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

Commit 8b5f4c7e authored by Yisroel Forta's avatar Yisroel Forta Committed by Android (Google) Code Review
Browse files

Merge changes from topics "dev-telemetry", "profiling-apis" into main 

* changes:
  Start Profiling service
  APIs for Profiling module initialization
parents 3a9bd8fc cd13f869

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10725,6 +10725,7 @@ package android.content { 
    field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint";

    field public static final String POWER_SERVICE = "power";

    field public static final String PRINT_SERVICE = "print";

    field @FlaggedApi("android.os.telemetry_apis_framework_initialization") public static final String PROFILING_SERVICE = "profiling";

    field public static final int RECEIVER_EXPORTED = 2; // 0x2

    field public static final int RECEIVER_NOT_EXPORTED = 4; // 0x4

    field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1

core/api/module-lib-current.txt

+13 −0
Original line number Diff line number Diff line
@@ -412,6 +412,19 @@ package android.os { 
    field public static final int VPN_UID = 1016; // 0x3f8

  }



  @FlaggedApi("android.os.telemetry_apis_framework_initialization") public class ProfilingServiceManager {

    method @NonNull public android.os.ProfilingServiceManager.ServiceRegisterer getProfilingServiceRegisterer();

  }



  public static class ProfilingServiceManager.ServiceNotFoundException extends java.lang.Exception {

    ctor public ProfilingServiceManager.ServiceNotFoundException(@NonNull String);

  }



  public static final class ProfilingServiceManager.ServiceRegisterer {

    method @Nullable public android.os.IBinder get();

    method @Nullable public android.os.IBinder getOrThrow() throws android.os.ProfilingServiceManager.ServiceNotFoundException;

  }



  public final class ServiceManager {

    method @NonNull public static String[] getDeclaredInstances(@NonNull String);

    method public static boolean isDeclared(@NonNull String);

core/java/android/app/ActivityThread.java

+5 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ import android.os.Parcel; 
import android.os.ParcelFileDescriptor;

import android.os.PersistableBundle;

import android.os.Process;

import android.os.ProfilingFrameworkInitializer;

import android.os.ProfilingServiceManager;

import android.os.RemoteCallback;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -8588,6 +8590,9 @@ public final class ActivityThread extends ClientTransactionHandler 
        NfcFrameworkInitializer.setNfcServiceManager(new NfcServiceManager());

        DeviceConfigInitializer.setDeviceConfigServiceManager(new DeviceConfigServiceManager());

        SeFrameworkInitializer.setSeServiceManager(new SeServiceManager());

        if (android.server.Flags.telemetryApisService()) {

            ProfilingFrameworkInitializer.setProfilingServiceManager(new ProfilingServiceManager());

        }

    }



    private void purgePendingResources() {

core/java/android/app/SystemServiceRegistry.java

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ import android.os.IncidentManager; 
import android.os.PerformanceHintManager;

import android.os.PermissionEnforcer;

import android.os.PowerManager;

import android.os.ProfilingFrameworkInitializer;

import android.os.RecoverySystem;

import android.os.SecurityStateManager;

import android.os.ServiceManager;
@@ -1662,6 +1663,9 @@ public final class SystemServiceRegistry { 
            if (android.permission.flags.Flags.enhancedConfirmationModeApisEnabled()) {

                EnhancedConfirmationFrameworkInitializer.registerServiceWrappers();

            }

            if (android.server.Flags.telemetryApisService()) {

                ProfilingFrameworkInitializer.registerServiceWrappers();

            }

        } finally {

            // If any of the above code throws, we're in a pretty bad shape and the process

            // will likely crash, but we'll reset it just in case there's an exception handler...

core/java/android/content/Context.java

+9 −0
Original line number Diff line number Diff line
@@ -6552,6 +6552,15 @@ public abstract class Context { 
    @FlaggedApi(android.provider.Flags.FLAG_USER_KEYS)

    public static final String CONTACT_KEYS_SERVICE = "contact_keys";



    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * {@link android.os.ProfilingManager}.

     *

     * @see #getSystemService(String)

     */

    @FlaggedApi(android.os.Flags.FLAG_TELEMETRY_APIS_FRAMEWORK_INITIALIZATION)

    public static final String PROFILING_SERVICE = "profiling";



    /**

     * Determine whether the given permission is allowed for a particular

     * process and user ID running in the system.