Merge "Add @SystemApi to related VR functions that will be used by VrCore Services." (6de5ddc6) · Commits · e / os / android_frameworks_base

api/system-current.txt

+41 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,7 @@ package android.app {
		method public int getUidImportance(int);
		method public void killUid(int, java.lang.String);
		method public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
		method public static void setPersistentVrThread(int);
		}

		public static abstract interface ActivityManager.OnUidImportanceListener {
		@@ -409,9 +410,49 @@ package android.app {
		ctor public StatsManager.StatsUnavailableException(java.lang.String, java.lang.Throwable);
		}

		public final class Vr2dDisplayProperties implements android.os.Parcelable {
		ctor public Vr2dDisplayProperties(int, int, int);
		method public int describeContents();
		method public void dump(java.io.PrintWriter, java.lang.String);
		method public int getAddedFlags();
		method public int getDpi();
		method public int getHeight();
		method public int getRemovedFlags();
		method public int getWidth();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.Vr2dDisplayProperties> CREATOR;
		field public static final int FLAG_VIRTUAL_DISPLAY_ENABLED = 1; // 0x1
		}

		public static class Vr2dDisplayProperties.Builder {
		ctor public Vr2dDisplayProperties.Builder();
		method public android.app.Vr2dDisplayProperties.Builder addFlags(int);
		method public android.app.Vr2dDisplayProperties build();
		method public android.app.Vr2dDisplayProperties.Builder removeFlags(int);
		method public android.app.Vr2dDisplayProperties.Builder setDimensions(int, int, int);
		method public android.app.Vr2dDisplayProperties.Builder setEnabled(boolean);
		}

		public static abstract class Vr2dDisplayProperties.Vr2dDisplayFlag implements java.lang.annotation.Annotation {
		}

		public class VrManager {
		method public int getVr2dDisplayId();
		method public boolean isPersistentVrModeEnabled();
		method public boolean isVrModeEnabled();
		method public void registerVrStateCallback(java.util.concurrent.Executor, android.app.VrStateCallback);
		method public void setAndBindVrCompositor(android.content.ComponentName);
		method public void setPersistentVrModeEnabled(boolean);
		method public void setStandbyEnabled(boolean);
		method public void setVr2dDisplayProperties(android.app.Vr2dDisplayProperties);
		method public void setVrInputMethod(android.content.ComponentName);
		method public void unregisterVrStateCallback(android.app.VrStateCallback);
		}

		public abstract class VrStateCallback {
		ctor public VrStateCallback();
		method public void onPersistentVrStateChanged(boolean);
		method public void onVrStateChanged(boolean);
		}

		public class WallpaperManager {

config/hiddenapi-light-greylist.txt

+0 −11

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ Landroid/app/ActivityManager;->isUserRunning(I)Z
		Landroid/app/ActivityManager;->mContext:Landroid/content/Context;
		Landroid/app/ActivityManager;->PROCESS_STATE_IMPORTANT_BACKGROUND:I
		Landroid/app/ActivityManager;->PROCESS_STATE_TOP:I
		Landroid/app/ActivityManager;->setPersistentVrThread(I)V
		Landroid/app/ActivityManagerNative;->asInterface(Landroid/os/IBinder;)Landroid/app/IActivityManager;
		Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager;
		Landroid/app/ActivityOptions;->makeMultiThumbFutureAspectScaleAnimation(Landroid/content/Context;Landroid/os/Handler;Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/app/ActivityOptions$OnAnimationStartedListener;Z)Landroid/app/ActivityOptions;
		@@ -464,15 +463,6 @@ Landroid/app/usage/UsageStats;->mLastEvent:I
		Landroid/app/usage/UsageStats;->mLaunchCount:I
		Landroid/app/usage/UsageStats;->mTotalTimeInForeground:J
		Landroid/app/usage/UsageStatsManager;->mService:Landroid/app/usage/IUsageStatsManager;
		Landroid/app/Vr2dDisplayProperties$Builder;-><init>()V
		Landroid/app/Vr2dDisplayProperties$Builder;->build()Landroid/app/Vr2dDisplayProperties;
		Landroid/app/Vr2dDisplayProperties$Builder;->setEnabled(Z)Landroid/app/Vr2dDisplayProperties$Builder;
		Landroid/app/Vr2dDisplayProperties;-><init>(III)V
		Landroid/app/VrManager;->getPersistentVrModeEnabled()Z
		Landroid/app/VrManager;->mService:Landroid/service/vr/IVrManager;
		Landroid/app/VrManager;->registerVrStateCallback(Landroid/app/VrStateCallback;Landroid/os/Handler;)V
		Landroid/app/VrManager;->setVr2dDisplayProperties(Landroid/app/Vr2dDisplayProperties;)V
		Landroid/app/VrManager;->unregisterVrStateCallback(Landroid/app/VrStateCallback;)V
		Landroid/app/WallpaperColors;->getColorHints()I
		Landroid/app/WallpaperManager;->getBitmap()Landroid/graphics/Bitmap;
		Landroid/app/WallpaperManager;->getBitmap(Z)Landroid/graphics/Bitmap;
		@@ -2284,7 +2274,6 @@ Landroid/service/notification/StatusBarNotification;->getUid()I
		Landroid/service/persistentdata/IPersistentDataBlockService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/persistentdata/IPersistentDataBlockService;
		Landroid/service/voice/AlwaysOnHotwordDetector$EventPayload;->getCaptureSession()Ljava/lang/Integer;
		Landroid/service/voice/VoiceInteractionService;->isKeyphraseAndLocaleSupportedForHotword(Ljava/lang/String;Ljava/util/Locale;)Z
		Landroid/service/vr/IVrManager;->getVr2dDisplayId()I
		Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V
		Landroid/speech/tts/TextToSpeech;->getCurrentEngine()Ljava/lang/String;
		Landroid/system/Int32Ref;->value:I

config/hiddenapi-vendor-list.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -58,8 +58,6 @@ Landroid/app/TaskStackListener;->onTaskProfileLocked(II)V
		Landroid/app/TaskStackListener;->onTaskRemoved(I)V
		Landroid/app/TaskStackListener;->onTaskSnapshotChanged(ILandroid/app/ActivityManager$TaskSnapshot;)V
		Landroid/app/TaskStackListener;->onTaskStackChanged()V
		Landroid/app/VrStateCallback;-><init>()V
		Landroid/app/VrStateCallback;->onPersistentVrStateChanged(Z)V
		Landroid/app/WallpaperColors;-><init>(Landroid/graphics/Color;Landroid/graphics/Color;Landroid/graphics/Color;I)V
		Landroid/bluetooth/BluetoothHeadset;->phoneStateChanged(IIILjava/lang/String;I)V
		Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V

core/java/android/app/ActivityManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -4257,6 +4257,7 @@ public class ActivityManager {
		* @param tid tid of the VR thread
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.RESTRICTED_VR_ACCESS)
		public static void setPersistentVrThread(int tid) {
		try {

core/java/android/app/Vr2dDisplayProperties.java

+35 −4

Original line number	Diff line number	Diff line
		@@ -16,20 +16,31 @@

		package android.app;

		import android.annotation.IntDef;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.io.PrintWriter;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* Display properties to be used by VR mode when creating a virtual display.
		*
		* @hide
		*/
		@SystemApi
		public final class Vr2dDisplayProperties implements Parcelable {

		public static final int FLAG_VIRTUAL_DISPLAY_ENABLED = 1;

		@Retention(RetentionPolicy.SOURCE)
		@IntDef({
		FLAG_VIRTUAL_DISPLAY_ENABLED
		})
		public @interface Vr2dDisplayFlag {}

		/**
		* The actual width, height and dpi.
		*/
		@@ -79,7 +90,7 @@ public final class Vr2dDisplayProperties implements Parcelable {

		Vr2dDisplayProperties that = (Vr2dDisplayProperties) o;

		if (getFlags() != that.getFlags()) return false;
		if (getAddedFlags() != that.getAddedFlags()) return false;
		if (getRemovedFlags() != that.getRemovedFlags()) return false;
		if (getWidth() != that.getWidth()) return false;
		if (getHeight() != that.getHeight()) return false;
		@@ -121,26 +132,46 @@ public final class Vr2dDisplayProperties implements Parcelable {
		mRemovedFlags = source.readInt();
		}

		/**
		* Prints out dump info.
		*/
		public void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + toString());
		}

		/**
		* Returns the width of VR 2d display.
		*/
		public int getWidth() {
		return mWidth;
		}

		/**
		* Returns the height of VR 2d display.
		*/
		public int getHeight() {
		return mHeight;
		}

		/**
		* Returns the dpi of VR 2d display.
		*/
		public int getDpi() {
		return mDpi;
		}

		public int getFlags() {
		/**
		* Returns the added flags of VR 2d display. Flags are combined by logic or.
		*/
		@Vr2dDisplayFlag
		public int getAddedFlags() {
		return mAddedFlags;
		}

		/**
		* Returns the removed flags of VR 2d display. Flags are combined by logic or.
		*/
		@Vr2dDisplayFlag
		public int getRemovedFlags() {
		return mRemovedFlags;
		}
		@@ -193,7 +224,7 @@ public final class Vr2dDisplayProperties implements Parcelable {
		/**
		* Adds property flags.
		*/
		public Builder addFlags(int flags) {
		public Builder addFlags(@Vr2dDisplayFlag int flags) {
		mAddedFlags \|= flags;
		mRemovedFlags &= ~flags;
		return this;
		@@ -202,7 +233,7 @@ public final class Vr2dDisplayProperties implements Parcelable {
		/**
		* Removes property flags.
		*/
		public Builder removeFlags(int flags) {
		public Builder removeFlags(@Vr2dDisplayFlag int flags) {
		mRemovedFlags \|= flags;
		mAddedFlags &= ~flags;
		return this;