Skip to content

Commit 68e4fa2

Browse files
alanvalanv
committed
Migrate all UnstableAidl violations to Stable AIDL
Excludes 🚗app:app-automotive and :media2:media2-session because we do not yet export Stable AIDL definitions between projects. Excludes :media:media due to Stable AIDL issue b/277088307. Bug: 277088307 Bug: 255373327 Test: ./gradlew checkReleaseAidlApi Change-Id: I85afc281d17b1779c23c3aa5b232dc96fde922b7
1 parent e42ace1 commit 68e4fa2

File tree

179 files changed

+3425
-29
lines changed

Some content is hidden

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

179 files changed

+3425
-29
lines changed

‎browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsCallback.aidl

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright (C) 2015 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
///////////////////////////////////////////////////////////////////////////////
17+
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
18+
///////////////////////////////////////////////////////////////////////////////
19+
20+
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
21+
// two cases:
22+
// 1). this is a frozen version file - do not edit this in any case.
23+
// 2). this is a 'current' file. If you make a backwards compatible change to
24+
// the interface (from the latest frozen version), the build system will
25+
// prompt you to update this file with `m <name>-update-api`.
26+
//
27+
// You must not make a backward incompatible change to any AIDL file built
28+
// with the aidl_interface module type with versions property set. The module
29+
// type is used to build AIDL files in a way that they can be used across
30+
// independently updatable components of the system. If a device is shipped
31+
// with such a backward incompatible change, it has a high risk of breaking
32+
// later when a module using the interface is updated, e.g., Mainline modules.
33+
34+
package android.support.customtabs;
35+
/* @hide */
36+
interface ICustomTabsCallback {
37+
oneway void onNavigationEvent(int navigationEvent, in android.os.Bundle extras) = 1;
38+
oneway void extraCallback(String callbackName, in android.os.Bundle args) = 2;
39+
void onMessageChannelReady(in android.os.Bundle extras) = 3;
40+
void onPostMessage(String message, in android.os.Bundle extras) = 4;
41+
oneway void onRelationshipValidationResult(int relation, in android.net.Uri origin, boolean result, in android.os.Bundle extras) = 5;
42+
android.os.Bundle extraCallbackWithResult(String callbackName, in android.os.Bundle args) = 6;
43+
oneway void onActivityResized(int height, int width, in android.os.Bundle extras) = 7;
44+
}

‎browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsService.aidl

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Copyright (C) 2015 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
///////////////////////////////////////////////////////////////////////////////
17+
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
18+
///////////////////////////////////////////////////////////////////////////////
19+
20+
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
21+
// two cases:
22+
// 1). this is a frozen version file - do not edit this in any case.
23+
// 2). this is a 'current' file. If you make a backwards compatible change to
24+
// the interface (from the latest frozen version), the build system will
25+
// prompt you to update this file with `m <name>-update-api`.
26+
//
27+
// You must not make a backward incompatible change to any AIDL file built
28+
// with the aidl_interface module type with versions property set. The module
29+
// type is used to build AIDL files in a way that they can be used across
30+
// independently updatable components of the system. If a device is shipped
31+
// with such a backward incompatible change, it has a high risk of breaking
32+
// later when a module using the interface is updated, e.g., Mainline modules.
33+
34+
package android.support.customtabs;
35+
/* @hide */
36+
interface ICustomTabsService {
37+
boolean warmup(long flags) = 1;
38+
boolean newSession(in android.support.customtabs.ICustomTabsCallback callback) = 2;
39+
boolean newSessionWithExtras(in android.support.customtabs.ICustomTabsCallback callback, in android.os.Bundle extras) = 9;
40+
boolean mayLaunchUrl(in android.support.customtabs.ICustomTabsCallback callback, in android.net.Uri url, in android.os.Bundle extras, in List<android.os.Bundle> otherLikelyBundles) = 3;
41+
android.os.Bundle extraCommand(String commandName, in android.os.Bundle args) = 4;
42+
boolean updateVisuals(in android.support.customtabs.ICustomTabsCallback callback, in android.os.Bundle bundle) = 5;
43+
boolean requestPostMessageChannel(in android.support.customtabs.ICustomTabsCallback callback, in android.net.Uri postMessageOrigin) = 6;
44+
boolean requestPostMessageChannelWithExtras(in android.support.customtabs.ICustomTabsCallback callback, in android.net.Uri postMessageOrigin, in android.os.Bundle extras) = 10;
45+
int postMessage(in android.support.customtabs.ICustomTabsCallback callback, String message, in android.os.Bundle extras) = 7;
46+
boolean validateRelationship(in android.support.customtabs.ICustomTabsCallback callback, int relation, in android.net.Uri origin, in android.os.Bundle extras) = 8;
47+
boolean receiveFile(in android.support.customtabs.ICustomTabsCallback callback, in android.net.Uri uri, int purpose, in android.os.Bundle extras) = 11;
48+
boolean isEngagementSignalsApiAvailable(in android.support.customtabs.ICustomTabsCallback customTabsCallback, in android.os.Bundle extras) = 12;
49+
boolean setEngagementSignalsCallback(in android.support.customtabs.ICustomTabsCallback customTabsCallback, in IBinder callback, in android.os.Bundle extras) = 13;
50+
int getGreatestScrollPercentage(in android.support.customtabs.ICustomTabsCallback customTabsCallback, in android.os.Bundle extras) = 14;
51+
}

