Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 461675e7 authored by Chun Zhang's avatar Chun Zhang
Browse files

Support tests run by non-system user. 

Followed guideline doc https://g3doc.corp.google.com/company/teams/android/teampages/android-rubidium/eng/guides/dev-guide/rb-test-mu.md?cl=head

Test: atest  --user-type secondary_user   FrameworksWifiNonUpdatableApiTests:android.net.wifi.sharedconnectivity.service.SharedConnectivityServiceTest
Flag: EXEMPT test
Fixes: 396862192

Change-Id: Ie951a51f2f95049713796ae23b1077157cddfeba
parent 9eef798c

wifi/tests/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityServiceTest.java

+15 −5
Original line number Diff line number Diff line
@@ -42,9 +42,11 @@ import android.net.wifi.sharedconnectivity.app.KnownNetwork; 
import android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus;

import android.net.wifi.sharedconnectivity.app.NetworkProviderInfo;

import android.net.wifi.sharedconnectivity.app.SharedConnectivitySettingsState;

import android.os.Build;

import android.os.Bundle;

import android.os.IBinder;

import android.os.Looper;

import android.os.Process;

import android.os.RemoteException;



import androidx.annotation.NonNull;
@@ -421,10 +423,18 @@ public class SharedConnectivityServiceTest { 
    }



    private SharedConnectivitySettingsState buildSettingsState() {

        return new SharedConnectivitySettingsState.Builder().setInstantTetherEnabled(true)

                .setInstantTetherSettingsPendingIntent(

                        PendingIntent.getActivity(mContext, 0, new Intent(),

                                PendingIntent.FLAG_IMMUTABLE))

                .setExtras(Bundle.EMPTY).build();

        PendingIntent pendingIntent = null;

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {

            pendingIntent = PendingIntent.getActivityAsUser(mContext, 0, new Intent(),

                    PendingIntent.FLAG_IMMUTABLE, null, Process.myUserHandle());

        } else {

            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(),

                    PendingIntent.FLAG_IMMUTABLE);

        }

        return new SharedConnectivitySettingsState.Builder()

            .setInstantTetherEnabled(true)

            .setInstantTetherSettingsPendingIntent(pendingIntent)

            .setExtras(Bundle.EMPTY)

            .build();

    }

}