Manual unrestrict on 13790637.

devbridie · devbridie · commit fe052daf18ff · 2025-07-22T12:53:03.000+02:00
diff --git a/xr/build.gradle.kts b/xr/build.gradle.kts
@@ -25,6 +25,9 @@ android {
     buildFeatures {
         compose = true
     }
+    lint {
+        disable += "RestrictedApi"
+    }
 }
 
 dependencies {
diff --git a/xr/src/main/java/com/example/xr/arcore/Anchors.kt b/xr/src/main/java/com/example/xr/arcore/Anchors.kt
@@ -63,7 +63,6 @@ private fun createAnchorAtTrackable(trackable: Trackable<*>) {
     // [END androidxr_arcore_anchor_create_trackable]
 }
 
-@Suppress("RestrictedApi") // b/422174724
 private fun attachEntityToAnchor(
     session: Session,
     entity: Entity,
diff --git a/xr/src/main/java/com/example/xr/arcore/Hands.kt b/xr/src/main/java/com/example/xr/arcore/Hands.kt
@@ -76,7 +76,6 @@ fun secondaryHandDetection(activity: Activity, session: Session) {
     // [END androidxr_arcore_hand_handedness]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
     val session: Session = null!!
     val palmEntity: GltfModelEntity = null!!
@@ -97,7 +96,6 @@ fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
     // [END androidxr_arcore_hand_entityAtHandPalm]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {
     val session: Session = null!!
     val indexFingerEntity: GltfModelEntity = null!!
@@ -120,7 +118,6 @@ fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {
     // [END androidxr_arcore_hand_entityAtIndexFingerTip]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun detectPinch(session: Session, handState: Hand.State): Boolean {
     // [START androidxr_arcore_hand_pinch_gesture]
     val thumbTip = handState.handJoints[HandJointType.THUMB_TIP] ?: return false
diff --git a/xr/src/main/java/com/example/xr/arcore/Planes.kt b/xr/src/main/java/com/example/xr/arcore/Planes.kt
@@ -48,7 +48,6 @@ private suspend fun subscribePlanes(session: Session) {
     // [END androidxr_arcore_planes_subscribe]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun hitTestTable(session: Session) {
     val pose = session.scene.spatialUser.head?.transformPoseTo(Pose(), session.scene.perceptionSpace) ?: return
     val ray = Ray(pose.translation, pose.forward)
diff --git a/xr/src/main/java/com/example/xr/compose/Orbiter.kt b/xr/src/main/java/com/example/xr/compose/Orbiter.kt
@@ -50,7 +50,6 @@ import androidx.xr.compose.subspace.layout.resizable
 import androidx.xr.compose.subspace.layout.width
 import com.example.xr.R
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun OrbiterExampleSubspace() {
     // [START androidxr_compose_OrbiterExampleSubspace]
@@ -98,7 +97,6 @@ fun OrbiterExample() {
 // [END androidxr_compose_OrbiterExample]
 
 @Composable
-@Suppress("RestrictedApi") // b/416066566
 fun OrbiterAnchoringExample() {
     // [START androidxr_compose_OrbiterAnchoringExample]
     Subspace {
diff --git a/xr/src/main/java/com/example/xr/compose/SpatialCapabilities.kt b/xr/src/main/java/com/example/xr/compose/SpatialCapabilities.kt
@@ -45,7 +45,6 @@ private fun SpatialCapabilitiesCheck() {
     // [END androidxr_compose_checkSpatialCapabilities]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun checkSpatialUiEnabled() {
     // [START androidxr_compose_checkSpatialUiEnabled]
diff --git a/xr/src/main/java/com/example/xr/compose/SpatialExternalSurface.kt b/xr/src/main/java/com/example/xr/compose/SpatialExternalSurface.kt
@@ -36,7 +36,6 @@ import androidx.xr.compose.subspace.layout.width
 
 // [START androidxr_compose_SpatialExternalSurfaceStereo]
 @OptIn(ExperimentalComposeApi::class)
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 fun SpatialExternalSurfaceContent() {
     val context = LocalContext.current
@@ -77,7 +76,6 @@ fun SpatialExternalSurfaceContent() {
 
 // [START androidxr_compose_SpatialExternalSurfaceDRM]
 @OptIn(ExperimentalComposeApi::class)
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 fun DrmSpatialVideoPlayer() {
     val context = LocalContext.current
diff --git a/xr/src/main/java/com/example/xr/compose/SpatialLayout.kt b/xr/src/main/java/com/example/xr/compose/SpatialLayout.kt
@@ -36,7 +36,6 @@ import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.height
 import androidx.xr.compose.subspace.layout.width
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun SpatialLayoutExampleSubspace() {
     // [START androidxr_compose_SpatialLayoutExampleSubspace]
diff --git a/xr/src/main/java/com/example/xr/compose/SpatialPanel.kt b/xr/src/main/java/com/example/xr/compose/SpatialPanel.kt
@@ -36,7 +36,6 @@ import androidx.xr.compose.subspace.layout.movable
 import androidx.xr.compose.subspace.layout.resizable
 import androidx.xr.compose.subspace.layout.width
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun SpatialPanelExample() {
     // [START androidxr_compose_SpatialPanel]
@@ -76,7 +75,6 @@ fun SpatialPanelContent() {
 @Composable
 private fun AppContent() {}
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun ContentInSpatialPanel() {
     // [START androidxr_compose_SpatialPanelAppContent]
diff --git a/xr/src/main/java/com/example/xr/compose/SpatialRow.kt b/xr/src/main/java/com/example/xr/compose/SpatialRow.kt
@@ -24,7 +24,6 @@ import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.height
 import androidx.xr.compose.subspace.layout.width
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun SpatialRowExample() {
     // [START androidxr_compose_SpatialRowExample]
diff --git a/xr/src/main/java/com/example/xr/compose/Subspace.kt b/xr/src/main/java/com/example/xr/compose/Subspace.kt
@@ -26,7 +26,6 @@ import androidx.xr.compose.spatial.ApplicationSubspace
 import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.SpatialPanel
 
-@Suppress("RestrictedApi") // b/416066566
 private class SubspaceActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/xr/src/main/java/com/example/xr/compose/Views.kt b/xr/src/main/java/com/example/xr/compose/Views.kt
@@ -42,7 +42,6 @@ import com.example.xr.R
 private class MyCustomView(context: Context) : View(context)
 
 private class ActivityWithSubspaceContent : ComponentActivity() {
-    @Suppress("RestrictedApi") // b/416066566
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         // [START androidxr_compose_ActivityWithSubspaceContent]
@@ -57,7 +56,6 @@ private class ActivityWithSubspaceContent : ComponentActivity() {
     }
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private class FragmentWithComposeView() : Fragment() {
     // [START androidxr_compose_FragmentWithComposeView]
     override fun onCreateView(
diff --git a/xr/src/main/java/com/example/xr/compose/Volume.kt b/xr/src/main/java/com/example/xr/compose/Volume.kt
@@ -39,7 +39,6 @@ import androidx.xr.compose.subspace.layout.scale
 import androidx.xr.compose.subspace.layout.width
 import kotlinx.coroutines.launch
 
-@Suppress("RestrictedApi") // b/416066566
 @Composable
 private fun VolumeExample() {
     // [START androidxr_compose_Volume]
diff --git a/xr/src/main/java/com/example/xr/misc/ModeTransition.kt b/xr/src/main/java/com/example/xr/misc/ModeTransition.kt
@@ -30,7 +30,6 @@ fun modeTransitionCompose() {
     // [END androidxr_misc_modeTransitionCompose]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 fun modeTransitionScenecore(xrSession: Session) {
     // [START androidxr_misc_modeTransitionScenecore]
     xrSession.scene.requestHomeSpaceMode()
diff --git a/xr/src/main/java/com/example/xr/scenecore/Environments.kt b/xr/src/main/java/com/example/xr/scenecore/Environments.kt
@@ -37,7 +37,6 @@ private class Environments(val session: Session) {
         // [END androidxr_scenecore_environment_loadEnvironmentSkybox]
     }
 
-    @Suppress("RestrictedApi") // b/416066566
     fun setEnvironmentPreference(environmentGeometry: GltfModel, lightingForSkybox: ExrImage) {
         // [START androidxr_scenecore_environment_setEnvironmentPreference]
         val spatialEnvironmentPreference =
@@ -56,7 +55,6 @@ private class Environments(val session: Session) {
         // [END androidxr_scenecore_environment_setEnvironmentPreference]
     }
 
-    @Suppress("RestrictedApi") // b/416066566
     fun setPassthroughOpacityPreference() {
         // [START androidxr_scenecore_environment_setPassthroughOpacityPreference]
         session.scene.spatialEnvironment.preferredPassthroughOpacity = 1.0f
@@ -74,7 +72,6 @@ private class Environments(val session: Session) {
         // [END androidxr_scenecore_environment_setPassthroughOpacityPreference]
     }
 
-    @Suppress("RestrictedApi") // b/416066566
     fun getCurrentPassthroughOpacity() {
         // [START androidxr_scenecore_environment_getCurrentPassthroughOpacity]
         val currentPassthroughOpacity = session.scene.spatialEnvironment.currentPassthroughOpacity
diff --git a/xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt b/xr/src/main/java/com/example/xr/scenecore/GltfEntity.kt
@@ -33,7 +33,6 @@ private suspend fun loadGltfFile(session: Session) {
     // [END androidxr_scenecore_gltfmodel_create]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun createModelEntity(session: Session, gltfModel: GltfModel) {
     // [START androidxr_scenecore_gltfmodelentity_create]
     if (session.scene.spatialCapabilities
@@ -44,7 +43,6 @@ private fun createModelEntity(session: Session, gltfModel: GltfModel) {
     // [END androidxr_scenecore_gltfmodelentity_create]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun animateEntity(gltfEntity: GltfModelEntity) {
     // [START androidxr_scenecore_gltfmodelentity_animation]
     gltfEntity.startAnimation(loop = true, animationName = "Walk")
diff --git a/xr/src/main/java/com/example/xr/scenecore/InteractableComponent.kt b/xr/src/main/java/com/example/xr/scenecore/InteractableComponent.kt
@@ -22,7 +22,6 @@ import androidx.xr.scenecore.InputEvent
 import androidx.xr.scenecore.InteractableComponent
 import java.util.concurrent.Executors
 
-@Suppress("RestrictedApi") // b/416066566
 private fun interactableComponentExample(session: Session, entity: Entity) {
     // [START androidxr_scenecore_interactableComponentExample]
     val executor = Executors.newSingleThreadExecutor()
diff --git a/xr/src/main/java/com/example/xr/scenecore/MovableComponent.kt b/xr/src/main/java/com/example/xr/scenecore/MovableComponent.kt
@@ -23,15 +23,13 @@ import androidx.xr.scenecore.MovableComponent
 import androidx.xr.scenecore.PlaneOrientation
 import androidx.xr.scenecore.PlaneSemanticType
 
-@Suppress("RestrictedApi") // b/416066566
 private fun createSystemMovable(session: Session, entity: Entity) {
     // [START androidxr_scenecore_movableComponent_createSystemMovable]
     val movableComponent = MovableComponent.createSystemMovable(session)
     entity.addComponent(movableComponent)
     // [END androidxr_scenecore_movableComponent_createSystemMovable]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun movableComponentAnchorExample(session: Session, entity: Entity) {
     // [START androidxr_scenecore_movableComponent_anchorable]
     val anchorPlacement = AnchorPlacement.createForPlanes(
diff --git a/xr/src/main/java/com/example/xr/scenecore/ResizableComponent.kt b/xr/src/main/java/com/example/xr/scenecore/ResizableComponent.kt
@@ -23,7 +23,6 @@ import androidx.xr.scenecore.ResizeEvent
 import androidx.xr.scenecore.SurfaceEntity
 import java.util.concurrent.Executor
 
-@Suppress("RestrictedApi") // b/416066566
 private fun resizableComponentExample(
     session: Session,
     surfaceEntity: SurfaceEntity,
diff --git a/xr/src/main/java/com/example/xr/scenecore/SpatialAudio.kt b/xr/src/main/java/com/example/xr/scenecore/SpatialAudio.kt
@@ -33,7 +33,6 @@ import androidx.xr.scenecore.SpatialSoundPool
 import androidx.xr.scenecore.SpatializerConstants
 import androidx.xr.scenecore.scene
 
-@Suppress("RestrictedApi") // b/416066566
 private fun playSpatialAudioAtEntity(session: Session, appContext: Context, entity: Entity) {
     // [START androidxr_scenecore_playSpatialAudio]
     // Check spatial capabilities before using spatial audio
@@ -80,7 +79,6 @@ private fun playSpatialAudioAtEntity(session: Session, appContext: Context, enti
     // [END androidxr_scenecore_playSpatialAudio]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun playSpatialAudioAtEntitySurround(session: Session, appContext: Context) {
     // [START androidxr_scenecore_playSpatialAudioSurround]
     // Check spatial capabilities before using spatial audio
@@ -116,7 +114,6 @@ private fun playSpatialAudioAtEntitySurround(session: Session, appContext: Conte
     // [END androidxr_scenecore_playSpatialAudioSurround]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun playSpatialAudioAtEntityAmbionics(session: Session, appContext: Context) {
     // [START androidxr_scenecore_playSpatialAudioAmbionics]
     // Check spatial capabilities before using spatial audio
diff --git a/xr/src/main/java/com/example/xr/scenecore/SpatialCapabilities.kt b/xr/src/main/java/com/example/xr/scenecore/SpatialCapabilities.kt
@@ -20,7 +20,6 @@ import androidx.xr.runtime.Session
 import androidx.xr.scenecore.SpatialCapabilities
 import androidx.xr.scenecore.scene
 
-@Suppress("RestrictedApi") // b/416066566
 fun checkMultipleCapabilities(xrSession: Session) {
     // [START androidxr_compose_checkMultipleCapabilities]
     // Example 1: check if enabling passthrough mode is allowed
diff --git a/xr/src/main/java/com/example/xr/scenecore/SpatialVideo.kt b/xr/src/main/java/com/example/xr/scenecore/SpatialVideo.kt
@@ -28,7 +28,6 @@ import androidx.xr.runtime.math.Vector3
 import androidx.xr.scenecore.SurfaceEntity
 import androidx.xr.scenecore.scene
 
-@Suppress("RestrictedApi") // b/416066566
 private fun ComponentActivity.surfaceEntityCreate(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreate]
     val stereoSurfaceEntity = SurfaceEntity.create(
@@ -51,7 +50,6 @@ private fun ComponentActivity.surfaceEntityCreate(xrSession: Session) {
     // [END androidxr_scenecore_surfaceEntityCreate]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun ComponentActivity.surfaceEntityCreateSbs(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreateSbs]
     // Set up the surface for playing a 180° video on a hemisphere.
@@ -69,7 +67,6 @@ private fun ComponentActivity.surfaceEntityCreateSbs(xrSession: Session) {
     // [END androidxr_scenecore_surfaceEntityCreateSbs]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun ComponentActivity.surfaceEntityCreateTb(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreateTb]
     // Set up the surface for playing a 360° video on a sphere.
@@ -87,7 +84,6 @@ private fun ComponentActivity.surfaceEntityCreateTb(xrSession: Session) {
     // [END androidxr_scenecore_surfaceEntityCreateTb]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun ComponentActivity.surfaceEntityCreateMVHEVC(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreateMVHEVC]
     // Create the SurfaceEntity with the StereoMode corresponding to the MV-HEVC content
@@ -111,7 +107,6 @@ private fun ComponentActivity.surfaceEntityCreateMVHEVC(xrSession: Session) {
     // [END androidxr_scenecore_surfaceEntityCreateMVHEVC]
 }
 
-@Suppress("RestrictedApi") // b/416066566
 private fun ComponentActivity.surfaceEntityCreateDRM(xrSession: Session) {
     // [START androidxr_scenecore_surfaceEntityCreateDRM]
     // Create a SurfaceEntity with DRM content

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ android {`
`25`	`25`	`buildFeatures {`
`26`	`26`	`compose = true`
`27`	`27`	`}`
	`28`	`+ lint {`
	`29`	`+ disable += "RestrictedApi"`
	`30`	`+ }`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ private fun createAnchorAtTrackable(trackable: Trackable<*>) {`
`63`	`63`	`// [END androidxr_arcore_anchor_create_trackable]`
`64`	`64`	`}`
`65`	`65`
`66`		`-@Suppress("RestrictedApi") // b/422174724`
`67`	`66`	`private fun attachEntityToAnchor(`
`68`	`67`	`session: Session,`
`69`	`68`	`entity: Entity,`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ fun secondaryHandDetection(activity: Activity, session: Session) {`
`76`	`76`	`// [END androidxr_arcore_hand_handedness]`
`77`	`77`	`}`
`78`	`78`
`79`		`-@Suppress("RestrictedApi") // b/416066566`
`80`	`79`	`fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {`
`81`	`80`	`val session: Session = null!!`
`82`	`81`	`val palmEntity: GltfModelEntity = null!!`
`@@ -97,7 +96,6 @@ fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {`
`97`	`96`	`// [END androidxr_arcore_hand_entityAtHandPalm]`
`98`	`97`	`}`
`99`	`98`
`100`		`-@Suppress("RestrictedApi") // b/416066566`
`101`	`99`	`fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {`
`102`	`100`	`val session: Session = null!!`
`103`	`101`	`val indexFingerEntity: GltfModelEntity = null!!`
`@@ -120,7 +118,6 @@ fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {`
`120`	`118`	`// [END androidxr_arcore_hand_entityAtIndexFingerTip]`
`121`	`119`	`}`
`122`	`120`
`123`		`-@Suppress("RestrictedApi") // b/416066566`
`124`	`121`	`private fun detectPinch(session: Session, handState: Hand.State): Boolean {`
`125`	`122`	`// [START androidxr_arcore_hand_pinch_gesture]`
`126`	`123`	`val thumbTip = handState.handJoints[HandJointType.THUMB_TIP] ?: return false`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ private suspend fun subscribePlanes(session: Session) {`
`48`	`48`	`// [END androidxr_arcore_planes_subscribe]`
`49`	`49`	`}`
`50`	`50`
`51`		`-@Suppress("RestrictedApi") // b/416066566`
`52`	`51`	`private fun hitTestTable(session: Session) {`
`53`	`52`	`val pose = session.scene.spatialUser.head?.transformPoseTo(Pose(), session.scene.perceptionSpace) ?: return`
`54`	`53`	`val ray = Ray(pose.translation, pose.forward)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ private fun SpatialCapabilitiesCheck() {`
`45`	`45`	`// [END androidxr_compose_checkSpatialCapabilities]`
`46`	`46`	`}`
`47`	`47`
`48`		`-@Suppress("RestrictedApi") // b/416066566`
`49`	`48`	`@Composable`
`50`	`49`	`private fun checkSpatialUiEnabled() {`
`51`	`50`	`// [START androidxr_compose_checkSpatialUiEnabled]`