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

Commit d7a56a04 authored by Roshan Pius's avatar Roshan Pius
Browse files

se(api): Expose SEServiceManager to retrieve SE service

Similar to NfcServiceManager and other mainline module service classes.

Bug: 263563609
Test: Compiles

Change-Id: I3ad94afd403015e1fd23e5de53db559ad9840036
parent 51c5d5ed
Loading
Loading
Loading
Loading
+24 −0
Original line number Diff line number Diff line
@@ -554,6 +554,30 @@ package android.provider {

}

package android.se.omapi {

  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public class SeFrameworkInitializer {
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public static android.se.omapi.SeServiceManager getSeServiceManager();
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static void setSeServiceManager(@NonNull android.se.omapi.SeServiceManager);
  }

  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public class SeServiceManager {
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.se.omapi.SeServiceManager.ServiceRegisterer getSeManagerServiceRegisterer();
  }

  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static class SeServiceManager.ServiceNotFoundException extends java.lang.Exception {
    ctor @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public SeServiceManager.ServiceNotFoundException(@NonNull String);
  }

  @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public static final class SeServiceManager.ServiceRegisterer {
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public android.os.IBinder get();
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @NonNull public android.os.IBinder getOrThrow() throws android.se.omapi.SeServiceManager.ServiceNotFoundException;
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) public void register(@NonNull android.os.IBinder);
    method @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE) @Nullable public android.os.IBinder tryGet();
  }

}

package android.telecom {

  public abstract class ConnectionService extends android.app.Service {
+3 −1
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ import android.provider.Downloads;
import android.provider.FontsContract;
import android.provider.Settings;
import android.renderscript.RenderScriptCacheDir;
import android.se.omapi.SeFrameworkInitializer;
import android.se.omapi.SeServiceManager;
import android.security.NetworkSecurityPolicy;
import android.security.net.config.NetworkSecurityConfigProvider;
import android.system.ErrnoException;
@@ -8379,8 +8381,8 @@ public final class ActivityThread extends ClientTransactionHandler
            BinderCallsStats.startForBluetooth(context);
        });
        NfcFrameworkInitializer.setNfcServiceManager(new NfcServiceManager());

        DeviceConfigInitializer.setDeviceConfigServiceManager(new DeviceConfigServiceManager());
        SeFrameworkInitializer.setSeServiceManager(new SeServiceManager());
    }

    private void purgePendingResources() {
+70 −0
Original line number Diff line number Diff line
/*
 * Copyright 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 android.se.omapi;

import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.nfc.Flags;

/**
 * Class for performing registration for SE service.
 *
 * @hide
 */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
public class SeFrameworkInitializer {
    private SeFrameworkInitializer() {}

    private static volatile SeServiceManager sSeServiceManager;

    /**
     * Sets an instance of {@link SeServiceManager} that allows
     * the se mainline module to register/obtain se binder services. This is called
     * by the platform during the system initialization.
     *
     * @param seServiceManager instance of {@link SeServiceManager} that allows
     * the se/nfc mainline module to register/obtain se binder services.
     */
    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
    public static void setSeServiceManager(
            @NonNull SeServiceManager seServiceManager) {
        if (sSeServiceManager != null) {
            throw new IllegalStateException("setSeServiceManager called twice!");
        }

        if (seServiceManager == null) {
            throw new IllegalArgumentException("seServiceManager must not be null");
        }

        sSeServiceManager = seServiceManager;
    }

    /**
     * Gets an instance of {@link SeServiceManager} that allows
     * the se mainline module to register/obtain se binder services.
     *
     * @return instance of {@link SeServiceManager} that allows
     * the se/nfc mainline module to register/obtain se binder services.
     */
    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
    @Nullable
    public static SeServiceManager getSeServiceManager() {
        return sSeServiceManager;
    }
}
+140 −0
Original line number Diff line number Diff line
/*
 * Copyright 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.
 */


/**********************************************************************
 * This file is not a part of the SE mainline module                 *
 * *******************************************************************/

package android.se.omapi;

import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.SystemApi.Client;
import android.content.Context;
import android.nfc.Flags;
import android.os.IBinder;
import android.os.ServiceManager;

/**
 * Provides a way to register and obtain the system service binder objects managed by the
 * SecureElement service.
 *
 * @hide
 */
@SystemApi(client = Client.MODULE_LIBRARIES)
@FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
public class SeServiceManager {

    /**
     * @hide
     */
    public SeServiceManager() {
    }

    /**
     * A class that exposes the methods to register and obtain each system service.
     * @hide
     */
    @SystemApi(client = Client.MODULE_LIBRARIES)
    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
    public static final class ServiceRegisterer {
        private final String mServiceName;

        /**
         * @hide
         */
        public ServiceRegisterer(String serviceName) {
            mServiceName = serviceName;
        }

        /**
         * Register a system server binding object for a service.
         */
        @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
        public void register(@NonNull IBinder service) {
            ServiceManager.addService(mServiceName, service);
        }

        /**
         * Get the system server binding object for a service.
         *
         * <p>This blocks until the service instance is ready,
         * or a timeout happens, in which case it returns null.
         */
        @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
        @Nullable
        public IBinder get() {
            return ServiceManager.getService(mServiceName);
        }

        /**
         * Get the system server binding object for a service.
         *
         * <p>This blocks until the service instance is ready,
         * or a timeout happens, in which case it throws {@link ServiceNotFoundException}.
         */
        @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
        @NonNull
        public IBinder getOrThrow() throws ServiceNotFoundException {
            try {
                return ServiceManager.getServiceOrThrow(mServiceName);
            } catch (ServiceManager.ServiceNotFoundException e) {
                throw new ServiceNotFoundException(mServiceName);
            }
        }

        /**
         * Get the system server binding object for a service. If the specified service is
         * not available, it returns null.
         */
        @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
        @Nullable
        public IBinder tryGet() {
            return ServiceManager.checkService(mServiceName);
        }
    }

    /**
     * See {@link ServiceRegisterer#getOrThrow}.
     * @hide
     */
    @SystemApi(client = Client.MODULE_LIBRARIES)
    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
    public static class ServiceNotFoundException extends ServiceManager.ServiceNotFoundException {
        /**
         * Constructor.
         *
         * @param name the name of the binder service that cannot be found.
         *
         */
        @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
        public ServiceNotFoundException(@NonNull String name) {
            super(name);
        }
    }

    /**
     * Returns {@link ServiceRegisterer} for the "secure_element" service.
     */
    @FlaggedApi(Flags.FLAG_ENABLE_NFC_MAINLINE)
    @NonNull
    public ServiceRegisterer getSeManagerServiceRegisterer() {
        return new ServiceRegisterer(Context.SECURE_ELEMENT_SERVICE);
    }
}