diff options
64 files changed, 291 insertions, 317 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 1d069bc19872..baf2d6027ca9 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -147,7 +147,7 @@ import com.android.internal.util.ArrayUtils; import com.android.internal.util.FastPrintWriter; import com.android.org.conscrypt.OpenSSLSocketImpl; import com.android.org.conscrypt.TrustedCertificateStore; -import com.android.server.am.proto.MemInfoDumpProto; +import com.android.server.am.MemInfoDumpProto; import dalvik.system.BaseDexClassLoader; import dalvik.system.CloseGuard; diff --git a/core/proto/android/os/incident.proto b/core/proto/android/os/incident.proto index 6a3aaabb3614..476d5fe45692 100644 --- a/core/proto/android/os/incident.proto +++ b/core/proto/android/os/incident.proto @@ -231,22 +231,22 @@ message IncidentProto { (section).args = "procstats --proto" ]; - optional com.android.server.am.proto.ActivityManagerServiceDumpActivitiesProto activities = 3012 [ + optional com.android.server.am.ActivityManagerServiceDumpActivitiesProto activities = 3012 [ (section).type = SECTION_DUMPSYS, (section).args = "activity --proto activities" ]; - optional com.android.server.am.proto.ActivityManagerServiceDumpBroadcastsProto broadcasts = 3013 [ + optional com.android.server.am.ActivityManagerServiceDumpBroadcastsProto broadcasts = 3013 [ (section).type = SECTION_DUMPSYS, (section).args = "activity --proto broadcasts" ]; - optional com.android.server.am.proto.ActivityManagerServiceDumpServicesProto amservices = 3014 [ + optional com.android.server.am.ActivityManagerServiceDumpServicesProto amservices = 3014 [ (section).type = SECTION_DUMPSYS, (section).args = "activity --proto service" ]; - optional com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto amprocesses = 3015 [ + optional com.android.server.am.ActivityManagerServiceDumpProcessesProto amprocesses = 3015 [ (section).type = SECTION_DUMPSYS, (section).args = "activity --proto processes" ]; @@ -256,12 +256,12 @@ message IncidentProto { (section).args = "alarm --proto" ]; - optional com.android.server.wm.proto.WindowManagerServiceDumpProto window = 3017 [ + optional com.android.server.wm.WindowManagerServiceDumpProto window = 3017 [ (section).type = SECTION_DUMPSYS, (section).args = "window --proto" ]; - optional com.android.server.am.proto.MemInfoDumpProto meminfo = 3018 [ + optional com.android.server.am.MemInfoDumpProto meminfo = 3018 [ (section).type = SECTION_DUMPSYS, (section).args = "meminfo -a --proto" ]; diff --git a/core/proto/android/server/activitymanagerservice.proto b/core/proto/android/server/activitymanagerservice.proto index fcb980708157..0c617fff6b97 100644 --- a/core/proto/android/server/activitymanagerservice.proto +++ b/core/proto/android/server/activitymanagerservice.proto @@ -16,7 +16,7 @@ syntax = "proto2"; -package com.android.server.am.proto; +package com.android.server.am; import "frameworks/base/core/proto/android/app/activitymanager.proto"; import "frameworks/base/core/proto/android/app/enums.proto"; @@ -59,11 +59,11 @@ message ActivityManagerServiceDumpActivitiesProto { message ActivityStackSupervisorProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1; + optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1; repeated ActivityDisplayProto displays = 2; optional KeyguardControllerProto keyguard_controller = 3; optional int32 focused_stack_id = 4; - optional .com.android.server.wm.proto.IdentifierProto resumed_activity = 5; + optional .com.android.server.wm.IdentifierProto resumed_activity = 5; // Whether or not the home activity is the recents activity. This is needed for the CTS tests to // know what activity types to check for when invoking splitscreen multi-window. optional bool is_home_recents_component = 6; @@ -73,7 +73,7 @@ message ActivityStackSupervisorProto { message ActivityDisplayProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1; + optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1; optional int32 id = 2; repeated ActivityStackProto stacks = 3; } @@ -81,10 +81,10 @@ message ActivityDisplayProto { message ActivityStackProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1; + optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1; optional int32 id = 2; repeated TaskRecordProto tasks = 3; - optional .com.android.server.wm.proto.IdentifierProto resumed_activity = 4; + optional .com.android.server.wm.IdentifierProto resumed_activity = 4; optional int32 display_id = 5; optional bool fullscreen = 6; optional .android.graphics.RectProto bounds = 7; @@ -93,7 +93,7 @@ message ActivityStackProto { message TaskRecordProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1; + optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1; optional int32 id = 2; repeated ActivityRecordProto activities = 3; optional int32 stack_id = 4; @@ -111,8 +111,8 @@ message TaskRecordProto { message ActivityRecordProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; - optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1; - optional .com.android.server.wm.proto.IdentifierProto identifier = 2; + optional .com.android.server.wm.ConfigurationContainerProto configuration_container = 1; + optional .com.android.server.wm.IdentifierProto identifier = 2; optional string state = 3; optional bool visible = 4; optional bool front_of_task = 5; @@ -689,25 +689,14 @@ message ActivityManagerServiceDumpProcessesProto { } optional SleepStatus sleep_status = 27; - message VoiceProto { + message Voice { option (.android.msg_privacy).dest = DEST_AUTOMATIC; optional string session = 1; optional .android.os.PowerManagerProto.WakeLock wakelock = 2; } - optional VoiceProto running_voice = 28; + optional Voice running_voice = 28; - message VrControllerProto { - option (.android.msg_privacy).dest = DEST_AUTOMATIC; - - enum VrMode { - FLAG_NON_VR_MODE = 0; - FLAG_VR_MODE = 1; - FLAG_PERSISTENT_VR_MODE = 2; - } - repeated VrMode vr_mode = 1; - optional int32 render_thread_id = 2; - } optional VrControllerProto vr_controller = 29; message DebugApp { @@ -854,6 +843,19 @@ message ImportanceTokenProto { optional string reason = 3; } +// proto of class VrController.java +message VrControllerProto { + option (.android.msg_privacy).dest = DEST_AUTOMATIC; + + enum VrMode { + FLAG_NON_VR_MODE = 0; + FLAG_VR_MODE = 1; + FLAG_PERSISTENT_VR_MODE = 2; + } + repeated VrMode vr_mode = 1; + optional int32 render_thread_id = 2; +} + message ProcessOomProto { option (.android.msg_privacy).dest = DEST_AUTOMATIC; diff --git a/core/proto/android/server/animationadapter.proto b/core/proto/android/server/animationadapter.proto index c4ffe8c477aa..9bfa79455e0b 100644 --- a/core/proto/android/server/animationadapter.proto +++ b/core/proto/android/server/animationadapter.proto @@ -20,7 +20,7 @@ import "frameworks/base/core/proto/android/graphics/point.proto"; import "frameworks/base/core/proto/android/view/remote_animation_target.proto"; import "frameworks/base/libs/incident/proto/android/privacy.proto"; -package com.android.server.wm.proto; +package com.android.server.wm; option java_multiple_files = true; message AnimationAdapterProto { diff --git a/core/proto/android/server/appwindowthumbnail.proto b/core/proto/android/server/appwindowthumbnail.proto index 8f48d75a7f76..54ad193675e9 100644 --- a/core/proto/android/server/appwindowthumbnail.proto +++ b/core/proto/android/server/appwindowthumbnail.proto @@ -19,7 +19,7 @@ syntax = "proto2"; import "frameworks/base/core/proto/android/server/surfaceanimator.proto"; import "frameworks/base/libs/incident/proto/android/privacy.proto"; -package com.android.server.wm.proto; +package com.android.server.wm; option java_multiple_files = true; /** diff --git a/core/proto/android/server/surfaceanimator.proto b/core/proto/android/server/surfaceanimator.proto index dcc2b3443f2b..84560bc0eef2 100644 --- a/core/proto/android/server/surfaceanimator.proto +++ b/core/proto/android/server/surfaceanimator.proto @@ -20,7 +20,7 @@ import "frameworks/base/core/proto/android/server/animationadapter.proto"; import "frameworks/base/core/proto/android/view/surfacecontrol.proto"; import "frameworks/base/libs/incident/proto/android/privacy.proto"; -package com.android.server.wm.proto; +package com.android.server.wm; option java_multiple_files = true; /** diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index 9598f24b6ff1..063135d1de8b 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -28,7 +28,7 @@ import "frameworks/base/core/proto/android/view/surface.proto"; import "frameworks/base/core/proto/android/view/windowlayoutparams.proto"; import "frameworks/base/libs/incident/proto/android/privacy.proto"; -package com.android.server.wm.proto; +package com.android.server.wm; option java_multiple_files = true; diff --git a/core/proto/android/server/windowmanagertrace.proto b/core/proto/android/server/windowmanagertrace.proto index 96a90bfe63da..f502961d2c45 100644 --- a/core/proto/android/server/windowmanagertrace.proto +++ b/core/proto/android/server/windowmanagertrace.proto @@ -18,7 +18,7 @@ syntax = "proto2"; import "frameworks/base/core/proto/android/server/windowmanagerservice.proto"; -package com.android.server.wm.proto; +package com.android.server.wm; option java_multiple_files = true; diff --git a/services/core/java/com/android/server/am/ActiveInstrumentation.java b/services/core/java/com/android/server/am/ActiveInstrumentation.java index 4a657334f4fb..ff6595115584 100644 --- a/services/core/java/com/android/server/am/ActiveInstrumentation.java +++ b/services/core/java/com/android/server/am/ActiveInstrumentation.java @@ -24,8 +24,6 @@ import android.os.Bundle; import android.util.PrintWriterPrinter; import android.util.proto.ProtoOutputStream; -import com.android.server.am.proto.ActiveInstrumentationProto; - import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 73b1e333d02b..e84c5f4d9dff 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -60,7 +60,6 @@ import com.android.server.AppStateTracker; import com.android.server.LocalServices; import com.android.server.am.ActivityManagerService.ItemMatcher; import com.android.server.am.ActivityManagerService.NeededUriGrants; -import com.android.server.am.proto.ActiveServicesProto; import android.app.ActivityManager; import android.app.AppGlobals; diff --git a/services/core/java/com/android/server/am/ActivityDisplay.java b/services/core/java/com/android/server/am/ActivityDisplay.java index 44980772d895..4a8bc8745012 100644 --- a/services/core/java/com/android/server/am/ActivityDisplay.java +++ b/services/core/java/com/android/server/am/ActivityDisplay.java @@ -35,9 +35,9 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_STACK; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_STACK; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; -import static com.android.server.am.proto.ActivityDisplayProto.CONFIGURATION_CONTAINER; -import static com.android.server.am.proto.ActivityDisplayProto.STACKS; -import static com.android.server.am.proto.ActivityDisplayProto.ID; +import static com.android.server.am.ActivityDisplayProto.CONFIGURATION_CONTAINER; +import static com.android.server.am.ActivityDisplayProto.STACKS; +import static com.android.server.am.ActivityDisplayProto.ID; import android.annotation.Nullable; import android.app.ActivityManagerInternal; diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 8313107bfd20..457564b210b0 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -441,19 +441,19 @@ import com.android.server.ThreadPriorityBooster; import com.android.server.Watchdog; import com.android.server.am.ActivityStack.ActivityState; import com.android.server.am.MemoryStatUtil.MemoryStat; -import com.android.server.am.proto.ActivityManagerServiceProto; -import com.android.server.am.proto.ActivityManagerServiceDumpActivitiesProto; -import com.android.server.am.proto.ActivityManagerServiceDumpBroadcastsProto; -import com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto; -import com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto.UidObserverRegistrationProto; -import com.android.server.am.proto.ActivityManagerServiceDumpServicesProto; -import com.android.server.am.proto.GrantUriProto; -import com.android.server.am.proto.ImportanceTokenProto; -import com.android.server.am.proto.MemInfoDumpProto; -import com.android.server.am.proto.NeededUriGrantsProto; -import com.android.server.am.proto.ProcessOomProto; -import com.android.server.am.proto.ProcessToGcProto; -import com.android.server.am.proto.StickyBroadcastProto; +import com.android.server.am.ActivityManagerServiceProto; +import com.android.server.am.ActivityManagerServiceDumpActivitiesProto; +import com.android.server.am.ActivityManagerServiceDumpBroadcastsProto; +import com.android.server.am.ActivityManagerServiceDumpProcessesProto; +import com.android.server.am.ActivityManagerServiceDumpProcessesProto.UidObserverRegistrationProto; +import com.android.server.am.ActivityManagerServiceDumpServicesProto; +import com.android.server.am.GrantUriProto; +import com.android.server.am.ImportanceTokenProto; +import com.android.server.am.MemInfoDumpProto; +import com.android.server.am.NeededUriGrantsProto; +import com.android.server.am.ProcessOomProto; +import com.android.server.am.ProcessToGcProto; +import com.android.server.am.StickyBroadcastProto; import com.android.server.firewall.IntentFirewall; import com.android.server.job.JobSchedulerInternal; import com.android.server.pm.Installer; @@ -17092,8 +17092,8 @@ public class ActivityManagerService extends IActivityManager.Stub if (mRunningVoice != null) { final long vrToken = proto.start(ActivityManagerServiceDumpProcessesProto.RUNNING_VOICE); - proto.write(ActivityManagerServiceDumpProcessesProto.VoiceProto.SESSION, mRunningVoice.toString()); - mVoiceWakeLock.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.VoiceProto.WAKELOCK); + proto.write(ActivityManagerServiceDumpProcessesProto.Voice.SESSION, mRunningVoice.toString()); + mVoiceWakeLock.writeToProto(proto, ActivityManagerServiceDumpProcessesProto.Voice.WAKELOCK); proto.end(vrToken); } diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 17acb3bbafbf..ccc17a3b1d0e 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -112,16 +112,16 @@ import static com.android.server.am.EventLogTags.AM_RELAUNCH_RESUME_ACTIVITY; import static com.android.server.am.TaskPersister.DEBUG; import static com.android.server.am.TaskPersister.IMAGE_EXTENSION; import static com.android.server.am.TaskRecord.INVALID_TASK_ID; -import static com.android.server.am.proto.ActivityRecordProto.CONFIGURATION_CONTAINER; -import static com.android.server.am.proto.ActivityRecordProto.FRONT_OF_TASK; -import static com.android.server.am.proto.ActivityRecordProto.IDENTIFIER; -import static com.android.server.am.proto.ActivityRecordProto.PROC_ID; -import static com.android.server.am.proto.ActivityRecordProto.STATE; -import static com.android.server.am.proto.ActivityRecordProto.VISIBLE; +import static com.android.server.am.ActivityRecordProto.CONFIGURATION_CONTAINER; +import static com.android.server.am.ActivityRecordProto.FRONT_OF_TASK; +import static com.android.server.am.ActivityRecordProto.IDENTIFIER; +import static com.android.server.am.ActivityRecordProto.PROC_ID; +import static com.android.server.am.ActivityRecordProto.STATE; +import static com.android.server.am.ActivityRecordProto.VISIBLE; import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_LEFT; -import static com.android.server.wm.proto.IdentifierProto.HASH_CODE; -import static com.android.server.wm.proto.IdentifierProto.TITLE; -import static com.android.server.wm.proto.IdentifierProto.USER_ID; +import static com.android.server.wm.IdentifierProto.HASH_CODE; +import static com.android.server.wm.IdentifierProto.TITLE; +import static com.android.server.wm.IdentifierProto.USER_ID; import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; import static org.xmlpull.v1.XmlPullParser.END_TAG; diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 1f5320aa876d..20b938b32eed 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -82,13 +82,13 @@ import static com.android.server.am.ActivityStackSupervisor.FindTaskResult; import static com.android.server.am.ActivityStackSupervisor.PAUSE_IMMEDIATELY; import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS; import static com.android.server.am.ActivityStackSupervisor.REMOVE_FROM_RECENTS; -import static com.android.server.am.proto.ActivityStackProto.BOUNDS; -import static com.android.server.am.proto.ActivityStackProto.CONFIGURATION_CONTAINER; -import static com.android.server.am.proto.ActivityStackProto.DISPLAY_ID; -import static com.android.server.am.proto.ActivityStackProto.FULLSCREEN; -import static com.android.server.am.proto.ActivityStackProto.ID; -import static com.android.server.am.proto.ActivityStackProto.RESUMED_ACTIVITY; -import static com.android.server.am.proto.ActivityStackProto.TASKS; +import static com.android.server.am.ActivityStackProto.BOUNDS; +import static com.android.server.am.ActivityStackProto.CONFIGURATION_CONTAINER; +import static com.android.server.am.ActivityStackProto.DISPLAY_ID; +import static com.android.server.am.ActivityStackProto.FULLSCREEN; +import static com.android.server.am.ActivityStackProto.ID; +import static com.android.server.am.ActivityStackProto.RESUMED_ACTIVITY; +import static com.android.server.am.ActivityStackProto.TASKS; import static android.view.WindowManager.TRANSIT_ACTIVITY_CLOSE; import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN; import static android.view.WindowManager.TRANSIT_NONE; diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index be72216c6bf6..265e4fa078fc 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -90,12 +90,12 @@ import static com.android.server.am.TaskRecord.LOCK_TASK_AUTH_WHITELISTED; import static com.android.server.am.TaskRecord.REPARENT_KEEP_STACK_AT_FRONT; import static com.android.server.am.TaskRecord.REPARENT_LEAVE_STACK_IN_PLACE; import static com.android.server.am.TaskRecord.REPARENT_MOVE_STACK_TO_FRONT; -import static com.android.server.am.proto.ActivityStackSupervisorProto.CONFIGURATION_CONTAINER; -import static com.android.server.am.proto.ActivityStackSupervisorProto.DISPLAYS; -import static com.android.server.am.proto.ActivityStackSupervisorProto.FOCUSED_STACK_ID; -import static com.android.server.am.proto.ActivityStackSupervisorProto.IS_HOME_RECENTS_COMPONENT; -import static com.android.server.am.proto.ActivityStackSupervisorProto.KEYGUARD_CONTROLLER; -import static com.android.server.am.proto.ActivityStackSupervisorProto.RESUMED_ACTIVITY; +import static com.android.server.am.ActivityStackSupervisorProto.CONFIGURATION_CONTAINER; +import static com.android.server.am.ActivityStackSupervisorProto.DISPLAYS; +import static com.android.server.am.ActivityStackSupervisorProto.FOCUSED_STACK_ID; +import static com.android.server.am.ActivityStackSupervisorProto.IS_HOME_RECENTS_COMPONENT; +import static com.android.server.am.ActivityStackSupervisorProto.KEYGUARD_CONTROLLER; +import static com.android.server.am.ActivityStackSupervisorProto.RESUMED_ACTIVITY; import static android.view.WindowManager.TRANSIT_DOCK_TASK_FROM_RECENTS; import static java.lang.Integer.MAX_VALUE; diff --git a/services/core/java/com/android/server/am/AppBindRecord.java b/services/core/java/com/android/server/am/AppBindRecord.java index 972a692d276f..4eaebd04a8ad 100644 --- a/services/core/java/com/android/server/am/AppBindRecord.java +++ b/services/core/java/com/android/server/am/AppBindRecord.java @@ -19,8 +19,6 @@ package com.android.server.am; import android.util.ArraySet; import android.util.proto.ProtoOutputStream; -import com.android.server.am.proto.AppBindRecordProto; - import java.io.PrintWriter; /** diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index ed098795d1d8..b2872e4d7f5a 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -22,7 +22,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.ProcessCpuTracker; import com.android.server.RescueParty; import com.android.server.Watchdog; -import com.android.server.am.proto.AppErrorsProto; import android.app.ActivityManager; import android.app.ActivityOptions; diff --git a/services/core/java/com/android/server/am/AppTimeTracker.java b/services/core/java/com/android/server/am/AppTimeTracker.java index d96364ade168..772865d89d3b 100644 --- a/services/core/java/com/android/server/am/AppTimeTracker.java +++ b/services/core/java/com/android/server/am/AppTimeTracker.java @@ -28,8 +28,6 @@ import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoUtils; -import com.android.server.am.proto.AppTimeTrackerProto; - import java.io.PrintWriter; /** diff --git a/services/core/java/com/android/server/am/BroadcastFilter.java b/services/core/java/com/android/server/am/BroadcastFilter.java index 7ff227f56ae8..8e2ca0691277 100644 --- a/services/core/java/com/android/server/am/BroadcastFilter.java +++ b/services/core/java/com/android/server/am/BroadcastFilter.java @@ -21,8 +21,6 @@ import android.util.PrintWriterPrinter; import android.util.Printer; import android.util.proto.ProtoOutputStream; -import com.android.server.am.proto.BroadcastFilterProto; - import java.io.PrintWriter; final class BroadcastFilter extends IntentFilter { diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java index 715151b93296..cc3a8875c4d1 100644 --- a/services/core/java/com/android/server/am/BroadcastQueue.java +++ b/services/core/java/com/android/server/am/BroadcastQueue.java @@ -55,8 +55,6 @@ import android.util.proto.ProtoOutputStream; import static com.android.server.am.ActivityManagerDebugConfig.*; -import com.android.server.am.proto.BroadcastQueueProto; - /** * BROADCASTS * diff --git a/services/core/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java index 5b3b2a8ed3d8..574ca4a340ee 100644 --- a/services/core/java/com/android/server/am/BroadcastRecord.java +++ b/services/core/java/com/android/server/am/BroadcastRecord.java @@ -32,8 +32,6 @@ import android.util.PrintWriterPrinter; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; -import com.android.server.am.proto.BroadcastRecordProto; - import java.io.PrintWriter; import java.text.SimpleDateFormat; import java.util.Arrays; diff --git a/services/core/java/com/android/server/am/ConnectionRecord.java b/services/core/java/com/android/server/am/ConnectionRecord.java index a8e9ad9ce87b..679024ee4c94 100644 --- a/services/core/java/com/android/server/am/ConnectionRecord.java +++ b/services/core/java/com/android/server/am/ConnectionRecord.java @@ -22,8 +22,6 @@ import android.content.Context; import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoUtils; -import com.android.server.am.proto.ConnectionRecordProto; - import java.io.PrintWriter; /** diff --git a/services/core/java/com/android/server/am/IntentBindRecord.java b/services/core/java/com/android/server/am/IntentBindRecord.java index 3457a8098284..839b6e1bd634 100644 --- a/services/core/java/com/android/server/am/IntentBindRecord.java +++ b/services/core/java/com/android/server/am/IntentBindRecord.java @@ -23,9 +23,6 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.proto.ProtoOutputStream; -import com.android.server.am.proto.AppBindRecordProto; -import com.android.server.am.proto.IntentBindRecordProto; - import java.io.PrintWriter; /** diff --git a/services/core/java/com/android/server/am/KeyguardController.java b/services/core/java/com/android/server/am/KeyguardController.java index 0d7eab626ff0..b67dd0dc479b 100644 --- a/services/core/java/com/android/server/am/KeyguardController.java +++ b/services/core/java/com/android/server/am/KeyguardController.java @@ -25,8 +25,8 @@ import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS; -import static com.android.server.am.proto.KeyguardControllerProto.KEYGUARD_OCCLUDED; -import static com.android.server.am.proto.KeyguardControllerProto.KEYGUARD_SHOWING; +import static com.android.server.am.KeyguardControllerProto.KEYGUARD_OCCLUDED; +import static com.android.server.am.KeyguardControllerProto.KEYGUARD_SHOWING; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE; import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER; diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index 0bf269151f24..e348bf4bf5ae 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -27,7 +27,6 @@ import android.util.Slog; import com.android.internal.app.procstats.ProcessStats; import com.android.internal.app.procstats.ProcessState; import com.android.internal.os.BatteryStatsImpl; -import com.android.server.am.proto.ProcessRecordProto; import android.app.ActivityManager; import android.app.Dialog; diff --git a/services/core/java/com/android/server/am/ReceiverList.java b/services/core/java/com/android/server/am/ReceiverList.java index eee924f6b23f..5e31b2e3bdd1 100644 --- a/services/core/java/com/android/server/am/ReceiverList.java +++ b/services/core/java/com/android/server/am/ReceiverList.java @@ -25,7 +25,6 @@ import android.util.Printer; import android.util.proto.ProtoOutputStream; import com.android.server.IntentResolver; -import com.android.server.am.proto.ReceiverListProto; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/services/core/java/com/android/server/am/ServiceRecord.java b/services/core/java/com/android/server/am/ServiceRecord.java index 49a55cbf8e98..f296c6045248 100644 --- a/services/core/java/com/android/server/am/ServiceRecord.java +++ b/services/core/java/com/android/server/am/ServiceRecord.java @@ -19,7 +19,6 @@ package com.android.server.am; import com.android.internal.app.procstats.ServiceState; import com.android.internal.os.BatteryStatsImpl; import com.android.server.LocalServices; -import com.android.server.am.proto.ServiceRecordProto; import com.android.server.notification.NotificationManagerInternal; import android.app.INotificationManager; diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index c7b89d3d47eb..034cb2e373d5 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -62,19 +62,19 @@ import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING_TO_TOP import static com.android.server.am.ActivityStackSupervisor.ON_TOP; import static com.android.server.am.ActivityStackSupervisor.PAUSE_IMMEDIATELY; import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS; -import static com.android.server.am.proto.TaskRecordProto.ACTIVITIES; -import static com.android.server.am.proto.TaskRecordProto.BOUNDS; -import static com.android.server.am.proto.TaskRecordProto.CONFIGURATION_CONTAINER; -import static com.android.server.am.proto.TaskRecordProto.FULLSCREEN; -import static com.android.server.am.proto.TaskRecordProto.ID; -import static com.android.server.am.proto.TaskRecordProto.LAST_NON_FULLSCREEN_BOUNDS; -import static com.android.server.am.proto.TaskRecordProto.MIN_HEIGHT; -import static com.android.server.am.proto.TaskRecordProto.MIN_WIDTH; -import static com.android.server.am.proto.TaskRecordProto.ORIG_ACTIVITY; -import static com.android.server.am.proto.TaskRecordProto.REAL_ACTIVITY; -import static com.android.server.am.proto.TaskRecordProto.RESIZE_MODE; -import static com.android.server.am.proto.TaskRecordProto.STACK_ID; -import static com.android.server.am.proto.TaskRecordProto.ACTIVITY_TYPE; +import static com.android.server.am.TaskRecordProto.ACTIVITIES; +import static com.android.server.am.TaskRecordProto.BOUNDS; +import static com.android.server.am.TaskRecordProto.CONFIGURATION_CONTAINER; +import static com.android.server.am.TaskRecordProto.FULLSCREEN; +import static com.android.server.am.TaskRecordProto.ID; +import static com.android.server.am.TaskRecordProto.LAST_NON_FULLSCREEN_BOUNDS; +import static com.android.server.am.TaskRecordProto.MIN_HEIGHT; +import static com.android.server.am.TaskRecordProto.MIN_WIDTH; +import static com.android.server.am.TaskRecordProto.ORIG_ACTIVITY; +import static com.android.server.am.TaskRecordProto.REAL_ACTIVITY; +import static com.android.server.am.TaskRecordProto.RESIZE_MODE; +import static com.android.server.am.TaskRecordProto.STACK_ID; +import static com.android.server.am.TaskRecordProto.ACTIVITY_TYPE; import static java.lang.Integer.MAX_VALUE; diff --git a/services/core/java/com/android/server/am/UidRecord.java b/services/core/java/com/android/server/am/UidRecord.java index d49f3baa7bcb..3b859edd3cf9 100644 --- a/services/core/java/com/android/server/am/UidRecord.java +++ b/services/core/java/com/android/server/am/UidRecord.java @@ -28,7 +28,6 @@ import android.util.proto.ProtoUtils; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; -import com.android.server.am.proto.UidRecordProto; /** * Overall information about a uid that has actively running processes. diff --git a/services/core/java/com/android/server/am/UriPermissionOwner.java b/services/core/java/com/android/server/am/UriPermissionOwner.java index fc07c1ab8c9d..8eda38e6bd24 100644 --- a/services/core/java/com/android/server/am/UriPermissionOwner.java +++ b/services/core/java/com/android/server/am/UriPermissionOwner.java @@ -22,8 +22,6 @@ import android.os.IBinder; import android.util.ArraySet; import android.util.proto.ProtoOutputStream; -import com.android.server.am.proto.UriPermissionOwnerProto; - import com.google.android.collect.Sets; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index af1ab83190cc..0d125e051549 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -95,7 +95,6 @@ import com.android.internal.widget.LockPatternUtils; import com.android.server.FgThread; import com.android.server.LocalServices; import com.android.server.SystemServiceManager; -import com.android.server.am.proto.UserControllerProto; import com.android.server.pm.UserManagerService; import com.android.server.wm.WindowManagerService; diff --git a/services/core/java/com/android/server/am/UserState.java b/services/core/java/com/android/server/am/UserState.java index 00597e242d79..4f5c59ce0634 100644 --- a/services/core/java/com/android/server/am/UserState.java +++ b/services/core/java/com/android/server/am/UserState.java @@ -27,7 +27,6 @@ import android.util.Slog; import android.util.proto.ProtoOutputStream; import com.android.internal.util.ProgressReporter; -import com.android.server.am.proto.UserStateProto; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/services/core/java/com/android/server/am/VrController.java b/services/core/java/com/android/server/am/VrController.java index 9d34a8020345..45410d79afe7 100644 --- a/services/core/java/com/android/server/am/VrController.java +++ b/services/core/java/com/android/server/am/VrController.java @@ -24,7 +24,6 @@ import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoUtils; import com.android.server.LocalServices; -import com.android.server.am.proto.ActivityManagerServiceDumpProcessesProto.VrControllerProto; import com.android.server.vr.VrManagerInternal; /** diff --git a/services/core/java/com/android/server/policy/BarController.java b/services/core/java/com/android/server/policy/BarController.java index cf88bd5364a7..eca6f9f1ec47 100644 --- a/services/core/java/com/android/server/policy/BarController.java +++ b/services/core/java/com/android/server/policy/BarController.java @@ -16,8 +16,8 @@ package com.android.server.policy; -import static com.android.server.wm.proto.BarControllerProto.STATE; -import static com.android.server.wm.proto.BarControllerProto.TRANSIENT_STATE; +import static com.android.server.wm.BarControllerProto.STATE; +import static com.android.server.wm.BarControllerProto.TRANSIENT_STATE; import android.app.StatusBarManager; import android.graphics.Rect; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 61b1eb4d4d83..6b70f5c4ec88 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -128,26 +128,26 @@ import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.C import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_CLOSED; import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN; -import static com.android.server.wm.proto.WindowManagerPolicyProto.FOCUSED_APP_TOKEN; -import static com.android.server.wm.proto.WindowManagerPolicyProto.FOCUSED_WINDOW; -import static com.android.server.wm.proto.WindowManagerPolicyProto.FORCE_STATUS_BAR; -import static com.android.server.wm.proto.WindowManagerPolicyProto.FORCE_STATUS_BAR_FROM_KEYGUARD; -import static com.android.server.wm.proto.WindowManagerPolicyProto.KEYGUARD_DELEGATE; -import static com.android.server.wm.proto.WindowManagerPolicyProto.KEYGUARD_DRAW_COMPLETE; -import static com.android.server.wm.proto.WindowManagerPolicyProto.KEYGUARD_OCCLUDED; -import static com.android.server.wm.proto.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_CHANGED; -import static com.android.server.wm.proto.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_PENDING; -import static com.android.server.wm.proto.WindowManagerPolicyProto.LAST_SYSTEM_UI_FLAGS; -import static com.android.server.wm.proto.WindowManagerPolicyProto.NAVIGATION_BAR; -import static com.android.server.wm.proto.WindowManagerPolicyProto.ORIENTATION; -import static com.android.server.wm.proto.WindowManagerPolicyProto.ORIENTATION_LISTENER; -import static com.android.server.wm.proto.WindowManagerPolicyProto.ROTATION; -import static com.android.server.wm.proto.WindowManagerPolicyProto.ROTATION_MODE; -import static com.android.server.wm.proto.WindowManagerPolicyProto.SCREEN_ON_FULLY; -import static com.android.server.wm.proto.WindowManagerPolicyProto.STATUS_BAR; -import static com.android.server.wm.proto.WindowManagerPolicyProto.TOP_FULLSCREEN_OPAQUE_OR_DIMMING_WINDOW; -import static com.android.server.wm.proto.WindowManagerPolicyProto.TOP_FULLSCREEN_OPAQUE_WINDOW; -import static com.android.server.wm.proto.WindowManagerPolicyProto.WINDOW_MANAGER_DRAW_COMPLETE; +import static com.android.server.wm.WindowManagerPolicyProto.FOCUSED_APP_TOKEN; +import static com.android.server.wm.WindowManagerPolicyProto.FOCUSED_WINDOW; +import static com.android.server.wm.WindowManagerPolicyProto.FORCE_STATUS_BAR; +import static com.android.server.wm.WindowManagerPolicyProto.FORCE_STATUS_BAR_FROM_KEYGUARD; +import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_DELEGATE; +import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_DRAW_COMPLETE; +import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_OCCLUDED; +import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_CHANGED; +import static com.android.server.wm.WindowManagerPolicyProto.KEYGUARD_OCCLUDED_PENDING; +import static com.android.server.wm.WindowManagerPolicyProto.LAST_SYSTEM_UI_FLAGS; +import static com.android.server.wm.WindowManagerPolicyProto.NAVIGATION_BAR; +import static com.android.server.wm.WindowManagerPolicyProto.ORIENTATION; +import static com.android.server.wm.WindowManagerPolicyProto.ORIENTATION_LISTENER; +import static com.android.server.wm.WindowManagerPolicyProto.ROTATION; +import static com.android.server.wm.WindowManagerPolicyProto.ROTATION_MODE; +import static com.android.server.wm.WindowManagerPolicyProto.SCREEN_ON_FULLY; +import static com.android.server.wm.WindowManagerPolicyProto.STATUS_BAR; +import static com.android.server.wm.WindowManagerPolicyProto.TOP_FULLSCREEN_OPAQUE_OR_DIMMING_WINDOW; +import static com.android.server.wm.WindowManagerPolicyProto.TOP_FULLSCREEN_OPAQUE_WINDOW; +import static com.android.server.wm.WindowManagerPolicyProto.WINDOW_MANAGER_DRAW_COMPLETE; import android.annotation.Nullable; import android.app.ActivityManager; diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index 6674e185118a..ec0521dda40d 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -488,7 +488,7 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { boolean canAcquireSleepToken(); /** - * Writes {@link com.android.server.wm.proto.IdentifierProto} to stream. + * Writes {@link com.android.server.wm.IdentifierProto} to stream. */ void writeIdentifierToProto(ProtoOutputStream proto, long fieldId); } @@ -1626,7 +1626,7 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { /** * Write the WindowManagerPolicy's state into the protocol buffer. - * The message is described in {@link com.android.server.wm.proto.WindowManagerPolicyProto} + * The message is described in {@link com.android.server.wm.WindowManagerPolicyProto} * * @param proto The protocol buffer output stream to write to. */ diff --git a/services/core/java/com/android/server/policy/WindowOrientationListener.java b/services/core/java/com/android/server/policy/WindowOrientationListener.java index 48a196dfcff1..1508c9ecb394 100644 --- a/services/core/java/com/android/server/policy/WindowOrientationListener.java +++ b/services/core/java/com/android/server/policy/WindowOrientationListener.java @@ -16,8 +16,8 @@ package com.android.server.policy; -import static com.android.server.wm.proto.WindowOrientationListenerProto.ENABLED; -import static com.android.server.wm.proto.WindowOrientationListenerProto.ROTATION; +import static com.android.server.wm.WindowOrientationListenerProto.ENABLED; +import static com.android.server.wm.WindowOrientationListenerProto.ROTATION; import android.content.Context; import android.hardware.Sensor; diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index 58e8f776f9dd..062b154b8c1a 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -1,11 +1,11 @@ package com.android.server.policy.keyguard; import static android.view.Display.INVALID_DISPLAY; -import static com.android.server.wm.proto.KeyguardServiceDelegateProto.INTERACTIVE_STATE; -import static com.android.server.wm.proto.KeyguardServiceDelegateProto.OCCLUDED; -import static com.android.server.wm.proto.KeyguardServiceDelegateProto.SCREEN_STATE; -import static com.android.server.wm.proto.KeyguardServiceDelegateProto.SECURE; -import static com.android.server.wm.proto.KeyguardServiceDelegateProto.SHOWING; +import static com.android.server.wm.KeyguardServiceDelegateProto.INTERACTIVE_STATE; +import static com.android.server.wm.KeyguardServiceDelegateProto.OCCLUDED; +import static com.android.server.wm.KeyguardServiceDelegateProto.SCREEN_STATE; +import static com.android.server.wm.KeyguardServiceDelegateProto.SECURE; +import static com.android.server.wm.KeyguardServiceDelegateProto.SHOWING; import android.app.ActivityManager; import android.content.ComponentName; diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index 93ca4dc48319..41ae48a05c0f 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -70,8 +70,8 @@ import static com.android.server.wm.WindowManagerInternal.AppTransitionListener; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_NONE; -import static com.android.server.wm.proto.AppTransitionProto.APP_TRANSITION_STATE; -import static com.android.server.wm.proto.AppTransitionProto.LAST_USED_APP_TRANSITION; +import static com.android.server.wm.AppTransitionProto.APP_TRANSITION_STATE; +import static com.android.server.wm.AppTransitionProto.LAST_USED_APP_TRANSITION; import android.annotation.DrawableRes; import android.annotation.Nullable; diff --git a/services/core/java/com/android/server/wm/AppWindowThumbnail.java b/services/core/java/com/android/server/wm/AppWindowThumbnail.java index 3cd3e8b0912e..ad92f81f4dde 100644 --- a/services/core/java/com/android/server/wm/AppWindowThumbnail.java +++ b/services/core/java/com/android/server/wm/AppWindowThumbnail.java @@ -20,9 +20,9 @@ import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.MAX_ANIMATION_DURATION; -import static com.android.server.wm.proto.AppWindowThumbnailProto.HEIGHT; -import static com.android.server.wm.proto.AppWindowThumbnailProto.SURFACE_ANIMATOR; -import static com.android.server.wm.proto.AppWindowThumbnailProto.WIDTH; +import static com.android.server.wm.AppWindowThumbnailProto.HEIGHT; +import static com.android.server.wm.AppWindowThumbnailProto.SURFACE_ANIMATOR; +import static com.android.server.wm.AppWindowThumbnailProto.WIDTH; import android.graphics.GraphicBuffer; import android.graphics.PixelFormat; @@ -119,7 +119,7 @@ class AppWindowThumbnail implements Animatable { /** * Write to a protocol buffer output stream. Protocol buffer message definition is at {@link - * com.android.server.wm.proto.AppWindowThumbnailProto}. + * com.android.server.wm.AppWindowThumbnailProto}. * * @param proto Stream to write the AppWindowThumbnail object to. * @param fieldId Field Id of the AppWindowThumbnail as defined in the parent message. diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index f52f91cd6a3b..a76857e877d8 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -51,29 +51,29 @@ import static com.android.server.wm.WindowManagerService.H.NOTIFY_ACTIVITY_DRAWN import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL; import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES; import static com.android.server.wm.WindowManagerService.logWithStack; -import static com.android.server.wm.proto.AppWindowTokenProto.ALL_DRAWN; -import static com.android.server.wm.proto.AppWindowTokenProto.APP_STOPPED; -import static com.android.server.wm.proto.AppWindowTokenProto.CLIENT_HIDDEN; -import static com.android.server.wm.proto.AppWindowTokenProto.DEFER_HIDING_CLIENT; -import static com.android.server.wm.proto.AppWindowTokenProto.FILLS_PARENT; -import static com.android.server.wm.proto.AppWindowTokenProto.FROZEN_BOUNDS; -import static com.android.server.wm.proto.AppWindowTokenProto.HIDDEN_REQUESTED; -import static com.android.server.wm.proto.AppWindowTokenProto.HIDDEN_SET_FROM_TRANSFERRED_STARTING_WINDOW; -import static com.android.server.wm.proto.AppWindowTokenProto.IS_REALLY_ANIMATING; -import static com.android.server.wm.proto.AppWindowTokenProto.IS_WAITING_FOR_TRANSITION_START; -import static com.android.server.wm.proto.AppWindowTokenProto.LAST_ALL_DRAWN; -import static com.android.server.wm.proto.AppWindowTokenProto.LAST_SURFACE_SHOWING; -import static com.android.server.wm.proto.AppWindowTokenProto.NAME; -import static com.android.server.wm.proto.AppWindowTokenProto.NUM_DRAWN_WINDOWS; -import static com.android.server.wm.proto.AppWindowTokenProto.NUM_INTERESTING_WINDOWS; -import static com.android.server.wm.proto.AppWindowTokenProto.REMOVED; -import static com.android.server.wm.proto.AppWindowTokenProto.REPORTED_DRAWN; -import static com.android.server.wm.proto.AppWindowTokenProto.REPORTED_VISIBLE; -import static com.android.server.wm.proto.AppWindowTokenProto.STARTING_DISPLAYED; -import static com.android.server.wm.proto.AppWindowTokenProto.STARTING_MOVED; -import static com.android.server.wm.proto.AppWindowTokenProto.STARTING_WINDOW; -import static com.android.server.wm.proto.AppWindowTokenProto.THUMBNAIL; -import static com.android.server.wm.proto.AppWindowTokenProto.WINDOW_TOKEN; +import static com.android.server.wm.AppWindowTokenProto.ALL_DRAWN; +import static com.android.server.wm.AppWindowTokenProto.APP_STOPPED; +import static com.android.server.wm.AppWindowTokenProto.CLIENT_HIDDEN; +import static com.android.server.wm.AppWindowTokenProto.DEFER_HIDING_CLIENT; +import static com.android.server.wm.AppWindowTokenProto.FILLS_PARENT; +import static com.android.server.wm.AppWindowTokenProto.FROZEN_BOUNDS; +import static com.android.server.wm.AppWindowTokenProto.HIDDEN_REQUESTED; +import static com.android.server.wm.AppWindowTokenProto.HIDDEN_SET_FROM_TRANSFERRED_STARTING_WINDOW; +import static com.android.server.wm.AppWindowTokenProto.IS_REALLY_ANIMATING; +import static com.android.server.wm.AppWindowTokenProto.IS_WAITING_FOR_TRANSITION_START; +import static com.android.server.wm.AppWindowTokenProto.LAST_ALL_DRAWN; +import static com.android.server.wm.AppWindowTokenProto.LAST_SURFACE_SHOWING; +import static com.android.server.wm.AppWindowTokenProto.NAME; +import static com.android.server.wm.AppWindowTokenProto.NUM_DRAWN_WINDOWS; +import static com.android.server.wm.AppWindowTokenProto.NUM_INTERESTING_WINDOWS; +import static com.android.server.wm.AppWindowTokenProto.REMOVED; +import static com.android.server.wm.AppWindowTokenProto.REPORTED_DRAWN; +import static com.android.server.wm.AppWindowTokenProto.REPORTED_VISIBLE; +import static com.android.server.wm.AppWindowTokenProto.STARTING_DISPLAYED; +import static com.android.server.wm.AppWindowTokenProto.STARTING_MOVED; +import static com.android.server.wm.AppWindowTokenProto.STARTING_WINDOW; +import static com.android.server.wm.AppWindowTokenProto.THUMBNAIL; +import static com.android.server.wm.AppWindowTokenProto.WINDOW_TOKEN; import android.annotation.CallSuper; import android.app.Activity; diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java index 2c2389b12577..627c6297bdd8 100644 --- a/services/core/java/com/android/server/wm/ConfigurationContainer.java +++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java @@ -29,9 +29,9 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECOND import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.app.WindowConfiguration.activityTypeToString; import static android.app.WindowConfiguration.windowingModeToString; -import static com.android.server.wm.proto.ConfigurationContainerProto.FULL_CONFIGURATION; -import static com.android.server.wm.proto.ConfigurationContainerProto.MERGED_OVERRIDE_CONFIGURATION; -import static com.android.server.wm.proto.ConfigurationContainerProto.OVERRIDE_CONFIGURATION; +import static com.android.server.wm.ConfigurationContainerProto.FULL_CONFIGURATION; +import static com.android.server.wm.ConfigurationContainerProto.MERGED_OVERRIDE_CONFIGURATION; +import static com.android.server.wm.ConfigurationContainerProto.OVERRIDE_CONFIGURATION; import android.annotation.CallSuper; import android.app.WindowConfiguration; @@ -470,7 +470,7 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { /** * Write to a protocol buffer output stream. Protocol buffer message definition is at - * {@link com.android.server.wm.proto.ConfigurationContainerProto}. + * {@link com.android.server.wm.ConfigurationContainerProto}. * * @param proto Stream to write the ConfigurationContainer object to. * @param fieldId Field Id of the ConfigurationContainer as defined in the parent diff --git a/services/core/java/com/android/server/wm/Dimmer.java b/services/core/java/com/android/server/wm/Dimmer.java index 5c62987ec521..d000bb62ff80 100644 --- a/services/core/java/com/android/server/wm/Dimmer.java +++ b/services/core/java/com/android/server/wm/Dimmer.java @@ -16,10 +16,10 @@ package com.android.server.wm; -import static com.android.server.wm.proto.AlphaAnimationSpecProto.DURATION; -import static com.android.server.wm.proto.AlphaAnimationSpecProto.FROM; -import static com.android.server.wm.proto.AlphaAnimationSpecProto.TO; -import static com.android.server.wm.proto.AnimationSpecProto.ALPHA; +import static com.android.server.wm.AlphaAnimationSpecProto.DURATION; +import static com.android.server.wm.AlphaAnimationSpecProto.FROM; +import static com.android.server.wm.AlphaAnimationSpecProto.TO; +import static com.android.server.wm.AnimationSpecProto.ALPHA; import android.graphics.Rect; import android.util.proto.ProtoOutputStream; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index e2e169003913..20947557f1da 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -101,19 +101,19 @@ import static com.android.server.wm.WindowState.RESIZE_HANDLE_WIDTH_IN_DP; import static com.android.server.wm.WindowStateAnimator.DRAW_PENDING; import static com.android.server.wm.WindowStateAnimator.READY_TO_SHOW; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE; -import static com.android.server.wm.proto.DisplayProto.ABOVE_APP_WINDOWS; -import static com.android.server.wm.proto.DisplayProto.BELOW_APP_WINDOWS; -import static com.android.server.wm.proto.DisplayProto.DISPLAY_FRAMES; -import static com.android.server.wm.proto.DisplayProto.DISPLAY_INFO; -import static com.android.server.wm.proto.DisplayProto.DOCKED_STACK_DIVIDER_CONTROLLER; -import static com.android.server.wm.proto.DisplayProto.DPI; -import static com.android.server.wm.proto.DisplayProto.ID; -import static com.android.server.wm.proto.DisplayProto.IME_WINDOWS; -import static com.android.server.wm.proto.DisplayProto.PINNED_STACK_CONTROLLER; -import static com.android.server.wm.proto.DisplayProto.ROTATION; -import static com.android.server.wm.proto.DisplayProto.SCREEN_ROTATION_ANIMATION; -import static com.android.server.wm.proto.DisplayProto.STACKS; -import static com.android.server.wm.proto.DisplayProto.WINDOW_CONTAINER; +import static com.android.server.wm.DisplayProto.ABOVE_APP_WINDOWS; +import static com.android.server.wm.DisplayProto.BELOW_APP_WINDOWS; +import static com.android.server.wm.DisplayProto.DISPLAY_FRAMES; +import static com.android.server.wm.DisplayProto.DISPLAY_INFO; +import static com.android.server.wm.DisplayProto.DOCKED_STACK_DIVIDER_CONTROLLER; +import static com.android.server.wm.DisplayProto.DPI; +import static com.android.server.wm.DisplayProto.ID; +import static com.android.server.wm.DisplayProto.IME_WINDOWS; +import static com.android.server.wm.DisplayProto.PINNED_STACK_CONTROLLER; +import static com.android.server.wm.DisplayProto.ROTATION; +import static com.android.server.wm.DisplayProto.SCREEN_ROTATION_ANIMATION; +import static com.android.server.wm.DisplayProto.STACKS; +import static com.android.server.wm.DisplayProto.WINDOW_CONTAINER; import android.annotation.CallSuper; import android.annotation.NonNull; diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java index 57693ac2b463..dc6b49127f7b 100644 --- a/services/core/java/com/android/server/wm/DisplayFrames.java +++ b/services/core/java/com/android/server/wm/DisplayFrames.java @@ -19,7 +19,7 @@ package com.android.server.wm; import static android.view.Surface.ROTATION_180; import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; -import static com.android.server.wm.proto.DisplayFramesProto.STABLE_BOUNDS; +import static com.android.server.wm.DisplayFramesProto.STABLE_BOUNDS; import android.annotation.NonNull; import android.graphics.Rect; diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java index b99e85fed46b..5e2bb10fe629 100644 --- a/services/core/java/com/android/server/wm/DockedStackDividerController.java +++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java @@ -34,7 +34,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.H.NOTIFY_DOCKED_STACK_MINIMIZED_CHANGED; import static com.android.server.wm.WindowManagerService.LAYER_OFFSET_DIM; -import static com.android.server.wm.proto.DockedStackDividerControllerProto.MINIMIZED_DOCK; +import static com.android.server.wm.DockedStackDividerControllerProto.MINIMIZED_DOCK; import android.content.Context; import android.content.res.Configuration; diff --git a/services/core/java/com/android/server/wm/LocalAnimationAdapter.java b/services/core/java/com/android/server/wm/LocalAnimationAdapter.java index 3f1fde96d7b7..529aacc0f91d 100644 --- a/services/core/java/com/android/server/wm/LocalAnimationAdapter.java +++ b/services/core/java/com/android/server/wm/LocalAnimationAdapter.java @@ -16,8 +16,8 @@ package com.android.server.wm; -import static com.android.server.wm.proto.AnimationAdapterProto.LOCAL; -import static com.android.server.wm.proto.LocalAnimationAdapterProto.ANIMATION_SPEC; +import static com.android.server.wm.AnimationAdapterProto.LOCAL; +import static com.android.server.wm.LocalAnimationAdapterProto.ANIMATION_SPEC; import android.os.SystemClock; import android.util.proto.ProtoOutputStream; diff --git a/services/core/java/com/android/server/wm/PinnedStackController.java b/services/core/java/com/android/server/wm/PinnedStackController.java index 2293fb2bea4e..5f1916d4e523 100644 --- a/services/core/java/com/android/server/wm/PinnedStackController.java +++ b/services/core/java/com/android/server/wm/PinnedStackController.java @@ -22,8 +22,8 @@ import static android.util.TypedValue.COMPLEX_UNIT_DIP; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.PinnedStackControllerProto.DEFAULT_BOUNDS; -import static com.android.server.wm.proto.PinnedStackControllerProto.MOVEMENT_BOUNDS; +import static com.android.server.wm.PinnedStackControllerProto.DEFAULT_BOUNDS; +import static com.android.server.wm.PinnedStackControllerProto.MOVEMENT_BOUNDS; import android.app.RemoteAction; import android.content.pm.ParceledListSlice; diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java index 3e72a713272a..19d66919bb7f 100644 --- a/services/core/java/com/android/server/wm/RecentsAnimationController.java +++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java @@ -26,8 +26,8 @@ import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_W import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.H.NOTIFY_APP_TRANSITION_STARTING; -import static com.android.server.wm.proto.RemoteAnimationAdapterWrapperProto.TARGET; -import static com.android.server.wm.proto.AnimationAdapterProto.REMOTE; +import static com.android.server.wm.RemoteAnimationAdapterWrapperProto.TARGET; +import static com.android.server.wm.AnimationAdapterProto.REMOTE; import android.app.ActivityManager.TaskSnapshot; import android.app.WindowConfiguration; diff --git a/services/core/java/com/android/server/wm/RemoteAnimationController.java b/services/core/java/com/android/server/wm/RemoteAnimationController.java index d645110b6fd5..d7f480b78f85 100644 --- a/services/core/java/com/android/server/wm/RemoteAnimationController.java +++ b/services/core/java/com/android/server/wm/RemoteAnimationController.java @@ -19,8 +19,8 @@ package com.android.server.wm; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.AnimationAdapterProto.REMOTE; -import static com.android.server.wm.proto.RemoteAnimationAdapterWrapperProto.TARGET; +import static com.android.server.wm.AnimationAdapterProto.REMOTE; +import static com.android.server.wm.RemoteAnimationAdapterWrapperProto.TARGET; import android.graphics.Point; import android.graphics.Rect; diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 32ae52375fd5..52d81777fd52 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -84,9 +84,9 @@ import static com.android.server.wm.WindowSurfacePlacer.SET_ORIENTATION_CHANGE_C import static com.android.server.wm.WindowSurfacePlacer.SET_UPDATE_ROTATION; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_ACTION_PENDING; import static com.android.server.wm.WindowSurfacePlacer.SET_WALLPAPER_MAY_CHANGE; -import static com.android.server.wm.proto.RootWindowContainerProto.DISPLAYS; -import static com.android.server.wm.proto.RootWindowContainerProto.WINDOWS; -import static com.android.server.wm.proto.RootWindowContainerProto.WINDOW_CONTAINER; +import static com.android.server.wm.RootWindowContainerProto.DISPLAYS; +import static com.android.server.wm.RootWindowContainerProto.WINDOWS; +import static com.android.server.wm.RootWindowContainerProto.WINDOW_CONTAINER; /** Root {@link WindowContainer} for the device. */ class RootWindowContainer extends WindowContainer<DisplayContent> { diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java index 235f63e6fd7f..fa8a5c66aeea 100644 --- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java +++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java @@ -23,8 +23,8 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER; import static com.android.server.wm.WindowStateAnimator.WINDOW_FREEZE_LAYER; -import static com.android.server.wm.proto.ScreenRotationAnimationProto.ANIMATION_RUNNING; -import static com.android.server.wm.proto.ScreenRotationAnimationProto.STARTED; +import static com.android.server.wm.ScreenRotationAnimationProto.ANIMATION_RUNNING; +import static com.android.server.wm.ScreenRotationAnimationProto.STARTED; import android.content.Context; import android.graphics.Matrix; diff --git a/services/core/java/com/android/server/wm/SurfaceAnimator.java b/services/core/java/com/android/server/wm/SurfaceAnimator.java index f10ff8c1dd81..e5928b1e6675 100644 --- a/services/core/java/com/android/server/wm/SurfaceAnimator.java +++ b/services/core/java/com/android/server/wm/SurfaceAnimator.java @@ -19,9 +19,9 @@ package com.android.server.wm; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.SurfaceAnimatorProto.ANIMATION_ADAPTER; -import static com.android.server.wm.proto.SurfaceAnimatorProto.ANIMATION_START_DELAYED; -import static com.android.server.wm.proto.SurfaceAnimatorProto.LEASH; +import static com.android.server.wm.SurfaceAnimatorProto.ANIMATION_ADAPTER; +import static com.android.server.wm.SurfaceAnimatorProto.ANIMATION_START_DELAYED; +import static com.android.server.wm.SurfaceAnimatorProto.LEASH; import android.annotation.NonNull; import android.annotation.Nullable; @@ -310,7 +310,7 @@ class SurfaceAnimator { /** * Write to a protocol buffer output stream. Protocol buffer message definition is at {@link - * com.android.server.wm.proto.SurfaceAnimatorProto}. + * com.android.server.wm.SurfaceAnimatorProto}. * * @param proto Stream to write the SurfaceAnimator object to. * @param fieldId Field Id of the SurfaceAnimator as defined in the parent message. diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index a403e6f2a212..e4722f956f1f 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -26,13 +26,13 @@ import static com.android.server.EventLogTags.WM_TASK_REMOVED; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.TaskProto.APP_WINDOW_TOKENS; -import static com.android.server.wm.proto.TaskProto.BOUNDS; -import static com.android.server.wm.proto.TaskProto.DEFER_REMOVAL; -import static com.android.server.wm.proto.TaskProto.FILLS_PARENT; -import static com.android.server.wm.proto.TaskProto.ID; -import static com.android.server.wm.proto.TaskProto.TEMP_INSET_BOUNDS; -import static com.android.server.wm.proto.TaskProto.WINDOW_CONTAINER; +import static com.android.server.wm.TaskProto.APP_WINDOW_TOKENS; +import static com.android.server.wm.TaskProto.BOUNDS; +import static com.android.server.wm.TaskProto.DEFER_REMOVAL; +import static com.android.server.wm.TaskProto.FILLS_PARENT; +import static com.android.server.wm.TaskProto.ID; +import static com.android.server.wm.TaskProto.TEMP_INSET_BOUNDS; +import static com.android.server.wm.TaskProto.WINDOW_CONTAINER; import android.annotation.CallSuper; import android.app.ActivityManager.TaskDescription; diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 460edece0f61..900e2df1258d 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -35,18 +35,18 @@ import static android.view.WindowManager.DOCKED_TOP; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_MOVEMENT; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.StackProto.ADJUSTED_BOUNDS; -import static com.android.server.wm.proto.StackProto.ADJUSTED_FOR_IME; -import static com.android.server.wm.proto.StackProto.ADJUST_DIVIDER_AMOUNT; -import static com.android.server.wm.proto.StackProto.ADJUST_IME_AMOUNT; -import static com.android.server.wm.proto.StackProto.ANIMATION_BACKGROUND_SURFACE_IS_DIMMING; -import static com.android.server.wm.proto.StackProto.BOUNDS; -import static com.android.server.wm.proto.StackProto.DEFER_REMOVAL; -import static com.android.server.wm.proto.StackProto.FILLS_PARENT; -import static com.android.server.wm.proto.StackProto.ID; -import static com.android.server.wm.proto.StackProto.MINIMIZE_AMOUNT; -import static com.android.server.wm.proto.StackProto.TASKS; -import static com.android.server.wm.proto.StackProto.WINDOW_CONTAINER; +import static com.android.server.wm.StackProto.ADJUSTED_BOUNDS; +import static com.android.server.wm.StackProto.ADJUSTED_FOR_IME; +import static com.android.server.wm.StackProto.ADJUST_DIVIDER_AMOUNT; +import static com.android.server.wm.StackProto.ADJUST_IME_AMOUNT; +import static com.android.server.wm.StackProto.ANIMATION_BACKGROUND_SURFACE_IS_DIMMING; +import static com.android.server.wm.StackProto.BOUNDS; +import static com.android.server.wm.StackProto.DEFER_REMOVAL; +import static com.android.server.wm.StackProto.FILLS_PARENT; +import static com.android.server.wm.StackProto.ID; +import static com.android.server.wm.StackProto.MINIMIZE_AMOUNT; +import static com.android.server.wm.StackProto.TASKS; +import static com.android.server.wm.StackProto.WINDOW_CONTAINER; import android.annotation.CallSuper; import android.content.res.Configuration; diff --git a/services/core/java/com/android/server/wm/WindowAnimationSpec.java b/services/core/java/com/android/server/wm/WindowAnimationSpec.java index a41eba8205f7..7b7cb30ac64d 100644 --- a/services/core/java/com/android/server/wm/WindowAnimationSpec.java +++ b/services/core/java/com/android/server/wm/WindowAnimationSpec.java @@ -19,8 +19,8 @@ package com.android.server.wm; import static com.android.server.wm.AnimationAdapter.STATUS_BAR_TRANSITION_DURATION; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_NONE; -import static com.android.server.wm.proto.AnimationSpecProto.WINDOW; -import static com.android.server.wm.proto.WindowAnimationSpecProto.ANIMATION; +import static com.android.server.wm.AnimationSpecProto.WINDOW; +import static com.android.server.wm.WindowAnimationSpecProto.ANIMATION; import android.graphics.Point; import android.graphics.Rect; diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 27c0b3b39dfc..28fdaaef7abb 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -23,10 +23,10 @@ import static android.view.SurfaceControl.Transaction; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.WindowContainerProto.CONFIGURATION_CONTAINER; -import static com.android.server.wm.proto.WindowContainerProto.ORIENTATION; -import static com.android.server.wm.proto.WindowContainerProto.SURFACE_ANIMATOR; -import static com.android.server.wm.proto.WindowContainerProto.VISIBLE; +import static com.android.server.wm.WindowContainerProto.CONFIGURATION_CONTAINER; +import static com.android.server.wm.WindowContainerProto.ORIENTATION; +import static com.android.server.wm.WindowContainerProto.SURFACE_ANIMATOR; +import static com.android.server.wm.WindowContainerProto.VISIBLE; import android.annotation.CallSuper; import android.content.res.Configuration; @@ -987,7 +987,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< /** * Write to a protocol buffer output stream. Protocol buffer message definition is at - * {@link com.android.server.wm.proto.WindowContainerProto}. + * {@link com.android.server.wm.WindowContainerProto}. * * @param proto Stream to write the WindowContainer object to. * @param fieldId Field Id of the WindowContainer as defined in the parent message. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 5f0769d19b2c..a22bb0086ba1 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -97,15 +97,15 @@ import static com.android.server.wm.WindowManagerDebugConfig.SHOW_VERBOSE_TRANSA import static com.android.server.wm.WindowManagerDebugConfig.TAG_KEEP_SCREEN_ON; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.APP_TRANSITION; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.DISPLAY_FROZEN; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.FOCUSED_APP; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.FOCUSED_WINDOW; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.INPUT_METHOD_WINDOW; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.LAST_ORIENTATION; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.POLICY; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.ROOT_WINDOW_CONTAINER; -import static com.android.server.wm.proto.WindowManagerServiceDumpProto.ROTATION; +import static com.android.server.wm.WindowManagerServiceDumpProto.APP_TRANSITION; +import static com.android.server.wm.WindowManagerServiceDumpProto.DISPLAY_FROZEN; +import static com.android.server.wm.WindowManagerServiceDumpProto.FOCUSED_APP; +import static com.android.server.wm.WindowManagerServiceDumpProto.FOCUSED_WINDOW; +import static com.android.server.wm.WindowManagerServiceDumpProto.INPUT_METHOD_WINDOW; +import static com.android.server.wm.WindowManagerServiceDumpProto.LAST_ORIENTATION; +import static com.android.server.wm.WindowManagerServiceDumpProto.POLICY; +import static com.android.server.wm.WindowManagerServiceDumpProto.ROOT_WINDOW_CONTAINER; +import static com.android.server.wm.WindowManagerServiceDumpProto.ROTATION; import android.Manifest; import android.Manifest.permission; @@ -6179,7 +6179,7 @@ public class WindowManagerService extends IWindowManager.Stub /** * Write to a protocol buffer output stream. Protocol buffer message definition is at - * {@link com.android.server.wm.proto.WindowManagerServiceDumpProto}. + * {@link com.android.server.wm.WindowManagerServiceDumpProto}. * * @param proto Stream to write the WindowContainer object to. * @param trim If true, reduce the amount of data written. diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index eebf2fd1b356..54b4123e54ca 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -107,50 +107,50 @@ import static com.android.server.wm.WindowStateAnimator.COMMIT_DRAW_PENDING; import static com.android.server.wm.WindowStateAnimator.DRAW_PENDING; import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN; import static com.android.server.wm.WindowStateAnimator.READY_TO_SHOW; -import static com.android.server.wm.proto.IdentifierProto.HASH_CODE; -import static com.android.server.wm.proto.IdentifierProto.TITLE; -import static com.android.server.wm.proto.IdentifierProto.USER_ID; -import static com.android.server.wm.proto.AnimationSpecProto.MOVE; -import static com.android.server.wm.proto.MoveAnimationSpecProto.DURATION; -import static com.android.server.wm.proto.MoveAnimationSpecProto.FROM; -import static com.android.server.wm.proto.MoveAnimationSpecProto.TO; -import static com.android.server.wm.proto.WindowStateProto.ANIMATING_EXIT; -import static com.android.server.wm.proto.WindowStateProto.ANIMATOR; -import static com.android.server.wm.proto.WindowStateProto.ATTRIBUTES; -import static com.android.server.wm.proto.WindowStateProto.CHILD_WINDOWS; -import static com.android.server.wm.proto.WindowStateProto.CONTAINING_FRAME; -import static com.android.server.wm.proto.WindowStateProto.CONTENT_FRAME; -import static com.android.server.wm.proto.WindowStateProto.CONTENT_INSETS; -import static com.android.server.wm.proto.WindowStateProto.CUTOUT; -import static com.android.server.wm.proto.WindowStateProto.DECOR_FRAME; -import static com.android.server.wm.proto.WindowStateProto.DESTROYING; -import static com.android.server.wm.proto.WindowStateProto.DISPLAY_FRAME; -import static com.android.server.wm.proto.WindowStateProto.DISPLAY_ID; -import static com.android.server.wm.proto.WindowStateProto.FRAME; -import static com.android.server.wm.proto.WindowStateProto.GIVEN_CONTENT_INSETS; -import static com.android.server.wm.proto.WindowStateProto.HAS_SURFACE; -import static com.android.server.wm.proto.WindowStateProto.IDENTIFIER; -import static com.android.server.wm.proto.WindowStateProto.IS_ON_SCREEN; -import static com.android.server.wm.proto.WindowStateProto.IS_READY_FOR_DISPLAY; -import static com.android.server.wm.proto.WindowStateProto.IS_VISIBLE; -import static com.android.server.wm.proto.WindowStateProto.OUTSETS; -import static com.android.server.wm.proto.WindowStateProto.OUTSET_FRAME; -import static com.android.server.wm.proto.WindowStateProto.OVERSCAN_FRAME; -import static com.android.server.wm.proto.WindowStateProto.OVERSCAN_INSETS; -import static com.android.server.wm.proto.WindowStateProto.PARENT_FRAME; -import static com.android.server.wm.proto.WindowStateProto.REMOVED; -import static com.android.server.wm.proto.WindowStateProto.REMOVE_ON_EXIT; -import static com.android.server.wm.proto.WindowStateProto.REQUESTED_HEIGHT; -import static com.android.server.wm.proto.WindowStateProto.REQUESTED_WIDTH; -import static com.android.server.wm.proto.WindowStateProto.STABLE_INSETS; -import static com.android.server.wm.proto.WindowStateProto.STACK_ID; -import static com.android.server.wm.proto.WindowStateProto.SURFACE_INSETS; -import static com.android.server.wm.proto.WindowStateProto.SURFACE_POSITION; -import static com.android.server.wm.proto.WindowStateProto.SYSTEM_UI_VISIBILITY; -import static com.android.server.wm.proto.WindowStateProto.VIEW_VISIBILITY; -import static com.android.server.wm.proto.WindowStateProto.VISIBLE_FRAME; -import static com.android.server.wm.proto.WindowStateProto.VISIBLE_INSETS; -import static com.android.server.wm.proto.WindowStateProto.WINDOW_CONTAINER; +import static com.android.server.wm.IdentifierProto.HASH_CODE; +import static com.android.server.wm.IdentifierProto.TITLE; +import static com.android.server.wm.IdentifierProto.USER_ID; +import static com.android.server.wm.AnimationSpecProto.MOVE; +import static com.android.server.wm.MoveAnimationSpecProto.DURATION; +import static com.android.server.wm.MoveAnimationSpecProto.FROM; +import static com.android.server.wm.MoveAnimationSpecProto.TO; +import static com.android.server.wm.WindowStateProto.ANIMATING_EXIT; +import static com.android.server.wm.WindowStateProto.ANIMATOR; +import static com.android.server.wm.WindowStateProto.ATTRIBUTES; +import static com.android.server.wm.WindowStateProto.CHILD_WINDOWS; +import static com.android.server.wm.WindowStateProto.CONTAINING_FRAME; +import static com.android.server.wm.WindowStateProto.CONTENT_FRAME; +import static com.android.server.wm.WindowStateProto.CONTENT_INSETS; +import static com.android.server.wm.WindowStateProto.CUTOUT; +import static com.android.server.wm.WindowStateProto.DECOR_FRAME; +import static com.android.server.wm.WindowStateProto.DESTROYING; +import static com.android.server.wm.WindowStateProto.DISPLAY_FRAME; +import static com.android.server.wm.WindowStateProto.DISPLAY_ID; +import static com.android.server.wm.WindowStateProto.FRAME; +import static com.android.server.wm.WindowStateProto.GIVEN_CONTENT_INSETS; +import static com.android.server.wm.WindowStateProto.HAS_SURFACE; +import static com.android.server.wm.WindowStateProto.IDENTIFIER; +import static com.android.server.wm.WindowStateProto.IS_ON_SCREEN; +import static com.android.server.wm.WindowStateProto.IS_READY_FOR_DISPLAY; +import static com.android.server.wm.WindowStateProto.IS_VISIBLE; +import static com.android.server.wm.WindowStateProto.OUTSETS; +import static com.android.server.wm.WindowStateProto.OUTSET_FRAME; +import static com.android.server.wm.WindowStateProto.OVERSCAN_FRAME; +import static com.android.server.wm.WindowStateProto.OVERSCAN_INSETS; +import static com.android.server.wm.WindowStateProto.PARENT_FRAME; +import static com.android.server.wm.WindowStateProto.REMOVED; +import static com.android.server.wm.WindowStateProto.REMOVE_ON_EXIT; +import static com.android.server.wm.WindowStateProto.REQUESTED_HEIGHT; +import static com.android.server.wm.WindowStateProto.REQUESTED_WIDTH; +import static com.android.server.wm.WindowStateProto.STABLE_INSETS; +import static com.android.server.wm.WindowStateProto.STACK_ID; +import static com.android.server.wm.WindowStateProto.SURFACE_INSETS; +import static com.android.server.wm.WindowStateProto.SURFACE_POSITION; +import static com.android.server.wm.WindowStateProto.SYSTEM_UI_VISIBILITY; +import static com.android.server.wm.WindowStateProto.VIEW_VISIBILITY; +import static com.android.server.wm.WindowStateProto.VISIBLE_FRAME; +import static com.android.server.wm.WindowStateProto.VISIBLE_INSETS; +import static com.android.server.wm.WindowStateProto.WINDOW_CONTAINER; import android.annotation.CallSuper; import android.app.AppOpsManager; diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 0c2b0757df97..e92d460f2ec6 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -41,10 +41,10 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER; import static com.android.server.wm.WindowManagerService.logWithStack; import static com.android.server.wm.WindowSurfacePlacer.SET_ORIENTATION_CHANGE_COMPLETE; -import static com.android.server.wm.proto.WindowStateAnimatorProto.DRAW_STATE; -import static com.android.server.wm.proto.WindowStateAnimatorProto.LAST_CLIP_RECT; -import static com.android.server.wm.proto.WindowStateAnimatorProto.SURFACE; -import static com.android.server.wm.proto.WindowStateAnimatorProto.SYSTEM_DECOR_RECT; +import static com.android.server.wm.WindowStateAnimatorProto.DRAW_STATE; +import static com.android.server.wm.WindowStateAnimatorProto.LAST_CLIP_RECT; +import static com.android.server.wm.WindowStateAnimatorProto.SURFACE; +import static com.android.server.wm.WindowStateAnimatorProto.SYSTEM_DECOR_RECT; import android.content.Context; import android.graphics.Matrix; diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index f6c0a54c74ca..66c8cca8f0e0 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -25,8 +25,8 @@ import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACT import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import static com.android.server.wm.proto.WindowSurfaceControllerProto.LAYER; -import static com.android.server.wm.proto.WindowSurfaceControllerProto.SHOWN; +import static com.android.server.wm.WindowSurfaceControllerProto.LAYER; +import static com.android.server.wm.WindowSurfaceControllerProto.SHOWN; import android.graphics.Point; import android.graphics.PointF; diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index 172efdcb22ac..f727296ef98a 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -23,12 +23,12 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEME import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL; -import static com.android.server.wm.proto.WindowTokenProto.HASH_CODE; -import static com.android.server.wm.proto.WindowTokenProto.HIDDEN; -import static com.android.server.wm.proto.WindowTokenProto.PAUSED; -import static com.android.server.wm.proto.WindowTokenProto.WAITING_TO_SHOW; -import static com.android.server.wm.proto.WindowTokenProto.WINDOWS; -import static com.android.server.wm.proto.WindowTokenProto.WINDOW_CONTAINER; +import static com.android.server.wm.WindowTokenProto.HASH_CODE; +import static com.android.server.wm.WindowTokenProto.HIDDEN; +import static com.android.server.wm.WindowTokenProto.PAUSED; +import static com.android.server.wm.WindowTokenProto.WAITING_TO_SHOW; +import static com.android.server.wm.WindowTokenProto.WINDOWS; +import static com.android.server.wm.WindowTokenProto.WINDOW_CONTAINER; import android.annotation.CallSuper; import android.os.Debug; diff --git a/services/core/java/com/android/server/wm/WindowTracing.java b/services/core/java/com/android/server/wm/WindowTracing.java index a29978154a92..8fa56bb065c6 100644 --- a/services/core/java/com/android/server/wm/WindowTracing.java +++ b/services/core/java/com/android/server/wm/WindowTracing.java @@ -17,13 +17,13 @@ package com.android.server.wm; import static android.os.Build.IS_USER; -import static com.android.server.wm.proto.WindowManagerTraceFileProto.ENTRY; -import static com.android.server.wm.proto.WindowManagerTraceFileProto.MAGIC_NUMBER; -import static com.android.server.wm.proto.WindowManagerTraceFileProto.MAGIC_NUMBER_H; -import static com.android.server.wm.proto.WindowManagerTraceFileProto.MAGIC_NUMBER_L; -import static com.android.server.wm.proto.WindowManagerTraceProto.ELAPSED_REALTIME_NANOS; -import static com.android.server.wm.proto.WindowManagerTraceProto.WHERE; -import static com.android.server.wm.proto.WindowManagerTraceProto.WINDOW_MANAGER_SERVICE; +import static com.android.server.wm.WindowManagerTraceFileProto.ENTRY; +import static com.android.server.wm.WindowManagerTraceFileProto.MAGIC_NUMBER; +import static com.android.server.wm.WindowManagerTraceFileProto.MAGIC_NUMBER_H; +import static com.android.server.wm.WindowManagerTraceFileProto.MAGIC_NUMBER_L; +import static com.android.server.wm.WindowManagerTraceProto.ELAPSED_REALTIME_NANOS; +import static com.android.server.wm.WindowManagerTraceProto.WHERE; +import static com.android.server.wm.WindowManagerTraceProto.WINDOW_MANAGER_SERVICE; import android.content.Context; import android.os.ShellCommand; diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java b/services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java index a3ade1ea754c..50852548f525 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowTracingTest.java @@ -36,7 +36,7 @@ import android.support.test.runner.AndroidJUnit4; import android.util.proto.ProtoOutputStream; import com.android.internal.util.Preconditions; -import com.android.server.wm.proto.WindowManagerTraceProto; +import com.android.server.wm.WindowManagerTraceProto; import org.junit.After; import org.junit.Before; |