‎browser/browser/api/aidlRelease/current/android/support/customtabs/IEngagementSignalsCallback.aidl

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Copyright (C) 2023 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
///////////////////////////////////////////////////////////////////////////////
17+
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
18+
///////////////////////////////////////////////////////////////////////////////
19+
20+
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
21+
// two cases:
22+
// 1). this is a frozen version file - do not edit this in any case.
23+
// 2). this is a 'current' file. If you make a backwards compatible change to
24+
// the interface (from the latest frozen version), the build system will
25+
// prompt you to update this file with `m <name>-update-api`.
26+
//
27+
// You must not make a backward incompatible change to any AIDL file built
28+
// with the aidl_interface module type with versions property set. The module
29+
// type is used to build AIDL files in a way that they can be used across
30+
// independently updatable components of the system. If a device is shipped
31+
// with such a backward incompatible change, it has a high risk of breaking
32+
// later when a module using the interface is updated, e.g., Mainline modules.
33+
34+
package android.support.customtabs;
35+
/* @hide */
36+
interface IEngagementSignalsCallback {
37+
oneway void onVerticalScrollEvent(boolean isDirectionUp, in android.os.Bundle extras) = 1;
38+
oneway void onGreatestScrollPercentageIncreased(int scrollPercentage, in android.os.Bundle extras) = 2;
39+
oneway void onSessionEnded(boolean didUserInteract, in android.os.Bundle extras) = 3;
40+
}

‎browser/browser/api/aidlRelease/current/android/support/customtabs/IPostMessageService.aidl

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
* Copyright (C) 2016 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
///////////////////////////////////////////////////////////////////////////////
17+
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
18+
///////////////////////////////////////////////////////////////////////////////
19+
20+
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
21+
// two cases:
22+
// 1). this is a frozen version file - do not edit this in any case.
23+
// 2). this is a 'current' file. If you make a backwards compatible change to
24+
// the interface (from the latest frozen version), the build system will
25+
// prompt you to update this file with `m <name>-update-api`.
26+
//
27+
// You must not make a backward incompatible change to any AIDL file built
28+
// with the aidl_interface module type with versions property set. The module
29+
// type is used to build AIDL files in a way that they can be used across
30+
// independently updatable components of the system. If a device is shipped
31+
// with such a backward incompatible change, it has a high risk of breaking
32+
// later when a module using the interface is updated, e.g., Mainline modules.
33+
34+
package android.support.customtabs;
35+
/* @hide */
36+
interface IPostMessageService {
37+
void onMessageChannelReady(in android.support.customtabs.ICustomTabsCallback callback, in android.os.Bundle extras) = 1;
38+
void onPostMessage(in android.support.customtabs.ICustomTabsCallback callback, String message, in android.os.Bundle extras) = 2;
39+
}

‎browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* Copyright 2020 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
///////////////////////////////////////////////////////////////////////////////
17+
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
18+
///////////////////////////////////////////////////////////////////////////////
19+
20+
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
21+
// two cases:
22+
// 1). this is a frozen version file - do not edit this in any case.
23+
// 2). this is a 'current' file. If you make a backwards compatible change to
24+
// the interface (from the latest frozen version), the build system will
25+
// prompt you to update this file with `m <name>-update-api`.
26+
//
27+
// You must not make a backward incompatible change to any AIDL file built
28+
// with the aidl_interface module type with versions property set. The module
29+
// type is used to build AIDL files in a way that they can be used across
30+
// independently updatable components of the system. If a device is shipped
31+
// with such a backward incompatible change, it has a high risk of breaking
32+
// later when a module using the interface is updated, e.g., Mainline modules.
33+
34+
package android.support.customtabs.trusted;
35+
/* @hide */
36+
interface ITrustedWebActivityCallback {
37+
void onExtraCallback(String callbackName, in android.os.Bundle bundle) = 1;
38+
}

