diff options
244 files changed, 4213 insertions, 1637 deletions
diff --git a/Android.mk b/Android.mk index 6e75bea0520d..8bb366ae2fed 100644 --- a/Android.mk +++ b/Android.mk @@ -157,6 +157,7 @@ LOCAL_SRC_FILES += \ core/java/android/content/ISyncServiceAdapter.aidl \ core/java/android/content/ISyncStatusObserver.aidl \ core/java/android/content/om/IOverlayManager.aidl \ + core/java/android/content/pm/IDexModuleRegisterCallback.aidl \ core/java/android/content/pm/ILauncherApps.aidl \ core/java/android/content/pm/IOnAppsChangedListener.aidl \ core/java/android/content/pm/IOnPermissionsChangeListener.aidl \ diff --git a/api/current.txt b/api/current.txt index 90da660cbdd2..2f33c34fd5b4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -121,7 +121,6 @@ package android { field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; - field public static final java.lang.String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM"; @@ -1062,6 +1061,7 @@ package android { field public static final int ratingBarStyleSmall = 16842877; // 0x101007d field public static final int readPermission = 16842759; // 0x1010007 field public static final int recognitionService = 16843932; // 0x101049c + field public static final int recreateOnConfigChanges = 16844105; // 0x1010549 field public static final int recycleEnabled = 16844124; // 0x101055c field public static final int relinquishTaskIdentity = 16843894; // 0x1010476 field public static final int reparent = 16843964; // 0x10104bc @@ -1086,7 +1086,6 @@ package android { field public static final int resizeable = 16843405; // 0x101028d field public static final int resizeableActivity = 16844022; // 0x10104f6 field public static final int resource = 16842789; // 0x1010025 - field public static final int restartOnConfigChanges = 16844105; // 0x1010549 field public static final int restoreAnyVersion = 16843450; // 0x10102ba field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d field public static final int restrictedAccountType = 16843733; // 0x10103d5 @@ -1709,7 +1708,6 @@ package android { field public static final int ic_notification_clear_all = 17301594; // 0x108005a field public static final int ic_notification_overlay = 17301595; // 0x108005b field public static final int ic_partial_secure = 17301596; // 0x108005c - field public static final int ic_picture_in_picture = 17301685; // 0x10800b5 field public static final int ic_popup_disk_full = 17301597; // 0x108005d field public static final int ic_popup_reminder = 17301598; // 0x108005e field public static final int ic_popup_sync = 17301599; // 0x108005f @@ -2830,7 +2828,7 @@ package android.accessibilityservice { method public android.content.pm.ResolveInfo getResolveInfo(); method public java.lang.String getSettingsActivityName(); method public java.lang.String loadDescription(android.content.pm.PackageManager); - method public java.lang.String loadSummary(android.content.pm.PackageManager); + method public java.lang.CharSequence loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 @@ -3581,7 +3579,6 @@ package android.app { method public boolean dispatchTrackballEvent(android.view.MotionEvent); method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]); method public deprecated void enterPictureInPictureMode(); - method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs); method public boolean enterPictureInPictureMode(android.app.PictureInPictureParams); method public <T extends android.view.View> T findViewById(int); method public void finish(); @@ -3756,7 +3753,6 @@ package android.app { method public void setImmersive(boolean); method public void setIntent(android.content.Intent); method public final void setMediaController(android.media.session.MediaController); - method public void setPictureInPictureArgs(android.app.PictureInPictureArgs); method public void setPictureInPictureParams(android.app.PictureInPictureParams); method public final deprecated void setProgress(int); method public final deprecated void setProgressBarIndeterminate(boolean); @@ -3836,7 +3832,6 @@ package android.app { method public int getLauncherLargeIconDensity(); method public int getLauncherLargeIconSize(); method public int getLockTaskModeState(); - method public static deprecated int getMaxNumPictureInPictureActions(); method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); @@ -4700,7 +4695,6 @@ package android.app { public abstract class FragmentContainer { ctor public FragmentContainer(); - method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle); method public abstract <T extends android.view.View> T onFindViewById(int); method public abstract boolean onHasView(); } @@ -4973,7 +4967,6 @@ package android.app { public class KeyguardManager { method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); - method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public boolean inKeyguardRestrictedInputMode(); method public boolean isDeviceLocked(); @@ -5122,7 +5115,6 @@ package android.app { method public android.app.Notification clone(); method public int describeContents(); method public int getBadgeIconType(); - method public java.lang.String getChannel(); method public java.lang.String getChannelId(); method public java.lang.String getGroup(); method public int getGroupAlertBehavior(); @@ -5131,7 +5123,6 @@ package android.app { method public java.lang.String getShortcutId(); method public android.graphics.drawable.Icon getSmallIcon(); method public java.lang.String getSortKey(); - method public long getTimeout(); method public long getTimeoutAfter(); method public void writeToParcel(android.os.Parcel, int); field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT; @@ -5334,7 +5325,6 @@ package android.app { method public android.app.Notification.Builder setAutoCancel(boolean); method public android.app.Notification.Builder setBadgeIconType(int); method public android.app.Notification.Builder setCategory(java.lang.String); - method public android.app.Notification.Builder setChannel(java.lang.String); method public android.app.Notification.Builder setChannelId(java.lang.String); method public android.app.Notification.Builder setChronometerCountDown(boolean); method public android.app.Notification.Builder setColor(int); @@ -5379,7 +5369,6 @@ package android.app { method public android.app.Notification.Builder setSubText(java.lang.CharSequence); method public android.app.Notification.Builder setTicker(java.lang.CharSequence); method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews); - method public android.app.Notification.Builder setTimeout(long); method public android.app.Notification.Builder setTimeoutAfter(long); method public android.app.Notification.Builder setUsesChronometer(boolean); method public deprecated android.app.Notification.Builder setVibrate(long[]); @@ -5698,21 +5687,10 @@ package android.app { method public abstract void onSendFinished(android.app.PendingIntent, android.content.Intent, int, java.lang.String, android.os.Bundle); } - public final deprecated class PictureInPictureArgs extends android.app.PictureInPictureParams { - ctor public deprecated PictureInPictureArgs(); - ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>); - method public deprecated void setActions(java.util.List<android.app.RemoteAction>); - method public deprecated void setAspectRatio(float); - method public deprecated void setSourceRectHint(android.graphics.Rect); - } - - public class PictureInPictureParams implements android.os.Parcelable { + public final class PictureInPictureParams implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR; - field protected android.util.Rational mAspectRatio; - field protected android.graphics.Rect mSourceRectHint; - field protected java.util.List<android.app.RemoteAction> mUserActions; } public static class PictureInPictureParams.Builder { @@ -9349,15 +9327,12 @@ package android.content { field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; - field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; field public static final java.lang.String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT"; field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT"; field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED"; field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW"; - field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED"; - field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED"; field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE"; field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW"; field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK"; @@ -9561,7 +9536,6 @@ package android.content { field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY"; field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM"; field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT"; - field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX"; field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE"; field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT"; field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE"; @@ -10934,8 +10908,8 @@ package android.content.pm { field public android.content.pm.ActivityInfo activityInfo; field public android.content.IntentFilter filter; field public int icon; - field public boolean instantAppAvailable; field public boolean isDefault; + field public boolean isInstantAppAvailable; field public int labelRes; field public int match; field public java.lang.CharSequence nonLocalizedLabel; @@ -10972,7 +10946,7 @@ package android.content.pm { method public java.util.List<android.content.pm.VersionedPackage> getDependentPackages(); method public java.lang.String getName(); method public int getType(); - method public long getVersion(); + method public int getVersion(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR; field public static final int TYPE_BUILTIN = 0; // 0x0 @@ -13859,6 +13833,7 @@ package android.graphics { package android.graphics.drawable { public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { + ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable); method public void draw(android.graphics.Canvas); method public android.graphics.drawable.Drawable getBackground(); method public static float getExtraInsetFraction(); @@ -26570,6 +26545,7 @@ package android.net.wifi { method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public boolean setWifiEnabled(boolean); + method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler); method public boolean startScan(); method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback); method public int updateNetwork(android.net.wifi.WifiConfiguration); @@ -26620,6 +26596,22 @@ package android.net.wifi { field public static final int WPS_WEP_PROHIBITED = 4; // 0x4 } + public static class WifiManager.LocalOnlyHotspotCallback { + ctor public WifiManager.LocalOnlyHotspotCallback(); + method public void onFailed(int); + method public void onStarted(android.net.wifi.WifiManager.LocalOnlyHotspotReservation); + method public void onStopped(); + field public static final int ERROR_GENERIC = 2; // 0x2 + field public static final int ERROR_INCOMPATIBLE_MODE = 3; // 0x3 + field public static final int ERROR_NO_CHANNEL = 1; // 0x1 + field public static final int ERROR_TETHERING_DISALLOWED = 4; // 0x4 + } + + public class WifiManager.LocalOnlyHotspotReservation implements java.lang.AutoCloseable { + method public void close(); + method public android.net.wifi.WifiConfiguration getWifiConfiguration(); + } + public class WifiManager.MulticastLock { method public void acquire(); method public boolean isHeld(); @@ -26782,33 +26774,9 @@ package android.net.wifi.hotspot2 { ctor public PasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration); method public int describeContents(); method public android.net.wifi.hotspot2.pps.Credential getCredential(); - method public int getCredentialPriority(); method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp(); - method public android.net.wifi.hotspot2.pps.Policy getPolicy(); - method public long getSubscriptionCreationTimeInMs(); - method public long getSubscriptionExpirationTimeInMs(); - method public java.lang.String getSubscriptionType(); - method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); - method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList(); - method public int getUpdateIdentifier(); - method public long getUsageLimitDataLimit(); - method public long getUsageLimitStartTimeInMs(); - method public long getUsageLimitTimeLimitInMinutes(); - method public long getUsageLimitUsageTimePeriodInMinutes(); method public void setCredential(android.net.wifi.hotspot2.pps.Credential); - method public void setCredentialPriority(int); method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp); - method public void setPolicy(android.net.wifi.hotspot2.pps.Policy); - method public void setSubscriptionCreationTimeInMs(long); - method public void setSubscriptionExpirationTimeInMs(long); - method public void setSubscriptionType(java.lang.String); - method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter); - method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>); - method public void setUpdateIdentifier(int); - method public void setUsageLimitDataLimit(long); - method public void setUsageLimitStartTimeInMs(long); - method public void setUsageLimitTimeLimitInMinutes(long); - method public void setUsageLimitUsageTimePeriodInMinutes(long); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR; } @@ -26831,21 +26799,15 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.security.cert.X509Certificate getCaCertificate(); method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); - method public boolean getCheckAaaServerCertStatus(); method public java.security.cert.X509Certificate[] getClientCertificateChain(); method public java.security.PrivateKey getClientPrivateKey(); - method public long getCreationTimeInMs(); - method public long getExpirationTimeInMs(); method public java.lang.String getRealm(); method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential(); method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential(); method public void setCaCertificate(java.security.cert.X509Certificate); method public void setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential); - method public void setCheckAaaServerCertStatus(boolean); method public void setClientCertificateChain(java.security.cert.X509Certificate[]); method public void setClientPrivateKey(java.security.PrivateKey); - method public void setCreationTimeInMs(long); - method public void setExpirationTimeInMs(long); method public void setRealm(java.lang.String); method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential); method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential); @@ -26881,19 +26843,13 @@ package android.net.wifi.hotspot2.pps { ctor public Credential.UserCredential(); ctor public Credential.UserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential); method public int describeContents(); - method public boolean getAbleToShare(); method public int getEapType(); - method public boolean getMachineManaged(); method public java.lang.String getNonEapInnerMethod(); method public java.lang.String getPassword(); - method public java.lang.String getSoftTokenApp(); method public java.lang.String getUsername(); - method public void setAbleToShare(boolean); method public void setEapType(int); - method public void setMachineManaged(boolean); method public void setNonEapInnerMethod(java.lang.String); method public void setPassword(java.lang.String); - method public void setSoftTokenApp(java.lang.String); method public void setUsername(java.lang.String); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR; @@ -26905,96 +26861,14 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.lang.String getFqdn(); method public java.lang.String getFriendlyName(); - method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds(); - method public java.lang.String getIconUrl(); - method public long[] getMatchAllOis(); - method public long[] getMatchAnyOis(); - method public java.lang.String[] getOtherHomePartners(); method public long[] getRoamingConsortiumOis(); method public void setFqdn(java.lang.String); method public void setFriendlyName(java.lang.String); - method public void setHomeNetworkIds(java.util.Map<java.lang.String, java.lang.Long>); - method public void setIconUrl(java.lang.String); - method public void setMatchAllOis(long[]); - method public void setMatchAnyOis(long[]); - method public void setOtherHomePartners(java.lang.String[]); method public void setRoamingConsortiumOis(long[]); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR; } - public final class Policy implements android.os.Parcelable { - ctor public Policy(); - ctor public Policy(android.net.wifi.hotspot2.pps.Policy); - method public int describeContents(); - method public java.lang.String[] getExcludedSsidList(); - method public int getMaximumBssLoadValue(); - method public long getMinHomeDownlinkBandwidth(); - method public long getMinHomeUplinkBandwidth(); - method public long getMinRoamingDownlinkBandwidth(); - method public long getMinRoamingUplinkBandwidth(); - method public android.net.wifi.hotspot2.pps.UpdateParameter getPolicyUpdate(); - method public java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> getPreferredRoamingPartnerList(); - method public java.util.Map<java.lang.Integer, java.lang.String> getRequiredProtoPortMap(); - method public void setExcludedSsidList(java.lang.String[]); - method public void setMaximumBssLoadValue(int); - method public void setMinHomeDownlinkBandwidth(long); - method public void setMinHomeUplinkBandwidth(long); - method public void setMinRoamingDownlinkBandwidth(long); - method public void setMinRoamingUplinkBandwidth(long); - method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter); - method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>); - method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR; - } - - public static final class Policy.RoamingPartner implements android.os.Parcelable { - ctor public Policy.RoamingPartner(); - ctor public Policy.RoamingPartner(android.net.wifi.hotspot2.pps.Policy.RoamingPartner); - method public int describeContents(); - method public java.lang.String getCountries(); - method public java.lang.String getFqdn(); - method public boolean getFqdnExactMatch(); - method public int getPriority(); - method public void setCountries(java.lang.String); - method public void setFqdn(java.lang.String); - method public void setFqdnExactMatch(boolean); - method public void setPriority(int); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR; - } - - public final class UpdateParameter implements android.os.Parcelable { - ctor public UpdateParameter(); - ctor public UpdateParameter(android.net.wifi.hotspot2.pps.UpdateParameter); - method public int describeContents(); - method public java.lang.String getBase64EncodedPassword(); - method public java.lang.String getRestriction(); - method public java.lang.String getServerUri(); - method public byte[] getTrustRootCertSha256Fingerprint(); - method public java.lang.String getTrustRootCertUrl(); - method public long getUpdateIntervalInMinutes(); - method public java.lang.String getUpdateMethod(); - method public java.lang.String getUsername(); - method public void setBase64EncodedPassword(java.lang.String); - method public void setRestriction(java.lang.String); - method public void setServerUri(java.lang.String); - method public void setTrustRootCertSha256Fingerprint(byte[]); - method public void setTrustRootCertUrl(java.lang.String); - method public void setUpdateIntervalInMinutes(long); - method public void setUpdateMethod(java.lang.String); - method public void setUsername(java.lang.String); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR; - field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL - field public static final java.lang.String UPDATE_METHOD_OMADM = "OMA-DM-ClientInitiated"; - field public static final java.lang.String UPDATE_METHOD_SSP = "SSP-ClientInitiated"; - field public static final java.lang.String UPDATE_RESTRICTION_HOMESP = "HomeSP"; - field public static final java.lang.String UPDATE_RESTRICTION_ROAMING_PARTNER = "RoamingPartner"; - field public static final java.lang.String UPDATE_RESTRICTION_UNRESTRICTED = "Unrestricted"; - } - } package android.net.wifi.p2p { @@ -31622,7 +31496,7 @@ package android.os { public class TestLooperManager { method public void execute(android.os.Message); - method public android.os.MessageQueue getQueue(); + method public android.os.MessageQueue getMessageQueue(); method public boolean hasMessages(android.os.Handler, java.lang.Object, int); method public boolean hasMessages(android.os.Handler, java.lang.Object, java.lang.Runnable); method public android.os.Message next(); @@ -37032,7 +36906,7 @@ package android.service.autofill { public final class FillRequest implements android.os.Parcelable { method public int describeContents(); method public android.os.Bundle getClientState(); - method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts(); + method public java.util.List<android.service.autofill.FillContext> getFillContexts(); method public int getFlags(); method public int getId(); method public void writeToParcel(android.os.Parcel, int); @@ -38016,7 +37890,6 @@ package android.speech.tts { method public void onRangeStart(java.lang.String, int, int, int); method public abstract void onStart(java.lang.String); method public void onStop(java.lang.String, boolean); - method public deprecated void onUtteranceRangeStart(java.lang.String, int, int); } public class Voice implements android.os.Parcelable { @@ -40098,8 +39971,11 @@ package android.telephony { method public static int getDefaultVoiceSubscriptionId(); method public boolean isNetworkRoaming(int); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); + field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED"; + field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED"; field public static final int DATA_ROAMING_DISABLE = 0; // 0x0 field public static final int DATA_ROAMING_ENABLE = 1; // 0x1 + field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff } @@ -47800,7 +47676,7 @@ package android.view.autofill { method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback); field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE"; field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT"; - field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE"; + field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.CLIENT_STATE"; } public static abstract class AutofillManager.AutofillCallback { diff --git a/api/removed.txt b/api/removed.txt index 779ff7cce923..187349916286 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -1,9 +1,59 @@ package android.app { + public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback { + method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs); + method public deprecated void setPictureInPictureArgs(android.app.PictureInPictureArgs); + } + + public class ActivityManager { + method public static deprecated int getMaxNumPictureInPictureActions(); + } + + public class KeyguardManager { + method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler); + } + public class Notification implements android.os.Parcelable { + method public deprecated java.lang.String getChannel(); + method public deprecated long getTimeout(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); } + public static class Notification.Builder { + method public deprecated android.app.Notification.Builder setChannel(java.lang.String); + method public deprecated android.app.Notification.Builder setTimeout(long); + } + + public static final class Notification.TvExtender implements android.app.Notification.Extender { + method public deprecated java.lang.String getChannel(); + } + + public final deprecated class PictureInPictureArgs implements android.os.Parcelable { + method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams); + method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs); + method public void copyOnlySet(android.app.PictureInPictureArgs); + method public java.util.List<android.app.RemoteAction> getActions(); + method public float getAspectRatio(); + method public android.util.Rational getAspectRatioRational(); + method public android.graphics.Rect getSourceRectHint(); + method public android.graphics.Rect getSourceRectHintInsets(); + method public boolean hasSetActions(); + method public boolean hasSetAspectRatio(); + method public boolean hasSourceBoundsHint(); + method public boolean hasSourceBoundsHintInsets(); + method public deprecated void setSourceRectHintInsets(android.graphics.Rect); + method public void truncateActions(int); + field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR; + } + + public static class PictureInPictureArgs.Builder { + ctor public PictureInPictureArgs.Builder(); + method public android.app.PictureInPictureArgs build(); + method public android.app.PictureInPictureArgs.Builder setActions(java.util.List<android.app.RemoteAction>); + method public android.app.PictureInPictureArgs.Builder setAspectRatio(android.util.Rational); + method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect); + } + public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable { method public deprecated void showAsNotification(android.content.Context); } @@ -76,6 +126,10 @@ package android.content.pm { method public abstract boolean setInstantAppCookie(byte[]); } + public class ResolveInfo implements android.os.Parcelable { + field public deprecated boolean instantAppAvailable; + } + public final class SharedLibraryInfo implements android.os.Parcelable { method public boolean isBuiltin(); method public boolean isDynamic(); @@ -188,6 +242,26 @@ package android.net { method public deprecated int stopUsingNetworkFeature(int, java.lang.String); } + public deprecated class NetworkBadging { + method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme); + field public static final int BADGING_4K = 30; // 0x1e + field public static final int BADGING_HD = 20; // 0x14 + field public static final int BADGING_NONE = 0; // 0x0 + field public static final int BADGING_SD = 10; // 0xa + } + + public abstract class NetworkRecommendationProvider { + ctor public deprecated NetworkRecommendationProvider(android.os.Handler); + method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback); + field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT"; + field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE"; + } + + public static deprecated class NetworkRecommendationProvider.ResultCallback { + ctor public NetworkRecommendationProvider.ResultCallback(android.os.IRemoteCallback, int); + method public void onResult(android.net.RecommendationResult); + } + public abstract class PskKeyManager { ctor public PskKeyManager(); field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80 @@ -195,6 +269,37 @@ package android.net { field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100 } + public final deprecated class RecommendationRequest implements android.os.Parcelable { + ctor protected RecommendationRequest(android.os.Parcel); + method public android.net.wifi.WifiConfiguration[] getConnectableConfigs(); + method public android.net.wifi.WifiConfiguration getConnectedConfig(); + method public android.net.wifi.WifiConfiguration getDefaultWifiConfig(); + method public int getLastSelectedNetworkId(); + method public long getLastSelectedNetworkTimestamp(); + method public android.net.wifi.ScanResult[] getScanResults(); + method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]); + method public void setConnectedConfig(android.net.wifi.WifiConfiguration); + field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR; + } + + public static final deprecated class RecommendationRequest.Builder { + ctor public RecommendationRequest.Builder(); + method public android.net.RecommendationRequest build(); + method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]); + method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long); + method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]); + } + + public final deprecated class RecommendationResult implements android.os.Parcelable { + method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration); + method public static android.net.RecommendationResult createDoNotConnectRecommendation(); + method public android.net.wifi.WifiConfiguration getWifiConfiguration(); + method public boolean hasRecommendation(); + field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR; + } + public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); } @@ -221,6 +326,10 @@ package android.os { ctor public RecoverySystem(); } + public class TestLooperManager { + method public deprecated android.os.MessageQueue getQueue(); + } + public class UserManager { method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); @@ -382,6 +491,14 @@ package android.provider { } +package android.speech.tts { + + public abstract class UtteranceProgressListener { + method public deprecated void onUtteranceRangeStart(java.lang.String, int, int); + } + +} + package android.test.mock { public deprecated class MockPackageManager extends android.content.pm.PackageManager { diff --git a/api/system-current.txt b/api/system-current.txt index 9f696d2cb140..9a62752c79e1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1182,6 +1182,7 @@ package android { field public static final int ratingBarStyleSmall = 16842877; // 0x101007d field public static final int readPermission = 16842759; // 0x1010007 field public static final int recognitionService = 16843932; // 0x101049c + field public static final int recreateOnConfigChanges = 16844105; // 0x1010549 field public static final int recycleEnabled = 16844124; // 0x101055c field public static final int relinquishTaskIdentity = 16843894; // 0x1010476 field public static final int reparent = 16843964; // 0x10104bc @@ -1208,7 +1209,6 @@ package android { field public static final int resizeable = 16843405; // 0x101028d field public static final int resizeableActivity = 16844022; // 0x10104f6 field public static final int resource = 16842789; // 0x1010025 - field public static final int restartOnConfigChanges = 16844105; // 0x1010549 field public static final int restoreAnyVersion = 16843450; // 0x10102ba field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d field public static final int restrictedAccountType = 16843733; // 0x10103d5 @@ -1835,7 +1835,6 @@ package android { field public static final int ic_notification_clear_all = 17301594; // 0x108005a field public static final int ic_notification_overlay = 17301595; // 0x108005b field public static final int ic_partial_secure = 17301596; // 0x108005c - field public static final int ic_picture_in_picture = 17301685; // 0x10800b5 field public static final int ic_popup_disk_full = 17301597; // 0x108005d field public static final int ic_popup_reminder = 17301598; // 0x108005e field public static final int ic_popup_sync = 17301599; // 0x108005f @@ -2959,7 +2958,7 @@ package android.accessibilityservice { method public android.content.pm.ResolveInfo getResolveInfo(); method public java.lang.String getSettingsActivityName(); method public java.lang.String loadDescription(android.content.pm.PackageManager); - method public java.lang.String loadSummary(android.content.pm.PackageManager); + method public java.lang.CharSequence loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 @@ -3713,7 +3712,6 @@ package android.app { method public boolean dispatchTrackballEvent(android.view.MotionEvent); method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]); method public deprecated void enterPictureInPictureMode(); - method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs); method public boolean enterPictureInPictureMode(android.app.PictureInPictureParams); method public <T extends android.view.View> T findViewById(int); method public void finish(); @@ -3891,7 +3889,6 @@ package android.app { method public void setImmersive(boolean); method public void setIntent(android.content.Intent); method public final void setMediaController(android.media.session.MediaController); - method public void setPictureInPictureArgs(android.app.PictureInPictureArgs); method public void setPictureInPictureParams(android.app.PictureInPictureParams); method public final deprecated void setProgress(int); method public final deprecated void setProgressBarIndeterminate(boolean); @@ -3978,7 +3975,6 @@ package android.app { method public int getLauncherLargeIconDensity(); method public int getLauncherLargeIconSize(); method public int getLockTaskModeState(); - method public static deprecated int getMaxNumPictureInPictureActions(); method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); @@ -4869,7 +4865,6 @@ package android.app { public abstract class FragmentContainer { ctor public FragmentContainer(); - method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle); method public abstract <T extends android.view.View> T onFindViewById(int); method public abstract boolean onHasView(); } @@ -5154,7 +5149,6 @@ package android.app { public class KeyguardManager { method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); - method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public boolean inKeyguardRestrictedInputMode(); method public boolean isDeviceLocked(); @@ -5303,7 +5297,6 @@ package android.app { method public android.app.Notification clone(); method public int describeContents(); method public int getBadgeIconType(); - method public java.lang.String getChannel(); method public java.lang.String getChannelId(); method public java.lang.String getGroup(); method public int getGroupAlertBehavior(); @@ -5313,7 +5306,6 @@ package android.app { method public java.lang.String getShortcutId(); method public android.graphics.drawable.Icon getSmallIcon(); method public java.lang.String getSortKey(); - method public long getTimeout(); method public long getTimeoutAfter(); method public void writeToParcel(android.os.Parcel, int); field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT; @@ -5519,7 +5511,6 @@ package android.app { method public android.app.Notification.Builder setAutoCancel(boolean); method public android.app.Notification.Builder setBadgeIconType(int); method public android.app.Notification.Builder setCategory(java.lang.String); - method public android.app.Notification.Builder setChannel(java.lang.String); method public android.app.Notification.Builder setChannelId(java.lang.String); method public android.app.Notification.Builder setChronometerCountDown(boolean); method public android.app.Notification.Builder setColor(int); @@ -5564,7 +5555,6 @@ package android.app { method public android.app.Notification.Builder setSubText(java.lang.CharSequence); method public android.app.Notification.Builder setTicker(java.lang.CharSequence); method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews); - method public android.app.Notification.Builder setTimeout(long); method public android.app.Notification.Builder setTimeoutAfter(long); method public android.app.Notification.Builder setUsesChronometer(boolean); method public deprecated android.app.Notification.Builder setVibrate(long[]); @@ -5669,7 +5659,6 @@ package android.app { ctor public Notification.TvExtender(); ctor public Notification.TvExtender(android.app.Notification); method public android.app.Notification.Builder extend(android.app.Notification.Builder); - method public java.lang.String getChannel(); method public java.lang.String getChannelId(); method public android.app.PendingIntent getContentIntent(); method public android.app.PendingIntent getDeleteIntent(); @@ -5904,21 +5893,10 @@ package android.app { method public abstract void onSendFinished(android.app.PendingIntent, android.content.Intent, int, java.lang.String, android.os.Bundle); } - public final deprecated class PictureInPictureArgs extends android.app.PictureInPictureParams { - ctor public deprecated PictureInPictureArgs(); - ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>); - method public deprecated void setActions(java.util.List<android.app.RemoteAction>); - method public deprecated void setAspectRatio(float); - method public deprecated void setSourceRectHint(android.graphics.Rect); - } - - public class PictureInPictureParams implements android.os.Parcelable { + public final class PictureInPictureParams implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR; - field protected android.util.Rational mAspectRatio; - field protected android.graphics.Rect mSourceRectHint; - field protected java.util.List<android.app.RemoteAction> mUserActions; } public static class PictureInPictureParams.Builder { @@ -9875,15 +9853,12 @@ package android.content { field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; - field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; field public static final java.lang.String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT"; field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT"; field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED"; field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW"; - field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED"; - field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED"; field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE"; field public static final deprecated java.lang.String ACTION_DEVICE_INITIALIZATION_WIZARD = "android.intent.action.DEVICE_INITIALIZATION_WIZARD"; field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW"; @@ -10136,7 +10111,6 @@ package android.content { field public static final java.lang.String EXTRA_SPLIT_NAME = "android.intent.extra.SPLIT_NAME"; field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM"; field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT"; - field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX"; field public static final deprecated java.lang.String EXTRA_SYSTEM_ID = "systemId"; field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE"; field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT"; @@ -11365,6 +11339,7 @@ package android.content.pm { method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int); method public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int); method public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public abstract void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback); method public abstract void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); method public abstract deprecated void removePackageFromPreferred(java.lang.String); method public abstract void removePermission(java.lang.String); @@ -11585,6 +11560,11 @@ package android.content.pm { field public static final int VERSION_CODE_HIGHEST = -1; // 0xffffffff } + public static abstract class PackageManager.DexModuleRegisterCallback { + ctor public PackageManager.DexModuleRegisterCallback(); + method public abstract void onDexModuleRegistered(java.lang.String, boolean, java.lang.String); + } + public static class PackageManager.NameNotFoundException extends android.util.AndroidException { ctor public PackageManager.NameNotFoundException(); ctor public PackageManager.NameNotFoundException(java.lang.String); @@ -11701,8 +11681,8 @@ package android.content.pm { field public android.content.pm.ActivityInfo activityInfo; field public android.content.IntentFilter filter; field public int icon; - field public boolean instantAppAvailable; field public boolean isDefault; + field public boolean isInstantAppAvailable; field public int labelRes; field public int match; field public java.lang.CharSequence nonLocalizedLabel; @@ -11739,7 +11719,7 @@ package android.content.pm { method public java.util.List<android.content.pm.VersionedPackage> getDependentPackages(); method public java.lang.String getName(); method public int getType(); - method public long getVersion(); + method public int getVersion(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR; field public static final int TYPE_BUILTIN = 0; // 0x0 @@ -14640,6 +14620,7 @@ package android.graphics { package android.graphics.drawable { public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { + ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable); method public void draw(android.graphics.Canvas); method public android.graphics.drawable.Drawable getBackground(); method public static float getExtraInsetFraction(); @@ -27802,17 +27783,6 @@ package android.net { field public static final android.os.Parcelable.Creator<android.net.Network> CREATOR; } - public class NetworkBadging { - method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme); - field public static final int BADGING_4K = 30; // 0x1e - field public static final int BADGING_HD = 20; // 0x14 - field public static final int BADGING_NONE = 0; // 0x0 - field public static final int BADGING_SD = 10; // 0xa - } - - public static abstract class NetworkBadging.Badging implements java.lang.annotation.Annotation { - } - public final class NetworkCapabilities implements android.os.Parcelable { ctor public NetworkCapabilities(android.net.NetworkCapabilities); method public int describeContents(); @@ -27907,17 +27877,9 @@ package android.net { } public abstract class NetworkRecommendationProvider { - ctor public deprecated NetworkRecommendationProvider(android.os.Handler); ctor public NetworkRecommendationProvider(android.content.Context, java.util.concurrent.Executor); method public final android.os.IBinder getBinder(); - method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback); method public abstract void onRequestScores(android.net.NetworkKey[]); - field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT"; - field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE"; - } - - public static deprecated class NetworkRecommendationProvider.ResultCallback { - method public void onResult(android.net.RecommendationResult); } public class NetworkRequest implements android.os.Parcelable { @@ -27983,41 +27945,6 @@ package android.net { field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR; } - public final deprecated class RecommendationRequest implements android.os.Parcelable { - ctor protected RecommendationRequest(android.os.Parcel); - method public int describeContents(); - method public android.net.wifi.WifiConfiguration[] getConnectableConfigs(); - method public android.net.wifi.WifiConfiguration getConnectedConfig(); - method public android.net.wifi.WifiConfiguration getDefaultWifiConfig(); - method public int getLastSelectedNetworkId(); - method public long getLastSelectedNetworkTimestamp(); - method public android.net.wifi.ScanResult[] getScanResults(); - method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]); - method public void setConnectedConfig(android.net.wifi.WifiConfiguration); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR; - } - - public static final deprecated class RecommendationRequest.Builder { - ctor public RecommendationRequest.Builder(); - method public android.net.RecommendationRequest build(); - method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]); - method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration); - method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration); - method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long); - method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]); - } - - public final deprecated class RecommendationResult implements android.os.Parcelable { - method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration); - method public static android.net.RecommendationResult createDoNotConnectRecommendation(); - method public int describeContents(); - method public android.net.wifi.WifiConfiguration getWifiConfiguration(); - method public boolean hasRecommendation(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR; - } - public final class RouteInfo implements android.os.Parcelable { method public int describeContents(); method public android.net.IpPrefix getDestination(); @@ -29152,6 +29079,7 @@ package android.net.wifi { method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration); method public boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean); method public boolean setWifiEnabled(boolean); + method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler); method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource); method public boolean startScan(); method public boolean startScan(android.os.WorkSource); @@ -29229,6 +29157,22 @@ package android.net.wifi { method public abstract void onSuccess(); } + public static class WifiManager.LocalOnlyHotspotCallback { + ctor public WifiManager.LocalOnlyHotspotCallback(); + method public void onFailed(int); + method public void onStarted(android.net.wifi.WifiManager.LocalOnlyHotspotReservation); + method public void onStopped(); + field public static final int ERROR_GENERIC = 2; // 0x2 + field public static final int ERROR_INCOMPATIBLE_MODE = 3; // 0x3 + field public static final int ERROR_NO_CHANNEL = 1; // 0x1 + field public static final int ERROR_TETHERING_DISALLOWED = 4; // 0x4 + } + + public class WifiManager.LocalOnlyHotspotReservation implements java.lang.AutoCloseable { + method public void close(); + method public android.net.wifi.WifiConfiguration getWifiConfiguration(); + } + public class WifiManager.MulticastLock { method public void acquire(); method public boolean isHeld(); @@ -29533,33 +29477,9 @@ package android.net.wifi.hotspot2 { ctor public PasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration); method public int describeContents(); method public android.net.wifi.hotspot2.pps.Credential getCredential(); - method public int getCredentialPriority(); method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp(); - method public android.net.wifi.hotspot2.pps.Policy getPolicy(); - method public long getSubscriptionCreationTimeInMs(); - method public long getSubscriptionExpirationTimeInMs(); - method public java.lang.String getSubscriptionType(); - method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); - method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList(); - method public int getUpdateIdentifier(); - method public long getUsageLimitDataLimit(); - method public long getUsageLimitStartTimeInMs(); - method public long getUsageLimitTimeLimitInMinutes(); - method public long getUsageLimitUsageTimePeriodInMinutes(); method public void setCredential(android.net.wifi.hotspot2.pps.Credential); - method public void setCredentialPriority(int); method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp); - method public void setPolicy(android.net.wifi.hotspot2.pps.Policy); - method public void setSubscriptionCreationTimeInMs(long); - method public void setSubscriptionExpirationTimeInMs(long); - method public void setSubscriptionType(java.lang.String); - method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter); - method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>); - method public void setUpdateIdentifier(int); - method public void setUsageLimitDataLimit(long); - method public void setUsageLimitStartTimeInMs(long); - method public void setUsageLimitTimeLimitInMinutes(long); - method public void setUsageLimitUsageTimePeriodInMinutes(long); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR; } @@ -29582,21 +29502,15 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.security.cert.X509Certificate getCaCertificate(); method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); - method public boolean getCheckAaaServerCertStatus(); method public java.security.cert.X509Certificate[] getClientCertificateChain(); method public java.security.PrivateKey getClientPrivateKey(); - method public long getCreationTimeInMs(); - method public long getExpirationTimeInMs(); method public java.lang.String getRealm(); method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential(); method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential(); method public void setCaCertificate(java.security.cert.X509Certificate); method public void setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential); - method public void setCheckAaaServerCertStatus(boolean); method public void setClientCertificateChain(java.security.cert.X509Certificate[]); method public void setClientPrivateKey(java.security.PrivateKey); - method public void setCreationTimeInMs(long); - method public void setExpirationTimeInMs(long); method public void setRealm(java.lang.String); method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential); method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential); @@ -29632,19 +29546,13 @@ package android.net.wifi.hotspot2.pps { ctor public Credential.UserCredential(); ctor public Credential.UserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential); method public int describeContents(); - method public boolean getAbleToShare(); method public int getEapType(); - method public boolean getMachineManaged(); method public java.lang.String getNonEapInnerMethod(); method public java.lang.String getPassword(); - method public java.lang.String getSoftTokenApp(); method public java.lang.String getUsername(); - method public void setAbleToShare(boolean); method public void setEapType(int); - method public void setMachineManaged(boolean); method public void setNonEapInnerMethod(java.lang.String); method public void setPassword(java.lang.String); - method public void setSoftTokenApp(java.lang.String); method public void setUsername(java.lang.String); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR; @@ -29656,96 +29564,14 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.lang.String getFqdn(); method public java.lang.String getFriendlyName(); - method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds(); - method public java.lang.String getIconUrl(); - method public long[] getMatchAllOis(); - method public long[] getMatchAnyOis(); - method public java.lang.String[] getOtherHomePartners(); method public long[] getRoamingConsortiumOis(); method public void setFqdn(java.lang.String); method public void setFriendlyName(java.lang.String); - method public void setHomeNetworkIds(java.util.Map<java.lang.String, java.lang.Long>); - method public void setIconUrl(java.lang.String); - method public void setMatchAllOis(long[]); - method public void setMatchAnyOis(long[]); - method public void setOtherHomePartners(java.lang.String[]); method public void setRoamingConsortiumOis(long[]); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR; } - public final class Policy implements android.os.Parcelable { - ctor public Policy(); - ctor public Policy(android.net.wifi.hotspot2.pps.Policy); - method public int describeContents(); - method public java.lang.String[] getExcludedSsidList(); - method public int getMaximumBssLoadValue(); - method public long getMinHomeDownlinkBandwidth(); - method public long getMinHomeUplinkBandwidth(); - method public long getMinRoamingDownlinkBandwidth(); - method public long getMinRoamingUplinkBandwidth(); - method public android.net.wifi.hotspot2.pps.UpdateParameter getPolicyUpdate(); - method public java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> getPreferredRoamingPartnerList(); - method public java.util.Map<java.lang.Integer, java.lang.String> getRequiredProtoPortMap(); - method public void setExcludedSsidList(java.lang.String[]); - method public void setMaximumBssLoadValue(int); - method public void setMinHomeDownlinkBandwidth(long); - method public void setMinHomeUplinkBandwidth(long); - method public void setMinRoamingDownlinkBandwidth(long); - method public void setMinRoamingUplinkBandwidth(long); - method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter); - method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>); - method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR; - } - - public static final class Policy.RoamingPartner implements android.os.Parcelable { - ctor public Policy.RoamingPartner(); - ctor public Policy.RoamingPartner(android.net.wifi.hotspot2.pps.Policy.RoamingPartner); - method public int describeContents(); - method public java.lang.String getCountries(); - method public java.lang.String getFqdn(); - method public boolean getFqdnExactMatch(); - method public int getPriority(); - method public void setCountries(java.lang.String); - method public void setFqdn(java.lang.String); - method public void setFqdnExactMatch(boolean); - method public void setPriority(int); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR; - } - - public final class UpdateParameter implements android.os.Parcelable { - ctor public UpdateParameter(); - ctor public UpdateParameter(android.net.wifi.hotspot2.pps.UpdateParameter); - method public int describeContents(); - method public java.lang.String getBase64EncodedPassword(); - method public java.lang.String getRestriction(); - method public java.lang.String getServerUri(); - method public byte[] getTrustRootCertSha256Fingerprint(); - method public java.lang.String getTrustRootCertUrl(); - method public long getUpdateIntervalInMinutes(); - method public java.lang.String getUpdateMethod(); - method public java.lang.String getUsername(); - method public void setBase64EncodedPassword(java.lang.String); - method public void setRestriction(java.lang.String); - method public void setServerUri(java.lang.String); - method public void setTrustRootCertSha256Fingerprint(byte[]); - method public void setTrustRootCertUrl(java.lang.String); - method public void setUpdateIntervalInMinutes(long); - method public void setUpdateMethod(java.lang.String); - method public void setUsername(java.lang.String); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR; - field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL - field public static final java.lang.String UPDATE_METHOD_OMADM = "OMA-DM-ClientInitiated"; - field public static final java.lang.String UPDATE_METHOD_SSP = "SSP-ClientInitiated"; - field public static final java.lang.String UPDATE_RESTRICTION_HOMESP = "HomeSP"; - field public static final java.lang.String UPDATE_RESTRICTION_ROAMING_PARTNER = "RoamingPartner"; - field public static final java.lang.String UPDATE_RESTRICTION_UNRESTRICTED = "Unrestricted"; - } - } package android.net.wifi.p2p { @@ -34448,7 +34274,7 @@ package android.os { public class TestLooperManager { method public void execute(android.os.Message); - method public android.os.MessageQueue getQueue(); + method public android.os.MessageQueue getMessageQueue(); method public boolean hasMessages(android.os.Handler, java.lang.Object, int); method public boolean hasMessages(android.os.Handler, java.lang.Object, java.lang.Runnable); method public android.os.Message next(); @@ -40156,7 +39982,7 @@ package android.service.autofill { public final class FillRequest implements android.os.Parcelable { method public int describeContents(); method public android.os.Bundle getClientState(); - method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts(); + method public java.util.List<android.service.autofill.FillContext> getFillContexts(); method public int getFlags(); method public int getId(); method public void writeToParcel(android.os.Parcel, int); @@ -41283,7 +41109,6 @@ package android.speech.tts { method public void onRangeStart(java.lang.String, int, int, int); method public abstract void onStart(java.lang.String); method public void onStop(java.lang.String, boolean); - method public deprecated void onUtteranceRangeStart(java.lang.String, int, int); } public class Voice implements android.os.Parcelable { @@ -43585,8 +43410,11 @@ package android.telephony { method public static int getDefaultVoiceSubscriptionId(); method public boolean isNetworkRoaming(int); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); + field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED"; + field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED"; field public static final int DATA_ROAMING_DISABLE = 0; // 0x0 field public static final int DATA_ROAMING_ENABLE = 1; // 0x1 + field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff } @@ -44576,6 +44404,7 @@ package android.test.mock { method public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int); method public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int); method public java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException; + method public void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback); method public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener); method public void removePackageFromPreferred(java.lang.String); method public void removePermission(java.lang.String); @@ -50698,6 +50527,7 @@ package android.view.accessibility { method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int); method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getInstalledAccessibilityServiceList(); method public void interrupt(); + method public static boolean isAccessibilityButtonSupported(); method public boolean isEnabled(); method public boolean isTouchExplorationEnabled(); method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer); @@ -51397,7 +51227,7 @@ package android.view.autofill { method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback); field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE"; field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT"; - field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE"; + field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.CLIENT_STATE"; } public static abstract class AutofillManager.AutofillCallback { diff --git a/api/system-removed.txt b/api/system-removed.txt index fe512481b1ad..60865a3892da 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -1,9 +1,59 @@ package android.app { + public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback { + method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs); + method public deprecated void setPictureInPictureArgs(android.app.PictureInPictureArgs); + } + + public class ActivityManager { + method public static deprecated int getMaxNumPictureInPictureActions(); + } + + public class KeyguardManager { + method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler); + } + public class Notification implements android.os.Parcelable { + method public deprecated java.lang.String getChannel(); + method public deprecated long getTimeout(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); } + public static class Notification.Builder { + method public deprecated android.app.Notification.Builder setChannel(java.lang.String); + method public deprecated android.app.Notification.Builder setTimeout(long); + } + + public static final class Notification.TvExtender implements android.app.Notification.Extender { + method public deprecated java.lang.String getChannel(); + } + + public final deprecated class PictureInPictureArgs implements android.os.Parcelable { + method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams); + method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs); + method public void copyOnlySet(android.app.PictureInPictureArgs); + method public java.util.List<android.app.RemoteAction> getActions(); + method public float getAspectRatio(); + method public android.util.Rational getAspectRatioRational(); + method public android.graphics.Rect getSourceRectHint(); + method public android.graphics.Rect getSourceRectHintInsets(); + method public boolean hasSetActions(); + method public boolean hasSetAspectRatio(); + method public boolean hasSourceBoundsHint(); + method public boolean hasSourceBoundsHintInsets(); + method public deprecated void setSourceRectHintInsets(android.graphics.Rect); + method public void truncateActions(int); + field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR; + } + + public static class PictureInPictureArgs.Builder { + ctor public PictureInPictureArgs.Builder(); + method public android.app.PictureInPictureArgs build(); + method public android.app.PictureInPictureArgs.Builder setActions(java.util.List<android.app.RemoteAction>); + method public android.app.PictureInPictureArgs.Builder setAspectRatio(android.util.Rational); + method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect); + } + public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable { method public deprecated void showAsNotification(android.content.Context); } @@ -74,6 +124,10 @@ package android.content.pm { method public abstract boolean setInstantAppCookie(byte[]); } + public class ResolveInfo implements android.os.Parcelable { + field public deprecated boolean instantAppAvailable; + } + public final class SharedLibraryInfo implements android.os.Parcelable { method public boolean isBuiltin(); method public boolean isDynamic(); @@ -186,6 +240,26 @@ package android.net { method public deprecated int stopUsingNetworkFeature(int, java.lang.String); } + public deprecated class NetworkBadging { + method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme); + field public static final int BADGING_4K = 30; // 0x1e + field public static final int BADGING_HD = 20; // 0x14 + field public static final int BADGING_NONE = 0; // 0x0 + field public static final int BADGING_SD = 10; // 0xa + } + + public abstract class NetworkRecommendationProvider { + ctor public deprecated NetworkRecommendationProvider(android.os.Handler); + method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback); + field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT"; + field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE"; + } + + public static deprecated class NetworkRecommendationProvider.ResultCallback { + ctor public NetworkRecommendationProvider.ResultCallback(android.os.IRemoteCallback, int); + method public void onResult(android.net.RecommendationResult); + } + public abstract class PskKeyManager { ctor public PskKeyManager(); field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80 @@ -193,6 +267,37 @@ package android.net { field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100 } + public final deprecated class RecommendationRequest implements android.os.Parcelable { + ctor protected RecommendationRequest(android.os.Parcel); + method public android.net.wifi.WifiConfiguration[] getConnectableConfigs(); + method public android.net.wifi.WifiConfiguration getConnectedConfig(); + method public android.net.wifi.WifiConfiguration getDefaultWifiConfig(); + method public int getLastSelectedNetworkId(); + method public long getLastSelectedNetworkTimestamp(); + method public android.net.wifi.ScanResult[] getScanResults(); + method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]); + method public void setConnectedConfig(android.net.wifi.WifiConfiguration); + field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR; + } + + public static final deprecated class RecommendationRequest.Builder { + ctor public RecommendationRequest.Builder(); + method public android.net.RecommendationRequest build(); + method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]); + method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long); + method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]); + } + + public final deprecated class RecommendationResult implements android.os.Parcelable { + method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration); + method public static android.net.RecommendationResult createDoNotConnectRecommendation(); + method public android.net.wifi.WifiConfiguration getWifiConfiguration(); + method public boolean hasRecommendation(); + field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR; + } + public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); } @@ -215,6 +320,10 @@ package android.os { ctor public RecoverySystem(); } + public class TestLooperManager { + method public deprecated android.os.MessageQueue getQueue(); + } + public class UserManager { method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); @@ -376,6 +485,14 @@ package android.provider { } +package android.speech.tts { + + public abstract class UtteranceProgressListener { + method public deprecated void onUtteranceRangeStart(java.lang.String, int, int); + } + +} + package android.test.mock { public deprecated class MockPackageManager extends android.content.pm.PackageManager { diff --git a/api/test-current.txt b/api/test-current.txt index 2ac284efbbd7..6ea9b11aa41d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -121,7 +121,6 @@ package android { field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; - field public static final java.lang.String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM"; @@ -1062,6 +1061,7 @@ package android { field public static final int ratingBarStyleSmall = 16842877; // 0x101007d field public static final int readPermission = 16842759; // 0x1010007 field public static final int recognitionService = 16843932; // 0x101049c + field public static final int recreateOnConfigChanges = 16844105; // 0x1010549 field public static final int recycleEnabled = 16844124; // 0x101055c field public static final int relinquishTaskIdentity = 16843894; // 0x1010476 field public static final int reparent = 16843964; // 0x10104bc @@ -1086,7 +1086,6 @@ package android { field public static final int resizeable = 16843405; // 0x101028d field public static final int resizeableActivity = 16844022; // 0x10104f6 field public static final int resource = 16842789; // 0x1010025 - field public static final int restartOnConfigChanges = 16844105; // 0x1010549 field public static final int restoreAnyVersion = 16843450; // 0x10102ba field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d field public static final int restrictedAccountType = 16843733; // 0x10103d5 @@ -1709,7 +1708,6 @@ package android { field public static final int ic_notification_clear_all = 17301594; // 0x108005a field public static final int ic_notification_overlay = 17301595; // 0x108005b field public static final int ic_partial_secure = 17301596; // 0x108005c - field public static final int ic_picture_in_picture = 17301685; // 0x10800b5 field public static final int ic_popup_disk_full = 17301597; // 0x108005d field public static final int ic_popup_reminder = 17301598; // 0x108005e field public static final int ic_popup_sync = 17301599; // 0x108005f @@ -2830,7 +2828,7 @@ package android.accessibilityservice { method public android.content.pm.ResolveInfo getResolveInfo(); method public java.lang.String getSettingsActivityName(); method public java.lang.String loadDescription(android.content.pm.PackageManager); - method public java.lang.String loadSummary(android.content.pm.PackageManager); + method public java.lang.CharSequence loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 @@ -3583,7 +3581,6 @@ package android.app { method public boolean dispatchTrackballEvent(android.view.MotionEvent); method public void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]); method public deprecated void enterPictureInPictureMode(); - method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs); method public boolean enterPictureInPictureMode(android.app.PictureInPictureParams); method public <T extends android.view.View> T findViewById(int); method public void finish(); @@ -3758,7 +3755,6 @@ package android.app { method public void setImmersive(boolean); method public void setIntent(android.content.Intent); method public final void setMediaController(android.media.session.MediaController); - method public void setPictureInPictureArgs(android.app.PictureInPictureArgs); method public void setPictureInPictureParams(android.app.PictureInPictureParams); method public final deprecated void setProgress(int); method public final deprecated void setProgressBarIndeterminate(boolean); @@ -3839,7 +3835,6 @@ package android.app { method public int getLauncherLargeIconDensity(); method public int getLauncherLargeIconSize(); method public int getLockTaskModeState(); - method public static deprecated int getMaxNumPictureInPictureActions(); method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); @@ -4713,7 +4708,6 @@ package android.app { public abstract class FragmentContainer { ctor public FragmentContainer(); - method public android.app.Fragment instantiate(android.content.Context, java.lang.String, android.os.Bundle); method public abstract <T extends android.view.View> T onFindViewById(int); method public abstract boolean onHasView(); } @@ -4986,7 +4980,6 @@ package android.app { public class KeyguardManager { method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence); - method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler); method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult); method public boolean inKeyguardRestrictedInputMode(); method public boolean isDeviceLocked(); @@ -5135,7 +5128,6 @@ package android.app { method public android.app.Notification clone(); method public int describeContents(); method public int getBadgeIconType(); - method public java.lang.String getChannel(); method public java.lang.String getChannelId(); method public java.lang.String getGroup(); method public int getGroupAlertBehavior(); @@ -5144,7 +5136,6 @@ package android.app { method public java.lang.String getShortcutId(); method public android.graphics.drawable.Icon getSmallIcon(); method public java.lang.String getSortKey(); - method public long getTimeout(); method public long getTimeoutAfter(); method public void writeToParcel(android.os.Parcel, int); field public static final android.media.AudioAttributes AUDIO_ATTRIBUTES_DEFAULT; @@ -5347,7 +5338,6 @@ package android.app { method public android.app.Notification.Builder setAutoCancel(boolean); method public android.app.Notification.Builder setBadgeIconType(int); method public android.app.Notification.Builder setCategory(java.lang.String); - method public android.app.Notification.Builder setChannel(java.lang.String); method public android.app.Notification.Builder setChannelId(java.lang.String); method public android.app.Notification.Builder setChronometerCountDown(boolean); method public android.app.Notification.Builder setColor(int); @@ -5392,7 +5382,6 @@ package android.app { method public android.app.Notification.Builder setSubText(java.lang.CharSequence); method public android.app.Notification.Builder setTicker(java.lang.CharSequence); method public deprecated android.app.Notification.Builder setTicker(java.lang.CharSequence, android.widget.RemoteViews); - method public android.app.Notification.Builder setTimeout(long); method public android.app.Notification.Builder setTimeoutAfter(long); method public android.app.Notification.Builder setUsesChronometer(boolean); method public deprecated android.app.Notification.Builder setVibrate(long[]); @@ -5712,21 +5701,10 @@ package android.app { method public abstract void onSendFinished(android.app.PendingIntent, android.content.Intent, int, java.lang.String, android.os.Bundle); } - public final deprecated class PictureInPictureArgs extends android.app.PictureInPictureParams { - ctor public deprecated PictureInPictureArgs(); - ctor public deprecated PictureInPictureArgs(float, java.util.List<android.app.RemoteAction>); - method public deprecated void setActions(java.util.List<android.app.RemoteAction>); - method public deprecated void setAspectRatio(float); - method public deprecated void setSourceRectHint(android.graphics.Rect); - } - - public class PictureInPictureParams implements android.os.Parcelable { + public final class PictureInPictureParams implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR; - field protected android.util.Rational mAspectRatio; - field protected android.graphics.Rect mSourceRectHint; - field protected java.util.List<android.app.RemoteAction> mUserActions; } public static class PictureInPictureParams.Builder { @@ -9383,15 +9361,12 @@ package android.content { field public static final java.lang.String ACTION_CAMERA_BUTTON = "android.intent.action.CAMERA_BUTTON"; field public static final java.lang.String ACTION_CARRIER_SETUP = "android.intent.action.CARRIER_SETUP"; field public static final java.lang.String ACTION_CHOOSER = "android.intent.action.CHOOSER"; - field public static final java.lang.String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; field public static final java.lang.String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS"; field public static final java.lang.String ACTION_CONFIGURATION_CHANGED = "android.intent.action.CONFIGURATION_CHANGED"; field public static final java.lang.String ACTION_CREATE_DOCUMENT = "android.intent.action.CREATE_DOCUMENT"; field public static final java.lang.String ACTION_CREATE_SHORTCUT = "android.intent.action.CREATE_SHORTCUT"; field public static final java.lang.String ACTION_DATE_CHANGED = "android.intent.action.DATE_CHANGED"; field public static final java.lang.String ACTION_DEFAULT = "android.intent.action.VIEW"; - field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED"; - field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED"; field public static final java.lang.String ACTION_DELETE = "android.intent.action.DELETE"; field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_LOW = "android.intent.action.DEVICE_STORAGE_LOW"; field public static final deprecated java.lang.String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK"; @@ -9595,7 +9570,6 @@ package android.content { field public static final java.lang.String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY"; field public static final java.lang.String EXTRA_STREAM = "android.intent.extra.STREAM"; field public static final java.lang.String EXTRA_SUBJECT = "android.intent.extra.SUBJECT"; - field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX"; field public static final java.lang.String EXTRA_TEMPLATE = "android.intent.extra.TEMPLATE"; field public static final java.lang.String EXTRA_TEXT = "android.intent.extra.TEXT"; field public static final java.lang.String EXTRA_TITLE = "android.intent.extra.TITLE"; @@ -10975,8 +10949,8 @@ package android.content.pm { field public android.content.pm.ActivityInfo activityInfo; field public android.content.IntentFilter filter; field public int icon; - field public boolean instantAppAvailable; field public boolean isDefault; + field public boolean isInstantAppAvailable; field public int labelRes; field public int match; field public java.lang.CharSequence nonLocalizedLabel; @@ -11013,7 +10987,7 @@ package android.content.pm { method public java.util.List<android.content.pm.VersionedPackage> getDependentPackages(); method public java.lang.String getName(); method public int getType(); - method public long getVersion(); + method public int getVersion(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR; field public static final int TYPE_BUILTIN = 0; // 0x0 @@ -13901,6 +13875,7 @@ package android.graphics { package android.graphics.drawable { public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback { + ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable); method public void draw(android.graphics.Canvas); method public android.graphics.drawable.Drawable getBackground(); method public static float getExtraInsetFraction(); @@ -13914,6 +13889,7 @@ package android.graphics.drawable { method public void setColorFilter(android.graphics.ColorFilter); method public void setOpacity(int); method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable); + field public static final float MASK_SIZE = 100.0f; } public abstract interface Animatable { @@ -26678,6 +26654,7 @@ package android.net.wifi { method public void setTdlsEnabled(java.net.InetAddress, boolean); method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean); method public boolean setWifiEnabled(boolean); + method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler); method public boolean startScan(); method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback); method public int updateNetwork(android.net.wifi.WifiConfiguration); @@ -26728,6 +26705,22 @@ package android.net.wifi { field public static final int WPS_WEP_PROHIBITED = 4; // 0x4 } + public static class WifiManager.LocalOnlyHotspotCallback { + ctor public WifiManager.LocalOnlyHotspotCallback(); + method public void onFailed(int); + method public void onStarted(android.net.wifi.WifiManager.LocalOnlyHotspotReservation); + method public void onStopped(); + field public static final int ERROR_GENERIC = 2; // 0x2 + field public static final int ERROR_INCOMPATIBLE_MODE = 3; // 0x3 + field public static final int ERROR_NO_CHANNEL = 1; // 0x1 + field public static final int ERROR_TETHERING_DISALLOWED = 4; // 0x4 + } + + public class WifiManager.LocalOnlyHotspotReservation implements java.lang.AutoCloseable { + method public void close(); + method public android.net.wifi.WifiConfiguration getWifiConfiguration(); + } + public class WifiManager.MulticastLock { method public void acquire(); method public boolean isHeld(); @@ -26890,33 +26883,9 @@ package android.net.wifi.hotspot2 { ctor public PasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration); method public int describeContents(); method public android.net.wifi.hotspot2.pps.Credential getCredential(); - method public int getCredentialPriority(); method public android.net.wifi.hotspot2.pps.HomeSp getHomeSp(); - method public android.net.wifi.hotspot2.pps.Policy getPolicy(); - method public long getSubscriptionCreationTimeInMs(); - method public long getSubscriptionExpirationTimeInMs(); - method public java.lang.String getSubscriptionType(); - method public android.net.wifi.hotspot2.pps.UpdateParameter getSubscriptionUpdate(); - method public java.util.Map<java.lang.String, byte[]> getTrustRootCertList(); - method public int getUpdateIdentifier(); - method public long getUsageLimitDataLimit(); - method public long getUsageLimitStartTimeInMs(); - method public long getUsageLimitTimeLimitInMinutes(); - method public long getUsageLimitUsageTimePeriodInMinutes(); method public void setCredential(android.net.wifi.hotspot2.pps.Credential); - method public void setCredentialPriority(int); method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp); - method public void setPolicy(android.net.wifi.hotspot2.pps.Policy); - method public void setSubscriptionCreationTimeInMs(long); - method public void setSubscriptionExpirationTimeInMs(long); - method public void setSubscriptionType(java.lang.String); - method public void setSubscriptionUpdate(android.net.wifi.hotspot2.pps.UpdateParameter); - method public void setTrustRootCertList(java.util.Map<java.lang.String, byte[]>); - method public void setUpdateIdentifier(int); - method public void setUsageLimitDataLimit(long); - method public void setUsageLimitStartTimeInMs(long); - method public void setUsageLimitTimeLimitInMinutes(long); - method public void setUsageLimitUsageTimePeriodInMinutes(long); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR; } @@ -26939,21 +26908,15 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.security.cert.X509Certificate getCaCertificate(); method public android.net.wifi.hotspot2.pps.Credential.CertificateCredential getCertCredential(); - method public boolean getCheckAaaServerCertStatus(); method public java.security.cert.X509Certificate[] getClientCertificateChain(); method public java.security.PrivateKey getClientPrivateKey(); - method public long getCreationTimeInMs(); - method public long getExpirationTimeInMs(); method public java.lang.String getRealm(); method public android.net.wifi.hotspot2.pps.Credential.SimCredential getSimCredential(); method public android.net.wifi.hotspot2.pps.Credential.UserCredential getUserCredential(); method public void setCaCertificate(java.security.cert.X509Certificate); method public void setCertCredential(android.net.wifi.hotspot2.pps.Credential.CertificateCredential); - method public void setCheckAaaServerCertStatus(boolean); method public void setClientCertificateChain(java.security.cert.X509Certificate[]); method public void setClientPrivateKey(java.security.PrivateKey); - method public void setCreationTimeInMs(long); - method public void setExpirationTimeInMs(long); method public void setRealm(java.lang.String); method public void setSimCredential(android.net.wifi.hotspot2.pps.Credential.SimCredential); method public void setUserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential); @@ -26989,19 +26952,13 @@ package android.net.wifi.hotspot2.pps { ctor public Credential.UserCredential(); ctor public Credential.UserCredential(android.net.wifi.hotspot2.pps.Credential.UserCredential); method public int describeContents(); - method public boolean getAbleToShare(); method public int getEapType(); - method public boolean getMachineManaged(); method public java.lang.String getNonEapInnerMethod(); method public java.lang.String getPassword(); - method public java.lang.String getSoftTokenApp(); method public java.lang.String getUsername(); - method public void setAbleToShare(boolean); method public void setEapType(int); - method public void setMachineManaged(boolean); method public void setNonEapInnerMethod(java.lang.String); method public void setPassword(java.lang.String); - method public void setSoftTokenApp(java.lang.String); method public void setUsername(java.lang.String); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Credential.UserCredential> CREATOR; @@ -27013,96 +26970,14 @@ package android.net.wifi.hotspot2.pps { method public int describeContents(); method public java.lang.String getFqdn(); method public java.lang.String getFriendlyName(); - method public java.util.Map<java.lang.String, java.lang.Long> getHomeNetworkIds(); - method public java.lang.String getIconUrl(); - method public long[] getMatchAllOis(); - method public long[] getMatchAnyOis(); - method public java.lang.String[] getOtherHomePartners(); method public long[] getRoamingConsortiumOis(); method public void setFqdn(java.lang.String); method public void setFriendlyName(java.lang.String); - method public void setHomeNetworkIds(java.util.Map<java.lang.String, java.lang.Long>); - method public void setIconUrl(java.lang.String); - method public void setMatchAllOis(long[]); - method public void setMatchAnyOis(long[]); - method public void setOtherHomePartners(java.lang.String[]); method public void setRoamingConsortiumOis(long[]); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.HomeSp> CREATOR; } - public final class Policy implements android.os.Parcelable { - ctor public Policy(); - ctor public Policy(android.net.wifi.hotspot2.pps.Policy); - method public int describeContents(); - method public java.lang.String[] getExcludedSsidList(); - method public int getMaximumBssLoadValue(); - method public long getMinHomeDownlinkBandwidth(); - method public long getMinHomeUplinkBandwidth(); - method public long getMinRoamingDownlinkBandwidth(); - method public long getMinRoamingUplinkBandwidth(); - method public android.net.wifi.hotspot2.pps.UpdateParameter getPolicyUpdate(); - method public java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> getPreferredRoamingPartnerList(); - method public java.util.Map<java.lang.Integer, java.lang.String> getRequiredProtoPortMap(); - method public void setExcludedSsidList(java.lang.String[]); - method public void setMaximumBssLoadValue(int); - method public void setMinHomeDownlinkBandwidth(long); - method public void setMinHomeUplinkBandwidth(long); - method public void setMinRoamingDownlinkBandwidth(long); - method public void setMinRoamingUplinkBandwidth(long); - method public void setPolicyUpdate(android.net.wifi.hotspot2.pps.UpdateParameter); - method public void setPreferredRoamingPartnerList(java.util.List<android.net.wifi.hotspot2.pps.Policy.RoamingPartner>); - method public void setRequiredProtoPortMap(java.util.Map<java.lang.Integer, java.lang.String>); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy> CREATOR; - } - - public static final class Policy.RoamingPartner implements android.os.Parcelable { - ctor public Policy.RoamingPartner(); - ctor public Policy.RoamingPartner(android.net.wifi.hotspot2.pps.Policy.RoamingPartner); - method public int describeContents(); - method public java.lang.String getCountries(); - method public java.lang.String getFqdn(); - method public boolean getFqdnExactMatch(); - method public int getPriority(); - method public void setCountries(java.lang.String); - method public void setFqdn(java.lang.String); - method public void setFqdnExactMatch(boolean); - method public void setPriority(int); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.Policy.RoamingPartner> CREATOR; - } - - public final class UpdateParameter implements android.os.Parcelable { - ctor public UpdateParameter(); - ctor public UpdateParameter(android.net.wifi.hotspot2.pps.UpdateParameter); - method public int describeContents(); - method public java.lang.String getBase64EncodedPassword(); - method public java.lang.String getRestriction(); - method public java.lang.String getServerUri(); - method public byte[] getTrustRootCertSha256Fingerprint(); - method public java.lang.String getTrustRootCertUrl(); - method public long getUpdateIntervalInMinutes(); - method public java.lang.String getUpdateMethod(); - method public java.lang.String getUsername(); - method public void setBase64EncodedPassword(java.lang.String); - method public void setRestriction(java.lang.String); - method public void setServerUri(java.lang.String); - method public void setTrustRootCertSha256Fingerprint(byte[]); - method public void setTrustRootCertUrl(java.lang.String); - method public void setUpdateIntervalInMinutes(long); - method public void setUpdateMethod(java.lang.String); - method public void setUsername(java.lang.String); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.pps.UpdateParameter> CREATOR; - field public static final long UPDATE_CHECK_INTERVAL_NEVER = 4294967295L; // 0xffffffffL - field public static final java.lang.String UPDATE_METHOD_OMADM = "OMA-DM-ClientInitiated"; - field public static final java.lang.String UPDATE_METHOD_SSP = "SSP-ClientInitiated"; - field public static final java.lang.String UPDATE_RESTRICTION_HOMESP = "HomeSP"; - field public static final java.lang.String UPDATE_RESTRICTION_ROAMING_PARTNER = "RoamingPartner"; - field public static final java.lang.String UPDATE_RESTRICTION_UNRESTRICTED = "Unrestricted"; - } - } package android.net.wifi.p2p { @@ -31752,7 +31627,7 @@ package android.os { public class TestLooperManager { method public void execute(android.os.Message); - method public android.os.MessageQueue getQueue(); + method public android.os.MessageQueue getMessageQueue(); method public boolean hasMessages(android.os.Handler, java.lang.Object, int); method public boolean hasMessages(android.os.Handler, java.lang.Object, java.lang.Runnable); method public android.os.Message next(); @@ -37186,7 +37061,7 @@ package android.service.autofill { public final class FillRequest implements android.os.Parcelable { method public int describeContents(); method public android.os.Bundle getClientState(); - method public java.util.ArrayList<android.service.autofill.FillContext> getFillContexts(); + method public java.util.List<android.service.autofill.FillContext> getFillContexts(); method public int getFlags(); method public int getId(); method public void writeToParcel(android.os.Parcel, int); @@ -38211,7 +38086,6 @@ package android.speech.tts { method public void onRangeStart(java.lang.String, int, int, int); method public abstract void onStart(java.lang.String); method public void onStop(java.lang.String, boolean); - method public deprecated void onUtteranceRangeStart(java.lang.String, int, int); } public class Voice implements android.os.Parcelable { @@ -40309,8 +40183,11 @@ package android.telephony { method public static int getDefaultVoiceSubscriptionId(); method public boolean isNetworkRoaming(int); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); + field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED"; + field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED"; field public static final int DATA_ROAMING_DISABLE = 0; // 0x0 field public static final int DATA_ROAMING_ENABLE = 1; // 0x1 + field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff } @@ -48195,7 +48072,7 @@ package android.view.autofill { method public void unregisterCallback(android.view.autofill.AutofillManager.AutofillCallback); field public static final java.lang.String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE"; field public static final java.lang.String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT"; - field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.EXTRA_CLIENT_STATE"; + field public static final java.lang.String EXTRA_CLIENT_STATE = "android.view.autofill.extra.CLIENT_STATE"; } public static abstract class AutofillManager.AutofillCallback { diff --git a/api/test-removed.txt b/api/test-removed.txt index 779ff7cce923..187349916286 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -1,9 +1,59 @@ package android.app { + public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback { + method public deprecated boolean enterPictureInPictureMode(android.app.PictureInPictureArgs); + method public deprecated void setPictureInPictureArgs(android.app.PictureInPictureArgs); + } + + public class ActivityManager { + method public static deprecated int getMaxNumPictureInPictureActions(); + } + + public class KeyguardManager { + method public deprecated void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler); + } + public class Notification implements android.os.Parcelable { + method public deprecated java.lang.String getChannel(); + method public deprecated long getTimeout(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); } + public static class Notification.Builder { + method public deprecated android.app.Notification.Builder setChannel(java.lang.String); + method public deprecated android.app.Notification.Builder setTimeout(long); + } + + public static final class Notification.TvExtender implements android.app.Notification.Extender { + method public deprecated java.lang.String getChannel(); + } + + public final deprecated class PictureInPictureArgs implements android.os.Parcelable { + method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams); + method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs); + method public void copyOnlySet(android.app.PictureInPictureArgs); + method public java.util.List<android.app.RemoteAction> getActions(); + method public float getAspectRatio(); + method public android.util.Rational getAspectRatioRational(); + method public android.graphics.Rect getSourceRectHint(); + method public android.graphics.Rect getSourceRectHintInsets(); + method public boolean hasSetActions(); + method public boolean hasSetAspectRatio(); + method public boolean hasSourceBoundsHint(); + method public boolean hasSourceBoundsHintInsets(); + method public deprecated void setSourceRectHintInsets(android.graphics.Rect); + method public void truncateActions(int); + field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR; + } + + public static class PictureInPictureArgs.Builder { + ctor public PictureInPictureArgs.Builder(); + method public android.app.PictureInPictureArgs build(); + method public android.app.PictureInPictureArgs.Builder setActions(java.util.List<android.app.RemoteAction>); + method public android.app.PictureInPictureArgs.Builder setAspectRatio(android.util.Rational); + method public android.app.PictureInPictureArgs.Builder setSourceRectHint(android.graphics.Rect); + } + public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable { method public deprecated void showAsNotification(android.content.Context); } @@ -76,6 +126,10 @@ package android.content.pm { method public abstract boolean setInstantAppCookie(byte[]); } + public class ResolveInfo implements android.os.Parcelable { + field public deprecated boolean instantAppAvailable; + } + public final class SharedLibraryInfo implements android.os.Parcelable { method public boolean isBuiltin(); method public boolean isDynamic(); @@ -188,6 +242,26 @@ package android.net { method public deprecated int stopUsingNetworkFeature(int, java.lang.String); } + public deprecated class NetworkBadging { + method public static android.graphics.drawable.Drawable getWifiIcon(int, int, android.content.res.Resources.Theme); + field public static final int BADGING_4K = 30; // 0x1e + field public static final int BADGING_HD = 20; // 0x14 + field public static final int BADGING_NONE = 0; // 0x0 + field public static final int BADGING_SD = 10; // 0xa + } + + public abstract class NetworkRecommendationProvider { + ctor public deprecated NetworkRecommendationProvider(android.os.Handler); + method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback); + field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT"; + field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE"; + } + + public static deprecated class NetworkRecommendationProvider.ResultCallback { + ctor public NetworkRecommendationProvider.ResultCallback(android.os.IRemoteCallback, int); + method public void onResult(android.net.RecommendationResult); + } + public abstract class PskKeyManager { ctor public PskKeyManager(); field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80 @@ -195,6 +269,37 @@ package android.net { field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100 } + public final deprecated class RecommendationRequest implements android.os.Parcelable { + ctor protected RecommendationRequest(android.os.Parcel); + method public android.net.wifi.WifiConfiguration[] getConnectableConfigs(); + method public android.net.wifi.WifiConfiguration getConnectedConfig(); + method public android.net.wifi.WifiConfiguration getDefaultWifiConfig(); + method public int getLastSelectedNetworkId(); + method public long getLastSelectedNetworkTimestamp(); + method public android.net.wifi.ScanResult[] getScanResults(); + method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]); + method public void setConnectedConfig(android.net.wifi.WifiConfiguration); + field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR; + } + + public static final deprecated class RecommendationRequest.Builder { + ctor public RecommendationRequest.Builder(); + method public android.net.RecommendationRequest build(); + method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]); + method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration); + method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long); + method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]); + } + + public final deprecated class RecommendationResult implements android.os.Parcelable { + method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration); + method public static android.net.RecommendationResult createDoNotConnectRecommendation(); + method public android.net.wifi.WifiConfiguration getWifiConfiguration(); + method public boolean hasRecommendation(); + field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR; + } + public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); } @@ -221,6 +326,10 @@ package android.os { ctor public RecoverySystem(); } + public class TestLooperManager { + method public deprecated android.os.MessageQueue getQueue(); + } + public class UserManager { method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int); method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle); @@ -382,6 +491,14 @@ package android.provider { } +package android.speech.tts { + + public abstract class UtteranceProgressListener { + method public deprecated void onUtteranceRangeStart(java.lang.String, int, int); + } + +} + package android.test.mock { public deprecated class MockPackageManager extends android.content.pm.PackageManager { diff --git a/core/java/android/accessibilityservice/AccessibilityButtonController.java b/core/java/android/accessibilityservice/AccessibilityButtonController.java index ee1976889299..a70085cbde4f 100644 --- a/core/java/android/accessibilityservice/AccessibilityButtonController.java +++ b/core/java/android/accessibilityservice/AccessibilityButtonController.java @@ -19,6 +19,7 @@ package android.accessibilityservice; import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Handler; +import android.os.Looper; import android.os.RemoteException; import android.util.ArrayMap; import android.util.Slog; @@ -91,7 +92,7 @@ public final class AccessibilityButtonController { * @param callback the callback to add, must be non-null */ public void registerAccessibilityButtonCallback(@NonNull AccessibilityButtonCallback callback) { - registerAccessibilityButtonCallback(callback, new Handler()); + registerAccessibilityButtonCallback(callback, new Handler(Looper.getMainLooper())); } /** diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 70a6ce615731..06a9b0676d08 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -670,9 +670,10 @@ public class AccessibilityServiceInfo implements Parcelable { * <strong>Statically set from * {@link AccessibilityService#SERVICE_META_DATA meta-data}.</strong> * </p> - * @return The localized summary. + * @return The localized summary if available, and {@code null} if a summary + * has not been provided. */ - public String loadSummary(PackageManager packageManager) { + public CharSequence loadSummary(PackageManager packageManager) { if (mSummaryResId == 0) { return mNonLocalizedSummary; } diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index ab4f33d6b6e6..4f6c0c9d8f91 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2050,20 +2050,10 @@ public class Activity extends ContextThemeWrapper enterPictureInPictureMode(new PictureInPictureParams.Builder().build()); } - /** - * TO BE REMOVED - */ + /** @removed */ @Deprecated public boolean enterPictureInPictureMode(@NonNull PictureInPictureArgs args) { - try { - if (args == null) { - throw new IllegalArgumentException("Expected non-null picture-in-picture args"); - } - updatePictureInPictureParamsForContentInsets(args); - return ActivityManagerNative.getDefault().enterPictureInPictureMode(mToken, args); - } catch (RemoteException e) { - return false; - } + return enterPictureInPictureMode(PictureInPictureArgs.convert(args)); } /** @@ -2095,11 +2085,10 @@ public class Activity extends ContextThemeWrapper } } - /** - * TO BE REMOVED - */ + /** @removed */ + @Deprecated public void setPictureInPictureArgs(@NonNull PictureInPictureArgs args) { - setPictureInPictureParams(args); + setPictureInPictureParams(PictureInPictureArgs.convert(args)); } /** diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 66d221aefc14..4c3e1b077091 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1143,13 +1143,7 @@ public class ActivityManager { com.android.internal.R.bool.config_supportsSplitScreenMultiWindow); } - /** - * Return the number of actions that will be displayed in the picture-in-picture UI when the - * user interacts with the activity currently in picture-in-picture mode. This number may change - * if the global configuration changes (ie. if the device is plugged into an external display). - * - * TO BE REMOVED - */ + /** @removed */ @Deprecated public static int getMaxNumPictureInPictureActions() { return 3; diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index e50c307df854..f6aea96bf7e2 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -78,6 +78,10 @@ import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.provider.Settings; +import android.system.ErrnoException; +import android.system.Os; +import android.system.OsConstants; +import android.system.StructStat; import android.util.ArrayMap; import android.util.IconDrawableFactory; import android.util.LauncherIcons; @@ -2662,4 +2666,78 @@ public class ApplicationPackageManager extends PackageManager { throw e.rethrowAsRuntimeException(); } } + + private static class DexModuleRegisterResult { + final String dexModulePath; + final boolean success; + final String message; + + private DexModuleRegisterResult(String dexModulePath, boolean success, String message) { + this.dexModulePath = dexModulePath; + this.success = success; + this.message = message; + } + } + + private static class DexModuleRegisterCallbackDelegate + extends android.content.pm.IDexModuleRegisterCallback.Stub + implements Handler.Callback { + private static final int MSG_DEX_MODULE_REGISTERED = 1; + private final DexModuleRegisterCallback callback; + private final Handler mHandler; + + DexModuleRegisterCallbackDelegate(@NonNull DexModuleRegisterCallback callback) { + this.callback = callback; + mHandler = new Handler(Looper.getMainLooper(), this); + } + + @Override + public void onDexModuleRegistered(@NonNull String dexModulePath, boolean success, + @Nullable String message)throws RemoteException { + mHandler.obtainMessage(MSG_DEX_MODULE_REGISTERED, + new DexModuleRegisterResult(dexModulePath, success, message)).sendToTarget(); + } + + @Override + public boolean handleMessage(Message msg) { + if (msg.what != MSG_DEX_MODULE_REGISTERED) { + return false; + } + DexModuleRegisterResult result = (DexModuleRegisterResult)msg.obj; + callback.onDexModuleRegistered(result.dexModulePath, result.success, result.message); + return true; + } + } + + @Override + public void registerDexModule(@NonNull String dexModule, + @Nullable DexModuleRegisterCallback callback) { + // Check if this is a shared module by looking if the others can read it. + boolean isSharedModule = false; + try { + StructStat stat = Os.stat(dexModule); + if ((OsConstants.S_IROTH & stat.st_mode) != 0) { + isSharedModule = true; + } + } catch (ErrnoException e) { + callback.onDexModuleRegistered(dexModule, false, + "Could not get stat the module file: " + e.getMessage()); + return; + } + + // Module path is ok. + // Create the callback delegate to be passed to package manager service. + DexModuleRegisterCallbackDelegate callbackDelegate = null; + if (callback != null) { + callbackDelegate = new DexModuleRegisterCallbackDelegate(callback); + } + + // Invoke the package manager service. + try { + mPM.registerDexModule(mContext.getPackageName(), dexModule, + isSharedModule, callbackDelegate); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } } diff --git a/core/java/android/app/FragmentContainer.java b/core/java/android/app/FragmentContainer.java index 77c9c312ce24..f8836bc829a0 100644 --- a/core/java/android/app/FragmentContainer.java +++ b/core/java/android/app/FragmentContainer.java @@ -42,6 +42,8 @@ public abstract class FragmentContainer { * Creates an instance of the specified fragment, can be overridden to construct fragments * with dependencies, or change the fragment being constructed. By default just calls * {@link Fragment#instantiate(Context, String, Bundle)}. + * + * @hide */ public Fragment instantiate(Context context, String className, Bundle arguments) { return Fragment.instantiate(context, className, arguments); diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index 4de6e44b0400..fcf0aab0c821 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -362,28 +362,7 @@ public class KeyguardManager { } } - /** - * If the device is currently locked (see {@link #isKeyguardLocked()}, requests the Keyguard to - * be dismissed. - * <p> - * If the Keyguard is not secure or the device is currently in a trusted state, calling this - * method will immediately dismiss the Keyguard without any user interaction. - * <p> - * If the Keyguard is secure and the device is not in a trusted state, this will bring up the - * UI so the user can enter their credentials. - * - * @param activity The activity requesting the dismissal. The activity must be either visible - * by using {@link LayoutParams#FLAG_SHOW_WHEN_LOCKED} or must be in a state in - * which it would be visible if Keyguard would not be hiding it. If that's not - * the case, the request will fail immediately and - * {@link KeyguardDismissCallback#onDismissError} will be invoked. - * @param callback The callback to be called if the request to dismiss Keyguard was successful - * or {@code null} if the caller isn't interested in knowing the result. - * @param handler The handler to invoke the callback on, or {@code null} to use the main - * handler. - * - * TO BE REMOVED - */ + /** @removed */ @Deprecated public void dismissKeyguard(@NonNull Activity activity, @Nullable KeyguardDismissCallback callback, @Nullable Handler handler) { diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 28fe3195839d..c8b8c6c1b262 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -2494,9 +2494,8 @@ public class Notification implements Parcelable } } - /** - * Returns the id of the channel this notification posts to. - */ + /** @removed */ + @Deprecated public String getChannel() { return mChannelId; } @@ -2508,10 +2507,8 @@ public class Notification implements Parcelable return mChannelId; } - /** - * Returns the time at which this notification should be canceled by the system, if it's not - * canceled already. - */ + /** @removed */ + @Deprecated public long getTimeout() { return mTimeout; } @@ -2811,9 +2808,8 @@ public class Notification implements Parcelable return this; } - /** - * Specifies the channel the notification should be delivered on. - */ + /** @removed */ + @Deprecated public Builder setChannel(String channelId) { mN.mChannelId = channelId; return this; @@ -2827,10 +2823,8 @@ public class Notification implements Parcelable return this; } - /** - * Specifies a duration in milliseconds after which this notification should be canceled, - * if it is not already canceled. - */ + /** @removed */ + @Deprecated public Builder setTimeout(long durationMs) { mN.mTimeout = durationMs; return this; @@ -8040,9 +8034,8 @@ public class Notification implements Parcelable return this; } - /** - * Returns the id of the channel this notification posts to on TV. - */ + /** @removed */ + @Deprecated public String getChannel() { return mChannelId; } diff --git a/core/java/android/app/PictureInPictureArgs.java b/core/java/android/app/PictureInPictureArgs.java index 63db86aac9a8..88e6b9981486 100644 --- a/core/java/android/app/PictureInPictureArgs.java +++ b/core/java/android/app/PictureInPictureArgs.java @@ -16,91 +16,314 @@ package android.app; +import android.annotation.Nullable; import android.graphics.Rect; +import android.os.Parcel; +import android.os.Parcelable; import android.util.Rational; import java.util.ArrayList; import java.util.List; -/** - * TO BE REMOVED - */ +/** @removed */ @Deprecated -public final class PictureInPictureArgs extends PictureInPictureParams { +public final class PictureInPictureArgs implements Parcelable { /** - * Creates a new set of picture-in-picture arguments. - * - * TODO: Remove once we remove PictureInPictureArgs. + * Builder class for {@link PictureInPictureArgs} objects. */ - @Deprecated - public PictureInPictureArgs() { - // Empty constructor + public static class Builder { + + @Nullable + private Rational mAspectRatio; + + @Nullable + private List<RemoteAction> mUserActions; + + @Nullable + private Rect mSourceRectHint; + + /** + * Sets the aspect ratio. This aspect ratio is defined as the desired width / height, and + * does not change upon device rotation. + * + * @param aspectRatio the new aspect ratio for the activity in picture-in-picture, must be + * between 2.39:1 and 1:2.39 (inclusive). + * + * @return this builder instance. + */ + public Builder setAspectRatio(Rational aspectRatio) { + mAspectRatio = aspectRatio; + return this; + } + + /** + * Sets the user actions. If there are more than + * {@link Activity#getMaxNumPictureInPictureActions()} actions, then the input list + * will be truncated to that number. + * + * @param actions the new actions to show in the picture-in-picture menu. + * + * @return this builder instance. + * + * @see RemoteAction + */ + public Builder setActions(List<RemoteAction> actions) { + if (mUserActions != null) { + mUserActions = null; + } + if (actions != null) { + mUserActions = new ArrayList<>(actions); + } + return this; + } + + /** + * Sets the source bounds hint. These bounds are only used when an activity first enters + * picture-in-picture, and describe the bounds in window coordinates of activity entering + * picture-in-picture that will be visible following the transition. For the best effect, + * these bounds should also match the aspect ratio in the arguments. + * + * @param launchBounds window-coordinate bounds indicating the area of the activity that + * will still be visible following the transition into picture-in-picture (eg. the video + * view bounds in a video player) + * + * @return this builder instance. + */ + public Builder setSourceRectHint(Rect launchBounds) { + if (launchBounds == null) { + mSourceRectHint = null; + } else { + mSourceRectHint = new Rect(launchBounds); + } + return this; + } + + public PictureInPictureArgs build() { + PictureInPictureArgs args = new PictureInPictureArgs(mAspectRatio, mUserActions, + mSourceRectHint); + return args; + } } /** - * Creates a new set of picture-in-picture arguments from the given {@param aspectRatio} and - * {@param actions}. - * - * TODO: Remove once we remove PictureInPictureArgs. + * The expected aspect ratio of the picture-in-picture. */ - @Deprecated - public PictureInPictureArgs(float aspectRatio, List<RemoteAction> actions) { - setAspectRatio(aspectRatio); - if (actions != null) { - setActions(actions); + @Nullable + private Rational mAspectRatio; + + /** + * The set of actions that are associated with this activity when in picture-in-picture. + */ + @Nullable + private List<RemoteAction> mUserActions; + + /** + * The source bounds hint used when entering picture-in-picture, relative to the window bounds. + * We can use this internally for the transition into picture-in-picture to ensure that a + * particular source rect is visible throughout the whole transition. + */ + @Nullable + private Rect mSourceRectHint; + + /** + * The content insets that are used with the source hint rect for the transition into PiP where + * the insets are removed at the beginning of the transition. + */ + @Nullable + private Rect mSourceRectHintInsets; + + private PictureInPictureArgs() { + } + + private PictureInPictureArgs(Parcel in) { + if (in.readInt() != 0) { + mAspectRatio = new Rational(in.readInt(), in.readInt()); + } + if (in.readInt() != 0) { + mUserActions = new ArrayList<>(); + in.readParcelableList(mUserActions, RemoteAction.class.getClassLoader()); + } + if (in.readInt() != 0) { + mSourceRectHint = Rect.CREATOR.createFromParcel(in); + } + if (in.readInt() != 0) { + mSourceRectHintInsets = Rect.CREATOR.createFromParcel(in); } } + private PictureInPictureArgs(Rational aspectRatio, List<RemoteAction> actions, + Rect sourceRectHint) { + mAspectRatio = aspectRatio; + mUserActions = actions; + mSourceRectHint = sourceRectHint; + } + /** - * Sets the aspect ratio. - * - * @param aspectRatio the new aspect ratio for picture-in-picture, must be within 2.39:1 and - * 1:2.39. - * - * TODO: Remove once we remove PictureInPictureArgs. + * Copies the set parameters from the other picture-in-picture args. + * @hide */ - @Deprecated - public void setAspectRatio(float aspectRatio) { - // Temporary workaround - mAspectRatio = new Rational((int) (aspectRatio * 1000000000), 1000000000); + public void copyOnlySet(PictureInPictureArgs otherArgs) { + if (otherArgs.hasSetAspectRatio()) { + mAspectRatio = otherArgs.mAspectRatio; + } + if (otherArgs.hasSetActions()) { + mUserActions = otherArgs.mUserActions; + } + if (otherArgs.hasSourceBoundsHint()) { + mSourceRectHint = new Rect(otherArgs.getSourceRectHint()); + } + if (otherArgs.hasSourceBoundsHintInsets()) { + mSourceRectHintInsets = new Rect(otherArgs.getSourceRectHintInsets()); + } } /** - * Sets the user actions. If there are more than - * {@link ActivityManager#getMaxNumPictureInPictureActions()} actions, then the input will be - * truncated to that number. - * - * @param actions the new actions to show in the picture-in-picture menu. - * - * @see RemoteAction - * - * TODO: Remove once we remove PictureInPictureArgs. + * @return the aspect ratio. If none is set, return 0. + * @hide */ - @Deprecated - public void setActions(List<RemoteAction> actions) { - if (mUserActions != null) { - mUserActions = null; + public float getAspectRatio() { + if (mAspectRatio != null) { + return mAspectRatio.floatValue(); } - if (actions != null) { - mUserActions = new ArrayList<>(actions); + return 0f; + } + + /** {@hide} */ + public Rational getAspectRatioRational() { + return mAspectRatio; + } + + /** + * @return whether the aspect ratio is set. + * @hide + */ + public boolean hasSetAspectRatio() { + return mAspectRatio != null; + } + + /** + * @return the set of user actions. + * @hide + */ + public List<RemoteAction> getActions() { + return mUserActions; + } + + /** + * @return whether the user actions are set. + * @hide + */ + public boolean hasSetActions() { + return mUserActions != null; + } + + /** + * Truncates the set of actions to the given {@param size}. + * @hide + */ + public void truncateActions(int size) { + if (hasSetActions()) { + mUserActions = mUserActions.subList(0, Math.min(mUserActions.size(), size)); } } /** - * Sets the source bounds hint. These bounds are only used when an activity first enters - * picture-in-picture, and describe the bounds in window coordinates of activity entering - * picture-in-picture that will be visible following the transition. For the best effect, these - * bounds should also match the aspect ratio in the arguments. - * - * TODO: Remove once we remove PictureInPictureArgs. + * Sets the insets to be used with the source rect hint bounds. + * @hide */ @Deprecated - public void setSourceRectHint(Rect launchBounds) { - if (launchBounds == null) { - mSourceRectHint = null; + public void setSourceRectHintInsets(Rect insets) { + if (insets == null) { + mSourceRectHintInsets = null; } else { - mSourceRectHint = new Rect(launchBounds); + mSourceRectHintInsets = new Rect(insets); } } -}
\ No newline at end of file + + /** + * @return the source rect hint + * @hide + */ + public Rect getSourceRectHint() { + return mSourceRectHint; + } + + /** + * @return the source rect hint insets. + * @hide + */ + public Rect getSourceRectHintInsets() { + return mSourceRectHintInsets; + } + + /** + * @return whether there are launch bounds set + * @hide + */ + public boolean hasSourceBoundsHint() { + return mSourceRectHint != null && !mSourceRectHint.isEmpty(); + } + + /** + * @return whether there are source rect hint insets set + * @hide + */ + public boolean hasSourceBoundsHintInsets() { + return mSourceRectHintInsets != null; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel out, int flags) { + if (mAspectRatio != null) { + out.writeInt(1); + out.writeInt(mAspectRatio.getNumerator()); + out.writeInt(mAspectRatio.getDenominator()); + } else { + out.writeInt(0); + } + if (mUserActions != null) { + out.writeInt(1); + out.writeParcelableList(mUserActions, 0); + } else { + out.writeInt(0); + } + if (mSourceRectHint != null) { + out.writeInt(1); + mSourceRectHint.writeToParcel(out, 0); + } else { + out.writeInt(0); + } + if (mSourceRectHintInsets != null) { + out.writeInt(1); + mSourceRectHintInsets.writeToParcel(out, 0); + } else { + out.writeInt(0); + } + } + + public static final Creator<PictureInPictureArgs> CREATOR = + new Creator<PictureInPictureArgs>() { + public PictureInPictureArgs createFromParcel(Parcel in) { + return new PictureInPictureArgs(in); + } + public PictureInPictureArgs[] newArray(int size) { + return new PictureInPictureArgs[size]; + } + }; + + public static PictureInPictureArgs convert(PictureInPictureParams params) { + return new PictureInPictureArgs(params.getAspectRatioRational(), params.getActions(), + params.getSourceRectHint()); + } + + public static PictureInPictureParams convert(PictureInPictureArgs args) { + return new PictureInPictureParams(args.getAspectRatioRational(), args.getActions(), + args.getSourceRectHint()); + } +} diff --git a/core/java/android/app/PictureInPictureParams.java b/core/java/android/app/PictureInPictureParams.java index e1df33b55281..323a0fbaa5b1 100644 --- a/core/java/android/app/PictureInPictureParams.java +++ b/core/java/android/app/PictureInPictureParams.java @@ -28,10 +28,8 @@ import java.util.List; /** * Represents a set of parameters used to initialize and update an Activity in picture-in-picture * mode. - * - * TODO: Make this final after we remove PictureInPictureArgs */ -public class PictureInPictureParams implements Parcelable { +public final class PictureInPictureParams implements Parcelable { /** * Builder class for {@link PictureInPictureParams} objects. @@ -63,7 +61,7 @@ public class PictureInPictureParams implements Parcelable { /** * Sets the user actions. If there are more than - * {@link ActivityManager#getMaxNumPictureInPictureActions()} actions, then the input list + * {@link Activity#getMaxNumPictureInPictureActions()} actions, then the input list * will be truncated to that number. * * @param actions the new actions to show in the picture-in-picture menu. @@ -120,25 +118,22 @@ public class PictureInPictureParams implements Parcelable { /** * The expected aspect ratio of the picture-in-picture. */ - // TODO: Make private once we removed PictureInPictureArgs @Nullable - protected Rational mAspectRatio; + private Rational mAspectRatio; /** * The set of actions that are associated with this activity when in picture-in-picture. */ - // TODO: Make private once we removed PictureInPictureArgs @Nullable - protected List<RemoteAction> mUserActions; + private List<RemoteAction> mUserActions; /** * The source bounds hint used when entering picture-in-picture, relative to the window bounds. * We can use this internally for the transition into picture-in-picture to ensure that a * particular source rect is visible throughout the whole transition. */ - // TODO: Make private once we removed PictureInPictureArgs @Nullable - protected Rect mSourceRectHint; + private Rect mSourceRectHint; /** * The content insets that are used with the source hint rect for the transition into PiP where @@ -147,15 +142,12 @@ public class PictureInPictureParams implements Parcelable { @Nullable private Rect mSourceRectHintInsets; - /** - * TO BE REMOVED - */ - @Deprecated + /** {@hide} */ PictureInPictureParams() { - // TODO: Remove once we remove PictureInPictureArgs } - private PictureInPictureParams(Parcel in) { + /** {@hide} */ + PictureInPictureParams(Parcel in) { if (in.readInt() != 0) { mAspectRatio = new Rational(in.readInt(), in.readInt()); } @@ -171,7 +163,8 @@ public class PictureInPictureParams implements Parcelable { } } - private PictureInPictureParams(Rational aspectRatio, List<RemoteAction> actions, + /** {@hide} */ + PictureInPictureParams(Rational aspectRatio, List<RemoteAction> actions, Rect sourceRectHint) { mAspectRatio = aspectRatio; mUserActions = actions; @@ -208,6 +201,11 @@ public class PictureInPictureParams implements Parcelable { return 0f; } + /** @hide */ + public Rational getAspectRatioRational() { + return mAspectRatio; + } + /** * @return whether the aspect ratio is set. * @hide diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 5f93313acab4..852e5f708ec3 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1710,19 +1710,6 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE"; /** - * Activity Action: Launch application uninstaller. - * <p> - * Input: The data must be a package: URI whose scheme specific part is - * the package name of the current installed package to be uninstalled. - * You can optionally supply {@link #EXTRA_RETURN_RESULT}. - * <p> - * Output: Nothing. - * </p> - */ - @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_CLEAR_PACKAGE = "android.intent.action.CLEAR_PACKAGE"; - - /** * Specify whether the package should be uninstalled for all users. * @hide because these should not be part of normal application flow. */ @@ -3398,32 +3385,6 @@ public class Intent implements Parcelable, Cloneable { ACTION_DYNAMIC_SENSOR_CHANGED = "android.intent.action.DYNAMIC_SENSOR_CHANGED"; /** - * Broadcast Action: The default subscription has changed. This has the following - * extra values:</p> - * The {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default subscription index - */ - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED - = "android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED"; - - /** - * Broadcast Action: The default sms subscription has changed. This has the following - * extra values:</p> - * {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default sms - * subscription index - */ - @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) - public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED - = "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED"; - - /** - * Integer extra used with {@link #ACTION_DEFAULT_SUBSCRIPTION_CHANGED} and - * {@link #ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED} to indicate the subscription - * which has changed. - */ - public static final String EXTRA_SUBSCRIPTION_INDEX = "android.intent.extra.SUBSCRIPTION_INDEX"; - - /** * Deprecated - use ACTION_FACTORY_RESET instead. * @hide */ diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 0be0885c5bdc..cf7f017daf60 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -883,9 +883,12 @@ public class ActivityInfo extends ComponentInfo /** * Screen rotation animation desired by the activity, with values as defined * for {@link android.view.WindowManager.LayoutParams#rotationAnimation}. + * + * -1 means to use the system default. + * * @hide */ - public int rotationAnimation = ROTATION_ANIMATION_ROTATE; + public int rotationAnimation = -1; /** @hide */ public static final int LOCK_TASK_LAUNCH_MODE_DEFAULT = 0; diff --git a/core/java/android/content/pm/IDexModuleRegisterCallback.aidl b/core/java/android/content/pm/IDexModuleRegisterCallback.aidl new file mode 100644 index 000000000000..4af6999c09ba --- /dev/null +++ b/core/java/android/content/pm/IDexModuleRegisterCallback.aidl @@ -0,0 +1,28 @@ +/* +** Copyright 2017, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + +package android.content.pm; + +import android.os.Bundle; + +/** + * Callback for registering a dex module with the Package Manager. + * + * @hide + */ +oneway interface IDexModuleRegisterCallback { + void onDexModuleRegistered(in String dexModulePath, in boolean success, in String message); +} diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index c7dd1fad4edc..77891fa84f78 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -25,6 +25,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.ChangedPackages; import android.content.pm.InstantAppInfo; import android.content.pm.FeatureInfo; +import android.content.pm.IDexModuleRegisterCallback; import android.content.pm.IPackageInstallObserver2; import android.content.pm.IPackageInstaller; import android.content.pm.IPackageDeleteObserver; @@ -474,6 +475,38 @@ interface IPackageManager { void notifyDexLoad(String loadingPackageName, in List<String> dexPaths, String loaderIsa); /** + * Register an application dex module with the package manager. + * The package manager will keep track of the given module for future optimizations. + * + * Dex module optimizations will disable the classpath checking at runtime. The client bares + * the responsibility to ensure that the static assumptions on classes in the optimized code + * hold at runtime (e.g. there's no duplicate classes in the classpath). + * + * Note that the package manager already keeps track of dex modules loaded with + * {@link dalvik.system.DexClassLoader} and {@link dalvik.system.PathClassLoader}. + * This can be called for an eager registration. + * + * The call might take a while and the results will be posted on the main thread, using + * the given callback. + * + * If the module is intended to be shared with other apps, make sure that the file + * permissions allow for it. + * If at registration time the permissions allow for others to read it, the module would + * be marked as a shared module which might undergo a different optimization strategy. + * (usually shared modules will generated larger optimizations artifacts, + * taking more disk space). + * + * @param packageName the package name to which the dex module belongs + * @param dexModulePath the absolute path of the dex module. + * @param isSharedModule whether or not the module is intended to be used by other apps. + * @param callback if not null, + * {@link android.content.pm.IDexModuleRegisterCallback.IDexModuleRegisterCallback#onDexModuleRegistered} + * will be called once the registration finishes. + */ + void registerDexModule(in String packageName, in String dexModulePath, + in boolean isSharedModule, IDexModuleRegisterCallback callback); + + /** * Ask the package manager to perform a dex-opt for the given reason. The package * manager will map the reason to a compiler filter according to the current system * configuration. diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 10b7965c58ea..07125e035edc 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -5725,4 +5725,48 @@ public abstract class PackageManager { * @hide */ public abstract String getInstantAppAndroidId(String packageName, @NonNull UserHandle user); + + /** + * Callback use to notify the callers of module registration that the operation + * has finished. + * + * @hide + */ + @SystemApi + public static abstract class DexModuleRegisterCallback { + public abstract void onDexModuleRegistered(String dexModulePath, boolean success, + String message); + } + + /** + * Register an application dex module with the package manager. + * The package manager will keep track of the given module for future optimizations. + * + * Dex module optimizations will disable the classpath checking at runtime. The client bares + * the responsibility to ensure that the static assumptions on classes in the optimized code + * hold at runtime (e.g. there's no duplicate classes in the classpath). + * + * Note that the package manager already keeps track of dex modules loaded with + * {@link dalvik.system.DexClassLoader} and {@link dalvik.system.PathClassLoader}. + * This can be called for an eager registration. + * + * The call might take a while and the results will be posted on the main thread, using + * the given callback. + * + * If the module is intended to be shared with other apps, make sure that the file + * permissions allow for it. + * If at registration time the permissions allow for others to read it, the module would + * be marked as a shared module which might undergo a different optimization strategy. + * (usually shared modules will generated larger optimizations artifacts, + * taking more disk space). + * + * @param dexModulePath the absolute path of the dex module. + * @param callback if not null, {@link DexModuleRegisterCallback#onDexModuleRegistered} will + * be called once the registration finishes. + * + * @hide + */ + @SystemApi + public abstract void registerDexModule(String dexModulePath, + @Nullable DexModuleRegisterCallback callback); } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 101317784c17..9b0bab427478 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -201,10 +201,10 @@ public class PackageParser { private static final String META_DATA_INSTANT_APPS = "instantapps.clients.allowed"; /** - * Bit mask of all the valid bits that can be set in restartOnConfigChanges. + * Bit mask of all the valid bits that can be set in recreateOnConfigChanges. * @hide */ - private static final int RESTART_ON_CONFIG_CHANGES_MASK = + private static final int RECREATE_ON_CONFIG_CHANGES_MASK = ActivityInfo.CONFIG_MCC | ActivityInfo.CONFIG_MNC; // These are the tags supported by child packages @@ -4219,7 +4219,7 @@ public class PackageParser { ActivityManager.getDefaultAppRecentsLimitStatic()); a.info.configChanges = getActivityConfigChanges( sa.getInt(R.styleable.AndroidManifestActivity_configChanges, 0), - sa.getInt(R.styleable.AndroidManifestActivity_restartOnConfigChanges, 0)); + sa.getInt(R.styleable.AndroidManifestActivity_recreateOnConfigChanges, 0)); a.info.softInputMode = sa.getInt( R.styleable.AndroidManifestActivity_windowSoftInputMode, 0); @@ -4523,13 +4523,13 @@ public class PackageParser { /** * @param configChanges The bit mask of configChanges fetched from AndroidManifest.xml. - * @param restartOnConfigChanges The bit mask restartOnConfigChanges fetched from - * AndroidManifest.xml. + * @param recreateOnConfigChanges The bit mask recreateOnConfigChanges fetched from + * AndroidManifest.xml. * @hide Exposed for unit testing only. */ @TestApi - public static int getActivityConfigChanges(int configChanges, int restartOnConfigChanges) { - return configChanges | ((~restartOnConfigChanges) & RESTART_ON_CONFIG_CHANGES_MASK); + public static int getActivityConfigChanges(int configChanges, int recreateOnConfigChanges) { + return configChanges | ((~recreateOnConfigChanges) & RECREATE_ON_CONFIG_CHANGES_MASK); } private void parseLayout(Resources res, AttributeSet attrs, Activity a) { diff --git a/core/java/android/content/pm/ResolveInfo.java b/core/java/android/content/pm/ResolveInfo.java index 650b4c008dcc..f312204e9467 100644 --- a/core/java/android/content/pm/ResolveInfo.java +++ b/core/java/android/content/pm/ResolveInfo.java @@ -71,6 +71,10 @@ public class ResolveInfo implements Parcelable { /** * Whether or not an instant app is available for the resolved intent. */ + public boolean isInstantAppAvailable; + + /** @removed */ + @Deprecated public boolean instantAppAvailable; /** @@ -330,7 +334,8 @@ public class ResolveInfo implements Parcelable { system = orig.system; targetUserId = orig.targetUserId; handleAllWebDataURI = orig.handleAllWebDataURI; - instantAppAvailable = orig.instantAppAvailable; + isInstantAppAvailable = orig.isInstantAppAvailable; + instantAppAvailable = isInstantAppAvailable; } public String toString() { @@ -394,7 +399,7 @@ public class ResolveInfo implements Parcelable { dest.writeInt(noResourceId ? 1 : 0); dest.writeInt(iconResourceId); dest.writeInt(handleAllWebDataURI ? 1 : 0); - dest.writeInt(instantAppAvailable ? 1 : 0); + dest.writeInt(isInstantAppAvailable ? 1 : 0); } public static final Creator<ResolveInfo> CREATOR @@ -442,7 +447,7 @@ public class ResolveInfo implements Parcelable { noResourceId = source.readInt() != 0; iconResourceId = source.readInt(); handleAllWebDataURI = source.readInt() != 0; - instantAppAvailable = source.readInt() != 0; + instantAppAvailable = isInstantAppAvailable = source.readInt() != 0; } public static class DisplayNameComparator diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java index 0ad4874d41fe..5032e6a59a8b 100644 --- a/core/java/android/content/pm/SharedLibraryInfo.java +++ b/core/java/android/content/pm/SharedLibraryInfo.java @@ -131,7 +131,7 @@ public final class SharedLibraryInfo implements Parcelable { * * @return The version. */ - public @IntRange(from = -1) long getVersion() { + public @IntRange(from = -1) int getVersion() { return mVersion; } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 94e9470d8fcf..5edefb5e2359 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -3381,6 +3381,22 @@ public class ConnectivityManager { } /** + * Requests that the system open the captive portal app on the specified network. + * + * @param network The network to log into. + * + * @hide + */ + @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) + public void startCaptivePortalApp(Network network) { + try { + mService.startCaptivePortalApp(network); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * It is acceptable to briefly use multipath data to provide seamless connectivity for * time-sensitive user-facing operations when the system default network is temporarily * unresponsive. The amount of data should be limited (less than one megabyte for every call to diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 63a1f0513e20..27729dcce779 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -161,6 +161,7 @@ interface IConnectivityManager void setAcceptUnvalidated(in Network network, boolean accept, boolean always); void setAvoidUnvalidated(in Network network); + void startCaptivePortalApp(in Network network); int getMultipathPreference(in Network Network); diff --git a/core/java/android/net/NetworkBadging.java b/core/java/android/net/NetworkBadging.java index b4ef69542bd1..6de28b7146e8 100644 --- a/core/java/android/net/NetworkBadging.java +++ b/core/java/android/net/NetworkBadging.java @@ -35,9 +35,10 @@ import java.lang.annotation.RetentionPolicy; /** * Utility methods for working with network badging. * - * @hide + * @removed + * */ -@SystemApi +@Deprecated public class NetworkBadging { @IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K}) diff --git a/core/java/android/net/NetworkRecommendationProvider.java b/core/java/android/net/NetworkRecommendationProvider.java index 1eaa1f90d64c..d7b58f779625 100644 --- a/core/java/android/net/NetworkRecommendationProvider.java +++ b/core/java/android/net/NetworkRecommendationProvider.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + package android.net; import android.Manifest.permission; @@ -41,11 +57,13 @@ public abstract class NetworkRecommendationProvider { private static final boolean VERBOSE = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.VERBOSE); /** The key into the callback Bundle where the RecommendationResult will be found. * @deprecated to be removed. + * @removed */ public static final String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT"; /** The key into the callback Bundle where the sequence will be found. * @deprecated to be removed. + * @removed */ public static final String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE"; private final IBinder mService; @@ -54,6 +72,7 @@ public abstract class NetworkRecommendationProvider { * Constructs a new instance. * @param handler indicates which thread to use when handling requests. Cannot be {@code null}. * @deprecated use {@link #NetworkRecommendationProvider(Context, Executor)} + * @removed */ public NetworkRecommendationProvider(Handler handler) { if (handler == null) { @@ -82,6 +101,7 @@ public abstract class NetworkRecommendationProvider { * available it must be passed into * {@link ResultCallback#onResult(RecommendationResult)}. * @deprecated to be removed. + * @removed */ public void onRequestRecommendation(RecommendationRequest request, ResultCallback callback) {} @@ -107,6 +127,7 @@ public abstract class NetworkRecommendationProvider { * is available. * * @deprecated to be removed. + * @removed */ public static class ResultCallback { private final IRemoteCallback mCallback; diff --git a/core/java/android/net/RecommendationRequest.java b/core/java/android/net/RecommendationRequest.java index 45ee3a5283dd..21641d9e7fe3 100644 --- a/core/java/android/net/RecommendationRequest.java +++ b/core/java/android/net/RecommendationRequest.java @@ -17,7 +17,6 @@ package android.net; -import android.annotation.SystemApi; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.os.Parcel; @@ -31,8 +30,8 @@ import com.android.internal.annotations.VisibleForTesting; * @see {@link NetworkScoreManager#requestRecommendation(RecommendationRequest)}. * @hide * @deprecated to be removed. + * @removed */ -@SystemApi public final class RecommendationRequest implements Parcelable { private final ScanResult[] mScanResults; private final WifiConfiguration mDefaultConfig; @@ -45,8 +44,8 @@ public final class RecommendationRequest implements Parcelable { * Builder class for constructing {@link RecommendationRequest} instances. * @hide * @deprecated to be removed. + * @removed */ - @SystemApi public static final class Builder { private ScanResult[] mScanResults; private WifiConfiguration mDefaultConfig; diff --git a/core/java/android/net/RecommendationResult.java b/core/java/android/net/RecommendationResult.java index ce4d83af3f01..d66dd22de40a 100644 --- a/core/java/android/net/RecommendationResult.java +++ b/core/java/android/net/RecommendationResult.java @@ -18,12 +18,10 @@ package android.net; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.net.wifi.WifiConfiguration; import android.os.Parcel; import android.os.Parcelable; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Preconditions; /** @@ -32,8 +30,8 @@ import com.android.internal.util.Preconditions; * @see {@link NetworkScoreManager#requestRecommendation(RecommendationRequest)}. * @hide * @deprecated to be removed. + * @removed */ -@SystemApi public final class RecommendationResult implements Parcelable { private final WifiConfiguration mWifiConfiguration; diff --git a/core/java/android/net/nsd/NsdManager.java b/core/java/android/net/nsd/NsdManager.java index 83c469103f55..3fd9f1936444 100644 --- a/core/java/android/net/nsd/NsdManager.java +++ b/core/java/android/net/nsd/NsdManager.java @@ -372,6 +372,8 @@ public final class NsdManager { ((DiscoveryListener) listener).onServiceLost((NsdServiceInfo) message.obj); break; case STOP_DISCOVERY_FAILED: + // TODO: failure to stop discovery should be internal and retried internally, as + // the effect for the client is indistinguishable from STOP_DISCOVERY_SUCCEEDED removeListener(message.arg2); ((DiscoveryListener) listener).onStopDiscoveryFailed(getNsdServiceInfoType(ns), message.arg1); @@ -393,6 +395,8 @@ public final class NsdManager { ((RegistrationListener) listener).onUnregistrationFailed(ns, message.arg1); break; case UNREGISTER_SERVICE_SUCCEEDED: + // TODO: do not unregister listener until service is unregistered, or provide + // alternative way for unregistering ? removeListener(message.arg2); ((RegistrationListener) listener).onServiceUnregistered(ns); break; diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index b71578060fdc..037cccf14615 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -55,6 +55,7 @@ interface IPowerManager void rebootSafeMode(boolean confirm, boolean wait); void shutdown(boolean confirm, String reason, boolean wait); void crash(String message); + int getLastShutdownReason(); void setStayOnSetting(int val); void boostScreenBrightness(long time); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index a713eef72c45..7d1369fe1b69 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -16,10 +16,13 @@ package android.os; +import android.annotation.IntDef; import android.annotation.SdkConstant; import android.annotation.SystemApi; import android.content.Context; import android.util.Log; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * This class gives you control of the power state of the device. @@ -432,6 +435,49 @@ public final class PowerManager { */ public static final String SHUTDOWN_USER_REQUESTED = "userrequested"; + /** + * @hide + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + SHUTDOWN_REASON_UNKNOWN, + SHUTDOWN_REASON_SHUTDOWN, + SHUTDOWN_REASON_REBOOT, + SHUTDOWN_REASON_USER_REQUESTED, + SHUTDOWN_REASON_THERMAL_SHUTDOWN + }) + public @interface ShutdownReason {} + + /** + * constant for shutdown reason being unknown. + * @hide + */ + public static final int SHUTDOWN_REASON_UNKNOWN = 0; + + /** + * constant for shutdown reason being normal shutdown. + * @hide + */ + public static final int SHUTDOWN_REASON_SHUTDOWN = 1; + + /** + * constant for shutdown reason being reboot. + * @hide + */ + public static final int SHUTDOWN_REASON_REBOOT = 2; + + /** + * constant for shutdown reason being user requested. + * @hide + */ + public static final int SHUTDOWN_REASON_USER_REQUESTED = 3; + + /** + * constant for shutdown reason being overheating. + * @hide + */ + public static final int SHUTDOWN_REASON_THERMAL_SHUTDOWN = 4; + final Context mContext; final IPowerManager mService; final Handler mHandler; @@ -1085,6 +1131,22 @@ public final class PowerManager { } /** + * Returns the reason the phone was last shutdown. Calling app must have the + * {@link android.Manifest.permission#DEVICE_POWER} permission to request this information. + * @return Reason for shutdown as an int, {@link #SHUTDOWN_REASON_UNKNOWN} if the file could + * not be accessed. + * @hide + */ + @ShutdownReason + public int getLastShutdownReason() { + try { + return mService.getLastShutdownReason(); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Intent that is broadcast when the state of {@link #isPowerSaveMode()} changes. * This broadcast is only sent to registered receivers. */ diff --git a/core/java/android/os/TestLooperManager.java b/core/java/android/os/TestLooperManager.java index 745642efc423..5e7549fa67d8 100644 --- a/core/java/android/os/TestLooperManager.java +++ b/core/java/android/os/TestLooperManager.java @@ -58,11 +58,17 @@ public class TestLooperManager { /** * Returns the {@link MessageQueue} this object is wrapping. */ - public MessageQueue getQueue() { + public MessageQueue getMessageQueue() { checkReleased(); return mQueue; } + /** @removed */ + @Deprecated + public MessageQueue getQueue() { + return getMessageQueue(); + } + /** * Returns the next message that should be executed by this queue, may block * if no messages are ready. diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index 8208438dc62a..0d81bd9c74dc 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -19,6 +19,7 @@ package android.os; import android.net.LocalSocket; import android.net.LocalSocketAddress; import android.util.Log; +import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.Zygote; import com.android.internal.util.Preconditions; @@ -529,4 +530,27 @@ public class ZygoteProcess { return (state.inputStream.readInt() == 0); } } + + /** + * Try connecting to the Zygote over and over again until we hit a time-out. + * @param socketName The name of the socket to connect to. + */ + public static void waitForConnectionToZygote(String socketName) { + for (int n = 20; n >= 0; n--) { + try { + final ZygoteState zs = ZygoteState.connect(socketName); + zs.close(); + return; + } catch (IOException ioe) { + Log.w(LOG_TAG, + "Got error connecting to zygote, retrying. msg= " + ioe.getMessage()); + } + + try { + Thread.sleep(1000); + } catch (InterruptedException ie) { + } + } + Slog.wtf(LOG_TAG, "Failed to connect to Zygote through socket " + socketName); + } } diff --git a/core/java/android/service/autofill/AutofillService.java b/core/java/android/service/autofill/AutofillService.java index 416455d596be..88d17ef32c13 100644 --- a/core/java/android/service/autofill/AutofillService.java +++ b/core/java/android/service/autofill/AutofillService.java @@ -119,7 +119,7 @@ public abstract class AutofillService extends Service { try { onFillRequest(request, cancellation, fillCallback); } catch (AbstractMethodError e) { - final ArrayList<FillContext> contexts = request.getFillContexts(); + final List<FillContext> contexts = request.getFillContexts(); onFillRequest(contexts.get(contexts.size() - 1).getStructure(), request.getClientState(), request.getFlags(), cancellation, fillCallback); diff --git a/core/java/android/service/autofill/FillRequest.java b/core/java/android/service/autofill/FillRequest.java index 8ac399c776ec..b1145ee38929 100644 --- a/core/java/android/service/autofill/FillRequest.java +++ b/core/java/android/service/autofill/FillRequest.java @@ -29,6 +29,7 @@ import com.android.internal.util.Preconditions; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; +import java.util.List; /** * This class represents a request to an {@link AutofillService autofill provider} @@ -96,7 +97,7 @@ public final class FillRequest implements Parcelable { /** * @return The contexts associated with each previous fill request. */ - public @NonNull ArrayList<FillContext> getFillContexts() { + public @NonNull List<FillContext> getFillContexts() { return mContexts; } diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index 42c0151298b0..1914db9eb438 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -30,6 +30,7 @@ import android.view.autofill.AutofillManager; import android.widget.RemoteViews; import java.util.ArrayList; +import java.util.Arrays; /** * Response for a {@link @@ -258,12 +259,17 @@ public final class FillResponse implements Parcelable { * @param ids id of Views that when focused will display the authentication UI affordance. * * @return This builder. + * @throw {@link IllegalArgumentException} if {@code ids} is {@code null} or empty, or if + * neither {@code authentication} nor {@code presentation} is non-{@code null}. + * * @see android.app.PendingIntent#getIntentSender() */ public @NonNull Builder setAuthentication(@NonNull AutofillId[] ids, @Nullable IntentSender authentication, @Nullable RemoteViews presentation) { throwIfDestroyed(); - // TODO(b/37424539): assert ids is not null nor empty once old version is removed + if (ids == null || ids.length == 0) { + throw new IllegalArgumentException("ids cannot be null or empry"); + } if (authentication == null ^ presentation == null) { throw new IllegalArgumentException("authentication and presentation" + " must be both non-null or null"); @@ -275,17 +281,6 @@ public final class FillResponse implements Parcelable { } /** - * TODO(b/37424539): will be removed once clients use the version that takes ids - * @hide - * @deprecated - */ - @Deprecated - public @NonNull Builder setAuthentication(@Nullable IntentSender authentication, - @Nullable RemoteViews presentation) { - return setAuthentication(null, authentication, presentation); - } - - /** * Specifies views that should not trigger new * {@link AutofillService#onFillRequest(FillRequest, android.os.CancellationSignal, * FillCallback)} requests. @@ -396,6 +391,7 @@ public final class FillResponse implements Parcelable { public String toString() { if (!sDebug) return super.toString(); + // TODO: create a dump() method instead return new StringBuilder( "FillResponse : [mRequestId=" + mRequestId) .append(", datasets=").append(mDatasets) @@ -403,10 +399,8 @@ public final class FillResponse implements Parcelable { .append(", clientState=").append(mClientState != null) .append(", hasPresentation=").append(mPresentation != null) .append(", hasAuthentication=").append(mAuthentication != null) - .append(", authenticationSize=").append(mAuthenticationIds != null - ? mAuthenticationIds.length : "N/A") - .append(", ignoredIdsSize=").append(mIgnoredIds != null - ? mIgnoredIds.length : "N/A") + .append(", authenticationIds=").append(Arrays.toString(mAuthenticationIds)) + .append(", ignoredIds=").append(Arrays.toString(mIgnoredIds)) .append("]") .toString(); } @@ -447,8 +441,16 @@ public final class FillResponse implements Parcelable { } builder.setSaveInfo(parcel.readParcelable(null)); builder.setClientState(parcel.readParcelable(null)); - builder.setAuthentication(parcel.readParcelableArray(null, AutofillId.class), - parcel.readParcelable(null), parcel.readParcelable(null)); + + // Sets authentication state. + final AutofillId[] authenticationIds = parcel.readParcelableArray(null, + AutofillId.class); + final IntentSender authentication = parcel.readParcelable(null); + final RemoteViews presentation = parcel.readParcelable(null); + if (authenticationIds != null) { + builder.setAuthentication(authenticationIds, authentication, presentation); + } + builder.setIgnoredIds(parcel.readParcelableArray(null, AutofillId.class)); final FillResponse response = builder.build(); diff --git a/core/java/android/speech/tts/UtteranceProgressListener.java b/core/java/android/speech/tts/UtteranceProgressListener.java index ef81f1211364..7381a12af083 100644 --- a/core/java/android/speech/tts/UtteranceProgressListener.java +++ b/core/java/android/speech/tts/UtteranceProgressListener.java @@ -144,9 +144,8 @@ public abstract class UtteranceProgressListener { onUtteranceRangeStart(utteranceId, start, end); } - /** - * @deprecated Due to internal API changes. Remove when apps catch up. - */ + /** @removed */ + @Deprecated public void onUtteranceRangeStart(String utteranceId, int start, int end) { } diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index 4c266a66a7af..c8f297ae9c1f 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -23,10 +23,12 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SdkConstant; +import android.annotation.SystemApi; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; +import android.content.res.Resources; import android.os.Binder; import android.os.Handler; import android.os.IBinder; @@ -1113,6 +1115,19 @@ public final class AccessibilityManager { } } + /** + * Determines if the accessibility button within the system navigation area is supported. + * + * @return {@code true} if the accessibility button is supported on this device, + * {@code false} otherwise + * @hide + */ + @SystemApi + public static boolean isAccessibilityButtonSupported() { + final Resources res = Resources.getSystem(); + return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar); + } + private final class MyCallback implements Handler.Callback { public static final int MSG_SET_STATE = 1; diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 0a24bfb019ca..d0133ed66535 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -95,7 +95,7 @@ public final class AutofillManager { * Type: {@link android.os.Bundle} */ public static final String EXTRA_CLIENT_STATE = - "android.view.autofill.extra.EXTRA_CLIENT_STATE"; + "android.view.autofill.extra.CLIENT_STATE"; static final String SESSION_ID_TAG = "android:sessionId"; static final String LAST_AUTOFILLED_DATA_TAG = "android:lastAutoFilledData"; diff --git a/core/java/android/webkit/WebViewZygote.java b/core/java/android/webkit/WebViewZygote.java index b519ec9c42a2..0204dff9bf9d 100644 --- a/core/java/android/webkit/WebViewZygote.java +++ b/core/java/android/webkit/WebViewZygote.java @@ -218,7 +218,7 @@ public class WebViewZygote { final String zip = (zipPaths.size() == 1) ? zipPaths.get(0) : TextUtils.join(File.pathSeparator, zipPaths); - waitForZygote(); + ZygoteProcess.waitForConnectionToZygote(WEBVIEW_ZYGOTE_SOCKET); Log.d(LOGTAG, "Preloading package " + zip + " " + librarySearchPath); sZygote.preloadPackageForAbi(zip, librarySearchPath, sPackageCacheKey, @@ -228,25 +228,4 @@ public class WebViewZygote { sZygote = null; } } - - /** - * Wait until a connection to the Zygote can be established. - */ - private static void waitForZygote() { - while (true) { - try { - final ZygoteProcess.ZygoteState zs = - ZygoteProcess.ZygoteState.connect(WEBVIEW_ZYGOTE_SOCKET); - zs.close(); - break; - } catch (IOException ioe) { - Log.w(LOGTAG, "Got error connecting to zygote, retrying. msg= " + ioe.getMessage()); - } - - try { - Thread.sleep(1000); - } catch (InterruptedException ie) { - } - } - } } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 1c87726b3ca9..5476ab216f2f 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -7088,7 +7088,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te final int size = scrapViews.size(); if (size > 0) { // See if we still have a view for this position or ID. - for (int i = 0; i < size; i++) { + // Traverse backwards to find the most recently used scrap view + for (int i = size - 1; i >= 0; i--) { final View view = scrapViews.get(i); final AbsListView.LayoutParams params = (AbsListView.LayoutParams) view.getLayoutParams(); diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 142effbbf0c7..4ce6ec5520ca 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -786,21 +786,7 @@ public class ZygoteInit { private static void waitForSecondaryZygote(String socketName) { String otherZygoteName = Process.ZYGOTE_SOCKET.equals(socketName) ? Process.SECONDARY_ZYGOTE_SOCKET : Process.ZYGOTE_SOCKET; - while (true) { - try { - final ZygoteProcess.ZygoteState zs = - ZygoteProcess.ZygoteState.connect(otherZygoteName); - zs.close(); - break; - } catch (IOException ioe) { - Log.w(TAG, "Got error connecting to zygote, retrying. msg= " + ioe.getMessage()); - } - - try { - Thread.sleep(1000); - } catch (InterruptedException ie) { - } - } + ZygoteProcess.waitForConnectionToZygote(otherZygoteName); } static boolean isPreloadComplete() { diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp index c11ce0fe338e..d8eb7d2e80e1 100644 --- a/core/jni/android_hardware_camera2_CameraMetadata.cpp +++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp @@ -442,10 +442,12 @@ static void CameraMetadata_dump(JNIEnv *env, jobject thiz) { if (threadRet != 0) { close(writeFd); + close(readFd); jniThrowExceptionFmt(env, "java/io/IOException", "Failed to create thread for writing (errno = %#x, message = '%s')", threadRet, strerror(threadRet)); + return; } } @@ -476,6 +478,8 @@ static void CameraMetadata_dump(JNIEnv *env, jobject thiz) { } else if (!logLine.isEmpty()) { ALOGD("%s", logLine.string()); } + + close(readFd); } int res; diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index d0ce1927b108..c00d698770b3 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -45,7 +45,6 @@ static jmethodID gConfig_ctorID; static jfieldID gDisplay_EGLDisplayFieldID; static jfieldID gContext_EGLContextFieldID; static jfieldID gSurface_EGLSurfaceFieldID; -static jfieldID gSurface_NativePixelRefFieldID; static jfieldID gConfig_EGLConfigFieldID; static inline EGLDisplay getDisplay(JNIEnv* env, jobject o) { @@ -84,7 +83,6 @@ static void nativeClassInit(JNIEnv *_env, jclass eglImplClass) jclass surface_class = _env->FindClass("com/google/android/gles_jni/EGLSurfaceImpl"); gSurface_EGLSurfaceFieldID = _env->GetFieldID(surface_class, "mEGLSurface", "J"); - gSurface_NativePixelRefFieldID = _env->GetFieldID(surface_class, "mNativePixelRef", "J"); } static const jint gNull_attrib_base[] = {EGL_NONE}; @@ -398,14 +396,6 @@ static jboolean jni_eglDestroySurface(JNIEnv *_env, jobject _this, jobject displ } EGLDisplay dpy = getDisplay(_env, display); EGLSurface sur = getSurface(_env, surface); - - if (sur) { - SkPixelRef* ref = (SkPixelRef*)(_env->GetLongField(surface, - gSurface_NativePixelRefFieldID)); - if (ref) { - SkSafeUnref(ref); - } - } return EglBoolToJBool(eglDestroySurface(dpy, sur)); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6fe356777a79..5e34e0559f79 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -377,8 +377,6 @@ <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_PROGRESS" /> <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" /> - <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED" /> - <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED" /> <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED" /> <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED" /> <protected-broadcast android:name="android.intent.action.ACTION_SUBINFO_CONTENT_CHANGE" /> @@ -446,6 +444,8 @@ <protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED" /> <protected-broadcast android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" /> <protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" /> + <protected-broadcast android:name="android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED" /> + <protected-broadcast android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" /> <protected-broadcast android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION" /> <protected-broadcast android:name="com.android.bluetooth.btservice.action.ALARM_WAKEUP" /> @@ -827,16 +827,6 @@ android:description="@string/permdesc_callPhone" android:protectionLevel="dangerous" /> - <!-- Allows an application to manage its own calls, but rely on the system to route focus to the - currently active call. - <p>Protection level: dangerous - --> - <permission android:name="android.permission.MANAGE_OWN_CALLS" - android:permissionGroup="android.permission-group.PHONE" - android:label="@string/permlab_manageOwnCalls" - android:description="@string/permdesc_manageOwnCalls" - android:protectionLevel="dangerous" /> - <!-- Allows an application to access the IMS call service: making and modifying a call <p>Protection level: signature|privileged @@ -924,6 +914,16 @@ android:description="@string/permdesc_answerPhoneCalls" android:protectionLevel="dangerous|runtime" /> + <!-- Allows a calling application which manages it own calls through the self-managed + {@link android.telecom.ConnectionService} APIs. See + {@link android.telecom.PhoneAccount#CAPABILITY_SELF_MANAGED for more information on the + self-managed ConnectionService APIs. + <p>Protection level: normal + --> + <permission android:name="android.permission.MANAGE_OWN_CALLS" + android:label="@string/permlab_manageOwnCalls" + android:description="@string/permdesc_manageOwnCalls" + android:protectionLevel="normal" /> <!-- ====================================================================== --> <!-- Permissions for accessing the device microphone --> @@ -1900,20 +1900,20 @@ android:protectionLevel="signature|privileged" /> <!-- Allows a companion app to run in the background. - <p>Protection level: signature + <p>Protection level: normal --> <permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND" android:label="@string/permlab_runInBackground" android:description="@string/permdesc_runInBackground" - android:protectionLevel="signature" /> + android:protectionLevel="normal" /> <!-- Allows a companion app to use data in the background. - <p>Protection level: signature + <p>Protection level: normal --> <permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND" android:label="@string/permlab_useDataInBackground" android:description="@string/permdesc_useDataInBackground" - android:protectionLevel="signature" /> + android:protectionLevel="normal" /> <!-- ================================== --> @@ -3374,6 +3374,8 @@ android:protectionLevel="signature" /> <!-- Must be required by system apps when accessing restricted VR APIs. + @hide + @SystemApi <p>Protection level: signature --> <permission android:name="android.permission.RESTRICTED_VR_ACCESS" android:protectionLevel="signature|preinstalled" /> diff --git a/core/res/res/drawable/ic_picture_in_picture.xml b/core/res/res/drawable/ic_picture_in_picture.xml deleted file mode 100644 index e2dda336f8f7..000000000000 --- a/core/res/res/drawable/ic_picture_in_picture.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - - <path - android:fillColor="#FFFFFF" - android:pathData="M19 11h-8v6h8v-6zm4 8V4.98C23 3.88 22.1 3 21 3H3c-1.1 0-2 .88-2 1.98V19c0 1.1 .9 -2 2 2h18c1.1 0 2-.9 2-2zm-2 .02H3V4.97h18v14.05z" /> - <path - android:pathData="M0 0h24v24H0V0z" /> -</vector>
\ No newline at end of file diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index b6cc0355cd78..4524b6e6c181 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Opletberigte"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Kleinhandeldemonstrasie"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-verbinding"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Veiligmodus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-stelsel"</string> <string name="user_owner_label" msgid="1119010402169916617">"Skakel oor na persoonlik"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 03432cb78500..a3ebecbd2ebc 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ማንቂያዎች"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"የችርቻሮ ማሳያ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"የዩኤስቢ ግንኙነት"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"የሚያስተማምን ሁነታ"</string> <string name="android_system_label" msgid="6577375335728551336">"Android ስርዓት"</string> <string name="user_owner_label" msgid="1119010402169916617">"ወደ የግል ቀይር"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 49aeb0ad3037..d1b9dcb5af2b 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -277,6 +277,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"التنبيهات"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"عرض توضيحي لبائع التجزئة"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"اتصال USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"الوضع الآمن"</string> <string name="android_system_label" msgid="6577375335728551336">"نظام Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"التبديل إلى الشخصي"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 4d4d157f31be..552c4e30c7cf 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Siqnallar"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Pərakəndə demo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB əlaqə"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Təhlükəsiz rejim"</string> <string name="android_system_label" msgid="6577375335728551336">"Android sistemi"</string> <string name="user_owner_label" msgid="1119010402169916617">"Şəxsi profilə keçirin"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 81ef9088997d..9fc3a28c507b 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -268,6 +268,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Obaveštenja"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Režim demonstracije za maloprodajne objekte"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB veza"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Bezbedni režim"</string> <string name="android_system_label" msgid="6577375335728551336">"Android sistem"</string> <string name="user_owner_label" msgid="1119010402169916617">"Pređi na Lični profil"</string> @@ -1630,7 +1640,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"Instalirao je administrator"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"Ažurirao je administrator"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"Izbrisao je administrator"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"Da bi produžila vreme trajanja baterije, ušteda baterije smanjuje performanse uređaja i ograničava vibraciju, usluge lokacije i većinu pozadinskih podataka. Imejl, razmena poruka i druge aplikacije koje se oslanjaju na sinhronizaciju možda neće da se ažuriraju ako ih ne otvorite.\n\nUšteda baterije se automatski isključuje kada se uređaj puni."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"Da bi produžila vreme trajanja baterije, ušteda baterije smanjuje performanse uređaja i ograničava vibraciju, usluge lokacije i većinu pozadinskih podataka. Imejl, razmena poruka i druge aplikacije koje se oslanjaju na sinhronizaciju neće se ažurirati dok ih ne otvorite.\n\nUšteda baterije se automatski isključuje kada se uređaj puni."</string> <string name="data_saver_description" msgid="6015391409098303235">"Da bi se smanjila potrošnja podataka, Ušteda podataka sprečava neke aplikacije da šalju ili primaju podatke u pozadini. Aplikacija koju trenutno koristite može da pristupa podacima, ali će to činiti ređe. Na primer, slike se neće prikazivati dok ih ne dodirnete."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Uključiti Uštedu podataka?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Uključi"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 3836385b14e9..fdd15d3cf95c 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Абвесткi"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Дэманстрацыйны рэжым для пунктаў продажу"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Падключэнне USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Бяспечны рэжым"</string> <string name="android_system_label" msgid="6577375335728551336">"Сістэма Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Пераключыцца на асабісты"</string> @@ -293,12 +303,12 @@ <string name="permgroupdesc_phone" msgid="6234224354060641055">"рабіць тэлефонныя выклікі і кіраваць імі"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"Датчыкі цела"</string> <string name="permgroupdesc_sensors" msgid="7147968539346634043">"атрымліваць з датчыка даныя асноўных фізіялагічных паказчыкаў"</string> - <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Атрымайце змесцiва акна"</string> - <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Вывучыце змесцiва акна, з якiм вы працуеце."</string> - <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Уключыце Explore by Touch"</string> + <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Атрымліваць змесціва вакна"</string> + <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Аналізаваць змесціва актыўнага вакна."</string> + <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Уключаць Азнаямленне дотыкам"</string> <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Элементы, да якіх дакрануліся, будуць агучаны, а экранам можна даследаваць пры дапамозе жэстаў."</string> - <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Глядзiце, што набiраеце"</string> - <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Уключае ў сябе асабістыя дадзеныя, такія як нумары крэдытных карт і паролі."</string> + <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Праглядаць тэкст, які вы набіраеце"</string> + <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"У тым ліку асабістыя даныя, такія як нумары крэдытных карт і паролі."</string> <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Кіраваць павелічэннем дысплэя"</string> <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Кіраваць маштабам дысплэя і пазіцыянаваннем."</string> <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Выконваць жэсты"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index c799ca9e48f2..b03e09e73daf 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Сигнали"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Демонстрационен режим за магазини"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB връзка"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безопасен режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Система Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Превключване към личния потребителски профил"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index c8bc6d7b19f4..b574890b5cc9 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"সতর্কতাগুলি"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"খুচরা বিক্রয়ের ডেমো"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB সংযোগ"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"নিরাপদ মোড"</string> <string name="android_system_label" msgid="6577375335728551336">"Android সিস্টেম"</string> <string name="user_owner_label" msgid="1119010402169916617">"ব্যক্তিগততে পাল্টান"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index f93c655b02a4..37fa55fc3b70 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -268,6 +268,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Upozorenja"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Promotivna demonstracija u maloprodaji"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB veza"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Siguran način rada"</string> <string name="android_system_label" msgid="6577375335728551336">"Android sistem"</string> <string name="user_owner_label" msgid="1119010402169916617">"Prebacite se na lični"</string> @@ -998,7 +1008,7 @@ <string name="inputMethod" msgid="1653630062304567879">"Način unosa"</string> <string name="editTextMenuTitle" msgid="4909135564941815494">"Akcije za tekst"</string> <string name="email" msgid="4560673117055050403">"E-pošta"</string> - <string name="dial" msgid="4204975095406423102">"Telefon"</string> + <string name="dial" msgid="4204975095406423102">"Pozovi"</string> <string name="map" msgid="5441053548030107189">"Mapa"</string> <string name="browse" msgid="6079864138582486027">"Pretraži"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ponestaje prostora za pohranu"</string> @@ -1184,7 +1194,7 @@ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Postavljanje vremena"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Postavljanje datuma"</string> <string name="date_time_set" msgid="5777075614321087758">"Postaviti"</string> - <string name="date_time_done" msgid="2507683751759308828">"Završeno"</string> + <string name="date_time_done" msgid="2507683751759308828">"Gotovo"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"NOVO: "</font></string> <string name="perms_description_app" msgid="5139836143293299417">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> omogućava."</string> <string name="no_permissions" msgid="7283357728219338112">"Nisu potrebne dozvole"</string> @@ -1436,7 +1446,7 @@ <string name="wireless_display_route_description" msgid="9070346425023979651">"Bežični prikaz"</string> <string name="media_route_button_content_description" msgid="591703006349356016">"Prebacuj"</string> <string name="media_route_chooser_title" msgid="1751618554539087622">"Poveži na uređaj"</string> - <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Prebaci ekran na uređaj"</string> + <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Emitiranje ekrana na uređaj"</string> <string name="media_route_chooser_searching" msgid="4776236202610828706">"Traženje uređajā…"</string> <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"Postavke"</string> <string name="media_route_controller_disconnect" msgid="8966120286374158649">"Prekini vezu"</string> @@ -1615,7 +1625,7 @@ <string name="immersive_cling_title" msgid="8394201622932303336">"Prikazuje se cijeli ekran"</string> <string name="immersive_cling_description" msgid="3482371193207536040">"Da izađete, prevucite nadolje odozgo."</string> <string name="immersive_cling_positive" msgid="5016839404568297683">"Razumijem"</string> - <string name="done_label" msgid="2093726099505892398">"Završeno"</string> + <string name="done_label" msgid="2093726099505892398">"Gotovo"</string> <string name="hour_picker_description" msgid="6698199186859736512">"Kružni klizač za odabir sata"</string> <string name="minute_picker_description" msgid="8606010966873791190">"Kružni klizač za minute"</string> <string name="select_hours" msgid="6043079511766008245">"Odaberite sat"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 512f1673831b..0b77c82fae42 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertes"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demostració comercial"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Connexió USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode segur"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Canvia al perfil personal"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 0dabc80913ab..31f08268ed68 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Upozornění"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Prodejní ukázka"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Připojení USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Nouzový režim"</string> <string name="android_system_label" msgid="6577375335728551336">"Systém Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Přepnout na osobní profil"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index d5b40fbeb938..a258f082fdfa 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Underretninger"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo til udstilling i butik"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-forbindelse"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Sikker tilstand"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="user_owner_label" msgid="1119010402169916617">"Skift til Tilpasset"</string> @@ -317,8 +327,8 @@ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Tillader, at appen kan modtage og behandle sms-beskeder. Det betyder, at appen kan overvåge eller slette de beskeder, der sendes til din enhed, uden at vise dem til dig."</string> <string name="permlab_receiveMms" msgid="1821317344668257098">"modtage tekstbeskeder (mms)"</string> <string name="permdesc_receiveMms" msgid="533019437263212260">"Tillader, at appen kan modtage og behandle mms-beskeder. Det betyder, at appen kan overvåge eller slette de beskeder, der sendes til din enhed, uden at vise dem til dig."</string> - <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"læse Cell Broadcast-beskeder"</string> - <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillader, at appen læser Cell Broadcast-beskeder, der modtages af din enhed. I nogle områder sendes der Cell Broadcast-beskeder for at advare om nødsituationer. Ondsindede apps kan forstyrre ydelsen eller driften af din enhed, når der modtages en Cell Broadcast-besked om en nødsituation."</string> + <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"læse Cell Broadcast-meddelelser"</string> + <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillader, at appen læser Cell Broadcast-meddelelser, der modtages af din enhed. I nogle områder sendes der Cell Broadcast-meddelelser for at advare om nødsituationer. Ondsindede apps kan forstyrre ydelsen eller driften af din enhed, når der modtages en Cell Broadcast-meddelelse om en nødsituation."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"læse feeds, jeg abonnerer på"</string> <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Tillader, at appen kan hente oplysninger om de feeds, der synkroniseres."</string> <string name="permlab_sendSms" msgid="7544599214260982981">"Send og se sms-beskeder"</string> @@ -1074,19 +1084,19 @@ <string name="dump_heap_text" msgid="4809417337240334941">"Processen <xliff:g id="PROC">%1$s</xliff:g> har overskredet sin proceshukommelsesgrænse på <xliff:g id="SIZE">%2$s</xliff:g>. En heap dump er tilgængelig og kan deles med udvikleren. Vær forsigtig: Denne heap dump kan indeholde dine personlige oplysninger, som appen har adgang til."</string> <string name="sendText" msgid="5209874571959469142">"Vælg en handling for teksten"</string> <string name="volume_ringtone" msgid="6885421406845734650">"Lydstyrke for opkald"</string> - <string name="volume_music" msgid="5421651157138628171">"Medielydstyrke"</string> + <string name="volume_music" msgid="5421651157138628171">"Lydstyrke for medier"</string> <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Afspilning via Bluetooth"</string> <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"Lydløs ringetone er angivet"</string> <string name="volume_call" msgid="3941680041282788711">"Lydstyrke for opkald"</string> <string name="volume_bluetooth_call" msgid="2002891926351151534">"Lydstyrke for Bluetooth under opkald"</string> <string name="volume_alarm" msgid="1985191616042689100">"Lydstyrke for alarm"</string> - <string name="volume_notification" msgid="2422265656744276715">"Lydstyrke for meddelelser"</string> + <string name="volume_notification" msgid="2422265656744276715">"Lydstyrke for underretninger"</string> <string name="volume_unknown" msgid="1400219669770445902">"Lydstyrke"</string> <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Lydstyrke for bluetooth"</string> <string name="volume_icon_description_ringer" msgid="3326003847006162496">"Lydstyrke for ringetone"</string> <string name="volume_icon_description_incall" msgid="8890073218154543397">"Lydstyrke for opkald"</string> - <string name="volume_icon_description_media" msgid="4217311719665194215">"Medielydstyrke"</string> - <string name="volume_icon_description_notification" msgid="7044986546477282274">"Lydstyrke for meddelelser"</string> + <string name="volume_icon_description_media" msgid="4217311719665194215">"Lydstyrke for medier"</string> + <string name="volume_icon_description_notification" msgid="7044986546477282274">"Lydstyrke for underretninger"</string> <string name="ringtone_default" msgid="3789758980357696936">"Standardringetone"</string> <string name="ringtone_default_with_actual" msgid="1767304850491060581">"Standard (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"Ingen"</string> @@ -1609,7 +1619,7 @@ <string name="package_updated_device_owner" msgid="1847154566357862089">"Opdateret af din administrator"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"Slettet af din administrator"</string> <string name="battery_saver_description" msgid="1960431123816253034">"Batterisparefunktionen hjælper med at forlænge batteriets levetid ved at reducere enhedens ydeevne og begrænse vibration, placeringstjenester og det meste baggrundsdata. E-mail, beskedfunktioner og andre apps, der benytter synkronisering, opdateres muligvis ikke, medmindre du åbner dem.\n\nBatterisparefunktionen slukker automatisk, når enheden oplader."</string> - <string name="data_saver_description" msgid="6015391409098303235">"Datasparefunktion forhindrer nogle apps i at sende eller modtage data i baggrunden for at reducere dataforbruget. En app, der er i brug, kan få adgang til data, men gør det måske ikke så ofte. Dette kan f.eks. betyde, at billeder ikke vises, før du trykker på dem."</string> + <string name="data_saver_description" msgid="6015391409098303235">"Datasparefunktionen forhindrer nogle apps i at sende eller modtage data i baggrunden for at reducere dataforbruget. En app, der er i brug, kan få adgang til data, men gør det måske ikke så ofte. Dette kan f.eks. betyde, at billeder ikke vises, før du trykker på dem."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Vil du slå Datasparefunktion til?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Slå til"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1731,13 +1741,13 @@ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB-fejlretning"</string> <string name="time_picker_hour_label" msgid="2979075098868106450">"time"</string> <string name="time_picker_minute_label" msgid="5168864173796598399">"minut"</string> - <string name="time_picker_header_text" msgid="143536825321922567">"Indstil klokkeslæt"</string> + <string name="time_picker_header_text" msgid="143536825321922567">"Angiv klokkeslæt"</string> <string name="time_picker_input_error" msgid="7574999942502513765">"Angiv et gyldigt klokkeslæt"</string> <string name="time_picker_prompt_label" msgid="7588093983899966783">"Angiv klokkeslæt"</string> <string name="time_picker_text_input_mode_description" msgid="4148166758173708199">"Skift til teksttilstand for at angive klokkeslæt."</string> <string name="time_picker_radial_mode_description" msgid="4953403779779557198">"Skift til urtilstand for at angive klokkeslæt."</string> <string name="autofill_picker_accessibility_title" msgid="8469043291648711535">"Valgmuligheder for AutoFyld"</string> - <string name="autofill_save_accessibility_title" msgid="7244365268417107822">"Gem til AutoFyld"</string> + <string name="autofill_save_accessibility_title" msgid="7244365268417107822">"Gem i AutoFyld"</string> <string name="autofill_error_cannot_autofill" msgid="7402758580060110371">"Indhold kan ikke udfyldes automatisk"</string> <string name="autofill_save_title" msgid="3345527308992082601">"Vil du gemme i <b><xliff:g id="LABEL">%1$s</xliff:g></b>?"</string> <string name="autofill_save_title_with_type" msgid="8637809388029313305">"Vil du gemme <xliff:g id="TYPE">%1$s</xliff:g> i <b><xliff:g id="LABEL">%2$s</xliff:g></b>?"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 347ebca534ab..5a70d9b1ab2a 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Warnmeldungen"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo für Einzelhandel"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-Verbindung"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Abgesicherter Modus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-System"</string> <string name="user_owner_label" msgid="1119010402169916617">"Zu \"Privat\" wechseln"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 4d93e5fc9e52..0cc6dc602546 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Ειδοποιήσεις"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Επίδειξη λιανικής"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Σύνδεση USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Ασφαλής λειτουργία"</string> <string name="android_system_label" msgid="6577375335728551336">"Σύστημα Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Μετάβαση σε προσωπικό προφίλ"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index aa08377297bd..4976b037e7cd 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Retail demo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB connection"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"Android system"</string> <string name="user_owner_label" msgid="1119010402169916617">"Switch to Personal"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index aa08377297bd..4976b037e7cd 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Retail demo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB connection"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"Android system"</string> <string name="user_owner_label" msgid="1119010402169916617">"Switch to Personal"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index aa08377297bd..4976b037e7cd 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Retail demo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB connection"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"Android system"</string> <string name="user_owner_label" msgid="1119010402169916617">"Switch to Personal"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 29a0adc4d825..5515ae19a996 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertas"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo para punto de venta"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Conexión USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Cambiar al perfil personal"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 02c91dbcb0b9..33c0e5ca2aee 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertas"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo para tiendas"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Conexión USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Cambiar a perfil personal"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index cb6365935855..1c76b3f748d6 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Teatised"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Poedemo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-ühendus"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Turvarežiim"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-süsteem"</string> <string name="user_owner_label" msgid="1119010402169916617">"Lülita isiklikule profiilile"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index 3c79b784010a..78aed2310781 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Abisuak"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Saltzaileentzako demoa"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB konexioa"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modu segurua"</string> <string name="android_system_label" msgid="6577375335728551336">"Android sistema"</string> <string name="user_owner_label" msgid="1119010402169916617">"Aldatu profil pertsonalera"</string> @@ -289,7 +299,7 @@ <string name="permgroupdesc_sensors" msgid="7147968539346634043">"atzitu bizi-konstanteei buruzko sentsore-datuak"</string> <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Eskuratu leihoko edukia"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Arakatu irekita daukazun leihoko edukia."</string> - <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Aktibatu ukipen bidez arakatzeko eginbidea"</string> + <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Aktibatu \"Arakatu ukituta\""</string> <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Sakatutako elementuak ozen esango dira eta pantaila keinu bidez arakatu ahal izango da."</string> <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Behatu idazten duzun testua"</string> <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Ez da salbuespenik egiten datu pertsonalekin, hala nola, kreditu-txartelen zenbakiekin eta pasahitzekin."</string> @@ -1477,7 +1487,7 @@ <string name="user_switched" msgid="3768006783166984410">"Uneko erabiltzailea: <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailera aldatzen…"</string> <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> erabiltzailearen saioa amaitzen…"</string> - <string name="owner_name" msgid="2716755460376028154">"jabea"</string> + <string name="owner_name" msgid="2716755460376028154">"Jabea"</string> <string name="error_message_title" msgid="4510373083082500195">"Errorea"</string> <string name="error_message_change_not_allowed" msgid="1238035947357923497">"Administratzaileak ez du eman aldaketa egiteko baimena"</string> <string name="app_not_found" msgid="3429141853498927379">"Ez da ekintza gauza dezakeen aplikaziorik aurkitu"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index beef14c59527..cd8e7502d7e8 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"هشدارها"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"نمونه برای خردهفروشان"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"اتصال USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"حالت ایمن"</string> <string name="android_system_label" msgid="6577375335728551336">"سیستم Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"رفتن به نمایه شخصی"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 44614d761f09..56906696654b 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Ilmoitukset"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Esittelytila"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-yhteys"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Suojattu tila"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-järjestelmä"</string> <string name="user_owner_label" msgid="1119010402169916617">"Siirry henkilökohtaiseen profiiliin"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 20780fd2b80a..77972741e960 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertes"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Démo en magasin"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Connexion USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode sécurisé"</string> <string name="android_system_label" msgid="6577375335728551336">"Système Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Passer au profil personnel"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 65f8d78e76f7..761947e3e0c7 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertes"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Démonstration en magasin"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Connexion USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode sécurisé"</string> <string name="android_system_label" msgid="6577375335728551336">"Système Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Passer au profil personnel"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index cb2ad8f4c417..2c58acbad584 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -29,10 +29,10 @@ <string name="fileSizeSuffix" msgid="8897567456150907538">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string> <string name="durationDays" msgid="6652371460511178259">"<xliff:g id="DAYS">%1$d</xliff:g> días"</string> <string name="durationDayHours" msgid="2713107458736744435">"<xliff:g id="DAYS">%1$d</xliff:g> día <xliff:g id="HOURS">%2$d</xliff:g> hrs"</string> - <string name="durationDayHour" msgid="7293789639090958917">"<xliff:g id="DAYS">%1$d</xliff:g> día <xliff:g id="HOURS">%2$d</xliff:g> hr"</string> + <string name="durationDayHour" msgid="7293789639090958917">"<xliff:g id="DAYS">%1$d</xliff:g> día <xliff:g id="HOURS">%2$d</xliff:g> h"</string> <string name="durationHours" msgid="4266858287167358988">"<xliff:g id="HOURS">%1$d</xliff:g> hrs"</string> - <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> hr <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> - <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> hr <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> + <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> + <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> min"</string> <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string> <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> minuto"</string> <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> min <xliff:g id="SECONDS">%2$d</xliff:g> seg"</string> @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertas"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demostración comercial"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"conexión USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Cambiar ao perfil persoal"</string> @@ -293,8 +303,8 @@ <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Os elementos que toques pronunciaranse en voz alta e a pantalla poderá explorarse mediante xestos."</string> <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observar o texto que escribes"</string> <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Inclúe datos persoais como números e contrasinais de tarxetas de crédito."</string> - <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar ampliación da pantalla"</string> - <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controla o nivel do zoom e o posicionamento da pantalla"</string> + <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Controlar a ampliación da pantalla"</string> + <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Controla o nivel do zoom e o posicionamento da pantalla."</string> <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Realizar xestos"</string> <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"Podes tocar, pasar o dedo, beliscar e realizar outros xestos."</string> <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Xestos de impresión dixital"</string> @@ -1609,7 +1619,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"Instalado polo teu administrador"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"Actualizado polo teu administrador"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"Eliminado polo teu administrador"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"Para axudar a mellorar a duración da batería, a función aforro de batería reduce o rendemento do teu dispositivo e limita a vibración, os servizos de localización e a maioría dos datos en segundo plano. É posible que o correo electrónico, as mensaxes e outras aplicacións que dependen da sincronización non se actualicen a menos que os abras. \n\nA función aforro de batería desactívase automaticamente cando pos a cargar o teu dispositivo."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"Para axudar a mellorar a duración da batería, a función de aforro da batería reduce o rendemento do teu dispositivo e limita a vibración, os servizos de localización e a maioría dos datos en segundo plano. É posible que o correo electrónico, as mensaxes e outras aplicacións que dependen da sincronización non se actualicen a menos que os abras. \n\nA función de aforro da batería desactívase automaticamente cando pos a cargar o teu dispositivo."</string> <string name="data_saver_description" msgid="6015391409098303235">"Para contribuír a reducir o uso de datos, o Economizador de datos impide que algunhas aplicacións envíen ou reciban datos en segundo plano. Cando esteas utilizando unha aplicación, esta poderá acceder aos datos, pero é posible que o faga con menos frecuencia. Por exemplo, é posible que as imaxes non se mostren ata que as toques."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Queres activar o economizador de datos?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Activar"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index f70639f22bd7..77f7212e15d1 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ચેતવણીઓ"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"રિટેલ ડેમો"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB કનેક્શન"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"સુરક્ષિત મોડ"</string> <string name="android_system_label" msgid="6577375335728551336">"Android સિસ્ટમ"</string> <string name="user_owner_label" msgid="1119010402169916617">"વ્યક્તિગત પર સ્વિચ કરો"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 556ba9e62ccc..0a672ca7bd9f 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"सूचनाएं"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"खुदरा डेमो"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB कनेक्शन"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"सुरक्षित मोड"</string> <string name="android_system_label" msgid="6577375335728551336">"Android सिस्टम"</string> <string name="user_owner_label" msgid="1119010402169916617">"व्यक्तिगत प्रोफ़ाइल में स्विच करें"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index c8083e76c3d7..48f4cf7b221d 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -268,6 +268,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Upozorenja"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Prodajni demo-način"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB veza"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Siguran način rada"</string> <string name="android_system_label" msgid="6577375335728551336">"Sustav Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Prijeđite na osobni"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index d528e9437158..8af3ff5575f2 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Értesítések"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Kiskereskedelmi bemutató"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-kapcsolat"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Biztonsági üzemmód"</string> <string name="android_system_label" msgid="6577375335728551336">"Android rendszer"</string> <string name="user_owner_label" msgid="1119010402169916617">"Átváltás személyes profilra"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index f33e7778a068..2ca708d6653c 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Ծանուցումներ"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Խանութի ցուցադրական ռեժիմ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB կապակցում"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Անվտանգ ռեժիմ"</string> <string name="android_system_label" msgid="6577375335728551336">"Android համակարգ"</string> <string name="user_owner_label" msgid="1119010402169916617">"Անցնել անհատական պրոֆիլին"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 9ba2120be671..aa325acce3ba 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Notifikasi"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo promo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Sambungan USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode aman"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Beralih ke Pribadi"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 30d83e1481ef..e37862bd2679 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Tilkynningar"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Kynningarútgáfa fyrir verslanir"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-tenging"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Örugg stilling"</string> <string name="android_system_label" msgid="6577375335728551336">"Android kerfið"</string> <string name="user_owner_label" msgid="1119010402169916617">"Skipta yfir í persónulegt snið"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 61be91cf63c4..8057a06445ab 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Avvisi"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo retail"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Connessione USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modalità provvisoria"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Passa al profilo personale"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 18518f8eaafd..504d3ad8d05c 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"התראות"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"הדגמה לקמעונאים"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"חיבור USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"מצב בטוח"</string> <string name="android_system_label" msgid="6577375335728551336">"מערכת Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"עבור ל\'אישי\'"</string> @@ -1009,7 +1019,7 @@ <string name="delete" msgid="6098684844021697789">"מחק"</string> <string name="copyUrl" msgid="2538211579596067402">"העתק כתובת אתר"</string> <string name="selectTextMode" msgid="1018691815143165326">"בחר טקסט"</string> - <string name="undo" msgid="7905788502491742328">"בטל"</string> + <string name="undo" msgid="7905788502491742328">"ביטול"</string> <string name="redo" msgid="7759464876566803888">"בצע מחדש"</string> <string name="autofill" msgid="3035779615680565188">"מילוי אוטומטי"</string> <string name="textSelectionCABTitle" msgid="5236850394370820357">"בחירת טקסט"</string> @@ -1066,7 +1076,7 @@ <string name="aerr_application_repeated" msgid="3146328699537439573">"האפליקציה <xliff:g id="APPLICATION">%1$s</xliff:g> נעצרת שוב ושוב"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"האפליקציה <xliff:g id="PROCESS">%1$s</xliff:g> נעצרת שוב ושוב"</string> <string name="aerr_restart" msgid="7581308074153624475">"פתח שוב את האפליקציה"</string> - <string name="aerr_report" msgid="5371800241488400617">"שלח משוב"</string> + <string name="aerr_report" msgid="5371800241488400617">"משוב"</string> <string name="aerr_close" msgid="2991640326563991340">"סגור"</string> <string name="aerr_mute" msgid="1974781923723235953">"השתק עד הפעלה מחדש של המכשיר"</string> <string name="aerr_wait" msgid="3199956902437040261">"המתן"</string> @@ -1181,7 +1191,7 @@ <string name="sms_short_code_details" msgid="5873295990846059400">"הדבר "<b>"עלול לגרום לחיובים"</b>" בחשבון המכשיר הנייד שלך."</string> <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"הדבר יגרום לחיובים בחשבון המכשיר הנייד שלך."</b></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"שלח"</string> - <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"בטל"</string> + <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"ביטול"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"זכור את הבחירה שלי"</string> <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"ניתן לשנות זאת מאוחר יותר ב\'הגדרות\' > \'אפליקציות\'"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"אפשר תמיד"</string> @@ -1198,7 +1208,7 @@ <string name="carrier_app_notification_title" msgid="8921767385872554621">"ה-SIM החדש הוכנס"</string> <string name="carrier_app_notification_text" msgid="1132487343346050225">"הקש כדי להגדיר"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"הגדרת שעה"</string> - <string name="date_picker_dialog_title" msgid="5879450659453782278">"הגדר תאריך"</string> + <string name="date_picker_dialog_title" msgid="5879450659453782278">"הגדרת תאריך"</string> <string name="date_time_set" msgid="5777075614321087758">"הגדר"</string> <string name="date_time_done" msgid="2507683751759308828">"בוצע"</string> <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"חדש: "</font></string> @@ -1223,7 +1233,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"שתף"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"לא, אין מצב"</string> <string name="select_input_method" msgid="8547250819326693584">"שינוי מקלדת"</string> - <string name="show_ime" msgid="2506087537466597099">"השאר אותו במסך בזמן שהמקלדת הפיזית פעילה"</string> + <string name="show_ime" msgid="2506087537466597099">"תישאר במסך בזמן שהמקלדת הפיזית פעילה"</string> <string name="hardware" msgid="194658061510127999">"הצג מקלדת וירטואלית"</string> <string name="select_keyboard_layout_notification_title" msgid="597189518763083494">"הגדרת מקלדת פיזית"</string> <string name="select_keyboard_layout_notification_message" msgid="8084622969903004900">"הקש כדי לבחור שפה ופריסה"</string> @@ -1358,13 +1368,13 @@ <string name="sync_undo_deletes" msgid="2941317360600338602">"בטל את פעולות המחיקה"</string> <string name="sync_do_nothing" msgid="3743764740430821845">"אל תעשה דבר כרגע"</string> <string name="choose_account_label" msgid="5655203089746423927">"בחר חשבון"</string> - <string name="add_account_label" msgid="2935267344849993553">"הוסף חשבון"</string> - <string name="add_account_button_label" msgid="3611982894853435874">"הוסף חשבון"</string> + <string name="add_account_label" msgid="2935267344849993553">"הוספת חשבון"</string> + <string name="add_account_button_label" msgid="3611982894853435874">"הוספת חשבון"</string> <string name="number_picker_increment_button" msgid="2412072272832284313">"הוסף"</string> <string name="number_picker_decrement_button" msgid="476050778386779067">"הפחת"</string> <string name="number_picker_increment_scroll_mode" msgid="5259126567490114216">"<xliff:g id="VALUE">%s</xliff:g> גע והחזק."</string> <string name="number_picker_increment_scroll_action" msgid="9101473045891835490">"הסט למעלה כדי להוסיף ולמטה כדי להפחית."</string> - <string name="time_picker_increment_minute_button" msgid="8865885114028614321">"הוסף דקה"</string> + <string name="time_picker_increment_minute_button" msgid="8865885114028614321">"הוספת דקה"</string> <string name="time_picker_decrement_minute_button" msgid="6246834937080684791">"הפחת דקה"</string> <string name="time_picker_increment_hour_button" msgid="3652056055810223139">"הוסף שעה"</string> <string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"הפחת שעה"</string> @@ -1403,7 +1413,7 @@ <string name="storage_usb_drive_label" msgid="4501418548927759953">"כונן USB של <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb" msgid="3017954059538517278">"אחסון USB"</string> <string name="extract_edit_menu_button" msgid="8940478730496610137">"ערוך"</string> - <string name="data_usage_warning_title" msgid="3620440638180218181">"התראה לשימוש בנתונים"</string> + <string name="data_usage_warning_title" msgid="3620440638180218181">"התראה על שימוש בנתונים"</string> <string name="data_usage_warning_body" msgid="6660692274311972007">"הקש כדי להציג נתוני שימוש והגדרות."</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"הגעת למגבלת הנתונים של 2G-3G"</string> <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"הגעת למגבלת הנתונים של 4G"</string> @@ -1487,7 +1497,7 @@ <string name="kg_login_instructions" msgid="1100551261265506448">"כדי לבטל את הנעילה, היכנס באמצעות חשבון Google שלך."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"שם משתמש (אימייל)"</string> <string name="kg_login_password_hint" msgid="9057289103827298549">"סיסמה"</string> - <string name="kg_login_submit_button" msgid="5355904582674054702">"היכנס"</string> + <string name="kg_login_submit_button" msgid="5355904582674054702">"כניסה"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"שם משתמש או סיסמה לא חוקיים."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"שכחת את שם המשתמש או הסיסמה?\nהיכנס לכתובת "<b>"google.com/accounts/recovery"</b></string> <string name="kg_login_checking_password" msgid="1052685197710252395">"בודק חשבון…"</string> @@ -1776,7 +1786,7 @@ <string name="demo_restarting_message" msgid="952118052531642451">"מאפס את המכשיר…"</string> <string name="demo_user_inactivity_timeout_title" msgid="6596109959002331334">"האם לאפס את המכשיר?"</string> <string name="demo_user_inactivity_timeout_countdown" msgid="5675588824402569506">"תאבד את כל השינויים וההדגמה תתחיל שוב בעוד <xliff:g id="TIMEOUT">%1$s</xliff:g> שניות…"</string> - <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"בטל"</string> + <string name="demo_user_inactivity_timeout_left_button" msgid="5314271347014802475">"ביטול"</string> <string name="demo_user_inactivity_timeout_right_button" msgid="5019306703066964808">"אפס עכשיו"</string> <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> הושבת"</string> <string name="conference_call" msgid="3751093130790472426">"שיחת ועידה"</string> @@ -1793,9 +1803,9 @@ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"ניקוי באגים ב-USB"</string> <string name="time_picker_hour_label" msgid="2979075098868106450">"שעה"</string> <string name="time_picker_minute_label" msgid="5168864173796598399">"דקה"</string> - <string name="time_picker_header_text" msgid="143536825321922567">"הגדר שעה"</string> + <string name="time_picker_header_text" msgid="143536825321922567">"הגדרת שעה"</string> <string name="time_picker_input_error" msgid="7574999942502513765">"הזן שעה חוקית"</string> - <string name="time_picker_prompt_label" msgid="7588093983899966783">"הקלד את השעה"</string> + <string name="time_picker_prompt_label" msgid="7588093983899966783">"מהי השעה הנכונה"</string> <string name="time_picker_text_input_mode_description" msgid="4148166758173708199">"העבר למצב קלט טקסט לצורך הזנת השעה"</string> <string name="time_picker_radial_mode_description" msgid="4953403779779557198">"העבר למצב שעון לצורך הזנת השעה"</string> <string name="autofill_picker_accessibility_title" msgid="8469043291648711535">"אפשרויות מילוי אוטומטי"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index f5da17ecc995..4f18bcb7b08d 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"通知"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"販売店デモ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB 接続"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"セーフモード"</string> <string name="android_system_label" msgid="6577375335728551336">"Androidシステム"</string> <string name="user_owner_label" msgid="1119010402169916617">"個人用に切り替える"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index bf0f5da4528d..31cd59b2130b 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"გაფრთხილებები"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"დემო-რეჟიმი საცალო მოვაჭრეებისთვის"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB კავშირი"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"უსაფრთხო რეჟიმი"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-ის სისტემა"</string> <string name="user_owner_label" msgid="1119010402169916617">"პირად პროფილზე გადართვა"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 7b30f282863f..c512e4311485 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Дабылдар"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Бөлшек саудаға арналған демо нұсқасы"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB байланысы"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Қауіпсіз режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Android жүйесі"</string> <string name="user_owner_label" msgid="1119010402169916617">"Жекеге ауысу"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 59c8c2066463..64306fd3e809 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ការជូនដំណឹង"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"របៀបដាក់បង្ហាញក្នុងហាង"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"ការតភ្ជាប់ USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"របៀបសុវត្ថិភាព"</string> <string name="android_system_label" msgid="6577375335728551336">"ប្រព័ន្ធ Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"ប្តូរទៅផ្ទាល់ខ្លួន"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 906c88cd4437..aaabd919e6ea 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ಎಚ್ಚರಿಕೆಗಳು"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"ರಿಟೇಲ್ ಡೆಮೋ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB ಸಂಪರ್ಕ"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"ಸುರಕ್ಷಿತ ಮೋಡ್"</string> <string name="android_system_label" msgid="6577375335728551336">"Android ಸಿಸ್ಟಂ"</string> <string name="user_owner_label" msgid="1119010402169916617">"ವೈಯಕ್ತಿಕಗೆ ಬದಲಿಸಿ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index db2e038418b3..ab61857150d8 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"알림"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"소매 데모"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB 연결"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"안전 모드"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 시스템"</string> <string name="user_owner_label" msgid="1119010402169916617">"개인으로 전환"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 05ca65ee9f5d..a24bd7fb21ad 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Эскертүүлөр"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Чекене соода дүкөнү үчүн демо режим"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB аркылуу туташуу"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Коопсуз режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Android тутуму"</string> <string name="user_owner_label" msgid="1119010402169916617">"Жеке профилге которулуу"</string> @@ -1412,7 +1422,7 @@ <string name="media_route_chooser_title" msgid="1751618554539087622">"Түзмөккө туташуу"</string> <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Сырткы экранга чыгаруу"</string> <string name="media_route_chooser_searching" msgid="4776236202610828706">"Түзмөктөр изделүүдө..."</string> - <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"Тууралоолор"</string> + <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"Жөндөөлөр"</string> <string name="media_route_controller_disconnect" msgid="8966120286374158649">"Ажыратуу"</string> <string name="media_route_status_scanning" msgid="7279908761758293783">"Скандоодо..."</string> <string name="media_route_status_connecting" msgid="6422571716007825440">"Туташууда..."</string> @@ -1466,7 +1476,7 @@ <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Алып салуу"</string> <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"Сунушталган деңгээлден да катуулатып уккуңуз келеби?\n\nМузыканы узакка чейин катуу уксаңыз, угууңуз начарлап кетиши мүмкүн."</string> <string name="accessibility_shortcut_warning_dialog_title" msgid="8404780875025725199">"Атайын мүмкүнчүлүктөр функциясынын кыска жолу колдонулсунбу?"</string> - <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Кыска жол функциясы күйгүзүлгөн учурда үн көзөмөлдөөчү баскычтарды басып, 3 секунд кармап турсаңыз, атайын мүмкүнчүлүктөр функциясы иштетилет.\n\n Учурдагы атайын мүмкүнчүлүктөр функциясы:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Функцияны Жөндөөлөр > атайын мүмкүнчүлүктөр бөлүмүнөн өзгөртө аласыз."</string> + <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн, анын кыска жолу күйгүзүлгөндө, үндү катуулатуу/акырындатуу баскычын үч секунддай кое бербей басып туруңуз.\n\n Учурдагы атайын мүмкүнчүлүктөрдүн жөндөөлөрү:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nЖөндөөлөр > Атайын мүмкүнчүлүктөр бөлүмүнөн өзгөртө аласыз."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Кыска жолду өчүрүү"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Кыска жолду колдонуу"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Атайын мүмкүнчүлүктөр кыска жолу <xliff:g id="SERVICE_NAME">%1$s</xliff:g> кызматын күйгүздү"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 4f2eb19d3a11..d162fe027238 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ການເຕືອນ"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"ເດໂມສຳລັບຮ້ານຂາຍ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"ການເຊື່ອມຕໍ່ USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"ລະບົບ Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"ສະລັບໄປໂປຣໄຟລ໌ສ່ວນຕົວ"</string> @@ -1608,7 +1618,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"ຖືກຕິດຕັ້ງໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"ຖືກອັບໂຫລດໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"ຖືກລຶບອອກໂດຍຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານ"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"ເພື່ອຊ່ວຍເພີ່ມອາຍຸແບັດເຕີຣີ, ຕົວປະຢັດໄຟແບັດເຕີຣີຫຼຸດປະສິດທິພາບການເຮັດວຽກຂອງອຸປະກອນຂອງທ່ານລົງ ແລະຈຳກັດການສັ່ນ, ການບໍລິການຫາທີ່ຕັ້ງ, ແລະຂໍ້ມູນພື້ນຫຼັງເກືອບທັງໝົດ. ອີເມວ, ການສົ່ງຂໍ້ຄວາມ, ແລະແອັບອື່ນໆທີ່ອາໄສການຊິງຄ໌ອາດຈະບໍ່ອັບເດດ ນອກຈາກວ່າທ່ານເປີດມັນ.\n\nຕົວປະຢັດໄຟແບັດເຕີຣີຈະປິດອັດຕະໂນມັດ ເມື່ອອຸປະກອນຂອງທ່ານກຳລັງສາກຢູ່."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"ເພື່ອຊ່ວຍເພີ່ມອາຍຸແບັດເຕີຣີ, ຕົວປະຢັດໄຟແບັດເຕີຣີຫຼຸດປະສິດທິພາບການເຮັດວຽກຂອງອຸປະກອນຂອງທ່ານລົງ ແລະຈຳກັດການສັ່ນ, ການບໍລິການຫາທີ່ຕັ້ງ ແລະ ຂໍ້ມູນພື້ນຫຼັງເກືອບທັງໝົດ. ອີເມວ, ການສົ່ງຂໍ້ຄວາມ, ແລະ ແອັບອື່ນໆທີ່ອາໄສການຊິ້ງຂໍ້ມູນອາດຈະບໍ່ອັບເດດ ນອກຈາກວ່າທ່ານເປີດມັນ.\n\nຕົວປະຢັດໄຟແບັດເຕີຣີຈະປິດອັດຕະໂນມັດເມື່ອທ່ານສາກໄຟອຸປະກອນ."</string> <string name="data_saver_description" msgid="6015391409098303235">"ເພື່ອຊ່ວຍຫຼຸດຜ່ອນການນຳໃຊ້ຂໍ້ມູນ, ຕົວປະຢັດຂໍ້ມູນຈະປ້ອງກັນບໍ່ໃຫ້ບາງແອັບສົ່ງ ຫຼື ຮັບຂໍ້ມູນໃນພື້ນຫຼັງ. ແອັບໃດໜຶ່ງທີ່ທ່ານກຳລັງໃຊ້ຢູ່ຈະສາມາດເຂົ້າເຖິງຂໍ້ມູນໄດ້ ແຕ່ອາດເຂົ້າເຖິງໄດ້ຖີ່ໜ້ອຍລົງ. ນີ້ອາດໝາຍຄວາມວ່າ ຮູບພາບຕ່າງໆອາດບໍ່ສະແດງຈົນກວ່າທ່ານຈະແຕະໃສ່ກ່ອນ."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"ເປີດໃຊ້ຕົວປະຢັດຂໍ້ມູນບໍ?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"ເປີດໃຊ້"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 99ef41ca0b70..0a62d62f6d22 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Įspėjimai"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstracinė versija mažmenininkams"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB jungtis"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Saugos režimas"</string> <string name="android_system_label" msgid="6577375335728551336">"„Android“ sistema"</string> <string name="user_owner_label" msgid="1119010402169916617">"Perjungti į asmeninį režimą"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index c01ab61be1e9..3bcce6f5319c 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -268,6 +268,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Brīdinājumi"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstrācijas versija veikaliem"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB savienojums"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Drošais režīms"</string> <string name="android_system_label" msgid="6577375335728551336">"Android sistēma"</string> <string name="user_owner_label" msgid="1119010402169916617">"Pārslēgt personīgo profilu"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index bb2527c0dc08..b5e8c90b3bd5 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Предупредувања"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Демонстрација за малопродажба"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-врска"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безбеден режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Систем Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Префрлете на личен профил"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 178bc3d1e685..5dbb33452635 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"അലേർട്ടുകൾ"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"റീട്ടെയിൽ ഡെമോ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB കണക്ഷൻ"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"സുരക്ഷിത മോഡ്"</string> <string name="android_system_label" msgid="6577375335728551336">"Android സിസ്റ്റം"</string> <string name="user_owner_label" msgid="1119010402169916617">"വ്യക്തിഗത പ്രൊഫൈലിലേക്ക് മാറുക"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 5cf213a80157..765aa5d286fd 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Сануулга"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Жижиглэнгийн жишээ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB холболт"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Аюулгүй горим"</string> <string name="android_system_label" msgid="6577375335728551336">"Андройд систем"</string> <string name="user_owner_label" msgid="1119010402169916617">"\"Хувийн\" руу шилжих"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index 7f414492adf2..41918282c6f5 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"सूचना"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"किरकोळ डेमो"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB कनेक्शन"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"सुरक्षित मोड"</string> <string name="android_system_label" msgid="6577375335728551336">"Android सिस्टम"</string> <string name="user_owner_label" msgid="1119010402169916617">"वैयक्तिकवर स्विच करा"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 5d5c4f3a5942..d4cc2d339862 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Makluman"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Tunjuk cara runcit"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Sambungan USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mod selamat"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Beralih kepada Peribadi"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index d88065843a68..1d89730ba0aa 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"သတိပေးချက်များ"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"လက်လီအရောင်းဆိုင် သရုပ်ပြမှု"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB ချိတ်ဆက်မှု"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"အန္တရာယ်ကင်းမှု စနစ်(Safe mode)"</string> <string name="android_system_label" msgid="6577375335728551336">"Android စနစ်"</string> <string name="user_owner_label" msgid="1119010402169916617">"ကိုယ်ပိုင်သီးသန့်အဖြစ် ပြောင်းပါ"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index c6594354372f..ab32ff8f8ea2 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Varsler"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Butikkdemo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-tilkobling"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Sikkermodus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="user_owner_label" msgid="1119010402169916617">"Bytt til den personlige profilen"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 19e425aa2874..33466bcaa2f2 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"अलर्टहरू"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"खुद्रा बिक्री सम्बन्धी डेमो"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB जडान"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"सुरक्षित मोड"</string> <string name="android_system_label" msgid="6577375335728551336">"एन्ड्रोइड प्रणाली"</string> <string name="user_owner_label" msgid="1119010402169916617">"व्यक्तिगत प्रोफाइलमा स्विच गर्नुहोस्"</string> @@ -1288,7 +1298,7 @@ <string name="vpn_lockdown_config" msgid="5099330695245008680">"सेट अप गर्न ट्याप गर्नुहोस्"</string> <string name="upload_file" msgid="2897957172366730416">"फाइल छान्नुहोस्"</string> <string name="no_file_chosen" msgid="6363648562170759465">"कुनै फाइल छानिएको छैन"</string> - <string name="reset" msgid="2448168080964209908">"पुनःसेट गर्नु"</string> + <string name="reset" msgid="2448168080964209908">"रिसेट गर्नुहोस्"</string> <string name="submit" msgid="1602335572089911941">"पेस गर्नुहोस्"</string> <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"कार मोड सक्षम पारियो।"</string> <string name="car_mode_disable_notification_message" msgid="6301524980144350051">"कार मोडबाट बाहिर निस्कन ट्याप गर्नुहोस्।"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 4875b9feea33..c82219c01cee 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Meldingen"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo voor de detailhandel"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-verbinding"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Veilige modus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-systeem"</string> <string name="user_owner_label" msgid="1119010402169916617">"Overschakelen naar persoonlijk profiel"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index 78a5517ac30a..5c606ae2b961 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ਸੁਚੇਤਨਾਵਾਂ"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"ਪ੍ਰਚੂਨ ਸਟੋਰਾਂ ਲਈ ਡੈਮੋ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB ਕਨੈਕਸ਼ਨ"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"ਸੁਰੱਖਿਅਤ ਮੋਡ"</string> <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="user_owner_label" msgid="1119010402169916617">"ਨਿੱਜੀ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 5f01dd46c4e3..7386f2d62cf0 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerty"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Tryb demo dla sklepów"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Połączenie USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Tryb awaryjny"</string> <string name="android_system_label" msgid="6577375335728551336">"System Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Włącz profil osobisty"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 05ac675b2c02..d5dc39502b48 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertas"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstração na loja"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Conexão USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo de segurança"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Alternar para \"Pessoal\""</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index e78386e08a1e..1f297c2f01fe 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertas"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstração para retalho"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Ligação USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Mudar para pessoal"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 05ac675b2c02..d5dc39502b48 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alertas"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstração na loja"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Conexão USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo de segurança"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Alternar para \"Pessoal\""</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 7785e72ba21d..3a2c38d2905e 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -268,6 +268,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerte"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstrație comercială"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Conexiune USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mod sigur"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistemul Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Comutați la Personal"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index b84b808bd6b6..0bc71eb4c700 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Уведомления"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Деморежим для магазина"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-подключение"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безопасный режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Система Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Перейти в личный профиль"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index 7b0478b33642..b7e695a863e2 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"ඇඟවීම්"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"සිල්ලර ආදර්ශනය"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB සම්බන්ධතාවය"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"ආරක්ෂිත ආකාරය"</string> <string name="android_system_label" msgid="6577375335728551336">"Android පද්ධතිය"</string> <string name="user_owner_label" msgid="1119010402169916617">"පුද්ගලික වෙත මාරු වන්න"</string> @@ -1610,7 +1620,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"ඔබගේ පරිපාලක මඟින් ස්ථාපනය කර ඇත"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"ඔබගේ පරිපාලක මඟින් යාවත්කාලීන කර ඇත"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"ඔබගේ පරිපාලක මඟින් මකා දමා ඇත"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"බැටරි ආයු කාලය වැඩිදියුණු කිරීමට උදවු කිරීමට, බැටරි සුරැකුම ඔබේ උපාංගයේ ක්රියාකාරීත්වය අඩුකරන අතර කම්පනය, පිහිටීම් සේවා, සහ බොහෝමයක් පසුබිම් දත්ත සීමා කරයි. ඔබ ඒවා විවෘත නොකරන්නේ නම් මිස ඊමේල්, පණිවිඩකරණය, සහ සමමුහුර්ත කිරීම මත රඳා පවතින වෙනත් යෙදුම් යාවත්කාලීන නොවිය හැකිය.\n\nඔබේ උපාංගය ආරෝපණය වන විට බැටරි සුරැකුම ස්වයංක්රියව අක්රිය වේ."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"බැටරි ආයු කාලය වැඩිදියුණු කිරීමට උදවු කිරීමට, බැටරි සුරැකුම ඔබේ උපාංගයේ ක්රියාකාරීත්වය අඩුකරන අතර කම්පනය, පිහිටීම් සේවා, සහ බොහෝමයක් පසුබිම් දත්ත සීමා කරයි. ඔබ ඒවා විවෘත නොකරන්නේ නම් මිස ඊ-තැපැල්, පණිවිඩකරණය, සහ සමමුහුර්ත කිරීම මත රඳා පවතින වෙනත් යෙදුම් යාවත්කාලීන නොවිය හැකිය.\n\nඔබේ උපාංගය ආරෝපණය වන විට බැටරි සුරැකුම ස්වයංක්රියව ක්රියාත්මක වේ."</string> <string name="data_saver_description" msgid="6015391409098303235">"දත්ත භාවිතය අඩු කිරීමට උදවු වීමට, දත්ත සුරැකුම සමහර යෙදුම් පසුබිමින් දත්ත යැවීම සහ ලබා ගැනීම වළක්වයි. ඔබ දැනට භාවිත කරන යෙදුමකට දත්ත වෙත පිවිසීමට හැකිය, නමුත් එසේ කරන්නේ කලාතුරකින් විය හැකිය. මෙයින් අදහස් වන්නේ, උදාහරණයක් ලෙස, එම රූප ඔබ ඒවාට තට්ටු කරන තෙක් සංදර්ශනය නොවන බවය."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"දත්ත සුරැකුම ක්රියාත්මක කරන්නද?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"ක්රියාත්මක කරන්න"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 8782dc9dcab4..018ea4e6eafe 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Upozornenia"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Predajná ukážka"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Pripojenie USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Núdzový režim"</string> <string name="android_system_label" msgid="6577375335728551336">"Systém Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Prepnúť na osobný"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index d6643d740bb4..729612fb1571 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Opozorila"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Predstavitev za maloprodajo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Povezava USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Varni način"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Preklop na osebni profil"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 1bd2b7420cd6..563f4bd0d415 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Sinjalizimet"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demonstrimi i shitjes me pakicë"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Lidhja USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modaliteti i sigurisë"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistemi \"android\""</string> <string name="user_owner_label" msgid="1119010402169916617">"Ndryshoje te \"Personale\""</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 44abfb96329e..2d2cc708be23 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -268,6 +268,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Обавештења"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Режим демонстрације за малопродајне објекте"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB веза"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безбедни режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Android систем"</string> <string name="user_owner_label" msgid="1119010402169916617">"Пређи на Лични профил"</string> @@ -1630,7 +1640,7 @@ <string name="package_installed_device_owner" msgid="6875717669960212648">"Инсталирао је администратор"</string> <string name="package_updated_device_owner" msgid="1847154566357862089">"Ажурирао је администратор"</string> <string name="package_deleted_device_owner" msgid="2307122077550236438">"Избрисао је администратор"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"Да би продужила време трајања батерије, уштеда батерије смањује перформансе уређаја и ограничава вибрацију, услуге локације и већину позадинских података. Имејл, размена порука и друге апликације које се ослањају на синхронизацију можда неће да се ажурирају ако их не отворите.\n\nУштеда батерије се аутоматски искључује када се уређај пуни."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"Да би продужила време трајања батерије, уштеда батерије смањује перформансе уређаја и ограничава вибрацију, услуге локације и већину позадинских података. Имејл, размена порука и друге апликације које се ослањају на синхронизацију неће се ажурирати док их не отворите.\n\nУштеда батерије се аутоматски искључује када се уређај пуни."</string> <string name="data_saver_description" msgid="6015391409098303235">"Да би се смањила потрошња података, Уштеда података спречава неке апликације да шаљу или примају податке у позадини. Апликација коју тренутно користите може да приступа подацима, али ће то чинити ређе. На пример, слике се неће приказивати док их не додирнете."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Укључити Уштеду података?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Укључи"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 7f3d212b6a47..c480df43cc96 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Varningar"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo för återförsäljare"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB-anslutning"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Säkert läge"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="user_owner_label" msgid="1119010402169916617">"Byt till din personliga profil"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 52fa3a2ff576..cec75bca468a 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -263,6 +263,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Arifa"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Onyesho la duka la rejareja"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Muunganisho wa USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mtindo salama"</string> <string name="android_system_label" msgid="6577375335728551336">"Mfumo wa Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Badili uweke wasifu wa Binafsi"</string> @@ -1735,7 +1745,7 @@ <string name="time_picker_text_input_mode_description" msgid="4148166758173708199">"Badilisha iwe katika hali ya maandishi wakati wa kuweka muda."</string> <string name="time_picker_radial_mode_description" msgid="4953403779779557198">"Badilisha umbo liwe la saa ya mishale wakati wa kuweka muda."</string> <string name="autofill_picker_accessibility_title" msgid="8469043291648711535">"Chaguo za kujaza otomatiki"</string> - <string name="autofill_save_accessibility_title" msgid="7244365268417107822">"Hifadhi kwa ajili ya Kujaza kiotomatiki"</string> + <string name="autofill_save_accessibility_title" msgid="7244365268417107822">"Hifadhi kwa ajili ya Kujaza Kiotomatiki"</string> <string name="autofill_error_cannot_autofill" msgid="7402758580060110371">"Maudhui hayawezi kujazwa kiotomatiki"</string> <string name="autofill_save_title" msgid="3345527308992082601">"Ungependa kuhifadhi kwenye <b><xliff:g id="LABEL">%1$s</xliff:g></b>?"</string> <string name="autofill_save_title_with_type" msgid="8637809388029313305">"Ungependa kuhifadhi <xliff:g id="TYPE">%1$s</xliff:g> kwenye <b><xliff:g id="LABEL">%2$s</xliff:g></b>?"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 18b097e2de84..7062e9834f89 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"விழிப்பூட்டல்கள்"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"விற்பனையாளர் டெமோ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB இணைப்பு"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"பாதுகாப்பு பயன்முறை"</string> <string name="android_system_label" msgid="6577375335728551336">"Android அமைப்பு"</string> <string name="user_owner_label" msgid="1119010402169916617">"தனிப்பட்ட சுயவிவரத்திற்கு மாறு"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index d79e52f32ab5..31e272153377 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"హెచ్చరికలు"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"రిటైల్ డెమో"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB కనెక్షన్"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"సురక్షిత మోడ్"</string> <string name="android_system_label" msgid="6577375335728551336">"Android సిస్టమ్"</string> <string name="user_owner_label" msgid="1119010402169916617">"వ్యక్తిగతానికి మార్చు"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 2179f70e56e5..fd7158ffa554 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"การแจ้งเตือน"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"การสาธิตสำหรับผู้ค้าปลีก"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"การเชื่อมต่อ USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"โหมดปลอดภัย"</string> <string name="android_system_label" msgid="6577375335728551336">"ระบบ Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"เปลี่ยนไปใช้โปรไฟล์ส่วนตัว"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 90e57c1e982c..e58f62ff0d10 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Mga Alerto"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Retail demo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Koneksyon ng USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="user_owner_label" msgid="1119010402169916617">"Lumipat sa Personal"</string> @@ -277,7 +287,7 @@ <string name="permgroupdesc_calendar" msgid="3889615280211184106">"i-access ang iyong kalendaryo"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"magpadala at tumingin ng mga mensaheng SMS"</string> - <string name="permgrouplab_storage" msgid="1971118770546336966">"Imbakan"</string> + <string name="permgrouplab_storage" msgid="1971118770546336966">"Storage"</string> <string name="permgroupdesc_storage" msgid="637758554581589203">"i-access ang mga larawan, media at file sa iyong device"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Mikropono"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"mag-record ng audio"</string> @@ -575,7 +585,7 @@ <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"Itakda ang pandaigdigang proxy ng device na gagamitin habang naka-enable ang patakaran. Ang may-ari ng device lang ang makakapagtakda sa pandaigdigang proxy."</string> <string name="policylab_expirePassword" msgid="5610055012328825874">"Itakda screen lock password expiration"</string> <string name="policydesc_expirePassword" msgid="5367525762204416046">"Baguhin kung gaano kadalas dapat palitan ang password, PIN o pattern sa screen lock."</string> - <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Itakda pag-encrypt ng imbakan"</string> + <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Itakda pag-encrypt ng storage"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"Hilinging naka-encrypt ang nakaimbak na data ng app."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"Huwag paganahin mga camera"</string> <string name="policydesc_disableCamera" msgid="2306349042834754597">"Pigilan ang paggamit sa lahat ng camera ng device."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 5cc96b6f386e..e39543596c96 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Uyarılar"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Mağaza demo"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB bağlantısı"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Güvenli mod"</string> <string name="android_system_label" msgid="6577375335728551336">"Android Sistemi"</string> <string name="user_owner_label" msgid="1119010402169916617">"Kişisel Profile Geç"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 0fb047adb2af..09cec2a54af2 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -271,6 +271,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Сповіщення"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Демо-режим для роздрібної торгівлі"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"З’єднання USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безп. режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Система Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Перейти в особистий профіль"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 5c73b69ed71b..225faa65cfc2 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"الرٹس"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"ریٹیل ڈیمو"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB کنکشن"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"حفاظتی وضع"</string> <string name="android_system_label" msgid="6577375335728551336">"Android سسٹم"</string> <string name="user_owner_label" msgid="1119010402169916617">"ذاتی پر سوئچ کریں"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 1f231496837f..0e7d4ffa370a 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Ogohlantirishlar"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo rejim"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB orqali ulanish"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Xavfsiz usul"</string> <string name="android_system_label" msgid="6577375335728551336">"Android tizimi"</string> <string name="user_owner_label" msgid="1119010402169916617">"Shaxsiy profilga o‘tish"</string> @@ -722,7 +732,7 @@ <string name="lockscreen_missing_sim_message" product="tv" msgid="1943633865476989599">"Televizorda SIM karta yo‘q."</string> <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Telefoningizda SIM karta yo‘q."</string> <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"SIM kartani soling."</string> - <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM karta solinmagan yoki uni o‘qib bo‘lmaydi. SIM kartani soling."</string> + <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM karta solinmagan yoki u yaroqsiz. SIM kartani soling."</string> <string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Foydalanib bo‘lmaydigan SIM karta."</string> <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"SIM kartangiz butunlay bloklab qo‘yilgan.\n Yangi SIM karta olish uchun aloqa operatoringiz bilan bog‘laning."</string> <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Avvalgi musiqa"</string> @@ -1174,7 +1184,7 @@ <string name="usb_accessory_notification_title" msgid="7848236974087653666">"USB jihozga ulangan"</string> <string name="usb_notification_message" msgid="3370903770828407960">"Boshqa parametrlarini ko‘rish uchun bosing."</string> <string name="adb_active_notification_title" msgid="6729044778949189918">"USB orqali nosozliklarni tuzatish"</string> - <string name="adb_active_notification_message" msgid="4948470599328424059">"O‘chirib qo‘yish uchun bu yerga bosing."</string> + <string name="adb_active_notification_message" msgid="4948470599328424059">"Faolsizlantirish uchun bu yerga bosing."</string> <!-- no translation found for adb_active_notification_message (8470296818270110396) --> <skip /> <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Xatoliklar hisoboti olinmoqda…"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index fa103cccd9c4..f2ba67166230 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Cảnh báo"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Giới thiệu bán lẻ"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Kết nối USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Chế độ an toàn"</string> <string name="android_system_label" msgid="6577375335728551336">"Hệ thống Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Chuyển sang Cá nhân"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index dc66d6fec2fe..6e35e3f9cbce 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"提醒"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"零售演示模式"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB 连接"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string> <string name="user_owner_label" msgid="1119010402169916617">"切换到“个人”"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 63cf0b1ae639..74f498725b47 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -72,8 +72,8 @@ <string name="ClirMmi" msgid="7784673673446833091">"本機號碼"</string> <string name="ColpMmi" msgid="3065121483740183974">"連接線識別功能"</string> <string name="ColrMmi" msgid="4996540314421889589">"連接線識別限制"</string> - <string name="CfMmi" msgid="5123218989141573515">"來電轉接"</string> - <string name="CwMmi" msgid="9129678056795016867">"來電待接"</string> + <string name="CfMmi" msgid="5123218989141573515">"來電轉駁"</string> + <string name="CwMmi" msgid="9129678056795016867">"來電等候"</string> <string name="BaMmi" msgid="455193067926770581">"通話限制"</string> <string name="PwdMmi" msgid="7043715687905254199">"密碼更改"</string> <string name="PinMmi" msgid="3113117780361190304">"更改 PIN"</string> @@ -100,13 +100,13 @@ <string name="NetworkPreferenceSwitchTitle" msgid="4008877505368566980">"無法連接網絡"</string> <string name="NetworkPreferenceSwitchSummary" msgid="4164230263214915351">"如要改善接收品質，請前往 [系統] > [網絡與互聯網] > [流動網絡] > [偏好的網絡類型]，然後變更所選的網絡類型。"</string> <string name="notification_channel_network_alert" msgid="4427736684338074967">"通知"</string> - <string name="notification_channel_call_forward" msgid="2419697808481833249">"來電轉接"</string> + <string name="notification_channel_call_forward" msgid="2419697808481833249">"來電轉駁"</string> <string name="notification_channel_emergency_callback" msgid="6686166232265733921">"緊急回撥模式"</string> <string name="notification_channel_mobile_data_alert" msgid="6130875231721406231">"流動數據通知"</string> <string name="notification_channel_sms" msgid="3441746047346135073">"短訊"</string> <string name="notification_channel_voice_mail" msgid="3954099424160511919">"留言訊息"</string> <string name="notification_channel_wfc" msgid="2130802501654254801">"Wi-Fi 通話"</string> - <string name="peerTtyModeFull" msgid="6165351790010341421">"對方曾要求 TTY 模式 (FULL)"</string> + <string name="peerTtyModeFull" msgid="6165351790010341421">"對方曾要求 TTY 完整模式"</string> <string name="peerTtyModeHco" msgid="5728602160669216784">"對方曾要求 TTY 模式 (HCO)"</string> <string name="peerTtyModeVco" msgid="1742404978686538049">"對方曾要求 TTY 模式 (VCO)"</string> <string name="peerTtyModeOff" msgid="3280819717850602205">"對方曾要求 TTY 模式 (OFF)"</string> @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"通知"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"零售示範"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB 連線"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系統"</string> <string name="user_owner_label" msgid="1119010402169916617">"切換至個人設定檔"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 97962cf657ad..87e98dd381f2 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"快訊"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"零售商示範模式"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"USB 連線"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系統"</string> <string name="user_owner_label" msgid="1119010402169916617">"切換至個人設定檔"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index bcad869edfa1..a656e6ce1aee 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -265,6 +265,16 @@ <string name="notification_channel_alerts" msgid="4496839309318519037">"Izexwayiso"</string> <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Idemo yokuthenga"</string> <string name="notification_channel_usb" msgid="9006850475328924681">"Ukuxhumeka kwe-USB"</string> + <!-- no translation found for notification_channel_foreground_service (6665375982962336520) --> + <skip /> + <!-- no translation found for foreground_service_app_in_background (6826789589341671842) --> + <skip /> + <!-- no translation found for foreground_service_apps_in_background (7150914856893450380) --> + <skip /> + <!-- no translation found for foreground_service_tap_for_details (372046743534354644) --> + <skip /> + <!-- no translation found for foreground_service_multiple_separator (4021901567939866542) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Imodi ephephile"</string> <string name="android_system_label" msgid="6577375335728551336">"Uhlelo lwe-Android"</string> <string name="user_owner_label" msgid="1119010402169916617">"Shintshela komuntu siqu"</string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index c4215141448d..cfe25b33a4c3 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -63,6 +63,12 @@ <!-- Drawable to be drawn over the view to mark it as autofilled--> <attr name="autofilledHighlight" format="reference" /> + <!-- Max width of the autofill data set picker as a fraction of the screen width --> + <attr name="autofillDatasetPickerMaxWidth" format="reference" /> + + <!-- Max height of the autofill data set picker as a fraction of the screen height --> + <attr name="autofillDatasetPickerMaxHeight" format="reference" /> + <!-- Default disabled alpha for widgets that set enabled/disabled alpha programmatically. --> <attr name="disabledAlpha" format="float" /> <!-- The alpha applied to the foreground color to create the primary text color. --> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index b7bc7b7a5fe3..ced22cc37f5a 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -784,13 +784,13 @@ <enum name="locked" value="14" /> </attr> - <!-- Specify the configuration changes that trigger the system to restart the + <!-- Specify the configuration changes that trigger the system to recreate the current activity if any of these configuration changes happen in the system. The valid configuration changes include mcc and mnc which are the same with - those in configChanges. By default from Android O, we don't restart the activity + those in configChanges. By default from Android O, we don't recreate the activity even the app doesn't specify mcc or mnc in configChanges. If the app wants to - restart, specify them in restartOnConfigChanges. --> - <attr name="restartOnConfigChanges"> + be recreated, specify them in recreateOnConfigChanges. --> + <attr name="recreateOnConfigChanges"> <!-- The IMSI MCC has changed, that is a SIM has been detected and updated the Mobile Country Code. --> <flag name="mcc" value="0x0001" /> @@ -817,15 +817,15 @@ <attr name="configChanges"> <!-- The IMSI MCC has changed, that is a SIM has been detected and updated the Mobile Country Code. By default from Android O, we - don't restart the activity even the app doesn't specify mcc in - configChanges. If the app wants to restart, specify mcc in - restartOnConfigChanges. --> + don't recreate the activity even the app doesn't specify mcc in + configChanges. If the app wants to recreate the activity, specify + mcc in recreateOnConfigChanges. --> <flag name="mcc" value="0x0001" /> <!-- The IMSI MNC has changed, that is a SIM has been detected and updated the Mobile Network Code. By default from Android O, we - don't restart the activity even the app doesn't specify mnc in - configChanges. If the app wants to restart, specify mnc in - restartOnConfigChanges. --> + don't recreate the activity even the app doesn't specify mnc in + configChanges. If the app wants to recreate the acvitity, specify + mnc in recreateOnConfigChanges. --> <flag name="mnc" value="0x0002" /> <!-- The locale has changed, that is the user has selected a new language that text should be displayed in. --> @@ -2048,7 +2048,7 @@ <attr name="launchMode" /> <attr name="screenOrientation" /> <attr name="configChanges" /> - <attr name="restartOnConfigChanges" /> + <attr name="recreateOnConfigChanges" /> <attr name="permission" /> <attr name="multiprocess" /> <attr name="process" /> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index eb25ab37b4b5..f3c54ba63aa2 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2877,4 +2877,13 @@ <!-- The apps that need to be hidden when they are disabled --> <string-array name="config_hideWhenDisabled_packageNames"></string-array> + + <!-- Additional non-platform defined global settings exposed to Instant Apps --> + <string-array name="config_allowedGlobalInstantAppSettings"></string-array> + + <!-- Additional non-platform defined system settings exposed to Instant Apps --> + <string-array name="config_allowedSystemInstantAppSettings"></string-array> + + <!-- Additional non-platform defined secure settings exposed to Instant Apps --> + <string-array name="config_allowedSecureInstantAppSettings"></string-array> </resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 54225c7fe40b..880e0e1526b9 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -559,4 +559,8 @@ <dimen name="item_touch_helper_max_drag_scroll_per_frame">20dp</dimen> <dimen name="item_touch_helper_swipe_escape_velocity">120dp</dimen> <dimen name="item_touch_helper_swipe_escape_max_velocity">800dp</dimen> + + <!-- Max width/height of the autofill data set picker as a fraction of the screen width/height --> + <dimen name="autofill_dataset_picker_max_size">90%</dimen> + </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 17f4d39a3251..42d3f27eccfb 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2786,7 +2786,7 @@ <public name="appCategory" /> <public name="autoSizeMaxTextSize" /> <public name="__removed2" /> - <public name="restartOnConfigChanges" /> + <public name="recreateOnConfigChanges" /> <public name="certDigest" /> <public name="splitName" /> <public name="colorMode" /> @@ -2834,11 +2834,6 @@ <public name="autofill" /> </public-group> - <public-group type="drawable" first-id="0x010800b5"> - <!-- 0x010800b4 was removed --> - <public name="ic_picture_in_picture" /> - </public-group> - <public-group type="string" first-id="0x01040019"> <public name="paste_as_plain_text" /> </public-group> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index e633d66514cc..9848485d15c2 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3155,6 +3155,11 @@ <string name="usb_accessory_notification_title">Connected to a USB accessory</string> <!-- See USB_PREFERENCES. This is the message. --> <string name="usb_notification_message">Tap for more options.</string> + <!-- USB_PREFERENCES: Notification for when a type-c USB audio accessory is attached but not supported. This is the title --> + <string name="usb_unsupported_audio_accessory_title">Audio accessory not supported</string> + <!-- Message of notification shown when a type-c USB audio accessory is attached but not supported. --> + <string name="usb_unsupported_audio_accessory_message">Tap for more info</string> + <!-- Title of notification shown when ADB is actively connected to the phone. --> <string name="adb_active_notification_title">USB debugging connected</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index bd70ca8c2191..5aec3ceb2e99 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -239,7 +239,8 @@ <java-symbol type="attr" name="accessibilityFocusedDrawable"/> <java-symbol type="attr" name="isLightTheme"/> <java-symbol type="attr" name="autofilledHighlight"/> - + <java-symbol type="attr" name="autofillDatasetPickerMaxWidth"/> + <java-symbol type="attr" name="autofillDatasetPickerMaxHeight"/> <java-symbol type="bool" name="action_bar_embed_tabs" /> <java-symbol type="bool" name="action_bar_expanded_action_views_exclusive" /> <java-symbol type="bool" name="config_avoidGfxAccel" /> @@ -1958,6 +1959,8 @@ <java-symbol type="string" name="usb_ptp_notification_title" /> <java-symbol type="string" name="usb_midi_notification_title" /> <java-symbol type="string" name="usb_supplying_notification_title" /> + <java-symbol type="string" name="usb_unsupported_audio_accessory_title" /> + <java-symbol type="string" name="usb_unsupported_audio_accessory_message" /> <java-symbol type="string" name="config_UsbDeviceConnectionHandling_component" /> <java-symbol type="string" name="vpn_text" /> <java-symbol type="string" name="vpn_text_long" /> @@ -2915,6 +2918,7 @@ <java-symbol type="string" name="autofill_save_type_email_address" /> <java-symbol type="drawable" name="autofill_dataset_picker_background" /> <java-symbol type="style" name="AutofillDatasetPicker" /> + <java-symbol type="dimen" name="autofill_dataset_picker_max_size"/> <!-- Accessibility fingerprint gestures --> <java-symbol type="string" name="capability_title_canCaptureFingerprintGestures" /> @@ -3013,4 +3017,9 @@ <java-symbol type="string" name="config_feedbackIntentNameKey" /> <java-symbol type="array" name="config_hideWhenDisabled_packageNames" /> + + <java-symbol type="array" name="config_allowedGlobalInstantAppSettings" /> + <java-symbol type="array" name="config_allowedSystemInstantAppSettings" /> + <java-symbol type="array" name="config_allowedSecureInstantAppSettings" /> + </resources> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index e8fbf348c371..383ae5d577ce 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -449,6 +449,10 @@ please see themes_device_defaults.xml. <item name="tooltipFrameBackground">@drawable/tooltip_frame</item> <item name="tooltipForegroundColor">@color/bright_foreground_light</item> <item name="tooltipBackgroundColor">@color/tooltip_background_light</item> + + <!-- Autofill: max width/height of the dataset picker as a fraction of screen size --> + <item name="autofillDatasetPickerMaxWidth">@dimen/autofill_dataset_picker_max_size</item> + <item name="autofillDatasetPickerMaxHeight">@dimen/autofill_dataset_picker_max_size</item> </style> <!-- Variant of {@link #Theme} with no title bar --> diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 33a04939387a..698f2ec1c2f3 100644 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -36,6 +36,7 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.FileUtils; @@ -64,9 +65,14 @@ import android.util.Log; import com.android.frameworks.coretests.R; import com.android.internal.content.PackageHelper; +import dalvik.system.VMRuntime; + import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -78,9 +84,9 @@ public class PackageManagerTests extends AndroidTestCase { public static final String TAG = "PackageManagerTests"; - public final long MAX_WAIT_TIME = 25 * 1000; + public static final long MAX_WAIT_TIME = 25 * 1000; - public final long WAIT_TIME_INCR = 5 * 1000; + public static final long WAIT_TIME_INCR = 5 * 1000; private static final String SECURE_CONTAINERS_PREFIX = "/mnt/asec"; @@ -3861,6 +3867,117 @@ public class PackageManagerTests extends AndroidTestCase { PackageInfo.INSTALL_LOCATION_UNSPECIFIED); } + private static class TestDexModuleRegisterCallback + extends PackageManager.DexModuleRegisterCallback { + private String mDexModulePath = null; + private boolean mSuccess = false; + private String mMessage = null; + CountDownLatch doneSignal = new CountDownLatch(1); + + @Override + public void onDexModuleRegistered(String dexModulePath, boolean success, String message) { + mDexModulePath = dexModulePath; + mSuccess = success; + mMessage = message; + doneSignal.countDown(); + } + + boolean waitTillDone() { + long startTime = System.currentTimeMillis(); + while (System.currentTimeMillis() - startTime < MAX_WAIT_TIME) { + try { + return doneSignal.await(MAX_WAIT_TIME, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + Log.i(TAG, "Interrupted during sleep", e); + } + } + return false; + } + + } + + // Verify that the base code path cannot be registered. + public void testRegisterDexModuleBaseCode() throws Exception { + PackageManager pm = getPm(); + ApplicationInfo info = getContext().getApplicationInfo(); + TestDexModuleRegisterCallback callback = new TestDexModuleRegisterCallback(); + pm.registerDexModule(info.getBaseCodePath(), callback); + assertTrue(callback.waitTillDone()); + assertEquals(info.getBaseCodePath(), callback.mDexModulePath); + assertFalse("BaseCodePath should not be registered", callback.mSuccess); + } + + // Verify thatmodules which are not own by the calling package are not registered. + public void testRegisterDexModuleNotOwningModule() throws Exception { + TestDexModuleRegisterCallback callback = new TestDexModuleRegisterCallback(); + String moduleBelongingToOtherPackage = "/data/user/0/com.google.android.gms/module.apk"; + getPm().registerDexModule(moduleBelongingToOtherPackage, callback); + assertTrue(callback.waitTillDone()); + assertEquals(moduleBelongingToOtherPackage, callback.mDexModulePath); + assertTrue(callback.waitTillDone()); + assertFalse("Only modules belonging to the calling package can be registered", + callback.mSuccess); + } + + // Verify that modules owned by the package are successfully registered. + public void testRegisterDexModuleSuccessfully() throws Exception { + ApplicationInfo info = getContext().getApplicationInfo(); + // Copy the main apk into the data folder and use it as a "module". + File dexModuleDir = new File(info.dataDir, "module-dir"); + File dexModule = new File(dexModuleDir, "module.apk"); + try { + assertNotNull(FileUtils.createDir( + dexModuleDir.getParentFile(), dexModuleDir.getName())); + Files.copy(Paths.get(info.getBaseCodePath()), dexModule.toPath(), + StandardCopyOption.REPLACE_EXISTING); + TestDexModuleRegisterCallback callback = new TestDexModuleRegisterCallback(); + getPm().registerDexModule(dexModule.toString(), callback); + assertTrue(callback.waitTillDone()); + assertEquals(dexModule.toString(), callback.mDexModulePath); + assertTrue(callback.waitTillDone()); + assertTrue(callback.mMessage, callback.mSuccess); + + // NOTE: + // This actually verifies internal behaviour which might change. It's not + // ideal but it's the best we can do since there's no other place we can currently + // write a better test. + for(String isa : getAppDexInstructionSets(info)) { + Files.exists(Paths.get(dexModuleDir.toString(), "oat", isa, "module.odex")); + Files.exists(Paths.get(dexModuleDir.toString(), "oat", isa, "module.vdex")); + } + } finally { + FileUtils.deleteContentsAndDir(dexModuleDir); + } + } + + // If the module does not exist on disk we should get a failure. + public void testRegisterDexModuleNotExists() throws Exception { + ApplicationInfo info = getContext().getApplicationInfo(); + String nonExistentApk = Paths.get(info.dataDir, "non-existent.apk").toString(); + TestDexModuleRegisterCallback callback = new TestDexModuleRegisterCallback(); + getPm().registerDexModule(nonExistentApk, callback); + assertTrue(callback.waitTillDone()); + assertEquals(nonExistentApk, callback.mDexModulePath); + assertTrue(callback.waitTillDone()); + assertFalse("DexModule registration should fail", callback.mSuccess); + } + + // Copied from com.android.server.pm.InstructionSets because we don't have access to it here. + private static String[] getAppDexInstructionSets(ApplicationInfo info) { + if (info.primaryCpuAbi != null) { + if (info.secondaryCpuAbi != null) { + return new String[] { + VMRuntime.getInstructionSet(info.primaryCpuAbi), + VMRuntime.getInstructionSet(info.secondaryCpuAbi) }; + } else { + return new String[] { + VMRuntime.getInstructionSet(info.primaryCpuAbi) }; + } + } + + return new String[] { VMRuntime.getInstructionSet(Build.SUPPORTED_ABIS[0]) }; + } + /*---------- Recommended install location tests ----*/ /* * TODO's diff --git a/core/tests/coretests/src/android/content/pm/PackageParserTest.java b/core/tests/coretests/src/android/content/pm/PackageParserTest.java index ca4141afae2d..b9bd193ad48c 100644 --- a/core/tests/coretests/src/android/content/pm/PackageParserTest.java +++ b/core/tests/coretests/src/android/content/pm/PackageParserTest.java @@ -220,41 +220,41 @@ public class PackageParserTest { * Unit test for PackageParser.getActivityConfigChanges(). * If the bit is 1 in the original configChanges, it is still 1 in the final configChanges. * If the bit is 0 in the original configChanges and the bit is not set to 1 in - * restartOnConfigChanges, the bit is changed to 1 in the final configChanges by default. + * recreateOnConfigChanges, the bit is changed to 1 in the final configChanges by default. */ @Test public void testGetActivityConfigChanges() { - // Not set in either configChanges or restartOnConfigChanges. + // Not set in either configChanges or recreateOnConfigChanges. int configChanges = 0x0000; // 00000000. - int restartOnConfigChanges = 0x0000; // 00000000. + int recreateOnConfigChanges = 0x0000; // 00000000. int finalConfigChanges = - PackageParser.getActivityConfigChanges(configChanges, restartOnConfigChanges); + PackageParser.getActivityConfigChanges(configChanges, recreateOnConfigChanges); assertEquals(0x0003, finalConfigChanges); // Should be 00000011. - // Not set in configChanges, but set in restartOnConfigChanges. + // Not set in configChanges, but set in recreateOnConfigChanges. configChanges = 0x0000; // 00000000. - restartOnConfigChanges = 0x0003; // 00000011. + recreateOnConfigChanges = 0x0003; // 00000011. finalConfigChanges = - PackageParser.getActivityConfigChanges(configChanges, restartOnConfigChanges); + PackageParser.getActivityConfigChanges(configChanges, recreateOnConfigChanges); assertEquals(0x0000, finalConfigChanges); // Should be 00000000. // Set in configChanges. configChanges = 0x0003; // 00000011. - restartOnConfigChanges = 0X0000; // 00000000. + recreateOnConfigChanges = 0X0000; // 00000000. finalConfigChanges = - PackageParser.getActivityConfigChanges(configChanges, restartOnConfigChanges); + PackageParser.getActivityConfigChanges(configChanges, recreateOnConfigChanges); assertEquals(0x0003, finalConfigChanges); // Should be 00000011. - restartOnConfigChanges = 0x0003; // 00000011. + recreateOnConfigChanges = 0x0003; // 00000011. finalConfigChanges = - PackageParser.getActivityConfigChanges(configChanges, restartOnConfigChanges); + PackageParser.getActivityConfigChanges(configChanges, recreateOnConfigChanges); assertEquals(0x0003, finalConfigChanges); // Should still be 00000011. // Other bit set in configChanges. configChanges = 0x0080; // 10000000, orientation. - restartOnConfigChanges = 0x0000; // 00000000. + recreateOnConfigChanges = 0x0000; // 00000000. finalConfigChanges = - PackageParser.getActivityConfigChanges(configChanges, restartOnConfigChanges); + PackageParser.getActivityConfigChanges(configChanges, recreateOnConfigChanges); assertEquals(0x0083, finalConfigChanges); // Should be 10000011. } } diff --git a/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java b/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java new file mode 100644 index 000000000000..6e38fb685887 --- /dev/null +++ b/core/tests/coretests/src/android/graphics/ColorSpaceRendererTest.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.graphics; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class ColorSpaceRendererTest { + + @Test + public void testRendererSize() { + Bitmap b = ColorSpace.createRenderer() + .size(0) + .render(); + assertEquals(128, b.getWidth()); + assertEquals(128, b.getHeight()); + + b = ColorSpace.createRenderer() + .size(768) + .render(); + assertEquals(768, b.getWidth()); + assertEquals(768, b.getHeight()); + } + + @Test + public void testRenderer() { + Bitmap b = ColorSpace.createRenderer() + .size(1024) + .clip(true) + .showWhitePoint(false) + .add(ColorSpace.get(ColorSpace.Named.SRGB), 0xffffffff) + .add(ColorSpace.get(ColorSpace.Named.DCI_P3), 0xffffffff) + .add(ColorSpace.get(ColorSpace.Named.PRO_PHOTO_RGB), 0.1f, 0.5f, 0.1f, 0xff000000) + .add(ColorSpace.get(ColorSpace.Named.ADOBE_RGB), 0.1f, 0.5f, 0.1f, 0xff000000) + .render(); + assertNotNull(b); + } + + @Test + public void testUcsRenderer() { + Bitmap b = ColorSpace.createRenderer() + .size(1024) + .clip(true) + .showWhitePoint(false) + .uniformChromaticityScale(true) + .add(ColorSpace.get(ColorSpace.Named.SRGB), 0xffffffff) + .add(ColorSpace.get(ColorSpace.Named.DCI_P3), 0xffffffff) + .add(ColorSpace.get(ColorSpace.Named.PRO_PHOTO_RGB), 0.1f, 0.5f, 0.1f, 0xff000000) + .add(ColorSpace.get(ColorSpace.Named.ADOBE_RGB), 0.1f, 0.5f, 0.1f, 0xff000000) + .render(); + assertNotNull(b); + } +} diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java index ffadad9d68c5..ab10e978b0f7 100644 --- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java +++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java @@ -78,6 +78,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback * Mask path is defined inside device configuration in following dimension: [100 x 100] * @hide */ + @TestApi public static final float MASK_SIZE = 100f; /** @@ -179,7 +180,6 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback * * @param backgroundDrawable drawable that should be rendered in the background * @param foregroundDrawable drawable that should be rendered in the foreground - * @hide */ public AdaptiveIconDrawable(Drawable backgroundDrawable, Drawable foregroundDrawable) { diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp index 8126d57a3a79..028d9f756fb7 100644 --- a/libs/hwui/JankTracker.cpp +++ b/libs/hwui/JankTracker.cpp @@ -291,7 +291,6 @@ void JankTracker::addFrame(const FrameInfo& frame) { / kSlowFrameBucketIntervalMs; framebucket = std::min(framebucket, static_cast<uint32_t>(mData->slowFrameCounts.size() - 1)); - framebucket = std::max(framebucket, 0u); mData->slowFrameCounts[framebucket]++; } diff --git a/media/java/android/media/AudioFocusRequest.java b/media/java/android/media/AudioFocusRequest.java index 29d19860eba3..b1dc3ad13f12 100644 --- a/media/java/android/media/AudioFocusRequest.java +++ b/media/java/android/media/AudioFocusRequest.java @@ -357,6 +357,20 @@ public final class AudioFocusRequest { } /** + * @hide + * Internal listener setter, no null checks on listener nor handler + * @param listener + * @param handler + * @return this {@code Builder} instance. + */ + @NonNull Builder setOnAudioFocusChangeListenerInt( + OnAudioFocusChangeListener listener, Handler handler) { + mFocusListener = listener; + mListenerHandler = handler; + return this; + } + + /** * Sets the listener called when audio focus changes after being requested with * {@link AudioManager#requestAudioFocus(AudioFocusRequest)}, and until being abandoned * with {@link AudioManager#abandonAudioFocusRequest(AudioFocusRequest)}. diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index ce07c9982623..0b5dff227d23 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -2445,7 +2445,7 @@ public class AudioManager { } final AudioFocusRequest afr = new AudioFocusRequest.Builder(durationHint) - .setOnAudioFocusChangeListener(l, null /* no Handler for this legacy API */) + .setOnAudioFocusChangeListenerInt(l, null /* no Handler for this legacy API */) .setAudioAttributes(requestAttributes) .setAcceptsDelayedFocusGain((flags & AUDIOFOCUS_FLAG_DELAY_OK) == AUDIOFOCUS_FLAG_DELAY_OK) diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 6f4118ecebbb..4496a82e55d5 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -437,7 +437,7 @@ public final class TvContract { public static final String PARAM_BROWSABLE_ONLY = "browsable_only"; /** - * A optional query, update or delete URI parameter that allows the caller to specify canonical + * An optional query, update or delete URI parameter that allows the caller to specify canonical * genre to filter programs. * @hide */ @@ -452,6 +452,13 @@ public final class TvContract { public static final String PARAM_PREVIEW = "preview"; /** + * An optional query, update or delete URI parameter that allows the caller to specify package + * name to filter channels. + * @hide + */ + public static final String PARAM_PACKAGE = "package"; + + /** * Builds an ID that uniquely identifies a TV input service. * * @param name The {@link ComponentName} of the TV input service to build ID for. diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index a292b8e4f81e..74085d39162c 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -949,9 +949,6 @@ public final class TvInputInfo implements Parcelable { com.android.internal.R.styleable.TvInputService); mSetupActivity = sa.getString( com.android.internal.R.styleable.TvInputService_setupActivity); - if (inputType == TYPE_TUNER && TextUtils.isEmpty(mSetupActivity)) { - throw new IllegalStateException("Setup activity not found for " + si.name); - } if (mCanRecord == null) { mCanRecord = sa.getBoolean( com.android.internal.R.styleable.TvInputService_canRecord, false); diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index e51025f43ea5..7b5f778e2853 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -745,7 +745,7 @@ public abstract class TvInputService extends Service { * Called when the application sets the surface. * * <p>The TV input service should render video onto the given surface. When called with - * {@code null}, the input service should immediately release any references to the + * {@code null}, the input service should immediately free any references to the * currently set surface and stop using it. * * @param surface The surface to be used for video rendering. Can be {@code null}. diff --git a/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java b/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java index 7a3ed24f8811..21c350be7c39 100644 --- a/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java @@ -20,14 +20,11 @@ import javax.microedition.khronos.egl.*; public class EGLSurfaceImpl extends EGLSurface { long mEGLSurface; - private long mNativePixelRef; public EGLSurfaceImpl() { mEGLSurface = 0; - mNativePixelRef = 0; } public EGLSurfaceImpl(long surface) { mEGLSurface = surface; - mNativePixelRef = 0; } @Override diff --git a/packages/BackupRestoreConfirmation/res/values-gl/strings.xml b/packages/BackupRestoreConfirmation/res/values-gl/strings.xml index c973a31fd71f..0a12aa7364ff 100644 --- a/packages/BackupRestoreConfirmation/res/values-gl/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-gl/strings.xml @@ -24,10 +24,10 @@ <string name="restore_confirm_text" msgid="7499866728030461776">"Solicitouse unha restauración de todos os datos desde un ordenador de escritorio conectado. Queres permitir esta operación?\n\nSe non o solicitaches ti, non permitas que se realice. Substituiranse todos os datos que conteña o dispositivo."</string> <string name="allow_restore_button_label" msgid="3081286752277127827">"Restaurar os meus datos"</string> <string name="deny_restore_button_label" msgid="1724367334453104378">"Non restaurar"</string> - <string name="current_password_text" msgid="8268189555578298067">"Insire o contrasinal de copia de seguranza actual a continuación:"</string> + <string name="current_password_text" msgid="8268189555578298067">"Insire o contrasinal da copia de seguranza actual a continuación:"</string> <string name="device_encryption_restore_text" msgid="1570864916855208992">"Insire o contrasinal de encriptación do teu dispositivo a continuación."</string> <string name="device_encryption_backup_text" msgid="5866590762672844664">"Insire o contrasinal de encriptación do dispositivo a continuación. Tamén se usará para encriptar o arquivo de copia de seguranza."</string> - <string name="backup_enc_password_text" msgid="4981585714795233099">"Insire un contrasinal para encriptar os datos da copia de seguranza completa. Se queda en branco este campo, usarase o contrasinal de copia de seguranza actual."</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"Insire un contrasinal para encriptar os datos da copia de seguranza completa. Se queda en branco este campo, usarase o contrasinal da copia de seguranza actual."</string> <string name="backup_enc_password_optional" msgid="1350137345907579306">"Se queres encriptar os datos da copia de seguranza completa, insire un contrasinal a continuación:"</string> <string name="backup_enc_password_required" msgid="7889652203371654149">"Como o teu dispositivo está cifrado, debes cifrar a túa copia de seguranza. Introduce un contrasinal a continuación:"</string> <string name="restore_enc_password_text" msgid="6140898525580710823">"Se os datos de restauración están encriptados, insire o contrasinal a continuación:"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml index 1eeed3c69632..0bfda36a37d6 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml @@ -198,7 +198,7 @@ <item msgid="1069584980746680398">"Razmera animacije 10x"</item> </string-array> <string-array name="overlay_display_devices_entries"> - <item msgid="1606809880904982133">"Nijedno"</item> + <item msgid="1606809880904982133">"Ništa"</item> <item msgid="9033194758688161545">"480 piksela"</item> <item msgid="1025306206556583600">"480 piksela (bezbedno)"</item> <item msgid="1853913333042744661">"720 piksela"</item> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index 35473b3a4167..fcbb89d0de11 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -316,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomalija (crveno-zeleno)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomalija (plavo-žuto)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Korekcija boja"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna i može da utiče na performanse."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna i može da utiče na kvalitet rada."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamenjuje ga <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Još oko <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> do potpunog punjenja"</string> diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index 61388c0e1ed0..f8eec7f237c2 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -95,7 +95,7 @@ <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Партатыўная кропка доступу"</string> <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-мадэм"</string> <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Мадэм"</string> - <string name="tether_settings_title_all" msgid="8356136101061143841">"Мадэм і партатыўны хотспот"</string> + <string name="tether_settings_title_all" msgid="8356136101061143841">"Рэжым мадэма"</string> <string name="managed_user_title" msgid="8109605045406748842">"Усе працоўныя праграмы"</string> <string name="user_guest" msgid="8475274842845401871">"Госць"</string> <string name="unknown" msgid="1592123443519355854">"Невядома"</string> @@ -306,7 +306,7 @@ <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Пераход..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Шыфраванне файлаў ужо дзейнічае"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Пераход на шыфраванне файлаў"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Перайдзіце з шыфравання раздзелаў даных на шыфраванне файлаў.\n !!Увага!! Гэта прывядзе да выдалення ўсіх даных.\n Гэта функцыя ў альфа-версіі, яна можа працаваць няправільна.\n Каб працягнуць, націсніце «Сцерці і перайсці...»."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Перайдзіце з шыфравання раздзелаў даных на шыфраванне файлаў.\n !!Увага!! Гэта прывядзе да выдалення ўсіх даных.\n Гэта функцыя ў альфа-версіі, яна можа працаваць няправільна.\n Каб працягнуць, націсніце \"Сцерці і перайсці...\"."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Сцерці і перайсці..."</string> <string name="picture_color_mode" msgid="4560755008730283695">"Каляровы рэжым выявы"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Выкарыстоўваць sRGB"</string> @@ -316,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Пратанамалія (чырвоны-зялёны)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Трытанамалія (сіні-жоўты)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Карэкцыя колеру"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Гэтая функцыя з\'яўляецца эксперыментальнай і можа паўплываць на прадукцыйнасць."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Гэта функцыя з\'яўляецца эксперыментальнай і можа паўплываць на прадукцыйнасць."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Перавызначаны <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Засталося каля <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Да поўнай зарадкі засталося <xliff:g id="TIME">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index aeea676ecedd..53c50b91dc81 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -216,7 +216,7 @@ <string name="enable_terminal_title" msgid="95572094356054120">"Локален терминал"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"Актив. на прил. за терминал с достъп до локалния команден ред"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"Проверка с HDCP"</string> - <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Повед. за проверка с HDCP"</string> + <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Проверка с HDCP"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Отстраняване на грешки"</string> <string name="debug_app" msgid="8349591734751384446">"Избор на прил. за отстран. на грешки"</string> <string name="debug_app_not_set" msgid="718752499586403499">"Няма зададено приложение за отстраняване на грешки"</string> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index 886d6356db4a..6d755ea8f979 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -103,13 +103,13 @@ <string name="launch_defaults_some" msgid="313159469856372621">"Neke zadane vrijednosti su postavljene"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Nema postavljenih zadanih vrijednosti"</string> <string name="tts_settings" msgid="8186971894801348327">"Postavke za pretvaranje teksta u govor"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"Izlaz za pretvaranje teksta u govor"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Pretvaranje teksta u govor"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Brzina govora"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Brzina kojom se izgovara tekst"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina"</string> <string name="tts_default_pitch_summary" msgid="1944885882882650009">"Utječe na ton sintetiziranog govora"</string> <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string> - <string name="tts_lang_use_system" msgid="2679252467416513208">"Koristi sistemski jezik"</string> + <string name="tts_lang_use_system" msgid="2679252467416513208">"Korištenje sistemskog jezika"</string> <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije izabran"</string> <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja glas za dati jezik za izgovoreni tekst"</string> <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string> @@ -117,7 +117,7 @@ <string name="tts_install_data_title" msgid="4264378440508149986">"Instaliraj glasovne podatke"</string> <string name="tts_install_data_summary" msgid="5742135732511822589">"Instalirajte glasovne podatke potrebne za sintetiziranje govora"</string> <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ovaj program za sintetiziranje govora u mogućnosti je da prikuplja sav tekst koji se izgovara, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Program omogućava aplikacija <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Da li želite koristiti ovaj program za sintetiziranje govora?"</string> - <string name="tts_engine_network_required" msgid="1190837151485314743">"Ovaj jezik zahtijeva mrežnu vezu radi za izlaz tekst-u-govor."</string> + <string name="tts_engine_network_required" msgid="1190837151485314743">"Ovaj jezik zahtijeva aktivnu mrežnu vezu za pretvaranje teksta u govor."</string> <string name="tts_default_sample_string" msgid="4040835213373086322">"Ovo je primjer sinteze govora"</string> <string name="tts_status_title" msgid="7268566550242584413">"Zadani status jezika"</string> <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> je u potpunosti podržan"</string> @@ -126,7 +126,7 @@ <string name="tts_status_checking" msgid="5339150797940483592">"Provjerava se…"</string> <string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string> <string name="tts_engine_settings_button" msgid="1030512042040722285">"Pokreni postavke programa"</string> - <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni program"</string> + <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni alat"</string> <string name="tts_general_section_title" msgid="4402572014604490502">"Opće postavke"</string> <string name="tts_reset_speech_pitch_title" msgid="5789394019544785915">"Postavite visinu glasa"</string> <string name="tts_reset_speech_pitch_summary" msgid="8700539616245004418">"Visinu glasa koji izgovara tekst postavite na podrazumjevanu."</string> @@ -216,7 +216,7 @@ <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući terminalnu aplik. koja nudi pristup lok. kom. okruženju"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjeravanje"</string> - <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Pos. ponaš. kod HDCP pr."</string> + <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Postavke HDCP provjere"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Otklanjanje grešaka"</string> <string name="debug_app" msgid="8349591734751384446">"Odaberi aplikaciju za otklanjanje grešaka"</string> <string name="debug_app_not_set" msgid="718752499586403499">"Nema postavljenih aplikac. za otklanjanje grešaka"</string> @@ -278,12 +278,12 @@ <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Neka sve aktivnosti budu takve da mogu mijenjati veličinu za prikaz sa više prozora, bez obzira na prikazane vrijednosti."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Omogući prozore nepravilnih oblika"</string> <string name="enable_freeform_support_summary" msgid="8247310463288834487">"Omogućiti podršku za eksperimentalne prozore nepravilnih oblika."</string> - <string name="local_backup_password_title" msgid="3860471654439418822">"Lozinka za rezervnu kopiju radne površine"</string> + <string name="local_backup_password_title" msgid="3860471654439418822">"Lozinka za sigurnosnu kopiju radne površine"</string> <string name="local_backup_password_summary_none" msgid="6951095485537767956">"Potpune sigurnosne kopije za računare trenutno nisu zaštićene"</string> <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Dodirnite da promijenite ili uklonite lozinku za potpune rezervne kopije sa radne površine"</string> - <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nova lozinka za rezervnu kopiju postavljena"</string> + <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nova lozinka za sigurnosnu kopiju postavljena"</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Nova lozinka i potvrda se ne podudaraju"</string> - <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nije uspjelo postavljanje lozinke za rezervnu kopiju"</string> + <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nije uspjelo postavljanje lozinke za sigurnosnu kopiju"</string> <string-array name="color_mode_names"> <item msgid="2425514299220523812">"Živopisan (zadano)"</item> <item msgid="8446070607501413455">"Prirodan"</item> @@ -302,11 +302,11 @@ <string name="select_webview_provider_title" msgid="4628592979751918907">"Postavljanje WebViewa"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Podesi WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ovaj izbor više ne vrijedi. Pokušajte ponovo."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvori u šifrirani fajl"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvaranje u šifrirani fajl"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pretvaranje…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fajl je već šifriran"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Pretvaranje u šifrirane fajlove"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Pretvori particiju sa podacima u particiju šifriranu sistemom fajlova.\n !! Upozorenje!! Ovo će izbrisati sve vaše podatke.\n Ova funkcija je u alfa fazi razvoja i možda neće ispravno raditi.\n Pritisnite \'Obriši i pretvori…\" da nastavite."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Pretvorite particiju sa podacima u particiju šifriranu sistemom fajlova.\n !! Upozorenje!! Ovo će izbrisati sve vaše podatke.\n Ova funkcija je u alfa fazi razvoja i možda neće ispravno raditi.\n Pritisnite \"Obriši i pretvori…\" da nastavite."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Obriši i pretvori…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Režim boja Slika"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Koristi sRGB"</string> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index 1c7ce0c58249..2a4db1d51694 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -302,7 +302,7 @@ <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementació de WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Configura la implementació de WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Aquesta opció ja no és vàlida. Torna-ho a provar."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteix en l\'encriptació de fitxers"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteix en encriptació de fitxers"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converteix…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"El fitxer ja està encriptat"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"S\'està convertint en l\'encriptació basada en fitxers"</string> diff --git a/packages/SettingsLib/res/values-gl/strings.xml b/packages/SettingsLib/res/values-gl/strings.xml index c433c0f5aaf9..8b57734635d3 100644 --- a/packages/SettingsLib/res/values-gl/strings.xml +++ b/packages/SettingsLib/res/values-gl/strings.xml @@ -91,11 +91,11 @@ <string name="process_kernel_label" msgid="3916858646836739323">"SO Android"</string> <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicacións eliminadas"</string> <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicacións e usuarios eliminados"</string> - <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoraxe de USB"</string> - <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona interactiva portátil"</string> - <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ancoraxe de Bluetooth"</string> - <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ancoraxe á rede"</string> - <string name="tether_settings_title_all" msgid="8356136101061143841">"Ancoraxe á rede e zona wifi"</string> + <string name="tether_settings_title_usb" msgid="6688416425801386511">"Conexión compart. por USB"</string> + <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona wifi portátil"</string> + <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Conexión por Bluetooth"</string> + <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Conexión compartida"</string> + <string name="tether_settings_title_all" msgid="8356136101061143841">"Conexión comp./zona wifi"</string> <string name="managed_user_title" msgid="8109605045406748842">"Aplicacións de traballo"</string> <string name="user_guest" msgid="8475274842845401871">"Convidado"</string> <string name="unknown" msgid="1592123443519355854">"Descoñecida"</string> @@ -149,7 +149,7 @@ <string name="development_settings_summary" msgid="1815795401632854041">"Definir as opcións de desenvolvemento de aplicacións"</string> <string name="development_settings_not_available" msgid="4308569041701535607">"As opcións de programador non están dispoñibles para este usuario"</string> <string name="vpn_settings_not_available" msgid="956841430176985598">"A configuración da VPN non está dispoñible para este usuario"</string> - <string name="tethering_settings_not_available" msgid="6765770438438291012">"A configuración da ancoraxe non está dispoñible para este usuario"</string> + <string name="tethering_settings_not_available" msgid="6765770438438291012">"A configuración da conexión compartida non está dispoñible para este usuario"</string> <string name="apn_settings_not_available" msgid="7873729032165324000">"A configuración do nome do punto de acceso non está dispoñible para este usuario"</string> <string name="enable_adb" msgid="7982306934419797485">"Depuración de USB"</string> <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración de erros cando o USB está conectado"</string> @@ -281,9 +281,9 @@ <string name="local_backup_password_title" msgid="3860471654439418822">"Contrasinal para copias"</string> <string name="local_backup_password_summary_none" msgid="6951095485537767956">"As copias de seguridade de ordenador completas non están protexidas"</string> <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Toca para cambiar ou eliminar o contrasinal para as copias de seguranza completas do escritorio"</string> - <string name="local_backup_password_toast_success" msgid="582016086228434290">"Novo contrasinal de copia de seguranza definido"</string> + <string name="local_backup_password_toast_success" msgid="582016086228434290">"Novo contrasinal da copia de seguranza definido"</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"O contrasinal novo e a confirmación non coinciden"</string> - <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Erro ao definir un contrasinal de copia de seguranza"</string> + <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Erro ao definir un contrasinal da copia de seguranza"</string> <string-array name="color_mode_names"> <item msgid="2425514299220523812">"Brillante (predeterminado)"</item> <item msgid="8446070607501413455">"Natural"</item> @@ -297,17 +297,17 @@ <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicacións inactivas"</string> <string name="inactive_app_inactive_summary" msgid="5091363706699855725">"Aplicación inactiva. Toca para alternar a configuración."</string> <string name="inactive_app_active_summary" msgid="4174921824958516106">"Aplicación activa. Toca para alternar a configuración."</string> - <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizos en execución"</string> + <string name="runningservices_settings_title" msgid="8097287939865165213">"En execución"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver e controlar servizos actualmente en execución"</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementación de WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Definir implementación de WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opción xa non é válida. Téntao de novo."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter no encriptado baseado en ficheiros"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Cambiar a cifraxe de ficheiros"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Xa se encriptou o ficheiro"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Convertendo no encriptado baseado en ficheiros"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converte a partición de datos nun encriptado baseado en ficheiros.\n Advertencia: Esta acción borrará todos os datos.\n Esta función é alfa e quizais non funcione correctamente.\n Toca Borrar e converter... para continuar."</string> - <string name="button_convert_fbe" msgid="5152671181309826405">"Borrar e converter..."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Converte a partición de datos nunha encriptación baseada en ficheiros.\n Advertencia: Esta acción borrará todos os datos.\n Esta función é alfa e quizais non funcione correctamente.\n Para continuar, toca Limpar e converter..."</string> + <string name="button_convert_fbe" msgid="5152671181309826405">"Limpar e converter..."</string> <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imaxe"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Desactivado"</string> diff --git a/packages/SettingsLib/res/values-hy/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml index 0ec7637178df..14ba22334ea9 100644 --- a/packages/SettingsLib/res/values-hy/strings.xml +++ b/packages/SettingsLib/res/values-hy/strings.xml @@ -299,15 +299,15 @@ <string name="inactive_app_active_summary" msgid="4174921824958516106">"Ակտիվ է: Հպեք՝ փոխելու համար:"</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"Աշխատեցվող ծառայություններ"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"Դիտել և վերահսկել ընթացիկ աշխատեցվող ծառայությունները"</string> - <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-ի իրականացում"</string> + <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView ծառայություն"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Ընտրեք WebView-ի իրականացումը"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Այս ընտրանքն այլևս վավեր չէ: Փորձեք նորից:"</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Վերածել ֆայլային գաղտնագրման"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Անցում ֆայլերի գաղտնագրման"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Փոխարկել…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ֆայլային գաղտնագրումն արդեն կատարվել է"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Վերածում ֆայլային գաղտնագրման"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Ստեղծեք ֆայլային գաղտնագրում՝ փոխարկելով տվյալների բաժինը:\n !!Ուշադրություն!! Ձեր բոլոր տվյալները կջնջվեն:\n Այս գործառույթը դեռ գտնվում է փորձարկման փուլում և հնարավոր է ճիշտ չաշխատի:\n Շարունակելու համար սեղմեք «Սրբել և փոխարկել...» կոճակը:"</string> - <string name="button_convert_fbe" msgid="5152671181309826405">"Սրբել և փոխարկել…"</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Անցնել առանձին ֆայլերի գաղտնագրման։\n Ուշադրությո՛ւն։ Ձեր բոլոր տվյալները կջնջվեն:\n Այս գործառույթը դեռ գտնվում է փորձարկման փուլում և, հնարավոր է, ճիշտ չաշխատի:\n Շարունակելու համար սեղմեք «Սրբել և անցնել...» կոճակը:"</string> + <string name="button_convert_fbe" msgid="5152671181309826405">"Սրբել և անցնել…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Նկարի գունային ռեժիմ"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Օգտագործել sRGB"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Կասեցված է"</string> @@ -315,8 +315,8 @@ <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"Դեյտերանոմալիա (կարմիր-կանաչ)"</string> <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Պրոտանոմալիա (կարմիր-կանաչ)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Տրիտանոմալիա (կապույտ-դեղին)"</string> - <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Գունային կարգաբերում"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Սա փորձնական գործառույթ է և կարող է ազդել աշխատանքի վրա:"</string> + <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Գունաշտկում"</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Սա փորձնական գործառույթ է և կարող է ազդել սարքի աշխատանքի վրա:"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Գերազանցված է <xliff:g id="TITLE">%1$s</xliff:g>-ից"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Մնացել է մոտ <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Մինչև լրիվ լիցքավորումը մնացել է <xliff:g id="TIME">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 213aaf365525..e64e00788a56 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -267,7 +267,7 @@ <string name="animator_duration_scale_title" msgid="3406722410819934083">"קנה מידה למשך זמן אנימציה"</string> <string name="overlay_display_devices_title" msgid="5364176287998398539">"צור הדמיית תצוגות משניות"</string> <string name="debug_applications_category" msgid="4206913653849771549">"אפליקציות"</string> - <string name="immediately_destroy_activities" msgid="1579659389568133959">"אל תשמור פעילויות"</string> + <string name="immediately_destroy_activities" msgid="1579659389568133959">"ללא שמירת פעילויות"</string> <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"השמד כל פעילות ברגע שהמשתמש עוזב אותה"</string> <string name="app_process_limit_title" msgid="4280600650253107163">"מגבלה של תהליכים ברקע"</string> <string name="show_all_anrs" msgid="28462979638729082">"הצג את כל פריטי ה-ANR"</string> @@ -302,12 +302,12 @@ <string name="select_webview_provider_title" msgid="4628592979751918907">"יישום WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"הגדרת יישום WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"אפשרות זו כבר אינה תקפה. נסה שוב."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"המר להצפנת קבצים"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"המרה לצורך הצפנת קבצים"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"המר..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"הצפנת קבצים כבר מוגדרת"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"המרה להצפנה מבוססת קבצים"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"המר את מחיצת הנתונים להצפנה מבוססת-קבצים.\n אזהרה!! פעולה זו תמחק את כל הנתונים.\n תכונה זו זמינה בגרסת אלפא וייתכן שלא תפעל כראוי.\n הקש על \'מחק והמר...\' כדי להמשיך."</string> - <string name="button_convert_fbe" msgid="5152671181309826405">"מחק והמר..."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"המר את מחיצת הנתונים להצפנה מבוססת-קבצים.\n אזהרה!! פעולה זו תמחק את כל הנתונים.\n תכונה זו זמינה בגרסת אלפא וייתכן שלא תפעל כראוי.\n הקש על \'מחיקה והמרה…\' כדי להמשיך."</string> + <string name="button_convert_fbe" msgid="5152671181309826405">"מחיקה והמרה…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"מצב צבע התמונה"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"שימוש ב-sRGB"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"מושבת"</string> diff --git a/packages/SettingsLib/res/values-ka/strings.xml b/packages/SettingsLib/res/values-ka/strings.xml index 088d2955474e..08e644950e22 100644 --- a/packages/SettingsLib/res/values-ka/strings.xml +++ b/packages/SettingsLib/res/values-ka/strings.xml @@ -316,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"პროტოანომალია (წითელი-მწვანე)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"ტრიტანომალია (ლურჯი-ყვითელი)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ფერის კორექცია"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ეს ფუნქცია საცდელია და შეიძლება გავლენა იქონიოს შესრულებაზე."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ეს ფუნქცია საცდელია და შეიძლება გავლენა იქონიოს ფუნქციონალობაზე."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"უკუგებულია <xliff:g id="TITLE">%1$s</xliff:g>-ის მიერ"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"დარჩა დაახლოებით <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"სრულ დატენვამდე დარჩენილია <xliff:g id="TIME">%1$s</xliff:g>"</string> diff --git a/packages/SettingsLib/res/values-ky/arrays.xml b/packages/SettingsLib/res/values-ky/arrays.xml index 1d7a9a4284e5..9c8e28a1e42d 100644 --- a/packages/SettingsLib/res/values-ky/arrays.xml +++ b/packages/SettingsLib/res/values-ky/arrays.xml @@ -50,8 +50,8 @@ </string-array> <string-array name="hdcp_checking_titles"> <item msgid="441827799230089869">"Эч качан текшерилбесин"</item> - <item msgid="6042769699089883931">"DRM мазмунун гана текшерүү"</item> - <item msgid="9174900380056846820">"Ар дайым текшерүү"</item> + <item msgid="6042769699089883931">"DRM мазмуну гана текшерилсин"</item> + <item msgid="9174900380056846820">"Ар дайым текшерилсин"</item> </string-array> <string-array name="hdcp_checking_summaries"> <item msgid="505558545611516707">"Эч качан HDCP текшерүү колдонулбасын"</item> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index 410f80bd948e..97830f019975 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -216,7 +216,7 @@ <string name="enable_terminal_title" msgid="95572094356054120">"Жергиликтүү терминал"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"Жергиликтүү буйрук кабыгын сунуштаган терминалга уруксат берүү"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP текшерүү"</string> - <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP текшерүү арактн коюу"</string> + <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP текшерүү тартиби"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Жөндөө"</string> <string name="debug_app" msgid="8349591734751384446">"Жөндөөчү колдонмону тандоо"</string> <string name="debug_app_not_set" msgid="718752499586403499">"Эч бир жөндөөчү колдонмо орнотулган жок."</string> @@ -299,15 +299,15 @@ <string name="inactive_app_active_summary" msgid="4174921824958516106">"Иштеп турат. Которуштуруу үчүн таптап коюңуз."</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"Иштеп жаткан кызматтар"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"Учурда иштеп жаткан кызматтарды көрүү жана көзөмөлдөө"</string> - <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView аткарылышы"</string> + <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView кызматы"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView аткарылышын коюу"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Тандалган нерсе жараксыз болуп калган. Кайра аракет кылыңыз."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файл шифрлөөсүнө айландыруу"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файлдарды шифрлөөгө өтүү"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Айландыруу…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Файл мурунтан эле шифрленген"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Файл негизиндеги шифрлөөгө айландырылууда"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Дайындардын бөлүнүшүн файл негизиндеги шифрлөөгө айландыруу.\n !!Эскертүү!! Бул бардык дайындарыңызды тазалайт.\n Бул функция - альфа жана туура иштебеши мүмкүн.\n Улантуу үчүн \'Сүрүп салуу жана айландыруу…\' дегенди басыңыз."</string> - <string name="button_convert_fbe" msgid="5152671181309826405">"Сүрүп салуу жана айландыруу…"</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Айрым файлдарды шифрлөөгө өтөсүз.\n !!Эскертүү!! Ушуну менен бардык дайындар өчөт.\n Бул альфа версия болгондуктан, функция талаптагыдай иштебеши мүмкүн.\n Улантуу үчүн \'Өчүрүп туруп, кийинкиге өтүү…\' дегенди басыңыз."</string> + <string name="button_convert_fbe" msgid="5152671181309826405">"Өчүрүп туруп, кийинкиге өтүү…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Сүрөт түсү режими"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB колдонуңуз"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"Токтотулган"</string> diff --git a/packages/SettingsLib/res/values-sr/arrays.xml b/packages/SettingsLib/res/values-sr/arrays.xml index f57989b6d1b5..ef1c9de94847 100644 --- a/packages/SettingsLib/res/values-sr/arrays.xml +++ b/packages/SettingsLib/res/values-sr/arrays.xml @@ -198,7 +198,7 @@ <item msgid="1069584980746680398">"Размера анимације 10x"</item> </string-array> <string-array name="overlay_display_devices_entries"> - <item msgid="1606809880904982133">"Ниједно"</item> + <item msgid="1606809880904982133">"Ништа"</item> <item msgid="9033194758688161545">"480 пиксела"</item> <item msgid="1025306206556583600">"480 пиксела (безбедно)"</item> <item msgid="1853913333042744661">"720 пиксела"</item> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 9c08f97d96a9..3992dbe9e95b 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -316,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Протаномалија (црвено-зелено)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Тританомалија (плаво-жуто)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Корекција боја"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ова функција је експериментална и може да утиче на перформансе."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ова функција је експериментална и може да утиче на квалитет рада."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Замењује га <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Још око <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> до потпуног пуњења"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index a217708c9da6..d3f137f94626 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -103,10 +103,10 @@ <string name="launch_defaults_some" msgid="313159469856372621">"Налаштовано деякі значення за умовчанням"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Немає значень за умовчанням"</string> <string name="tts_settings" msgid="8186971894801348327">"Налашт. синтезу мовлення"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"Вивід синтезу мовлення з тексту"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Синтез мовлення"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Темп мовлення"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Швидкість відтворення тексту"</string> - <string name="tts_default_pitch_title" msgid="6135942113172488671">"Вис. зв."</string> + <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string> <string name="tts_default_pitch_summary" msgid="1944885882882650009">"Впливає на тон синтезованого мовлення"</string> <string name="tts_default_lang_title" msgid="8018087612299820556">"Мова"</string> <string name="tts_lang_use_system" msgid="2679252467416513208">"Використовувати мову системи"</string> @@ -302,7 +302,7 @@ <string name="select_webview_provider_title" msgid="4628592979751918907">"Застосування WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Налаштувати застосування WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ця опція більше не дійсна. Повторіть спробу."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертувати в зашифрований файл"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Перехід до шифрування файлів"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Конвертація…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Уже конвертовано в зашифрований файл"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Конвертація в зашифрований файл"</string> diff --git a/packages/SettingsLib/res/values-uz/arrays.xml b/packages/SettingsLib/res/values-uz/arrays.xml index 76be77188c7a..cc7ef9b6b181 100644 --- a/packages/SettingsLib/res/values-uz/arrays.xml +++ b/packages/SettingsLib/res/values-uz/arrays.xml @@ -223,7 +223,7 @@ <item msgid="1064373276095698656">"Chizmaning sinov buyruqlarini yashil bilan"</item> </string-array> <string-array name="track_frame_time_entries"> - <item msgid="2193584639058893150">"O‘chirib qo‘yish"</item> + <item msgid="2193584639058893150">"Faolsizlantirish"</item> <item msgid="2751513398307949636">"Ekranda bo‘laklar tarzida"</item> <item msgid="2355151170975410323">"“<xliff:g id="AS_TYPED_COMMAND">adb shell dumpsys gfxinfo</xliff:g>” buyrug‘ida"</item> </string-array> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 4e92c4640811..ad9dc3a85e59 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -28,7 +28,7 @@ <string name="wifi_disabled_by_recommendation_provider" msgid="5168315140978066096">"Sifatsiz tarmoq sababli ulanib bo‘lmadi"</string> <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi ulanishini o‘rnatib bo‘lmadi"</string> <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tasdiqdan o‘tishda muammo"</string> - <string name="wifi_not_in_range" msgid="1136191511238508967">"Aloqada emas"</string> + <string name="wifi_not_in_range" msgid="1136191511238508967">"Xizmat doirasidan tashqarida"</string> <string name="wifi_no_internet_no_reconnect" msgid="5724903347310541706">"Avtomatik ravishda ulanilmaydi"</string> <string name="wifi_no_internet" msgid="3880396223819116454">"Internet aloqasi yo‘q"</string> <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> tomonidan saqlangan"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityButtonHelper.java b/packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityButtonHelper.java index 972ea347e6dd..d5725e6aefed 100644 --- a/packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityButtonHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityButtonHelper.java @@ -18,7 +18,6 @@ package com.android.settingslib.accessibility; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Context; -import android.content.res.Resources; import android.provider.Settings; import android.view.accessibility.AccessibilityManager; @@ -55,8 +54,4 @@ public class AccessibilityButtonHelper { public static boolean isRequested(Context ctx) { return isRequestedByMagnification(ctx) || isRequestedByAccessibilityService(ctx); } - - public static boolean isDeviceSupported(Resources res) { - return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar); - } } diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/PrivateStorageInfo.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/PrivateStorageInfo.java index ccf7a0bfdfc6..39dfe0ef6620 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/PrivateStorageInfo.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/PrivateStorageInfo.java @@ -33,7 +33,7 @@ public class PrivateStorageInfo { public final long freeBytes; public final long totalBytes; - private PrivateStorageInfo(long freeBytes, long totalBytes) { + public PrivateStorageInfo(long freeBytes, long totalBytes) { this.freeBytes = freeBytes; this.totalBytes = totalBytes; } diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java index e5cdc85a48d9..988060eac64d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java +++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java @@ -16,6 +16,7 @@ package com.android.settingslib.dream; +import android.annotation.IntDef; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -35,6 +36,8 @@ import android.util.AttributeSet; import android.util.Log; import android.util.Xml; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -68,6 +71,15 @@ public class DreamBackend { } } + @Retention(RetentionPolicy.SOURCE) + @IntDef({WHILE_CHARGING, WHILE_DOCKED, EITHER, NEVER}) + public @interface WhenToDream{} + + public static final int WHILE_CHARGING = 0; + public static final int WHILE_DOCKED = 1; + public static final int EITHER = 2; + public static final int NEVER = 3; + private final Context mContext; private final IDreamManager mDreamManager; private final DreamInfoComparator mComparator; @@ -75,6 +87,15 @@ public class DreamBackend { private final boolean mDreamsActivatedOnSleepByDefault; private final boolean mDreamsActivatedOnDockByDefault; + private static DreamBackend sInstance; + + public static DreamBackend getInstance(Context context) { + if (sInstance == null) { + sInstance = new DreamBackend(context); + } + return sInstance; + } + public DreamBackend(Context context) { mContext = context; mDreamManager = IDreamManager.Stub.asInterface( @@ -138,6 +159,42 @@ public class DreamBackend { return null; } + public @WhenToDream int getWhenToDreamSetting() { + if (!isEnabled()) { + return NEVER; + } + return isActivatedOnDock() && isActivatedOnSleep() ? EITHER + : isActivatedOnDock() ? WHILE_DOCKED + : isActivatedOnSleep() ? WHILE_CHARGING + : NEVER; + } + + public void setWhenToDream(@WhenToDream int whenToDream) { + setEnabled(whenToDream != NEVER); + + switch (whenToDream) { + case WHILE_CHARGING: + setActivatedOnDock(false); + setActivatedOnSleep(true); + break; + + case WHILE_DOCKED: + setActivatedOnDock(true); + setActivatedOnSleep(false); + break; + + case EITHER: + setActivatedOnDock(true); + setActivatedOnSleep(true); + break; + + case NEVER: + default: + break; + } + + } + public boolean isEnabled() { return getBoolean(Settings.Secure.SCREENSAVER_ENABLED, mDreamsEnabledByDefault); } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index a6347c67efd8..4b304b2353b3 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -35,6 +35,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; +import android.content.res.Resources; import android.database.Cursor; import android.database.MatrixCursor; import android.database.sqlite.SQLiteDatabase; @@ -185,6 +186,26 @@ public class SettingsProvider extends ContentProvider { private static final Bundle NULL_SETTING_BUNDLE = Bundle.forPair( Settings.NameValueTable.VALUE, null); + // Overlay specified settings whitelisted for Instant Apps + private static final Set<String> OVERLAY_ALLOWED_GLOBAL_INSTANT_APP_SETTINGS = new ArraySet<>(); + private static final Set<String> OVERLAY_ALLOWED_SYSTEM_INSTANT_APP_SETTINGS = new ArraySet<>(); + private static final Set<String> OVERLAY_ALLOWED_SECURE_INSTANT_APP_SETTINGS = new ArraySet<>(); + + static { + for (String name : Resources.getSystem().getStringArray( + com.android.internal.R.array.config_allowedGlobalInstantAppSettings)) { + OVERLAY_ALLOWED_GLOBAL_INSTANT_APP_SETTINGS.add(name); + } + for (String name : Resources.getSystem().getStringArray( + com.android.internal.R.array.config_allowedSystemInstantAppSettings)) { + OVERLAY_ALLOWED_SYSTEM_INSTANT_APP_SETTINGS.add(name); + } + for (String name : Resources.getSystem().getStringArray( + com.android.internal.R.array.config_allowedSecureInstantAppSettings)) { + OVERLAY_ALLOWED_SECURE_INSTANT_APP_SETTINGS.add(name); + } + } + // Changes to these global settings are synchronously persisted private static final Set<String> CRITICAL_GLOBAL_SETTINGS = new ArraySet<>(); static { @@ -898,14 +919,13 @@ public class SettingsProvider extends ContentProvider { Slog.v(LOG_TAG, "getGlobalSetting(" + name + ")"); } + // Ensure the caller can access the setting. + enforceSettingReadable(name, SETTINGS_TYPE_GLOBAL, UserHandle.getCallingUserId()); + // Get the value. synchronized (mLock) { - Setting setting = mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_GLOBAL, + return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_GLOBAL, UserHandle.USER_SYSTEM, name); - // Ensure the caller can access the setting before we return it. - enforceSettingReadable(setting, name, SETTINGS_TYPE_GLOBAL, - UserHandle.getCallingUserId()); - return setting; } } @@ -1063,6 +1083,9 @@ public class SettingsProvider extends ContentProvider { // Resolve the userId on whose behalf the call is made. final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId); + // Ensure the caller can access the setting. + enforceSettingReadable(name, SETTINGS_TYPE_SECURE, UserHandle.getCallingUserId()); + // Determine the owning user as some profile settings are cloned from the parent. final int owningUserId = resolveOwningUserIdForSecureSettingLocked(callingUserId, name); @@ -1076,7 +1099,6 @@ public class SettingsProvider extends ContentProvider { // As of Android O, the SSAID is read from an app-specific entry in table // SETTINGS_FILE_SSAID, unless accessed by a system process. - // All apps are allowed to access their SSAID, so we skip the permission check. if (isNewSsaidSetting(name)) { PackageInfo callingPkg = getCallingPackageInfo(owningUserId); synchronized (mLock) { @@ -1086,12 +1108,8 @@ public class SettingsProvider extends ContentProvider { // Not the SSAID; do a straight lookup synchronized (mLock) { - Setting setting = mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SECURE, + return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SECURE, owningUserId, name); - // Ensure the caller can access the setting before we return it. - enforceSettingReadable(setting, name, SETTINGS_TYPE_SECURE, - UserHandle.getCallingUserId()); - return setting; } } @@ -1292,18 +1310,15 @@ public class SettingsProvider extends ContentProvider { // Resolve the userId on whose behalf the call is made. final int callingUserId = resolveCallingUserIdEnforcingPermissionsLocked(requestingUserId); + // Ensure the caller can access the setting. + enforceSettingReadable(name, SETTINGS_TYPE_SYSTEM, UserHandle.getCallingUserId()); // Determine the owning user as some profile settings are cloned from the parent. final int owningUserId = resolveOwningUserIdForSystemSettingLocked(callingUserId, name); // Get the value. synchronized (mLock) { - Setting setting = mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SYSTEM, - owningUserId, name); - // Ensure the caller can access the setting before we return it. - enforceSettingReadable(setting, name, SETTINGS_TYPE_SYSTEM, - UserHandle.getCallingUserId()); - return setting; + return mSettingsRegistry.getSettingLocked(SETTINGS_TYPE_SYSTEM, owningUserId, name); } } @@ -1635,6 +1650,19 @@ public class SettingsProvider extends ContentProvider { } } + private Set<String> getOverlayInstantAppAccessibleSettings(int settingsType) { + switch (settingsType) { + case SETTINGS_TYPE_GLOBAL: + return OVERLAY_ALLOWED_GLOBAL_INSTANT_APP_SETTINGS; + case SETTINGS_TYPE_SYSTEM: + return OVERLAY_ALLOWED_SYSTEM_INSTANT_APP_SETTINGS; + case SETTINGS_TYPE_SECURE: + return OVERLAY_ALLOWED_SECURE_INSTANT_APP_SETTINGS; + default: + throw new IllegalArgumentException("Invalid settings type: " + settingsType); + } + } + private List<String> getSettingsNamesLocked(int settingsType, int userId) { boolean instantApp; if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) { @@ -1650,23 +1678,16 @@ public class SettingsProvider extends ContentProvider { } } - private void enforceSettingReadable(Setting setting, String settingName, int settingsType, - int userId) { + private void enforceSettingReadable(String settingName, int settingsType, int userId) { if (UserHandle.getAppId(Binder.getCallingUid()) < Process.FIRST_APPLICATION_UID) { return; } ApplicationInfo ai = getCallingApplicationInfoOrThrow(); - // Installed apps are allowed to read all settings. if (!ai.isInstantApp()) { return; } - // Instant Apps are allowed to read settings defined by applications. - // TODO: Replace this with an API that allows the setting application to say if a setting - // shoud/shouldn't be accessible. - if (!setting.isDefaultFromSystem()) { - return; - } - if (!getInstantAppAccessibleSettings(settingsType).contains(settingName)) { + if (!getInstantAppAccessibleSettings(settingsType).contains(settingName) + && !getOverlayInstantAppAccessibleSettings(settingsType).contains(settingName)) { throw new SecurityException("Setting " + settingName + " is not accessible from" + " ephemeral package " + getCallingPackage()); } diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index a98afa9e6830..9273f01ce53e 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -130,6 +130,9 @@ <!-- size at which Notification icons will be drawn in the status bar --> <dimen name="status_bar_icon_drawing_size">17dp</dimen> + <!-- size at which Notification icons will be drawn on Ambient Display --> + <dimen name="status_bar_icon_drawing_size_dark">@*android:dimen/notification_header_icon_size_ambient</dimen> + <!-- opacity at which Notification icons will be drawn in the status bar --> <item type="dimen" name="status_bar_icon_drawing_alpha">90%</item> diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index f4d4a9ff327d..cfac2b70c992 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -248,7 +248,7 @@ public class Dependency extends SystemUI { new FragmentService(mContext)); mProviders.put(ExtensionController.class, () -> - new ExtensionControllerImpl()); + new ExtensionControllerImpl(mContext)); mProviders.put(PluginDependencyProvider.class, () -> new PluginDependencyProvider(get(PluginManager.class))); diff --git a/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java b/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java new file mode 100644 index 000000000000..880951036661 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/fragments/ExtensionFragmentListener.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.fragments; + +import android.app.Fragment; +import android.util.Log; +import android.view.View; + +import com.android.systemui.plugins.FragmentBase; +import com.android.systemui.statusbar.policy.ExtensionController.Extension; + +import java.util.function.Consumer; + +/** + * Wires up an Extension to a Fragment tag/id so that it always contains the class + * selected by the extension. + */ +public class ExtensionFragmentListener<T extends FragmentBase> implements Consumer<T> { + + private static final String TAG = "ExtensionFragmentListener"; + + private final FragmentHostManager mFragmentHostManager; + private final String mTag; + private final Extension<T> mExtension; + private String mOldClass; + + private ExtensionFragmentListener(View view, String tag, int id, Extension<T> extension) { + mTag = tag; + mFragmentHostManager = FragmentHostManager.get(view); + mExtension = extension; + mFragmentHostManager.getFragmentManager().beginTransaction() + .replace(id, (Fragment) mExtension.get(), mTag) + .commit(); + } + + @Override + public void accept(T extension) { + try { + Fragment.class.cast(extension); + mFragmentHostManager.getExtensionManager().setCurrentExtension(mTag, + mOldClass, extension.getClass().getName(), mExtension.getContext()); + mOldClass = extension.getClass().getName(); + } catch (ClassCastException e) { + Log.e(TAG, extension.getClass().getName() + " must be a Fragment", e); + } + } + + public static <T> void attachExtensonToFragment(View view, String tag, int id, + Extension<T> extension) { + extension.addCallback(new ExtensionFragmentListener(view, tag, id, extension)); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java index 8ac97f3306be..4dbf6f98e3e6 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java @@ -28,6 +28,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Parcelable; +import android.support.annotation.NonNull; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; @@ -51,7 +52,7 @@ public class FragmentHostManager { private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges( ActivityInfo.CONFIG_FONT_SCALE); private final FragmentService mManager; - private final PluginFragmentManager mPlugins = new PluginFragmentManager(); + private final ExtensionFragmentManager mPlugins = new ExtensionFragmentManager(); private FragmentController mFragments; private FragmentLifecycleCallbacks mLifecycleCallbacks; @@ -174,7 +175,7 @@ public class FragmentHostManager { return mFragments.getFragmentManager(); } - PluginFragmentManager getPluginManager() { + ExtensionFragmentManager getExtensionManager() { return mPlugins; } @@ -261,22 +262,16 @@ public class FragmentHostManager { } } - class PluginFragmentManager { - private final ArrayMap<String, Context> mPluginLookup = new ArrayMap<>(); + class ExtensionFragmentManager { + private final ArrayMap<String, Context> mExtensionLookup = new ArrayMap<>(); - public void removePlugin(String tag, String currentClass, String defaultClass) { + public void setCurrentExtension(@NonNull String tag, @Nullable String oldClass, + @NonNull String currentClass, @Nullable Context context) { Fragment fragment = getFragmentManager().findFragmentByTag(tag); - mPluginLookup.remove(currentClass); - getFragmentManager().beginTransaction() - .replace(((View) fragment.getView().getParent()).getId(), - instantiate(mContext, defaultClass, null), tag) - .commit(); - reloadFragments(); - } - - public void setCurrentPlugin(String tag, String currentClass, Context context) { - Fragment fragment = getFragmentManager().findFragmentByTag(tag); - mPluginLookup.put(currentClass, context); + if (oldClass != null) { + mExtensionLookup.remove(oldClass); + } + mExtensionLookup.put(currentClass, context); getFragmentManager().beginTransaction() .replace(((View) fragment.getView().getParent()).getId(), instantiate(context, currentClass, null), tag) @@ -292,11 +287,11 @@ public class FragmentHostManager { } Fragment instantiate(Context context, String className, Bundle arguments) { - Context pluginContext = mPluginLookup.get(className); - if (pluginContext != null) { - Fragment f = Fragment.instantiate(pluginContext, className, arguments); + Context extensionContext = mExtensionLookup.get(className); + if (extensionContext != null) { + Fragment f = Fragment.instantiate(extensionContext, className, arguments); if (f instanceof Plugin) { - ((Plugin) f).onCreate(mContext, pluginContext); + ((Plugin) f).onCreate(mContext, extensionContext); } return f; } diff --git a/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java b/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java deleted file mode 100644 index 03bb73da3902..000000000000 --- a/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.android.systemui.fragments; - -import android.app.Fragment; -import android.content.Context; -import android.util.Log; -import android.view.View; - -import com.android.systemui.Dependency; -import com.android.systemui.plugins.FragmentBase; -import com.android.systemui.plugins.Plugin; -import com.android.systemui.plugins.PluginListener; -import com.android.systemui.plugins.PluginManager; - -public class PluginFragmentListener implements PluginListener<Plugin> { - - private static final String TAG = "PluginFragmentListener"; - - private final FragmentHostManager mFragmentHostManager; - private final PluginManager mPluginManager; - private final Class<? extends Fragment> mDefaultClass; - private final Class<? extends FragmentBase> mExpectedInterface; - private final String mTag; - - public PluginFragmentListener(View view, String tag, Class<? extends Fragment> defaultFragment, - Class<? extends FragmentBase> expectedInterface) { - mTag = tag; - mFragmentHostManager = FragmentHostManager.get(view); - mPluginManager = Dependency.get(PluginManager.class); - mExpectedInterface = expectedInterface; - mDefaultClass = defaultFragment; - } - - public void startListening() { - mPluginManager.addPluginListener(this, mExpectedInterface, - false /* Only allow one */); - } - - public void stopListening() { - mPluginManager.removePluginListener(this); - } - - @Override - public void onPluginConnected(Plugin plugin, Context pluginContext) { - try { - mExpectedInterface.cast(plugin); - Fragment.class.cast(plugin); - mFragmentHostManager.getPluginManager().setCurrentPlugin(mTag, - plugin.getClass().getName(), pluginContext); - } catch (ClassCastException e) { - Log.e(TAG, plugin.getClass().getName() + " must be a Fragment and implement " - + mExpectedInterface.getName(), e); - } - } - - @Override - public void onPluginDisconnected(Plugin plugin) { - mFragmentHostManager.getPluginManager().removePlugin(mTag, - plugin.getClass().getName(), mDefaultClass.getName()); - } -} diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index 28bd23ce9825..df03fdc46d06 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -103,6 +103,7 @@ public class PipManager implements BasePipManager { // Re-enable touches after the animation completes mTouchHandler.setTouchEnabled(true); mTouchHandler.onPinnedStackAnimationEnded(); + mMenuController.onPinnedStackAnimationEnded(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java index 79ac8160c095..65f24cf5ba98 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java @@ -80,6 +80,7 @@ public class PipMenuActivity extends Activity { public static final int MESSAGE_HIDE_MENU = 3; public static final int MESSAGE_UPDATE_ACTIONS = 4; public static final int MESSAGE_UPDATE_DISMISS_FRACTION = 5; + public static final int MESSAGE_ANIMATION_ENDED = 6; private static final long INITIAL_DISMISS_DELAY = 3500; private static final long POST_INTERACTION_DISMISS_DELAY = 2000; @@ -92,6 +93,7 @@ public class PipMenuActivity extends Activity { private int mMenuState; private boolean mAllowMenuTimeout = true; + private boolean mAllowTouches = true; private final List<RemoteAction> mActions = new ArrayList<>(); @@ -149,6 +151,10 @@ public class PipMenuActivity extends Activity { updateDismissFraction(data.getFloat(EXTRA_DISMISS_FRACTION)); break; } + case MESSAGE_ANIMATION_ENDED: { + mAllowTouches = true; + break; + } } } }); @@ -245,6 +251,10 @@ public class PipMenuActivity extends Activity { @Override public boolean dispatchTouchEvent(MotionEvent ev) { + if (!mAllowTouches) { + return super.dispatchTouchEvent(ev); + } + // On the first action outside the window, hide the menu switch (ev.getAction()) { case MotionEvent.ACTION_OUTSIDE: @@ -284,6 +294,9 @@ public class PipMenuActivity extends Activity { boolean allowMenuTimeout) { mAllowMenuTimeout = allowMenuTimeout; if (mMenuState != menuState) { + boolean deferTouchesUntilAnimationEnds = (mMenuState == MENU_STATE_FULL) || + (menuState == MENU_STATE_FULL); + mAllowTouches = !deferTouchesUntilAnimationEnds; cancelDelayedFinish(); updateActionViews(stackBounds); if (mMenuContainerAnimator != null) { @@ -447,8 +460,8 @@ public class PipMenuActivity extends Activity { }); } else { actionView.setAlpha(DISABLED_ACTION_ALPHA); - actionView.setEnabled(false); } + actionView.setEnabled(action.isEnabled()); // Update the margin between actions LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java index c41f898ef4fe..d5cf1dd0387d 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java @@ -197,6 +197,19 @@ public class PipMenuActivityController { } } + public void onPinnedStackAnimationEnded() { + // Note: Only active menu activities care about this event + if (mToActivityMessenger != null) { + Message m = Message.obtain(); + m.what = PipMenuActivity.MESSAGE_ANIMATION_ENDED; + try { + mToActivityMessenger.send(m); + } catch (RemoteException e) { + Log.e(TAG, "Could not notify menu pinned animation ended", e); + } + } + } + /** * Adds a new menu activity listener. */ diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index daf0622fa7a6..6b3daa306103 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -36,6 +36,7 @@ import android.os.PowerManager; import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; +import android.support.annotation.VisibleForTesting; import android.util.Slog; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; @@ -71,6 +72,10 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private static final String ACTION_DISMISSED_WARNING = "PNW.dismissedWarning"; private static final String ACTION_CLICKED_TEMP_WARNING = "PNW.clickedTempWarning"; private static final String ACTION_DISMISSED_TEMP_WARNING = "PNW.dismissedTempWarning"; + private static final String ACTION_CLICKED_THERMAL_SHUTDOWN_WARNING = + "PNW.clickedThermalShutdownWarning"; + private static final String ACTION_DISMISSED_THERMAL_SHUTDOWN_WARNING = + "PNW.dismissedThermalShutdownWarning"; private static final AudioAttributes AUDIO_ATTRIBUTES = new AudioAttributes.Builder() .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) @@ -95,8 +100,9 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private boolean mPlaySound; private boolean mInvalidCharger; private SystemUIDialog mSaverConfirmation; - private boolean mTempWarning; + private boolean mHighTempWarning; private SystemUIDialog mHighTempDialog; + private SystemUIDialog mThermalShutdownDialog; public PowerNotificationWarnings(Context context, NotificationManager notificationManager, StatusBar statusBar) { @@ -113,8 +119,10 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { pw.print("mInvalidCharger="); pw.println(mInvalidCharger); pw.print("mShowing="); pw.println(SHOWING_STRINGS[mShowing]); pw.print("mSaverConfirmation="); pw.println(mSaverConfirmation != null ? "not null" : null); - pw.print("mTempWarning="); pw.println(mTempWarning); + pw.print("mHighTempWarning="); pw.println(mHighTempWarning); pw.print("mHighTempDialog="); pw.println(mHighTempDialog != null ? "not null" : null); + pw.print("mThermalShutdownDialog="); + pw.println(mThermalShutdownDialog != null ? "not null" : null); } @Override @@ -212,29 +220,29 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { } @Override - public void dismissTemperatureWarning() { - if (!mTempWarning) { + public void dismissHighTemperatureWarning() { + if (!mHighTempWarning) { return; } - mTempWarning = false; - dismissTemperatureWarningInternal(); + mHighTempWarning = false; + dismissHighTemperatureWarningInternal(); } /** - * Internal only version of {@link #dismissTemperatureWarning()} that simply dismisses + * Internal only version of {@link #dismissHighTemperatureWarning()} that simply dismisses * the notification. As such, the notification will not show again until - * {@link #dismissTemperatureWarning()} is called. + * {@link #dismissHighTemperatureWarning()} is called. */ - private void dismissTemperatureWarningInternal() { + private void dismissHighTemperatureWarningInternal() { mNoMan.cancelAsUser(TAG_TEMPERATURE, SystemMessage.NOTE_HIGH_TEMP, UserHandle.ALL); } @Override - public void showTemperatureWarning() { - if (mTempWarning) { + public void showHighTemperatureWarning() { + if (mHighTempWarning) { return; } - mTempWarning = true; + mHighTempWarning = true; final Notification.Builder nb = new Notification.Builder(mContext, NotificationChannels.ALERTS) .setSmallIcon(R.drawable.ic_device_thermostat_24) @@ -249,10 +257,9 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { SystemUI.overrideNotificationAppName(mContext, nb); final Notification n = nb.build(); mNoMan.notifyAsUser(TAG_TEMPERATURE, SystemMessage.NOTE_HIGH_TEMP, n, UserHandle.ALL); - } - private void showTemperatureDialog() { + private void showHighTemperatureDialog() { if (mHighTempDialog != null) return; final SystemUIDialog d = new SystemUIDialog(mContext); d.setIconAttribute(android.R.attr.alertDialogIcon); @@ -265,6 +272,44 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { mHighTempDialog = d; } + @VisibleForTesting + void dismissThermalShutdownWarning() { + mNoMan.cancelAsUser(TAG_TEMPERATURE, SystemMessage.NOTE_THERMAL_SHUTDOWN, UserHandle.ALL); + } + + private void showThermalShutdownDialog() { + if (mThermalShutdownDialog != null) return; + final SystemUIDialog d = new SystemUIDialog(mContext); + d.setIconAttribute(android.R.attr.alertDialogIcon); + d.setTitle(R.string.thermal_shutdown_title); + d.setMessage(R.string.thermal_shutdown_dialog_message); + d.setPositiveButton(com.android.internal.R.string.ok, null); + d.setShowForAllUsers(true); + d.setOnDismissListener(dialog -> mThermalShutdownDialog = null); + d.show(); + mThermalShutdownDialog = d; + } + + @Override + public void showThermalShutdownWarning() { + final Notification.Builder nb = + new Notification.Builder(mContext, NotificationChannels.ALERTS) + .setSmallIcon(R.drawable.ic_device_thermostat_24) + .setWhen(0) + .setShowWhen(false) + .setContentTitle(mContext.getString(R.string.thermal_shutdown_title)) + .setContentText(mContext.getString(R.string.thermal_shutdown_message)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setContentIntent(pendingBroadcast(ACTION_CLICKED_THERMAL_SHUTDOWN_WARNING)) + .setDeleteIntent( + pendingBroadcast(ACTION_DISMISSED_THERMAL_SHUTDOWN_WARNING)) + .setColor(Utils.getColorAttr(mContext, android.R.attr.colorError)); + SystemUI.overrideNotificationAppName(mContext, nb); + final Notification n = nb.build(); + mNoMan.notifyAsUser( + TAG_TEMPERATURE, SystemMessage.NOTE_THERMAL_SHUTDOWN, n, UserHandle.ALL); + } + @Override public void updateLowBatteryWarning() { updateNotification(); @@ -380,6 +425,8 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { filter.addAction(ACTION_DISMISSED_WARNING); filter.addAction(ACTION_CLICKED_TEMP_WARNING); filter.addAction(ACTION_DISMISSED_TEMP_WARNING); + filter.addAction(ACTION_CLICKED_THERMAL_SHUTDOWN_WARNING); + filter.addAction(ACTION_DISMISSED_THERMAL_SHUTDOWN_WARNING); mContext.registerReceiverAsUser(this, UserHandle.ALL, filter, android.Manifest.permission.STATUS_BAR_SERVICE, mHandler); } @@ -397,10 +444,15 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { } else if (action.equals(ACTION_DISMISSED_WARNING)) { dismissLowBatteryWarning(); } else if (ACTION_CLICKED_TEMP_WARNING.equals(action)) { - dismissTemperatureWarningInternal(); - showTemperatureDialog(); + dismissHighTemperatureWarningInternal(); + showHighTemperatureDialog(); } else if (ACTION_DISMISSED_TEMP_WARNING.equals(action)) { - dismissTemperatureWarningInternal(); + dismissHighTemperatureWarningInternal(); + } else if (ACTION_CLICKED_THERMAL_SHUTDOWN_WARNING.equals(action)) { + dismissThermalShutdownWarning(); + showThermalShutdownDialog(); + } else if (ACTION_DISMISSED_THERMAL_SHUTDOWN_WARNING.equals(action)) { + dismissThermalShutdownWarning(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index 471c3aeb9eb5..a64207714093 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -31,6 +31,7 @@ import android.os.PowerManager; import android.os.SystemClock; import android.os.UserHandle; import android.provider.Settings; +import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; import android.util.Slog; @@ -93,6 +94,10 @@ public class PowerUI extends SystemUI { updateBatteryWarningLevels(); mReceiver.init(); + // Check to see if we need to let the user know that the phone previously shut down due + // to the temperature being too high. + showThermalShutdownDialog(); + initTemperatureWarning(); } @@ -256,6 +261,13 @@ public class PowerUI extends SystemUI { updateTemperatureWarning(); } + private void showThermalShutdownDialog() { + if (mPowerManager.getLastShutdownReason() + == PowerManager.SHUTDOWN_REASON_THERMAL_SHUTDOWN) { + mWarnings.showThermalShutdownWarning(); + } + } + private void updateTemperatureWarning() { float[] temps = mHardwarePropertiesManager.getDeviceTemperatures( HardwarePropertiesManager.DEVICE_TEMPERATURE_SKIN, @@ -268,9 +280,9 @@ public class PowerUI extends SystemUI { if (statusBar != null && !statusBar.isDeviceInVrMode() && temp >= mThresholdTemp) { logAtTemperatureThreshold(temp); - mWarnings.showTemperatureWarning(); + mWarnings.showHighTemperatureWarning(); } else { - mWarnings.dismissTemperatureWarning(); + mWarnings.dismissHighTemperatureWarning(); } } @@ -369,8 +381,9 @@ public class PowerUI extends SystemUI { void showInvalidChargerWarning(); void updateLowBatteryWarning(); boolean isInvalidChargerWarningShowing(); - void dismissTemperatureWarning(); - void showTemperatureWarning(); + void dismissHighTemperatureWarning(); + void showHighTemperatureWarning(); + void showThermalShutdownWarning(); void dump(PrintWriter pw); void userSwitched(); } diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 53a9eae17f41..2b812a5f7ac3 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -331,8 +331,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener RecentsActivityLaunchState launchState = config.getLaunchState(); if (!launchState.launchedWithAltTab) { // Has the user tapped quickly? - boolean isQuickTap = ViewConfiguration.getDoubleTapMinTime() < elapsedTime && - elapsedTime < ViewConfiguration.getDoubleTapTimeout(); + boolean isQuickTap = elapsedTime < ViewConfiguration.getDoubleTapTimeout(); if (Recents.getConfiguration().isGridEnabled) { if (isQuickTap) { EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java index ccc99c59e510..8b3d6d9b7021 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSnooze.java @@ -145,13 +145,15 @@ public class NotificationSnooze extends LinearLayout } private void showSnoozeOptions(boolean show) { - mExpanded = show; - animateSnoozeOptions(show); int drawableId = show ? com.android.internal.R.drawable.ic_collapse_notification : com.android.internal.R.drawable.ic_expand_notification; mExpandButton.setImageResource(drawableId); - if (mGutsContainer != null) { - mGutsContainer.onHeightChanged(); + if (mExpanded != show) { + mExpanded = show; + animateSnoozeOptions(show); + if (mGutsContainer != null) { + mGutsContainer.onHeightChanged(); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 263df79318ea..c7fbbf956c68 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -89,6 +89,9 @@ public class StatusBarIconView extends AnimatedImageView { }; private boolean mAlwaysScaleIcon; + private int mStatusBarIconDrawingSizeDark = 1; + private int mStatusBarIconDrawingSize = 1; + private int mStatusBarIconSize = 1; private StatusBarIcon mIcon; @ViewDebug.ExportedProperty private String mSlot; private Drawable mNumberBackground; @@ -139,7 +142,7 @@ public class StatusBarIconView extends AnimatedImageView { mNumberPain.setColor(context.getColor(R.drawable.notification_number_text_color)); mNumberPain.setAntiAlias(true); setNotification(notification); - maybeUpdateIconScale(); + maybeUpdateIconScaleDimens(); setScaleType(ScaleType.CENTER); mDensity = context.getResources().getDisplayMetrics().densityDpi; if (mNotification != null) { @@ -149,18 +152,30 @@ public class StatusBarIconView extends AnimatedImageView { reloadDimens(); } - private void maybeUpdateIconScale() { + private void maybeUpdateIconScaleDimens() { // We do not resize and scale system icons (on the right), only notification icons (on the // left). if (mNotification != null || mAlwaysScaleIcon) { - updateIconScale(); + updateIconScaleDimens(); } } - private void updateIconScale() { + private void updateIconScaleDimens() { Resources res = mContext.getResources(); - final int outerBounds = res.getDimensionPixelSize(R.dimen.status_bar_icon_size); - final int imageBounds = res.getDimensionPixelSize(R.dimen.status_bar_icon_drawing_size); + mStatusBarIconSize = res.getDimensionPixelSize(R.dimen.status_bar_icon_size); + mStatusBarIconDrawingSizeDark = + res.getDimensionPixelSize(R.dimen.status_bar_icon_drawing_size_dark); + mStatusBarIconDrawingSize = + res.getDimensionPixelSize(R.dimen.status_bar_icon_drawing_size); + updateIconScale(); + } + + private void updateIconScale() { + final float imageBounds = NotificationUtils.interpolate( + mStatusBarIconDrawingSize, + mStatusBarIconDrawingSizeDark, + mDarkAmount); + final int outerBounds = mStatusBarIconSize; mIconScale = (float)imageBounds / (float)outerBounds; } @@ -174,7 +189,7 @@ public class StatusBarIconView extends AnimatedImageView { int density = newConfig.densityDpi; if (density != mDensity) { mDensity = density; - maybeUpdateIconScale(); + maybeUpdateIconScaleDimens(); updateDrawable(); reloadDimens(); } @@ -198,7 +213,7 @@ public class StatusBarIconView extends AnimatedImageView { mDozer = new NotificationIconDozeHelper(context); mBlocked = false; mAlwaysScaleIcon = true; - updateIconScale(); + updateIconScaleDimens(); mDensity = context.getResources().getDisplayMetrics().densityDpi; } @@ -681,6 +696,7 @@ public class StatusBarIconView extends AnimatedImageView { public void setDark(boolean dark, boolean fade, long delay) { mDozer.setIntensityDark(f -> { mDarkAmount = f; + updateIconScale(); updateDecorColor(); updateIconColor(); }, dark, fade, delay); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index e146e93e11c7..b89b062c6d0d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -21,6 +21,7 @@ package com.android.systemui.statusbar.phone; import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN; import static android.app.StatusBarManager.WINDOW_STATE_SHOWING; import static android.app.StatusBarManager.windowStateToString; +import static android.content.res.Configuration.UI_MODE_TYPE_CAR; import static com.android.systemui.statusbar.notification.NotificationInflater.InflationCallback; import static com.android.systemui.statusbar.phone.BarTransitions.MODE_LIGHTS_OUT; @@ -36,11 +37,17 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.annotation.NonNull; import android.app.ActivityManager; +import android.app.ActivityManager.StackId; import android.app.ActivityOptions; +import android.app.INotificationManager; +import android.app.KeyguardManager; import android.app.Notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; +import android.app.RemoteInput; import android.app.StatusBarManager; +import android.app.TaskStackBuilder; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.ComponentCallbacks2; @@ -49,8 +56,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.IntentSender; +import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.UserInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.database.ContentObserver; @@ -75,7 +85,9 @@ import android.media.session.PlaybackState; import android.metrics.LogMaker; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.PowerManager; @@ -88,63 +100,86 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.Vibrator; import android.provider.Settings; +import android.service.dreams.DreamService; +import android.service.dreams.IDreamManager; +import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; +import android.service.vr.IVrManager; +import android.service.vr.IVrStateCallbacks; +import android.text.TextUtils; import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Log; +import android.util.Slog; +import android.util.SparseArray; +import android.util.SparseBooleanArray; import android.view.ContextThemeWrapper; import android.view.Display; +import android.view.IWindowManager; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.ThreadedRenderer; import android.view.View; +import android.view.ViewAnimationUtils; import android.view.ViewGroup; import android.view.ViewParent; import android.view.ViewStub; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.view.WindowManagerGlobal; +import android.view.accessibility.AccessibilityManager; import android.view.animation.AccelerateInterpolator; import android.view.animation.Interpolator; import android.widget.DateTimeView; import android.widget.ImageView; +import android.widget.RemoteViews; import android.widget.TextView; +import android.widget.Toast; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; +import com.android.internal.statusbar.IStatusBarService; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.util.NotificationMessagingUtil; +import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardHostView.OnDismissAction; import com.android.keyguard.KeyguardStatusView; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.ActivityStarterDelegate; +import com.android.systemui.DejankUtils; import com.android.systemui.DemoMode; import com.android.systemui.Dependency; import com.android.systemui.EventLogTags; import com.android.systemui.Interpolators; import com.android.systemui.Prefs; import com.android.systemui.R; +import com.android.systemui.RecentsComponent; +import com.android.systemui.SwipeHelper; +import com.android.systemui.SystemUI; import com.android.systemui.SystemUIFactory; import com.android.systemui.assist.AssistManager; import com.android.systemui.classifier.FalsingLog; import com.android.systemui.classifier.FalsingManager; import com.android.systemui.doze.DozeHost; import com.android.systemui.doze.DozeLog; +import com.android.systemui.fragments.ExtensionFragmentListener; import com.android.systemui.fragments.FragmentHostManager; -import com.android.systemui.fragments.PluginFragmentListener; import com.android.systemui.keyguard.KeyguardViewMediator; -import com.android.systemui.plugins.qs.QS; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.plugins.qs.QS; +import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem; import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper.SnoozeOption; import com.android.systemui.qs.QSFragment; import com.android.systemui.qs.QSPanel; import com.android.systemui.qs.QSTileHost; +import com.android.systemui.recents.Recents; import com.android.systemui.recents.ScreenPinningRequest; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.AppTransitionFinishedEvent; @@ -183,6 +218,7 @@ import com.android.systemui.statusbar.policy.ConfigurationController.Configurati import com.android.systemui.statusbar.policy.DarkIconDispatcher; import com.android.systemui.statusbar.policy.DeviceProvisionedController; import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; +import com.android.systemui.statusbar.policy.ExtensionController; import com.android.systemui.statusbar.policy.HeadsUpManager; import com.android.systemui.statusbar.policy.KeyguardMonitor; import com.android.systemui.statusbar.policy.KeyguardMonitorImpl; @@ -190,11 +226,15 @@ import com.android.systemui.statusbar.policy.KeyguardUserSwitcher; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.OnHeadsUpChangedListener; import com.android.systemui.statusbar.policy.PreviewInflater; +import com.android.systemui.statusbar.policy.RemoteInputView; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; -import com.android.systemui.statusbar.stack.NotificationStackScrollLayout.OnChildLocationsChangedListener; +import com.android.systemui.statusbar.stack.NotificationStackScrollLayout + .OnChildLocationsChangedListener; +import com.android.systemui.statusbar.stack.StackStateAnimator; +import com.android.systemui.util.NotificationChannels; import com.android.systemui.util.leak.LeakDetector; import com.android.systemui.volume.VolumeComponent; @@ -205,50 +245,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import android.app.ActivityManager.StackId; -import android.app.INotificationManager; -import android.app.KeyguardManager; -import android.app.NotificationChannel; -import android.app.RemoteInput; -import android.app.TaskStackBuilder; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.UserInfo; -import android.os.Build; -import android.os.Handler; -import android.service.dreams.DreamService; -import android.service.dreams.IDreamManager; -import android.service.notification.NotificationListenerService; -import android.service.vr.IVrManager; -import android.service.vr.IVrStateCallbacks; -import android.text.TextUtils; -import android.util.Slog; -import android.util.SparseArray; -import android.util.SparseBooleanArray; -import android.view.IWindowManager; -import android.view.ViewAnimationUtils; -import android.view.accessibility.AccessibilityManager; -import android.widget.RemoteViews; -import android.widget.Toast; - -import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; -import com.android.internal.statusbar.IStatusBarService; -import com.android.internal.widget.LockPatternUtils; -import com.android.systemui.DejankUtils; -import com.android.systemui.RecentsComponent; -import com.android.systemui.SwipeHelper; -import com.android.systemui.SystemUI; -import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin.MenuItem; -import com.android.systemui.recents.Recents; -import com.android.systemui.statusbar.policy.RemoteInputView; -import com.android.systemui.statusbar.stack.StackStateAnimator; -import com.android.systemui.util.NotificationChannels; - import java.util.HashSet; +import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Set; import java.util.Stack; @@ -1133,11 +1133,12 @@ public class StatusBar extends SystemUI implements DemoMode, View container = mStatusBarWindow.findViewById(R.id.qs_frame); if (container != null) { FragmentHostManager fragmentHostManager = FragmentHostManager.get(container); - fragmentHostManager.getFragmentManager().beginTransaction() - .replace(R.id.qs_frame, new QSFragment(), QS.TAG) - .commit(); - new PluginFragmentListener(container, QS.TAG, QSFragment.class, QS.class) - .startListening(); + ExtensionFragmentListener.attachExtensonToFragment(container, QS.TAG, R.id.qs_frame, + Dependency.get(ExtensionController.class).newExtension(QS.class) + .withPlugin(QS.class) + .withUiMode(UI_MODE_TYPE_CAR, () -> new QSFragment()) + .withDefault(() -> new QSFragment()) + .build()); final QSTileHost qsh = SystemUIFactory.getInstance().createQSTileHost(mContext, this, mIconController); mBrightnessMirrorController = new BrightnessMirrorController(mStatusBarWindow); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionController.java index eaf89259ed59..61287491766b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionController.java @@ -14,8 +14,7 @@ package com.android.systemui.statusbar.policy; -import com.android.systemui.Dependency; -import com.android.systemui.plugins.Plugin; +import android.content.Context; import java.util.Map; import java.util.function.Consumer; @@ -31,7 +30,9 @@ public interface ExtensionController { interface Extension<T> { T get(); + Context getContext(); void destroy(); + void addCallback(Consumer<T> callback); } interface ExtensionBuilder<T> { @@ -42,6 +43,7 @@ public interface ExtensionController { PluginConverter<T, P> converter); ExtensionBuilder<T> withDefault(Supplier<T> def); ExtensionBuilder<T> withCallback(Consumer<T> callback); + ExtensionBuilder<T> withUiMode(int mode, Supplier<T> def); Extension build(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionControllerImpl.java index fefbaa31af2a..91b61607d04d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionControllerImpl.java @@ -14,23 +14,38 @@ package com.android.systemui.statusbar.policy; +import android.content.Context; +import android.content.res.Configuration; +import android.os.Handler; +import android.util.ArrayMap; + import com.android.systemui.Dependency; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.PluginManager; +import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; import com.android.systemui.tuner.TunerService; import com.android.systemui.tuner.TunerService.Tunable; -import android.content.Context; -import android.util.ArrayMap; - import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.function.Consumer; import java.util.function.Supplier; public class ExtensionControllerImpl implements ExtensionController { + public static final int SORT_ORDER_PLUGIN = 0; + public static final int SORT_ORDER_TUNER = 1; + public static final int SORT_ORDER_UI_MODE = 2; + public static final int SORT_ORDER_DEFAULT = 3; + + private final Context mDefaultContext; + + public ExtensionControllerImpl(Context context) { + mDefaultContext = context; + } + @Override public <T> ExtensionBuilder<T> newExtension(Class<T> cls) { return new ExtensionBuilder<>(); @@ -38,6 +53,7 @@ public class ExtensionControllerImpl implements ExtensionController { private interface Producer<T> { T get(); + void destroy(); } @@ -75,6 +91,12 @@ public class ExtensionControllerImpl implements ExtensionController { return this; } + public ExtensionController.ExtensionBuilder<T> withUiMode(int uiMode, + Supplier<T> supplier) { + mExtension.addUiMode(uiMode, supplier); + return this; + } + @Override public ExtensionController.ExtensionBuilder<T> withCallback( Consumer<T> callback) { @@ -85,34 +107,21 @@ public class ExtensionControllerImpl implements ExtensionController { @Override public ExtensionController.Extension build() { // Manually sort, plugins first, tuners second, defaults last. - Collections.sort(mExtension.mProducers, (o1, o2) -> { - if (o1 instanceof ExtensionImpl.PluginItem) { - if (o2 instanceof ExtensionImpl.PluginItem) { - return 0; - } else { - return -1; - } - } - if (o1 instanceof ExtensionImpl.TunerItem) { - if (o2 instanceof ExtensionImpl.PluginItem) { - return 1; - } else if (o2 instanceof ExtensionImpl.TunerItem) { - return 0; - } else { - return -1; - } - } - return 0; - }); + Collections.sort(mExtension.mProducers, Comparator.comparingInt(Item::sortOrder)); mExtension.notifyChanged(); return mExtension; } } private class ExtensionImpl<T> implements ExtensionController.Extension<T> { - private final ArrayList<Producer<T>> mProducers = new ArrayList<>(); + private final ArrayList<Item<T>> mProducers = new ArrayList<>(); private final ArrayList<Consumer<T>> mCallbacks = new ArrayList<>(); private T mItem; + private Context mPluginContext; + + public void addCallback(Consumer<T> callback) { + mCallbacks.add(callback); + } @Override public T get() { @@ -120,6 +129,11 @@ public class ExtensionControllerImpl implements ExtensionController { } @Override + public Context getContext() { + return mPluginContext != null ? mPluginContext : mDefaultContext; + } + + @Override public void destroy() { for (int i = 0; i < mProducers.size(); i++) { mProducers.get(i).destroy(); @@ -127,6 +141,7 @@ public class ExtensionControllerImpl implements ExtensionController { } private void notifyChanged() { + mItem = null; for (int i = 0; i < mProducers.size(); i++) { final T item = mProducers.get(i).get(); if (item != null) { @@ -151,7 +166,11 @@ public class ExtensionControllerImpl implements ExtensionController { mProducers.add(new TunerItem(factory, factory.keys())); } - private class PluginItem<P extends Plugin> implements Producer<T>, PluginListener<P> { + public void addUiMode(int uiMode, Supplier<T> mode) { + mProducers.add(new UiModeItem(uiMode, mode)); + } + + private class PluginItem<P extends Plugin> implements Item<T>, PluginListener<P> { private final PluginConverter<T, P> mConverter; private T mItem; @@ -162,6 +181,7 @@ public class ExtensionControllerImpl implements ExtensionController { @Override public void onPluginConnected(P plugin, Context pluginContext) { + mPluginContext = pluginContext; if (mConverter != null) { mItem = mConverter.getInterfaceFromPlugin(plugin); } else { @@ -172,6 +192,7 @@ public class ExtensionControllerImpl implements ExtensionController { @Override public void onPluginDisconnected(P plugin) { + mPluginContext = null; mItem = null; notifyChanged(); } @@ -185,9 +206,14 @@ public class ExtensionControllerImpl implements ExtensionController { public void destroy() { Dependency.get(PluginManager.class).removePluginListener(this); } + + @Override + public int sortOrder() { + return SORT_ORDER_PLUGIN; + } } - private class TunerItem<T> implements Producer<T>, Tunable { + private class TunerItem<T> implements Item<T>, Tunable { private final TunerFactory<T> mFactory; private final ArrayMap<String, String> mSettings = new ArrayMap<>(); private T mItem; @@ -213,9 +239,54 @@ public class ExtensionControllerImpl implements ExtensionController { mItem = mFactory.create(mSettings); notifyChanged(); } + + @Override + public int sortOrder() { + return SORT_ORDER_TUNER; + } + } + + private class UiModeItem<T> implements Item<T>, ConfigurationListener { + + private final int mDesiredUiMode; + private final Supplier<T> mSupplier; + private int mUiMode; + private Handler mHandler = new Handler(); + + public UiModeItem(int uiMode, Supplier<T> supplier) { + mDesiredUiMode = uiMode; + mSupplier = supplier; + mUiMode = mDefaultContext.getResources().getConfiguration().uiMode; + Dependency.get(ConfigurationController.class).addCallback(this); + } + + @Override + public void onConfigChanged(Configuration newConfig) { + int newMode = newConfig.uiMode & Configuration.UI_MODE_TYPE_MASK; + if (newMode != mUiMode) { + mUiMode = newMode; + // Post to make sure we don't have concurrent modifications. + mHandler.post(ExtensionImpl.this::notifyChanged); + } + } + + @Override + public T get() { + return (mUiMode == mDesiredUiMode) ? mSupplier.get() : null; + } + + @Override + public void destroy() { + Dependency.get(ConfigurationController.class).removeCallback(this); + } + + @Override + public int sortOrder() { + return SORT_ORDER_UI_MODE; + } } - private class Default<T> implements Producer<T> { + private class Default<T> implements Item<T> { private final Supplier<T> mSupplier; public Default(Supplier<T> supplier) { @@ -231,6 +302,15 @@ public class ExtensionControllerImpl implements ExtensionController { public void destroy() { } + + @Override + public int sortOrder() { + return SORT_ORDER_DEFAULT; + } } } + + private interface Item<T> extends Producer<T> { + int sortOrder(); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java index 34cfa7be5b53..eb59a341ef0f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java @@ -24,7 +24,6 @@ import static junit.framework.Assert.assertTrue; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -129,17 +128,32 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { } @Test - public void testShowTemperatureWarning_NotifyAsUser() { - mPowerNotificationWarnings.showTemperatureWarning(); + public void testShowHighTemperatureWarning_NotifyAsUser() { + mPowerNotificationWarnings.showHighTemperatureWarning(); verify(mMockNotificationManager, times(1)) .notifyAsUser(anyString(), eq(SystemMessage.NOTE_HIGH_TEMP), any(), any()); } @Test - public void testDismissTemperatureWarning_CancelAsUser() { - mPowerNotificationWarnings.showTemperatureWarning(); - mPowerNotificationWarnings.dismissTemperatureWarning(); + public void testDismissHighTemperatureWarning_CancelAsUser() { + mPowerNotificationWarnings.showHighTemperatureWarning(); + mPowerNotificationWarnings.dismissHighTemperatureWarning(); verify(mMockNotificationManager, times(1)).cancelAsUser(anyString(), eq(SystemMessage.NOTE_HIGH_TEMP), any()); } + + @Test + public void testShowThermalShutdownWarning_NotifyAsUser() { + mPowerNotificationWarnings.showThermalShutdownWarning(); + verify(mMockNotificationManager, times(1)) + .notifyAsUser(anyString(), eq(SystemMessage.NOTE_THERMAL_SHUTDOWN), any(), any()); + } + + @Test + public void testDismissThermalShutdownWarning_CancelAsUser() { + mPowerNotificationWarnings.showThermalShutdownWarning(); + mPowerNotificationWarnings.dismissThermalShutdownWarning(); + verify(mMockNotificationManager, times(1)).cancelAsUser(anyString(), + eq(SystemMessage.NOTE_THERMAL_SHUTDOWN), any()); + } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerImplTest.java new file mode 100644 index 000000000000..564019c2bdc5 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerImplTest.java @@ -0,0 +1,197 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.statusbar.policy; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.res.Configuration; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.testing.TestableLooper.RunWithLooper; +import android.util.Log; + +import com.android.systemui.Dependency; +import com.android.systemui.SysuiTestCase; +import com.android.systemui.plugins.OverlayPlugin; +import com.android.systemui.plugins.Plugin; +import com.android.systemui.plugins.PluginListener; +import com.android.systemui.plugins.PluginManager; +import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; +import com.android.systemui.statusbar.policy.ExtensionController.Extension; +import com.android.systemui.statusbar.policy.ExtensionController.TunerFactory; +import com.android.systemui.tuner.TunerService; +import com.android.systemui.tuner.TunerService.Tunable; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; + +import java.util.Map; +import java.util.function.Consumer; + +@RunWith(AndroidTestingRunner.class) +public class ExtensionControllerImplTest extends SysuiTestCase { + + private PluginManager mPluginManager; + private TunerService mTunerService; + private ExtensionController mExtensionController; + private ConfigurationController mConfigurationController; + + @Before + public void setup() { + mPluginManager = mDependency.injectMockDependency(PluginManager.class); + mTunerService = mDependency.injectMockDependency(TunerService.class); + mConfigurationController = mDependency.injectMockDependency(ConfigurationController.class); + mExtensionController = Dependency.get(ExtensionController.class); + } + + @Test + public void testPlugin() { + OverlayPlugin plugin = mock(OverlayPlugin.class); + + Extension ext = mExtensionController.newExtension(OverlayPlugin.class) + .withPlugin(OverlayPlugin.class) + .build(); + ArgumentCaptor<PluginListener> listener = ArgumentCaptor.forClass(PluginListener.class); + verify(mPluginManager).addPluginListener(eq(OverlayPlugin.ACTION), listener.capture(), + eq(OverlayPlugin.class)); + + listener.getValue().onPluginConnected(plugin, null); + assertEquals(plugin, ext.get()); + + ext.destroy(); + verify(mPluginManager).removePluginListener(any()); + } + + @Test + public void testTuner() { + String[] keys = new String[] { "key1", "key2" }; + TunerFactory<Object> factory = new ExtensionController.TunerFactory() { + @Override + public String[] keys() { + return keys; + } + + @Override + public Object create(Map settings) { + return null; + } + }; + Extension ext = mExtensionController.newExtension(Object.class) + .withTunerFactory(factory) + .build(); + verify(mTunerService).addTunable(any(), eq(keys[0]), eq(keys[1])); + + ext.destroy(); + verify(mTunerService).removeTunable(any()); + } + + @Test + @RunWithLooper + public void testUiMode() { + Object o = new Object(); + Extension ext = mExtensionController.newExtension(Object.class) + .withUiMode(Configuration.UI_MODE_TYPE_CAR, () -> o) + .build(); + ArgumentCaptor<ConfigurationListener> captor = ArgumentCaptor.forClass( + ConfigurationListener.class); + verify(mConfigurationController).addCallback(captor.capture()); + + Configuration c = new Configuration(mContext.getResources().getConfiguration()); + c.uiMode = 0; + captor.getValue().onConfigChanged(c); + TestableLooper.get(this).processAllMessages(); + assertNull(ext.get()); + + c.uiMode = Configuration.UI_MODE_TYPE_CAR; + captor.getValue().onConfigChanged(c); + TestableLooper.get(this).processAllMessages(); + assertEquals(o, ext.get()); + + ext.destroy(); + verify(mConfigurationController).removeCallback(eq(captor.getValue())); + } + + @Test + public void testDefault() { + Object o = new Object(); + Extension ext = mExtensionController.newExtension(Object.class) + .withDefault(() -> o) + .build(); + assertEquals(o, ext.get()); + } + + @Test + @RunWithLooper + public void testSortOrder() { + Log.d("TestTest", "Config " + mContext.getResources().getConfiguration().uiMode); + Object def = new Object(); + Object uiMode = new Object(); + Object tuner = new Object(); + Plugin plugin = mock(Plugin.class); + TunerFactory<Object> factory = mock(TunerFactory.class); + Extension ext = mExtensionController.newExtension(Object.class) + .withDefault(() -> def) + .withUiMode(Configuration.UI_MODE_TYPE_CAR, () -> uiMode) + .withTunerFactory(factory) + .withPlugin(Object.class, "some_action") + .build(); + + // Test default first. + assertEquals(def, ext.get()); + + // Enable a UI mode and check that. + ArgumentCaptor<ConfigurationListener> captor = ArgumentCaptor.forClass( + ConfigurationListener.class); + verify(mConfigurationController).addCallback(captor.capture()); + Configuration c = new Configuration(mContext.getResources().getConfiguration()); + c.uiMode |= Configuration.UI_MODE_TYPE_CAR; + captor.getValue().onConfigChanged(c); + TestableLooper.get(this).processAllMessages(); + assertEquals(uiMode, ext.get()); + + // Turn on tuner item and check that. + when(factory.create(any())).thenReturn(tuner); + ArgumentCaptor<Tunable> tunable = ArgumentCaptor.forClass(Tunable.class); + verify(mTunerService).addTunable(tunable.capture(), any()); + tunable.getValue().onTuningChanged(null, null); + assertEquals(tuner, ext.get()); + + // Lastly, check a plugin. + ArgumentCaptor<PluginListener> listener = ArgumentCaptor.forClass(PluginListener.class); + verify(mPluginManager).addPluginListener(any(), listener.capture(), any()); + listener.getValue().onPluginConnected(plugin, null); + assertEquals(plugin, ext.get()); + } + + @Test + public void testCallback() { + Consumer<Object> callback = mock(Consumer.class); + final Object o = new Object(); + mExtensionController.newExtension(Object.class) + .withDefault(() -> o) + .withCallback(callback) + .build(); + verify(callback).accept(eq(o)); + } + +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java deleted file mode 100644 index 3e79a0404026..000000000000 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package com.android.systemui.statusbar.policy; - -import static org.junit.Assert.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - -import com.android.systemui.Dependency; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.plugins.OverlayPlugin; -import com.android.systemui.plugins.PluginManager; -import com.android.systemui.statusbar.policy.ExtensionController.Extension; -import com.android.systemui.statusbar.policy.ExtensionController.TunerFactory; -import com.android.systemui.tuner.TunerService; - -import org.junit.Before; -import org.junit.Test; - -import java.util.Map; -import java.util.function.Consumer; - -public class ExtensionControllerTest extends SysuiTestCase { - - private PluginManager mPluginManager; - private TunerService mTunerService; - private ExtensionController mExtensionController; - - @Before - public void setup() { - mPluginManager = mDependency.injectMockDependency(PluginManager.class); - mTunerService = mDependency.injectMockDependency(TunerService.class); - mExtensionController = Dependency.get(ExtensionController.class); - } - - @Test - public void testPlugin() { - Extension ext = mExtensionController.newExtension(OverlayPlugin.class) - .withPlugin(OverlayPlugin.class) - .build(); - verify(mPluginManager).addPluginListener(eq(OverlayPlugin.ACTION), any(), - eq(OverlayPlugin.class)); - - ext.destroy(); - verify(mPluginManager).removePluginListener(any()); - } - - @Test - public void testTuner() { - String[] keys = new String[] { "key1", "key2" }; - TunerFactory<Object> factory = new ExtensionController.TunerFactory() { - @Override - public String[] keys() { - return keys; - } - - @Override - public Object create(Map settings) { - return null; - } - }; - Extension ext = mExtensionController.newExtension(Object.class) - .withTunerFactory(factory) - .build(); - verify(mTunerService).addTunable(any(), eq(keys[0]), eq(keys[1])); - - ext.destroy(); - verify(mTunerService).removeTunable(any()); - } - - @Test - public void testDefault() { - Object o = new Object(); - Extension ext = mExtensionController.newExtension(Object.class) - .withDefault(() -> o) - .build(); - assertEquals(o, ext.get()); - } - - @Test - public void testCallback() { - Consumer<Object> callback = mock(Consumer.class); - final Object o = new Object(); - mExtensionController.newExtension(Object.class) - .withDefault(() -> o) - .withCallback(callback) - .build(); - verify(callback).accept(eq(o)); - } - -} diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java index b9d188a3871a..3a0f907b8697 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java @@ -14,6 +14,7 @@ package com.android.systemui.utils.leaks; +import android.content.Context; import android.testing.LeakCheck; import android.testing.LeakCheck.Tracker; @@ -75,6 +76,11 @@ public class FakeExtensionController implements ExtensionController { } @Override + public ExtensionBuilder<T> withUiMode(int mode, Supplier<T> def) { + return null; + } + + @Override public Extension build() { return new FakeExtension(mAllocation); } @@ -94,8 +100,18 @@ public class FakeExtensionController implements ExtensionController { } @Override + public Context getContext() { + return null; + } + + @Override public void destroy() { mTracker.getLeakInfo(mAllocation).clearAllocations(); } + + @Override + public void addCallback(Consumer<T> callback) { + + } } } diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index 53b3fe9c1a0d..ac544e8abd74 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -180,6 +180,9 @@ message SystemMessage { // Package: android NOTE_FOREGROUND_SERVICES = 40; + // Inform the user that the connected audio accessory is not supported + NOTE_USB_AUDIO_ACCESSORY_NOT_SUPPORTED = 41; + // ADD_NEW_IDS_ABOVE_THIS_LINE // Legacy IDs with arbitrary values appear below // Legacy IDs existed as stable non-conflicting constants prior to the O release diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 4040db36c4fb..21438e04f38c 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -18,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \ libgui \ libjnigraphics -LOCAL_STATIC_LIBRARIES := +LOCAL_HEADER_LIBRARIES := \ + libbase_headers LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index f6d3f4835381..ee48289731a8 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -27,6 +27,7 @@ #include <androidfw/Asset.h> #include <androidfw/AssetManager.h> #include <androidfw/ResourceTypes.h> +#include <android-base/macros.h> #include "jni.h" #include "JNIHelp.h" diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index 2358ec55f686..b536ad969c95 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -603,15 +603,12 @@ public final class AutofillManagerService extends SystemService { if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; boolean oldDebug = sDebug; - boolean oldVerbose = sVerbose; try { synchronized (mLock) { oldDebug = sDebug; - oldVerbose = sVerbose; setDebugLocked(true); - setVerboseLocked(true); pw.print("Debug mode: "); pw.println(oldDebug); - pw.print("Verbose mode: "); pw.println(oldVerbose); + pw.print("Verbose mode: "); pw.println(sVerbose); pw.print("Disabled users: "); pw.println(mDisabledUsers); final int size = mServicesCache.size(); pw.print("Cached services: "); @@ -631,7 +628,6 @@ public final class AutofillManagerService extends SystemService { mRequestsHistory.reverseDump(fd, pw, args); } finally { setDebugLocked(oldDebug); - setVerboseLocked(oldVerbose); } } diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index c85ce436375e..018fb6886cd9 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -922,6 +922,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } } } + + if (ArrayUtils.contains(response.getAuthenticationIds(), id)) { + return false; + } } return true; @@ -943,8 +947,14 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState Slog.v(TAG, "Creating viewState for " + id + " on " + getActionAsString(action)); } - viewState = new ViewState(this, id, value, this, ViewState.STATE_INITIAL); + boolean isIgnored = isIgnoredLocked(id); + viewState = new ViewState(this, id, value, this, + isIgnored ? ViewState.STATE_IGNORED : ViewState.STATE_INITIAL); mViewStates.put(id, viewState); + if (isIgnored) { + if (sDebug) Slog.d(TAG, "updateLocked(): ignoring view " + id); + return; + } } else { if (sVerbose) Slog.v(TAG, "Ignored " + getActionAsString(action) + " for " + id); return; @@ -983,16 +993,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState break; case ACTION_VIEW_ENTERED: if (shouldStartNewPartitionLocked(id)) { - // TODO(b/37424539): proper implementation - if (mResponseWaitingAuth != null) { - viewState.setState(ViewState.STATE_WAITING_RESPONSE_AUTH); - } else { - if (sDebug) { - Slog.d(TAG, "Starting partition for view id " + viewState.id); - } - viewState.setState(ViewState.STATE_STARTED_PARTITION); - requestNewFillResponseLocked(flags); + if (sDebug) { + Slog.d(TAG, "Starting partition for view id " + viewState.id); } + viewState.setState(ViewState.STATE_STARTED_PARTITION); + requestNewFillResponseLocked(flags); } // Remove the UI if the ViewState has changed. @@ -1015,6 +1020,18 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState } } + /** + * Checks whether a view should be ignored. + */ + private boolean isIgnoredLocked(AutofillId id) { + if (mResponses == null || mResponses.size() == 0) { + return false; + } + // Always check the latest response only + final FillResponse response = mResponses.valueAt(mResponses.size() - 1); + return ArrayUtils.contains(response.getIgnoredIds(), id); + } + @Override public void onFillReady(FillResponse response, AutofillId filledId, @Nullable AutofillValue value) { @@ -1149,18 +1166,24 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState final SaveInfo saveInfo = response.getSaveInfo(); if (saveInfo != null) { final AutofillId[] requiredIds = saveInfo.getRequiredIds(); - for (int i = 0; i < requiredIds.length; i++) { - final AutofillId id = requiredIds[i]; + for (AutofillId id : requiredIds) { createOrUpdateViewStateLocked(id, state, null); } final AutofillId[] optionalIds = saveInfo.getOptionalIds(); if (optionalIds != null) { - for (int i = 0; i < optionalIds.length; i++) { - final AutofillId id = optionalIds[i]; + for (AutofillId id : optionalIds) { createOrUpdateViewStateLocked(id, state, null); } } } + + final AutofillId[] authIds = response.getAuthenticationIds(); + if (authIds != null) { + for (AutofillId id : authIds) { + createOrUpdateViewStateLocked(id, state, null); + } + } + } /** diff --git a/services/autofill/java/com/android/server/autofill/ViewState.java b/services/autofill/java/com/android/server/autofill/ViewState.java index 7ca943511dc0..d114e1452373 100644 --- a/services/autofill/java/com/android/server/autofill/ViewState.java +++ b/services/autofill/java/com/android/server/autofill/ViewState.java @@ -17,6 +17,7 @@ package com.android.server.autofill; import static com.android.server.autofill.Helper.sDebug; +import static com.android.server.autofill.Helper.sVerbose; import android.annotation.Nullable; import android.graphics.Rect; @@ -61,8 +62,8 @@ final class ViewState { public static final int STATE_STARTED_PARTITION = 0x20; /** User select a dataset in this view, but service must authenticate first. */ public static final int STATE_WAITING_DATASET_AUTH = 0x40; - // TODO(b/37424539): temporary workaround until partitioning supports auth - public static final int STATE_WAITING_RESPONSE_AUTH = 0x80; + /** Service does not care about this view. */ + public static final int STATE_IGNORED = 0x80; public final AutofillId id; @@ -199,7 +200,16 @@ final class ViewState { void dump(String prefix, PrintWriter pw) { pw.print(prefix); pw.print("id:" ); pw.println(this.id); pw.print(prefix); pw.print("state:" ); pw.println(getStateAsString()); - pw.print(prefix); pw.print("has response:" ); pw.println(mResponse != null); + pw.print(prefix); pw.print("response:"); + if (mResponse == null) { + pw.println("N/A"); + } else { + if (sVerbose) { + pw.println(mResponse); + } else { + pw.println(mResponse.getRequestId()); + } + } pw.print(prefix); pw.print("initialValue:" ); pw.println(mInitialValue); pw.print(prefix); pw.print("currentValue:" ); pw.println(mCurrentValue); pw.print(prefix); pw.print("autofilledValue:" ); pw.println(mAutofilledValue); diff --git a/services/autofill/java/com/android/server/autofill/ui/FillUi.java b/services/autofill/java/com/android/server/autofill/ui/FillUi.java index fa95e036eae5..dd297a645436 100644 --- a/services/autofill/java/com/android/server/autofill/ui/FillUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/FillUi.java @@ -23,10 +23,12 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.IntentSender; +import android.graphics.Point; import android.graphics.Rect; import android.service.autofill.Dataset; import android.service.autofill.FillResponse; import android.util.Slog; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -52,6 +54,8 @@ final class FillUi { private static final int VISIBLE_OPTIONS_MAX_COUNT = 3; + private static final TypedValue sTempTypedValue = new TypedValue(); + interface Callback { void onResponsePicked(@NonNull FillResponse response); void onDatasetPicked(@NonNull Dataset dataset); @@ -63,9 +67,13 @@ final class FillUi { void startIntentSender(IntentSender intentSender); } + private final @NonNull Point mTempPoint = new Point(); + private final @NonNull AutofillWindowPresenter mWindowPresenter = new AutofillWindowPresenter(); + private final @NonNull Context mContext; + private final @NonNull AnchoredWindow mWindow; private final @NonNull Callback mCallback; @@ -84,6 +92,7 @@ final class FillUi { FillUi(@NonNull Context context, @NonNull FillResponse response, @NonNull AutofillId focusedViewId, @NonNull @Nullable String filterText, @NonNull Callback callback) { + mContext = context; mCallback = callback; final LayoutInflater inflater = LayoutInflater.from(context); @@ -115,13 +124,18 @@ final class FillUi { mWindow = null; return; } - final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); - final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); - content.measure(widthMeasureSpec, heightMeasureSpec); + + Point maxSize = mTempPoint; + resolveMaxWindowSize(context, maxSize); + final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxSize.x, + MeasureSpec.AT_MOST); + final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxSize.y, + MeasureSpec.AT_MOST); + + decor.measure(widthMeasureSpec, heightMeasureSpec); decor.setOnClickListener(v -> mCallback.onResponsePicked(response)); - // TODO(b/37567439): temporary limiting maximum height and minimum width - mContentWidth = Math.max(content.getMeasuredWidth(), 1000); - mContentHeight = Math.min(content.getMeasuredHeight(), 500); + mContentWidth = content.getMeasuredWidth(); + mContentHeight = content.getMeasuredHeight(); mWindow = new AnchoredWindow(decor); mCallback.requestShowFillUi(mContentWidth, mContentHeight, mWindowPresenter); @@ -245,6 +259,9 @@ final class FillUi { return changed; } + Point maxSize = mTempPoint; + resolveMaxWindowSize(mContext, maxSize); + mContentWidth = 0; mContentHeight = 0; @@ -254,12 +271,14 @@ final class FillUi { for (int i = 0; i < itemCount; i++) { View view = mAdapter.getItem(i).getView(); view.measure(widthMeasureSpec, heightMeasureSpec); - final int newContentWidth = Math.max(mContentWidth, view.getMeasuredWidth()); + final int clampedMeasuredWidth = Math.min(view.getMeasuredWidth(), maxSize.x); + final int newContentWidth = Math.max(mContentWidth, clampedMeasuredWidth); if (newContentWidth != mContentWidth) { mContentWidth = newContentWidth; changed = true; } - final int newContentHeight = mContentHeight + view.getMeasuredHeight(); + final int clampedMeasuredHeight = Math.min(view.getMeasuredHeight(), maxSize.y); + final int newContentHeight = mContentHeight + clampedMeasuredHeight; if (newContentHeight != mContentHeight) { mContentHeight = newContentHeight; changed = true; @@ -274,6 +293,17 @@ final class FillUi { } } + private static void resolveMaxWindowSize(Context context, Point outPoint) { + context.getDisplay().getSize(outPoint); + TypedValue typedValue = sTempTypedValue; + context.getTheme().resolveAttribute(R.attr.autofillDatasetPickerMaxWidth, + typedValue, true); + outPoint.x = (int) typedValue.getFraction(outPoint.x, outPoint.x); + context.getTheme().resolveAttribute(R.attr.autofillDatasetPickerMaxHeight, + typedValue, true); + outPoint.y = (int) typedValue.getFraction(outPoint.y, outPoint.y); + } + private static class ViewItem { private final String mValue; private final Dataset mDataset; diff --git a/services/backup/java/com/android/server/backup/Trampoline.java b/services/backup/java/com/android/server/backup/Trampoline.java index 0fd0ea510cc5..1e56e95fbb90 100644 --- a/services/backup/java/com/android/server/backup/Trampoline.java +++ b/services/backup/java/com/android/server/backup/Trampoline.java @@ -356,6 +356,8 @@ public class Trampoline extends IBackupManager.Stub { BackupManagerServiceInterface svc = mService; if (svc != null) { svc.selectBackupTransportAsync(transport, listener); + } else { + listener.onFailure(BackupManager.ERROR_BACKUP_NOT_ALLOWED); } } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 0748816a8957..8555851fbcae 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2624,6 +2624,17 @@ public class ConnectivityService extends IConnectivityManager.Stub PROMPT_UNVALIDATED_DELAY_MS); } + @Override + public void startCaptivePortalApp(Network network) { + enforceConnectivityInternalPermission(); + mHandler.post(() -> { + NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network); + if (nai == null) return; + if (!nai.networkCapabilities.hasCapability(NET_CAPABILITY_CAPTIVE_PORTAL)) return; + nai.networkMonitor.sendMessage(NetworkMonitor.CMD_LAUNCH_CAPTIVE_PORTAL_APP); + }); + } + public boolean avoidBadWifi() { return mMultinetworkPolicyTracker.getAvoidBadWifi(); } diff --git a/services/core/java/com/android/server/SystemService.java b/services/core/java/com/android/server/SystemService.java index c105b1244e74..94397d07e1a2 100644 --- a/services/core/java/com/android/server/SystemService.java +++ b/services/core/java/com/android/server/SystemService.java @@ -173,6 +173,9 @@ public abstract class SystemService { * state they maintain for running users. This is called prior to sending the SHUTDOWN * broadcast to the user; it is a good place to stop making use of any resources of that * user (such as binding to a service running in the user). + * + * <p>NOTE: This is the last callback where the callee may access the target user's CE storage. + * * @param userHandle The identifier of the user. */ public void onStopUser(int userHandle) {} @@ -181,6 +184,10 @@ public abstract class SystemService { * Called when an existing user is stopping, for system services to finalize any per-user * state they maintain for running users. This is called after all application process * teardown of the user is complete. + * + * <p>NOTE: When this callback is called, the CE storage for the target user may not be + * accessible already. Use {@link #onStopUser} instead if you need to access the CE storage. + * * @param userHandle The identifier of the user. */ public void onCleanupUser(int userHandle) {} diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 5edf19a9d012..e0fc531eb326 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -2808,7 +2808,7 @@ public final class ActiveServices { void removeUninstalledPackageLocked(String packageName, int userId) { ServiceMap smap = mServiceMap.get(userId); if (smap != null && smap.mActiveForegroundApps.size() > 0) { - for (int i = smap.mActiveForegroundApps.size(); i >= 0; i--) { + for (int i = smap.mActiveForegroundApps.size()-1; i >= 0; i--) { ActiveForegroundApp aa = smap.mActiveForegroundApps.valueAt(i); if (aa.mPackageName.equals(packageName)) { smap.mActiveForegroundApps.removeAt(i); diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 158175f4b0d9..7bd8b0b3209a 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -2328,6 +2328,9 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo return true; } + // TODO: We should add ActivityRecord.shouldBeVisible() that checks if the activity should + // be visible based on the stack, task, and lockscreen state and use that here instead. The + // method should be based on the logic in ActivityStack.ensureActivitiesVisibleLocked(). // Skip updating configuration for activity is a stack that shouldn't be visible. if (stack.shouldBeVisible(null /* starting */) == STACK_INVISIBLE) { if (DEBUG_SWITCH || DEBUG_CONFIGURATION) Slog.v(TAG_CONFIGURATION, diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 01e86e271127..d84a1c03a453 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2503,7 +2503,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D tempRect /* outStackBounds */, otherTaskRect /* outTempTaskBounds */, true /* ignoreVisibility */); - resizeStackLocked(i, tempRect, + resizeStackLocked(i, !tempRect.isEmpty() ? tempRect : null, !otherTaskRect.isEmpty() ? otherTaskRect : tempOtherTaskBounds, tempOtherTaskInsetBounds, preserveWindows, true /* allowResizeInDockedMode */, deferResume); diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 22d1bd12685c..abe2daf65322 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -550,15 +550,11 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta boolean kept = true; if (updatedConfig) { final ActivityRecord r = topRunningActivityLocked(); - if (r != null) { + if (r != null && !deferResume) { kept = r.ensureActivityConfigurationLocked(0 /* globalChanges */, preserveWindow); - - if (!deferResume) { - // All other activities must be made visible with their correct configuration. - mService.mStackSupervisor.ensureActivitiesVisibleLocked(r, 0, !PRESERVE_WINDOWS); - if (!kept) { - mService.mStackSupervisor.resumeFocusedStackTopActivityLocked(); - } + mService.mStackSupervisor.ensureActivitiesVisibleLocked(r, 0, !PRESERVE_WINDOWS); + if (!kept) { + mService.mStackSupervisor.resumeFocusedStackTopActivityLocked(); } } } diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index e2b838f74699..e9555f7870d7 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -3251,9 +3251,10 @@ public class AudioService extends IAudioService.Stub if (deviceList.size() > 0) { btDevice = deviceList.get(0); int state = mA2dp.getConnectionState(btDevice); + int intState = (state == BluetoothA2dp.STATE_CONNECTED) ? 1 : 0; int delay = checkSendBecomingNoisyIntent( - AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, - (state == BluetoothA2dp.STATE_CONNECTED) ? 1 : 0); + AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, intState, + AudioSystem.DEVICE_NONE); queueMsgUnderWakeLock(mAudioHandler, MSG_SET_A2DP_SINK_CONNECTION_STATE, state, @@ -3381,9 +3382,8 @@ public class AudioService extends IAudioService.Stub } } if (toRemove != null) { - int delay = checkSendBecomingNoisyIntent( - AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, - 0); + int delay = checkSendBecomingNoisyIntent(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, + 0, AudioSystem.DEVICE_NONE); for (int i = 0; i < toRemove.size(); i++) { makeA2dpDeviceUnavailableLater(toRemove.valueAt(i), delay); } @@ -3919,7 +3919,7 @@ public class AudioService extends IAudioService.Stub Slog.i(TAG, "setWiredDeviceConnectionState(" + state + " nm: " + name + " addr:" + address + ")"); } - int delay = checkSendBecomingNoisyIntent(type, state); + int delay = checkSendBecomingNoisyIntent(type, state, AudioSystem.DEVICE_NONE); queueMsgUnderWakeLock(mAudioHandler, MSG_SET_WIRED_DEVICE_CONNECTION_STATE, 0 /* arg1 unused */, @@ -3931,14 +3931,25 @@ public class AudioService extends IAudioService.Stub public int setBluetoothA2dpDeviceConnectionState(BluetoothDevice device, int state, int profile) { + if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE)) { + return 0; + } + return setBluetoothA2dpDeviceConnectionStateInt( + device, state, profile, AudioSystem.DEVICE_NONE); + } + + public int setBluetoothA2dpDeviceConnectionStateInt( + BluetoothDevice device, int state, int profile, int musicDevice) + { int delay; if (profile != BluetoothProfile.A2DP && profile != BluetoothProfile.A2DP_SINK) { throw new IllegalArgumentException("invalid profile " + profile); } synchronized (mConnectedDevices) { if (profile == BluetoothProfile.A2DP) { + int intState = (state == BluetoothA2dp.STATE_CONNECTED) ? 1 : 0; delay = checkSendBecomingNoisyIntent(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, - (state == BluetoothA2dp.STATE_CONNECTED) ? 1 : 0); + intState, musicDevice); } else { delay = 0; } @@ -5162,16 +5173,21 @@ public class AudioService extends IAudioService.Stub int device = AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; synchronized (mConnectedDevices) { + if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE)) { + return; + } final String key = makeDeviceListKey(device, address); final DeviceListSpec deviceSpec = mConnectedDevices.get(key); if (deviceSpec != null) { // Device is connected + int musicDevice = getDeviceForStream(AudioSystem.STREAM_MUSIC); if (AudioSystem.handleDeviceConfigChange(device, address, btDevice.getName()) != AudioSystem.AUDIO_STATUS_OK) { // force A2DP device disconnection in case of error so that AudioService state is // consistent with audio policy manager state - setBluetoothA2dpDeviceConnectionState( - btDevice, BluetoothA2dp.STATE_DISCONNECTED, BluetoothProfile.A2DP_SINK); + setBluetoothA2dpDeviceConnectionStateInt( + btDevice, BluetoothA2dp.STATE_DISCONNECTED, BluetoothProfile.A2DP, + musicDevice); } } } @@ -5242,7 +5258,9 @@ public class AudioService extends IAudioService.Stub // must be called before removing the device from mConnectedDevices // Called synchronized on mConnectedDevices - private int checkSendBecomingNoisyIntent(int device, int state) { + // musicDevice argument is used when not AudioSystem.DEVICE_NONE instead of querying + // from AudioSystem + private int checkSendBecomingNoisyIntent(int device, int state, int musicDevice) { int delay = 0; if ((state == 0) && ((device & mBecomingNoisyIntentDevices) != 0)) { int devices = 0; @@ -5253,8 +5271,13 @@ public class AudioService extends IAudioService.Stub devices |= dev; } } - int musicDevice = getDeviceForStream(AudioSystem.STREAM_MUSIC); - if ((device == musicDevice) && (device == devices)) { + if (musicDevice == AudioSystem.DEVICE_NONE) { + musicDevice = getDeviceForStream(AudioSystem.STREAM_MUSIC); + } + // ignore condition on device being actually used for music when in communication + // because music routing is altered in this case. + if (((device == musicDevice) || isInCommunication()) && (device == devices)) { + mAudioHandler.removeMessages(MSG_BROADCAST_AUDIO_BECOMING_NOISY); sendMsg(mAudioHandler, MSG_BROADCAST_AUDIO_BECOMING_NOISY, SENDMSG_REPLACE, @@ -5338,6 +5361,11 @@ public class AudioService extends IAudioService.Stub } } + private static final int DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG = + AudioSystem.DEVICE_OUT_WIRED_HEADSET | AudioSystem.DEVICE_OUT_WIRED_HEADPHONE | + AudioSystem.DEVICE_OUT_LINE | + AudioSystem.DEVICE_OUT_ALL_USB; + private void onSetWiredDeviceConnectionState(int device, int state, String address, String deviceName, String caller) { if (DEBUG_DEVICES) { @@ -5349,9 +5377,7 @@ public class AudioService extends IAudioService.Stub } synchronized (mConnectedDevices) { - if ((state == 0) && ((device == AudioSystem.DEVICE_OUT_WIRED_HEADSET) || - (device == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE) || - (device == AudioSystem.DEVICE_OUT_LINE))) { + if ((state == 0) && ((device & DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG) != 0)) { setBluetoothA2dpOnInt(true); } boolean isUsb = ((device & ~AudioSystem.DEVICE_OUT_ALL_USB) == 0) || @@ -5362,9 +5388,7 @@ public class AudioService extends IAudioService.Stub return; } if (state != 0) { - if ((device == AudioSystem.DEVICE_OUT_WIRED_HEADSET) || - (device == AudioSystem.DEVICE_OUT_WIRED_HEADPHONE) || - (device == AudioSystem.DEVICE_OUT_LINE)) { + if ((device & DEVICE_OVERRIDE_A2DP_ROUTE_ON_PLUG) != 0) { setBluetoothA2dpOnInt(false); } if ((device & mSafeMediaVolumeDevices) != 0) { diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index b3d2e3099c1b..36779059eb63 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -197,11 +197,13 @@ public class NetworkMonitor extends StateMachine { public static final int EVENT_PROVISIONING_NOTIFICATION = BASE + 10; /** - * Message to self indicating sign-in app should be launched. + * Message indicating sign-in app should be launched. * Sent by mLaunchCaptivePortalAppBroadcastReceiver when the - * user touches the sign in notification. + * user touches the sign in notification, or sent by + * ConnectivityService when the user touches the "sign into + * network" button in the wifi access point detail page. */ - private static final int CMD_LAUNCH_CAPTIVE_PORTAL_APP = BASE + 11; + public static final int CMD_LAUNCH_CAPTIVE_PORTAL_APP = BASE + 11; /** * Retest network to see if captive portal is still in place. diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 8b8420571db4..ed47c3e55b74 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -4217,7 +4217,9 @@ public class NotificationManagerService extends SystemService { if (wasPosted) { // status bar if (r.getNotification().getSmallIcon() != null) { - r.isCanceled = true; + if (reason != REASON_SNOOZED) { + r.isCanceled = true; + } mListeners.notifyRemovedLocked(r.sbn, reason); mHandler.post(new Runnable() { @Override @@ -4340,9 +4342,11 @@ public class NotificationManagerService extends SystemService { updateLightsLocked(); } else { // No notification was found, assume that it is snoozed and cancel it. - final boolean wasSnoozed = mSnoozeHelper.cancel(userId, pkg, tag, id); - if (wasSnoozed) { - savePolicyFile(); + if (reason != REASON_SNOOZED) { + final boolean wasSnoozed = mSnoozeHelper.cancel(userId, pkg, tag, id); + if (wasSnoozed) { + savePolicyFile(); + } } } } @@ -4472,7 +4476,7 @@ public class NotificationManagerService extends SystemService { void snoozeNotificationInt(String key, long duration, String snoozeCriterionId, ManagedServiceInfo listener) { String listenerName = listener == null ? null : listener.component.toShortString(); - if (duration <= 0 && snoozeCriterionId == null) { + if (duration <= 0 && snoozeCriterionId == null || key == null) { return; } diff --git a/services/core/java/com/android/server/notification/SnoozeHelper.java b/services/core/java/com/android/server/notification/SnoozeHelper.java index 42b4f573dfcc..a178a525cede 100644 --- a/services/core/java/com/android/server/notification/SnoozeHelper.java +++ b/services/core/java/com/android/server/notification/SnoozeHelper.java @@ -167,16 +167,10 @@ public class SnoozeHelper { for (Map.Entry<String, NotificationRecord> record : records) { final StatusBarNotification sbn = record.getValue().sbn; if (Objects.equals(sbn.getTag(), tag) && sbn.getId() == id) { - key = record.getKey(); + record.getValue().isCanceled = true; + return true; } } - if (key != null) { - recordsForPkg.remove(key); - cancelAlarm(userId, pkg, key); - mPackages.remove(key); - mUsers.remove(key); - return true; - } } } return false; @@ -190,7 +184,7 @@ public class SnoozeHelper { final int N = userIds.length; for (int i = 0; i < N; i++) { final ArrayMap<String, ArrayMap<String, NotificationRecord>> snoozedPkgs = - mSnoozedNotifications.remove(userIds[i]); + mSnoozedNotifications.get(userIds[i]); if (snoozedPkgs != null) { final int M = snoozedPkgs.size(); for (int j = 0; j < M; j++) { @@ -198,10 +192,7 @@ public class SnoozeHelper { if (records != null) { int P = records.size(); for (int k = 0; k < P; k++) { - final String key = records.keyAt(k); - cancelAlarm(userId, snoozedPkgs.keyAt(j), key); - mPackages.remove(key); - mUsers.remove(key); + records.valueAt(k).isCanceled = true; } } } @@ -215,13 +206,10 @@ public class SnoozeHelper { if (mSnoozedNotifications.containsKey(userId)) { if (mSnoozedNotifications.get(userId).containsKey(pkg)) { ArrayMap<String, NotificationRecord> records = - mSnoozedNotifications.get(userId).remove(pkg); + mSnoozedNotifications.get(userId).get(pkg); int N = records.size(); for (int i = 0; i < N; i++) { - final String key = records.keyAt(i); - cancelAlarm(userId, pkg, key); - mPackages.remove(key); - mUsers.remove(key); + records.valueAt(i).isCanceled = true; } return true; } @@ -229,16 +217,6 @@ public class SnoozeHelper { return false; } - private void cancelAlarm(int userId, String pkg, String key) { - long identity = Binder.clearCallingIdentity(); - try { - final PendingIntent pi = createPendingIntent(pkg, key, userId); - mAm.cancel(pi); - } finally { - Binder.restoreCallingIdentity(identity); - } - } - /** * Updates the notification record so the most up to date information is shown on re-post. */ @@ -252,6 +230,10 @@ public class SnoozeHelper { if (pkgRecords == null) { return; } + NotificationRecord existing = pkgRecords.get(record.getKey()); + if (existing != null && existing.isCanceled) { + return; + } pkgRecords.put(record.getKey(), record); } @@ -274,8 +256,10 @@ public class SnoozeHelper { return; } final NotificationRecord record = pkgRecords.remove(key); + mPackages.remove(key); + mUsers.remove(key); - if (record != null) { + if (record != null && !record.isCanceled) { MetricsLogger.action(record.getLogMaker() .setCategory(MetricsProto.MetricsEvent.NOTIFICATION_SNOOZED) .setType(MetricsProto.MetricsEvent.TYPE_OPEN)); @@ -309,10 +293,12 @@ public class SnoozeHelper { mPackages.remove(groupSummaryKey); mUsers.remove(groupSummaryKey); - MetricsLogger.action(record.getLogMaker() - .setCategory(MetricsProto.MetricsEvent.NOTIFICATION_SNOOZED) - .setType(MetricsProto.MetricsEvent.TYPE_OPEN)); - mCallback.repost(userId, record); + if (record != null && !record.isCanceled) { + MetricsLogger.action(record.getLogMaker() + .setCategory(MetricsProto.MetricsEvent.NOTIFICATION_SNOOZED) + .setType(MetricsProto.MetricsEvent.TYPE_OPEN)); + mCallback.repost(userId, record); + } } } } diff --git a/services/core/java/com/android/server/pm/InstructionSets.java b/services/core/java/com/android/server/pm/InstructionSets.java index 5092ebf9d4b9..f326f1d20c46 100644 --- a/services/core/java/com/android/server/pm/InstructionSets.java +++ b/services/core/java/com/android/server/pm/InstructionSets.java @@ -34,7 +34,7 @@ import dalvik.system.VMRuntime; */ public class InstructionSets { private static final String PREFERRED_INSTRUCTION_SET = - VMRuntime.getInstructionSet(Build.SUPPORTED_ABIS[0]);; + VMRuntime.getInstructionSet(Build.SUPPORTED_ABIS[0]); public static String[] getAppDexInstructionSets(ApplicationInfo info) { if (info.primaryCpuAbi != null) { if (info.secondaryCpuAbi != null) { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index e21a2b9aa412..03f6aaa21293 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -127,6 +127,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.AppsQueryHelper; import android.content.pm.ChangedPackages; import android.content.pm.ComponentInfo; +import android.content.pm.IDexModuleRegisterCallback; import android.content.pm.InstantAppRequest; import android.content.pm.AuxiliaryResolveInfo; import android.content.pm.FallbackCategoryProvider; @@ -4360,8 +4361,7 @@ public class PackageManagerService extends IPackageManager.Stub } SharedLibraryInfo resLibInfo = new SharedLibraryInfo(libInfo.getName(), - // TODO: Remove cast for lib version once internally we support longs. - (int) libInfo.getVersion(), libInfo.getType(), + libInfo.getVersion(), libInfo.getType(), libInfo.getDeclaringPackage(), getPackagesUsingSharedLibraryLPr(libInfo, flags, userId)); @@ -6509,7 +6509,7 @@ public class PackageManagerService extends IPackageManager.Stub ephemeralInstaller.filter = new IntentFilter(intent.getAction()); ephemeralInstaller.filter.addDataPath( intent.getData().getPath(), PatternMatcher.PATTERN_LITERAL); - ephemeralInstaller.instantAppAvailable = true; + ephemeralInstaller.isInstantAppAvailable = true; result.add(ephemeralInstaller); } } @@ -8729,6 +8729,31 @@ public class PackageManagerService extends IPackageManager.Stub } @Override + public void registerDexModule(String packageName, String dexModulePath, boolean isSharedModule, + IDexModuleRegisterCallback callback) { + int userId = UserHandle.getCallingUserId(); + ApplicationInfo ai = getApplicationInfo(packageName, /*flags*/ 0, userId); + DexManager.RegisterDexModuleResult result; + if (ai == null) { + Slog.w(TAG, "Registering a dex module for a package that does not exist for the" + + " calling user. package=" + packageName + ", user=" + userId); + result = new DexManager.RegisterDexModuleResult(false, "Package not installed"); + } else { + result = mDexManager.registerDexModule(ai, dexModulePath, isSharedModule, userId); + } + + if (callback != null) { + mHandler.post(() -> { + try { + callback.onDexModuleRegistered(dexModulePath, result.success, result.message); + } catch (RemoteException e) { + Slog.w(TAG, "Failed to callback after module registration " + dexModulePath, e); + } + }); + } + } + + @Override public boolean performDexOpt(String packageName, boolean checkProfiles, int compileReason, boolean force) { int dexOptStatus = performDexOptTraced(packageName, checkProfiles, @@ -12611,7 +12636,7 @@ public class PackageManagerService extends IPackageManager.Stub } res.iconResourceId = info.icon; res.system = res.activityInfo.applicationInfo.isSystemApp(); - res.instantAppAvailable = userState.instantApp; + res.isInstantAppAvailable = userState.instantApp; return res; } @@ -17750,8 +17775,7 @@ public class PackageManagerService extends IPackageManager.Stub for (int i = 0; i < versionCount; i++) { SharedLibraryEntry libEntry = versionedLib.valueAt(i); if (versionsCallerCanSee != null && versionsCallerCanSee.indexOfKey( - // TODO: Remove cast for lib version once internally we support longs. - (int) libEntry.info.getVersion()) < 0) { + libEntry.info.getVersion()) < 0) { continue; } // TODO: We will change version code to long, so in the new API it is long diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 7c89e1ccb7c8..bed8f1a78649 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -555,8 +555,8 @@ public class ShortcutService extends IShortcutService.Stub { } @Override - public void onCleanupUser(int userHandle) { - mService.handleCleanupUser(userHandle); + public void onStopUser(int userHandle) { + mService.handleStopUser(userHandle); } @Override @@ -606,9 +606,9 @@ public class ShortcutService extends IShortcutService.Stub { } /** lifecycle event */ - void handleCleanupUser(int userId) { + void handleStopUser(int userId) { if (DEBUG) { - Slog.d(TAG, "handleCleanupUser: user=" + userId); + Slog.d(TAG, "handleStopUser: user=" + userId); } synchronized (mLock) { unloadUserLocked(userId); @@ -3777,7 +3777,7 @@ public class ShortcutService extends IShortcutService.Stub { Slog.i(TAG, "cmd: handleUnloadUser: user=" + mUserId); - ShortcutService.this.handleCleanupUser(mUserId); + ShortcutService.this.handleStopUser(mUserId); } } diff --git a/services/core/java/com/android/server/pm/dex/DexManager.java b/services/core/java/com/android/server/pm/dex/DexManager.java index 3d7cedce522a..4a8232da2b35 100644 --- a/services/core/java/com/android/server/pm/dex/DexManager.java +++ b/services/core/java/com/android/server/pm/dex/DexManager.java @@ -30,6 +30,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.server.pm.Installer; import com.android.server.pm.Installer.InstallerException; import com.android.server.pm.PackageDexOptimizer; +import com.android.server.pm.PackageManagerService; import com.android.server.pm.PackageManagerServiceUtils; import com.android.server.pm.PackageManagerServiceCompilerMapping; @@ -41,6 +42,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import static com.android.server.pm.InstructionSets.getAppDexInstructionSets; import static com.android.server.pm.dex.PackageDexUsage.PackageUseInfo; import static com.android.server.pm.dex.PackageDexUsage.DexUseInfo; @@ -431,6 +433,52 @@ public class DexManager { } } + public RegisterDexModuleResult registerDexModule(ApplicationInfo info, String dexPath, + boolean isUsedByOtherApps, int userId) { + // Find the owning package record. + DexSearchResult searchResult = getDexPackage(info, dexPath, userId); + + if (searchResult.mOutcome == DEX_SEARCH_NOT_FOUND) { + return new RegisterDexModuleResult(false, "Package not found"); + } + if (!info.packageName.equals(searchResult.mOwningPackageName)) { + return new RegisterDexModuleResult(false, "Dex path does not belong to package"); + } + if (searchResult.mOutcome == DEX_SEARCH_FOUND_PRIMARY || + searchResult.mOutcome == DEX_SEARCH_FOUND_SPLIT) { + return new RegisterDexModuleResult(false, "Main apks cannot be registered"); + } + + // We found the package. Now record the usage for all declared ISAs. + boolean update = false; + Set<String> isas = new HashSet<>(); + for (String isa : getAppDexInstructionSets(info)) { + isas.add(isa); + boolean newUpdate = mPackageDexUsage.record(searchResult.mOwningPackageName, + dexPath, userId, isa, isUsedByOtherApps, /*primaryOrSplit*/ false); + update |= newUpdate; + } + if (update) { + mPackageDexUsage.maybeWriteAsync(); + } + + // Try to optimize the package according to the install reason. + String compilerFilter = PackageManagerServiceCompilerMapping.getCompilerFilterForReason( + PackageManagerService.REASON_INSTALL); + int result = mPackageDexOptimizer.dexOptSecondaryDexPath(info, dexPath, isas, + compilerFilter, isUsedByOtherApps); + + // If we fail to optimize the package log an error but don't propagate the error + // back to the app. The app cannot do much about it and the background job + // will rety again when it executes. + // TODO(calin): there might be some value to return the error here but it may + // cause red herrings since that doesn't mean the app cannot use the module. + if (result != PackageDexOptimizer.DEX_OPT_FAILED) { + Slog.e(TAG, "Failed to optimize dex module " + dexPath); + } + return new RegisterDexModuleResult(true, "Dex module registered successfully"); + } + /** * Return all packages that contain records of secondary dex files. */ @@ -510,6 +558,20 @@ public class DexManager { return existingValue == null ? newValue : existingValue; } + public static class RegisterDexModuleResult { + public RegisterDexModuleResult() { + this(false, null); + } + + public RegisterDexModuleResult(boolean success, String message) { + this.success = success; + this.message = message; + } + + public final boolean success; + public final String message; + } + /** * Convenience class to store the different locations where a package might * own code. @@ -589,6 +651,4 @@ public class DexManager { return mOwningPackageName + "-" + mOutcome; } } - - } diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 61ed72d990ca..8c3d80f18581 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -65,6 +65,7 @@ import android.service.vr.IVrManager; import android.service.vr.IVrStateCallbacks; import android.util.EventLog; import android.util.KeyValueListParser; +import android.util.Log; import android.util.PrintWriterPrinter; import android.util.Slog; import android.util.SparseArray; @@ -91,6 +92,10 @@ import com.android.server.am.BatteryStatsService; import com.android.server.lights.Light; import com.android.server.lights.LightsManager; import com.android.server.power.BatterySaverPolicy.ServiceType; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; import libcore.util.Objects; import java.io.FileDescriptor; @@ -191,6 +196,12 @@ public final class PowerManagerService extends SystemService // System property indicating that the screen should remain off until an explicit user action private static final String SYSTEM_PROPERTY_QUIESCENT = "ro.boot.quiescent"; + // Possible reasons for shutting down for use in data/misc/reboot/last_shutdown_reason + private static final String REASON_SHUTDOWN = "shutdown"; + private static final String REASON_REBOOT = "reboot"; + private static final String REASON_USERREQUESTED = "userrequested"; + private static final String REASON_THERMAL_SHUTDOWN = "thermal-shutdown"; + private static final String TRACE_SCREEN_ON = "Screen turning on"; /** If turning screen on takes more than this long, we show a warning on logcat. */ @@ -204,6 +215,9 @@ public final class PowerManagerService extends SystemService private static final int HALT_MODE_REBOOT = 1; private static final int HALT_MODE_REBOOT_SAFE_MODE = 2; + // File location for last reboot reason + private static final String LAST_REBOOT_LOCATION = "/data/misc/reboot/last_reboot_reason"; + private final Context mContext; private final ServiceThread mHandlerThread; private final PowerManagerHandler mHandler; @@ -4340,6 +4354,25 @@ public final class PowerManagerService extends SystemService } /** + * Gets the reason for the last time the phone had to reboot. + * + * @return The reason the phone last shut down as an int or + * {@link PowerManager.SHUTDOWN_REASON_UNKNOWN} if the file could not be opened. + */ + @Override // Binder call + public int getLastShutdownReason() { + mContext.enforceCallingOrSelfPermission( + android.Manifest.permission.DEVICE_POWER, null); + + final long ident = Binder.clearCallingIdentity(); + try { + return getLastShutdownReasonInternal(new File(LAST_REBOOT_LOCATION)); + } finally { + Binder.restoreCallingIdentity(ident); + } + } + + /** * Reboots the device. * * @param confirm If true, shows a reboot confirmation dialog. @@ -4566,6 +4599,28 @@ public final class PowerManagerService extends SystemService } } + @VisibleForTesting + int getLastShutdownReasonInternal(File lastRebootReason) { + String line = ""; + try (BufferedReader bufferedReader = new BufferedReader(new FileReader(lastRebootReason))){ + line = bufferedReader.readLine(); + } catch (IOException e) { + Slog.e(TAG, "Failed to read last_reboot_reason file", e); + } + switch (line) { + case REASON_SHUTDOWN: + return PowerManager.SHUTDOWN_REASON_SHUTDOWN; + case REASON_REBOOT: + return PowerManager.SHUTDOWN_REASON_REBOOT; + case REASON_USERREQUESTED: + return PowerManager.SHUTDOWN_REASON_USER_REQUESTED; + case REASON_THERMAL_SHUTDOWN: + return PowerManager.SHUTDOWN_REASON_THERMAL_SHUTDOWN; + default: + return PowerManager.SHUTDOWN_REASON_UNKNOWN; + } + } + private final class LocalService extends PowerManagerInternal { @Override public void setScreenBrightnessOverrideFromWindowManager(int screenBrightness) { diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 2236b597ac5e..a6b95d635ba7 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1132,7 +1132,10 @@ class WindowStateAnimator { // Task is non-null per shouldCropToStackBounds final TaskStack stack = w.getTask().mStack; stack.getDimBounds(finalClipRect); - w.expandForSurfaceInsets(finalClipRect); + + if (StackId.tasksAreFloating(stack.mStackId)) { + w.expandForSurfaceInsets(finalClipRect); + } return true; } diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp index 4a08ce4aebb7..96c2d7e38232 100644 --- a/services/core/jni/com_android_server_SystemServer.cpp +++ b/services/core/jni/com_android_server_SystemServer.cpp @@ -48,7 +48,7 @@ static void android_server_SystemServer_startHidlServices(JNIEnv* /* env */, job status_t err; - configureRpcThreadpool(1, false /* callerWillJoin */); + configureRpcThreadpool(5, false /* callerWillJoin */); sp<ISensorManager> sensorService = new SensorManager(); err = sensorService->registerAsService(); diff --git a/services/tests/notification/src/com/android/server/notification/SnoozeHelperTest.java b/services/tests/notification/src/com/android/server/notification/SnoozeHelperTest.java index 51ec05c51b07..bc25860e8e92 100644 --- a/services/tests/notification/src/com/android/server/notification/SnoozeHelperTest.java +++ b/services/tests/notification/src/com/android/server/notification/SnoozeHelperTest.java @@ -107,9 +107,9 @@ public class SnoozeHelperTest { UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, r.sbn.getPackageName(), "one", 1); - // 3 = one for each snooze, above + one for cancel itself. - verify(mAm, times(3)).cancel(any(PendingIntent.class)); - assertFalse(mSnoozeHelper.isSnoozed( + // 2 = one for each snooze, above, zero for the cancel. + verify(mAm, times(2)).cancel(any(PendingIntent.class)); + assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); @@ -131,11 +131,11 @@ public class SnoozeHelperTest { UserHandle.USER_ALL, r3.sbn.getPackageName(), r3.getKey())); mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, false); - // 5 = once for each snooze above (3) + once for each notification canceled (2). - verify(mAm, times(5)).cancel(any(PendingIntent.class)); - assertFalse(mSnoozeHelper.isSnoozed( + // 3 = once for each snooze above (3), only. + verify(mAm, times(3)).cancel(any(PendingIntent.class)); + assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); - assertFalse(mSnoozeHelper.isSnoozed( + assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_ALL, r3.sbn.getPackageName(), r3.getKey())); @@ -157,17 +157,47 @@ public class SnoozeHelperTest { UserHandle.USER_SYSTEM, r3.sbn.getPackageName(), r3.getKey())); mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, "pkg2"); - // 4 = once for each snooze above (3) + once for each notification canceled (1). - verify(mAm, times(4)).cancel(any(PendingIntent.class)); + // 3 = once for each snooze above (3), only. + verify(mAm, times(3)).cancel(any(PendingIntent.class)); assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); - assertFalse(mSnoozeHelper.isSnoozed( + assertTrue(mSnoozeHelper.isSnoozed( UserHandle.USER_SYSTEM, r3.sbn.getPackageName(), r3.getKey())); } @Test + public void testCancelDoesNotUnsnooze() throws Exception { + NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); + mSnoozeHelper.snooze(r, 1000); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + + mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, r.sbn.getPackageName(), "one", 1); + + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + } + + @Test + public void testCancelDoesNotRepost() throws Exception { + NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); + NotificationRecord r2 = getNotificationRecord("pkg", 2, "two", UserHandle.SYSTEM); + mSnoozeHelper.snooze(r, 1000); + mSnoozeHelper.snooze(r2 , 1000); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r.sbn.getPackageName(), r.getKey())); + assertTrue(mSnoozeHelper.isSnoozed( + UserHandle.USER_SYSTEM, r2.sbn.getPackageName(), r2.getKey())); + + mSnoozeHelper.cancel(UserHandle.USER_SYSTEM, r.sbn.getPackageName(), "one", 1); + + mSnoozeHelper.repost(r.getKey(), UserHandle.USER_SYSTEM); + verify(mCallback, never()).repost(UserHandle.USER_SYSTEM, r); + } + + @Test public void testRepost() throws Exception { NotificationRecord r = getNotificationRecord("pkg", 1, "one", UserHandle.SYSTEM); mSnoozeHelper.snooze(r, 1000); diff --git a/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java b/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java index 1896cda5d356..4c53915c79e2 100644 --- a/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java @@ -18,6 +18,7 @@ package com.android.server.backup; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; @@ -31,6 +32,7 @@ import android.app.backup.BackupManager; import android.app.backup.IBackupManagerMonitor; import android.app.backup.IBackupObserver; import android.app.backup.IFullBackupRestoreObserver; +import android.app.backup.ISelectBackupTransportCallback; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -54,6 +56,9 @@ import java.io.File; import java.io.FileDescriptor; import java.io.IOException; import java.io.PrintWriter; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; @SmallTest @Presubmit @@ -568,9 +573,30 @@ public class TrampolineTest { } @Test - public void selectBackupTransportAsync_calledBeforeInitialize_ignored() throws RemoteException { - mTrampoline.selectBackupTransportAsync(TRANSPORT_COMPONENT_NAME, null); + public void selectBackupTransportAsync_calledBeforeInitialize_ignored() throws Exception { + LinkedBlockingQueue<Integer> q = new LinkedBlockingQueue(); + mTrampoline.selectBackupTransportAsync( + TRANSPORT_COMPONENT_NAME, + new ISelectBackupTransportCallback() { + @Override + public void onSuccess(String transportName) throws RemoteException { + + } + + @Override + public void onFailure(int reason) throws RemoteException { + q.offer(reason); + } + + @Override + public IBinder asBinder() { + return null; + } + }); verifyNoMoreInteractions(mBackupManagerServiceMock); + Integer errorCode = q.poll(5, TimeUnit.SECONDS); + assertNotNull(errorCode); + assertEquals(BackupManager.ERROR_BACKUP_NOT_ALLOWED, (int) errorCode); } @Test diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java index cd39d8875692..4c7bf4df0143 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java @@ -3241,7 +3241,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest { assertNull(mService.getShortcutsForTest().get(USER_10).getLastKnownLauncher()); // Try stopping the user - mService.handleCleanupUser(USER_10); + mService.handleStopUser(USER_10); // Now it's unloaded. assertEquals(1, mService.getShortcutsForTest().size()); @@ -6106,7 +6106,7 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest { assertEmpty(mManager.getPinnedShortcuts()); }); // Send add broadcast, but the user is not running, so should be ignored. - mService.handleCleanupUser(USER_10); + mService.handleStopUser(USER_10); mRunningUsers.put(USER_10, false); mUnlockedUsers.put(USER_10, false); diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java index 9880caa11f85..2b40c511ef14 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest2.java @@ -2091,7 +2091,7 @@ public class ShortcutManagerTest2 extends BaseShortcutManagerTest { assertFalse(mService.isUserUnlockedL(USER_10)); // Directly call the stop lifecycle event. Goes back to the initial state. - mService.handleCleanupUser(USER_0); + mService.handleStopUser(USER_0); assertFalse(mService.isUserUnlockedL(USER_0)); assertFalse(mService.isUserUnlockedL(USER_10)); } diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 967b0a44e086..d12c07a84004 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -16,10 +16,19 @@ package com.android.server.power; +import android.content.Context; import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest; +import android.os.PowerManager; import android.os.PowerSaveState; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; +import android.text.TextUtils; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.OutputStreamWriter; +import org.junit.Rule; +import org.junit.rules.TemporaryFolder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -35,11 +44,16 @@ public class PowerManagerServiceTest extends AndroidTestCase { private static final float PRECISION = 0.001f; private static final float BRIGHTNESS_FACTOR = 0.7f; private static final boolean BATTERY_SAVER_ENABLED = true; + private static final String LAST_REBOOT_REASON = "last_reboot_reason"; private @Mock BatterySaverPolicy mBatterySaverPolicy; private PowerManagerService mService; private PowerSaveState mPowerSaveState; private DisplayPowerRequest mDisplayPowerRequest; + private File mTempReason; + + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); public void setUp() throws Exception { super.setUp(); @@ -54,6 +68,8 @@ public class PowerManagerServiceTest extends AndroidTestCase { .thenReturn(mPowerSaveState); mDisplayPowerRequest = new DisplayPowerRequest(); mService = new PowerManagerService(getContext(), mBatterySaverPolicy); + temporaryFolder.create(); + mTempReason = temporaryFolder.newFile(LAST_REBOOT_REASON); } @SmallTest @@ -63,4 +79,17 @@ public class PowerManagerServiceTest extends AndroidTestCase { assertThat(mDisplayPowerRequest.screenLowPowerBrightnessFactor) .isWithin(PRECISION).of(BRIGHTNESS_FACTOR); } + + @SmallTest + public void testGetLastShutdownReasonInternal() { + try { + FileWriter writer = new FileWriter(mTempReason); + writer.append("thermal-shutdown\n"); + writer.close(); + } catch (IOException e) { + e.printStackTrace(); + } + int reason = mService.getLastShutdownReasonInternal(mTempReason); + assertThat(reason).isEqualTo(PowerManager.SHUTDOWN_REASON_THERMAL_SHUTDOWN); + } } diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 3b4fd04f2442..84a2e8b5d266 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -424,6 +424,8 @@ public class UsbDeviceManager { private boolean mSinkPower; private boolean mConfigured; private boolean mUsbDataUnlocked; + private boolean mAudioAccessoryConnected; + private boolean mAudioAccessorySupported; private String mCurrentFunctions; private boolean mCurrentFunctionsApplied; private UsbAccessory mCurrentAccessory; @@ -534,30 +536,13 @@ public class UsbDeviceManager { } public void updateHostState(UsbPort port, UsbPortStatus status) { - boolean hostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST; - boolean sourcePower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE; - boolean sinkPower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SINK; - // Ideally we want to see if PR_SWAP and DR_SWAP is supported. - // But, this should be suffice, since, all four combinations are only supported - // when PR_SWAP and DR_SWAP are supported. - boolean supportsAllCombinations = status.isRoleCombinationSupported( - UsbPort.POWER_ROLE_SOURCE, UsbPort.DATA_ROLE_HOST) - && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK, - UsbPort.DATA_ROLE_HOST) - && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SOURCE, - UsbPort.DATA_ROLE_DEVICE) - && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK, - UsbPort.DATA_ROLE_HOST); - if (DEBUG) { Slog.i(TAG, "updateHostState " + port + " status=" + status); } SomeArgs args = SomeArgs.obtain(); - args.argi1 = hostConnected ? 1 : 0; - args.argi2 = sourcePower ? 1 : 0; - args.argi3 = sinkPower ? 1 : 0; - args.argi4 = supportsAllCombinations ? 1 : 0; + args.arg1 = port; + args.arg2 = status; removeMessages(MSG_UPDATE_PORT_STATE); Message msg = obtainMessage(MSG_UPDATE_PORT_STATE, args); @@ -931,10 +916,26 @@ public class UsbDeviceManager { case MSG_UPDATE_PORT_STATE: SomeArgs args = (SomeArgs) msg.obj; boolean prevHostConnected = mHostConnected; - mHostConnected = (args.argi1 == 1); - mSourcePower = (args.argi2 == 1); - mSinkPower = (args.argi3 == 1); - mSupportsAllCombinations = (args.argi4 == 1); + UsbPort port = (UsbPort) args.arg1; + UsbPortStatus status = (UsbPortStatus) args.arg2; + mHostConnected = status.getCurrentDataRole() == UsbPort.DATA_ROLE_HOST; + mSourcePower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SOURCE; + mSinkPower = status.getCurrentPowerRole() == UsbPort.POWER_ROLE_SINK; + mAudioAccessoryConnected = + (status.getCurrentMode() == UsbPort.MODE_AUDIO_ACCESSORY); + mAudioAccessorySupported = port.isModeSupported(UsbPort.MODE_AUDIO_ACCESSORY); + // Ideally we want to see if PR_SWAP and DR_SWAP is supported. + // But, this should be suffice, since, all four combinations are only supported + // when PR_SWAP and DR_SWAP are supported. + mSupportsAllCombinations = status.isRoleCombinationSupported( + UsbPort.POWER_ROLE_SOURCE, UsbPort.DATA_ROLE_HOST) + && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK, + UsbPort.DATA_ROLE_HOST) + && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SOURCE, + UsbPort.DATA_ROLE_DEVICE) + && status.isRoleCombinationSupported(UsbPort.POWER_ROLE_SINK, + UsbPort.DATA_ROLE_HOST); + args.recycle(); updateUsbNotification(false); if (mBootCompleted) { @@ -1076,7 +1077,10 @@ public class UsbDeviceManager { int id = 0; int titleRes = 0; Resources r = mContext.getResources(); - if (mConnected) { + if (mAudioAccessoryConnected && !mAudioAccessorySupported) { + titleRes = com.android.internal.R.string.usb_unsupported_audio_accessory_title; + id = SystemMessage.NOTE_USB_AUDIO_ACCESSORY_NOT_SUPPORTED; + } else if (mConnected) { if (!mUsbDataUnlocked) { if (mSourcePower) { titleRes = com.android.internal.R.string.usb_supplying_notification_title; @@ -1123,18 +1127,43 @@ public class UsbDeviceManager { mUsbNotificationId = 0; } if (id != 0) { - CharSequence message = r.getText( - com.android.internal.R.string.usb_notification_message); + CharSequence message; CharSequence title = r.getText(titleRes); + PendingIntent pi; + String channel; + + if (titleRes + != com.android.internal.R.string + .usb_unsupported_audio_accessory_title) { + Intent intent = Intent.makeRestartActivityTask( + new ComponentName("com.android.settings", + "com.android.settings.deviceinfo.UsbModeChooserActivity")); + pi = PendingIntent.getActivityAsUser(mContext, 0, + intent, 0, null, UserHandle.CURRENT); + channel = SystemNotificationChannels.USB; + message = r.getText( + com.android.internal.R.string.usb_notification_message); + } else { + final Intent intent = new Intent(); + intent.setClassName("com.android.settings", + "com.android.settings.HelpTrampoline"); + intent.putExtra(Intent.EXTRA_TEXT, + "help_url_audio_accessory_not_supported"); + + if (mContext.getPackageManager().resolveActivity(intent, 0) != null) { + pi = PendingIntent.getActivity(mContext, 0, intent, 0); + } else { + pi = null; + } - Intent intent = Intent.makeRestartActivityTask( - new ComponentName("com.android.settings", - "com.android.settings.deviceinfo.UsbModeChooserActivity")); - PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0, - intent, 0, null, UserHandle.CURRENT); + channel = SystemNotificationChannels.ALERTS; + message = r.getText( + com.android.internal.R.string + .usb_unsupported_audio_accessory_message); + } Notification notification = - new Notification.Builder(mContext, SystemNotificationChannels.USB) + new Notification.Builder(mContext, channel) .setSmallIcon(com.android.internal.R.drawable.stat_sys_adb) .setWhen(0) .setOngoing(true) @@ -1148,6 +1177,7 @@ public class UsbDeviceManager { .setContentIntent(pi) .setVisibility(Notification.VISIBILITY_PUBLIC) .build(); + mNotificationManager.notifyAsUser(null, id, notification, UserHandle.ALL); mUsbNotificationId = id; @@ -1230,6 +1260,8 @@ public class UsbDeviceManager { pw.println(" mSinkPower: " + mSinkPower); pw.println(" mUsbCharging: " + mUsbCharging); pw.println(" mHideUsbNotification: " + mHideUsbNotification); + pw.println(" mAudioAccessoryConnected: " + mAudioAccessoryConnected); + try { pw.println(" Kernel state: " + FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim()); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 81f660047c6b..7f616ad6fb08 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -342,6 +342,32 @@ public class SubscriptionManager { public static final String SUB_DEFAULT_CHANGED_ACTION = "android.intent.action.SUB_DEFAULT_CHANGED"; + /** + * Broadcast Action: The default subscription has changed. This has the following + * extra values:</p> + * The {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default subscription index + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED + = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED"; + + /** + * Broadcast Action: The default sms subscription has changed. This has the following + * extra values:</p> + * {@link #EXTRA_SUBSCRIPTION_INDEX} extra indicates the current default sms + * subscription index + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED + = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED"; + + /** + * Integer extra used with {@link #ACTION_DEFAULT_SUBSCRIPTION_CHANGED} and + * {@link #ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED} to indicate the subscription + * which has changed. + */ + public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; + private final Context mContext; /** @@ -1178,7 +1204,7 @@ public class SubscriptionManager { public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) { if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); - intent.putExtra(Intent.EXTRA_SUBSCRIPTION_INDEX, subId); + intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId); intent.putExtra(PhoneConstants.PHONE_KEY, phoneId); //FIXME this is using phoneId and slotIndex interchangeably //Eventually, this should be removed as it is not the slot id diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java index cf8d6903187b..32d3f2705d27 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java +++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java @@ -18,6 +18,7 @@ package com.android.internal.telephony; import android.content.Intent; import android.content.Intent; +import android.telephony.SubscriptionManager; /** * The intents that the telephony services broadcast. @@ -336,11 +337,11 @@ public class TelephonyIntents { * <ul> * <li><em>subscription</em> - A int, the current default subscription.</li> * </ul> - * @deprecated Use {@link Intent#ACTION_DEFAULT_SUBSCRIPTION_CHANGED} + * @deprecated Use {@link SubscriptionManager#ACTION_DEFAULT_SUBSCRIPTION_CHANGED} */ @Deprecated public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED - = Intent.ACTION_DEFAULT_SUBSCRIPTION_CHANGED; + = SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED; /** * Broadcast Action: The default data subscription has changed. This has the following @@ -368,11 +369,11 @@ public class TelephonyIntents { * <ul> * <li><em>subscription</em> - A int, the current sms default subscription.</li> * </ul> - * @deprecated Use {@link Intent#ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED} + * @deprecated Use {@link SubscriptionManager#ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED} */ @Deprecated public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED - = Intent.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED; + = SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED; /* * Broadcast Action: An attempt to set phone radio type and access technology has changed. diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java index 2d3d79a03446..9a03c53d95cc 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-runner/src/android/test/mock/MockPackageManager.java @@ -17,6 +17,7 @@ package android.test.mock; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.PackageInstallObserver; import android.content.ComponentName; import android.content.Intent; @@ -1159,4 +1160,13 @@ public class MockPackageManager extends PackageManager { public String getInstantAppAndroidId(String packageName, UserHandle user) { throw new UnsupportedOperationException(); } + + /** + * @hide + */ + @Override + public void registerDexModule(String dexModulePath, + @Nullable DexModuleRegisterCallback callback) { + throw new UnsupportedOperationException(); + } } diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java index 93677e35dc4f..5dd42dd21c90 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java @@ -385,6 +385,23 @@ public class NotificationTestList extends TestActivity mNM.notify("timeout_min", 7013, n); } }, + new Test("Too many cancels") { + public void run() + { + mNM.cancelAll(); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Notification n = new Notification.Builder(NotificationTestList.this, "default") + .setSmallIcon(R.drawable.icon2) + .setContentTitle("Cancel then post") + .setContentText("instead of just updating the existing notification") + .build(); + mNM.notify("cancel_madness", 7014, n); + } + }, new Test("Off") { public void run() { PowerManager pm = (PowerManager) NotificationTestList.this.getSystemService( diff --git a/tests/net/java/android/net/nsd/NsdManagerTest.java b/tests/net/java/android/net/nsd/NsdManagerTest.java index b8ed766e3fcb..063cd5dc48b7 100644 --- a/tests/net/java/android/net/nsd/NsdManagerTest.java +++ b/tests/net/java/android/net/nsd/NsdManagerTest.java @@ -19,14 +19,15 @@ package android.net.nsd; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.os.HandlerThread; import android.os.Handler; @@ -49,6 +50,8 @@ import java.util.function.Consumer; @SmallTest public class NsdManagerTest { + static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD; + @Mock Context mContext; @Mock INsdManager mService; MockServiceHandler mServiceHandler; @@ -107,6 +110,143 @@ public class NsdManagerTest { } @Test + public void testRegisterService() { + NsdManager manager = makeManager(); + + NsdServiceInfo request1 = new NsdServiceInfo("a_name", "a_type"); + NsdServiceInfo request2 = new NsdServiceInfo("another_name", "another_type"); + request1.setPort(2201); + request2.setPort(2202); + NsdManager.RegistrationListener listener1 = mock(NsdManager.RegistrationListener.class); + NsdManager.RegistrationListener listener2 = mock(NsdManager.RegistrationListener.class); + + // Register two services + manager.registerService(request1, PROTOCOL, listener1); + int key1 = verifyRequest(NsdManager.REGISTER_SERVICE); + + manager.registerService(request2, PROTOCOL, listener2); + int key2 = verifyRequest(NsdManager.REGISTER_SERVICE); + + // First reques fails, second request succeeds + sendResponse(NsdManager.REGISTER_SERVICE_SUCCEEDED, 0, key2, request2); + verify(listener2, timeout(mTimeoutMs).times(1)).onServiceRegistered(request2); + + int err = 1; + sendResponse(NsdManager.REGISTER_SERVICE_FAILED, err, key1, request1); + verify(listener1, timeout(mTimeoutMs).times(1)).onRegistrationFailed(request1, err); + + // Client retries first request, it succeeds + manager.registerService(request1, PROTOCOL, listener1); + int key3 = verifyRequest(NsdManager.REGISTER_SERVICE); + + sendResponse(NsdManager.REGISTER_SERVICE_SUCCEEDED, 0, key3, request1); + verify(listener1, timeout(mTimeoutMs).times(1)).onServiceRegistered(request1); + + // First request is unregistered, it succeeds + manager.unregisterService(listener1); + int key3again = verifyRequest(NsdManager.UNREGISTER_SERVICE); + assertEquals(key3, key3again); + + sendResponse(NsdManager.UNREGISTER_SERVICE_SUCCEEDED, 0, key3again, null); + verify(listener1, timeout(mTimeoutMs).times(1)).onServiceUnregistered(request1); + + // Second request is unregistered, it fails + manager.unregisterService(listener2); + int key2again = verifyRequest(NsdManager.UNREGISTER_SERVICE); + assertEquals(key2, key2again); + + sendResponse(NsdManager.UNREGISTER_SERVICE_FAILED, err, key2again, null); + verify(listener2, timeout(mTimeoutMs).times(1)).onUnregistrationFailed(request2, err); + + // TODO: do not unregister listener until service is unregistered + // Client retries unregistration of second request, it succeeds + //manager.unregisterService(listener2); + //int key2yetAgain = verifyRequest(NsdManager.UNREGISTER_SERVICE); + //assertEquals(key2, key2yetAgain); + + //sendResponse(NsdManager.UNREGISTER_SERVICE_SUCCEEDED, 0, key2yetAgain, null); + //verify(listener2, timeout(mTimeoutMs).times(1)).onServiceUnregistered(request2); + } + + @Test + public void testDiscoverService() { + NsdManager manager = makeManager(); + + NsdServiceInfo reply1 = new NsdServiceInfo("a_name", "a_type"); + NsdServiceInfo reply2 = new NsdServiceInfo("another_name", "a_type"); + NsdServiceInfo reply3 = new NsdServiceInfo("a_third_name", "a_type"); + + NsdManager.DiscoveryListener listener = mock(NsdManager.DiscoveryListener.class); + + // Client registers for discovery, request fails + manager.discoverServices("a_type", PROTOCOL, listener); + int key1 = verifyRequest(NsdManager.DISCOVER_SERVICES); + + int err = 1; + sendResponse(NsdManager.DISCOVER_SERVICES_FAILED, err, key1, null); + verify(listener, timeout(mTimeoutMs).times(1)).onStartDiscoveryFailed("a_type", err); + + // Client retries, request succeeds + manager.discoverServices("a_type", PROTOCOL, listener); + int key2 = verifyRequest(NsdManager.DISCOVER_SERVICES); + + sendResponse(NsdManager.DISCOVER_SERVICES_STARTED, 0, key2, reply1); + verify(listener, timeout(mTimeoutMs).times(1)).onDiscoveryStarted("a_type"); + + + // mdns notifies about services + sendResponse(NsdManager.SERVICE_FOUND, 0, key2, reply1); + verify(listener, timeout(mTimeoutMs).times(1)).onServiceFound(reply1); + + sendResponse(NsdManager.SERVICE_FOUND, 0, key2, reply2); + verify(listener, timeout(mTimeoutMs).times(1)).onServiceFound(reply2); + + sendResponse(NsdManager.SERVICE_LOST, 0, key2, reply2); + verify(listener, timeout(mTimeoutMs).times(1)).onServiceLost(reply2); + + + // Client unregisters its listener + manager.stopServiceDiscovery(listener); + int key2again = verifyRequest(NsdManager.STOP_DISCOVERY); + assertEquals(key2, key2again); + + // TODO: unregister listener immediately and stop notifying it about services + // Notifications are still passed to the client's listener + sendResponse(NsdManager.SERVICE_LOST, 0, key2, reply1); + verify(listener, timeout(mTimeoutMs).times(1)).onServiceLost(reply1); + + // Client is notified of complete unregistration + sendResponse(NsdManager.STOP_DISCOVERY_SUCCEEDED, 0, key2again, "a_type"); + verify(listener, timeout(mTimeoutMs).times(1)).onDiscoveryStopped("a_type"); + + // Notifications are not passed to the client anymore + sendResponse(NsdManager.SERVICE_FOUND, 0, key2, reply3); + verify(listener, timeout(mTimeoutMs).times(0)).onServiceLost(reply3); + + + // Client registers for service discovery + reset(listener); + manager.discoverServices("a_type", PROTOCOL, listener); + int key3 = verifyRequest(NsdManager.DISCOVER_SERVICES); + + sendResponse(NsdManager.DISCOVER_SERVICES_STARTED, 0, key3, reply1); + verify(listener, timeout(mTimeoutMs).times(1)).onDiscoveryStarted("a_type"); + + // Client unregisters immediately, it fails + manager.stopServiceDiscovery(listener); + int key3again = verifyRequest(NsdManager.STOP_DISCOVERY); + assertEquals(key3, key3again); + + err = 2; + sendResponse(NsdManager.STOP_DISCOVERY_FAILED, err, key3again, "a_type"); + verify(listener, timeout(mTimeoutMs).times(1)).onStopDiscoveryFailed("a_type", err); + + // New notifications are not passed to the client anymore + sendResponse(NsdManager.SERVICE_FOUND, 0, key3, reply1); + verify(listener, timeout(mTimeoutMs).times(0)).onServiceFound(reply1); + } + + @Test public void testInvalidCalls() { NsdManager manager = new NsdManager(mContext, mService); @@ -118,38 +258,36 @@ public class NsdManagerTest { NsdServiceInfo validService = new NsdServiceInfo("a_name", "a_type"); validService.setPort(2222); - int protocol = NsdManager.PROTOCOL_DNS_SD; - // Service registration // - invalid arguments mustFail(() -> { manager.unregisterService(null); }); mustFail(() -> { manager.registerService(null, -1, null); }); - mustFail(() -> { manager.registerService(null, protocol, listener1); }); - mustFail(() -> { manager.registerService(invalidService, protocol, listener1); }); + mustFail(() -> { manager.registerService(null, PROTOCOL, listener1); }); + mustFail(() -> { manager.registerService(invalidService, PROTOCOL, listener1); }); mustFail(() -> { manager.registerService(validService, -1, listener1); }); - mustFail(() -> { manager.registerService(validService, protocol, null); }); - manager.registerService(validService, protocol, listener1); + mustFail(() -> { manager.registerService(validService, PROTOCOL, null); }); + manager.registerService(validService, PROTOCOL, listener1); // - listener already registered - mustFail(() -> { manager.registerService(validService, protocol, listener1); }); + mustFail(() -> { manager.registerService(validService, PROTOCOL, listener1); }); manager.unregisterService(listener1); // TODO: make listener immediately reusable //mustFail(() -> { manager.unregisterService(listener1); }); - //manager.registerService(validService, protocol, listener1); + //manager.registerService(validService, PROTOCOL, listener1); // Discover service // - invalid arguments mustFail(() -> { manager.stopServiceDiscovery(null); }); mustFail(() -> { manager.discoverServices(null, -1, null); }); - mustFail(() -> { manager.discoverServices(null, protocol, listener2); }); + mustFail(() -> { manager.discoverServices(null, PROTOCOL, listener2); }); mustFail(() -> { manager.discoverServices("a_service", -1, listener2); }); - mustFail(() -> { manager.discoverServices("a_service", protocol, null); }); - manager.discoverServices("a_service", protocol, listener2); + mustFail(() -> { manager.discoverServices("a_service", PROTOCOL, null); }); + manager.discoverServices("a_service", PROTOCOL, listener2); // - listener already registered - mustFail(() -> { manager.discoverServices("another_service", protocol, listener2); }); + mustFail(() -> { manager.discoverServices("another_service", PROTOCOL, listener2); }); manager.stopServiceDiscovery(listener2); // TODO: make listener immediately reusable //mustFail(() -> { manager.stopServiceDiscovery(listener2); }); - //manager.discoverServices("another_service", protocol, listener2); + //manager.discoverServices("another_service", PROTOCOL, listener2); // Resolver service // - invalid arguments diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 633a914778a5..46dcdad2e83a 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -39,6 +39,7 @@ import android.content.ContextWrapper; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Resources; +import android.net.CaptivePortal; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.PacketKeepalive; @@ -77,6 +78,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.Process; import android.os.SystemClock; +import android.os.UserHandle; import android.provider.Settings; import android.test.AndroidTestCase; import android.test.mock.MockContentResolver; @@ -121,7 +123,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { private static final int TIMEOUT_MS = 500; private static final int TEST_LINGER_DELAY_MS = 120; - private BroadcastInterceptingContext mServiceContext; + private MockContext mServiceContext; private WrappedConnectivityService mService; private WrappedConnectivityManager mCm; private MockNetworkAgent mWiFiNetworkAgent; @@ -152,6 +154,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { private final MockContentResolver mContentResolver; @Spy private Resources mResources; + private final LinkedBlockingQueue<Intent> mStartedActivities = new LinkedBlockingQueue<>(); MockContext(Context base) { super(base); @@ -169,6 +172,27 @@ public class ConnectivityServiceTest extends AndroidTestCase { } @Override + public void startActivityAsUser(Intent intent, UserHandle handle) { + mStartedActivities.offer(intent); + } + + public Intent expectStartActivityIntent(int timeoutMs) { + Intent intent = null; + try { + intent = mStartedActivities.poll(timeoutMs, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) {} + assertNotNull("Did not receive sign-in intent after " + timeoutMs + "ms", intent); + return intent; + } + + public void expectNoStartActivityIntent(int timeoutMs) { + try { + assertNull("Received unexpected Intent to start activity", + mStartedActivities.poll(timeoutMs, TimeUnit.MILLISECONDS)); + } catch (InterruptedException e) {} + } + + @Override public Object getSystemService(String name) { if (Context.CONNECTIVITY_SERVICE.equals(name)) return mCm; if (Context.NOTIFICATION_SERVICE.equals(name)) return mock(NotificationManager.class); @@ -1830,6 +1854,52 @@ public class ConnectivityServiceTest extends AndroidTestCase { } @SmallTest + public void testCaptivePortalApp() { + final TestNetworkCallback captivePortalCallback = new TestNetworkCallback(); + final NetworkRequest captivePortalRequest = new NetworkRequest.Builder() + .addCapability(NET_CAPABILITY_CAPTIVE_PORTAL).build(); + mCm.registerNetworkCallback(captivePortalRequest, captivePortalCallback); + + final TestNetworkCallback validatedCallback = new TestNetworkCallback(); + final NetworkRequest validatedRequest = new NetworkRequest.Builder() + .addCapability(NET_CAPABILITY_VALIDATED).build(); + mCm.registerNetworkCallback(validatedRequest, validatedCallback); + + // Bring up wifi. + mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI); + mWiFiNetworkAgent.connect(true); + validatedCallback.expectAvailableAndValidatedCallbacks(mWiFiNetworkAgent); + Network wifiNetwork = mWiFiNetworkAgent.getNetwork(); + + // Check that calling startCaptivePortalApp does nothing. + final int fastTimeoutMs = 100; + mCm.startCaptivePortalApp(wifiNetwork); + mServiceContext.expectNoStartActivityIntent(fastTimeoutMs); + + // Turn into a captive portal. + mWiFiNetworkAgent.getWrappedNetworkMonitor().gen204ProbeResult = 302; + mCm.reportNetworkConnectivity(wifiNetwork, false); + captivePortalCallback.expectAvailableCallbacks(mWiFiNetworkAgent); + validatedCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent); + + // Check that startCaptivePortalApp sends the expected intent. + mCm.startCaptivePortalApp(wifiNetwork); + Intent intent = mServiceContext.expectStartActivityIntent(TIMEOUT_MS); + assertEquals(ConnectivityManager.ACTION_CAPTIVE_PORTAL_SIGN_IN, intent.getAction()); + assertEquals(wifiNetwork, intent.getExtra(ConnectivityManager.EXTRA_NETWORK)); + + // Have the app report that the captive portal is dismissed, and check that we revalidate. + mWiFiNetworkAgent.getWrappedNetworkMonitor().gen204ProbeResult = 204; + CaptivePortal c = (CaptivePortal) intent.getExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL); + c.reportCaptivePortalDismissed(); + validatedCallback.expectAvailableCallbacks(mWiFiNetworkAgent); + captivePortalCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent); + + mCm.unregisterNetworkCallback(validatedCallback); + mCm.unregisterNetworkCallback(captivePortalCallback); + } + + @SmallTest public void testAvoidOrIgnoreCaptivePortals() { final TestNetworkCallback captivePortalCallback = new TestNetworkCallback(); final NetworkRequest captivePortalRequest = new NetworkRequest.Builder() diff --git a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java index 34360e7e11e6..b5996afd7985 100644 --- a/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java @@ -699,6 +699,14 @@ public final class BridgeTypedArray extends TypedArray { return ResourceHelper.getDrawable(value, mContext, mTheme); } + /** + * Version of {@link #getDrawable(int)} that accepts an override density. + * @hide + */ + @Override + public Drawable getDrawableForDensity(int index, int density) { + return getDrawable(index); + } /** * Retrieve the Typeface for the attribute at <var>index</var>. diff --git a/tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java b/tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java index 672ff6d684c6..11cb046aa2f8 100644 --- a/tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java +++ b/tools/layoutlib/bridge/src/android/view/accessibility/AccessibilityManager.java @@ -18,8 +18,10 @@ package android.view.accessibility; import android.accessibilityservice.AccessibilityServiceInfo; import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; import android.content.pm.ServiceInfo; +import android.os.Handler; import android.view.IWindow; import android.view.View; @@ -206,6 +208,18 @@ public final class AccessibilityManager { return true; } + /** + * Registers an {@link AccessibilityStateChangeListener} for changes in + * the global accessibility state of the system. If the listener has already been registered, + * the handler used to call it back is updated. + * + * @param listener The listener. + * @param handler The handler on which the listener should be called back, or {@code null} + * for a callback on the process's main handler. + */ + public void addAccessibilityStateChangeListener( + @NonNull AccessibilityStateChangeListener listener, @Nullable Handler handler) {} + public boolean removeAccessibilityStateChangeListener( AccessibilityStateChangeListener listener) { return true; @@ -224,6 +238,18 @@ public final class AccessibilityManager { } /** + * Registers an {@link TouchExplorationStateChangeListener} for changes in + * the global touch exploration state of the system. If the listener has already been + * registered, the handler used to call it back is updated. + * + * @param listener The listener. + * @param handler The handler on which the listener should be called back, or {@code null} + * for a callback on the process's main handler. + */ + public void addTouchExplorationStateChangeListener( + @NonNull TouchExplorationStateChangeListener listener, @Nullable Handler handler) {} + + /** * Unregisters a {@link TouchExplorationStateChangeListener}. * * @param listener The listener. @@ -239,25 +265,21 @@ public final class AccessibilityManager { * the global high text contrast state of the system. * * @param listener The listener. - * @return True if successfully registered. * + * @hide */ - public boolean addHighTextContrastStateChangeListener( - @NonNull HighTextContrastChangeListener listener) { - return true; - } + public void addHighTextContrastStateChangeListener( + @NonNull HighTextContrastChangeListener listener, @Nullable Handler handler) {} /** * Unregisters a {@link HighTextContrastChangeListener}. * * @param listener The listener. - * @return True if successfully unregistered. * + * @hide */ - public boolean removeHighTextContrastStateChangeListener( - @NonNull HighTextContrastChangeListener listener) { - return true; - } + public void removeHighTextContrastStateChangeListener( + @NonNull HighTextContrastChangeListener listener) {} /** * Sets the current state and notifies listeners, if necessary. diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java index 764eeebaef6a..47dad3404beb 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java @@ -949,4 +949,10 @@ public class BridgePackageManager extends PackageManager { public String getInstantAppAndroidId(String packageName, UserHandle user) { return null; } + + @Override + public void registerDexModule(String dexModulePath, + @Nullable DexModuleRegisterCallback callback) { + callback.onDexModuleRegistered(dexModulePath, false, null); + } } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java index 339019d2ab16..ed428ec9cfe8 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java @@ -18,6 +18,7 @@ package com.android.layoutlib.bridge.android; import android.os.IBinder; import android.os.IPowerManager; +import android.os.PowerManager; import android.os.PowerSaveState; import android.os.RemoteException; import android.os.WorkSource; @@ -170,4 +171,9 @@ public class BridgePowerManager implements IPowerManager { public boolean isScreenBrightnessBoosted() throws RemoteException { return false; } + + @Override + public int getLastShutdownReason() { + return PowerManager.SHUTDOWN_REASON_UNKNOWN; + } } diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index faae90bec86f..d942d056a316 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -131,7 +131,7 @@ interface IWifiManager boolean stopSoftAp(); - WifiConfiguration startLocalOnlyHotspot(in Messenger messenger, in IBinder binder); + int startLocalOnlyHotspot(in Messenger messenger, in IBinder binder); void stopLocalOnlyHotspot(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 8fbf4721a20e..e59b74f0bf60 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -478,7 +478,6 @@ public class WifiManager { */ public static final int IFACE_IP_MODE_LOCAL_ONLY = 2; - /** * Broadcast intent action indicating that a connection to the supplicant has * been established (and it is now possible @@ -1850,8 +1849,9 @@ public class WifiManager { * Tethering to provide an upstream to another device, LocalOnlyHotspot will not start due to * an incompatible mode. The possible error codes include: * {@link LocalOnlyHotspotCallback#ERROR_NO_CHANNEL}, - * {@link LocalOnlyHotspotCallback#ERROR_GENERIC} and - * {@link LocalOnlyHotspotCallback#ERROR_INCOMPATIBLE_MODE}. + * {@link LocalOnlyHotspotCallback#ERROR_GENERIC}, + * {@link LocalOnlyHotspotCallback#ERROR_INCOMPATIBLE_MODE} and + * {@link LocalOnlyHotspotCallback#ERROR_TETHERING_DISALLOWED}. * <p> * Internally, requests will be tracked to prevent the hotspot from being torn down while apps * are still using it. The {@link LocalOnlyHotspotReservation} object passed in the {@link @@ -1882,8 +1882,6 @@ public class WifiManager { * operating status. * @param handler Handler to be used for callbacks. If the caller passes a null Handler, the * main thread will be used. - * - * @hide */ public void startLocalOnlyHotspot(LocalOnlyHotspotCallback callback, @Nullable Handler handler) { @@ -1892,12 +1890,10 @@ public class WifiManager { LocalOnlyHotspotCallbackProxy proxy = new LocalOnlyHotspotCallbackProxy(this, looper, callback); try { - WifiConfiguration config = mService.startLocalOnlyHotspot( - proxy.getMessenger(), new Binder()); - if (config == null) { + int returnCode = mService.startLocalOnlyHotspot(proxy.getMessenger(), new Binder()); + if (returnCode != LocalOnlyHotspotCallback.REQUEST_REGISTERED) { // Send message to the proxy to make sure we call back on the correct thread - proxy.notifyFailed( - LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE); + proxy.notifyFailed(returnCode); return; } mLOHSCallbackProxy = proxy; @@ -2274,8 +2270,6 @@ public class WifiManager { * any further callbacks. If the LocalOnlyHotspot is stopped due to a * user triggered mode change, applications will be notified via the {@link * LocalOnlyHotspotCallback#onStopped()} callback. - * - * @hide */ public class LocalOnlyHotspotReservation implements AutoCloseable { @@ -2289,7 +2283,7 @@ public class WifiManager { mCloseGuard.open("close"); } - public WifiConfiguration getConfig() { + public WifiConfiguration getWifiConfiguration() { return mConfig; } @@ -2318,13 +2312,15 @@ public class WifiManager { /** * Callback class for applications to receive updates about the LocalOnlyHotspot status. - * - * @hide */ public static class LocalOnlyHotspotCallback { + /** @hide */ + public static final int REQUEST_REGISTERED = 0; + public static final int ERROR_NO_CHANNEL = 1; public static final int ERROR_GENERIC = 2; public static final int ERROR_INCOMPATIBLE_MODE = 3; + public static final int ERROR_TETHERING_DISALLOWED = 4; /** LocalOnlyHotspot start succeeded. */ public void onStarted(LocalOnlyHotspotReservation reservation) {}; @@ -2345,7 +2341,8 @@ public class WifiManager { * {@link WifiManager#startLocalOnlyHotspot(LocalOnlyHotspotCallback, Handler)} again at * a later time. * <p> - * @param reason The reason for failure could be one of: {@link #ERROR_INCOMPATIBLE_MODE}, + * @param reason The reason for failure could be one of: {@link + * #ERROR_TETHERING_DISALLOWED}, {@link #ERROR_INCOMPATIBLE_MODE}, * {@link #ERROR_NO_CHANNEL}, or {@link #ERROR_GENERIC}. */ public void onFailed(int reason) { }; diff --git a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java index 333a4f7dc3ce..f892bb0a3884 100644 --- a/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java +++ b/wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java @@ -80,9 +80,15 @@ public final class PasspointConfiguration implements Parcelable { * Configurations under Policy subtree. */ private Policy mPolicy = null; + /** + * @hide + */ public void setPolicy(Policy policy) { mPolicy = policy; } + /** + * @hide + */ public Policy getPolicy() { return mPolicy; } @@ -91,9 +97,15 @@ public final class PasspointConfiguration implements Parcelable { * Meta data for performing subscription update. */ private UpdateParameter mSubscriptionUpdate = null; + /** + * @hide + */ public void setSubscriptionUpdate(UpdateParameter subscriptionUpdate) { mSubscriptionUpdate = subscriptionUpdate; } + /** + * @hide + */ public UpdateParameter getSubscriptionUpdate() { return mSubscriptionUpdate; } @@ -104,9 +116,15 @@ public final class PasspointConfiguration implements Parcelable { * identity during EAP authentication. */ private Map<String, byte[]> mTrustRootCertList = null; + /** + * @hide + */ public void setTrustRootCertList(Map<String, byte[]> trustRootCertList) { mTrustRootCertList = trustRootCertList; } + /** + * @hide + */ public Map<String, byte[]> getTrustRootCertList() { return mTrustRootCertList; } @@ -118,9 +136,15 @@ public final class PasspointConfiguration implements Parcelable { * Use Integer.MIN_VALUE to indicate unset value. */ private int mUpdateIdentifier = Integer.MIN_VALUE; + /** + * @hide + */ public void setUpdateIdentifier(int updateIdentifier) { mUpdateIdentifier = updateIdentifier; } + /** + * @hide + */ public int getUpdateIdentifier() { return mUpdateIdentifier; } @@ -131,9 +155,15 @@ public final class PasspointConfiguration implements Parcelable { * Use Integer.MIN_VALUE to indicate unset value. */ private int mCredentialPriority = Integer.MIN_VALUE; + /** + * @hide + */ public void setCredentialPriority(int credentialPriority) { mCredentialPriority = credentialPriority; } + /** + * @hide + */ public int getCredentialPriority() { return mCredentialPriority; } @@ -144,12 +174,18 @@ public final class PasspointConfiguration implements Parcelable { * * Use Long.MIN_VALUE to indicate unset value. */ - private long mSubscriptionCreationTimeInMs = Long.MIN_VALUE; - public void setSubscriptionCreationTimeInMs(long subscriptionCreationTimeInMs) { - mSubscriptionCreationTimeInMs = subscriptionCreationTimeInMs; + private long mSubscriptionCreationTimeInMillis = Long.MIN_VALUE; + /** + * @hide + */ + public void setSubscriptionCreationTimeInMillis(long subscriptionCreationTimeInMillis) { + mSubscriptionCreationTimeInMillis = subscriptionCreationTimeInMillis; } - public long getSubscriptionCreationTimeInMs() { - return mSubscriptionCreationTimeInMs; + /** + * @hide + */ + public long getSubscriptionCreationTimeInMillis() { + return mSubscriptionCreationTimeInMillis; } /** @@ -158,12 +194,18 @@ public final class PasspointConfiguration implements Parcelable { * * Use Long.MIN_VALUE to indicate unset value. */ - private long mSubscriptionExpirationTimeInMs = Long.MIN_VALUE; - public void setSubscriptionExpirationTimeInMs(long subscriptionExpirationTimeInMs) { - mSubscriptionExpirationTimeInMs = subscriptionExpirationTimeInMs; + private long mSubscriptionExpirationTimeInMillis = Long.MIN_VALUE; + /** + * @hide + */ + public void setSubscriptionExpirationTimeInMillis(long subscriptionExpirationTimeInMillis) { + mSubscriptionExpirationTimeInMillis = subscriptionExpirationTimeInMillis; } - public long getSubscriptionExpirationTimeInMs() { - return mSubscriptionExpirationTimeInMs; + /** + * @hide + */ + public long getSubscriptionExpirationTimeInMillis() { + return mSubscriptionExpirationTimeInMillis; } /** @@ -171,9 +213,15 @@ public final class PasspointConfiguration implements Parcelable { * specific. */ private String mSubscriptionType = null; + /** + * @hide + */ public void setSubscriptionType(String subscriptionType) { mSubscriptionType = subscriptionType; } + /** + * @hide + */ public String getSubscriptionType() { return mSubscriptionType; } @@ -184,9 +232,15 @@ public final class PasspointConfiguration implements Parcelable { * “pay as you go” - PAYG service). A non-zero value specifies the usage interval in minutes. */ private long mUsageLimitUsageTimePeriodInMinutes = Long.MIN_VALUE; + /** + * @hide + */ public void setUsageLimitUsageTimePeriodInMinutes(long usageLimitUsageTimePeriodInMinutes) { mUsageLimitUsageTimePeriodInMinutes = usageLimitUsageTimePeriodInMinutes; } + /** + * @hide + */ public long getUsageLimitUsageTimePeriodInMinutes() { return mUsageLimitUsageTimePeriodInMinutes; } @@ -197,12 +251,18 @@ public final class PasspointConfiguration implements Parcelable { * * Use Long.MIN_VALUE to indicate unset value. */ - private long mUsageLimitStartTimeInMs = Long.MIN_VALUE; - public void setUsageLimitStartTimeInMs(long usageLimitStartTimeInMs) { - mUsageLimitStartTimeInMs = usageLimitStartTimeInMs; + private long mUsageLimitStartTimeInMillis = Long.MIN_VALUE; + /** + * @hide + */ + public void setUsageLimitStartTimeInMillis(long usageLimitStartTimeInMillis) { + mUsageLimitStartTimeInMillis = usageLimitStartTimeInMillis; } - public long getUsageLimitStartTimeInMs() { - return mUsageLimitStartTimeInMs; + /** + * @hide + */ + public long getUsageLimitStartTimeInMillis() { + return mUsageLimitStartTimeInMillis; } /** @@ -212,9 +272,15 @@ public final class PasspointConfiguration implements Parcelable { * Use Long.MIN_VALUE to indicate unset value. */ private long mUsageLimitDataLimit = Long.MIN_VALUE; + /** + * @hide + */ public void setUsageLimitDataLimit(long usageLimitDataLimit) { mUsageLimitDataLimit = usageLimitDataLimit; } + /** + * @hide + */ public long getUsageLimitDataLimit() { return mUsageLimitDataLimit; } @@ -224,9 +290,15 @@ public final class PasspointConfiguration implements Parcelable { * A value of zero indicate unlimited time usage. */ private long mUsageLimitTimeLimitInMinutes = Long.MIN_VALUE; + /** + * @hide + */ public void setUsageLimitTimeLimitInMinutes(long usageLimitTimeLimitInMinutes) { mUsageLimitTimeLimitInMinutes = usageLimitTimeLimitInMinutes; } + /** + * @hide + */ public long getUsageLimitTimeLimitInMinutes() { return mUsageLimitTimeLimitInMinutes; } @@ -263,11 +335,11 @@ public final class PasspointConfiguration implements Parcelable { } mUpdateIdentifier = source.mUpdateIdentifier; mCredentialPriority = source.mCredentialPriority; - mSubscriptionCreationTimeInMs = source.mSubscriptionCreationTimeInMs; - mSubscriptionExpirationTimeInMs = source.mSubscriptionExpirationTimeInMs; + mSubscriptionCreationTimeInMillis = source.mSubscriptionCreationTimeInMillis; + mSubscriptionExpirationTimeInMillis = source.mSubscriptionExpirationTimeInMillis; mSubscriptionType = source.mSubscriptionType; mUsageLimitDataLimit = source.mUsageLimitDataLimit; - mUsageLimitStartTimeInMs = source.mUsageLimitStartTimeInMs; + mUsageLimitStartTimeInMillis = source.mUsageLimitStartTimeInMillis; mUsageLimitTimeLimitInMinutes = source.mUsageLimitTimeLimitInMinutes; mUsageLimitUsageTimePeriodInMinutes = source.mUsageLimitUsageTimePeriodInMinutes; } @@ -286,11 +358,11 @@ public final class PasspointConfiguration implements Parcelable { writeTrustRootCerts(dest, mTrustRootCertList); dest.writeInt(mUpdateIdentifier); dest.writeInt(mCredentialPriority); - dest.writeLong(mSubscriptionCreationTimeInMs); - dest.writeLong(mSubscriptionExpirationTimeInMs); + dest.writeLong(mSubscriptionCreationTimeInMillis); + dest.writeLong(mSubscriptionExpirationTimeInMillis); dest.writeString(mSubscriptionType); dest.writeLong(mUsageLimitUsageTimePeriodInMinutes); - dest.writeLong(mUsageLimitStartTimeInMs); + dest.writeLong(mUsageLimitStartTimeInMillis); dest.writeLong(mUsageLimitDataLimit); dest.writeLong(mUsageLimitTimeLimitInMinutes); } @@ -313,11 +385,11 @@ public final class PasspointConfiguration implements Parcelable { && isTrustRootCertListEquals(mTrustRootCertList, that.mTrustRootCertList) && mUpdateIdentifier == that.mUpdateIdentifier && mCredentialPriority == that.mCredentialPriority - && mSubscriptionCreationTimeInMs == that.mSubscriptionCreationTimeInMs - && mSubscriptionExpirationTimeInMs == that.mSubscriptionExpirationTimeInMs + && mSubscriptionCreationTimeInMillis == that.mSubscriptionCreationTimeInMillis + && mSubscriptionExpirationTimeInMillis == that.mSubscriptionExpirationTimeInMillis && TextUtils.equals(mSubscriptionType, that.mSubscriptionType) && mUsageLimitUsageTimePeriodInMinutes == that.mUsageLimitUsageTimePeriodInMinutes - && mUsageLimitStartTimeInMs == that.mUsageLimitStartTimeInMs + && mUsageLimitStartTimeInMillis == that.mUsageLimitStartTimeInMillis && mUsageLimitDataLimit == that.mUsageLimitDataLimit && mUsageLimitTimeLimitInMinutes == that.mUsageLimitTimeLimitInMinutes; } @@ -325,9 +397,9 @@ public final class PasspointConfiguration implements Parcelable { @Override public int hashCode() { return Objects.hash(mHomeSp, mCredential, mPolicy, mSubscriptionUpdate, mTrustRootCertList, - mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMs, - mSubscriptionExpirationTimeInMs, mUsageLimitUsageTimePeriodInMinutes, - mUsageLimitStartTimeInMs, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes); + mUpdateIdentifier, mCredentialPriority, mSubscriptionCreationTimeInMillis, + mSubscriptionExpirationTimeInMillis, mUsageLimitUsageTimePeriodInMinutes, + mUsageLimitStartTimeInMillis, mUsageLimitDataLimit, mUsageLimitTimeLimitInMinutes); } @Override @@ -336,13 +408,13 @@ public final class PasspointConfiguration implements Parcelable { builder.append("UpdateIdentifier: ").append(mUpdateIdentifier).append("\n"); builder.append("CredentialPriority: ").append(mCredentialPriority).append("\n"); builder.append("SubscriptionCreationTime: ").append( - mSubscriptionCreationTimeInMs != Long.MIN_VALUE - ? new Date(mSubscriptionCreationTimeInMs) : "Not specified").append("\n"); + mSubscriptionCreationTimeInMillis != Long.MIN_VALUE + ? new Date(mSubscriptionCreationTimeInMillis) : "Not specified").append("\n"); builder.append("SubscriptionExpirationTime: ").append( - mSubscriptionExpirationTimeInMs != Long.MIN_VALUE - ? new Date(mSubscriptionExpirationTimeInMs) : "Not specified").append("\n"); - builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMs != Long.MIN_VALUE - ? new Date(mUsageLimitStartTimeInMs) : "Not specified").append("\n"); + mSubscriptionExpirationTimeInMillis != Long.MIN_VALUE + ? new Date(mSubscriptionExpirationTimeInMillis) : "Not specified").append("\n"); + builder.append("UsageLimitStartTime: ").append(mUsageLimitStartTimeInMillis != Long.MIN_VALUE + ? new Date(mUsageLimitStartTimeInMillis) : "Not specified").append("\n"); builder.append("UsageTimePeriod: ").append(mUsageLimitUsageTimePeriodInMinutes) .append("\n"); builder.append("UsageLimitDataLimit: ").append(mUsageLimitDataLimit).append("\n"); @@ -433,11 +505,11 @@ public final class PasspointConfiguration implements Parcelable { config.setTrustRootCertList(readTrustRootCerts(in)); config.setUpdateIdentifier(in.readInt()); config.setCredentialPriority(in.readInt()); - config.setSubscriptionCreationTimeInMs(in.readLong()); - config.setSubscriptionExpirationTimeInMs(in.readLong()); + config.setSubscriptionCreationTimeInMillis(in.readLong()); + config.setSubscriptionExpirationTimeInMillis(in.readLong()); config.setSubscriptionType(in.readString()); config.setUsageLimitUsageTimePeriodInMinutes(in.readLong()); - config.setUsageLimitStartTimeInMs(in.readLong()); + config.setUsageLimitStartTimeInMillis(in.readLong()); config.setUsageLimitDataLimit(in.readLong()); config.setUsageLimitTimeLimitInMinutes(in.readLong()); return config; diff --git a/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java b/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java index 5dc5d13569c6..f6183fa219a1 100644 --- a/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java +++ b/wifi/java/android/net/wifi/hotspot2/omadm/PpsMoParser.java @@ -903,10 +903,10 @@ public final class PpsMoParser { for (PPSNode child: node.getChildren()) { switch (child.getName()) { case NODE_CREATION_DATE: - credential.setCreationTimeInMs(parseDate(getPpsNodeValue(child))); + credential.setCreationTimeInMillis(parseDate(getPpsNodeValue(child))); break; case NODE_EXPIRATION_DATE: - credential.setExpirationTimeInMs(parseDate(getPpsNodeValue(child))); + credential.setExpirationTimeInMillis(parseDate(getPpsNodeValue(child))); break; case NODE_USERNAME_PASSWORD: credential.setUserCredential(parseUserCredential(child)); @@ -1517,10 +1517,10 @@ public final class PpsMoParser { for (PPSNode child : node.getChildren()) { switch (child.getName()) { case NODE_CREATION_DATE: - config.setSubscriptionCreationTimeInMs(parseDate(getPpsNodeValue(child))); + config.setSubscriptionCreationTimeInMillis(parseDate(getPpsNodeValue(child))); break; case NODE_EXPIRATION_DATE: - config.setSubscriptionExpirationTimeInMs(parseDate(getPpsNodeValue(child))); + config.setSubscriptionExpirationTimeInMillis(parseDate(getPpsNodeValue(child))); break; case NODE_TYPE_OF_SUBSCRIPTION: config.setSubscriptionType(getPpsNodeValue(child)); @@ -1555,7 +1555,7 @@ public final class PpsMoParser { config.setUsageLimitDataLimit(parseLong(getPpsNodeValue(child), 10)); break; case NODE_START_DATE: - config.setUsageLimitStartTimeInMs(parseDate(getPpsNodeValue(child))); + config.setUsageLimitStartTimeInMillis(parseDate(getPpsNodeValue(child))); break; case NODE_TIME_LIMIT: config.setUsageLimitTimeLimitInMinutes(parseLong(getPpsNodeValue(child), 10)); diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java index 67fa1bbccd1e..d712feb7c6d2 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Credential.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Credential.java @@ -58,12 +58,18 @@ public final class Credential implements Parcelable { * of milliseconds since January 1, 1970, 00:00:00 GMT. * Using Long.MIN_VALUE to indicate unset value. */ - private long mCreationTimeInMs = Long.MIN_VALUE; - public void setCreationTimeInMs(long creationTimeInMs) { - mCreationTimeInMs = creationTimeInMs; + private long mCreationTimeInMillis = Long.MIN_VALUE; + /** + * @hide + */ + public void setCreationTimeInMillis(long creationTimeInMillis) { + mCreationTimeInMillis = creationTimeInMillis; } - public long getCreationTimeInMs() { - return mCreationTimeInMs; + /** + * @hide + */ + public long getCreationTimeInMillis() { + return mCreationTimeInMillis; } /** @@ -71,12 +77,18 @@ public final class Credential implements Parcelable { * of milliseconds since January 1, 1970, 00:00:00 GMT. * Using Long.MIN_VALUE to indicate unset value. */ - private long mExpirationTimeInMs = Long.MIN_VALUE; - public void setExpirationTimeInMs(long expirationTimeInMs) { - mExpirationTimeInMs = expirationTimeInMs; + private long mExpirationTimeInMillis = Long.MIN_VALUE; + /** + * @hide + */ + public void setExpirationTimeInMillis(long expirationTimeInMillis) { + mExpirationTimeInMillis = expirationTimeInMillis; } - public long getExpirationTimeInMs() { - return mExpirationTimeInMs; + /** + * @hide + */ + public long getExpirationTimeInMillis() { + return mExpirationTimeInMillis; } /** @@ -98,9 +110,15 @@ public final class Credential implements Parcelable { * Protocol) authentication. */ private boolean mCheckAaaServerCertStatus = false; + /** + * @hide + */ public void setCheckAaaServerCertStatus(boolean checkAaaServerCertStatus) { mCheckAaaServerCertStatus = checkAaaServerCertStatus; } + /** + * @hide + */ public boolean getCheckAaaServerCertStatus() { return mCheckAaaServerCertStatus; } @@ -166,9 +184,15 @@ public final class Credential implements Parcelable { * Flag indicating if the password is machine managed. */ private boolean mMachineManaged = false; + /** + * @hide + */ public void setMachineManaged(boolean machineManaged) { mMachineManaged = machineManaged; } + /** + * @hide + */ public boolean getMachineManaged() { return mMachineManaged; } @@ -177,9 +201,15 @@ public final class Credential implements Parcelable { * The name of the application used to generate the password. */ private String mSoftTokenApp = null; + /** + * @hide + */ public void setSoftTokenApp(String softTokenApp) { mSoftTokenApp = softTokenApp; } + /** + * @hide + */ public String getSoftTokenApp() { return mSoftTokenApp; } @@ -188,9 +218,15 @@ public final class Credential implements Parcelable { * Flag indicating if this credential is usable on other mobile devices as well. */ private boolean mAbleToShare = false; + /** + * @hide + */ public void setAbleToShare(boolean ableToShare) { mAbleToShare = ableToShare; } + /** + * @hide + */ public boolean getAbleToShare() { return mAbleToShare; } @@ -720,8 +756,8 @@ public final class Credential implements Parcelable { */ public Credential(Credential source) { if (source != null) { - mCreationTimeInMs = source.mCreationTimeInMs; - mExpirationTimeInMs = source.mExpirationTimeInMs; + mCreationTimeInMillis = source.mCreationTimeInMillis; + mExpirationTimeInMillis = source.mExpirationTimeInMillis; mRealm = source.mRealm; mCheckAaaServerCertStatus = source.mCheckAaaServerCertStatus; if (source.mUserCredential != null) { @@ -749,8 +785,8 @@ public final class Credential implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeLong(mCreationTimeInMs); - dest.writeLong(mExpirationTimeInMs); + dest.writeLong(mCreationTimeInMillis); + dest.writeLong(mExpirationTimeInMillis); dest.writeString(mRealm); dest.writeInt(mCheckAaaServerCertStatus ? 1 : 0); dest.writeParcelable(mUserCredential, flags); @@ -772,8 +808,8 @@ public final class Credential implements Parcelable { Credential that = (Credential) thatObject; return TextUtils.equals(mRealm, that.mRealm) - && mCreationTimeInMs == that.mCreationTimeInMs - && mExpirationTimeInMs == that.mExpirationTimeInMs + && mCreationTimeInMillis == that.mCreationTimeInMillis + && mExpirationTimeInMillis == that.mExpirationTimeInMillis && mCheckAaaServerCertStatus == that.mCheckAaaServerCertStatus && (mUserCredential == null ? that.mUserCredential == null : mUserCredential.equals(that.mUserCredential)) @@ -788,7 +824,7 @@ public final class Credential implements Parcelable { @Override public int hashCode() { - return Objects.hash(mRealm, mCreationTimeInMs, mExpirationTimeInMs, + return Objects.hash(mRealm, mCreationTimeInMillis, mExpirationTimeInMillis, mCheckAaaServerCertStatus, mUserCredential, mCertCredential, mSimCredential, mCaCertificate, mClientCertificateChain, mClientPrivateKey); } @@ -797,10 +833,10 @@ public final class Credential implements Parcelable { public String toString() { StringBuilder builder = new StringBuilder(); builder.append("Realm: ").append(mRealm).append("\n"); - builder.append("CreationTime: ").append(mCreationTimeInMs != Long.MIN_VALUE - ? new Date(mCreationTimeInMs) : "Not specified").append("\n"); - builder.append("ExpirationTime: ").append(mExpirationTimeInMs != Long.MIN_VALUE - ? new Date(mExpirationTimeInMs) : "Not specified").append("\n"); + builder.append("CreationTime: ").append(mCreationTimeInMillis != Long.MIN_VALUE + ? new Date(mCreationTimeInMillis) : "Not specified").append("\n"); + builder.append("ExpirationTime: ").append(mExpirationTimeInMillis != Long.MIN_VALUE + ? new Date(mExpirationTimeInMillis) : "Not specified").append("\n"); builder.append("CheckAAAServerStatus: ").append(mCheckAaaServerCertStatus).append("\n"); if (mUserCredential != null) { builder.append("UserCredential Begin ---\n"); @@ -863,8 +899,8 @@ public final class Credential implements Parcelable { @Override public Credential createFromParcel(Parcel in) { Credential credential = new Credential(); - credential.setCreationTimeInMs(in.readLong()); - credential.setExpirationTimeInMs(in.readLong()); + credential.setCreationTimeInMillis(in.readLong()); + credential.setExpirationTimeInMillis(in.readLong()); credential.setRealm(in.readString()); credential.setCheckAaaServerCertStatus(in.readInt() != 0); credential.setUserCredential(in.readParcelable(null)); diff --git a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java index 9192ab015e20..2247860d23a5 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/HomeSp.java @@ -74,9 +74,15 @@ public final class HomeSp implements Parcelable { * Icon URL of this home service provider. */ private String mIconUrl = null; + /** + * @hide + */ public void setIconUrl(String iconUrl) { mIconUrl = iconUrl; } + /** + * @hide + */ public String getIconUrl() { return mIconUrl; } @@ -89,9 +95,15 @@ public final class HomeSp implements Parcelable { * string is assumed to be encoded using UTF-8. */ private Map<String, Long> mHomeNetworkIds = null; + /** + * @hide + */ public void setHomeNetworkIds(Map<String, Long> homeNetworkIds) { mHomeNetworkIds = homeNetworkIds; } + /** + * @hide + */ public Map<String, Long> getHomeNetworkIds() { return mHomeNetworkIds; } @@ -107,9 +119,15 @@ public final class HomeSp implements Parcelable { * (MO) tree for more detail. */ private long[] mMatchAllOis = null; + /** + * @hide + */ public void setMatchAllOis(long[] matchAllOis) { mMatchAllOis = matchAllOis; } + /** + * @hide + */ public long[] getMatchAllOis() { return mMatchAllOis; } @@ -128,9 +146,15 @@ public final class HomeSp implements Parcelable { * (MO) tree for more detail. */ private long[] mMatchAnyOis = null; + /** + * @hide + */ public void setMatchAnyOis(long[] matchAnyOis) { mMatchAnyOis = matchAnyOis; } + /** + * @hide + */ public long[] getMatchAnyOis() { return mMatchAnyOis; } @@ -142,9 +166,15 @@ public final class HomeSp implements Parcelable { * operator merges between the providers. */ private String[] mOtherHomePartners = null; + /** + * @hide + */ public void setOtherHomePartners(String[] otherHomePartners) { mOtherHomePartners = otherHomePartners; } + /** + * @hide + */ public String[] getOtherHomePartners() { return mOtherHomePartners; } diff --git a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java index 1df70f8d45d0..ee0894bd0212 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/Policy.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/Policy.java @@ -40,6 +40,8 @@ import java.util.Objects; * * For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0 * Release 2 Technical Specification. + * + * @hide */ public final class Policy implements Parcelable { private static final String TAG = "Policy"; diff --git a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java index a7adfeb9ec0f..9eb6314b1fa0 100644 --- a/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java +++ b/wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.java @@ -34,6 +34,8 @@ import java.util.Objects; * * For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0 * Release 2 Technical Specification. + * + * @hide */ public final class UpdateParameter implements Parcelable { private static final String TAG = "UpdateParameter"; diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index 3c0fc6ef0aa8..03ef319fa1e0 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -22,6 +22,7 @@ import static android.net.wifi.WifiManager.HOTSPOT_STOPPED; import static android.net.wifi.WifiManager.LocalOnlyHotspotCallback.ERROR_GENERIC; import static android.net.wifi.WifiManager.LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE; import static android.net.wifi.WifiManager.LocalOnlyHotspotCallback.ERROR_NO_CHANNEL; +import static android.net.wifi.WifiManager.LocalOnlyHotspotCallback.REQUEST_REGISTERED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -125,12 +126,12 @@ public class WifiManagerTest { public void testCreationAndCloseOfLocalOnlyHotspotReservation() throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(mApConfig); + .thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); callback.onStarted(mWifiManager.new LocalOnlyHotspotReservation(mApConfig)); - assertEquals(mApConfig, callback.mRes.getConfig()); + assertEquals(mApConfig, callback.mRes.getWifiConfiguration()); callback.mRes.close(); verify(mWifiService).stopLocalOnlyHotspot(); } @@ -143,13 +144,13 @@ public class WifiManagerTest { throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(mApConfig); + .thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); callback.onStarted(mWifiManager.new LocalOnlyHotspotReservation(mApConfig)); try (WifiManager.LocalOnlyHotspotReservation res = callback.mRes) { - assertEquals(mApConfig, res.getConfig()); + assertEquals(mApConfig, res.getWifiConfiguration()); } verify(mWifiService).stopLocalOnlyHotspot(); @@ -337,7 +338,7 @@ public class WifiManagerTest { // record thread from looper.getThread and check ids. TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(null); + .thenReturn(ERROR_INCOMPATIBLE_MODE); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mLooper.dispatchAll(); assertEquals(ERROR_INCOMPATIBLE_MODE, callback.mFailureReason); @@ -355,7 +356,7 @@ public class WifiManagerTest { when(mContext.getMainLooper()).thenReturn(altLooper.getLooper()); TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(null); + .thenReturn(ERROR_INCOMPATIBLE_MODE); mWifiManager.startLocalOnlyHotspot(callback, null); altLooper.dispatchAll(); assertEquals(ERROR_INCOMPATIBLE_MODE, callback.mFailureReason); @@ -372,7 +373,7 @@ public class WifiManagerTest { TestLooper callbackLooper = new TestLooper(); Handler callbackHandler = new Handler(callbackLooper.getLooper()); when(mWifiService.startLocalOnlyHotspot(mMessengerCaptor.capture(), - any(IBinder.class))).thenReturn(mApConfig); + any(IBinder.class))).thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, callbackHandler); callbackLooper.dispatchAll(); mLooper.dispatchAll(); @@ -386,7 +387,7 @@ public class WifiManagerTest { mLooper.dispatchAll(); callbackLooper.dispatchAll(); assertTrue(callback.mOnStartedCalled); - assertEquals(mApConfig, callback.mRes.getConfig()); + assertEquals(mApConfig, callback.mRes.getWifiConfiguration()); } /** @@ -399,7 +400,7 @@ public class WifiManagerTest { TestLooper callbackLooper = new TestLooper(); Handler callbackHandler = new Handler(callbackLooper.getLooper()); when(mWifiService.startLocalOnlyHotspot(mMessengerCaptor.capture(), - any(IBinder.class))).thenReturn(mApConfig); + any(IBinder.class))).thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, callbackHandler); callbackLooper.dispatchAll(); mLooper.dispatchAll(); @@ -424,7 +425,7 @@ public class WifiManagerTest { TestLooper callbackLooper = new TestLooper(); Handler callbackHandler = new Handler(callbackLooper.getLooper()); when(mWifiService.startLocalOnlyHotspot(mMessengerCaptor.capture(), - any(IBinder.class))).thenReturn(mApConfig); + any(IBinder.class))).thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, callbackHandler); callbackLooper.dispatchAll(); mLooper.dispatchAll(); @@ -447,7 +448,7 @@ public class WifiManagerTest { TestLooper callbackLooper = new TestLooper(); Handler callbackHandler = new Handler(callbackLooper.getLooper()); when(mWifiService.startLocalOnlyHotspot(mMessengerCaptor.capture(), - any(IBinder.class))).thenReturn(mApConfig); + any(IBinder.class))).thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, callbackHandler); callbackLooper.dispatchAll(); mLooper.dispatchAll(); @@ -470,7 +471,7 @@ public class WifiManagerTest { public void testLocalOnlyHotspotCallbackFullOnNullConfig() throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(null); + .thenReturn(ERROR_INCOMPATIBLE_MODE); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mLooper.dispatchAll(); assertEquals(ERROR_INCOMPATIBLE_MODE, callback.mFailureReason); @@ -508,7 +509,7 @@ public class WifiManagerTest { public void testLocalOnlyHotspotCallbackFullOnNoChannelError() throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(mApConfig); + .thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mLooper.dispatchAll(); //assertEquals(ERROR_NO_CHANNEL, callback.mFailureReason); @@ -524,7 +525,7 @@ public class WifiManagerTest { public void testCancelLocalOnlyHotspotRequestCallsStopOnWifiService() throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(mApConfig); + .thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mWifiManager.cancelLocalOnlyHotspotRequest(); verify(mWifiService).stopLocalOnlyHotspot(); @@ -546,7 +547,7 @@ public class WifiManagerTest { public void testCallbackAfterLocalOnlyHotspotWasCancelled() throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(mApConfig); + .thenReturn(REQUEST_REGISTERED); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mWifiManager.cancelLocalOnlyHotspotRequest(); verify(mWifiService).stopLocalOnlyHotspot(); @@ -565,7 +566,7 @@ public class WifiManagerTest { public void testCancelAfterLocalOnlyHotspotCallbackTriggered() throws Exception { TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(); when(mWifiService.startLocalOnlyHotspot(any(Messenger.class), any(IBinder.class))) - .thenReturn(null); + .thenReturn(ERROR_INCOMPATIBLE_MODE); mWifiManager.startLocalOnlyHotspot(callback, mHandler); mLooper.dispatchAll(); assertEquals(ERROR_INCOMPATIBLE_MODE, callback.mFailureReason); diff --git a/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java b/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java index 7df4fcf56e8a..afcf3e344c27 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/PasspointConfigurationTest.java @@ -158,11 +158,11 @@ public class PasspointConfigurationTest { config.setTrustRootCertList(trustRootCertList); config.setUpdateIdentifier(1); config.setCredentialPriority(120); - config.setSubscriptionCreationTimeInMs(231200); - config.setSubscriptionExpirationTimeInMs(2134232); + config.setSubscriptionCreationTimeInMillis(231200); + config.setSubscriptionExpirationTimeInMillis(2134232); config.setSubscriptionType("Gold"); config.setUsageLimitUsageTimePeriodInMinutes(3600); - config.setUsageLimitStartTimeInMs(124214213); + config.setUsageLimitStartTimeInMillis(124214213); config.setUsageLimitDataLimit(14121); config.setUsageLimitTimeLimitInMinutes(78912); return config; diff --git a/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java b/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java index 7cd72f03dd1b..afa9fd6a9e8b 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/omadm/PpsMoParserTest.java @@ -113,11 +113,11 @@ public class PpsMoParserTest { config.setSubscriptionUpdate(subscriptionUpdate); // Subscription parameters. - config.setSubscriptionCreationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime()); - config.setSubscriptionExpirationTimeInMs(format.parse("2016-03-01T10:00:00Z").getTime()); + config.setSubscriptionCreationTimeInMillis(format.parse("2016-02-01T10:00:00Z").getTime()); + config.setSubscriptionExpirationTimeInMillis(format.parse("2016-03-01T10:00:00Z").getTime()); config.setSubscriptionType("Gold"); config.setUsageLimitDataLimit(921890); - config.setUsageLimitStartTimeInMs(format.parse("2016-12-01T10:00:00Z").getTime()); + config.setUsageLimitStartTimeInMillis(format.parse("2016-12-01T10:00:00Z").getTime()); config.setUsageLimitTimeLimitInMinutes(120); config.setUsageLimitUsageTimePeriodInMinutes(99910); @@ -138,8 +138,8 @@ public class PpsMoParserTest { // Credential configuration. Credential credential = new Credential(); - credential.setCreationTimeInMs(format.parse("2016-01-01T10:00:00Z").getTime()); - credential.setExpirationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime()); + credential.setCreationTimeInMillis(format.parse("2016-01-01T10:00:00Z").getTime()); + credential.setExpirationTimeInMillis(format.parse("2016-02-01T10:00:00Z").getTime()); credential.setRealm("shaken.stirred.com"); credential.setCheckAaaServerCertStatus(true); Credential.UserCredential userCredential = new Credential.UserCredential(); diff --git a/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java b/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java index c7ade002c826..9bfc0105fcc9 100644 --- a/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java +++ b/wifi/tests/src/android/net/wifi/hotspot2/pps/CredentialTest.java @@ -56,8 +56,8 @@ public class CredentialTest { X509Certificate[] clientCertificateChain, PrivateKey clientPrivateKey) { Credential cred = new Credential(); - cred.setCreationTimeInMs(123455L); - cred.setExpirationTimeInMs(2310093L); + cred.setCreationTimeInMillis(123455L); + cred.setExpirationTimeInMillis(2310093L); cred.setRealm("realm"); cred.setCheckAaaServerCertStatus(true); cred.setUserCredential(userCred); @@ -440,4 +440,4 @@ public class CredentialTest { Credential copyCred = new Credential(sourceCred); assertTrue(copyCred.equals(sourceCred)); } -}
\ No newline at end of file +} |