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

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

Merge "Clean up reflection-related services keep rules" into main

parents 760a44e4 5123eb38

apex/jobscheduler/service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ java_library { 
        "app-compat-annotations",

        "error_prone_annotations",

        "framework",

        "keepanno-annotations",

        "services.core",

        "unsupportedappusage",

    ],

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ import com.android.server.AppSchedulingModuleThread; 
import com.android.server.LocalServices;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.usage.AppIdleHistory.AppUsageHistory;

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

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



import libcore.util.EmptyArray;
@@ -588,6 +590,8 @@ public class AppStandbyController 
        }

    }



    // This constructor is reflectively invoked from framework code in AppStandbyInternal.

    @UsedByReflection(kind = KeepItemKind.CLASS_AND_METHODS)

    public AppStandbyController(Context context) {

        this(new Injector(context, AppSchedulingModuleThread.get().getLooper()));

    }

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ java_library { 
    libs: [

        "android.hidl.manager-V1.0-java",

        "framework-tethering.stubs.module_lib",

        "keepanno-annotations",

        "service-art.stubs.system_server",

        "service-permission.stubs.system_server",

        "service-rkp.stubs.system_server",

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ java_library_static { 
        "android.hardware.vibrator-V2-java",

        "app-compat-annotations",

        "framework-tethering.stubs.module_lib",

        "keepanno-annotations",

        "service-art.stubs.system_server",

        "service-permission.stubs.system_server",

        "service-rkp.stubs.system_server",

services/core/java/com/android/server/notification/RankingHelper.java

+11 −1
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ import android.util.ArrayMap; 
import android.util.Slog;

import android.util.proto.ProtoOutputStream;



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

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

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



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Collections;
@@ -44,7 +48,13 @@ public class RankingHelper { 
    private final Context mContext;

    private final RankingHandler mRankingHandler;





    @UsesReflection(

            value = {

                @KeepTarget(

                        kind = KeepItemKind.CLASS_AND_MEMBERS,

                        instanceOfClassConstantExclusive = NotificationSignalExtractor.class,

                        methodName = "<init>")

            })

    public RankingHelper(Context context, RankingHandler rankingHandler, RankingConfig config,

            ZenModeHelper zenHelper, NotificationUsageStats usageStats, String[] extractorNames) {

        mContext = context;