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

Commit 3dd18524 authored by Brad Ebinger's avatar Brad Ebinger Committed by Android (Google) Code Review
Browse files

Merge "Fix low hanging deps for APEX" into main

parents 62e8a512 4cbf0b8a

telecomm/framework/java/com/android/internal/telecom/IDeviceIdleControllerAdapter.aidl

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.telecom; 
/*

 * Adapter interface for using DeviceIdleController, since the PowerWhitelistManager is not

 * directly accessible in the SYSTEM process.

 * @hide

 */

interface IDeviceIdleControllerAdapter {

    void exemptAppTemporarilyForEvent(String packageName, long duration, int userHandle,

telecomm/framework/java/com/android/internal/telecom/IInternalServiceRetriever.aidl

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.internal.telecom.IDeviceIdleControllerAdapter; 
/*

 * Interface used to retrieve services that are only accessible via LocalService in the SYSTEM

 * process.

 * @hide

 */

interface IInternalServiceRetriever {

    IDeviceIdleControllerAdapter getDeviceIdleController();

telecomm/framework/java/com/android/internal/telecom/ITelecomLoader.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.internal.telecom.IInternalServiceRetriever; 
/*

 * Internal interface for getting an instance of the ITelecomService for external publication.

 * Allows the TelecomLoaderService to pass additional dependencies required for creation.

 * @hide

 */

interface ITelecomLoader {

    ITelecomService createTelecomService(IInternalServiceRetriever retriever, String sysUiName);

telephony/java/android/telephony/Annotation.java

+0 −27
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package android.telephony; 
import android.annotation.IntDef;

import android.net.NetworkAgent;

import android.net.NetworkCapabilities;

import android.telecom.Connection;

import android.telephony.data.ApnSetting;

import android.telephony.ims.ImsCallProfile;
@@ -594,32 +593,6 @@ public class Annotation { 
    public @interface CarrierPrivilegeStatus {

    }



    @IntDef({

            Connection.AUDIO_CODEC_NONE,

            Connection.AUDIO_CODEC_AMR,

            Connection.AUDIO_CODEC_AMR_WB,

            Connection.AUDIO_CODEC_QCELP13K,

            Connection.AUDIO_CODEC_EVRC,

            Connection.AUDIO_CODEC_EVRC_B,

            Connection.AUDIO_CODEC_EVRC_WB,

            Connection.AUDIO_CODEC_EVRC_NW,

            Connection.AUDIO_CODEC_GSM_EFR,

            Connection.AUDIO_CODEC_GSM_FR,

            Connection.AUDIO_CODEC_G711U,

            Connection.AUDIO_CODEC_G723,

            Connection.AUDIO_CODEC_G711A,

            Connection.AUDIO_CODEC_G722,

            Connection.AUDIO_CODEC_G711AB,

            Connection.AUDIO_CODEC_G729,

            Connection.AUDIO_CODEC_EVS_NB,

            Connection.AUDIO_CODEC_EVS_WB,

            Connection.AUDIO_CODEC_EVS_SWB,

            Connection.AUDIO_CODEC_EVS_FB

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ImsAudioCodec {

    }



    /**

     * UICC SIM Application Types

     */