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

Commit da7b71f7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5342135 from 79c8d662 to qt-release 

Change-Id: Ia278a3b972debb134dcacee96a0d1360d921c547
parents 230f3f9f 79c8d662

api/current.txt

+13 −10
Original line number Diff line number Diff line
@@ -4250,10 +4250,9 @@ package android.app { 














  public class AppComponentFactory {















    ctor public AppComponentFactory();













    method public android.content.pm.ApplicationInfo getApplicationInfo();















    method @NonNull public android.app.Activity instantiateActivity(@NonNull ClassLoader, @NonNull String, @Nullable android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;















    method @NonNull public android.app.Application instantiateApplication(@NonNull ClassLoader, @NonNull String) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;













    method @NonNull public ClassLoader instantiateClassLoader(@NonNull ClassLoader);













    method @NonNull public ClassLoader instantiateClassLoader(@NonNull ClassLoader, @NonNull android.content.pm.ApplicationInfo);















    method @NonNull public android.content.ContentProvider instantiateProvider(@NonNull ClassLoader, @NonNull String) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;















    method @NonNull public android.content.BroadcastReceiver instantiateReceiver(@NonNull ClassLoader, @NonNull String, @Nullable android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;















    method @NonNull public android.app.Service instantiateService(@NonNull ClassLoader, @NonNull String, @Nullable android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException;










@@ -6171,6 +6170,7 @@ package android.app {













    ctor public Service();















    method protected void dump(java.io.FileDescriptor, java.io.PrintWriter, String[]);















    method public final android.app.Application getApplication();













    method public final int getForegroundServiceType();















    method @Nullable public abstract android.os.IBinder onBind(android.content.Intent);















    method public void onConfigurationChanged(android.content.res.Configuration);















    method public void onCreate();










@@ -26035,6 +26035,7 @@ package android.media {













  public static final class MediaSession2.Builder {















    ctor public MediaSession2.Builder(@NonNull android.content.Context);















    method @NonNull public android.media.MediaSession2 build();













    method @NonNull public android.media.MediaSession2.Builder setExtras(@Nullable android.os.Bundle);















    method @NonNull public android.media.MediaSession2.Builder setId(@NonNull String);















    method @NonNull public android.media.MediaSession2.Builder setSessionActivity(@Nullable android.app.PendingIntent);















    method @NonNull public android.media.MediaSession2.Builder setSessionCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.MediaSession2.SessionCallback);










@@ -26397,6 +26398,7 @@ package android.media {













  public final class Session2Token implements android.os.Parcelable {















    ctor public Session2Token(@NonNull android.content.Context, @NonNull android.content.ComponentName);















    method public int describeContents();













    method @Nullable public android.os.Bundle getExtras();















    method @NonNull public String getPackageName();















    method @Nullable public String getServiceName();















    method public int getType();










@@ -29356,7 +29358,7 @@ package android.net {













    method public android.os.ParcelFileDescriptor establish();















    method public android.net.VpnService.Builder setBlocking(boolean);















    method public android.net.VpnService.Builder setConfigureIntent(android.app.PendingIntent);













    method public android.net.VpnService.Builder setHttpProxy(android.net.ProxyInfo);













    method public android.net.VpnService.Builder setHttpProxy(@NonNull android.net.ProxyInfo);















    method public android.net.VpnService.Builder setMetered(boolean);















    method public android.net.VpnService.Builder setMtu(int);















    method public android.net.VpnService.Builder setSession(String);










@@ -29944,13 +29946,14 @@ package android.net.wifi {













    method public String getMacAddress();















    method public int getNetworkId();















    method public int getRssi();













    method public int getRxLinkSpeedMbps();













    method @IntRange(from=0xffffffff) public int getRxLinkSpeedMbps();















    method public String getSSID();















    method public android.net.wifi.SupplicantState getSupplicantState();













    method public int getTxLinkSpeedMbps();













    method @IntRange(from=0xffffffff) public int getTxLinkSpeedMbps();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final String FREQUENCY_UNITS = "MHz";















    field public static final String LINK_SPEED_UNITS = "Mbps";













    field public static final int LINK_SPEED_UNKNOWN = -1; // 0xffffffff















  }





























  public class WifiManager {










@@ -45020,7 +45023,7 @@ package android.telephony {













    method public String getCountryIso();















    method public int getDataRoaming();















    method public CharSequence getDisplayName();













    method public String getGroupUuid();













    method @Nullable public String getGroupUuid();















    method public String getIccId();















    method public int getIconTint();















    method @Deprecated public int getMcc();










@@ -51205,8 +51208,8 @@ package android.view {













    method public int getScaledHoverSlop();















    method public int getScaledMaximumDrawingCacheSize();















    method public int getScaledMaximumFlingVelocity();













    method public int getScaledMinScalingSpan();















    method public int getScaledMinimumFlingVelocity();













    method public int getScaledMinimumScalingSpan();















    method public int getScaledOverflingDistance();















    method public int getScaledOverscrollDistance();















    method public int getScaledPagingTouchSlop();










@@ -51980,16 +51983,16 @@ package android.view {













    method public boolean hasInsets();















    method public boolean hasStableInsets();















    method public boolean hasSystemWindowInsets();













    method @NonNull public android.view.WindowInsets inset(int, int, int, int);













    method @NonNull public android.view.WindowInsets inset(@IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0) int);















    method public boolean isConsumed();















    method public boolean isRound();















    method @Deprecated @NonNull public android.view.WindowInsets replaceSystemWindowInsets(int, int, int, int);















    method @Deprecated @NonNull public android.view.WindowInsets replaceSystemWindowInsets(android.graphics.Rect);















  }



























  public static class WindowInsets.Builder {













  public static final class WindowInsets.Builder {















    ctor public WindowInsets.Builder();













    ctor public WindowInsets.Builder(android.view.WindowInsets);













    ctor public WindowInsets.Builder(@NonNull android.view.WindowInsets);















    method @NonNull public android.view.WindowInsets build();















    method @NonNull public android.view.WindowInsets.Builder setDisplayCutout(@Nullable android.view.DisplayCutout);















    method @NonNull public android.view.WindowInsets.Builder setStableInsets(@NonNull android.graphics.Insets);

























api/system-current.txt



+50
−11






























Original line number
Diff line number
Diff line








@@ -3455,15 +3455,23 @@ package android.media {













    method @Deprecated public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes);















    method public void clearAudioServerStateCallback();















    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int dispatchAudioFocusChange(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);













    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioProductStrategies getAudioProductStrategies();













    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public android.media.audiopolicy.AudioVolumeGroups getAudioVolumeGroups();













    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMaxVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);













    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getMinVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);













    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getVolumeIndexForAttributes(@NonNull android.media.AudioAttributes);















    method public boolean isAudioServerRunning();















    method public boolean isHdmiSystemAudioSupported();















    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int registerAudioPolicy(@NonNull android.media.audiopolicy.AudioPolicy);













    method public void registerVolumeGroupCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.VolumeGroupCallback);















    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int) throws java.lang.IllegalArgumentException;















    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.MODIFY_AUDIO_ROUTING}) public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, @NonNull android.media.AudioAttributes, int, int, android.media.audiopolicy.AudioPolicy) throws java.lang.IllegalArgumentException;















    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int requestAudioFocus(@NonNull android.media.AudioFocusRequest, @Nullable android.media.audiopolicy.AudioPolicy);















    method public void setAudioServerStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.AudioManager.AudioServerStateCallback);















    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setFocusRequestResult(@NonNull android.media.AudioFocusInfo, int, @NonNull android.media.audiopolicy.AudioPolicy);













    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setVolumeIndexForAttributes(@NonNull android.media.AudioAttributes, int, int);















    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void unregisterAudioPolicyAsync(@NonNull android.media.audiopolicy.AudioPolicy);













    method public void unregisterVolumeGroupCallback(@NonNull android.media.AudioManager.VolumeGroupCallback);















    field public static final int AUDIOFOCUS_FLAG_DELAY_OK = 1; // 0x1















    field public static final int AUDIOFOCUS_FLAG_LOCK = 4; // 0x4















    field public static final int AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS = 2; // 0x2









@@ -3477,6 +3485,11 @@ package android.media {













    method public void onAudioServerUp();















  }



























  public abstract static class AudioManager.VolumeGroupCallback {













    ctor public AudioManager.VolumeGroupCallback();













    method public void onAudioVolumeGroupChanged(int, int);













  }



























  public final class AudioPlaybackConfiguration implements android.os.Parcelable {















    method public int getClientPid();















    method public int getClientUid();










@@ -3647,6 +3660,9 @@ package android.media.audiopolicy {













    method @NonNull public android.media.AudioAttributes getAudioAttributesForProductStrategy(@NonNull android.media.audiopolicy.AudioProductStrategy);















    method @Nullable public android.media.audiopolicy.AudioProductStrategy getById(int);















    method public int getLegacyStreamTypeForAudioAttributes(@NonNull android.media.AudioAttributes);













    method @Nullable public android.media.audiopolicy.AudioProductStrategy getProductStrategyForAudioAttributes(@NonNull android.media.AudioAttributes);













    method public int getVolumeGroupIdForAttributes(@NonNull android.media.AudioAttributes);













    method public int getVolumeGroupIdForLegacyStreamType(int);















    method public java.util.Iterator<android.media.audiopolicy.AudioProductStrategy> iterator();















    method public int size();















    method public void writeToParcel(@NonNull android.os.Parcel, int);









@@ -3662,6 +3678,27 @@ package android.media.audiopolicy {













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioProductStrategy> CREATOR;















  }



























  public final class AudioVolumeGroup implements android.os.Parcelable {













    method public int describeContents();













    method public java.util.List<android.media.AudioAttributes> getAudioAttributes();













    method public int getId();













    method @NonNull public int[] getLegacyStreamTypes();













    method @NonNull public String name();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroup> CREATOR;













  }

























  public final class AudioVolumeGroups implements java.lang.Iterable<android.media.audiopolicy.AudioVolumeGroup> android.os.Parcelable {













    ctor public AudioVolumeGroups();













    method public int describeContents();













    method @Nullable public android.media.audiopolicy.AudioVolumeGroup getById(int);













    method public java.util.Iterator<android.media.audiopolicy.AudioVolumeGroup> iterator();













    method public int size();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.media.audiopolicy.AudioVolumeGroups> CREATOR;













    field public static final int DEFAULT_VOLUME_GROUP = -1; // 0xffffffff













  }



























}





























package android.media.session {










@@ -4849,7 +4886,8 @@ package android.net.wifi {













    ctor public WifiScanner.ScanSettings();















    field public int band;















    field public android.net.wifi.WifiScanner.ChannelSpec[] channels;













    field @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean ignoreLocationSettings;













    field public boolean hideFromAppOps;













    field public boolean ignoreLocationSettings;















    field public int maxPeriodInMs;















    field public int maxScansToCache;















    field public int numBssidsPerScan;










@@ -5797,6 +5835,7 @@ package android.provider {













    field public static final String NAMESPACE_GAME_DRIVER = "game_driver";















    field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot";















    field public static final String NAMESPACE_NETD_NATIVE = "netd_native";













    field public static final String NAMESPACE_SYSTEMUI = "systemui";















  }





























  public static interface DeviceConfig.ActivityManager {










@@ -5839,14 +5878,6 @@ package android.provider {













    field public static final String NAMESPACE = "media_native";















  }



























  public static interface DeviceConfig.NotificationAssistant {













    field public static final String GENERATE_ACTIONS = "generate_actions";













    field public static final String GENERATE_REPLIES = "generate_replies";













    field public static final String MAX_MESSAGES_TO_EXTRACT = "max_messages_to_extract";













    field public static final String MAX_SUGGESTIONS = "max_suggestions";













    field public static final String NAMESPACE = "notification_assistant";













  }



























  public static interface DeviceConfig.OnPropertyChangedListener {















    method public void onPropertyChanged(String, String, String);















  }










@@ -7476,6 +7507,13 @@ package android.telephony {













    field public static final int VSNCP_TIMEOUT = 2236; // 0x8bc















  }



























  public final class DataSpecificRegistrationStates implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationStates> CREATOR;













  }



























  public final class DisconnectCause {















    field public static final int ALREADY_DIALING = 72; // 0x48















    field public static final int ANSWERED_ELSEWHERE = 52; // 0x34










@@ -7584,6 +7622,7 @@ package android.telephony {













    method public int getAccessNetworkTechnology();















    method public int[] getAvailableServices();















    method public android.telephony.CellIdentity getCellIdentity();













    method @Nullable public android.telephony.DataSpecificRegistrationStates getDataSpecificStates();















    method public int getDomain();















    method public int getRegState();















    method public int getRejectCause();










@@ -9239,7 +9278,7 @@ package android.telephony.mbms {



























package android.telephony.mbms.vendor {



























  public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface {













  public class MbmsDownloadServiceBase extends android.os.Binder {















    ctor public MbmsDownloadServiceBase();















    method public int addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException;















    method public int addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException;










@@ -9272,7 +9311,7 @@ package android.telephony.mbms.vendor {













    method public void updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>);















  }



























  public class MbmsStreamingServiceBase extends android.os.Binder implements android.os.IInterface {













  public class MbmsStreamingServiceBase extends android.os.Binder {















    ctor public MbmsStreamingServiceBase();















    method public android.os.IBinder asBinder();















    method public void dispose(int) throws android.os.RemoteException;

























api/test-current.txt



+10
−3






























Original line number
Diff line number
Diff line








@@ -684,7 +684,6 @@ package android.database.sqlite {













    method public static int getWALAutoCheckpoint();















    method public static int getWALConnectionPoolSize();















    method public static String getWALSyncMode();













    method public static boolean isCompatibilityWalSupported();















    method public static int releaseMemory();















  }


























@@ -741,6 +740,13 @@ package android.hardware.display {













    field public static final android.os.Parcelable.Creator<android.hardware.display.AmbientBrightnessDayStats> CREATOR;















  }





























  public class AmbientDisplayConfiguration {













    ctor public AmbientDisplayConfiguration(android.content.Context);













    method public boolean alwaysOnAvailable();













    method public boolean alwaysOnAvailableForUser(int);













    method public boolean alwaysOnEnabled(int);













  }





























  public final class BrightnessChangeEvent implements android.os.Parcelable {















    method public int describeContents();















    method public void writeToParcel(android.os.Parcel, int);










@@ -1991,6 +1997,7 @@ package android.provider {













    field public static final String AUTOFILL_USER_DATA_MIN_VALUE_LENGTH = "autofill_user_data_min_value_length";















    field public static final String CONTENT_CAPTURE_ENABLED = "content_capture_enabled";















    field public static final String DISABLED_PRINT_SERVICES = "disabled_print_services";













    field public static final String DOZE_ALWAYS_ON = "doze_always_on";















    field @Deprecated public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";















    field public static final String ENABLED_VR_LISTENERS = "enabled_vr_listeners";















    field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";










@@ -2381,7 +2388,7 @@ package android.telephony.mbms {





























package android.telephony.mbms.vendor {





























  public class MbmsDownloadServiceBase extends android.os.Binder implements android.os.IInterface {













  public class MbmsDownloadServiceBase extends android.os.Binder {















    ctor public MbmsDownloadServiceBase();















    method public int addProgressListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadProgressListener) throws android.os.RemoteException;















    method public int addStatusListener(android.telephony.mbms.DownloadRequest, android.telephony.mbms.DownloadStatusListener) throws android.os.RemoteException;










@@ -2414,7 +2421,7 @@ package android.telephony.mbms.vendor {













    method public void updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>);















  }





























  public class MbmsStreamingServiceBase extends android.os.Binder implements android.os.IInterface {













  public class MbmsStreamingServiceBase extends android.os.Binder {















    ctor public MbmsStreamingServiceBase();















    method public android.os.IBinder asBinder();















    method public void dispose(int) throws android.os.RemoteException;

































cmds/idmap2/idmap2/Create.cpp



+4
−4






























Original line number
Diff line number
Diff line








@@ -28,7 +28,6 @@













#include "idmap2/FileUtils.h"















#include "idmap2/Idmap.h"















#include "idmap2/Policies.h"













#include "idmap2/Result.h"















#include "idmap2/SysTrace.h"































using android::ApkAssets;









@@ -38,7 +37,6 @@ using android::idmap2::Idmap;













using android::idmap2::PoliciesToBitmask;















using android::idmap2::PolicyBitmask;















using android::idmap2::PolicyFlags;













using android::idmap2::Result;















using android::idmap2::utils::kIdmapFilePermissionMask;















using android::idmap2::utils::UidHasWriteAccessToPath;


























@@ -77,9 +75,11 @@ bool Create(const std::vector<std::string>& args, std::ostream& out_error) {













  }































  PolicyBitmask fulfilled_policies = 0;













  if (auto result = PoliciesToBitmask(policies, out_error)) {













    fulfilled_policies |= *result;













  auto conv_result = PoliciesToBitmask(policies);













  if (conv_result) {













    fulfilled_policies |= *conv_result;















  } else {













    out_error << "error: " << conv_result.GetErrorMessage() << std::endl;















    return false;















  }

















































cmds/idmap2/idmap2/Lookup.cpp



+12
−11






























Original line number
Diff line number
Diff line








@@ -53,6 +53,7 @@ using android::ResTable_config;













using android::StringPiece16;















using android::base::StringPrintf;















using android::idmap2::CommandLineOptions;













using android::idmap2::Error;















using android::idmap2::IdmapHeader;















using android::idmap2::ResourceId;















using android::idmap2::Result;









@@ -71,17 +72,17 @@ Result<ResourceId> WARN_UNUSED ParseResReference(const AssetManager2& am, const













  ResourceId resid;















  resid = strtol(res.c_str(), &endptr, kBaseHex);















  if (*endptr == '\0') {













    return {resid};













    return resid;















  }































  // next, try to parse as a package:type/name string















  resid = am.GetResourceId(res, "", fallback_package);















  if (is_valid_resid(resid)) {













    return {resid};













    return resid;















  }































  // end of the road: res could not be parsed













  return {};













  return Error("failed to obtain resource id for %s", res.c_str());















}































Result<std::string> WARN_UNUSED GetValue(const AssetManager2& am, ResourceId resid) {









@@ -90,7 +91,7 @@ Result<std::string> WARN_UNUSED GetValue(const AssetManager2& am, ResourceId res













  uint32_t flags;















  ApkAssetsCookie cookie = am.GetResource(resid, false, 0, &value, &config, &flags);















  if (cookie == kInvalidCookie) {













    return {};













    return Error("no resource 0x%08x in asset manager", resid);















  }































  std::string out;










@@ -128,31 +129,31 @@ Result<std::string> WARN_UNUSED GetValue(const AssetManager2& am, ResourceId res













      out.append(StringPrintf("dataType=0x%02x data=0x%08x", value.dataType, value.data));















      break;















  }













  return {out};













  return out;















}































Result<std::string> GetTargetPackageNameFromManifest(const std::string& apk_path) {















  const auto zip = ZipFile::Open(apk_path);















  if (!zip) {













    return {};













    return Error("failed to open %s as zip", apk_path.c_str());















  }















  const auto entry = zip->Uncompress("AndroidManifest.xml");















  if (!entry) {













    return {};













    return Error("failed to uncompress AndroidManifest.xml in %s", apk_path.c_str());















  }















  const auto xml = Xml::Create(entry->buf, entry->size);















  if (!xml) {













    return {};













    return Error("failed to create XML buffer");















  }















  const auto tag = xml->FindTag("overlay");















  if (!tag) {













    return {};













    return Error("failed to find <overlay> tag");















  }















  const auto iter = tag->find("targetPackage");















  if (iter == tag->end()) {













    return {};













    return Error("failed to find targetPackage attribute");















  }













  return {iter->second};













  return iter->second;















}















}  // namespace