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

Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev

Browse Source 
am: 1d01f9cf67

Change-Id: I4072d3d1ccd258473ccc35412dd3b002e0239f2d
This commit is contained in:
Karthik Ravi Shankar
2017-05-04 05:23:42 +00:00
committed by android-build-merger
parent 381f8a97f9 1d01f9cf67
commit c4d7248cdd
11 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmds/vr/src/com/android/commands/vr/Vr.java
View File

@@ -16,7 +16,7 @@
package com.android.commands.vr;
import android.app.CompatibilityDisplayProperties;
import android.app.Vr2dDisplayProperties;
import android.content.Context;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -39,7 +39,7 @@ public final class Vr extends BaseCommand {
private static final String COMMAND_SET_PERSISTENT_VR_MODE_ENABLED =
"set-persistent-vr-mode-enabled";
private static final String COMMAND_SET_COMPATIBILITY_DISPLAY_PROPERTIES =
private static final String COMMAND_SET_VR2D_DISPLAY_PROPERTIES =
"set-display-props";
private IVrManager mVrService;
@@ -63,8 +63,8 @@ public final class Vr extends BaseCommand {
String command = nextArgRequired();
switch (command) {
case COMMAND_SET_COMPATIBILITY_DISPLAY_PROPERTIES:
runSetCompatibilityDisplayProperties();
case COMMAND_SET_VR2D_DISPLAY_PROPERTIES:
runSetVr2dDisplayProperties();
break;
case COMMAND_SET_PERSISTENT_VR_MODE_ENABLED:
runSetPersistentVrModeEnabled();
@@ -74,7 +74,7 @@ public final class Vr extends BaseCommand {
}
}
private void runSetCompatibilityDisplayProperties() throws RemoteException {
private void runSetVr2dDisplayProperties() throws RemoteException {
String widthStr = nextArgRequired();
int width = Integer.parseInt(widthStr);
@@ -84,11 +84,11 @@ public final class Vr extends BaseCommand {
String dpiStr = nextArgRequired();
int dpi = Integer.parseInt(dpiStr);
CompatibilityDisplayProperties compatDisplayProperties =
new CompatibilityDisplayProperties(width, height, dpi);
Vr2dDisplayProperties vr2dDisplayProperties =
new Vr2dDisplayProperties(width, height, dpi);
try {
mVrService.setCompatibilityDisplayProperties(compatDisplayProperties);
mVrService.setVr2dDisplayProperties(vr2dDisplayProperties);
} catch (RemoteException re) {
System.err.println("Error: Can't set persistent mode " + re);
}

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

@@ -244,8 +244,8 @@ public abstract class ActivityManagerInternal {
/**
* Called after virtual display Id is updated by
* {@link com.android.server.vr.CompatibilityDisplay} with a specific
* {@param compatibilityDisplayId}.
* {@link com.android.server.vr.Vr2dDisplay} with a specific
* {@param vr2dDisplayId}.
*/
public abstract void setVrCompatibilityDisplayId(int vrCompatibilityDisplayId);
public abstract void setVr2dDisplayId(int vr2dDisplayId);
}

2
core/java/android/app/CompatibilityDisplayProperties.aidl → core/java/android/app/Vr2dDisplayProperties.aidl
View File

@@ -17,4 +17,4 @@
package android.app;
/** @hide */
parcelable CompatibilityDisplayProperties;
parcelable Vr2dDisplayProperties;

24
core/java/android/app/CompatibilityDisplayProperties.java → core/java/android/app/Vr2dDisplayProperties.java
View File

@@ -27,7 +27,7 @@ import java.io.PrintWriter;
*
* @hide
*/
public class CompatibilityDisplayProperties implements Parcelable {
public class Vr2dDisplayProperties implements Parcelable {
/**
* The actual width, height and dpi.
@@ -36,7 +36,7 @@ public class CompatibilityDisplayProperties implements Parcelable {
private final int mHeight;
private final int mDpi;
public CompatibilityDisplayProperties(int width, int height, int dpi) {
public Vr2dDisplayProperties(int width, int height, int dpi) {
mWidth = width;
mHeight = height;
mDpi = dpi;
@@ -52,7 +52,7 @@ public class CompatibilityDisplayProperties implements Parcelable {
@Override
public String toString() {
return "CompatibilityDisplayProperties{" +
return "Vr2dDisplayProperties{" +
"mWidth=" + mWidth +
", mHeight=" + mHeight +
", mDpi=" + mDpi +
@@ -64,7 +64,7 @@ public class CompatibilityDisplayProperties implements Parcelable {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
CompatibilityDisplayProperties that = (CompatibilityDisplayProperties) o;
Vr2dDisplayProperties that = (Vr2dDisplayProperties) o;
if (getWidth() != that.getWidth()) return false;
if (getHeight() != that.getHeight()) return false;
@@ -83,27 +83,27 @@ public class CompatibilityDisplayProperties implements Parcelable {
dest.writeInt(mDpi);
}
public static final Parcelable.Creator<CompatibilityDisplayProperties> CREATOR
= new Parcelable.Creator<CompatibilityDisplayProperties>() {
public static final Parcelable.Creator<Vr2dDisplayProperties> CREATOR
= new Parcelable.Creator<Vr2dDisplayProperties>() {
@Override
public CompatibilityDisplayProperties createFromParcel(Parcel source) {
return new CompatibilityDisplayProperties(source);
public Vr2dDisplayProperties createFromParcel(Parcel source) {
return new Vr2dDisplayProperties(source);
}
@Override
public CompatibilityDisplayProperties[] newArray(int size) {
return new CompatibilityDisplayProperties[size];
public Vr2dDisplayProperties[] newArray(int size) {
return new Vr2dDisplayProperties[size];
}
};
private CompatibilityDisplayProperties(Parcel source) {
private Vr2dDisplayProperties(Parcel source) {
mWidth = source.readInt();
mHeight = source.readInt();
mDpi = source.readInt();
}
public void dump(PrintWriter pw, String prefix) {
pw.println(prefix + "CompatibilityDisplayProperties:");
pw.println(prefix + "Vr2dDisplayProperties:");
pw.println(prefix + " width=" + mWidth);
pw.println(prefix + " height=" + mHeight);
pw.println(prefix + " dpi=" + mDpi);

12
core/java/android/app/VrManager.java
View File

@@ -45,20 +45,20 @@ public class VrManager {
}
/**
* Sets the resolution and DPI of the compatibility virtual display used to display 2D
* Sets the resolution and DPI of the vr2d virtual display used to display 2D
* applications in VR mode.
*
* <p>Requires {@link android.Manifest.permission#ACCESS_VR_MANAGER} permission.</p>
*
* @param {@link android.app.CompatibilityDisplayProperties} properties to be set to the
* virtual display for 2D applications in VR mode.
* @param vr2dDisplayProp properties to be set to the virtual display for
* 2D applications in VR mode.
*
* {@hide}
*/
public void setCompatibilityDisplayProperties(
CompatibilityDisplayProperties compatDisplayProp) {
public void setVr2dDisplayProperties(
Vr2dDisplayProperties vr2dDisplayProp) {
try {
mService.setCompatibilityDisplayProperties(compatDisplayProp);
mService.setVr2dDisplayProperties(vr2dDisplayProp);
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}

12
core/java/android/service/vr/IVrManager.aidl
View File

@@ -16,7 +16,7 @@
package android.service.vr;
import android.app.CompatibilityDisplayProperties;
import android.app.Vr2dDisplayProperties;
import android.service.vr.IVrStateCallbacks;
import android.service.vr.IPersistentVrStateCallbacks;
@@ -68,16 +68,16 @@ interface IVrManager {
void setPersistentVrModeEnabled(in boolean enabled);
/**
* Sets the resolution and DPI of the compatibility virtual display used to display
* Sets the resolution and DPI of the vr2d virtual display used to display
* 2D applications in VR mode.
*
* <p>Requires {@link android.Manifest.permission#ACCESS_VR_MANAGER} permission.</p>
*
* @param compatDisplayProperties Compatibitlity display properties to be set for
* @param vr2dDisplayProperties Vr2d display properties to be set for
* the VR virtual display
*/
void setCompatibilityDisplayProperties(
in CompatibilityDisplayProperties compatDisplayProperties);
void setVr2dDisplayProperties(
in Vr2dDisplayProperties vr2dDisplayProperties);
/**
* Return current virtual display id.
@@ -85,7 +85,7 @@ interface IVrManager {
* @return {@link android.view.Display.INVALID_DISPLAY} if there is no virtual display
* currently, else return the display id of the virtual display
*/
int getCompatibilityDisplayId();
int getVr2dDisplayId();
/**
* Initiate connection for system controller data.

26
services/core/java/com/android/server/vr/CompatibilityDisplay.java → services/core/java/com/android/server/Vr2dDisplay.java
View File

@@ -3,7 +3,7 @@ package com.android.server.vr;
import static android.view.Display.INVALID_DISPLAY;
import android.app.ActivityManagerInternal;
import android.app.CompatibilityDisplayProperties;
import android.app.Vr2dDisplayProperties;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -31,8 +31,8 @@ import com.android.server.vr.VrManagerService;
* Creates a 2D Virtual Display while VR Mode is enabled. This display will be used to run and
* render 2D app within a VR experience. For example, bringing up the 2D calculator app in VR.
*/
class CompatibilityDisplay {
private final static String TAG = "CompatDisplay";
class Vr2dDisplay {
private final static String TAG = "Vr2dDisplay";
private final static boolean DEBUG = false;
// TODO: Go over these values and figure out what is best
@@ -42,13 +42,13 @@ class CompatibilityDisplay {
private final static int STOP_VIRTUAL_DISPLAY_DELAY_MILLIS = 2000;
private final static String DEBUG_ACTION_SET_MODE =
"com.android.server.vr.CompatibilityDisplay.SET_MODE";
"com.android.server.vr.Vr2dDisplay.SET_MODE";
private final static String DEBUG_EXTRA_MODE_ON =
"com.android.server.vr.CompatibilityDisplay.EXTRA_MODE_ON";
"com.android.server.vr.Vr2dDisplay.EXTRA_MODE_ON";
private final static String DEBUG_ACTION_SET_SURFACE =
"com.android.server.vr.CompatibilityDisplay.SET_SURFACE";
"com.android.server.vr.Vr2dDisplay.SET_SURFACE";
private final static String DEBUG_EXTRA_SURFACE =
"com.android.server.vr.CompatibilityDisplay.EXTRA_SURFACE";
"com.android.server.vr.Vr2dDisplay.EXTRA_SURFACE";
/**
* The default width of the VR virtual display
@@ -99,7 +99,7 @@ class CompatibilityDisplay {
private boolean mIsVrModeOverrideEnabled;
private boolean mIsVrModeEnabled;
public CompatibilityDisplay(DisplayManager displayManager,
public Vr2dDisplay(DisplayManager displayManager,
ActivityManagerInternal activityManagerInternal, IVrManager vrManager) {
mDisplayManager = displayManager;
mActivityManagerInternal = activityManagerInternal;
@@ -190,7 +190,7 @@ class CompatibilityDisplay {
}
/**
* Sets the resolution and DPI of the compatibility virtual display used to display
* Sets the resolution and DPI of the Vr2d virtual display used to display
* 2D applications in VR mode.
*
* <p>Requires {@link android.Manifest.permission#ACCESS_VR_MANAGER} permission.</p>
@@ -198,7 +198,7 @@ class CompatibilityDisplay {
* @param compatDisplayProperties Properties of the virtual display for 2D applications
* in VR mode.
*/
public void setVirtualDisplayProperties(CompatibilityDisplayProperties compatDisplayProperties) {
public void setVirtualDisplayProperties(Vr2dDisplayProperties compatDisplayProperties) {
synchronized(mVdLock) {
if (DEBUG) {
Log.i(TAG, "VD setVirtualDisplayProperties: res = " +
@@ -273,13 +273,13 @@ class CompatibilityDisplay {
null /* Surface */, 0 /* flags */);
if (mVirtualDisplay != null) {
mActivityManagerInternal.setVrCompatibilityDisplayId(
mActivityManagerInternal.setVr2dDisplayId(
mVirtualDisplay.getDisplay().getDisplayId());
// Now create the ImageReader to supply a Surface to the new virtual display.
startImageReader();
} else {
Log.w(TAG, "Virtual display id is null after createVirtualDisplay");
mActivityManagerInternal.setVrCompatibilityDisplayId(INVALID_DISPLAY);
mActivityManagerInternal.setVr2dDisplayId(INVALID_DISPLAY);
return;
}
}
@@ -302,7 +302,7 @@ class CompatibilityDisplay {
} else {
Log.i(TAG, "Stopping Virtual Display");
synchronized (mVdLock) {
mActivityManagerInternal.setVrCompatibilityDisplayId(INVALID_DISPLAY);
mActivityManagerInternal.setVr2dDisplayId(INVALID_DISPLAY);
setSurfaceLocked(null); // clean up and release the surface first.
if (mVirtualDisplay != null) {
mVirtualDisplay.release();

16
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -626,8 +626,8 @@ public class ActivityManagerService extends IActivityManager.Stub
private final VrController mVrController;
// VR Compatibility Display Id.
int mVrCompatibilityDisplayId = INVALID_DISPLAY;
// VR Vr2d Display Id.
int mVr2dDisplayId = INVALID_DISPLAY;
// Whether we should use SCHED_FIFO for UI and RenderThreads.
private boolean mUseFifoUiScheduling = false;
@@ -23727,17 +23727,17 @@ public class ActivityManagerService extends IActivityManager.Stub
/**
* Called after virtual display Id is updated by
* {@link com.android.server.vr.CompatibilityDisplay} with a specific
* {@param vrCompatibilityDisplayId}.
* {@link com.android.server.vr.Vr2dDisplay} with a specific
* {@param vrVr2dDisplayId}.
*/
@Override
public void setVrCompatibilityDisplayId(int vrCompatibilityDisplayId) {
public void setVr2dDisplayId(int vr2dDisplayId) {
if (DEBUG_STACK) {
Slog.d(TAG, "setVrCompatibilityDisplayId called for: " +
vrCompatibilityDisplayId);
Slog.d(TAG, "setVr2dDisplayId called for: " +
vr2dDisplayId);
}
synchronized (ActivityManagerService.this) {
mVrCompatibilityDisplayId = vrCompatibilityDisplayId;
mVr2dDisplayId = vr2dDisplayId;
}
}
}

14
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -186,7 +186,7 @@ class ActivityStarter {
private IVoiceInteractionSession mVoiceSession;
private IVoiceInteractor mVoiceInteractor;
private boolean mUsingVrCompatibilityDisplay;
private boolean mUsingVr2dDisplay;
private void reset() {
mStartActivity = null;
@@ -226,14 +226,14 @@ class ActivityStarter {
mVoiceSession = null;
mVoiceInteractor = null;
mUsingVrCompatibilityDisplay = false;
mUsingVr2dDisplay = false;
}
ActivityStarter(ActivityManagerService service, ActivityStackSupervisor supervisor) {
mService = service;
mSupervisor = supervisor;
mInterceptor = new ActivityStartInterceptor(mService, mSupervisor);
mUsingVrCompatibilityDisplay = false;
mUsingVr2dDisplay = false;
}
final int startActivityLocked(IApplicationThread caller, Intent intent, Intent ephemeralIntent,
@@ -1476,12 +1476,12 @@ class ActivityStarter {
}
// Get the virtual display id from ActivityManagerService.
int displayId = mService.mVrCompatibilityDisplayId;
int displayId = mService.mVr2dDisplayId;
if (displayId != INVALID_DISPLAY) {
if (DEBUG_STACK) {
Slog.d(TAG, "getSourceDisplayId :" + displayId);
}
mUsingVrCompatibilityDisplay = true;
mUsingVr2dDisplay = true;
return displayId;
}
@@ -2105,8 +2105,8 @@ class ActivityStarter {
return mSupervisor.getValidLaunchStackOnDisplay(launchDisplayId, r);
}
// If we are using Vr compatibility display, find the virtual display stack.
if (mUsingVrCompatibilityDisplay) {
// If we are using Vr2d display, find the virtual display stack.
if (mUsingVr2dDisplay) {
ActivityStack as = mSupervisor.getValidLaunchStackOnDisplay(mSourceDisplayId, r);
if (DEBUG_STACK) {
Slog.v(TAG, "Launch stack for app: " + r.toString() +

12
services/core/java/com/android/server/vr/VrManagerInternal.java
View File

@@ -16,7 +16,7 @@
package com.android.server.vr;
import android.annotation.NonNull;
import android.app.CompatibilityDisplayProperties;
import android.app.Vr2dDisplayProperties;
import android.content.ComponentName;
import android.service.vr.IPersistentVrStateCallbacks;
@@ -83,16 +83,16 @@ public abstract class VrManagerInternal {
public abstract int hasVrPackage(@NonNull ComponentName packageName, int userId);
/**
* Sets the resolution and DPI of the compatibility virtual display used to display
* Sets the resolution and DPI of the vr2d virtual display used to display
* 2D applications in VR mode.
*
* <p>Requires {@link android.Manifest.permission#ACCESS_VR_MANAGER} permission.</p>
*
* @param compatDisplayProp Properties of the virtual display for 2D applications
* @param vr2dDisplayProp Properties of the virtual display for 2D applications
* in VR mode.
*/
public abstract void setCompatibilityDisplayProperties(
CompatibilityDisplayProperties compatDisplayProp);
public abstract void setVr2dDisplayProperties(
Vr2dDisplayProperties vr2dDisplayProp);
/**
* Sets the persistent VR mode state of a device. When a device is in persistent VR mode it will
@@ -110,7 +110,7 @@ public abstract class VrManagerInternal {
* @return {@link android.view.Display.INVALID_DISPLAY} if there is no virtual display
* currently, else return the display id of the virtual display
*/
public abstract int getCompatibilityDisplayId();
public abstract int getVr2dDisplayId();
/**
* Adds listener that reports state changes to persistent VR mode.

46
services/core/java/com/android/server/vr/VrManagerService.java
View File

@@ -21,7 +21,7 @@ import android.Manifest;
import android.app.ActivityManagerInternal;
import android.app.ActivityManager;
import android.app.AppOpsManager;
import android.app.CompatibilityDisplayProperties;
import android.app.Vr2dDisplayProperties;
import android.app.NotificationManager;
import android.annotation.NonNull;
import android.content.ComponentName;
@@ -141,7 +141,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC
private final NotificationAccessManager mNotifAccessManager = new NotificationAccessManager();
/** Tracks the state of the screen and keyguard UI.*/
private int mSystemSleepFlags = FLAG_AWAKE;
private CompatibilityDisplay mCompatibilityDisplay;
private Vr2dDisplay mVr2dDisplay;
private static final int MSG_VR_STATE_CHANGE = 0;
private static final int MSG_PENDING_VR_STATE_CHANGE = 1;
@@ -428,15 +428,15 @@ public class VrManagerService extends SystemService implements EnabledComponentC
}
@Override
public void setCompatibilityDisplayProperties(
CompatibilityDisplayProperties compatDisplayProp) {
public void setVr2dDisplayProperties(
Vr2dDisplayProperties vr2dDisplayProp) {
enforceCallerPermission(Manifest.permission.RESTRICTED_VR_ACCESS);
VrManagerService.this.setCompatibilityDisplayProperties(compatDisplayProp);
VrManagerService.this.setVr2dDisplayProperties(vr2dDisplayProp);
}
@Override
public int getCompatibilityDisplayId() {
return VrManagerService.this.getCompatibilityDisplayId();
public int getVr2dDisplayId() {
return VrManagerService.this.getVr2dDisplayId();
}
@Override
@@ -549,14 +549,14 @@ public class VrManagerService extends SystemService implements EnabledComponentC
}
@Override
public void setCompatibilityDisplayProperties(
CompatibilityDisplayProperties compatDisplayProp) {
VrManagerService.this.setCompatibilityDisplayProperties(compatDisplayProp);
public void setVr2dDisplayProperties(
Vr2dDisplayProperties compatDisplayProp) {
VrManagerService.this.setVr2dDisplayProperties(compatDisplayProp);
}
@Override
public int getCompatibilityDisplayId() {
return VrManagerService.this.getCompatibilityDisplayId();
public int getVr2dDisplayId() {
return VrManagerService.this.getVr2dDisplayId();
}
@Override
@@ -608,8 +608,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC
DisplayManager dm =
(DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
ActivityManagerInternal ami = LocalServices.getService(ActivityManagerInternal.class);
mCompatibilityDisplay = new CompatibilityDisplay(dm, ami, mVrManager);
mCompatibilityDisplay.init(getContext());
mVr2dDisplay = new Vr2dDisplay(dm, ami, mVrManager);
mVr2dDisplay.init(getContext());
} else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {
synchronized (mLock) {
mVrModeAllowed = true;
@@ -1116,20 +1116,20 @@ public class VrManagerService extends SystemService implements EnabledComponentC
}
}
public void setCompatibilityDisplayProperties(
CompatibilityDisplayProperties compatDisplayProp) {
if (mCompatibilityDisplay != null) {
mCompatibilityDisplay.setVirtualDisplayProperties(compatDisplayProp);
public void setVr2dDisplayProperties(
Vr2dDisplayProperties compatDisplayProp) {
if (mVr2dDisplay != null) {
mVr2dDisplay.setVirtualDisplayProperties(compatDisplayProp);
return;
}
Slog.w(TAG, "CompatibilityDisplay is null!");
Slog.w(TAG, "Vr2dDisplay is null!");
}
private int getCompatibilityDisplayId() {
if (mCompatibilityDisplay != null) {
return mCompatibilityDisplay.getVirtualDisplayId();
private int getVr2dDisplayId() {
if (mVr2dDisplay != null) {
return mVr2dDisplay.getVirtualDisplayId();
}
Slog.w(TAG, "CompatibilityDisplay is null!");
Slog.w(TAG, "Vr2dDisplay is null!");
return INVALID_DISPLAY;
}