Revert "Finalize artifacts for extension SDK 5"

Revert "[automerge] Bump SDK Extension version to 5 2p: 03fbfe7d30"

Revert "Finalize artifacts for extension SDK 5"

Revert "Bump SDK Extension version to 5"

Revert "[automerge] Finalize artifacts for extension SDK 5 2p: 6..."

Revert "Bump SDK Extension version to 5"

Revert "[automerge] Finalize artifacts for extension SDK 5 2p: d..."

Revert submission 20334939-ext-v5

Reason for revert: v5 release is cancelled for 2023-01 Mission.
Reverted Changes:
Ifaeb81f51:[automerge] Finalize artifacts for extension SDK 5...
I5e2ea6d7f:[automerge] Finalize artifacts for extension SDK 5...
I488c2e581:[automerge] Finalize artifacts for extension SDK 5...
If696ca6ca:Finalize artifacts for extension SDK 5
Ic27649417:[automerge] Bump SDK Extension version to 5 2p: b1...
I4d670b2ad:[automerge] Bump SDK Extension version to 5 2p: 03...
I71b0d123e:Finalize artifacts for extension SDK 5
I0214950c0:Finalize artifacts for extension SDK 5
I309e0eb80:Bump SDK Extension version to 5
I1f1293ffd:Bump SDK Extension version to 5

Bug: 256848771

