Merge "Improve WMP dumpsys readability." (096a47d5) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -10071,6 +10071,27 @@ public class Intent implements Parcelable, Cloneable {
		return false;
		}

		/**
		* Convert the dock state to a human readable format.
		* @hide
		*/
		public static String dockStateToString(int dock) {
		switch (dock) {
		case EXTRA_DOCK_STATE_HE_DESK:
		return "EXTRA_DOCK_STATE_HE_DESK";
		case EXTRA_DOCK_STATE_LE_DESK:
		return "EXTRA_DOCK_STATE_LE_DESK";
		case EXTRA_DOCK_STATE_CAR:
		return "EXTRA_DOCK_STATE_CAR";
		case EXTRA_DOCK_STATE_DESK:
		return "EXTRA_DOCK_STATE_DESK";
		case EXTRA_DOCK_STATE_UNDOCKED:
		return "EXTRA_DOCK_STATE_UNDOCKED";
		default:
		return Integer.toString(dock);
		}
		}

		private static ClipData.Item makeClipItem(ArrayList<Uri> streams, ArrayList<CharSequence> texts,
		ArrayList<String> htmlTexts, int which) {
		Uri uri = streams != null ? streams.get(which) : null;

core/java/android/content/pm/ActivityInfo.java

+46 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,7 @@ import java.lang.annotation.RetentionPolicy;
		* from the AndroidManifest.xml's <activity> and
		* <receiver> tags.
		*/
		public class ActivityInfo extends ComponentInfo
		implements Parcelable {
		public class ActivityInfo extends ComponentInfo implements Parcelable {

		// NOTE: When adding new data members be sure to update the copy-constructor, Parcel
		// constructor, and writeToParcel.
		@@ -1211,6 +1210,51 @@ public class ActivityInfo extends ComponentInfo
		return isFloating \|\| isTranslucent \|\| isSwipeToDismiss;
		}

		/**
		* Convert the screen orientation constant to a human readable format.
		* @hide
		*/
		public static String screenOrientationToString(int orientation) {
		switch(orientation) {
		case SCREEN_ORIENTATION_UNSET:
		return "SCREEN_ORIENTATION_UNSET";
		case SCREEN_ORIENTATION_UNSPECIFIED:
		return "SCREEN_ORIENTATION_UNSPECIFIED";
		case SCREEN_ORIENTATION_LANDSCAPE:
		return "SCREEN_ORIENTATION_LANDSCAPE";
		case SCREEN_ORIENTATION_PORTRAIT:
		return "SCREEN_ORIENTATION_PORTRAIT";
		case SCREEN_ORIENTATION_USER:
		return "SCREEN_ORIENTATION_USER";
		case SCREEN_ORIENTATION_BEHIND:
		return "SCREEN_ORIENTATION_BEHIND";
		case SCREEN_ORIENTATION_SENSOR:
		return "SCREEN_ORIENTATION_SENSOR";
		case SCREEN_ORIENTATION_NOSENSOR:
		return "SCREEN_ORIENTATION_NOSENSOR";
		case SCREEN_ORIENTATION_SENSOR_LANDSCAPE:
		return "SCREEN_ORIENTATION_SENSOR_LANDSCAPE";
		case SCREEN_ORIENTATION_SENSOR_PORTRAIT:
		return "SCREEN_ORIENTATION_SENSOR_PORTRAIT";
		case SCREEN_ORIENTATION_REVERSE_LANDSCAPE:
		return "SCREEN_ORIENTATION_REVERSE_LANDSCAPE";
		case SCREEN_ORIENTATION_REVERSE_PORTRAIT:
		return "SCREEN_ORIENTATION_REVERSE_PORTRAIT";
		case SCREEN_ORIENTATION_FULL_SENSOR:
		return "SCREEN_ORIENTATION_FULL_SENSOR";
		case SCREEN_ORIENTATION_USER_LANDSCAPE:
		return "SCREEN_ORIENTATION_USER_LANDSCAPE";
		case SCREEN_ORIENTATION_USER_PORTRAIT:
		return "SCREEN_ORIENTATION_USER_PORTRAIT";
		case SCREEN_ORIENTATION_FULL_USER:
		return "SCREEN_ORIENTATION_FULL_USER";
		case SCREEN_ORIENTATION_LOCKED:
		return "SCREEN_ORIENTATION_LOCKED";
		default:
		return Integer.toString(orientation);
		}
		}

		public static final Parcelable.Creator<ActivityInfo> CREATOR
		= new Parcelable.Creator<ActivityInfo>() {
		public ActivityInfo createFromParcel(Parcel source) {

core/java/android/content/res/Configuration.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -1088,6 +1088,33 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		protoOutputStream.end(token);
		}

		/**
		* Convert the UI mode to a human readable format.
		* @hide
		*/
		public static String uiModeToString(int uiMode) {
		switch (uiMode) {
		case UI_MODE_TYPE_UNDEFINED:
		return "UI_MODE_TYPE_UNDEFINED";
		case UI_MODE_TYPE_NORMAL:
		return "UI_MODE_TYPE_NORMAL";
		case UI_MODE_TYPE_DESK:
		return "UI_MODE_TYPE_DESK";
		case UI_MODE_TYPE_CAR:
		return "UI_MODE_TYPE_CAR";
		case UI_MODE_TYPE_TELEVISION:
		return "UI_MODE_TYPE_TELEVISION";
		case UI_MODE_TYPE_APPLIANCE:
		return "UI_MODE_TYPE_APPLIANCE";
		case UI_MODE_TYPE_WATCH:
		return "UI_MODE_TYPE_WATCH";
		case UI_MODE_TYPE_VR_HEADSET:
		return "UI_MODE_TYPE_VR_HEADSET";
		default:
		return Integer.toString(uiMode);
		}
		}

		/**
		* Set this object to the system defaults.
		*/

core/java/android/view/Surface.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -762,7 +762,7 @@ public class Surface implements Parcelable {
		return "ROTATION_270";
		}
		default: {
		throw new IllegalArgumentException("Invalid rotation: " + rotation);
		return Integer.toString(rotation);
		}
		}
		}

core/java/android/view/WindowManagerPolicy.java

+62 −0

Original line number	Diff line number	Diff line
		@@ -617,6 +617,38 @@ public interface WindowManagerPolicy {
		* @param listener callback to call when display can be turned off
		*/
		void screenTurningOff(ScreenOffListener listener);

		/**
		* Convert the lid state to a human readable format.
		*/
		static String lidStateToString(int lid) {
		switch (lid) {
		case LID_ABSENT:
		return "LID_ABSENT";
		case LID_CLOSED:
		return "LID_CLOSED";
		case LID_OPEN:
		return "LID_OPEN";
		default:
		return Integer.toString(lid);
		}
		}

		/**
		* Convert the camera lens state to a human readable format.
		*/
		static String cameraLensStateToString(int lens) {
		switch (lens) {
		case CAMERA_LENS_COVER_ABSENT:
		return "CAMERA_LENS_COVER_ABSENT";
		case CAMERA_LENS_UNCOVERED:
		return "CAMERA_LENS_UNCOVERED";
		case CAMERA_LENS_COVERED:
		return "CAMERA_LENS_COVERED";
		default:
		return Integer.toString(lens);
		}
		}
		}

		public interface PointerEventListener {
		@@ -1750,4 +1782,34 @@ public interface WindowManagerPolicy {
		* @return true if ready; false otherwise.
		*/
		boolean canDismissBootAnimation();

		/**
		* Convert the user rotation mode to a human readable format.
		*/
		static String userRotationModeToString(int mode) {
		switch(mode) {
		case USER_ROTATION_FREE:
		return "USER_ROTATION_FREE";
		case USER_ROTATION_LOCKED:
		return "USER_ROTATION_LOCKED";
		default:
		return Integer.toString(mode);
		}
		}

		/**
		* Convert the off reason to a human readable format.
		*/
		static String offReasonToString(int why) {
		switch (why) {
		case OFF_BECAUSE_OF_ADMIN:
		return "OFF_BECAUSE_OF_ADMIN";
		case OFF_BECAUSE_OF_USER:
		return "OFF_BECAUSE_OF_USER";
		case OFF_BECAUSE_OF_TIMEOUT:
		return "OFF_BECAUSE_OF_TIMEOUT";
		default:
		return Integer.toString(why);
		}
		}
		}