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

Commit 8d6962ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add vm name and version to am capabilities" into main am: 9e319787 am: d333c8a2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3086485



Change-Id: Iae0ef015767c98cb02d482bbf6b2721fa5917058
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c9ccc46 d333c8a2

proto/src/am_capabilities.proto

+8 −0
Original line number Diff line number Diff line
@@ -15,8 +15,16 @@ message FrameworkCapability { 
  string name  = 1;

}



message VMInfo {

  // The value of the "java.vm.name" system property

  string name = 1;

  // The value of the "java.vm.version" system property

  string version = 2;

}



message Capabilities {

  repeated Capability values = 1;

  repeated VMCapability vm_capabilities = 2;

  repeated FrameworkCapability framework_capabilities = 3;

  VMInfo vm_info = 4;

}

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+10 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ import com.android.server.am.nano.Capabilities; 
import com.android.server.am.nano.Capability;

import com.android.server.am.nano.FrameworkCapability;

import com.android.server.am.nano.VMCapability;

import com.android.server.am.nano.VMInfo;

import com.android.server.compat.PlatformCompat;

import com.android.server.pm.UserManagerInternal;

import com.android.server.utils.Slogf;
@@ -460,6 +461,8 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                return -1;

            }

        }

        String vmName = System.getProperty("java.vm.name", "?");

        String vmVersion = System.getProperty("java.vm.version", "?");



        if (outputAsProtobuf) {

            Capabilities capabilities = new Capabilities();
@@ -486,6 +489,11 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                capabilities.frameworkCapabilities[i] = cap;

            }



            VMInfo vmInfo = new VMInfo();

            vmInfo.name = vmName;

            vmInfo.version = vmVersion;

            capabilities.vmInfo = vmInfo;



            try {

                getRawOutputStream().write(Capabilities.toByteArray(capabilities));

            } catch (IOException e) {
@@ -505,6 +513,8 @@ final class ActivityManagerShellCommand extends ShellCommand { 
            for (String capability : Debug.getFeatureList()) {

                pw.println("framework:" + capability);

            }

            pw.println("vm_name:" + vmName);

            pw.println("vm_version:" + vmVersion);

        }

        return 0;

    }