Change-Id: I95264e1f213f6154f02dea25f8547dc1dd19448b
(cherry picked from commit 3b55cd258d8bad2373aca0502ad0172248bed078)
Merged-In: I95264e1f213f6154f02dea25f8547dc1dd19448b
diff --git a/extensions/5/module-lib/api/framework-adservices-removed.txt b/extensions/5/module-lib/api/framework-adservices-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/module-lib/api/framework-adservices-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/module-lib/api/framework-adservices.txt b/extensions/5/module-lib/api/framework-adservices.txt
deleted file mode 100644
index 3a3276d..0000000
--- a/extensions/5/module-lib/api/framework-adservices.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 2.0
-package android.adservices {
-
-  public class AdServicesFrameworkInitializer {
-    method public static void registerServiceWrappers();
-  }
-
-}
-
diff --git a/extensions/5/module-lib/api/framework-mediaprovider-removed.txt b/extensions/5/module-lib/api/framework-mediaprovider-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/module-lib/api/framework-mediaprovider-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/module-lib/api/framework-mediaprovider.txt b/extensions/5/module-lib/api/framework-mediaprovider.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/module-lib/api/framework-mediaprovider.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/module-lib/api/framework-sdksandbox-removed.txt b/extensions/5/module-lib/api/framework-sdksandbox-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/module-lib/api/framework-sdksandbox-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/module-lib/api/framework-sdksandbox.txt b/extensions/5/module-lib/api/framework-sdksandbox.txt
deleted file mode 100644
index c4fcb76..0000000
--- a/extensions/5/module-lib/api/framework-sdksandbox.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Signature format: 2.0
-package android.app.sdksandbox {
-
-  public class SdkSandboxManagerFrameworkInitializer {
-    method public static void registerServiceWrappers();
-  }
-
-}
-
diff --git a/extensions/5/module-lib/framework-adservices.jar b/extensions/5/module-lib/framework-adservices.jar
deleted file mode 100644
index b8d69c6..0000000
--- a/extensions/5/module-lib/framework-adservices.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/module-lib/framework-mediaprovider.jar b/extensions/5/module-lib/framework-mediaprovider.jar
deleted file mode 100644
index 47499e6..0000000
--- a/extensions/5/module-lib/framework-mediaprovider.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/module-lib/framework-sdksandbox.jar b/extensions/5/module-lib/framework-sdksandbox.jar
deleted file mode 100644
index d473959..0000000
--- a/extensions/5/module-lib/framework-sdksandbox.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/public/api/framework-adservices-removed.txt b/extensions/5/public/api/framework-adservices-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/public/api/framework-adservices-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/public/api/framework-adservices.txt b/extensions/5/public/api/framework-adservices.txt
deleted file mode 100644
index ff9e4ec..0000000
--- a/extensions/5/public/api/framework-adservices.txt
+++ /dev/null
@@ -1,414 +0,0 @@
-// Signature format: 2.0
-package android.adservices {
-
-  public class AdServicesState {
-    method public static boolean isAdServicesStateEnabled();
-  }
-
-  public class AdServicesVersion {
-    field public static final int API_VERSION;
-  }
-
-}
-
-package android.adservices.adid {
-
-  public class AdId {
-    ctor public AdId(@NonNull String, boolean);
-    method @NonNull public String getAdId();
-    method public boolean isLimitAdTrackingEnabled();
-    field public static final String ZERO_OUT = "00000000-0000-0000-0000-000000000000";
-  }
-
-  public class AdIdManager {
-    method @NonNull @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_AD_ID) public void getAdId(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.adservices.adid.AdId,java.lang.Exception>);
-  }
-
-}
-
-package android.adservices.adselection {
-
-  public final class AdSelectionConfig implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public android.adservices.common.AdSelectionSignals getAdSelectionSignals();
-    method @NonNull public java.util.List<android.adservices.common.AdTechIdentifier> getCustomAudienceBuyers();
-    method @NonNull public android.net.Uri getDecisionLogicUri();
-    method @NonNull public java.util.Map<android.adservices.common.AdTechIdentifier,android.adservices.common.AdSelectionSignals> getPerBuyerSignals();
-    method @NonNull public android.adservices.common.AdTechIdentifier getSeller();
-    method @NonNull public android.adservices.common.AdSelectionSignals getSellerSignals();
-    method @NonNull public android.net.Uri getTrustedScoringSignalsUri();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.adselection.AdSelectionConfig> CREATOR;
-  }
-
-  public static final class AdSelectionConfig.Builder {
-    ctor public AdSelectionConfig.Builder();
-    method @NonNull public android.adservices.adselection.AdSelectionConfig build();
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setAdSelectionSignals(@NonNull android.adservices.common.AdSelectionSignals);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setCustomAudienceBuyers(@NonNull java.util.List<android.adservices.common.AdTechIdentifier>);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setDecisionLogicUri(@NonNull android.net.Uri);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setPerBuyerSignals(@NonNull java.util.Map<android.adservices.common.AdTechIdentifier,android.adservices.common.AdSelectionSignals>);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setSeller(@NonNull android.adservices.common.AdTechIdentifier);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setSellerSignals(@NonNull android.adservices.common.AdSelectionSignals);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig.Builder setTrustedScoringSignalsUri(@NonNull android.net.Uri);
-  }
-
-  public class AdSelectionManager {
-    method @NonNull public android.adservices.adselection.TestAdSelectionManager getTestAdSelectionManager();
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void reportImpression(@NonNull android.adservices.adselection.ReportImpressionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void selectAds(@NonNull android.adservices.adselection.AdSelectionConfig, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.adservices.adselection.AdSelectionOutcome,java.lang.Exception>);
-  }
-
-  public class AdSelectionOutcome {
-    method @NonNull public long getAdSelectionId();
-    method @NonNull public android.net.Uri getRenderUri();
-  }
-
-  public static final class AdSelectionOutcome.Builder {
-    ctor public AdSelectionOutcome.Builder();
-    method @NonNull public android.adservices.adselection.AdSelectionOutcome build();
-    method @NonNull public android.adservices.adselection.AdSelectionOutcome.Builder setAdSelectionId(long);
-    method @NonNull public android.adservices.adselection.AdSelectionOutcome.Builder setRenderUri(@NonNull android.net.Uri);
-  }
-
-  public class AddAdSelectionOverrideRequest {
-    ctor public AddAdSelectionOverrideRequest(@NonNull android.adservices.adselection.AdSelectionConfig, @NonNull String, @NonNull android.adservices.common.AdSelectionSignals);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig getAdSelectionConfig();
-    method @NonNull public String getDecisionLogicJs();
-    method @NonNull public android.adservices.common.AdSelectionSignals getTrustedScoringSignals();
-  }
-
-  public class RemoveAdSelectionOverrideRequest {
-    ctor public RemoveAdSelectionOverrideRequest(@NonNull android.adservices.adselection.AdSelectionConfig);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig getAdSelectionConfig();
-  }
-
-  public class ReportImpressionRequest {
-    ctor public ReportImpressionRequest(long, @NonNull android.adservices.adselection.AdSelectionConfig);
-    method @NonNull public android.adservices.adselection.AdSelectionConfig getAdSelectionConfig();
-    method public long getAdSelectionId();
-  }
-
-  public class TestAdSelectionManager {
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void overrideAdSelectionConfigRemoteInfo(@NonNull android.adservices.adselection.AddAdSelectionOverrideRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void removeAdSelectionConfigRemoteInfoOverride(@NonNull android.adservices.adselection.RemoveAdSelectionOverrideRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void resetAllAdSelectionConfigRemoteOverrides(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-  }
-
-}
-
-package android.adservices.appsetid {
-
-  public class AppSetId {
-    ctor public AppSetId(@NonNull String, int);
-    method @NonNull public String getId();
-    method public int getScope();
-    field public static final int SCOPE_APP = 1; // 0x1
-    field public static final int SCOPE_DEVELOPER = 2; // 0x2
-  }
-
-  public class AppSetIdManager {
-    method @NonNull public void getAppSetId(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.adservices.appsetid.AppSetId,java.lang.Exception>);
-  }
-
-}
-
-package android.adservices.common {
-
-  public final class AdData implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public String getMetadata();
-    method @NonNull public android.net.Uri getRenderUri();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.common.AdData> CREATOR;
-  }
-
-  public static final class AdData.Builder {
-    ctor public AdData.Builder();
-    method @NonNull public android.adservices.common.AdData build();
-    method @NonNull public android.adservices.common.AdData.Builder setMetadata(@NonNull String);
-    method @NonNull public android.adservices.common.AdData.Builder setRenderUri(@NonNull android.net.Uri);
-  }
-
-  public final class AdSelectionSignals implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public static android.adservices.common.AdSelectionSignals fromString(@NonNull String);
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.common.AdSelectionSignals> CREATOR;
-    field public static final android.adservices.common.AdSelectionSignals EMPTY;
-  }
-
-  public class AdServicesPermissions {
-    field public static final String ACCESS_ADSERVICES_AD_ID = "android.permission.ACCESS_ADSERVICES_AD_ID";
-    field public static final String ACCESS_ADSERVICES_ATTRIBUTION = "android.permission.ACCESS_ADSERVICES_ATTRIBUTION";
-    field public static final String ACCESS_ADSERVICES_CUSTOM_AUDIENCE = "android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCE";
-    field public static final String ACCESS_ADSERVICES_TOPICS = "android.permission.ACCESS_ADSERVICES_TOPICS";
-  }
-
-  public final class AdTechIdentifier implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public static android.adservices.common.AdTechIdentifier fromString(@NonNull String);
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.common.AdTechIdentifier> CREATOR;
-  }
-
-}
-
-package android.adservices.customaudience {
-
-  public class AddCustomAudienceOverrideRequest {
-    ctor public AddCustomAudienceOverrideRequest(@NonNull android.adservices.common.AdTechIdentifier, @NonNull String, @NonNull String, @NonNull android.adservices.common.AdSelectionSignals);
-    method @NonNull public String getBiddingLogicJs();
-    method @NonNull public android.adservices.common.AdTechIdentifier getBuyer();
-    method @NonNull public String getName();
-    method @NonNull public android.adservices.common.AdSelectionSignals getTrustedBiddingSignals();
-  }
-
-  public static final class AddCustomAudienceOverrideRequest.Builder {
-    ctor public AddCustomAudienceOverrideRequest.Builder();
-    method @NonNull public android.adservices.customaudience.AddCustomAudienceOverrideRequest build();
-    method @NonNull public android.adservices.customaudience.AddCustomAudienceOverrideRequest.Builder setBiddingLogicJs(@NonNull String);
-    method @NonNull public android.adservices.customaudience.AddCustomAudienceOverrideRequest.Builder setBuyer(@NonNull android.adservices.common.AdTechIdentifier);
-    method @NonNull public android.adservices.customaudience.AddCustomAudienceOverrideRequest.Builder setName(@NonNull String);
-    method @NonNull public android.adservices.customaudience.AddCustomAudienceOverrideRequest.Builder setTrustedBiddingSignals(@NonNull android.adservices.common.AdSelectionSignals);
-  }
-
-  public final class CustomAudience implements android.os.Parcelable {
-    method public int describeContents();
-    method @Nullable public java.time.Instant getActivationTime();
-    method @NonNull public java.util.List<android.adservices.common.AdData> getAds();
-    method @NonNull public android.net.Uri getBiddingLogicUri();
-    method @NonNull public android.adservices.common.AdTechIdentifier getBuyer();
-    method @NonNull public android.net.Uri getDailyUpdateUri();
-    method @Nullable public java.time.Instant getExpirationTime();
-    method @NonNull public String getName();
-    method @Nullable public android.adservices.customaudience.TrustedBiddingData getTrustedBiddingData();
-    method @Nullable public android.adservices.common.AdSelectionSignals getUserBiddingSignals();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.customaudience.CustomAudience> CREATOR;
-  }
-
-  public static final class CustomAudience.Builder {
-    ctor public CustomAudience.Builder();
-    method @NonNull public android.adservices.customaudience.CustomAudience build();
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setActivationTime(@Nullable java.time.Instant);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setAds(@Nullable java.util.List<android.adservices.common.AdData>);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setBiddingLogicUri(@NonNull android.net.Uri);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setBuyer(@NonNull android.adservices.common.AdTechIdentifier);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setDailyUpdateUri(@NonNull android.net.Uri);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setExpirationTime(@Nullable java.time.Instant);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setName(@NonNull String);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setTrustedBiddingData(@Nullable android.adservices.customaudience.TrustedBiddingData);
-    method @NonNull public android.adservices.customaudience.CustomAudience.Builder setUserBiddingSignals(@Nullable android.adservices.common.AdSelectionSignals);
-  }
-
-  public class CustomAudienceManager {
-    method @NonNull public android.adservices.customaudience.TestCustomAudienceManager getTestCustomAudienceManager();
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void joinCustomAudience(@NonNull android.adservices.customaudience.JoinCustomAudienceRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void leaveCustomAudience(@NonNull android.adservices.customaudience.LeaveCustomAudienceRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-  }
-
-  public class JoinCustomAudienceRequest {
-    method @NonNull public android.adservices.customaudience.CustomAudience getCustomAudience();
-  }
-
-  public static final class JoinCustomAudienceRequest.Builder {
-    ctor public JoinCustomAudienceRequest.Builder();
-    method @NonNull public android.adservices.customaudience.JoinCustomAudienceRequest build();
-    method @NonNull public android.adservices.customaudience.JoinCustomAudienceRequest.Builder setCustomAudience(@NonNull android.adservices.customaudience.CustomAudience);
-  }
-
-  public final class LeaveCustomAudienceRequest {
-    method @NonNull public android.adservices.common.AdTechIdentifier getBuyer();
-    method @NonNull public String getName();
-  }
-
-  public static final class LeaveCustomAudienceRequest.Builder {
-    ctor public LeaveCustomAudienceRequest.Builder();
-    method @NonNull public android.adservices.customaudience.LeaveCustomAudienceRequest build();
-    method @NonNull public android.adservices.customaudience.LeaveCustomAudienceRequest.Builder setBuyer(@NonNull android.adservices.common.AdTechIdentifier);
-    method @NonNull public android.adservices.customaudience.LeaveCustomAudienceRequest.Builder setName(@NonNull String);
-  }
-
-  public class RemoveCustomAudienceOverrideRequest {
-    ctor public RemoveCustomAudienceOverrideRequest(@NonNull android.adservices.common.AdTechIdentifier, @NonNull String);
-    method @NonNull public android.adservices.common.AdTechIdentifier getBuyer();
-    method @NonNull public String getName();
-  }
-
-  public static final class RemoveCustomAudienceOverrideRequest.Builder {
-    ctor public RemoveCustomAudienceOverrideRequest.Builder();
-    method @NonNull public android.adservices.customaudience.RemoveCustomAudienceOverrideRequest build();
-    method @NonNull public android.adservices.customaudience.RemoveCustomAudienceOverrideRequest.Builder setBuyer(@NonNull android.adservices.common.AdTechIdentifier);
-    method @NonNull public android.adservices.customaudience.RemoveCustomAudienceOverrideRequest.Builder setName(@NonNull String);
-  }
-
-  public class TestCustomAudienceManager {
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void overrideCustomAudienceRemoteInfo(@NonNull android.adservices.customaudience.AddCustomAudienceOverrideRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void removeCustomAudienceRemoteInfoOverride(@NonNull android.adservices.customaudience.RemoveCustomAudienceOverrideRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_CUSTOM_AUDIENCE) public void resetAllCustomAudienceOverrides(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-  }
-
-  public final class TrustedBiddingData implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public java.util.List<java.lang.String> getTrustedBiddingKeys();
-    method @NonNull public android.net.Uri getTrustedBiddingUri();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.customaudience.TrustedBiddingData> CREATOR;
-  }
-
-  public static final class TrustedBiddingData.Builder {
-    ctor public TrustedBiddingData.Builder();
-    method @NonNull public android.adservices.customaudience.TrustedBiddingData build();
-    method @NonNull public android.adservices.customaudience.TrustedBiddingData.Builder setTrustedBiddingKeys(@NonNull java.util.List<java.lang.String>);
-    method @NonNull public android.adservices.customaudience.TrustedBiddingData.Builder setTrustedBiddingUri(@NonNull android.net.Uri);
-  }
-
-}
-
-package android.adservices.exceptions {
-
-  public class AdServicesException extends java.lang.Exception {
-    ctor public AdServicesException(@Nullable String, @Nullable Throwable);
-    ctor public AdServicesException(@Nullable String);
-  }
-
-}
-
-package android.adservices.measurement {
-
-  public class DeletionRequest {
-    method public int getDeletionMode();
-    method @NonNull public java.util.List<android.net.Uri> getDomainUris();
-    method @NonNull public java.time.Instant getEnd();
-    method public int getMatchBehavior();
-    method @NonNull public java.util.List<android.net.Uri> getOriginUris();
-    method @NonNull public java.time.Instant getStart();
-    field public static final int DELETION_MODE_ALL = 0; // 0x0
-    field public static final int DELETION_MODE_EXCLUDE_INTERNAL_DATA = 1; // 0x1
-    field public static final int MATCH_BEHAVIOR_DELETE = 0; // 0x0
-    field public static final int MATCH_BEHAVIOR_PRESERVE = 1; // 0x1
-  }
-
-  public static final class DeletionRequest.Builder {
-    ctor public DeletionRequest.Builder();
-    method @NonNull public android.adservices.measurement.DeletionRequest build();
-    method @NonNull public android.adservices.measurement.DeletionRequest.Builder setDeletionMode(int);
-    method @NonNull public android.adservices.measurement.DeletionRequest.Builder setDomainUris(@Nullable java.util.List<android.net.Uri>);
-    method @NonNull public android.adservices.measurement.DeletionRequest.Builder setEnd(@NonNull java.time.Instant);
-    method @NonNull public android.adservices.measurement.DeletionRequest.Builder setMatchBehavior(int);
-    method @NonNull public android.adservices.measurement.DeletionRequest.Builder setOriginUris(@Nullable java.util.List<android.net.Uri>);
-    method @NonNull public android.adservices.measurement.DeletionRequest.Builder setStart(@NonNull java.time.Instant);
-  }
-
-  public class MeasurementManager {
-    method public void deleteRegistrations(@NonNull android.adservices.measurement.DeletionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public void getMeasurementApiStatus(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Integer,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public void registerSource(@NonNull android.net.Uri, @Nullable android.view.InputEvent, @Nullable java.util.concurrent.Executor, @Nullable android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public void registerTrigger(@NonNull android.net.Uri, @Nullable java.util.concurrent.Executor, @Nullable android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public void registerWebSource(@NonNull android.adservices.measurement.WebSourceRegistrationRequest, @Nullable java.util.concurrent.Executor, @Nullable android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_ATTRIBUTION) public void registerWebTrigger(@NonNull android.adservices.measurement.WebTriggerRegistrationRequest, @Nullable java.util.concurrent.Executor, @Nullable android.os.OutcomeReceiver<java.lang.Object,java.lang.Exception>);
-    field public static final int MEASUREMENT_API_STATE_DISABLED = 0; // 0x0
-    field public static final int MEASUREMENT_API_STATE_ENABLED = 1; // 0x1
-  }
-
-  public final class WebSourceParams implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public android.net.Uri getRegistrationUri();
-    method public boolean isDebugKeyAllowed();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.measurement.WebSourceParams> CREATOR;
-  }
-
-  public static final class WebSourceParams.Builder {
-    ctor public WebSourceParams.Builder(@NonNull android.net.Uri);
-    method @NonNull public android.adservices.measurement.WebSourceParams build();
-    method @NonNull public android.adservices.measurement.WebSourceParams.Builder setDebugKeyAllowed(boolean);
-  }
-
-  public final class WebSourceRegistrationRequest implements android.os.Parcelable {
-    method public int describeContents();
-    method @Nullable public android.net.Uri getAppDestination();
-    method @Nullable public android.view.InputEvent getInputEvent();
-    method @NonNull public java.util.List<android.adservices.measurement.WebSourceParams> getSourceParams();
-    method @NonNull public android.net.Uri getTopOriginUri();
-    method @Nullable public android.net.Uri getVerifiedDestination();
-    method @Nullable public android.net.Uri getWebDestination();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.measurement.WebSourceRegistrationRequest> CREATOR;
-  }
-
-  public static final class WebSourceRegistrationRequest.Builder {
-    ctor public WebSourceRegistrationRequest.Builder(@NonNull java.util.List<android.adservices.measurement.WebSourceParams>, @NonNull android.net.Uri);
-    method @NonNull public android.adservices.measurement.WebSourceRegistrationRequest build();
-    method @NonNull public android.adservices.measurement.WebSourceRegistrationRequest.Builder setAppDestination(@Nullable android.net.Uri);
-    method @NonNull public android.adservices.measurement.WebSourceRegistrationRequest.Builder setInputEvent(@Nullable android.view.InputEvent);
-    method @NonNull public android.adservices.measurement.WebSourceRegistrationRequest.Builder setVerifiedDestination(@Nullable android.net.Uri);
-    method @NonNull public android.adservices.measurement.WebSourceRegistrationRequest.Builder setWebDestination(@Nullable android.net.Uri);
-  }
-
-  public final class WebTriggerParams implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public android.net.Uri getRegistrationUri();
-    method public boolean isDebugKeyAllowed();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.measurement.WebTriggerParams> CREATOR;
-  }
-
-  public static final class WebTriggerParams.Builder {
-    ctor public WebTriggerParams.Builder(@NonNull android.net.Uri);
-    method @NonNull public android.adservices.measurement.WebTriggerParams build();
-    method @NonNull public android.adservices.measurement.WebTriggerParams.Builder setDebugKeyAllowed(boolean);
-  }
-
-  public final class WebTriggerRegistrationRequest implements android.os.Parcelable {
-    method public int describeContents();
-    method @NonNull public android.net.Uri getDestination();
-    method @NonNull public java.util.List<android.adservices.measurement.WebTriggerParams> getTriggerParams();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.adservices.measurement.WebTriggerRegistrationRequest> CREATOR;
-  }
-
-  public static final class WebTriggerRegistrationRequest.Builder {
-    ctor public WebTriggerRegistrationRequest.Builder(@NonNull java.util.List<android.adservices.measurement.WebTriggerParams>, @NonNull android.net.Uri);
-    method @NonNull public android.adservices.measurement.WebTriggerRegistrationRequest build();
-  }
-
-}
-
-package android.adservices.topics {
-
-  public final class GetTopicsRequest {
-    method @NonNull public String getAdsSdkName();
-    method public boolean shouldRecordObservation();
-  }
-
-  public static final class GetTopicsRequest.Builder {
-    ctor public GetTopicsRequest.Builder();
-    method @NonNull public android.adservices.topics.GetTopicsRequest build();
-    method @NonNull public android.adservices.topics.GetTopicsRequest.Builder setAdsSdkName(@NonNull String);
-    method @NonNull public android.adservices.topics.GetTopicsRequest.Builder setShouldRecordObservation(boolean);
-  }
-
-  public final class GetTopicsResponse {
-    method @NonNull public java.util.List<android.adservices.topics.Topic> getTopics();
-  }
-
-  public static final class GetTopicsResponse.Builder {
-    ctor public GetTopicsResponse.Builder(@NonNull java.util.List<android.adservices.topics.Topic>);
-    method @NonNull public android.adservices.topics.GetTopicsResponse build();
-  }
-
-  public final class Topic {
-    ctor public Topic(long, long, int);
-    method public long getModelVersion();
-    method public long getTaxonomyVersion();
-    method public int getTopicId();
-  }
-
-  public final class TopicsManager {
-    method @NonNull @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_TOPICS) public void getTopics(@NonNull android.adservices.topics.GetTopicsRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.adservices.topics.GetTopicsResponse,java.lang.Exception>);
-  }
-
-}
-
diff --git a/extensions/5/public/api/framework-mediaprovider-removed.txt b/extensions/5/public/api/framework-mediaprovider-removed.txt
deleted file mode 100644
index 183a7c9..0000000
--- a/extensions/5/public/api/framework-mediaprovider-removed.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-// Signature format: 2.0
-package android.provider {
-
-  public static interface MediaStore.Audio.AudioColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String ALBUM = "album";
-    field public static final String ARTIST = "artist";
-    field public static final String COMPOSER = "composer";
-    field public static final String DURATION = "duration";
-  }
-
-  public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns {
-    field @Deprecated public static final String DESCRIPTION = "description";
-  }
-
-  public static interface MediaStore.Files.FileColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String TITLE = "title";
-  }
-
-  public static interface MediaStore.Images.ImageColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name";
-    field public static final String BUCKET_ID = "bucket_id";
-    field public static final String DATE_TAKEN = "datetaken";
-    field public static final String GROUP_ID = "group_id";
-    field public static final String ORIENTATION = "orientation";
-  }
-
-  public static interface MediaStore.MediaColumns extends android.provider.BaseColumns {
-    field @Deprecated public static final String GROUP_ID = "group_id";
-  }
-
-  public static interface MediaStore.Video.VideoColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String ALBUM = "album";
-    field public static final String ARTIST = "artist";
-    field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name";
-    field public static final String BUCKET_ID = "bucket_id";
-    field public static final String DATE_TAKEN = "datetaken";
-    field public static final String DURATION = "duration";
-    field public static final String GROUP_ID = "group_id";
-    field public static final String RESOLUTION = "resolution";
-  }
-
-}
-
diff --git a/extensions/5/public/api/framework-mediaprovider.txt b/extensions/5/public/api/framework-mediaprovider.txt
deleted file mode 100644
index b0d655d..0000000
--- a/extensions/5/public/api/framework-mediaprovider.txt
+++ /dev/null
@@ -1,530 +0,0 @@
-// Signature format: 2.0
-package android.provider {
-
-  public abstract class CloudMediaProvider extends android.content.ContentProvider {
-    ctor public CloudMediaProvider();
-    method public final void attachInfo(@NonNull android.content.Context, @NonNull android.content.pm.ProviderInfo);
-    method @NonNull public final android.os.Bundle call(@NonNull String, @Nullable String, @Nullable android.os.Bundle);
-    method @NonNull public final android.net.Uri canonicalize(@NonNull android.net.Uri);
-    method public final int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]);
-    method @NonNull public final String getType(@NonNull android.net.Uri);
-    method @NonNull public final android.net.Uri insert(@NonNull android.net.Uri, @NonNull android.content.ContentValues);
-    method @Nullable public android.provider.CloudMediaProvider.CloudMediaSurfaceController onCreateCloudMediaSurfaceController(@NonNull android.os.Bundle, @NonNull android.provider.CloudMediaProvider.CloudMediaSurfaceStateChangedCallback);
-    method @NonNull public abstract android.os.Bundle onGetMediaCollectionInfo(@NonNull android.os.Bundle);
-    method @NonNull public abstract android.os.ParcelFileDescriptor onOpenMedia(@NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
-    method @NonNull public abstract android.content.res.AssetFileDescriptor onOpenPreview(@NonNull String, @NonNull android.graphics.Point, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
-    method @NonNull public android.database.Cursor onQueryAlbums(@NonNull android.os.Bundle);
-    method @NonNull public abstract android.database.Cursor onQueryDeletedMedia(@NonNull android.os.Bundle);
-    method @NonNull public abstract android.database.Cursor onQueryMedia(@NonNull android.os.Bundle);
-    method @NonNull public final android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException;
-    method @NonNull public final android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
-    method @NonNull public final android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle) throws java.io.FileNotFoundException;
-    method @NonNull public final android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
-    method @NonNull public final android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal);
-    method @NonNull public final android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String);
-    method @NonNull public final android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable android.os.CancellationSignal);
-    method public final int update(@NonNull android.net.Uri, @NonNull android.content.ContentValues, @Nullable String, @Nullable String[]);
-  }
-
-  public abstract static class CloudMediaProvider.CloudMediaSurfaceController {
-    ctor public CloudMediaProvider.CloudMediaSurfaceController();
-    method public abstract void onConfigChange(@NonNull android.os.Bundle);
-    method public abstract void onDestroy();
-    method public abstract void onMediaPause(int);
-    method public abstract void onMediaPlay(int);
-    method public abstract void onMediaSeekTo(int, long);
-    method public abstract void onPlayerCreate();
-    method public abstract void onPlayerRelease();
-    method public abstract void onSurfaceChanged(int, int, int, int);
-    method public abstract void onSurfaceCreated(int, @NonNull android.view.Surface, @NonNull String);
-    method public abstract void onSurfaceDestroyed(int);
-  }
-
-  public static final class CloudMediaProvider.CloudMediaSurfaceStateChangedCallback {
-    method public void setPlaybackState(int, int, @Nullable android.os.Bundle);
-    field public static final int PLAYBACK_STATE_BUFFERING = 1; // 0x1
-    field public static final int PLAYBACK_STATE_COMPLETED = 5; // 0x5
-    field public static final int PLAYBACK_STATE_ERROR_PERMANENT_FAILURE = 7; // 0x7
-    field public static final int PLAYBACK_STATE_ERROR_RETRIABLE_FAILURE = 6; // 0x6
-    field public static final int PLAYBACK_STATE_MEDIA_SIZE_CHANGED = 8; // 0x8
-    field public static final int PLAYBACK_STATE_PAUSED = 4; // 0x4
-    field public static final int PLAYBACK_STATE_READY = 2; // 0x2
-    field public static final int PLAYBACK_STATE_STARTED = 3; // 0x3
-  }
-
-  public final class CloudMediaProviderContract {
-    field public static final String EXTRA_ALBUM_ID = "android.provider.extra.ALBUM_ID";
-    field public static final String EXTRA_LOOPING_PLAYBACK_ENABLED = "android.provider.extra.LOOPING_PLAYBACK_ENABLED";
-    field public static final String EXTRA_MEDIA_COLLECTION_ID = "android.provider.extra.MEDIA_COLLECTION_ID";
-    field public static final String EXTRA_PAGE_TOKEN = "android.provider.extra.PAGE_TOKEN";
-    field public static final String EXTRA_PREVIEW_THUMBNAIL = "android.provider.extra.PREVIEW_THUMBNAIL";
-    field public static final String EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED = "android.provider.extra.SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED";
-    field public static final String EXTRA_SYNC_GENERATION = "android.provider.extra.SYNC_GENERATION";
-    field public static final String MANAGE_CLOUD_MEDIA_PROVIDERS_PERMISSION = "com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS";
-    field public static final String PROVIDER_INTERFACE = "android.content.action.CLOUD_MEDIA_PROVIDER";
-  }
-
-  public static final class CloudMediaProviderContract.AlbumColumns {
-    field public static final String DATE_TAKEN_MILLIS = "date_taken_millis";
-    field public static final String DISPLAY_NAME = "display_name";
-    field public static final String ID = "id";
-    field public static final String MEDIA_COUNT = "album_media_count";
-    field public static final String MEDIA_COVER_ID = "album_media_cover_id";
-  }
-
-  public static final class CloudMediaProviderContract.MediaCollectionInfo {
-    field public static final String ACCOUNT_CONFIGURATION_INTENT = "account_configuration_intent";
-    field public static final String ACCOUNT_NAME = "account_name";
-    field public static final String LAST_MEDIA_SYNC_GENERATION = "last_media_sync_generation";
-    field public static final String MEDIA_COLLECTION_ID = "media_collection_id";
-  }
-
-  public static final class CloudMediaProviderContract.MediaColumns {
-    field public static final String DATE_TAKEN_MILLIS = "date_taken_millis";
-    field public static final String DURATION_MILLIS = "duration_millis";
-    field public static final String HEIGHT = "height";
-    field public static final String ID = "id";
-    field public static final String IS_FAVORITE = "is_favorite";
-    field public static final String MEDIA_STORE_URI = "media_store_uri";
-    field public static final String MIME_TYPE = "mime_type";
-    field public static final String ORIENTATION = "orientation";
-    field public static final String SIZE_BYTES = "size_bytes";
-    field public static final String STANDARD_MIME_TYPE_EXTENSION = "standard_mime_type_extension";
-    field public static final int STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP = 3; // 0x3
-    field public static final int STANDARD_MIME_TYPE_EXTENSION_GIF = 1; // 0x1
-    field public static final int STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO = 2; // 0x2
-    field public static final int STANDARD_MIME_TYPE_EXTENSION_NONE = 0; // 0x0
-    field public static final String SYNC_GENERATION = "sync_generation";
-    field public static final String WIDTH = "width";
-  }
-
-  public final class MediaStore {
-    ctor public MediaStore();
-    method public static boolean canManageMedia(@NonNull android.content.Context);
-    method @NonNull public static android.app.PendingIntent createDeleteRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>);
-    method @NonNull public static android.app.PendingIntent createFavoriteRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>, boolean);
-    method @NonNull public static android.app.PendingIntent createTrashRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>, boolean);
-    method @NonNull public static android.app.PendingIntent createWriteRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>);
-    method @Nullable public static android.net.Uri getDocumentUri(@NonNull android.content.Context, @NonNull android.net.Uri);
-    method @NonNull public static java.util.Set<java.lang.String> getExternalVolumeNames(@NonNull android.content.Context);
-    method public static long getGeneration(@NonNull android.content.Context, @NonNull String);
-    method public static android.net.Uri getMediaScannerUri();
-    method @Nullable public static android.net.Uri getMediaUri(@NonNull android.content.Context, @NonNull android.net.Uri);
-    method @NonNull public static android.os.ParcelFileDescriptor getOriginalMediaFormatFileDescriptor(@NonNull android.content.Context, @NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;
-    method public static int getPickImagesMaxLimit();
-    method @NonNull public static java.util.Set<java.lang.String> getRecentExternalVolumeNames(@NonNull android.content.Context);
-    method @Nullable public static android.net.Uri getRedactedUri(@NonNull android.content.ContentResolver, @NonNull android.net.Uri);
-    method @NonNull public static java.util.List<android.net.Uri> getRedactedUri(@NonNull android.content.ContentResolver, @NonNull java.util.List<android.net.Uri>);
-    method public static boolean getRequireOriginal(@NonNull android.net.Uri);
-    method @NonNull public static String getVersion(@NonNull android.content.Context);
-    method @NonNull public static String getVersion(@NonNull android.content.Context, @NonNull String);
-    method @NonNull public static String getVolumeName(@NonNull android.net.Uri);
-    method public static boolean isCurrentCloudMediaProviderAuthority(@NonNull android.content.ContentResolver, @NonNull String);
-    method public static boolean isCurrentSystemGallery(@NonNull android.content.ContentResolver, int, @NonNull String);
-    method public static boolean isSupportedCloudMediaProviderAuthority(@NonNull android.content.ContentResolver, @NonNull String);
-    method public static void notifyCloudMediaChangedEvent(@NonNull android.content.ContentResolver, @NonNull String, @NonNull String) throws java.lang.SecurityException;
-    method @Deprecated @NonNull public static android.net.Uri setIncludePending(@NonNull android.net.Uri);
-    method @NonNull public static android.net.Uri setRequireOriginal(@NonNull android.net.Uri);
-    field public static final String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
-    field public static final String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE";
-    field public static final String ACTION_PICK_IMAGES = "android.provider.action.PICK_IMAGES";
-    field public static final String ACTION_PICK_IMAGES_SETTINGS = "android.provider.action.PICK_IMAGES_SETTINGS";
-    field public static final String ACTION_REVIEW = "android.provider.action.REVIEW";
-    field public static final String ACTION_REVIEW_SECURE = "android.provider.action.REVIEW_SECURE";
-    field public static final String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";
-    field public static final String AUTHORITY = "media";
-    field @NonNull public static final android.net.Uri AUTHORITY_URI;
-    field public static final String EXTRA_ACCEPT_ORIGINAL_MEDIA_FORMAT = "android.provider.extra.ACCEPT_ORIGINAL_MEDIA_FORMAT";
-    field public static final String EXTRA_BRIGHTNESS = "android.provider.extra.BRIGHTNESS";
-    field public static final String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
-    field public static final String EXTRA_FINISH_ON_COMPLETION = "android.intent.extra.finishOnCompletion";
-    field public static final String EXTRA_FULL_SCREEN = "android.intent.extra.fullScreen";
-    field public static final String EXTRA_MEDIA_ALBUM = "android.intent.extra.album";
-    field public static final String EXTRA_MEDIA_ARTIST = "android.intent.extra.artist";
-    field public static final String EXTRA_MEDIA_CAPABILITIES = "android.provider.extra.MEDIA_CAPABILITIES";
-    field public static final String EXTRA_MEDIA_CAPABILITIES_UID = "android.provider.extra.MEDIA_CAPABILITIES_UID";
-    field public static final String EXTRA_MEDIA_FOCUS = "android.intent.extra.focus";
-    field public static final String EXTRA_MEDIA_GENRE = "android.intent.extra.genre";
-    field @Deprecated public static final String EXTRA_MEDIA_PLAYLIST = "android.intent.extra.playlist";
-    field public static final String EXTRA_MEDIA_RADIO_CHANNEL = "android.intent.extra.radio_channel";
-    field public static final String EXTRA_MEDIA_TITLE = "android.intent.extra.title";
-    field public static final String EXTRA_OUTPUT = "output";
-    field public static final String EXTRA_PICK_IMAGES_MAX = "android.provider.extra.PICK_IMAGES_MAX";
-    field public static final String EXTRA_SCREEN_ORIENTATION = "android.intent.extra.screenOrientation";
-    field public static final String EXTRA_SHOW_ACTION_ICONS = "android.intent.extra.showActionIcons";
-    field public static final String EXTRA_SIZE_LIMIT = "android.intent.extra.sizeLimit";
-    field public static final String EXTRA_VIDEO_QUALITY = "android.intent.extra.videoQuality";
-    field public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH = "android.media.action.MEDIA_PLAY_FROM_SEARCH";
-    field public static final String INTENT_ACTION_MEDIA_SEARCH = "android.intent.action.MEDIA_SEARCH";
-    field @Deprecated public static final String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";
-    field public static final String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA";
-    field public static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE";
-    field public static final String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH = "android.media.action.TEXT_OPEN_FROM_SEARCH";
-    field public static final String INTENT_ACTION_VIDEO_CAMERA = "android.media.action.VIDEO_CAMERA";
-    field public static final String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH = "android.media.action.VIDEO_PLAY_FROM_SEARCH";
-    field public static final int MATCH_DEFAULT = 0; // 0x0
-    field public static final int MATCH_EXCLUDE = 2; // 0x2
-    field public static final int MATCH_INCLUDE = 1; // 0x1
-    field public static final int MATCH_ONLY = 3; // 0x3
-    field public static final String MEDIA_IGNORE_FILENAME = ".nomedia";
-    field public static final String MEDIA_SCANNER_VOLUME = "volume";
-    field public static final String META_DATA_REVIEW_GALLERY_PREWARM_SERVICE = "android.media.review_gallery_prewarm_service";
-    field public static final String META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE = "android.media.still_image_camera_preview_service";
-    field public static final String QUERY_ARG_INCLUDE_RECENTLY_UNMOUNTED_VOLUMES = "android:query-arg-recently-unmounted-volumes";
-    field public static final String QUERY_ARG_MATCH_FAVORITE = "android:query-arg-match-favorite";
-    field public static final String QUERY_ARG_MATCH_PENDING = "android:query-arg-match-pending";
-    field public static final String QUERY_ARG_MATCH_TRASHED = "android:query-arg-match-trashed";
-    field public static final String QUERY_ARG_RELATED_URI = "android:query-arg-related-uri";
-    field public static final String UNKNOWN_STRING = "<unknown>";
-    field public static final String VOLUME_EXTERNAL = "external";
-    field public static final String VOLUME_EXTERNAL_PRIMARY = "external_primary";
-    field public static final String VOLUME_INTERNAL = "internal";
-  }
-
-  public static final class MediaStore.Audio {
-    ctor public MediaStore.Audio();
-    method @Deprecated @Nullable public static String keyFor(@Nullable String);
-  }
-
-  public static interface MediaStore.Audio.AlbumColumns {
-    field public static final String ALBUM = "album";
-    field @Deprecated public static final String ALBUM_ART = "album_art";
-    field public static final String ALBUM_ID = "album_id";
-    field @Deprecated public static final String ALBUM_KEY = "album_key";
-    field public static final String ARTIST = "artist";
-    field public static final String ARTIST_ID = "artist_id";
-    field @Deprecated public static final String ARTIST_KEY = "artist_key";
-    field public static final String FIRST_YEAR = "minyear";
-    field public static final String LAST_YEAR = "maxyear";
-    field public static final String NUMBER_OF_SONGS = "numsongs";
-    field public static final String NUMBER_OF_SONGS_FOR_ARTIST = "numsongs_by_artist";
-  }
-
-  public static final class MediaStore.Audio.Albums implements android.provider.BaseColumns android.provider.MediaStore.Audio.AlbumColumns {
-    ctor public MediaStore.Audio.Albums();
-    method public static android.net.Uri getContentUri(String);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/albums";
-    field public static final String DEFAULT_SORT_ORDER = "album_key";
-    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/album";
-    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  public static interface MediaStore.Audio.ArtistColumns {
-    field public static final String ARTIST = "artist";
-    field @Deprecated public static final String ARTIST_KEY = "artist_key";
-    field public static final String NUMBER_OF_ALBUMS = "number_of_albums";
-    field public static final String NUMBER_OF_TRACKS = "number_of_tracks";
-  }
-
-  public static final class MediaStore.Audio.Artists implements android.provider.BaseColumns android.provider.MediaStore.Audio.ArtistColumns {
-    ctor public MediaStore.Audio.Artists();
-    method public static android.net.Uri getContentUri(String);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/artists";
-    field public static final String DEFAULT_SORT_ORDER = "artist_key";
-    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/artist";
-    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  public static final class MediaStore.Audio.Artists.Albums implements android.provider.BaseColumns android.provider.MediaStore.Audio.AlbumColumns {
-    ctor public MediaStore.Audio.Artists.Albums();
-    method public static android.net.Uri getContentUri(String, long);
-  }
-
-  public static interface MediaStore.Audio.AudioColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String ALBUM_ID = "album_id";
-    field @Deprecated public static final String ALBUM_KEY = "album_key";
-    field public static final String ARTIST_ID = "artist_id";
-    field @Deprecated public static final String ARTIST_KEY = "artist_key";
-    field public static final String BOOKMARK = "bookmark";
-    field public static final String GENRE = "genre";
-    field public static final String GENRE_ID = "genre_id";
-    field @Deprecated public static final String GENRE_KEY = "genre_key";
-    field public static final String IS_ALARM = "is_alarm";
-    field public static final String IS_AUDIOBOOK = "is_audiobook";
-    field public static final String IS_MUSIC = "is_music";
-    field public static final String IS_NOTIFICATION = "is_notification";
-    field public static final String IS_PODCAST = "is_podcast";
-    field public static final String IS_RECORDING = "is_recording";
-    field public static final String IS_RINGTONE = "is_ringtone";
-    field @Deprecated public static final String TITLE_KEY = "title_key";
-    field public static final String TITLE_RESOURCE_URI = "title_resource_uri";
-    field public static final String TRACK = "track";
-    field public static final String YEAR = "year";
-  }
-
-  public static final class MediaStore.Audio.Genres implements android.provider.BaseColumns android.provider.MediaStore.Audio.GenresColumns {
-    ctor public MediaStore.Audio.Genres();
-    method public static android.net.Uri getContentUri(String);
-    method public static android.net.Uri getContentUriForAudioId(String, int);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/genre";
-    field public static final String DEFAULT_SORT_ORDER = "name";
-    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/genre";
-    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  public static final class MediaStore.Audio.Genres.Members implements android.provider.MediaStore.Audio.AudioColumns {
-    ctor public MediaStore.Audio.Genres.Members();
-    method public static android.net.Uri getContentUri(String, long);
-    field public static final String AUDIO_ID = "audio_id";
-    field public static final String CONTENT_DIRECTORY = "members";
-    field public static final String DEFAULT_SORT_ORDER = "title_key";
-    field public static final String GENRE_ID = "genre_id";
-  }
-
-  public static interface MediaStore.Audio.GenresColumns {
-    field public static final String NAME = "name";
-  }
-
-  public static final class MediaStore.Audio.Media implements android.provider.MediaStore.Audio.AudioColumns {
-    ctor public MediaStore.Audio.Media();
-    method public static android.net.Uri getContentUri(String);
-    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
-    method @Deprecated @Nullable public static android.net.Uri getContentUriForPath(@NonNull String);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
-    field public static final String DEFAULT_SORT_ORDER = "title_key";
-    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/audio";
-    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field public static final String EXTRA_MAX_BYTES = "android.provider.MediaStore.extra.MAX_BYTES";
-    field public static final android.net.Uri INTERNAL_CONTENT_URI;
-    field public static final String RECORD_SOUND_ACTION = "android.provider.MediaStore.RECORD_SOUND";
-  }
-
-  @Deprecated public static final class MediaStore.Audio.Playlists implements android.provider.BaseColumns android.provider.MediaStore.Audio.PlaylistsColumns {
-    ctor @Deprecated public MediaStore.Audio.Playlists();
-    method @Deprecated public static android.net.Uri getContentUri(String);
-    field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/playlist";
-    field @Deprecated public static final String DEFAULT_SORT_ORDER = "name";
-    field @Deprecated public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/playlist";
-    field @Deprecated public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field @Deprecated public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  @Deprecated public static final class MediaStore.Audio.Playlists.Members implements android.provider.MediaStore.Audio.AudioColumns {
-    ctor @Deprecated public MediaStore.Audio.Playlists.Members();
-    method @Deprecated public static android.net.Uri getContentUri(String, long);
-    method @Deprecated public static boolean moveItem(android.content.ContentResolver, long, int, int);
-    field @Deprecated public static final String AUDIO_ID = "audio_id";
-    field @Deprecated public static final String CONTENT_DIRECTORY = "members";
-    field @Deprecated public static final String DEFAULT_SORT_ORDER = "play_order";
-    field @Deprecated public static final String PLAYLIST_ID = "playlist_id";
-    field @Deprecated public static final String PLAY_ORDER = "play_order";
-    field @Deprecated public static final String _ID = "_id";
-  }
-
-  @Deprecated public static interface MediaStore.Audio.PlaylistsColumns extends android.provider.MediaStore.MediaColumns {
-    field @Deprecated public static final String DATA = "_data";
-    field @Deprecated public static final String DATE_ADDED = "date_added";
-    field @Deprecated public static final String DATE_MODIFIED = "date_modified";
-    field @Deprecated public static final String NAME = "name";
-  }
-
-  public static final class MediaStore.Audio.Radio {
-    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/radio";
-  }
-
-  public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String DOWNLOAD_URI = "download_uri";
-    field public static final String REFERER_URI = "referer_uri";
-  }
-
-  public static final class MediaStore.Downloads implements android.provider.MediaStore.DownloadColumns {
-    method @NonNull public static android.net.Uri getContentUri(@NonNull String);
-    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/download";
-    field @NonNull public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field @NonNull public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  public static final class MediaStore.Files {
-    ctor public MediaStore.Files();
-    method public static android.net.Uri getContentUri(String);
-    method public static android.net.Uri getContentUri(String, long);
-  }
-
-  public static interface MediaStore.Files.FileColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String MEDIA_TYPE = "media_type";
-    field public static final int MEDIA_TYPE_AUDIO = 2; // 0x2
-    field public static final int MEDIA_TYPE_DOCUMENT = 6; // 0x6
-    field public static final int MEDIA_TYPE_IMAGE = 1; // 0x1
-    field public static final int MEDIA_TYPE_NONE = 0; // 0x0
-    field @Deprecated public static final int MEDIA_TYPE_PLAYLIST = 4; // 0x4
-    field public static final int MEDIA_TYPE_SUBTITLE = 5; // 0x5
-    field public static final int MEDIA_TYPE_VIDEO = 3; // 0x3
-    field public static final String MIME_TYPE = "mime_type";
-    field public static final String PARENT = "parent";
-  }
-
-  public static final class MediaStore.Images {
-    ctor public MediaStore.Images();
-  }
-
-  public static interface MediaStore.Images.ImageColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String DESCRIPTION = "description";
-    field public static final String EXPOSURE_TIME = "exposure_time";
-    field public static final String F_NUMBER = "f_number";
-    field public static final String ISO = "iso";
-    field public static final String IS_PRIVATE = "isprivate";
-    field @Deprecated public static final String LATITUDE = "latitude";
-    field @Deprecated public static final String LONGITUDE = "longitude";
-    field @Deprecated public static final String MINI_THUMB_MAGIC = "mini_thumb_magic";
-    field @Deprecated public static final String PICASA_ID = "picasa_id";
-    field public static final String SCENE_CAPTURE_TYPE = "scene_capture_type";
-  }
-
-  public static final class MediaStore.Images.Media implements android.provider.MediaStore.Images.ImageColumns {
-    ctor public MediaStore.Images.Media();
-    method @Deprecated public static android.graphics.Bitmap getBitmap(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException, java.io.IOException;
-    method public static android.net.Uri getContentUri(String);
-    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
-    method @Deprecated public static String insertImage(android.content.ContentResolver, String, String, String) throws java.io.FileNotFoundException;
-    method @Deprecated public static String insertImage(android.content.ContentResolver, android.graphics.Bitmap, String, String);
-    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
-    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String);
-    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String[], String);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/image";
-    field public static final String DEFAULT_SORT_ORDER = "bucket_display_name";
-    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  @Deprecated public static class MediaStore.Images.Thumbnails implements android.provider.BaseColumns {
-    ctor @Deprecated public MediaStore.Images.Thumbnails();
-    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long);
-    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);
-    method @Deprecated public static android.net.Uri getContentUri(String);
-    method @Deprecated @NonNull public static android.util.Size getKindSize(int);
-    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);
-    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);
-    method @Deprecated public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
-    method @Deprecated public static final android.database.Cursor queryMiniThumbnail(android.content.ContentResolver, long, int, String[]);
-    method @Deprecated public static final android.database.Cursor queryMiniThumbnails(android.content.ContentResolver, android.net.Uri, int, String[]);
-    field @Deprecated public static final String DATA = "_data";
-    field @Deprecated public static final String DEFAULT_SORT_ORDER = "image_id ASC";
-    field @Deprecated public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field @Deprecated public static final int FULL_SCREEN_KIND = 2; // 0x2
-    field @Deprecated public static final String HEIGHT = "height";
-    field @Deprecated public static final String IMAGE_ID = "image_id";
-    field @Deprecated public static final android.net.Uri INTERNAL_CONTENT_URI;
-    field @Deprecated public static final String KIND = "kind";
-    field @Deprecated public static final int MICRO_KIND = 3; // 0x3
-    field @Deprecated public static final int MINI_KIND = 1; // 0x1
-    field @Deprecated public static final String THUMB_DATA = "thumb_data";
-    field @Deprecated public static final String WIDTH = "width";
-  }
-
-  public static interface MediaStore.MediaColumns extends android.provider.BaseColumns {
-    field public static final String ALBUM = "album";
-    field public static final String ALBUM_ARTIST = "album_artist";
-    field public static final String ARTIST = "artist";
-    field public static final String AUTHOR = "author";
-    field public static final String BITRATE = "bitrate";
-    field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name";
-    field public static final String BUCKET_ID = "bucket_id";
-    field public static final String CAPTURE_FRAMERATE = "capture_framerate";
-    field public static final String CD_TRACK_NUMBER = "cd_track_number";
-    field public static final String COMPILATION = "compilation";
-    field public static final String COMPOSER = "composer";
-    field public static final String DATA = "_data";
-    field public static final String DATE_ADDED = "date_added";
-    field public static final String DATE_EXPIRES = "date_expires";
-    field public static final String DATE_MODIFIED = "date_modified";
-    field public static final String DATE_TAKEN = "datetaken";
-    field public static final String DISC_NUMBER = "disc_number";
-    field public static final String DISPLAY_NAME = "_display_name";
-    field public static final String DOCUMENT_ID = "document_id";
-    field public static final String DURATION = "duration";
-    field public static final String GENERATION_ADDED = "generation_added";
-    field public static final String GENERATION_MODIFIED = "generation_modified";
-    field public static final String GENRE = "genre";
-    field public static final String HEIGHT = "height";
-    field public static final String INSTANCE_ID = "instance_id";
-    field public static final String IS_DOWNLOAD = "is_download";
-    field public static final String IS_DRM = "is_drm";
-    field public static final String IS_FAVORITE = "is_favorite";
-    field public static final String IS_PENDING = "is_pending";
-    field public static final String IS_TRASHED = "is_trashed";
-    field public static final String MIME_TYPE = "mime_type";
-    field public static final String NUM_TRACKS = "num_tracks";
-    field public static final String ORIENTATION = "orientation";
-    field public static final String ORIGINAL_DOCUMENT_ID = "original_document_id";
-    field public static final String OWNER_PACKAGE_NAME = "owner_package_name";
-    field public static final String RELATIVE_PATH = "relative_path";
-    field public static final String RESOLUTION = "resolution";
-    field public static final String SIZE = "_size";
-    field public static final String TITLE = "title";
-    field public static final String VOLUME_NAME = "volume_name";
-    field public static final String WIDTH = "width";
-    field public static final String WRITER = "writer";
-    field public static final String XMP = "xmp";
-    field public static final String YEAR = "year";
-  }
-
-  public static class MediaStore.PickerMediaColumns {
-    field public static final String DATA = "_data";
-    field public static final String DATE_TAKEN = "datetaken";
-    field public static final String DISPLAY_NAME = "_display_name";
-    field public static final String DURATION_MILLIS = "duration";
-    field public static final String HEIGHT = "height";
-    field public static final String MIME_TYPE = "mime_type";
-    field public static final String ORIENTATION = "orientation";
-    field public static final String SIZE = "_size";
-    field public static final String WIDTH = "width";
-  }
-
-  public static final class MediaStore.Video {
-    ctor public MediaStore.Video();
-    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
-    field public static final String DEFAULT_SORT_ORDER = "_display_name";
-  }
-
-  public static final class MediaStore.Video.Media implements android.provider.MediaStore.Video.VideoColumns {
-    ctor public MediaStore.Video.Media();
-    method public static android.net.Uri getContentUri(String);
-    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
-    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/video";
-    field public static final String DEFAULT_SORT_ORDER = "title";
-    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field public static final android.net.Uri INTERNAL_CONTENT_URI;
-  }
-
-  @Deprecated public static class MediaStore.Video.Thumbnails implements android.provider.BaseColumns {
-    ctor @Deprecated public MediaStore.Video.Thumbnails();
-    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long);
-    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);
-    method @Deprecated public static android.net.Uri getContentUri(String);
-    method @Deprecated @NonNull public static android.util.Size getKindSize(int);
-    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);
-    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);
-    field @Deprecated public static final String DATA = "_data";
-    field @Deprecated public static final String DEFAULT_SORT_ORDER = "video_id ASC";
-    field @Deprecated public static final android.net.Uri EXTERNAL_CONTENT_URI;
-    field @Deprecated public static final int FULL_SCREEN_KIND = 2; // 0x2
-    field @Deprecated public static final String HEIGHT = "height";
-    field @Deprecated public static final android.net.Uri INTERNAL_CONTENT_URI;
-    field @Deprecated public static final String KIND = "kind";
-    field @Deprecated public static final int MICRO_KIND = 3; // 0x3
-    field @Deprecated public static final int MINI_KIND = 1; // 0x1
-    field @Deprecated public static final String VIDEO_ID = "video_id";
-    field @Deprecated public static final String WIDTH = "width";
-  }
-
-  public static interface MediaStore.Video.VideoColumns extends android.provider.MediaStore.MediaColumns {
-    field public static final String BOOKMARK = "bookmark";
-    field public static final String CATEGORY = "category";
-    field public static final String COLOR_RANGE = "color_range";
-    field public static final String COLOR_STANDARD = "color_standard";
-    field public static final String COLOR_TRANSFER = "color_transfer";
-    field public static final String DESCRIPTION = "description";
-    field public static final String IS_PRIVATE = "isprivate";
-    field public static final String LANGUAGE = "language";
-    field @Deprecated public static final String LATITUDE = "latitude";
-    field @Deprecated public static final String LONGITUDE = "longitude";
-    field @Deprecated public static final String MINI_THUMB_MAGIC = "mini_thumb_magic";
-    field public static final String TAGS = "tags";
-  }
-
-}
-
diff --git a/extensions/5/public/api/framework-sdksandbox-removed.txt b/extensions/5/public/api/framework-sdksandbox-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/public/api/framework-sdksandbox-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/public/api/framework-sdksandbox.txt b/extensions/5/public/api/framework-sdksandbox.txt
deleted file mode 100644
index ece4793..0000000
--- a/extensions/5/public/api/framework-sdksandbox.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-// Signature format: 2.0
-package android.app.sdksandbox {
-
-  public final class LoadSdkException extends java.lang.Exception implements android.os.Parcelable {
-    ctor public LoadSdkException(@NonNull Throwable, @NonNull android.os.Bundle);
-    method public int describeContents();
-    method @NonNull public android.os.Bundle getExtraInformation();
-    method public int getLoadSdkErrorCode();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.app.sdksandbox.LoadSdkException> CREATOR;
-  }
-
-  public final class RequestSurfacePackageException extends java.lang.Exception {
-    ctor public RequestSurfacePackageException(int, @Nullable String);
-    ctor public RequestSurfacePackageException(int, @Nullable String, @Nullable Throwable);
-    ctor public RequestSurfacePackageException(int, @Nullable String, @Nullable Throwable, @NonNull android.os.Bundle);
-    method @NonNull public android.os.Bundle getExtraErrorInformation();
-    method public int getRequestSurfacePackageErrorCode();
-  }
-
-  public final class SandboxedSdk implements android.os.Parcelable {
-    ctor public SandboxedSdk(@NonNull android.os.IBinder);
-    method public int describeContents();
-    method @Nullable public android.os.IBinder getInterface();
-    method @NonNull public android.content.pm.SharedLibraryInfo getSharedLibraryInfo();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.app.sdksandbox.SandboxedSdk> CREATOR;
-  }
-
-  public abstract class SandboxedSdkProvider {
-    ctor public SandboxedSdkProvider();
-    method public final void attachContext(@NonNull android.content.Context);
-    method public void beforeUnloadSdk();
-    method @Nullable public final android.content.Context getContext();
-    method @NonNull public abstract android.view.View getView(@NonNull android.content.Context, @NonNull android.os.Bundle, int, int);
-    method @NonNull public abstract android.app.sdksandbox.SandboxedSdk onLoadSdk(@NonNull android.os.Bundle) throws android.app.sdksandbox.LoadSdkException;
-  }
-
-  public final class SdkSandboxManager {
-    method public void addSdkSandboxProcessDeathCallback(@NonNull java.util.concurrent.Executor, @NonNull android.app.sdksandbox.SdkSandboxManager.SdkSandboxProcessDeathCallback);
-    method public void addSyncedSharedPreferencesKeys(@NonNull java.util.Set<java.lang.String>);
-    method @NonNull public java.util.List<android.app.sdksandbox.SandboxedSdk> getSandboxedSdks();
-    method public static int getSdkSandboxState();
-    method @NonNull public java.util.Set<java.lang.String> getSyncedSharedPreferencesKeys();
-    method public void loadSdk(@NonNull String, @NonNull android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.sdksandbox.SandboxedSdk,android.app.sdksandbox.LoadSdkException>);
-    method public void removeSdkSandboxProcessDeathCallback(@NonNull android.app.sdksandbox.SdkSandboxManager.SdkSandboxProcessDeathCallback);
-    method public void removeSyncedSharedPreferencesKeys(@NonNull java.util.Set<java.lang.String>);
-    method public void requestSurfacePackage(@NonNull String, @NonNull android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.os.Bundle,android.app.sdksandbox.RequestSurfacePackageException>);
-    method public void unloadSdk(@NonNull String);
-    field public static final String EXTRA_DISPLAY_ID = "android.app.sdksandbox.extra.DISPLAY_ID";
-    field public static final String EXTRA_HEIGHT_IN_PIXELS = "android.app.sdksandbox.extra.HEIGHT_IN_PIXELS";
-    field public static final String EXTRA_HOST_TOKEN = "android.app.sdksandbox.extra.HOST_TOKEN";
-    field public static final String EXTRA_SURFACE_PACKAGE = "android.app.sdksandbox.extra.SURFACE_PACKAGE";
-    field public static final String EXTRA_WIDTH_IN_PIXELS = "android.app.sdksandbox.extra.WIDTH_IN_PIXELS";
-    field public static final int LOAD_SDK_ALREADY_LOADED = 101; // 0x65
-    field public static final int LOAD_SDK_INTERNAL_ERROR = 500; // 0x1f4
-    field public static final int LOAD_SDK_NOT_FOUND = 100; // 0x64
-    field public static final int LOAD_SDK_SDK_DEFINED_ERROR = 102; // 0x66
-    field public static final int LOAD_SDK_SDK_SANDBOX_DISABLED = 103; // 0x67
-    field public static final int REQUEST_SURFACE_PACKAGE_INTERNAL_ERROR = 700; // 0x2bc
-    field public static final int REQUEST_SURFACE_PACKAGE_SDK_NOT_LOADED = 701; // 0x2bd
-    field public static final int SDK_SANDBOX_PROCESS_NOT_AVAILABLE = 503; // 0x1f7
-    field public static final String SDK_SANDBOX_SERVICE = "sdk_sandbox";
-    field public static final int SDK_SANDBOX_STATE_DISABLED = 0; // 0x0
-    field public static final int SDK_SANDBOX_STATE_ENABLED_PROCESS_ISOLATION = 2; // 0x2
-  }
-
-  public static interface SdkSandboxManager.SdkSandboxProcessDeathCallback {
-    method public void onSdkSandboxDied();
-  }
-
-}
-
-package android.app.sdksandbox.sdkprovider {
-
-  public class SdkSandboxController {
-    method @NonNull public android.content.SharedPreferences getClientSharedPreferences();
-    method @NonNull public java.util.List<android.app.sdksandbox.SandboxedSdk> getSandboxedSdks();
-    field public static final String SDK_SANDBOX_CONTROLLER_SERVICE = "sdk_sandbox_controller_service";
-  }
-
-}
-
diff --git a/extensions/5/public/api/service-adservices-removed.txt b/extensions/5/public/api/service-adservices-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/public/api/service-adservices-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/public/api/service-adservices.txt b/extensions/5/public/api/service-adservices.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/public/api/service-adservices.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/public/api/service-sdksandbox-removed.txt b/extensions/5/public/api/service-sdksandbox-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/public/api/service-sdksandbox-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/public/api/service-sdksandbox.txt b/extensions/5/public/api/service-sdksandbox.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/public/api/service-sdksandbox.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/public/framework-adservices.jar b/extensions/5/public/framework-adservices.jar
deleted file mode 100644
index eb1dff0..0000000
--- a/extensions/5/public/framework-adservices.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/public/framework-mediaprovider.jar b/extensions/5/public/framework-mediaprovider.jar
deleted file mode 100644
index 2821333..0000000
--- a/extensions/5/public/framework-mediaprovider.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/public/framework-sdksandbox.jar b/extensions/5/public/framework-sdksandbox.jar
deleted file mode 100644
index aae64cd..0000000
--- a/extensions/5/public/framework-sdksandbox.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/public/service-adservices.jar b/extensions/5/public/service-adservices.jar
deleted file mode 100644
index b62b671..0000000
--- a/extensions/5/public/service-adservices.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/public/service-sdksandbox.jar b/extensions/5/public/service-sdksandbox.jar
deleted file mode 100644
index b62b671..0000000
--- a/extensions/5/public/service-sdksandbox.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/system-server/api/service-adservices-removed.txt b/extensions/5/system-server/api/service-adservices-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system-server/api/service-adservices-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system-server/api/service-adservices.txt b/extensions/5/system-server/api/service-adservices.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system-server/api/service-adservices.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system-server/api/service-sdksandbox-removed.txt b/extensions/5/system-server/api/service-sdksandbox-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system-server/api/service-sdksandbox-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system-server/api/service-sdksandbox.txt b/extensions/5/system-server/api/service-sdksandbox.txt
deleted file mode 100644
index 4e07707..0000000
--- a/extensions/5/system-server/api/service-sdksandbox.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// Signature format: 2.0
-package com.android.server.sdksandbox {
-
-  public interface SdkSandboxManagerLocal {
-    method public void enforceAllowedToSendBroadcast(@NonNull android.content.Intent);
-    method public void enforceAllowedToStartActivity(@NonNull android.content.Intent);
-    method public void enforceAllowedToStartOrBindService(@NonNull android.content.Intent);
-    method @NonNull public String getSdkSandboxProcessNameForInstrumentation(@NonNull android.content.pm.ApplicationInfo);
-    method public void notifyInstrumentationFinished(@NonNull String, int);
-    method public void notifyInstrumentationStarted(@NonNull String, int);
-    field public static final String SERVICE_INTERFACE = "com.android.sdksandbox.SdkSandboxService";
-    field public static final String VERIFIER_RECEIVER = "com.android.server.sdksandbox.SdkSandboxVerifierReceiver";
-  }
-
-}
-
diff --git a/extensions/5/system-server/service-adservices.jar b/extensions/5/system-server/service-adservices.jar
deleted file mode 100644
index b62b671..0000000
--- a/extensions/5/system-server/service-adservices.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/system-server/service-sdksandbox.jar b/extensions/5/system-server/service-sdksandbox.jar
deleted file mode 100644
index a2232c0..0000000
--- a/extensions/5/system-server/service-sdksandbox.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/system/api/framework-adservices-removed.txt b/extensions/5/system/api/framework-adservices-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system/api/framework-adservices-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system/api/framework-adservices.txt b/extensions/5/system/api/framework-adservices.txt
deleted file mode 100644
index dffd8f2..0000000
--- a/extensions/5/system/api/framework-adservices.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// Signature format: 2.0
-package android.adservices.adid {
-
-  public abstract class AdIdProviderService extends android.app.Service {
-    ctor public AdIdProviderService();
-    method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
-    method @NonNull public abstract android.adservices.adid.AdId onGetAdId(int, @NonNull String) throws java.io.IOException;
-    field public static final String SERVICE_INTERFACE = "android.adservices.adid.AdIdProviderService";
-  }
-
-}
-
-package android.adservices.appsetid {
-
-  public abstract class AppSetIdProviderService extends android.app.Service {
-    ctor public AppSetIdProviderService();
-    method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
-    method @NonNull public abstract android.adservices.appsetid.AppSetId onGetAppSetId(int, @NonNull String) throws java.io.IOException;
-    field public static final String SERVICE_INTERFACE = "android.adservices.appsetid.AppSetIdProviderService";
-  }
-
-}
-
-package android.adservices.common {
-
-  public class AdServicesCommonManager {
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE) public void isAdServicesEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
-    method @RequiresPermission(android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE) public void setAdServicesEnabled(boolean, boolean);
-  }
-
-  public class AdServicesPermissions {
-    field public static final String ACCESS_ADSERVICES_STATE = "android.permission.ACCESS_ADSERVICES_STATE";
-    field public static final String ACCESS_PRIVILEGED_AD_ID = "android.permission.ACCESS_PRIVILEGED_AD_ID";
-    field public static final String ACCESS_PRIVILEGED_APP_SET_ID = "android.permission.ACCESS_PRIVILEGED_APP_SET_ID";
-    field public static final String MODIFY_ADSERVICES_STATE = "android.permission.MODIFY_ADSERVICES_STATE";
-  }
-
-}
-
diff --git a/extensions/5/system/api/framework-mediaprovider-removed.txt b/extensions/5/system/api/framework-mediaprovider-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system/api/framework-mediaprovider-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system/api/framework-mediaprovider.txt b/extensions/5/system/api/framework-mediaprovider.txt
deleted file mode 100644
index d29a6ed..0000000
--- a/extensions/5/system/api/framework-mediaprovider.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Signature format: 2.0
-package android.provider {
-
-  public final class MediaStore {
-    method @NonNull public static android.net.Uri rewriteToLegacy(@NonNull android.net.Uri);
-    method @NonNull @WorkerThread public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);
-    method @WorkerThread public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);
-    method @WorkerThread public static void waitForIdle(@NonNull android.content.ContentResolver);
-    field public static final String AUTHORITY_LEGACY = "media_legacy";
-    field @NonNull public static final android.net.Uri AUTHORITY_LEGACY_URI;
-    field public static final String QUERY_ARG_DEFER_SCAN = "android:query-arg-defer-scan";
-  }
-
-}
-
diff --git a/extensions/5/system/api/framework-sdksandbox-removed.txt b/extensions/5/system/api/framework-sdksandbox-removed.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system/api/framework-sdksandbox-removed.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system/api/framework-sdksandbox.txt b/extensions/5/system/api/framework-sdksandbox.txt
deleted file mode 100644
index d802177..0000000
--- a/extensions/5/system/api/framework-sdksandbox.txt
+++ /dev/null
@@ -1 +0,0 @@
-// Signature format: 2.0
diff --git a/extensions/5/system/framework-adservices.jar b/extensions/5/system/framework-adservices.jar
deleted file mode 100644
index ead509c..0000000
--- a/extensions/5/system/framework-adservices.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/system/framework-mediaprovider.jar b/extensions/5/system/framework-mediaprovider.jar
deleted file mode 100644
index 47499e6..0000000
--- a/extensions/5/system/framework-mediaprovider.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/5/system/framework-sdksandbox.jar b/extensions/5/system/framework-sdksandbox.jar
deleted file mode 100644
index f670b00..0000000
--- a/extensions/5/system/framework-sdksandbox.jar
+++ /dev/null
Binary files differ
diff --git a/extensions/README.md b/extensions/README.md
index 948bcf6..60bf4bb 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -11,4 +11,3 @@
 - 2: Finalized in March 2022 between S and T (mediaprovider, sdkextensions)
 - 3: Finalized together with Android T / 33 (all modules)
 - 4: Finalized in September 2022 between T and U (adservices, sdkextensions, tethering)
-- 5: Finalized in November 2022 between T and U (adservices, mediaprovider)