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

Commit 5830d517 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Relax system server proguard keep rules" into main

parents 002f3f1e e916f430

services/core/java/com/android/server/SystemServiceManager.java

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ import com.android.server.am.EventLogTags; 
import com.android.server.pm.ApexManager;

import com.android.server.pm.UserManagerInternal;

import com.android.server.utils.TimingsTraceAndSlog;

import com.android.tools.r8.keepanno.annotations.KeepTarget;

import com.android.tools.r8.keepanno.annotations.TypePattern;

import com.android.tools.r8.keepanno.annotations.UsesReflection;



import dalvik.system.PathClassLoader;
@@ -207,6 +210,11 @@ public final class SystemServiceManager implements Dumpable { 
     * @throws RuntimeException if the service fails to start.

     */

    @android.ravenwood.annotation.RavenwoodKeep

    @UsesReflection(

            @KeepTarget(

                    instanceOfClassConstantExclusive = SystemService.class,

                    methodName = "<init>",

                    methodParameterTypePatterns = {@TypePattern(constant = Context.class)}))

    public <T extends SystemService> T startService(Class<T> serviceClass) {

        try {

            final String name = serviceClass.getName();

services/proguard.flags

+0 −5
Original line number Diff line number Diff line
@@ -29,11 +29,6 @@ 
  public protected *;

}



# Derivatives of SystemService and other services created via reflection

-keep,allowoptimization,allowaccessmodification class * extends com.android.server.SystemService {

  public <methods>;

}



# Accessed from com.android.compos APEX

-keep,allowoptimization,allowaccessmodification class com.android.internal.art.ArtStatsLog {

   public static void write(...);