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

Commit 080950f8 authored by Artur Satayev's avatar Artur Satayev Committed by android-build-merger
Browse files

Merge "Use new UnsupportedAppUsage annotation."

am: 16c94880

Change-Id: I4fdc076704229ad8a61b1f4d70f1bf3aaa5425fa
parents aad2183c 16c94880
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ java_library {
        "voip-common",
        "ims-common",
        "services",
        "unsupportedappusage",
    ],
    static_libs: [
        "android.hardware.radio.config-V1.0-java-shallow",
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@

package com.android.internal.telephony;

import android.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.os.AsyncResult;
import android.os.Handler;
+4 −4
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@

package com.android.internal.telephony;

import java.util.ArrayList;
import java.util.List;

import android.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.telephony.Rlog;

import com.android.ims.internal.ConferenceParticipant;

import java.util.ArrayList;
import java.util.List;

/**
 * {@hide}
 */
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package com.android.internal.telephony;

import android.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.telephony.Rlog;

/**
+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package com.android.internal.telephony;

import android.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context;
import android.os.AsyncResult;
import android.os.Handler;
@@ -27,7 +27,6 @@ import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneStateListener;
import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;

import com.android.internal.telephony.sip.SipPhone;

Loading