Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Move DEVICE_ID_DEFAULT from VDM to Context""

Browse Source
This commit is contained in:
Jack Diver
2023-01-23 10:45:06 +00:00
committed by Android (Google) Code Review
parent ce6bbba5e8 4f2f43de4c
commit 7fa9ea2834
20 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -9338,6 +9338,8 @@ package android.companion.virtual {
public final class VirtualDeviceManager {
method @NonNull public java.util.List<android.companion.virtual.VirtualDevice> getVirtualDevices();
field public static final int DEVICE_ID_DEFAULT = 0; // 0x0
field public static final int DEVICE_ID_INVALID = -1; // 0xffffffff
}
}
@@ -10104,8 +10106,6 @@ package android.content {
field public static final int CONTEXT_RESTRICTED = 4; // 0x4
field public static final String CREDENTIAL_SERVICE = "credential";
field public static final String CROSS_PROFILE_APPS_SERVICE = "crossprofileapps";
field public static final int DEVICE_ID_DEFAULT = 0; // 0x0
field public static final int DEVICE_ID_INVALID = -1; // 0xffffffff
field public static final String DEVICE_LOCK_SERVICE = "device_lock";
field public static final String DEVICE_POLICY_SERVICE = "device_policy";
field public static final String DISPLAY_HASH_SERVICE = "display_hash";

4
core/java/android/app/ActivityThread.java
View File

@@ -4575,7 +4575,7 @@ public final class ActivityThread extends ClientTransactionHandler
ActivityManager.getService());
if (!service.isUiContext()) { // WindowProviderService is a UI Context.
VirtualDeviceManager vdm = context.getSystemService(VirtualDeviceManager.class);
if (mLastReportedDeviceId == Context.DEVICE_ID_DEFAULT
if (mLastReportedDeviceId == VirtualDeviceManager.DEVICE_ID_DEFAULT
|| vdm.isValidVirtualDeviceId(mLastReportedDeviceId)) {
service.updateDeviceId(mLastReportedDeviceId);
}
@@ -6103,7 +6103,7 @@ public final class ActivityThread extends ClientTransactionHandler
private void updateDeviceIdForNonUIContexts(int deviceId) {
// Invalid device id is treated as a no-op.
if (deviceId == Context.DEVICE_ID_INVALID) {
if (deviceId == VirtualDeviceManager.DEVICE_ID_INVALID) {
return;
}
if (deviceId == mLastReportedDeviceId) {

6
core/java/android/app/ContextImpl.java
View File

@@ -244,7 +244,7 @@ class ContextImpl extends Context {
@UnsupportedAppUsage
private @NonNull Resources mResources;
private @Nullable Display mDisplay; // may be null if invalid display or not initialized yet.
private int mDeviceId = Context.DEVICE_ID_DEFAULT;
private int mDeviceId = VirtualDeviceManager.DEVICE_ID_DEFAULT;
/**
* If set to {@code true} the resources for this context will be configured for mDisplay which
@@ -2756,7 +2756,7 @@ class ContextImpl extends Context {
@Override
public @NonNull Context createDeviceContext(int deviceId) {
if (deviceId != Context.DEVICE_ID_DEFAULT) {
if (deviceId != VirtualDeviceManager.DEVICE_ID_DEFAULT) {
VirtualDeviceManager vdm = getSystemService(VirtualDeviceManager.class);
if (!vdm.isValidVirtualDeviceId(deviceId)) {
throw new IllegalArgumentException(
@@ -3036,7 +3036,7 @@ class ContextImpl extends Context {
@Override
public void updateDeviceId(int updatedDeviceId) {
if (updatedDeviceId != Context.DEVICE_ID_DEFAULT) {
if (updatedDeviceId != VirtualDeviceManager.DEVICE_ID_DEFAULT) {
VirtualDeviceManager vdm = getSystemService(VirtualDeviceManager.class);
if (!vdm.isValidVirtualDeviceId(updatedDeviceId)) {
throw new IllegalArgumentException(

5
core/java/android/companion/virtual/VirtualDevice.java
View File

@@ -18,7 +18,6 @@ package android.companion.virtual;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
@@ -39,9 +38,9 @@ public final class VirtualDevice implements Parcelable {
* @hide
*/
public VirtualDevice(int id, @Nullable String name) {
if (id <= Context.DEVICE_ID_DEFAULT) {
if (id <= VirtualDeviceManager.DEVICE_ID_DEFAULT) {
throw new IllegalArgumentException("VirtualDevice ID mist be greater than "
+ Context.DEVICE_ID_DEFAULT);
+ VirtualDeviceManager.DEVICE_ID_DEFAULT);
}
mId = id;
mName = name;

14
core/java/android/companion/virtual/VirtualDeviceManager.java
View File

@@ -97,6 +97,16 @@ public final class VirtualDeviceManager {
| DisplayManager.VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH
| DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_FOCUS;
/**
* The default device ID, which is the ID of the primary (non-virtual) device.
*/
public static final int DEVICE_ID_DEFAULT = 0;
/**
* Invalid device ID.
*/
public static final int DEVICE_ID_INVALID = -1;
/**
* Broadcast Action: A Virtual Device was removed.
*
@@ -240,7 +250,7 @@ public final class VirtualDeviceManager {
public int getDeviceIdForDisplayId(int displayId) {
if (mService == null) {
Log.w(TAG, "Failed to retrieve virtual devices; no virtual device manager service.");
return Context.DEVICE_ID_DEFAULT;
return DEVICE_ID_DEFAULT;
}
try {
return mService.getDeviceIdForDisplayId(displayId);
@@ -251,7 +261,7 @@ public final class VirtualDeviceManager {
/**
* Checks whether the passed {@code deviceId} is a valid virtual device ID or not.
* {@link Context#DEVICE_ID_DEFAULT} is not valid as it is the ID of the default
* {@link VirtualDeviceManager#DEVICE_ID_DEFAULT} is not valid as it is the ID of the default
* device which is not a virtual device. {@code deviceId} must correspond to a virtual device
* created by {@link VirtualDeviceManager#createVirtualDevice(int, VirtualDeviceParams)}.
*

13
core/java/android/content/Context.java
View File

@@ -134,15 +134,6 @@ public abstract class Context {
@VisibleForTesting
public static final long OVERRIDABLE_COMPONENT_CALLBACKS = 193247900L;
/**
* The default device ID, which is the ID of the primary (non-virtual) device.
*/
public static final int DEVICE_ID_DEFAULT = 0;
/**
* Invalid device ID.
*/
public static final int DEVICE_ID_INVALID = -1;
/** @hide */
@IntDef(flag = true, prefix = { "MODE_" }, value = {
MODE_PRIVATE,
@@ -6993,7 +6984,7 @@ public abstract class Context {
* <p>
* Applications that run on virtual devices may use this method to access the default device
* capabilities and functionality (by passing
* {@link Context#DEVICE_ID_DEFAULT}. Similarly,
* {@link android.companion.virtual.VirtualDeviceManager#DEVICE_ID_DEFAULT}. Similarly,
* applications running on the default device may access the functionality of virtual devices.
* </p>
* <p>
@@ -7361,7 +7352,7 @@ public abstract class Context {
* determine whether they are running on a virtual device and identify that device.
*
* The device ID of the host device is
* {@link Context#DEVICE_ID_DEFAULT}
* {@link android.companion.virtual.VirtualDeviceManager#DEVICE_ID_DEFAULT}
*
* <p>
* If the underlying device ID is changed by the system, for example, when an

2
core/java/android/hardware/SystemSensorManager.java
View File

@@ -17,10 +17,10 @@
package android.hardware;
import static android.companion.virtual.VirtualDeviceManager.ACTION_VIRTUAL_DEVICE_REMOVED;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceManager.EXTRA_VIRTUAL_DEVICE_ID;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import android.companion.virtual.VirtualDeviceManager;

2
core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
View File

@@ -16,7 +16,7 @@
package android.app.activity;
import static android.content.Context.DEVICE_ID_INVALID;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_INVALID;
import static android.content.Intent.ACTION_EDIT;
import static android.content.Intent.ACTION_VIEW;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

2
core/tests/coretests/src/android/content/ContextTest.java
View File

@@ -16,7 +16,7 @@
package android.content;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;
import static android.view.Display.DEFAULT_DISPLAY;

2
media/java/android/media/AudioManager.java
View File

@@ -16,9 +16,9 @@
package android.media;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
import static android.content.Context.DEVICE_ID_DEFAULT;
import android.annotation.CallbackExecutor;
import android.annotation.IntDef;

2
media/java/android/media/AudioRecord.java
View File

@@ -16,9 +16,9 @@
package android.media;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.media.AudioManager.AUDIO_SESSION_ID_GENERATE;
import android.annotation.CallbackExecutor;

2
media/java/android/media/PlayerBase.java
View File

@@ -16,9 +16,9 @@
package android.media;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.media.AudioManager.AUDIO_SESSION_ID_GENERATE;
import android.annotation.NonNull;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/AudioManagerUnitTest.java
View File

@@ -17,10 +17,10 @@
package com.android.mediaframeworktest.unit;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.media.AudioManager.FX_KEY_CLICK;
import static org.mockito.ArgumentMatchers.anyInt;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/AudioRecordUnitTest.java
View File

@@ -16,10 +16,10 @@
package com.android.mediaframeworktest.unit;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.media.AudioManager.AUDIO_SESSION_ID_GENERATE;
import static org.junit.Assert.assertEquals;

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/AudioTrackUnitTest.java
View File

@@ -16,10 +16,10 @@
package com.android.mediaframeworktest.unit;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_AUDIO;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.media.AudioManager.AUDIO_SESSION_ID_GENERATE;
import static org.junit.Assert.assertEquals;

6
services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java
View File

@@ -85,7 +85,7 @@ public class VirtualDeviceManagerService extends SystemService {
private final PendingTrampolineMap mPendingTrampolines = new PendingTrampolineMap(mHandler);
private static AtomicInteger sNextUniqueIndex = new AtomicInteger(
Context.DEVICE_ID_DEFAULT + 1);
VirtualDeviceManager.DEVICE_ID_DEFAULT + 1);
/**
* Mapping from device IDs to virtual devices.
@@ -332,7 +332,7 @@ public class VirtualDeviceManagerService extends SystemService {
@Override // Binder call
public int getDeviceIdForDisplayId(int displayId) {
if (displayId == Display.INVALID_DISPLAY || displayId == Display.DEFAULT_DISPLAY) {
return Context.DEVICE_ID_DEFAULT;
return VirtualDeviceManager.DEVICE_ID_DEFAULT;
}
synchronized (mVirtualDeviceManagerLock) {
for (int i = 0; i < mVirtualDevices.size(); i++) {
@@ -342,7 +342,7 @@ public class VirtualDeviceManagerService extends SystemService {
}
}
}
return Context.DEVICE_ID_DEFAULT;
return VirtualDeviceManager.DEVICE_ID_DEFAULT;
}
// Binder call

3
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

@@ -103,7 +103,6 @@ import android.app.servertransaction.PauseActivityItem;
import android.app.servertransaction.ResumeActivityItem;
import android.companion.virtual.VirtualDeviceManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
@@ -1229,7 +1228,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
int getDeviceIdForDisplayId(int displayId) {
if (displayId == DEFAULT_DISPLAY || displayId == INVALID_DISPLAY) {
return Context.DEVICE_ID_DEFAULT;
return VirtualDeviceManager.DEVICE_ID_DEFAULT;
}
if (mVirtualDeviceManager == null) {
mVirtualDeviceManager =

7
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -54,6 +54,7 @@ import android.app.BackgroundStartPrivileges;
import android.app.IApplicationThread;
import android.app.ProfilerInfo;
import android.app.servertransaction.ConfigurationChangeItem;
import android.companion.virtual.VirtualDeviceManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -210,7 +211,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
/** Whether {@link #mLastReportedConfiguration} is deferred by the cached state. */
private volatile boolean mHasCachedConfiguration;
private int mTopActivityDeviceId = Context.DEVICE_ID_DEFAULT;
private int mTopActivityDeviceId = VirtualDeviceManager.DEVICE_ID_DEFAULT;
/**
* Registered {@link DisplayArea} as a listener to override config changes. {@code null} if not
* registered.
@@ -1434,7 +1435,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
// TODO(b/263402938): Add tests that capture the deviceId dispatch to the client.
mTopActivityDeviceId = deviceId;
dispatchConfiguration(config, topActivityDeviceChanged ? mTopActivityDeviceId
: Context.DEVICE_ID_INVALID);
: VirtualDeviceManager.DEVICE_ID_INVALID);
}
private int getTopActivityDeviceId() {
@@ -1519,7 +1520,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
private void scheduleConfigurationChange(IApplicationThread thread, Configuration config) {
// By default send invalid deviceId as no-op signal so it's not updated on the client side.
scheduleConfigurationChange(thread, config, Context.DEVICE_ID_INVALID);
scheduleConfigurationChange(thread, config, VirtualDeviceManager.DEVICE_ID_INVALID);
}
private void scheduleConfigurationChange(IApplicationThread thread, Configuration config,

4
services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java
View File

@@ -16,11 +16,11 @@
package com.android.server.companion.virtual;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_INVALID;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;
import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.content.Context.DEVICE_ID_INVALID;
import static android.content.Intent.ACTION_VIEW;
import static android.content.pm.ActivityInfo.FLAG_CAN_DISPLAY_ON_REMOTE_DEVICES;

4
services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceTest.java
View File

@@ -16,8 +16,8 @@
package com.android.server.companion.virtual;
import static android.content.Context.DEVICE_ID_DEFAULT;
import static android.content.Context.DEVICE_ID_INVALID;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_DEFAULT;
import static android.companion.virtual.VirtualDeviceManager.DEVICE_ID_INVALID;
import static com.google.common.truth.Truth.assertThat;