‎browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityService.aidl

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright 2018 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
///////////////////////////////////////////////////////////////////////////////
17+
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
18+
///////////////////////////////////////////////////////////////////////////////
19+
20+
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
21+
// two cases:
22+
// 1). this is a frozen version file - do not edit this in any case.
23+
// 2). this is a 'current' file. If you make a backwards compatible change to
24+
// the interface (from the latest frozen version), the build system will
25+
// prompt you to update this file with `m <name>-update-api`.
26+
//
27+
// You must not make a backward incompatible change to any AIDL file built
28+
// with the aidl_interface module type with versions property set. The module
29+
// type is used to build AIDL files in a way that they can be used across
30+
// independently updatable components of the system. If a device is shipped
31+
// with such a backward incompatible change, it has a high risk of breaking
32+
// later when a module using the interface is updated, e.g., Mainline modules.
33+
34+
package android.support.customtabs.trusted;
35+
/* @hide */
36+
interface ITrustedWebActivityService {
37+
android.os.Bundle areNotificationsEnabled(in android.os.Bundle args) = 5;
38+
android.os.Bundle notifyNotificationWithChannel(in android.os.Bundle args) = 1;
39+
void cancelNotification(in android.os.Bundle args) = 2;
40+
android.os.Bundle getActiveNotifications() = 4;
41+
int getSmallIconId() = 3;
42+
android.os.Bundle getSmallIconBitmap() = 6;
43+
android.os.Bundle extraCommand(String commandName, in android.os.Bundle args, in IBinder callback) = 8;
44+
}

‎browser/browser/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import androidx.build.Publish
33
plugins {
44
id("AndroidXPlugin")
55
id("com.android.library")
6+
id("androidx.stableaidl")
67
}
78

89
android {
@@ -12,6 +13,11 @@ android {
1213
buildFeatures {
1314
aidl = true
1415
}
16+
buildTypes.all {
17+
stableAidl {
18+
version 1
19+
}
20+
}
1521
testOptions.unitTests.includeAndroidResources = true
1622
namespace "androidx.browser"
1723
}

‎browser/browser/src/main/aidl/android/support/customtabs/ICustomTabsCallback.aidl renamed to ‎browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsCallback.aidl

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package android.support.customtabs;
1818

19+
import android.net.Uri;
1920
import android.os.Bundle;
2021

2122
/**

‎browser/browser/src/main/aidl/android/support/customtabs/ICustomTabsService.aidl renamed to ‎browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsService.aidl

File renamed without changes.

‎browser/browser/src/main/aidl/android/support/customtabs/IEngagementSignalsCallback.aidl renamed to ‎browser/browser/src/main/stableAidl/android/support/customtabs/IEngagementSignalsCallback.aidl

File renamed without changes.

‎browser/browser/src/main/aidl/android/support/customtabs/IPostMessageService.aidl renamed to ‎browser/browser/src/main/stableAidl/android/support/customtabs/IPostMessageService.aidl

File renamed without changes.

‎browser/browser/src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl renamed to ‎browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package android.support.customtabs.trusted;
1818

19+
import android.os.Bundle;
20+
1921
/**
2022
* Interface to a TrustedWebActivityCallback.
2123
* @hide

‎browser/browser/src/main/aidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl renamed to ‎browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package android.support.customtabs.trusted;
1818

19+
import android.os.Bundle;
20+
1921
/**
2022
* Interface to a TrustedWebActivityService.
2123
* @hide

‎browser/browser/src/main/stableAidlImports/android/content/ComponentName.aidl

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Copyright (C) 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package android.content;
18+
19+
@JavaOnlyStableParcelable parcelable ComponentName;

‎browser/browser/src/main/stableAidlImports/android/net/Uri.aidl

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Copyright (C) 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package android.net;
18+
19+
@JavaOnlyStableParcelable parcelable Uri;

‎browser/browser/src/main/stableAidlImports/android/os/Bundle.aidl

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Copyright (C) 2022 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package android.os;
18+
19+
@JavaOnlyStableParcelable parcelable Bundle;

0 commit comments

Comments
 (0)