Merge "Remove usage of @DoNotInline for manual NewApi outlines (Cr thru P)" into androidx-main
diff --git a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
index 74932be..f76e8ab 100644
--- a/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
+++ b/credentials/credentials-play-services-auth/src/main/java/androidx/credentials/playservices/controllers/CreatePublicKeyCredential/PublicKeyCredentialControllerUtility.kt
@@ -24,7 +24,6 @@
import android.os.Build
import android.util.Base64
import android.util.Log
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.credentials.CreatePublicKeyCredentialRequest
import androidx.credentials.GetPublicKeyCredentialOption
@@ -599,8 +598,6 @@
@RequiresApi(28)
private object GetGMSVersion {
- @JvmStatic
- @DoNotInline
- fun getVersionLong(info: PackageInfo): Long = info.getLongVersionCode()
+ @JvmStatic fun getVersionLong(info: PackageInfo): Long = info.getLongVersionCode()
}
}
diff --git a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialRequest.kt b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialRequest.kt
index c08ab46..9221f87 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialRequest.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialRequest.kt
@@ -18,7 +18,6 @@
import android.os.Build
import android.os.Bundle
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.credentials.provider.utils.BeginCreateCredentialUtil
@@ -35,7 +34,6 @@
private const val REQUEST_KEY = "androidx.credentials.provider.BeginCreateCredentialRequest"
@JvmStatic
- @DoNotInline
fun asBundle(bundle: Bundle, request: BeginCreateCredentialRequest) {
bundle.putParcelable(
REQUEST_KEY,
@@ -44,7 +42,6 @@
}
@JvmStatic
- @DoNotInline
fun fromBundle(bundle: Bundle): BeginCreateCredentialRequest? {
val frameworkRequest =
bundle.getParcelable(
diff --git a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialResponse.kt b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialResponse.kt
index d4dff8ce..2e44157 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialResponse.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginCreateCredentialResponse.kt
@@ -18,7 +18,6 @@
import android.os.Build
import android.os.Bundle
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.credentials.provider.utils.BeginCreateCredentialUtil
@@ -105,7 +104,6 @@
"androidx.credentials.provider.BeginCreateCredentialResponse"
@JvmStatic
- @DoNotInline
fun asBundle(bundle: Bundle, response: BeginCreateCredentialResponse) {
bundle.putParcelable(
REQUEST_KEY,
@@ -114,7 +112,6 @@
}
@JvmStatic
- @DoNotInline
fun fromBundle(bundle: Bundle): BeginCreateCredentialResponse? {
val frameworkResponse =
bundle.getParcelable(
diff --git a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialRequest.kt b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialRequest.kt
index 7e17f1e..4efedd6 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialRequest.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialRequest.kt
@@ -18,7 +18,6 @@
import android.os.Build
import android.os.Bundle
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.credentials.provider.utils.BeginGetCredentialUtil
@@ -49,7 +48,6 @@
private const val REQUEST_KEY = "androidx.credentials.provider.BeginGetCredentialRequest"
@JvmStatic
- @DoNotInline
fun asBundle(bundle: Bundle, request: BeginGetCredentialRequest) {
bundle.putParcelable(
REQUEST_KEY,
@@ -58,7 +56,6 @@
}
@JvmStatic
- @DoNotInline
fun fromBundle(bundle: Bundle): BeginGetCredentialRequest? {
val frameworkRequest =
bundle.getParcelable(
diff --git a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialResponse.kt b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialResponse.kt
index 6d8b754..4e8fc09 100644
--- a/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialResponse.kt
+++ b/credentials/credentials/src/main/java/androidx/credentials/provider/BeginGetCredentialResponse.kt
@@ -18,7 +18,6 @@
import android.os.Build
import android.os.Bundle
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.credentials.provider.utils.BeginGetCredentialUtil
@@ -153,7 +152,6 @@
private const val REQUEST_KEY = "androidx.credentials.provider.BeginGetCredentialResponse"
@JvmStatic
- @DoNotInline
fun asBundle(bundle: Bundle, response: BeginGetCredentialResponse) {
bundle.putParcelable(
REQUEST_KEY,
@@ -162,7 +160,6 @@
}
@JvmStatic
- @DoNotInline
fun fromBundle(bundle: Bundle): BeginGetCredentialResponse? {
val frameworkResponse =
bundle.getParcelable(
diff --git a/datastore/datastore/src/androidMain/kotlin/androidx/datastore/migrations/SharedPreferencesMigration.android.kt b/datastore/datastore/src/androidMain/kotlin/androidx/datastore/migrations/SharedPreferencesMigration.android.kt
index 55c02ee..df850ea 100644
--- a/datastore/datastore/src/androidMain/kotlin/androidx/datastore/migrations/SharedPreferencesMigration.android.kt
+++ b/datastore/datastore/src/androidMain/kotlin/androidx/datastore/migrations/SharedPreferencesMigration.android.kt
@@ -19,7 +19,6 @@
import android.content.Context
import android.content.SharedPreferences
import android.os.Build
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.datastore.core.DataMigration
import java.io.File
@@ -205,7 +204,6 @@
@RequiresApi(24)
private object Api24Impl {
@JvmStatic
- @DoNotInline
fun deleteSharedPreferences(context: Context, name: String): Boolean {
return context.deleteSharedPreferences(name)
}
diff --git a/draganddrop/draganddrop/src/main/java/androidx/draganddrop/DropAffordanceHighlighter.java b/draganddrop/draganddrop/src/main/java/androidx/draganddrop/DropAffordanceHighlighter.java
index adb0647..d557e59 100644
--- a/draganddrop/draganddrop/src/main/java/androidx/draganddrop/DropAffordanceHighlighter.java
+++ b/draganddrop/draganddrop/src/main/java/androidx/draganddrop/DropAffordanceHighlighter.java
@@ -39,7 +39,6 @@
import android.view.View;
import androidx.annotation.ColorInt;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -223,7 +222,6 @@
@RequiresApi(Build.VERSION_CODES.Q)
private static class Api29BackUpImpl {
- @DoNotInline
static void backUp(DropAffordanceHighlighter highlighter) {
highlighter.mOriginalForegroundTintBlendMode =
highlighter.mViewToHighlight.getForegroundTintBlendMode();
@@ -233,7 +231,6 @@
@RequiresApi(Build.VERSION_CODES.Q)
private static class Api29RestoreImpl {
- @DoNotInline
static void restore(DropAffordanceHighlighter highlighter) {
highlighter.mViewToHighlight.setForegroundTintBlendMode(
highlighter.mOriginalForegroundTintBlendMode);
diff --git a/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java b/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
index 1ee2af5..da9fcb2 100644
--- a/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
+++ b/drawerlayout/drawerlayout/src/main/java/androidx/drawerlayout/widget/DrawerLayout.java
@@ -46,7 +46,6 @@
import android.window.OnBackInvokedDispatcher;
import androidx.annotation.ColorInt;
-import androidx.annotation.DoNotInline;
import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
@@ -2550,7 +2549,6 @@
// This class is not instantiable.
}
- @DoNotInline
static void tryRegisterOnBackInvokedCallback(@NonNull Object dispatcherObj,
@NonNull Object callback) {
OnBackInvokedDispatcher dispatcher = (OnBackInvokedDispatcher) dispatcherObj;
@@ -2558,7 +2556,6 @@
(OnBackInvokedCallback) callback);
}
- @DoNotInline
static void tryUnregisterOnBackInvokedCallback(@NonNull Object dispatcherObj,
@NonNull Object callbackObj) {
OnBackInvokedDispatcher dispatcher = (OnBackInvokedDispatcher) dispatcherObj;
@@ -2566,13 +2563,11 @@
}
@Nullable
- @DoNotInline
static OnBackInvokedDispatcher findOnBackInvokedDispatcher(@NonNull DrawerLayout view) {
return view.findOnBackInvokedDispatcher();
}
@NonNull
- @DoNotInline
static OnBackInvokedCallback newOnBackInvokedCallback(@NonNull Runnable action) {
return action::run;
}
diff --git a/emoji2/emoji2/src/main/java/androidx/emoji2/text/ConcurrencyHelpers.java b/emoji2/emoji2/src/main/java/androidx/emoji2/text/ConcurrencyHelpers.java
index 8b13e60..060086e 100644
--- a/emoji2/emoji2/src/main/java/androidx/emoji2/text/ConcurrencyHelpers.java
+++ b/emoji2/emoji2/src/main/java/androidx/emoji2/text/ConcurrencyHelpers.java
@@ -21,7 +21,6 @@
import android.os.Looper;
import android.os.Process;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -104,7 +103,6 @@
// Non-instantiable.
}
- @DoNotInline
public static Handler createAsync(Looper looper) {
return Handler.createAsync(looper);
}
diff --git a/emoji2/emoji2/src/main/java/androidx/emoji2/text/EmojiExclusions.java b/emoji2/emoji2/src/main/java/androidx/emoji2/text/EmojiExclusions.java
index f93959c..bfe5806 100644
--- a/emoji2/emoji2/src/main/java/androidx/emoji2/text/EmojiExclusions.java
+++ b/emoji2/emoji2/src/main/java/androidx/emoji2/text/EmojiExclusions.java
@@ -19,7 +19,6 @@
import android.annotation.SuppressLint;
import android.os.Build;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -44,7 +43,6 @@
private EmojiExclusions_Api34() { /* cannot instantiate */ }
@NonNull
- @DoNotInline
static Set<int[]> getExclusions() {
// TODO: Call directly when API34 is published
return EmojiExclusions_Reflections.getExclusions();
diff --git a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterfaceUtils.java b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterfaceUtils.java
index a7033b4..5958a03 100644
--- a/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterfaceUtils.java
+++ b/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterfaceUtils.java
@@ -23,7 +23,6 @@
import android.system.Os;
import android.util.Log;
-import androidx.annotation.DoNotInline;
import androidx.annotation.RequiresApi;
import java.io.Closeable;
@@ -164,17 +163,14 @@
static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static FileDescriptor dup(FileDescriptor fileDescriptor) throws ErrnoException {
return Os.dup(fileDescriptor);
}
- @DoNotInline
static long lseek(FileDescriptor fd, long offset, int whence) throws ErrnoException {
return Os.lseek(fd, offset, whence);
}
- @DoNotInline
static void close(FileDescriptor fd) throws ErrnoException {
Os.close(fd);
}
@@ -184,7 +180,6 @@
static class Api23Impl {
private Api23Impl() {}
- @DoNotInline
static void setDataSource(MediaMetadataRetriever retriever, MediaDataSource dataSource) {
retriever.setDataSource(dataSource);
}
diff --git a/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.kt b/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.kt
index 66aa154..b1923e8 100644
--- a/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.kt
+++ b/fragment/fragment/src/main/java/androidx/fragment/app/DefaultSpecialEffectsController.kt
@@ -27,7 +27,6 @@
import android.view.ViewGroup
import android.view.animation.Animation
import androidx.activity.BackEventCompat
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.collection.ArrayMap
import androidx.core.view.OneShotPreDrawListener
@@ -1210,7 +1209,6 @@
@RequiresApi(24)
internal object Api24Impl {
- @DoNotInline
fun totalDuration(animatorSet: AnimatorSet): Long {
return animatorSet.totalDuration
}
@@ -1218,12 +1216,10 @@
@RequiresApi(26)
internal object Api26Impl {
- @DoNotInline
fun reverse(animatorSet: AnimatorSet) {
animatorSet.reverse()
}
- @DoNotInline
fun setCurrentPlayTime(animatorSet: AnimatorSet, time: Long) {
animatorSet.currentPlayTime = time
}
diff --git a/glance/glance-appwidget/lint-baseline.xml b/glance/glance-appwidget/lint-baseline.xml
index c90172e..d5bde38 100644
--- a/glance/glance-appwidget/lint-baseline.xml
+++ b/glance/glance-appwidget/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0-alpha06)" variant="all" version="8.5.0-alpha06">
+<issues format="6" by="lint 8.6.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0-alpha07)" variant="all" version="8.6.0-alpha07">
<issue
id="BanThreadSleep"
@@ -507,42 +507,6 @@
<issue
id="PrimitiveInCollection"
- message="variable children with type Map<SizeSelector, ? extends Integer>: replace with ObjectIntMap"
- errorLine1=" val children ="
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
- </issue>
-
- <issue
- id="PrimitiveInCollection"
- message="variable var6b5af7fa with type Map<SizeSelector, ? extends Integer>: replace with ObjectIntMap"
- errorLine1=" translationContext.parentContext.children[pos]"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
- </issue>
-
- <issue
- id="PrimitiveInCollection"
- message="variable childrenMapping with type Map<Integer, ? extends Map<SizeSelector, ? extends Integer>>: replace with IntObjectMap"
- errorLine1=" val childrenMapping ="
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
- </issue>
-
- <issue
- id="PrimitiveInCollection"
- message="variable var405cd718 with type Map<Integer, ? extends Map<SizeSelector, ? extends Integer>>: replace with IntObjectMap"
- errorLine1=" generatedChildren[type]"
- errorLine2=" ^">
- <location
- file="src/main/java/androidx/glance/appwidget/LayoutSelection.kt"/>
- </issue>
-
- <issue
- id="PrimitiveInCollection"
message="field ids with type ArrayList<Long>: replace with LongList"
errorLine1=" private val ids = arrayListOf<Long>()"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt
index 3b35e96..9b04e96 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/AppWidgetUtils.kt
@@ -27,7 +27,6 @@
import android.util.Log
import android.util.SizeF
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.RestrictTo
import androidx.compose.runtime.Composable
@@ -194,13 +193,11 @@
@RequiresApi(Build.VERSION_CODES.Q)
internal object TracingApi29Impl {
- @DoNotInline
fun beginAsyncSection(
methodName: String,
cookie: Int,
) = Trace.beginAsyncSection(methodName, cookie)
- @DoNotInline
fun endAsyncSection(
methodName: String,
cookie: Int,
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/ApplyModifiers.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/ApplyModifiers.kt
index c074490..69e14b9 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/ApplyModifiers.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/ApplyModifiers.kt
@@ -25,7 +25,6 @@
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.compose.ui.graphics.toArgb
import androidx.core.widget.RemoteViewsCompat.setTextViewHeight
@@ -321,7 +320,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object ApplyModifiersApi31Impl {
- @DoNotInline
fun setViewWidth(rv: RemoteViews, viewId: Int, width: Dimension) {
when (width) {
is Dimension.Wrap -> {
@@ -336,7 +334,6 @@
}.let {}
}
- @DoNotInline
fun setViewHeight(rv: RemoteViews, viewId: Int, height: Dimension) {
when (height) {
is Dimension.Wrap -> {
@@ -351,7 +348,6 @@
}.let {}
}
- @DoNotInline
fun applyRoundedCorners(rv: RemoteViews, viewId: Int, radius: Dimension) {
rv.setViewClipToOutline(viewId, true)
when (radius) {
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceAppWidgetManager.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceAppWidgetManager.kt
index 3bbd8a6f2..a5ecba7 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceAppWidgetManager.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceAppWidgetManager.kt
@@ -24,7 +24,6 @@
import android.content.Intent
import android.os.Build
import android.os.Bundle
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import androidx.compose.ui.unit.DpSize
@@ -371,11 +370,9 @@
@RequiresApi(Build.VERSION_CODES.O)
private object AppWidgetManagerApi26Impl {
- @DoNotInline
fun isRequestPinAppWidgetSupported(manager: AppWidgetManager) =
manager.isRequestPinAppWidgetSupported
- @DoNotInline
fun requestPinAppWidget(
manager: AppWidgetManager,
target: ComponentName,
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceRemoteViewsService.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceRemoteViewsService.kt
index c12f362..573b01a 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceRemoteViewsService.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/GlanceRemoteViewsService.kt
@@ -24,7 +24,6 @@
import android.util.Log
import android.widget.RemoteViews
import android.widget.RemoteViewsService
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.RestrictTo
import androidx.glance.session.GlanceSessionManager
@@ -227,7 +226,6 @@
* GlanceRemoteViewsService using an intent.
*/
@Suppress("DEPRECATION")
-@DoNotInline
internal fun RemoteViews.setRemoteAdapter(
context: Context,
appWidgetId: Int,
@@ -258,12 +256,10 @@
@RequiresApi(Build.VERSION_CODES.S)
private object CollectionItemsApi31Impl {
- @DoNotInline
fun setRemoteAdapter(remoteViews: RemoteViews, viewId: Int, items: RemoteCollectionItems) {
remoteViews.setRemoteAdapter(viewId, toPlatformCollectionItems(items))
}
- @DoNotInline
fun toPlatformCollectionItems(items: RemoteCollectionItems): RemoteViews.RemoteCollectionItems {
return RemoteViews.RemoteCollectionItems.Builder()
.setHasStableIds(items.hasStableIds())
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/LayoutSelection.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/LayoutSelection.kt
index 06118af..4a8be41 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/LayoutSelection.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/LayoutSelection.kt
@@ -21,7 +21,6 @@
import android.view.View
import android.view.ViewGroup
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.IdRes
import androidx.annotation.LayoutRes
import androidx.annotation.RequiresApi
@@ -361,6 +360,7 @@
height: LayoutSize
): Int {
val child = makeViewStubSelector(width, height)
+ @Suppress("PrimitiveInCollection")
val children =
translationContext.parentContext.children[pos]
?: throw IllegalStateException("Parent doesn't have child position $pos")
@@ -404,6 +404,7 @@
?: throw IllegalArgumentException(
"Cannot find container $type with $numChildren children"
)
+ @Suppress("PrimitiveInCollection")
val childrenMapping =
generatedChildren[type]
?: throw IllegalArgumentException("Cannot find generated children for $type")
@@ -433,7 +434,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object LayoutSelectionApi31Impl {
- @DoNotInline
fun remoteViews(packageName: String, @LayoutRes layoutId: Int, viewId: Int) =
RemoteViews(packageName, layoutId, viewId)
}
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/RemoteViewsTranslator.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/RemoteViewsTranslator.kt
index 9de41bc..ed0f454 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/RemoteViewsTranslator.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/RemoteViewsTranslator.kt
@@ -24,7 +24,6 @@
import android.view.Gravity
import android.view.View
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.LayoutRes
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
@@ -93,7 +92,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object Api31Impl {
- @DoNotInline
fun createRemoteViews(sizeMap: Map<SizeF, RemoteViews>): RemoteViews = RemoteViews(sizeMap)
}
@@ -469,12 +467,11 @@
@RequiresApi(Build.VERSION_CODES.P)
private object RemoteViewsTranslatorApi28Impl {
- @DoNotInline fun copyRemoteViews(rv: RemoteViews) = RemoteViews(rv)
+ fun copyRemoteViews(rv: RemoteViews) = RemoteViews(rv)
}
@RequiresApi(Build.VERSION_CODES.S)
private object RemoteViewsTranslatorApi31Impl {
- @DoNotInline
fun addChildView(rv: RemoteViews, viewId: Int, childView: RemoteViews, stableId: Int) {
rv.addStableView(viewId, childView, stableId)
}
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/WidgetLayout.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/WidgetLayout.kt
index 493830a..d1595e4 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/WidgetLayout.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/WidgetLayout.kt
@@ -19,7 +19,6 @@
import android.content.Context
import android.os.Build
import android.util.Log
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import androidx.datastore.core.CorruptionException
@@ -385,7 +384,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object WidgetLayoutImpl31 {
- @DoNotInline
fun toProto(dimension: Dimension) =
if (dimension is Dimension.Expand) {
LayoutProto.DimensionType.EXPAND
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ActionTrampoline.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ActionTrampoline.kt
index 5bc6daa..349855a 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ActionTrampoline.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ActionTrampoline.kt
@@ -24,7 +24,6 @@
import android.os.Bundle
import android.os.StrictMode
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.glance.appwidget.TranslationContext
@@ -156,7 +155,6 @@
@RequiresApi(Build.VERSION_CODES.O)
private object ListAdapterTrampolineApi26Impl {
- @DoNotInline
fun startForegroundService(context: Context, intent: Intent) {
context.startForegroundService(intent)
}
@@ -164,7 +162,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object StrictModeVmPolicyApi31Impl {
- @DoNotInline
fun permitUnsafeIntentLaunch(builder: StrictMode.VmPolicy.Builder) =
builder.permitUnsafeIntentLaunch()
}
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ApplyAction.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ApplyAction.kt
index fb82ee2..a248d03 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ApplyAction.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/action/ApplyAction.kt
@@ -22,7 +22,6 @@
import android.os.Build
import android.util.Log
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.IdRes
import androidx.annotation.RequiresApi
import androidx.core.os.bundleOf
@@ -353,22 +352,18 @@
@RequiresApi(Build.VERSION_CODES.S)
private object ApplyActionApi31Impl {
- @DoNotInline
fun setOnCheckedChangeResponse(rv: RemoteViews, viewId: Int, intent: PendingIntent) {
rv.setOnCheckedChangeResponse(viewId, RemoteViews.RemoteResponse.fromPendingIntent(intent))
}
- @DoNotInline
fun setOnCheckedChangeResponse(rv: RemoteViews, viewId: Int, intent: Intent) {
rv.setOnCheckedChangeResponse(viewId, RemoteViews.RemoteResponse.fromFillInIntent(intent))
}
- @DoNotInline
fun unsetOnCheckedChangeResponse(rv: RemoteViews, viewId: Int) {
rv.setOnCheckedChangeResponse(viewId, RemoteViews.RemoteResponse())
}
- @DoNotInline
fun unsetOnClickResponse(rv: RemoteViews, viewId: Int) {
rv.setOnClickResponse(viewId, RemoteViews.RemoteResponse())
}
@@ -376,14 +371,12 @@
@RequiresApi(Build.VERSION_CODES.Q)
private object ApplyActionApi29Impl {
- @DoNotInline
fun setIntentIdentifier(intent: Intent, viewId: Int): Intent =
intent.apply { identifier = viewId.toString() }
}
@RequiresApi(Build.VERSION_CODES.O)
private object ApplyActionApi26Impl {
- @DoNotInline
fun getForegroundServicePendingIntent(context: Context, intent: Intent): PendingIntent {
return PendingIntent.getForegroundService(
context,
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/CompoundButtonApi31Impl.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/CompoundButtonApi31Impl.kt
index a3573cf..72c01d3 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/CompoundButtonApi31Impl.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/CompoundButtonApi31Impl.kt
@@ -18,12 +18,10 @@
import android.os.Build
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
@RequiresApi(Build.VERSION_CODES.S)
internal object CompoundButtonApi31Impl {
- @DoNotInline
fun setCompoundButtonChecked(rv: RemoteViews, viewId: Int, checked: Boolean) {
rv.setCompoundButtonChecked(viewId, checked)
}
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/ImageTranslator.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/ImageTranslator.kt
index 7c8f05c..d015583 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/ImageTranslator.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/ImageTranslator.kt
@@ -20,7 +20,6 @@
import android.os.Build
import android.util.Log
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
@@ -160,7 +159,6 @@
@RequiresApi(Build.VERSION_CODES.M)
private object ImageTranslatorApi23Impl {
- @DoNotInline
fun setImageViewIcon(rv: RemoteViews, viewId: Int, icon: Icon) {
rv.setImageViewIcon(viewId, icon)
}
@@ -168,7 +166,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object ImageTranslatorApi31Impl {
- @DoNotInline
fun applyTintColorFilter(
translationContext: TranslationContext,
rv: RemoteViews,
diff --git a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/TextTranslator.kt b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/TextTranslator.kt
index fecd12d..bf1fbde 100644
--- a/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/TextTranslator.kt
+++ b/glance/glance-appwidget/src/main/java/androidx/glance/appwidget/translators/TextTranslator.kt
@@ -32,7 +32,6 @@
import android.util.TypedValue
import android.view.Gravity
import android.widget.RemoteViews
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.compose.ui.graphics.toArgb
import androidx.core.widget.RemoteViewsCompat.setTextViewGravity
@@ -184,7 +183,6 @@
@RequiresApi(Build.VERSION_CODES.S)
private object TextTranslatorApi31Impl {
- @DoNotInline
fun setTextViewGravity(rv: RemoteViews, viewId: Int, gravity: Int) {
rv.setTextViewGravity(viewId, gravity)
}
diff --git a/glance/glance/src/main/java/androidx/glance/session/IdleEventBroadcastReceiver.kt b/glance/glance/src/main/java/androidx/glance/session/IdleEventBroadcastReceiver.kt
index 7545543..c6f4aa3 100644
--- a/glance/glance/src/main/java/androidx/glance/session/IdleEventBroadcastReceiver.kt
+++ b/glance/glance/src/main/java/androidx/glance/session/IdleEventBroadcastReceiver.kt
@@ -22,7 +22,6 @@
import android.content.IntentFilter
import android.os.Build
import android.os.PowerManager
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.launch
@@ -57,7 +56,6 @@
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
private object Api33Impl {
- @DoNotInline
fun isLightIdleOrLowPowerStandby(pm: PowerManager): Boolean {
return pm.isLowPowerStandbyEnabled || pm.isDeviceLightIdleMode
}
@@ -65,7 +63,6 @@
@RequiresApi(Build.VERSION_CODES.M)
private object Api23Impl {
- @DoNotInline
fun isIdle(pm: PowerManager): Boolean {
return pm.isDeviceIdleMode
}
diff --git a/glance/glance/src/main/java/androidx/glance/unit/ColorProvider.kt b/glance/glance/src/main/java/androidx/glance/unit/ColorProvider.kt
index b0fb38d..2019a9f 100644
--- a/glance/glance/src/main/java/androidx/glance/unit/ColorProvider.kt
+++ b/glance/glance/src/main/java/androidx/glance/unit/ColorProvider.kt
@@ -20,7 +20,6 @@
import android.os.Build
import androidx.annotation.ColorInt
import androidx.annotation.ColorRes
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.RestrictTo
import androidx.compose.ui.graphics.Color
@@ -68,7 +67,6 @@
@RequiresApi(23)
private object ColorProviderApi23Impl {
@ColorInt
- @DoNotInline
fun getColor(context: Context, @ColorRes resId: Int): Int {
return context.getColor(resId)
}
diff --git a/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
index 5ce83ec..062596f 100644
--- a/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
+++ b/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
@@ -21,7 +21,6 @@
import android.content.pm.PackageManager
import android.os.Build
import android.os.UserManager
-import androidx.annotation.DoNotInline
import androidx.annotation.IntDef
import androidx.annotation.RequiresApi
import androidx.annotation.RestrictTo
@@ -485,7 +484,6 @@
@RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
private object Api34Impl {
@JvmStatic
- @DoNotInline
@AvailabilityStatus
fun getSdkStatus(context: Context): Int {
return if (
diff --git a/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt
index 5168b79..0a8d7d24 100644
--- a/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt
+++ b/health/connect/connect-client/src/main/java/androidx/health/platform/client/impl/data/SharedMemory27Impl.kt
@@ -20,14 +20,12 @@
import android.os.Parcel
import android.os.SharedMemory
import android.system.OsConstants
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
/** Internal class to ensure calls to shared memory are guarded, so that */
@RequiresApi(api = Build.VERSION_CODES.O_MR1)
internal object SharedMemory27Impl {
/** Flattens `bytes` into `dest` using [SharedMemory]. */
- @DoNotInline
fun writeToParcelUsingSharedMemory(name: String, bytes: ByteArray, dest: Parcel, flags: Int) {
SharedMemory.create(name, bytes.size).use { memory ->
memory.setProtect(OsConstants.PROT_READ or OsConstants.PROT_WRITE)
@@ -37,7 +35,6 @@
}
}
- @DoNotInline
fun <U : Any> parseParcelUsingSharedMemory(source: Parcel, parser: (ByteArray) -> U): U =
SharedMemory.CREATOR.createFromParcel(source).use { memory ->
val buffer = memory.mapReadOnly()
diff --git a/input/input-motionprediction/src/main/java/androidx/input/motionprediction/common/PredictionEstimator.java b/input/input-motionprediction/src/main/java/androidx/input/motionprediction/common/PredictionEstimator.java
index 6bbd88c..f23b7d3d 100644
--- a/input/input-motionprediction/src/main/java/androidx/input/motionprediction/common/PredictionEstimator.java
+++ b/input/input-motionprediction/src/main/java/androidx/input/motionprediction/common/PredictionEstimator.java
@@ -25,7 +25,6 @@
import android.view.MotionEvent;
import android.view.WindowManager;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
@@ -91,7 +90,6 @@
// Not instantiable
}
- @DoNotInline
static float getFastestFrameTimeMs(Display display) {
float[] refreshRates = display.getSupportedRefreshRates();
float largestRefreshRate = refreshRates[0];
@@ -112,7 +110,6 @@
// Not instantiable
}
- @DoNotInline
static float getFastestFrameTimeMs(Display display) {
Display.Mode[] displayModes = display.getSupportedModes();
float largestRefreshRate = displayModes[0].getRefreshRate();
@@ -134,7 +131,6 @@
// Not instantiable
}
- @DoNotInline
static Display getDisplayForContext(Context context) {
return context.getDisplay();
}
diff --git a/leanback/leanback/src/main/java/androidx/leanback/app/FragmentUtil.java b/leanback/leanback/src/main/java/androidx/leanback/app/FragmentUtil.java
index 761cf21..d9d72df 100644
--- a/leanback/leanback/src/main/java/androidx/leanback/app/FragmentUtil.java
+++ b/leanback/leanback/src/main/java/androidx/leanback/app/FragmentUtil.java
@@ -19,7 +19,6 @@
import android.content.Context;
import android.os.Build;
-import androidx.annotation.DoNotInline;
import androidx.annotation.RequiresApi;
class FragmentUtil {
@@ -39,7 +38,6 @@
// This class is not instantiable.
}
- @DoNotInline
static Context getContext(Fragment fragment) {
return fragment.getContext();
}
diff --git a/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleOwner.kt b/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleOwner.kt
index b5165de..5193aa8 100644
--- a/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleOwner.kt
+++ b/lifecycle/lifecycle-process/src/main/java/androidx/lifecycle/ProcessLifecycleOwner.kt
@@ -21,7 +21,6 @@
import android.os.Build
import android.os.Bundle
import android.os.Handler
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import androidx.lifecycle.ReportFragment.Companion.reportFragment
@@ -189,7 +188,6 @@
@RequiresApi(29)
internal object Api29Impl {
- @DoNotInline
@JvmStatic
fun registerActivityLifecycleCallbacks(
activity: Activity,
diff --git a/media/media/src/main/java/android/support/v4/media/MediaBrowserCompat.java b/media/media/src/main/java/android/support/v4/media/MediaBrowserCompat.java
index b3ce8b3..450f034 100644
--- a/media/media/src/main/java/android/support/v4/media/MediaBrowserCompat.java
+++ b/media/media/src/main/java/android/support/v4/media/MediaBrowserCompat.java
@@ -76,7 +76,6 @@
import android.text.TextUtils;
import android.util.Log;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -2383,12 +2382,10 @@
private static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static MediaDescription getDescription(MediaBrowser.MediaItem item) {
return item.getDescription();
}
- @DoNotInline
static int getFlags(MediaBrowser.MediaItem item) {
return item.getFlags();
}
diff --git a/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java b/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java
index 1a4f88e..ffa9638 100644
--- a/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java
+++ b/media/media/src/main/java/android/support/v4/media/MediaDescriptionCompat.java
@@ -28,7 +28,6 @@
import android.support.v4.media.session.MediaSessionCompat;
import android.text.TextUtils;
-import androidx.annotation.DoNotInline;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
@@ -573,95 +572,79 @@
private static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static MediaDescription.Builder createBuilder() {
return new MediaDescription.Builder();
}
- @DoNotInline
static void setMediaId(MediaDescription.Builder builder,
@Nullable String mediaId) {
builder.setMediaId(mediaId);
}
- @DoNotInline
static void setTitle(MediaDescription.Builder builder,
@Nullable CharSequence title) {
builder.setTitle(title);
}
- @DoNotInline
static void setSubtitle(MediaDescription.Builder builder,
@Nullable CharSequence subtitle) {
builder.setSubtitle(subtitle);
}
- @DoNotInline
static void setDescription(MediaDescription.Builder builder,
@Nullable CharSequence description) {
builder.setDescription(description);
}
- @DoNotInline
static void setIconBitmap(MediaDescription.Builder builder,
@Nullable Bitmap icon) {
builder.setIconBitmap(icon);
}
- @DoNotInline
static void setIconUri(MediaDescription.Builder builder,
@Nullable Uri iconUri) {
builder.setIconUri(iconUri);
}
- @DoNotInline
static void setExtras(MediaDescription.Builder builder,
@Nullable Bundle extras) {
builder.setExtras(extras);
}
- @DoNotInline
static MediaDescription build(MediaDescription.Builder builder) {
return builder.build();
}
- @DoNotInline
@Nullable
static String getMediaId(MediaDescription description) {
return description.getMediaId();
}
- @DoNotInline
@Nullable
static CharSequence getTitle(MediaDescription description) {
return description.getTitle();
}
- @DoNotInline
@Nullable
static CharSequence getSubtitle(MediaDescription description) {
return description.getSubtitle();
}
- @DoNotInline
@Nullable
static CharSequence getDescription(MediaDescription description) {
return description.getDescription();
}
- @DoNotInline
@Nullable
static Bitmap getIconBitmap(MediaDescription description) {
return description.getIconBitmap();
}
- @DoNotInline
@Nullable
static Uri getIconUri(MediaDescription description) {
return description.getIconUri();
}
- @DoNotInline
@Nullable
static Bundle getExtras(MediaDescription description) {
return description.getExtras();
@@ -672,13 +655,11 @@
private static class Api23Impl {
private Api23Impl() {}
- @DoNotInline
static void setMediaUri(MediaDescription.Builder builder,
@Nullable Uri mediaUri) {
builder.setMediaUri(mediaUri);
}
- @DoNotInline
@Nullable
static Uri getMediaUri(MediaDescription description) {
return description.getMediaUri();
diff --git a/media/media/src/main/java/android/support/v4/media/session/MediaSessionCompat.java b/media/media/src/main/java/android/support/v4/media/session/MediaSessionCompat.java
index 7dd3fbe..3030cdf 100644
--- a/media/media/src/main/java/android/support/v4/media/session/MediaSessionCompat.java
+++ b/media/media/src/main/java/android/support/v4/media/session/MediaSessionCompat.java
@@ -65,7 +65,6 @@
import android.view.KeyEvent;
import android.view.ViewConfiguration;
-import androidx.annotation.DoNotInline;
import androidx.annotation.GuardedBy;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
@@ -2281,17 +2280,14 @@
private static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static MediaSession.QueueItem createQueueItem(MediaDescription description, long id) {
return new MediaSession.QueueItem(description, id);
}
- @DoNotInline
static MediaDescription getDescription(MediaSession.QueueItem queueItem) {
return queueItem.getDescription();
}
- @DoNotInline
static long getQueueId(MediaSession.QueueItem queueItem) {
return queueItem.getQueueId();
}
diff --git a/media/media/src/main/java/android/support/v4/media/session/PlaybackStateCompat.java b/media/media/src/main/java/android/support/v4/media/session/PlaybackStateCompat.java
index a4c0f17..4a84c9a0 100644
--- a/media/media/src/main/java/android/support/v4/media/session/PlaybackStateCompat.java
+++ b/media/media/src/main/java/android/support/v4/media/session/PlaybackStateCompat.java
@@ -28,7 +28,6 @@
import android.text.TextUtils;
import android.view.KeyEvent;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.LongDef;
import androidx.annotation.Nullable;
@@ -1379,125 +1378,101 @@
private static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static PlaybackState.Builder createBuilder() {
return new PlaybackState.Builder();
}
- @DoNotInline
static void setState(PlaybackState.Builder builder, int state, long position,
float playbackSpeed, long updateTime) {
builder.setState(state, position, playbackSpeed, updateTime);
}
- @DoNotInline
static void setBufferedPosition(PlaybackState.Builder builder, long bufferedPosition) {
builder.setBufferedPosition(bufferedPosition);
}
- @DoNotInline
static void setActions(PlaybackState.Builder builder, long actions) {
builder.setActions(actions);
}
- @DoNotInline
static void setErrorMessage(PlaybackState.Builder builder, CharSequence error) {
builder.setErrorMessage(error);
}
- @DoNotInline
static void addCustomAction(PlaybackState.Builder builder,
PlaybackState.CustomAction customAction) {
builder.addCustomAction(customAction);
}
- @DoNotInline
static void setActiveQueueItemId(PlaybackState.Builder builder, long id) {
builder.setActiveQueueItemId(id);
}
- @DoNotInline
static List<PlaybackState.CustomAction> getCustomActions(PlaybackState state) {
return state.getCustomActions();
}
- @DoNotInline
static PlaybackState build(PlaybackState.Builder builder) {
return builder.build();
}
- @DoNotInline
static int getState(PlaybackState state) {
return state.getState();
}
- @DoNotInline
static long getPosition(PlaybackState state) {
return state.getPosition();
}
- @DoNotInline
static long getBufferedPosition(PlaybackState state) {
return state.getBufferedPosition();
}
- @DoNotInline
static float getPlaybackSpeed(PlaybackState state) {
return state.getPlaybackSpeed();
}
- @DoNotInline
static long getActions(PlaybackState state) {
return state.getActions();
}
- @DoNotInline
static CharSequence getErrorMessage(PlaybackState state) {
return state.getErrorMessage();
}
- @DoNotInline
static long getLastPositionUpdateTime(PlaybackState state) {
return state.getLastPositionUpdateTime();
}
- @DoNotInline
static long getActiveQueueItemId(PlaybackState state) {
return state.getActiveQueueItemId();
}
- @DoNotInline
static PlaybackState.CustomAction.Builder createCustomActionBuilder(String action,
CharSequence name, int icon) {
return new PlaybackState.CustomAction.Builder(action, name, icon);
}
- @DoNotInline
static void setExtras(PlaybackState.CustomAction.Builder builder, Bundle extras) {
builder.setExtras(extras);
}
- @DoNotInline
static PlaybackState.CustomAction build(PlaybackState.CustomAction.Builder builder) {
return builder.build();
}
- @DoNotInline
static Bundle getExtras(PlaybackState.CustomAction customAction) {
return customAction.getExtras();
}
- @DoNotInline
static String getAction(PlaybackState.CustomAction customAction) {
return customAction.getAction();
}
- @DoNotInline
static CharSequence getName(PlaybackState.CustomAction customAction) {
return customAction.getName();
}
- @DoNotInline
static int getIcon(PlaybackState.CustomAction customAction) {
return customAction.getIcon();
}
@@ -1507,12 +1482,10 @@
private static class Api22Impl {
private Api22Impl() {}
- @DoNotInline
static void setExtras(PlaybackState.Builder builder, Bundle extras) {
builder.setExtras(extras);
}
- @DoNotInline
static Bundle getExtras(PlaybackState state) {
return state.getExtras();
}
diff --git a/media/media/src/main/java/androidx/media/AudioFocusRequestCompat.java b/media/media/src/main/java/androidx/media/AudioFocusRequestCompat.java
index a126a53..249172d 100644
--- a/media/media/src/main/java/androidx/media/AudioFocusRequestCompat.java
+++ b/media/media/src/main/java/androidx/media/AudioFocusRequestCompat.java
@@ -28,7 +28,6 @@
import android.os.Looper;
import android.os.Message;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -430,7 +429,6 @@
private static class Api26Impl {
private Api26Impl() {}
- @DoNotInline
static AudioFocusRequest createInstance(
int focusGain,
AudioAttributes audioAttributes,
diff --git a/media/media/src/main/java/androidx/media/AudioManagerCompat.java b/media/media/src/main/java/androidx/media/AudioManagerCompat.java
index d65d023..e962042 100644
--- a/media/media/src/main/java/androidx/media/AudioManagerCompat.java
+++ b/media/media/src/main/java/androidx/media/AudioManagerCompat.java
@@ -20,7 +20,6 @@
import android.media.AudioManager;
import android.os.Build;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -178,7 +177,6 @@
@RequiresApi(21)
private static class Api21Impl {
- @DoNotInline
static boolean isVolumeFixed(AudioManager audioManager) {
return audioManager.isVolumeFixed();
}
@@ -189,13 +187,11 @@
@RequiresApi(26)
private static class Api26Impl {
- @DoNotInline
static int abandonAudioFocusRequest(AudioManager audioManager,
AudioFocusRequest focusRequest) {
return audioManager.abandonAudioFocusRequest(focusRequest);
}
- @DoNotInline
static int requestAudioFocus(AudioManager audioManager, AudioFocusRequest focusRequest) {
return audioManager.requestAudioFocus(focusRequest);
}
@@ -206,7 +202,6 @@
@RequiresApi(28)
private static class Api28Impl {
- @DoNotInline
static int getStreamMinVolume(AudioManager audioManager, int streamType) {
return audioManager.getStreamMinVolume(streamType);
}
diff --git a/media/media/src/main/java/androidx/media/VolumeProviderCompat.java b/media/media/src/main/java/androidx/media/VolumeProviderCompat.java
index 1d098f6..d83e42a 100644
--- a/media/media/src/main/java/androidx/media/VolumeProviderCompat.java
+++ b/media/media/src/main/java/androidx/media/VolumeProviderCompat.java
@@ -22,7 +22,6 @@
import android.os.Build;
import android.support.v4.media.session.MediaSessionCompat;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -239,7 +238,6 @@
private static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static void setCurrentVolume(VolumeProvider volumeProvider, int currentVolume) {
volumeProvider.setCurrentVolume(currentVolume);
}
diff --git a/media/media/src/main/java/androidx/media/app/NotificationCompat.java b/media/media/src/main/java/androidx/media/app/NotificationCompat.java
index bde77990e..93ff351 100644
--- a/media/media/src/main/java/androidx/media/app/NotificationCompat.java
+++ b/media/media/src/main/java/androidx/media/app/NotificationCompat.java
@@ -33,7 +33,6 @@
import android.view.View;
import android.widget.RemoteViews;
-import androidx.annotation.DoNotInline;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -542,17 +541,14 @@
private static class Api21Impl {
private Api21Impl() {}
- @DoNotInline
static void setMediaStyle(Notification.Builder builder, Notification.MediaStyle style) {
builder.setStyle(style);
}
- @DoNotInline
static Notification.MediaStyle createMediaStyle() {
return new Notification.MediaStyle();
}
- @DoNotInline
static Notification.MediaStyle fillInMediaStyle(Notification.MediaStyle style,
int[] actionsToShowInCompact, MediaSessionCompat.Token token) {
if (actionsToShowInCompact != null) {
@@ -564,12 +560,10 @@
return style;
}
- @DoNotInline
static void setShowActionsInCompactView(Notification.MediaStyle style, int... actions) {
style.setShowActionsInCompactView(actions);
}
- @DoNotInline
static void setMediaSession(Notification.MediaStyle style, MediaSession.Token token) {
style.setMediaSession(token);
}
@@ -579,7 +573,6 @@
private static class Api24Impl {
private Api24Impl() {}
- @DoNotInline
static Notification.MediaStyle createDecoratedMediaCustomViewStyle() {
return new Notification.DecoratedMediaCustomViewStyle();
}
@@ -591,7 +584,6 @@
private Api34Impl() {}
@SuppressLint({"MissingPermission"})
- @DoNotInline
static Notification.MediaStyle setRemotePlaybackInfo(Notification.MediaStyle style,
@NonNull CharSequence deviceName, @DrawableRes int iconResource,
@Nullable PendingIntent chipIntent, Boolean showRemotePlaybackInfo) {
diff --git a/media/media/src/main/java/androidx/media/session/MediaButtonReceiver.java b/media/media/src/main/java/androidx/media/session/MediaButtonReceiver.java
index e24f55e..c2dedad 100644
--- a/media/media/src/main/java/androidx/media/session/MediaButtonReceiver.java
+++ b/media/media/src/main/java/androidx/media/session/MediaButtonReceiver.java
@@ -36,7 +36,6 @@
import android.util.Log;
import android.view.KeyEvent;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
@@ -366,7 +365,6 @@
* Returns true if the passed exception is a
* {@link ForegroundServiceStartNotAllowedException}.
*/
- @DoNotInline
public static boolean instanceOfForegroundServiceStartNotAllowedException(
IllegalStateException e) {
return e instanceof ForegroundServiceStartNotAllowedException;
@@ -377,7 +375,6 @@
* {@link ForegroundServiceStartNotAllowedException} and throws an exception if the cast
* fails.
*/
- @DoNotInline
public static ForegroundServiceStartNotAllowedException
castToForegroundServiceStartNotAllowedException(IllegalStateException e) {
return (ForegroundServiceStartNotAllowedException) e;
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/SystemOutputSwitcherDialogController.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/SystemOutputSwitcherDialogController.java
index 6cee3d0..a12969f 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/SystemOutputSwitcherDialogController.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/app/SystemOutputSwitcherDialogController.java
@@ -28,7 +28,6 @@
import android.os.Build;
import android.provider.Settings;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
@@ -218,7 +217,6 @@
// This class is not instantiable.
}
- @DoNotInline
static MediaRouter2 getInstance(Context context) {
return MediaRouter2.getInstance(context);
}
@@ -230,7 +228,6 @@
// This class is not instantiable.
}
- @DoNotInline
static boolean showSystemOutputSwitcher(MediaRouter2 mediaRouter2) {
return mediaRouter2.showSystemOutputSwitcher();
}
@@ -241,7 +238,6 @@
private Api23Impl() {
}
- @DoNotInline
public static boolean isSuitableDeviceAlreadyConnectedAsAudioOutput(Context context) {
AudioManager audioManager = context.getSystemService(AudioManager.class);
AudioDeviceInfo[] audioDeviceInfos = audioManager.getDevices(
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java
index cf0b40a..462b25e 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRoute2Provider.java
@@ -44,7 +44,6 @@
import android.util.Log;
import android.util.SparseArray;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -727,7 +726,6 @@
// This class is not instantiable.
}
- @DoNotInline
static void setPlatformRouteListingPreference(
@NonNull MediaRouter2 mediaRouter2,
@Nullable android.media.RouteListingPreference routeListingPreference) {
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java
index 0b8ccf5..40c5b79 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter2Utils.java
@@ -73,7 +73,6 @@
import android.text.TextUtils;
import android.util.ArraySet;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.OptIn;
@@ -470,18 +469,15 @@
@RequiresApi(api = 34)
private static final class Api34Impl {
- @DoNotInline
public static void setDeduplicationIds(
MediaRoute2Info.Builder builder, Set<String> deduplicationIds) {
builder.setDeduplicationIds(deduplicationIds);
}
- @DoNotInline
public static Set<String> getDeduplicationIds(MediaRoute2Info fwkMediaRoute2Info) {
return fwkMediaRoute2Info.getDeduplicationIds();
}
- @DoNotInline
public static void copyDescriptorVisibilityToBuilder(MediaRoute2Info.Builder builder,
MediaRouteDescriptor descriptor) {
if (descriptor.isVisibilityPublic()) {
@@ -491,12 +487,10 @@
}
}
- @DoNotInline
public static void setDeviceType(MediaRoute2Info.Builder builder, int deviceType) {
builder.setType(deviceType);
}
- @DoNotInline
public static int getType(MediaRoute2Info fwkMediaRoute2Info) {
return fwkMediaRoute2Info.getType();
}
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterUtils.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterUtils.java
index daa8fbd..095aa65 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterUtils.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouterUtils.java
@@ -16,7 +16,6 @@
package androidx.mediarouter.media;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
/** Utils for usage with platform {@link android.media.MediaRouter} */
@@ -28,7 +27,6 @@
return new CallbackProxy<>(callback);
}
- @DoNotInline
public static android.media.MediaRouter.VolumeCallback createVolumeCallback(
VolumeCallback callback) {
return new VolumeCallbackProxy<>(callback);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/PlatformMediaRouter1RouteProvider.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/PlatformMediaRouter1RouteProvider.java
index 7a45f0f0..52c2cce 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/PlatformMediaRouter1RouteProvider.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/PlatformMediaRouter1RouteProvider.java
@@ -31,7 +31,6 @@
import android.util.Log;
import android.view.Display;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.mediarouter.R;
@@ -533,7 +532,6 @@
}
}
- @DoNotInline
protected void onBuildSystemRouteDescriptor(SystemRouteRecord record,
MediaRouteDescriptor.Builder builder) {
int supportedTypes = record.mRoute.getSupportedTypes();
@@ -590,18 +588,15 @@
}
}
- @DoNotInline
protected void selectRoute(android.media.MediaRouter.RouteInfo route) {
mRouter.selectRoute(ALL_ROUTE_TYPES, route);
}
- @DoNotInline
protected android.media.MediaRouter.RouteInfo getDefaultRoute() {
return mRouter.getDefaultRoute();
}
@SuppressLint("WrongConstant") // False positive. See b/310913043.
- @DoNotInline
protected void updateUserRouteProperties(UserRouteRecord record) {
android.media.MediaRouter.UserRouteInfo userRoute = record.mUserRoute;
MediaRouter.RouteInfo routeInfo = record.mRoute;
@@ -614,7 +609,6 @@
userRoute.setDescription(routeInfo.getDescription());
}
- @DoNotInline
protected void updateCallback() {
if (mCallbackRegistered) {
mRouter.removeCallback(mCallback);
@@ -626,7 +620,6 @@
mRouter.addCallback(mRouteTypes, mCallback, flags);
}
- @DoNotInline
protected boolean isConnecting(SystemRouteRecord record) {
return record.mRoute.isConnecting();
}
@@ -691,7 +684,6 @@
@SuppressLint("WrongConstant") // False positive. See b/283059575.
@Override
- @DoNotInline
protected void onBuildSystemRouteDescriptor(SystemRouteRecord record,
MediaRouteDescriptor.Builder builder) {
super.onBuildSystemRouteDescriptor(record, builder);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
index 19045af..937a1de 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
@@ -25,7 +25,6 @@
import android.os.Bundle;
import android.util.Log;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -1070,7 +1069,6 @@
@RequiresApi(33)
private static class Api33 {
- @DoNotInline
static void registerReceiver(@NonNull Context context, @NonNull BroadcastReceiver receiver,
@NonNull IntentFilter filter, int flags) {
context.registerReceiver(receiver, filter, flags);
diff --git a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RouteListingPreference.java b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RouteListingPreference.java
index 5ea089f..a6827e4 100644
--- a/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RouteListingPreference.java
+++ b/mediarouter/mediarouter/src/main/java/androidx/mediarouter/media/RouteListingPreference.java
@@ -20,7 +20,6 @@
import android.content.Intent;
import android.text.TextUtils;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -562,7 +561,6 @@
// This class is not instantiable.
}
- @DoNotInline
@NonNull
public static android.media.RouteListingPreference toPlatformRouteListingPreference(
RouteListingPreference routeListingPreference) {
@@ -579,7 +577,6 @@
.build();
}
- @DoNotInline
@NonNull
public static android.media.RouteListingPreference.Item toPlatformItem(Item item) {
return new android.media.RouteListingPreference.Item.Builder(item.getRouteId())
diff --git a/preference/preference/src/main/java/androidx/preference/PreferenceCategory.java b/preference/preference/src/main/java/androidx/preference/PreferenceCategory.java
index a1c033d..baaca31 100644
--- a/preference/preference/src/main/java/androidx/preference/PreferenceCategory.java
+++ b/preference/preference/src/main/java/androidx/preference/PreferenceCategory.java
@@ -24,7 +24,6 @@
import android.view.View;
import android.widget.TextView;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -108,7 +107,6 @@
@RequiresApi(28)
private static class Api28Impl {
- @DoNotInline
static void setAccessibilityHeading(@NonNull View view, boolean isHeading) {
view.setAccessibilityHeading(isHeading);
}
diff --git a/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java b/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java
index 1a2bc35..74c62b9 100644
--- a/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java
+++ b/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragment.java
@@ -36,7 +36,6 @@
import android.view.WindowManager;
import android.widget.TextView;
-import androidx.annotation.DoNotInline;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -327,7 +326,6 @@
/**
* Shows the IME on demand for the given {@link Window}.
*/
- @DoNotInline
static void showIme(@NonNull Window dialogWindow) {
dialogWindow.getDecorView().getWindowInsetsController().show(WindowInsets.Type.ime());
}
diff --git a/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java b/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
index 48b3821..a752ab0 100644
--- a/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
+++ b/preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java
@@ -34,7 +34,6 @@
import android.view.WindowInsets;
import android.widget.TextView;
-import androidx.annotation.DoNotInline;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -304,7 +303,6 @@
/**
* Shows the IME on demand for the given {@link Window}.
*/
- @DoNotInline
static void showIme(@NonNull Window dialogWindow) {
dialogWindow.getDecorView().getWindowInsetsController().show(WindowInsets.Type.ime());
}
diff --git a/print/print/src/main/java/androidx/print/PrintHelper.java b/print/print/src/main/java/androidx/print/PrintHelper.java
index c4fe138..f4c42b2 100644
--- a/print/print/src/main/java/androidx/print/PrintHelper.java
+++ b/print/print/src/main/java/androidx/print/PrintHelper.java
@@ -41,7 +41,6 @@
import android.print.pdf.PrintedPdfDocument;
import android.util.Log;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -839,12 +838,10 @@
// This class is not instantiable.
}
- @DoNotInline
static int getDuplexMode(PrintAttributes printAttributes) {
return printAttributes.getDuplexMode();
}
- @DoNotInline
static void setDuplexMode(PrintAttributes.Builder builder, int duplexMode) {
builder.setDuplexMode(duplexMode);
}
@@ -856,7 +853,6 @@
// This class is not instantiable.
}
- @DoNotInline
static ColorSpace get(ColorSpace.Named name) {
return ColorSpace.get(name);
}
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/InMemorySdkClassLoaderFactory.kt b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/InMemorySdkClassLoaderFactory.kt
index 676699c..808a3de 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/InMemorySdkClassLoaderFactory.kt
+++ b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/InMemorySdkClassLoaderFactory.kt
@@ -18,7 +18,6 @@
import android.content.Context
import android.content.res.AssetManager
import android.os.Build
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.privacysandbox.sdkruntime.client.config.LocalSdkConfig
import androidx.privacysandbox.sdkruntime.core.LoadSdkCompatException
@@ -33,7 +32,6 @@
private class Api27Impl(private val assetLoader: AssetLoader) :
InMemorySdkClassLoaderFactory() {
- @DoNotInline
override fun createClassLoaderFor(
sdkConfig: LocalSdkConfig,
parent: ClassLoader
@@ -58,7 +56,6 @@
private class Api26Impl(private val assetLoader: AssetLoader) :
InMemorySdkClassLoaderFactory() {
- @DoNotInline
override fun createClassLoaderFor(
sdkConfig: LocalSdkConfig,
parent: ClassLoader
@@ -83,7 +80,6 @@
}
private class FailImpl : InMemorySdkClassLoaderFactory() {
- @DoNotInline
override fun createClassLoaderFor(
sdkConfig: LocalSdkConfig,
parent: ClassLoader
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/MigrationUtils.kt b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/MigrationUtils.kt
index 11297ae..e8ca9bd 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/MigrationUtils.kt
+++ b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/MigrationUtils.kt
@@ -21,7 +21,6 @@
import android.system.ErrnoException
import android.system.Os
import android.util.Log
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import java.io.File
import java.io.FileInputStream
@@ -97,6 +96,6 @@
@RequiresApi(Build.VERSION_CODES.Q)
private object Api29 {
- @DoNotInline fun copy(from: InputStream, to: OutputStream): Long = FileUtils.copy(from, to)
+ fun copy(from: InputStream, to: OutputStream): Long = FileUtils.copy(from, to)
}
}
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/SandboxedSdkContextCompat.kt b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/SandboxedSdkContextCompat.kt
index 49f79f0..e85c783 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/SandboxedSdkContextCompat.kt
+++ b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/impl/SandboxedSdkContextCompat.kt
@@ -21,7 +21,6 @@
import android.database.DatabaseErrorHandler
import android.database.sqlite.SQLiteDatabase
import android.os.Build
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import java.io.File
import java.io.FileInputStream
@@ -254,20 +253,18 @@
@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
private object Api21 {
- @DoNotInline fun codeCacheDir(context: Context): File = context.codeCacheDir
+ fun codeCacheDir(context: Context): File = context.codeCacheDir
- @DoNotInline fun noBackupFilesDir(context: Context): File = context.noBackupFilesDir
+ fun noBackupFilesDir(context: Context): File = context.noBackupFilesDir
}
@RequiresApi(Build.VERSION_CODES.N)
private object Api24 {
- @DoNotInline
fun createDeviceProtectedStorageContext(context: Context): Context =
context.createDeviceProtectedStorageContext()
- @DoNotInline fun dataDir(context: Context): File = context.dataDir
+ fun dataDir(context: Context): File = context.dataDir
- @DoNotInline
fun deleteSharedPreferences(context: Context, name: String): Boolean =
context.deleteSharedPreferences(name)
}
diff --git a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/storage/LocalSdkFolderProvider.kt b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/storage/LocalSdkFolderProvider.kt
index eeab1f5..5e30302 100644
--- a/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/storage/LocalSdkFolderProvider.kt
+++ b/privacysandbox/sdkruntime/sdkruntime-client/src/main/java/androidx/privacysandbox/sdkruntime/client/loader/storage/LocalSdkFolderProvider.kt
@@ -21,7 +21,6 @@
import android.os.Build
import android.os.Build.VERSION_CODES.LOLLIPOP
import android.os.Build.VERSION_CODES.TIRAMISU
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.privacysandbox.sdkruntime.client.config.LocalSdkConfig
import java.io.DataInputStream
@@ -128,12 +127,11 @@
@RequiresApi(LOLLIPOP)
private object Api21Impl {
- @DoNotInline fun codeCacheDir(context: Context): File = context.codeCacheDir
+ fun codeCacheDir(context: Context): File = context.codeCacheDir
}
@RequiresApi(TIRAMISU)
private object Api33Impl {
- @DoNotInline
fun getLastUpdateTime(context: Context): Long =
context.packageManager
.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(0))
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt b/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt
index 84c44e0..73e0501 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt
+++ b/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/LoadSdkCompatException.kt
@@ -17,7 +17,6 @@
import android.app.sdksandbox.LoadSdkException
import android.os.Bundle
-import androidx.annotation.DoNotInline
import androidx.annotation.IntDef
import androidx.annotation.RequiresApi
import androidx.annotation.RestrictTo
@@ -116,12 +115,10 @@
@RequiresApi(34)
private object Api34Impl {
- @DoNotInline
fun toLoadSdkException(ex: LoadSdkCompatException): LoadSdkException {
return LoadSdkException(ex.cause!!, ex.extraInformation)
}
- @DoNotInline
fun toLoadCompatSdkException(ex: LoadSdkException): LoadSdkCompatException {
return LoadSdkCompatException(
toLoadSdkErrorCodeCompat(ex.loadSdkErrorCode),
diff --git a/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt b/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt
index 1b8b333..97aa272 100644
--- a/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt
+++ b/privacysandbox/sdkruntime/sdkruntime-core/src/main/java/androidx/privacysandbox/sdkruntime/core/SandboxedSdkCompat.kt
@@ -17,7 +17,6 @@
import android.app.sdksandbox.SandboxedSdk
import android.os.IBinder
-import androidx.annotation.DoNotInline
import androidx.annotation.Keep
import androidx.annotation.RequiresApi
import androidx.annotation.RestrictTo
@@ -100,18 +99,16 @@
fun getSdkInfo(): SandboxedSdkInfo?
- @RequiresApi(34) @DoNotInline fun toSandboxedSdk(): SandboxedSdk
+ @RequiresApi(34) fun toSandboxedSdk(): SandboxedSdk
}
@RequiresApi(34)
private open class Api34Impl(protected val sandboxedSdk: SandboxedSdk) : SandboxedSdkImpl {
- @DoNotInline
override fun getInterface(): IBinder? {
return sandboxedSdk.getInterface()
}
- @DoNotInline
override fun getSdkInfo(): SandboxedSdkInfo {
val sharedLibraryInfo = sandboxedSdk.sharedLibraryInfo
return SandboxedSdkInfo(
@@ -120,13 +117,11 @@
)
}
- @DoNotInline
override fun toSandboxedSdk(): SandboxedSdk {
return sandboxedSdk
}
companion object {
- @DoNotInline
fun createSandboxedSdk(sdkInterface: IBinder): SandboxedSdk {
return SandboxedSdk(sdkInterface)
}
diff --git a/privacysandbox/ui/ui-client/src/main/java/androidx/privacysandbox/ui/client/view/SandboxedSdkView.kt b/privacysandbox/ui/ui-client/src/main/java/androidx/privacysandbox/ui/client/view/SandboxedSdkView.kt
index ffdafcc..207ee67 100644
--- a/privacysandbox/ui/ui-client/src/main/java/androidx/privacysandbox/ui/client/view/SandboxedSdkView.kt
+++ b/privacysandbox/ui/ui-client/src/main/java/androidx/privacysandbox/ui/client/view/SandboxedSdkView.kt
@@ -30,7 +30,6 @@
import android.view.ViewGroup
import android.view.ViewParent
import android.view.ViewTreeObserver
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import androidx.customview.poolingcontainer.PoolingContainerListener
@@ -629,7 +628,6 @@
private object Api34PlusImpl {
@JvmStatic
- @DoNotInline
fun setClippingBounds(
contentView: View?,
isAttachedToWindow: Boolean,
@@ -667,7 +665,6 @@
}
@JvmStatic
- @DoNotInline
fun attachTemporarySurfaceViewAndOpenSession(
context: Context,
sandboxedSdkView: SandboxedSdkView
@@ -693,7 +690,6 @@
private object Api29PlusImpl {
@JvmStatic
- @DoNotInline
fun registerFrameCommitCallback(observer: ViewTreeObserver, callback: Runnable) {
observer.registerFrameCommitCallback(callback)
}
diff --git a/privacysandbox/ui/ui-provider/src/main/java/androidx/privacysandbox/ui/provider/BinderAdapterDelegate.kt b/privacysandbox/ui/ui-provider/src/main/java/androidx/privacysandbox/ui/provider/BinderAdapterDelegate.kt
index a993e74..ecb4e64 100644
--- a/privacysandbox/ui/ui-provider/src/main/java/androidx/privacysandbox/ui/provider/BinderAdapterDelegate.kt
+++ b/privacysandbox/ui/ui-provider/src/main/java/androidx/privacysandbox/ui/provider/BinderAdapterDelegate.kt
@@ -29,7 +29,6 @@
import android.view.Display
import android.view.SurfaceControlViewHost
import android.view.View
-import androidx.annotation.DoNotInline
import androidx.annotation.RequiresApi
import androidx.annotation.VisibleForTesting
import androidx.privacysandbox.ui.core.IRemoteSessionClient
@@ -319,7 +318,6 @@
private object Api34PlusImpl {
@JvmStatic
- @DoNotInline
fun createSurfaceControlViewHost(
context: Context,
display: Display,
diff --git a/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstallerInitializer.java b/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstallerInitializer.java
index d90e0ee..4814766f 100644
--- a/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstallerInitializer.java
+++ b/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileInstallerInitializer.java
@@ -22,7 +22,6 @@
import android.os.Looper;
import android.view.Choreographer;
-import androidx.annotation.DoNotInline;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.startup.Initializer;
@@ -150,7 +149,6 @@
}
// avoid aligning with vsync when available (API 28+)
- @DoNotInline
public static Handler createAsync(Looper looper) {
return Handler.createAsync(looper);
}
diff --git a/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileVerifier.java b/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileVerifier.java
index 7bea88d..2d5b62a 100644
--- a/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileVerifier.java
+++ b/profileinstaller/profileinstaller/src/main/java/androidx/profileinstaller/ProfileVerifier.java
@@ -33,7 +33,6 @@
import android.content.res.AssetFileDescriptor;
import android.os.Build;
-import androidx.annotation.DoNotInline;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -618,7 +617,6 @@
private Api33Impl() {
}
- @DoNotInline
static PackageInfo getPackageInfo(
PackageManager packageManager,
Context context) throws PackageManager.NameNotFoundException {
