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

Commit 2fd8c74c authored by Charlie Boutier's avatar Charlie Boutier Committed by Thomas Girardier
Browse files

[Pandora] - Add shell functionality 

Bug: 245578454
Test: manual
Ignore-AOSP-First: cherry-pick from aosp
Merged-In: Idb86d4331e385c58e8221b144dced4dfa49d615a
Change-Id: Idb86d4331e385c58e8221b144dced4dfa49d615a
parent 1e331e80

android/pandora/server/configs/PtsBotTest.xml

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
        <option name="install-arg" value="-g" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">

      <option name="force-root" value="true"/>

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RunHostCommandTargetPreparer">

        <option name="host-background-command" value="adb -s $SERIAL shell am instrument --no-hidden-api-checks -w com.android.pandora/.Main" />

    </target_preparer>

android/pandora/server/configs/PtsBotTestMts.xml

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 
        <option name="install-arg" value="-g" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">

      <option name="force-root" value="true"/>

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RunHostCommandTargetPreparer">

        <option name="host-background-command" value="adb -s $SERIAL shell am instrument --no-hidden-api-checks -w com.android.pandora/.Main" />

    </target_preparer>

android/pandora/server/src/com/android/pandora/Utils.kt

+11 −0
Original line number Diff line number Diff line
@@ -25,9 +25,14 @@ import android.content.Context 
import android.content.Intent

import android.content.IntentFilter

import android.net.MacAddress

import android.os.ParcelFileDescriptor

import androidx.test.platform.app.InstrumentationRegistry

import com.google.protobuf.ByteString

import io.grpc.stub.StreamObserver

import java.io.BufferedReader

import java.io.InputStreamReader

import java.util.concurrent.CancellationException

import java.util.stream.Collectors

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Job

import kotlinx.coroutines.channels.awaitClose
@@ -47,6 +52,12 @@ import kotlinx.coroutines.withTimeout 
import kotlinx.coroutines.withTimeoutOrNull

import pandora.HostProto.Connection



fun shell(cmd: String): String {

  val fd = InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(cmd)

  val input_stream = ParcelFileDescriptor.AutoCloseInputStream(fd)

  return BufferedReader(InputStreamReader(input_stream)).lines().collect(Collectors.joining("\n"))

}



/**

 * Creates a cold flow of intents based on an intent filter. If used multiple times in a same class,

 * this flow should be transformed into a shared flow.