Skip to content

Commit

Permalink
Adding VcnManagementService to ShadowSystemServices for VCN-related t…
Browse files Browse the repository at this point in the history
…ests.

PiperOrigin-RevId: 409253263
  • Loading branch information
Googler authored and copybara-robolectric committed Nov 22, 2021
1 parent bda68fd commit 16be51c
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 0 deletions.
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Manifest for ATSL integration tests
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.robolectric.integration.axt">
<uses-sdk android:targetSdkVersion="28"/>

<uses-permission android:name="android.permission.READ_CONTACTS"/>

<application>
<activity android:name="org.robolectric.integrationtests.axt.EspressoActivity"
android:label="Activity Label"
android:exported="true" />
<activity android:name="org.robolectric.integrationtests.axt.ActivityWithPlatformMenu"
android:exported="true">
</activity>
<activity android:name="org.robolectric.integrationtests.axt.ActivityWithAppCompatMenu"
android:exported="true"
android:theme="@style/Theme.AppCompat" />
<activity android:name="org.robolectric.integrationtests.axt.AppCompatActivityWithToolbarMenu"
android:exported="true"
android:theme="@style/Theme.AppCompat.NoActionBar" />
<activity android:name="org.robolectric.integrationtests.axt.ActivityWithSwitchCompat"
android:exported="true"
android:theme="@style/Theme.AppCompat" />
<activity android:name="org.robolectric.integrationtests.axt.StubBrowserActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
</intent-filter>
</activity>
</application>
</manifest>
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="org.robolectric.integrationtests.axt">

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="27"/>

<application>
<activity android:name=".EspressoActivity" android:exported="true"/>
</application>

<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="org.robolectric.integration.axt"/>

</manifest>
Expand Up @@ -55,6 +55,7 @@
import android.net.INetworkScoreService;
import android.net.ITetheringConnector;
import android.net.nsd.INsdManager;
import android.net.vcn.IVcnManagementService;
import android.net.wifi.IWifiManager;
import android.net.wifi.aware.IWifiAwareManager;
import android.net.wifi.p2p.IWifiP2pManager;
Expand Down Expand Up @@ -192,6 +193,7 @@ public class ShadowServiceManager {
addBinderService(Context.SPEECH_RECOGNITION_SERVICE, IRecognitionServiceManager.class);
addBinderService(Context.LEGACY_PERMISSION_SERVICE, ILegacyPermissionManager.class);
addBinderService(Context.UWB_SERVICE, IUwbAdapter.class);
addBinderService(Context.VCN_MANAGEMENT_SERVICE, IVcnManagementService.class);
}
}

Expand Down

0 comments on commit 16be51c

Please sign in to comment.