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

Commit d568d1ba authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Add callback for atom for MTE state" into udc-dev am: 5b1b82c3 

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



Change-Id: I8aa9bbb942108140c6f01bd92f6d94626f58838d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b245aea 5b1b82c3

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server;



import android.app.StatsManager;

import android.content.Context;

import android.util.StatsEvent;



import com.android.internal.os.BackgroundThread;

import com.android.internal.os.Zygote;

import com.android.internal.util.FrameworkStatsLog;



import java.util.List;



public class LogMteState {

    public static void register(Context context) {

        context.getSystemService(StatsManager.class)

                .setPullAtomCallback(

                        FrameworkStatsLog.MTE_STATE,

                        null, // use default PullAtomMetadata values

                        BackgroundThread.getExecutor(),

                        new StatsManager.StatsPullAtomCallback() {

                            @Override

                            public int onPullAtom(int atomTag, List<StatsEvent> data) {

                                if (atomTag != FrameworkStatsLog.MTE_STATE) {

                                    throw new UnsupportedOperationException(

                                            "Unknown tagId=" + atomTag);

                                }

                                data.add(

                                        FrameworkStatsLog.buildStatsEvent(

                                                FrameworkStatsLog.MTE_STATE,

                                                Zygote.nativeSupportsMemoryTagging()

                                                        ? FrameworkStatsLog.MTE_STATE__STATE__ON

                                                        : FrameworkStatsLog.MTE_STATE__STATE__OFF));

                                return StatsManager.PULL_SUCCESS;

                            }

                        });

    }

}

services/java/com/android/server/SystemServer.java

+8 −0
Original line number Diff line number Diff line
@@ -2739,6 +2739,14 @@ public final class SystemServer implements Dumpable { 
        }

        t.traceEnd();



        t.traceBegin("RegisterLogMteState");

        try {

            LogMteState.register(context);

        } catch (Throwable e) {

            reportWtf("RegisterLogMteState", e);

        }

        t.traceEnd();



        // Emit any pending system_server WTFs

        synchronized (SystemService.class) {

            if (sPendingWtfs != null) {