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

Commit 62dba7a4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use new UnsupportedAppUsage annotation." am: b2c3eaaf am: 904b7f9d 

Change-Id: I62868fbcba5ffd65a441808e2a0cda59c9597654
parents c1f190a7 904b7f9d

core/java/com/android/ims/internal/uce/common/CapInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


package com.android.ims.internal.uce.common;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;



/** Class for capability discovery information.

 *  @hide */

core/java/com/android/ims/internal/uce/common/StatusCode.java

+1 −2
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


package com.android.ims.internal.uce.common;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;





/** Class for UCE status codes.

core/java/com/android/ims/internal/uce/common/UceLong.java

+1 −2
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ 


package com.android.ims.internal.uce.common;



import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;





/** Simple object wrapper for a long type.

core/java/com/android/ims/internal/uce/options/OptionsCapInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
 */

package com.android.ims.internal.uce.options;



import android.annotation.UnsupportedAppUsage;

import com.android.ims.internal.uce.common.CapInfo;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;



import com.android.ims.internal.uce.common.CapInfo;



/** @hide  */

public class OptionsCapInfo implements Parcelable {

core/java/com/android/ims/internal/uce/options/OptionsCmdId.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.ims.internal.uce.options;





import android.annotation.UnsupportedAppUsage;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;