Skip to content

Commit fceab4a

Browse files
jsjeonjsjeon
committed
Update API lint baselines, current/beta API w/ Metalava update
More specific check for Kotlin boolean property naming. Fix nullability for inherited generic type. RelNote: N/A Bug: 152442689 Bug: 134803955 Bug: 276326483 Bug: 278505954 Test: presubmit Change-Id: Ia2ba44488722ce6362cb1b303c1084d92110d514 Merged-In: Ia2ba44488722ce6362cb1b303c1084d92110d514
1 parent 08c57e8 commit fceab4a

File tree

230 files changed

+2188
-1162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+2188
-1162
lines changed

‎activity/activity-compose/api/current.ignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.activity.compose.ManagedActivityResultLauncher#launch(I, androidx.core.app.ActivityOptionsCompat) parameter #0:
3+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.compose.ManagedActivityResultLauncher.launch(I input, androidx.core.app.ActivityOptionsCompat options)

‎activity/activity-compose/api/current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package androidx.activity.compose {
3636

3737
public final class ManagedActivityResultLauncher<I, O> extends androidx.activity.result.ActivityResultLauncher<I> {
3838
method public androidx.activity.result.contract.ActivityResultContract<I,?> getContract();
39-
method public void launch(I? input, androidx.core.app.ActivityOptionsCompat? options);
39+
method public void launch(I input, androidx.core.app.ActivityOptionsCompat? options);
4040
method @Deprecated public void unregister();
4141
}
4242

‎activity/activity-compose/api/public_plus_experimental_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package androidx.activity.compose {
3636

3737
public final class ManagedActivityResultLauncher<I, O> extends androidx.activity.result.ActivityResultLauncher<I> {
3838
method public androidx.activity.result.contract.ActivityResultContract<I,?> getContract();
39-
method public void launch(I? input, androidx.core.app.ActivityOptionsCompat? options);
39+
method public void launch(I input, androidx.core.app.ActivityOptionsCompat? options);
4040
method @Deprecated public void unregister();
4141
}
4242

‎activity/activity-compose/api/restricted_current.ignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.activity.compose.ManagedActivityResultLauncher#launch(I, androidx.core.app.ActivityOptionsCompat) parameter #0:
3+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.compose.ManagedActivityResultLauncher.launch(I input, androidx.core.app.ActivityOptionsCompat options)

‎activity/activity-compose/api/restricted_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package androidx.activity.compose {
3636

3737
public final class ManagedActivityResultLauncher<I, O> extends androidx.activity.result.ActivityResultLauncher<I> {
3838
method public androidx.activity.result.contract.ActivityResultContract<I,?> getContract();
39-
method public void launch(I? input, androidx.core.app.ActivityOptionsCompat? options);
39+
method public void launch(I input, androidx.core.app.ActivityOptionsCompat? options);
4040
method @Deprecated public void unregister();
4141
}
4242

‎activity/activity-ktx/api/current.ignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.activity.result.ActivityResultCallerKt#registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O>, I, androidx.activity.result.ActivityResultRegistry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit>) parameter #2:
3+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.ActivityResultCallerKt.registerForActivityResult(androidx.activity.result.ActivityResultCaller arg1, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback)
4+
InvalidNullConversion: androidx.activity.result.ActivityResultCallerKt#registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O>, I, kotlin.jvm.functions.Function1<? super O,kotlin.Unit>) parameter #2:
5+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.ActivityResultCallerKt.registerForActivityResult(androidx.activity.result.ActivityResultCaller arg1, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback)

‎activity/activity-ktx/api/current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package androidx.activity {
1515
package androidx.activity.result {
1616

1717
public final class ActivityResultCallerKt {
18-
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I? input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
19-
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I? input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
18+
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
19+
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
2020
}
2121

2222
public final class ActivityResultKt {

‎activity/activity-ktx/api/public_plus_experimental_current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package androidx.activity {
1515
package androidx.activity.result {
1616

1717
public final class ActivityResultCallerKt {
18-
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I? input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
19-
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I? input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
18+
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
19+
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
2020
}
2121

2222
public final class ActivityResultKt {

‎activity/activity-ktx/api/restricted_current.ignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.activity.result.ActivityResultCallerKt#registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O>, I, androidx.activity.result.ActivityResultRegistry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit>) parameter #2:
3+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.ActivityResultCallerKt.registerForActivityResult(androidx.activity.result.ActivityResultCaller arg1, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback)
4+
InvalidNullConversion: androidx.activity.result.ActivityResultCallerKt#registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O>, I, kotlin.jvm.functions.Function1<? super O,kotlin.Unit>) parameter #2:
5+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.ActivityResultCallerKt.registerForActivityResult(androidx.activity.result.ActivityResultCaller arg1, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback)

‎activity/activity-ktx/api/restricted_current.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package androidx.activity {
1515
package androidx.activity.result {
1616

1717
public final class ActivityResultCallerKt {
18-
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I? input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
19-
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I? input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
18+
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, androidx.activity.result.ActivityResultRegistry registry, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
19+
method public static <I, O> androidx.activity.result.ActivityResultLauncher<kotlin.Unit> registerForActivityResult(androidx.activity.result.ActivityResultCaller, androidx.activity.result.contract.ActivityResultContract<I,O> contract, I input, kotlin.jvm.functions.Function1<? super O,kotlin.Unit> callback);
2020
}
2121

2222
public final class ActivityResultKt {

‎activity/activity/api/current.ignore

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.activity.result.ActivityResultCallback#onActivityResult(O) parameter #0:
3+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter result in androidx.activity.result.ActivityResultCallback.onActivityResult(O result)
4+
InvalidNullConversion: androidx.activity.result.contract.ActivityResultContract#createIntent(android.content.Context, I) parameter #1:
5+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.contract.ActivityResultContract.createIntent(android.content.Context context, I input)
6+
InvalidNullConversion: androidx.activity.result.contract.ActivityResultContract#getSynchronousResult(android.content.Context, I) parameter #1:
7+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.contract.ActivityResultContract.getSynchronousResult(android.content.Context context, I input)
8+
InvalidNullConversion: androidx.activity.result.contract.ActivityResultContract.SynchronousResult#SynchronousResult(T) parameter #0:
9+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter value in androidx.activity.result.contract.ActivityResultContract.SynchronousResult(T value)
10+
11+
212
RemovedMethod: androidx.activity.ComponentActivity#onBackPressed():
313
Removed method androidx.activity.ComponentActivity.onBackPressed()

‎activity/activity/api/current.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ package androidx.activity.result {
176176
}
177177

178178
public fun interface ActivityResultCallback<O> {
179-
method public void onActivityResult(O? result);
179+
method public void onActivityResult(O result);
180180
}
181181

182182
public interface ActivityResultCaller {
@@ -255,15 +255,15 @@ package androidx.activity.result.contract {
255255

256256
public abstract class ActivityResultContract<I, O> {
257257
ctor public ActivityResultContract();
258-
method public abstract android.content.Intent createIntent(android.content.Context context, I? input);
259-
method public androidx.activity.result.contract.ActivityResultContract.SynchronousResult<O>? getSynchronousResult(android.content.Context context, I? input);
260-
method public abstract O! parseResult(int resultCode, android.content.Intent? intent);
258+
method public abstract android.content.Intent createIntent(android.content.Context context, I input);
259+
method public androidx.activity.result.contract.ActivityResultContract.SynchronousResult<O>? getSynchronousResult(android.content.Context context, I input);
260+
method public abstract O parseResult(int resultCode, android.content.Intent? intent);
261261
}
262262

263263
public static final class ActivityResultContract.SynchronousResult<T> {
264-
ctor public ActivityResultContract.SynchronousResult(T? value);
265-
method public T! getValue();
266-
property public final T! value;
264+
ctor public ActivityResultContract.SynchronousResult(T value);
265+
method public T getValue();
266+
property public final T value;
267267
}
268268

269269
public final class ActivityResultContracts {

‎activity/activity/api/public_plus_experimental_current.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ package androidx.activity.result {
176176
}
177177

178178
public fun interface ActivityResultCallback<O> {
179-
method public void onActivityResult(O? result);
179+
method public void onActivityResult(O result);
180180
}
181181

182182
public interface ActivityResultCaller {
@@ -255,15 +255,15 @@ package androidx.activity.result.contract {
255255

256256
public abstract class ActivityResultContract<I, O> {
257257
ctor public ActivityResultContract();
258-
method public abstract android.content.Intent createIntent(android.content.Context context, I? input);
259-
method public androidx.activity.result.contract.ActivityResultContract.SynchronousResult<O>? getSynchronousResult(android.content.Context context, I? input);
260-
method public abstract O! parseResult(int resultCode, android.content.Intent? intent);
258+
method public abstract android.content.Intent createIntent(android.content.Context context, I input);
259+
method public androidx.activity.result.contract.ActivityResultContract.SynchronousResult<O>? getSynchronousResult(android.content.Context context, I input);
260+
method public abstract O parseResult(int resultCode, android.content.Intent? intent);
261261
}
262262

263263
public static final class ActivityResultContract.SynchronousResult<T> {
264-
ctor public ActivityResultContract.SynchronousResult(T? value);
265-
method public T! getValue();
266-
property public final T! value;
264+
ctor public ActivityResultContract.SynchronousResult(T value);
265+
method public T getValue();
266+
property public final T value;
267267
}
268268

269269
public final class ActivityResultContracts {

‎activity/activity/api/restricted_current.ignore

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
// Baseline format: 1.0
2+
InvalidNullConversion: androidx.activity.result.ActivityResultCallback#onActivityResult(O) parameter #0:
3+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter result in androidx.activity.result.ActivityResultCallback.onActivityResult(O result)
4+
InvalidNullConversion: androidx.activity.result.contract.ActivityResultContract#createIntent(android.content.Context, I) parameter #1:
5+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.contract.ActivityResultContract.createIntent(android.content.Context context, I input)
6+
InvalidNullConversion: androidx.activity.result.contract.ActivityResultContract#getSynchronousResult(android.content.Context, I) parameter #1:
7+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter input in androidx.activity.result.contract.ActivityResultContract.getSynchronousResult(android.content.Context context, I input)
8+
InvalidNullConversion: androidx.activity.result.contract.ActivityResultContract.SynchronousResult#SynchronousResult(T) parameter #0:
9+
Attempted to change parameter from @Nullable to @NonNull: incompatible change for parameter value in androidx.activity.result.contract.ActivityResultContract.SynchronousResult(T value)
10+
11+
212
RemovedMethod: androidx.activity.ComponentActivity#onBackPressed():
313
Removed method androidx.activity.ComponentActivity.onBackPressed()

‎activity/activity/api/restricted_current.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ package androidx.activity.result {
175175
}
176176

177177
public fun interface ActivityResultCallback<O> {
178-
method public void onActivityResult(O? result);
178+
method public void onActivityResult(O result);
179179
}
180180

181181
public interface ActivityResultCaller {
@@ -254,15 +254,15 @@ package androidx.activity.result.contract {
254254

255255
public abstract class ActivityResultContract<I, O> {
256256
ctor public ActivityResultContract();
257-
method public abstract android.content.Intent createIntent(android.content.Context context, I? input);
258-
method public androidx.activity.result.contract.ActivityResultContract.SynchronousResult<O>? getSynchronousResult(android.content.Context context, I? input);
259-
method public abstract O! parseResult(int resultCode, android.content.Intent? intent);
257+
method public abstract android.content.Intent createIntent(android.content.Context context, I input);
258+
method public androidx.activity.result.contract.ActivityResultContract.SynchronousResult<O>? getSynchronousResult(android.content.Context context, I input);
259+
method public abstract O parseResult(int resultCode, android.content.Intent? intent);
260260
}
261261

262262
public static final class ActivityResultContract.SynchronousResult<T> {
263-
ctor public ActivityResultContract.SynchronousResult(T? value);
264-
method public T! getValue();
265-
property public final T! value;
263+
ctor public ActivityResultContract.SynchronousResult(T value);
264+
method public T getValue();
265+
property public final T value;
266266
}
267267

268268
public final class ActivityResultContracts {

‎benchmark/benchmark-junit4/api/api_lint.ignore

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
// Baseline format: 1.0
2+
GetterSetterNames: field PerfettoTraceRule.enableAppTagTracing:
3+
Invalid name for boolean property `enableAppTagTracing`. Should start with one of `has`, `can`, `should`, `is`.
4+
GetterSetterNames: field PerfettoTraceRule.enableUserspaceTracing:
5+
Invalid name for boolean property `enableUserspaceTracing`. Should start with one of `has`, `can`, `should`, `is`.
6+
7+
28
InvalidNullabilityOverride: androidx.benchmark.junit4.BenchmarkRule#apply(org.junit.runners.model.Statement, org.junit.runner.Description) parameter #0:
39
Invalid nullability on parameter `base` in method `apply`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
410
InvalidNullabilityOverride: androidx.benchmark.junit4.BenchmarkRule#apply(org.junit.runners.model.Statement, org.junit.runner.Description) parameter #1:

‎benchmark/benchmark-junit4/api/current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package androidx.benchmark.junit4 {
1212
}
1313

1414
public final class BenchmarkRule.Scope {
15-
method public inline <T> T! runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
15+
method public inline <T> T runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
1616
}
1717

1818
public final class BenchmarkRuleKt {

‎benchmark/benchmark-junit4/api/public_plus_experimental_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package androidx.benchmark.junit4 {
1212
}
1313

1414
public final class BenchmarkRule.Scope {
15-
method public inline <T> T! runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
15+
method public inline <T> T runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
1616
}
1717

1818
public final class BenchmarkRuleKt {

‎benchmark/benchmark-junit4/api/restricted_current.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package androidx.benchmark.junit4 {
1313

1414
public final class BenchmarkRule.Scope {
1515
method @kotlin.PublishedApi internal androidx.benchmark.BenchmarkState getOuterState();
16-
method public inline <T> T! runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
16+
method public inline <T> T runWithTimingDisabled(kotlin.jvm.functions.Function0<? extends T> block);
1717
}
1818

1919
public final class BenchmarkRuleKt {

‎benchmark/benchmark-macro/api/api_lint.ignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// Baseline format: 1.0
2+
GetterSetterNames: field Metric.Measurement.requireSingleValue:
3+
Invalid name for boolean property `requireSingleValue`. Should start with one of `has`, `can`, `should`, `is`.

0 commit comments

Comments
 (0)