diff options
8 files changed, 31 insertions, 9 deletions
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index aac57fe88b17..c28bab7f643f 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -609,7 +609,7 @@ public class UsbManager { public @interface UsbFunctionMode {} /** @hide */ - @IntDef(flag = true, prefix = { "GADGET_HAL_" }, value = { + @IntDef(prefix = { "GADGET_HAL_" }, value = { GADGET_HAL_NOT_SUPPORTED, GADGET_HAL_V1_0, GADGET_HAL_V1_1, diff --git a/core/java/android/hardware/usb/UsbPortStatus.java b/core/java/android/hardware/usb/UsbPortStatus.java index 43c418e2cb26..bb7aff651b3d 100644 --- a/core/java/android/hardware/usb/UsbPortStatus.java +++ b/core/java/android/hardware/usb/UsbPortStatus.java @@ -202,7 +202,7 @@ public final class UsbPortStatus implements Parcelable { public static final int CONTAMINANT_PROTECTION_DISABLED = android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.DISABLED; - @IntDef(prefix = { "CONTAMINANT_DETECION_" }, flag = true, value = { + @IntDef(prefix = { "CONTAMINANT_DETECTION_" }, value = { CONTAMINANT_DETECTION_NOT_SUPPORTED, CONTAMINANT_DETECTION_DISABLED, CONTAMINANT_DETECTION_NOT_DETECTED, @@ -221,7 +221,7 @@ public final class UsbPortStatus implements Parcelable { @Retention(RetentionPolicy.SOURCE) @interface ContaminantProtectionStatus{} - @IntDef(prefix = { "MODE_" }, flag = true, value = { + @IntDef(prefix = { "MODE_" }, value = { MODE_NONE, MODE_DFP, MODE_UFP, diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml b/libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml index 101b5bf27c77..1054c4345891 100644 --- a/libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml +++ b/libs/WindowManager/Shell/tests/flicker/AndroidManifest.xml @@ -21,6 +21,8 @@ <!-- Read and write traces from external storage --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <!-- Allow the test to write directly to /sdcard/ --> + <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> <!-- Write secure settings --> <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <!-- Capture screen contents --> @@ -38,7 +40,8 @@ <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL"/> <!-- ATM.removeRootTasksWithActivityTypes() --> <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS" /> - <application> + <!-- Allow the test to write directly to /sdcard/ --> + <application android:requestLegacyExternalStorage="true"> <uses-library android:name="android.test.runner"/> <service android:name=".NotificationListener" diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTestPhysicalDevices.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTestPhysicalDevices.xml index 9dd9f42bdf81..23d7021baffb 100644 --- a/libs/WindowManager/Shell/tests/flicker/AndroidTestPhysicalDevices.xml +++ b/libs/WindowManager/Shell/tests/flicker/AndroidTestPhysicalDevices.xml @@ -34,7 +34,7 @@ <option name="hidden-api-checks" value="false" /> </test> <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> - <option name="directory-keys" value="/storage/emulated/0/Android/data/com.android.wm.shell.flicker/files" /> + <option name="directory-keys" value="/sdcard/flicker" /> <option name="collect-on-run-ended-only" value="true" /> <option name="clean-up" value="true" /> </metrics_collector> diff --git a/libs/WindowManager/Shell/tests/flicker/AndroidTestVirtualDevices.xml b/libs/WindowManager/Shell/tests/flicker/AndroidTestVirtualDevices.xml index afb1166415fc..073860875004 100644 --- a/libs/WindowManager/Shell/tests/flicker/AndroidTestVirtualDevices.xml +++ b/libs/WindowManager/Shell/tests/flicker/AndroidTestVirtualDevices.xml @@ -34,7 +34,7 @@ <option name="hidden-api-checks" value="false" /> </test> <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector"> - <option name="directory-keys" value="/storage/emulated/0/Android/data/com.android.wm.shell.flicker/files" /> + <option name="directory-keys" value="/sdcard/flicker" /> <option name="collect-on-run-ended-only" value="true" /> <option name="clean-up" value="true" /> </metrics_collector> diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java index e9bb7f8d6cb8..1da41fb87b40 100644 --- a/media/java/android/media/session/MediaController.java +++ b/media/java/android/media/session/MediaController.java @@ -46,6 +46,8 @@ import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; +import com.android.internal.annotations.VisibleForTesting; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.ref.WeakReference; @@ -437,7 +439,7 @@ public final class MediaController { } if (mSessionInfo == null) { - Log.w(TAG, "sessionInfo shouldn't be null."); + Log.d(TAG, "sessionInfo is not set."); mSessionInfo = Bundle.EMPTY; } else if (MediaSession.hasCustomParcelable(mSessionInfo)) { Log.w(TAG, "sessionInfo contains custom parcelable. Ignoring."); @@ -514,6 +516,17 @@ public final class MediaController { return success; } + /** + * Gets associated handler for the given callback. + * @hide + */ + @VisibleForTesting + public Handler getHandlerForCallback(Callback cb) { + synchronized (mLock) { + return getHandlerForCallbackLocked(cb); + } + } + private MessageHandler getHandlerForCallbackLocked(Callback cb) { if (cb == null) { throw new IllegalArgumentException("Callback cannot be null"); diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 2e55e92a4dcd..743796b0aad0 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -925,8 +925,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (mVoiceInteraction) { pw.println(prefix + "mVoiceInteraction=true"); } - pw.print(prefix); pw.print("mOccludesParent="); pw.print(mOccludesParent); - pw.print(" mOrientation="); pw.println(mOrientation); + pw.print(prefix); pw.print("mOccludesParent="); pw.println(mOccludesParent); + pw.print(prefix); pw.print("mOrientation="); + pw.println(ActivityInfo.screenOrientationToString(mOrientation)); pw.println(prefix + "mVisibleRequested=" + mVisibleRequested + " mVisible=" + mVisible + " mClientVisible=" + mClientVisible + ((mDeferHidingClient) ? " mDeferHidingClient=" + mDeferHidingClient : "") @@ -1011,6 +1012,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A if (info.supportsSizeChanges) { pw.println(prefix + "supportsSizeChanges=true"); } + if (info.configChanges != 0) { + pw.println(prefix + "configChanges=0x" + Integer.toHexString(info.configChanges)); + } } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 0c584f4973e8..5aef314e0caf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -16,6 +16,7 @@ package com.android.server.wm.flicker.launch +import androidx.test.filters.FlakyTest import android.view.Surface import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry @@ -53,6 +54,7 @@ import org.junit.runners.Parameterized @RequiresDevice @RunWith(Parameterized::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@FlakyTest(bugId = 174658929) class OpenAppFromOverviewTest( testName: String, flickerSpec: Flicker |