diff options
593 files changed, 14047 insertions, 14949 deletions
diff --git a/Android.bp b/Android.bp index 948b0a068215..015e59fe9d08 100644 --- a/Android.bp +++ b/Android.bp @@ -99,6 +99,7 @@ java_library { "core/java/android/app/backup/IRestoreSession.aidl", "core/java/android/app/backup/ISelectBackupTransportCallback.aidl", "core/java/android/app/slice/ISliceManager.aidl", + "core/java/android/app/slice/ISliceListener.aidl", "core/java/android/app/timezone/ICallback.aidl", "core/java/android/app/timezone/IRulesManager.aidl", "core/java/android/app/usage/ICacheQuotaService.aidl", @@ -677,35 +678,23 @@ cc_library { "-Werror", "-Wno-unused-parameter", ], + + srcs: [ + "core/proto/**/*.proto", + "libs/incident/**/*.proto", + "tools/streaming_proto/stream.proto", + ], + target: { host: { proto: { type: "full", }, - srcs: [ - "core/proto/**/*.proto", - "libs/incident/**/*.proto", - "tools/streaming_proto/stream.proto", - ], }, android: { proto: { type: "lite", }, - // We only build the protos that are optimized for the lite - // runtime, as well as the only protos that are actually - // needed by the device. - srcs: [ - "core/proto/android/os/cpufreq.proto", - "core/proto/android/os/cpuinfo.proto", - "core/proto/android/os/kernelwake.proto", - "core/proto/android/os/pagetypeinfo.proto", - "core/proto/android/os/procrank.proto", - "core/proto/android/os/system_properties.proto", - "core/proto/android/service/graphicsstats.proto", - "libs/incident/proto/android/privacy.proto", - "tools/streaming_proto/stream.proto", - ], shared: { enabled: false, }, diff --git a/Android.mk b/Android.mk index ec5fb841131e..d4a1dcf891d7 100644 --- a/Android.mk +++ b/Android.mk @@ -97,6 +97,7 @@ aidl_files := \ frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \ frameworks/base/core/java/android/app/admin/PasswordMetrics.aidl \ frameworks/base/core/java/android/app/slice/ISliceManager.aidl \ + frameworks/base/core/java/android/app/slice/ISliceListener.aidl \ frameworks/base/core/java/android/print/PrintDocumentInfo.aidl \ frameworks/base/core/java/android/print/PageRange.aidl \ frameworks/base/core/java/android/print/PrintAttributes.aidl \ @@ -1008,7 +1009,7 @@ include $(BUILD_HOST_JAVA_LIBRARY) # ==== java proto device library (for test only) ============================== include $(CLEAR_VARS) LOCAL_MODULE := platformprotosnano -LOCAL_MODULE_TAGS := tests optional +LOCAL_MODULE_TAGS := tests LOCAL_PROTOC_OPTIMIZE_TYPE := nano LOCAL_PROTOC_FLAGS := \ -Iexternal/protobuf/src @@ -1020,6 +1021,17 @@ LOCAL_SRC_FILES := \ include $(BUILD_STATIC_JAVA_LIBRARY) +# ==== java proto device library (for test only) ============================== +include $(CLEAR_VARS) +LOCAL_MODULE := platformprotoslite +LOCAL_MODULE_TAGS := tests +LOCAL_PROTOC_OPTIMIZE_TYPE := lite +LOCAL_PROTOC_FLAGS := \ + -Iexternal/protobuf/src +LOCAL_SRC_FILES := \ + $(call all-proto-files-under, core/proto) +include $(BUILD_STATIC_JAVA_LIBRARY) + # Include subdirectory makefiles # ============================================================ diff --git a/api/current.txt b/api/current.txt index dd102f6563d9..66a577c17de5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -292,6 +292,7 @@ package android { field public static final int apduServiceBanner = 16843757; // 0x10103ed field public static final int apiKey = 16843281; // 0x1010211 field public static final int appCategory = 16844101; // 0x1010545 + field public static final int appComponentFactory = 16844154; // 0x101057a field public static final int author = 16843444; // 0x10102b4 field public static final int authorities = 16842776; // 0x1010018 field public static final int autoAdvanceViewId = 16843535; // 0x101030f @@ -4174,6 +4175,15 @@ package android.app { ctor public AliasActivity(); } + public class AppComponentFactory { + ctor public AppComponentFactory(); + method public android.app.Activity instantiateActivity(java.lang.ClassLoader, java.lang.String, android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException; + method public android.app.Application instantiateApplication(java.lang.ClassLoader, java.lang.String) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException; + method public android.content.ContentProvider instantiateProvider(java.lang.ClassLoader, java.lang.String) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException; + method public android.content.BroadcastReceiver instantiateReceiver(java.lang.ClassLoader, java.lang.String, android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException; + method public android.app.Service instantiateService(java.lang.ClassLoader, java.lang.String, android.content.Intent) throws java.lang.ClassNotFoundException, java.lang.IllegalAccessException, java.lang.InstantiationException; + } + public class AppOpsManager { method public int checkOp(java.lang.String, int, java.lang.String); method public int checkOpNoThrow(java.lang.String, int, java.lang.String); @@ -6313,7 +6323,7 @@ package android.app.admin { method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName); method public void addUserRestriction(android.content.ComponentName, java.lang.String); method public boolean bindDeviceAdminServiceAsUser(android.content.ComponentName, android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle); - method public boolean clearApplicationUserData(android.content.ComponentName, java.lang.String, android.app.admin.DevicePolicyManager.OnClearApplicationUserDataListener, android.os.Handler); + method public boolean clearApplicationUserData(android.content.ComponentName, java.lang.String, android.app.admin.DevicePolicyManager.OnClearApplicationUserDataListener, java.util.concurrent.Executor); method public void clearCrossProfileIntentFilters(android.content.ComponentName); method public deprecated void clearDeviceOwnerApp(java.lang.String); method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String); @@ -6391,6 +6401,7 @@ package android.app.admin { method public boolean installKeyPair(android.content.ComponentName, java.security.PrivateKey, java.security.cert.Certificate[], java.lang.String, boolean, boolean); method public boolean isActivePasswordSufficient(); method public boolean isAdminActive(android.content.ComponentName); + method public boolean isAffiliatedUser(); method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String); method public boolean isBackupServiceEnabled(android.content.ComponentName); method public deprecated boolean isCallerApplicationRestrictionsManagingPackage(); @@ -7017,6 +7028,7 @@ package android.app.slice { field public static final java.lang.String HINT_NO_TINT = "no_tint"; field public static final java.lang.String HINT_PARTIAL = "partial"; field public static final java.lang.String HINT_SELECTED = "selected"; + field public static final java.lang.String HINT_SUMMARY = "summary"; field public static final java.lang.String HINT_TITLE = "title"; field public static final java.lang.String SUBTYPE_COLOR = "color"; field public static final java.lang.String SUBTYPE_MESSAGE = "message"; @@ -9050,6 +9062,7 @@ package android.content { method public abstract java.io.File[] getExternalMediaDirs(); method public abstract java.io.File getFileStreamPath(java.lang.String); method public abstract java.io.File getFilesDir(); + method public java.util.concurrent.Executor getMainExecutor(); method public abstract android.os.Looper getMainLooper(); method public abstract java.io.File getNoBackupFilesDir(); method public abstract java.io.File getObbDir(); @@ -10409,6 +10422,7 @@ package android.content.pm { field public static final int FLAG_UPDATED_SYSTEM_APP = 128; // 0x80 field public static final int FLAG_USES_CLEARTEXT_TRAFFIC = 134217728; // 0x8000000 field public static final int FLAG_VM_SAFE_MODE = 16384; // 0x4000 + field public java.lang.String appComponentFactory; field public java.lang.String backupAgentName; field public int category; field public java.lang.String className; @@ -20992,6 +21006,7 @@ package android.location { method public void onGnssMeasurementsReceived(android.location.GnssMeasurementsEvent); method public void onStatusChanged(int); field public static final int STATUS_LOCATION_DISABLED = 2; // 0x2 + field public static final int STATUS_NOT_ALLOWED = 3; // 0x3 field public static final int STATUS_NOT_SUPPORTED = 0; // 0x0 field public static final int STATUS_READY = 1; // 0x1 } @@ -25905,12 +25920,12 @@ package android.net { } public final class IpSecManager { + method public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException; + method public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; - method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException; - method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; } public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException { @@ -40237,6 +40252,7 @@ package android.telephony { field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool"; field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool"; field public static final java.lang.String KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL = "show_onscreen_dial_button_bool"; + field public static final java.lang.String KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL = "show_signal_strength_in_sim_status_bool"; field public static final java.lang.String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool"; field public static final java.lang.String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool"; field public static final java.lang.String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool"; @@ -40855,6 +40871,8 @@ package android.telephony { method public int getSimState(); method public int getSimState(int); method public java.lang.String getSubscriberId(); + method public int getSubscriptionCarrierId(); + method public java.lang.String getSubscriptionCarrierName(); method public java.lang.String getVisualVoicemailPackageName(); method public java.lang.String getVoiceMailAlphaTag(); method public java.lang.String getVoiceMailNumber(); @@ -40888,12 +40906,13 @@ package android.telephony { method public boolean setPreferredNetworkTypeToGlobal(); method public void setVisualVoicemailSmsFilterSettings(android.telephony.VisualVoicemailSmsFilterSettings); method public boolean setVoiceMailNumber(java.lang.String, java.lang.String); - method public void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri); - method public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean); + method public deprecated void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri); + method public deprecated void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean); field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL"; field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE"; field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION"; + field public static final java.lang.String ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"; field public static final int APPTYPE_CSIM = 4; // 0x4 field public static final int APPTYPE_ISIM = 5; // 0x5 field public static final int APPTYPE_RUIM = 3; // 0x3 @@ -40918,6 +40937,8 @@ package android.telephony { field public static final int DATA_DISCONNECTED = 0; // 0x0 field public static final int DATA_SUSPENDED = 3; // 0x3 field public static final java.lang.String EXTRA_CALL_VOICEMAIL_INTENT = "android.telephony.extra.CALL_VOICEMAIL_INTENT"; + field public static final java.lang.String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID"; + field public static final java.lang.String EXTRA_CARRIER_NAME = "android.telephony.extra.CARRIER_NAME"; field public static final java.lang.String EXTRA_HIDE_PUBLIC_SETTINGS = "android.telephony.extra.HIDE_PUBLIC_SETTINGS"; field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number"; field public static final java.lang.String EXTRA_IS_REFRESH = "android.telephony.extra.IS_REFRESH"; @@ -40928,6 +40949,7 @@ package android.telephony { field public static final java.lang.String EXTRA_STATE_IDLE; field public static final java.lang.String EXTRA_STATE_OFFHOOK; field public static final java.lang.String EXTRA_STATE_RINGING; + field public static final java.lang.String EXTRA_SUBSCRIPTION_ID = "android.telephony.extra.SUBSCRIPTION_ID"; field public static final java.lang.String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER"; field public static final java.lang.String METADATA_HIDE_VOICEMAIL_SETTINGS_MENU = "android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU"; field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7 @@ -40963,6 +40985,7 @@ package android.telephony { field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3 field public static final int SIM_STATE_READY = 5; // 0x5 field public static final int SIM_STATE_UNKNOWN = 0; // 0x0 + field public static final int UNKNOWN_CARRIER_ID = -1; // 0xffffffff field public static final int USSD_ERROR_SERVICE_UNAVAIL = -2; // 0xfffffffe field public static final int USSD_RETURN_FAILURE = -1; // 0xffffffff field public static final java.lang.String VVM_TYPE_CVVM = "vvm_type_cvvm"; @@ -47045,6 +47068,7 @@ package android.view { method public int getScaledEdgeSlop(); method public int getScaledFadingEdgeLength(); method public float getScaledHorizontalScrollFactor(); + method public int getScaledHoverSlop(); method public int getScaledMaximumDrawingCacheSize(); method public int getScaledMaximumFlingVelocity(); method public int getScaledMinimumFlingVelocity(); @@ -49564,6 +49588,44 @@ package android.webkit { method public void proceed(); } + public class TracingConfig { + ctor public TracingConfig(int); + ctor public TracingConfig(int, java.lang.String, int); + method public java.lang.String getCustomCategoryPattern(); + method public int getPresetCategories(); + method public int getTracingMode(); + field public static final int CATEGORIES_FRAME_VIEWER = 4; // 0x4 + field public static final int CATEGORIES_INPUT_LATENCY = 1; // 0x1 + field public static final int CATEGORIES_JAVASCRIPT_AND_RENDERING = 3; // 0x3 + field public static final int CATEGORIES_NONE = -1; // 0xffffffff + field public static final int CATEGORIES_RENDERING = 2; // 0x2 + field public static final int CATEGORIES_WEB_DEVELOPER = 0; // 0x0 + field public static final int RECORD_CONTINUOUSLY = 1; // 0x1 + field public static final int RECORD_TO_CONSOLE = 3; // 0x3 + field public static final int RECORD_UNTIL_FULL = 0; // 0x0 + field public static final int RECORD_UNTIL_FULL_LARGE_BUFFER = 2; // 0x2 + } + + public abstract class TracingController { + ctor public TracingController(); + method public static android.webkit.TracingController getInstance(); + method public abstract boolean isTracing(); + method public abstract boolean start(android.webkit.TracingConfig); + method public abstract boolean stop(); + method public abstract boolean stopAndFlush(android.webkit.TracingController.TracingOutputStream, android.os.Handler); + } + + public static abstract interface TracingController.TracingOutputStream { + method public abstract void complete(); + method public abstract void write(byte[]); + } + + public class TracingFileOutputStream implements android.webkit.TracingController.TracingOutputStream { + ctor public TracingFileOutputStream(java.lang.String) throws java.io.FileNotFoundException; + method public void complete(); + method public void write(byte[]); + } + public final class URLUtil { ctor public URLUtil(); method public static java.lang.String composeSearchUrl(java.lang.String, java.lang.String, java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index d87fcbca9f2e..30e4cbce78e5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2106,11 +2106,13 @@ package android.location { method public int getQuality(); method public float getSmallestDisplacement(); method public android.os.WorkSource getWorkSource(); + method public boolean isLowPowerMode(); method public android.location.LocationRequest setExpireAt(long); method public android.location.LocationRequest setExpireIn(long); method public android.location.LocationRequest setFastestInterval(long); method public void setHideFromAppOps(boolean); method public android.location.LocationRequest setInterval(long); + method public android.location.LocationRequest setLowPowerMode(boolean); method public android.location.LocationRequest setNumUpdates(int); method public android.location.LocationRequest setProvider(java.lang.String); method public android.location.LocationRequest setQuality(int); @@ -4635,6 +4637,7 @@ package android.webkit { method public abstract android.webkit.ServiceWorkerController getServiceWorkerController(); method public abstract android.webkit.WebViewFactoryProvider.Statics getStatics(); method public abstract android.webkit.TokenBindingService getTokenBindingService(); + method public abstract android.webkit.TracingController getTracingController(); method public abstract android.webkit.WebIconDatabase getWebIconDatabase(); method public abstract android.webkit.WebStorage getWebStorage(); method public abstract android.webkit.WebViewDatabase getWebViewDatabase(android.content.Context); diff --git a/cmds/bootanimation/iot/BootParameters.h b/cmds/bootanimation/iot/BootParameters.h index ff3b018bd241..c10bd44bc2ca 100644 --- a/cmds/bootanimation/iot/BootParameters.h +++ b/cmds/bootanimation/iot/BootParameters.h @@ -48,8 +48,8 @@ private: struct SavedBootParameters { int brightness; int volume; - ScopedVector<std::string> param_names; - ScopedVector<std::string> param_values; + std::vector<std::unique_ptr<std::string>> param_names; + std::vector<std::unique_ptr<std::string>> param_values; SavedBootParameters(); static void RegisterJSONConverter( diff --git a/cmds/incident_helper/Android.bp b/cmds/incident_helper/Android.bp index fc0bdccb268b..d7b6d69ade74 100644 --- a/cmds/incident_helper/Android.bp +++ b/cmds/incident_helper/Android.bp @@ -50,12 +50,15 @@ cc_test { "testdata/*", ], - shared_libs: [ - "libprotobuf-cpp-full", - ], - static_libs: [ "libgmock", "libplatformprotos" ], + + shared_libs: [ + "libprotobuf-cpp-full" + ], + proto: { + type: "full", + }, } diff --git a/cmds/incident_helper/src/parsers/SystemPropertiesParser.cpp b/cmds/incident_helper/src/parsers/SystemPropertiesParser.cpp index a41ed6ebaa22..23393da01d48 100644 --- a/cmds/incident_helper/src/parsers/SystemPropertiesParser.cpp +++ b/cmds/incident_helper/src/parsers/SystemPropertiesParser.cpp @@ -53,10 +53,16 @@ SystemPropertiesParser::Parse(const int in, const int out) const SystemPropertiesProto::_FIELD_COUNT); Message sysProp(&sysPropTable); - Table aaudioT(SystemPropertiesProto::Aaudio::_FIELD_NAMES, + Table aacDrcTable(SystemPropertiesProto::AacDrc::_FIELD_NAMES, + SystemPropertiesProto::AacDrc::_FIELD_IDS, + SystemPropertiesProto::AacDrc::_FIELD_COUNT); + Message aacDrc(&aacDrcTable); + sysProp.addSubMessage(SystemPropertiesProto::AAC_DRC, &aacDrc); + + Table aaudioTable(SystemPropertiesProto::Aaudio::_FIELD_NAMES, SystemPropertiesProto::Aaudio::_FIELD_IDS, SystemPropertiesProto::Aaudio::_FIELD_COUNT); - Message aaudio(&aaudioT); + Message aaudio(&aaudioTable); sysProp.addSubMessage(SystemPropertiesProto::AAUDIO, &aaudio); Table cameraTable(SystemPropertiesProto::Camera::_FIELD_NAMES, @@ -142,8 +148,13 @@ SystemPropertiesParser::Parse(const int in, const int out) const SystemPropertiesProto::Ro::Product::_FIELD_IDS, SystemPropertiesProto::Ro::Product::_FIELD_COUNT); Message product(&productTable); - ro.addSubMessage(SystemPropertiesProto::Ro::PRODUCT, &product); + Table vendorTable(SystemPropertiesProto::Ro::Product::Vendor::_FIELD_NAMES, + SystemPropertiesProto::Ro::Product::Vendor::_FIELD_IDS, + SystemPropertiesProto::Ro::Product::Vendor::_FIELD_COUNT); + Message vendor(&vendorTable); + product.addSubMessage(SystemPropertiesProto::Ro::Product::VENDOR, &vendor); + ro.addSubMessage(SystemPropertiesProto::Ro::PRODUCT, &product); sysProp.addSubMessage(SystemPropertiesProto::RO, &ro); Table sysTable(SystemPropertiesProto::Sys::_FIELD_NAMES, diff --git a/cmds/incident_helper/testdata/system_properties.txt b/cmds/incident_helper/testdata/system_properties.txt index 51a2dfd96869..bf7d4ad5a844 100644 --- a/cmds/incident_helper/testdata/system_properties.txt +++ b/cmds/incident_helper/testdata/system_properties.txt @@ -1,3 +1,4 @@ +[aac_drc_cut]: [123] [aaudio.hw_burst_min_usec]: [2000] [aaudio.mmap_exclusive_policy]: [2] [dalvik.vm.appimageformat]: [lz4] @@ -10,4 +11,6 @@ [ro.bootimage.build.fingerprint]: [google/marlin/marlin:P/MASTER/jinyithu10301320:eng/dev-keys] [ro.hardware]: [marlin] [ro.hardware.power]: [marlin-profile] +[ro.product.cpu.abilist]: [arm64-v8a,armeabi-v7a,armeabi] +[ro.product.vendor.brand]: [google] [ro.wifi.channels]: [] diff --git a/cmds/incident_helper/tests/CpuFreqParser_test.cpp b/cmds/incident_helper/tests/CpuFreqParser_test.cpp index 1c2f9e59308d..82deee42687f 100644 --- a/cmds/incident_helper/tests/CpuFreqParser_test.cpp +++ b/cmds/incident_helper/tests/CpuFreqParser_test.cpp @@ -21,7 +21,7 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gmock/gmock.h> -#include <google/protobuf/message.h> +#include <google/protobuf/message_lite.h> #include <gtest/gtest.h> #include <string.h> #include <fcntl.h> @@ -42,13 +42,6 @@ public: ASSERT_TRUE(tf.fd != -1); } - string getSerializedString(::google::protobuf::Message& message) { - string expectedStr; - message.SerializeToFileDescriptor(tf.fd); - ReadFileToString(tf.path, &expectedStr); - return expectedStr; - } - protected: TemporaryFile tf; @@ -125,6 +118,6 @@ TEST_F(CpuFreqParserTest, Success) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } diff --git a/cmds/incident_helper/tests/CpuInfoParser_test.cpp b/cmds/incident_helper/tests/CpuInfoParser_test.cpp index bbc14bca3efc..8dce53e46492 100644 --- a/cmds/incident_helper/tests/CpuInfoParser_test.cpp +++ b/cmds/incident_helper/tests/CpuInfoParser_test.cpp @@ -21,7 +21,7 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gmock/gmock.h> -#include <google/protobuf/message.h> +#include <google/protobuf/message_lite.h> #include <gtest/gtest.h> #include <string.h> #include <fcntl.h> @@ -42,13 +42,6 @@ public: ASSERT_TRUE(tf.fd != -1); } - string getSerializedString(::google::protobuf::Message& message) { - string expectedStr; - message.SerializeToFileDescriptor(tf.fd); - ReadFileToString(tf.path, &expectedStr); - return expectedStr; - } - protected: TemporaryFile tf; @@ -153,6 +146,6 @@ TEST_F(CpuInfoParserTest, Success) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } diff --git a/cmds/incident_helper/tests/KernelWakesParser_test.cpp b/cmds/incident_helper/tests/KernelWakesParser_test.cpp index a8fa62088450..a98c62bd6024 100644 --- a/cmds/incident_helper/tests/KernelWakesParser_test.cpp +++ b/cmds/incident_helper/tests/KernelWakesParser_test.cpp @@ -21,7 +21,7 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gmock/gmock.h> -#include <google/protobuf/message.h> +#include <google/protobuf/message_lite.h> #include <gtest/gtest.h> #include <string.h> #include <fcntl.h> @@ -42,13 +42,6 @@ public: ASSERT_TRUE(tf.fd != -1); } - string getSerializedString(::google::protobuf::Message& message) { - string expectedStr; - message.SerializeToFileDescriptor(tf.fd); - ReadFileToString(tf.path, &expectedStr); - return expectedStr; - } - protected: TemporaryFile tf; @@ -76,7 +69,7 @@ TEST_F(KernelWakesParserTest, Short) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } @@ -114,6 +107,6 @@ TEST_F(KernelWakesParserTest, Normal) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } diff --git a/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp b/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp index de64e70c80c7..a9e6e816c6c5 100644 --- a/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp +++ b/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp @@ -21,7 +21,7 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gmock/gmock.h> -#include <google/protobuf/message.h> +#include <google/protobuf/message_lite.h> #include <gtest/gtest.h> #include <string.h> #include <fcntl.h> @@ -42,13 +42,6 @@ public: ASSERT_TRUE(tf.fd != -1); } - string getSerializedString(::google::protobuf::Message& message) { - string expectedStr; - message.SerializeToFileDescriptor(tf.fd); - ReadFileToString(tf.path, &expectedStr); - return expectedStr; - } - protected: TemporaryFile tf; @@ -108,6 +101,6 @@ TEST_F(PageTypeInfoParserTest, Success) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); -}
\ No newline at end of file +} diff --git a/cmds/incident_helper/tests/ProcrankParser_test.cpp b/cmds/incident_helper/tests/ProcrankParser_test.cpp index e86647ad479b..76b25d7f8f47 100644 --- a/cmds/incident_helper/tests/ProcrankParser_test.cpp +++ b/cmds/incident_helper/tests/ProcrankParser_test.cpp @@ -21,7 +21,7 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gmock/gmock.h> -#include <google/protobuf/message.h> +#include <google/protobuf/message_lite.h> #include <gtest/gtest.h> #include <string.h> #include <fcntl.h> @@ -42,13 +42,6 @@ public: ASSERT_TRUE(tf.fd != -1); } - string getSerializedString(::google::protobuf::Message& message) { - string expectedStr; - message.SerializeToFileDescriptor(tf.fd); - ReadFileToString(tf.path, &expectedStr); - return expectedStr; - } - protected: TemporaryFile tf; @@ -104,7 +97,7 @@ TEST_F(ProcrankParserTest, HasSwapInfo) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } @@ -142,6 +135,6 @@ TEST_F(ProcrankParserTest, NoSwapInfo) { CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } diff --git a/cmds/incident_helper/tests/SystemPropertiesParser_test.cpp b/cmds/incident_helper/tests/SystemPropertiesParser_test.cpp index 98838e98d796..ef28c51fe19a 100644 --- a/cmds/incident_helper/tests/SystemPropertiesParser_test.cpp +++ b/cmds/incident_helper/tests/SystemPropertiesParser_test.cpp @@ -21,7 +21,7 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gmock/gmock.h> -#include <google/protobuf/message.h> +#include <google/protobuf/message_lite.h> #include <gtest/gtest.h> #include <string.h> #include <fcntl.h> @@ -42,13 +42,6 @@ public: ASSERT_TRUE(tf.fd != -1); } - string getSerializedString(::google::protobuf::Message& message) { - string expectedStr; - message.SerializeToFileDescriptor(tf.fd); - ReadFileToString(tf.path, &expectedStr); - return expectedStr; - } - protected: TemporaryFile tf; @@ -61,44 +54,39 @@ TEST_F(SystemPropertiesParserTest, HasSwapInfo) { SystemPropertiesParser parser; SystemPropertiesProto expected; - SystemPropertiesProto::Aaudio* aaudio = expected.mutable_aaudio(); - aaudio->set_hw_burst_min_usec(2000); - aaudio->set_mmap_exclusive_policy(2); - - SystemPropertiesProto::DalvikVm* dalvikVm = expected.mutable_dalvik_vm(); - dalvikVm->set_appimageformat("lz4"); - + expected.mutable_aac_drc()->set_cut(123); + expected.mutable_aaudio()->set_hw_burst_min_usec(2000); + expected.mutable_aaudio()->set_mmap_exclusive_policy(2); + expected.mutable_dalvik_vm()->set_appimageformat("lz4"); expected.set_drm_64bit_enabled(false); - - SystemPropertiesProto::InitSvc* initSvc = expected.mutable_init_svc(); - initSvc->set_adbd(SystemPropertiesProto_InitSvc_Status_STATUS_RUNNING); - initSvc->set_lmkd(SystemPropertiesProto_InitSvc_Status_STATUS_STOPPED); - + expected.mutable_init_svc()->set_adbd( + SystemPropertiesProto_InitSvc_Status_STATUS_RUNNING); + expected.mutable_init_svc()->set_lmkd( + SystemPropertiesProto_InitSvc_Status_STATUS_STOPPED); expected.set_media_mediadrmservice_enable(true); SystemPropertiesProto::Ro* ro = expected.mutable_ro(); - - SystemPropertiesProto::Ro::Boot* boot = ro->mutable_boot(); - boot->add_boottime("1BLL:85"); - boot->add_boottime("1BLE:898"); - boot->add_boottime("2BLL:0"); - boot->add_boottime("2BLE:862"); - boot->add_boottime("SW:6739"); - boot->add_boottime("KL:340"); - - SystemPropertiesProto::Ro::BootImage* bootimage = ro->mutable_bootimage(); - bootimage->set_build_date_utc(1509394807LL); - bootimage->set_build_fingerprint("google/marlin/marlin:P/MASTER/jinyithu10301320:eng/dev-keys"); - - SystemPropertiesProto::Ro::Hardware* hardware = ro->mutable_hardware(); - hardware->set_value("marlin"); - hardware->set_power("marlin-profile"); + ro->mutable_boot()->add_boottime("1BLL:85"); + ro->mutable_boot()->add_boottime("1BLE:898"); + ro->mutable_boot()->add_boottime("2BLL:0"); + ro->mutable_boot()->add_boottime("2BLE:862"); + ro->mutable_boot()->add_boottime("SW:6739"); + ro->mutable_boot()->add_boottime("KL:340"); + ro->mutable_bootimage()->set_build_date_utc(1509394807LL); + ro->mutable_bootimage()->set_build_fingerprint( + "google/marlin/marlin:P/MASTER/jinyithu10301320:eng/dev-keys"); + ro->mutable_hardware()->set_value("marlin"); + ro->mutable_hardware()->set_power("marlin-profile"); + ro->mutable_product()->add_cpu_abilist("arm64-v8a"); + ro->mutable_product()->add_cpu_abilist("armeabi-v7a"); + ro->mutable_product()->add_cpu_abilist("armeabi"); + ro->mutable_product()->mutable_vendor()->set_brand("google"); int fd = open(testFile.c_str(), O_RDONLY); ASSERT_TRUE(fd != -1); CaptureStdout(); ASSERT_EQ(NO_ERROR, parser.Parse(fd, STDOUT_FILENO)); - EXPECT_EQ(GetCapturedStdout(), getSerializedString(expected)); + EXPECT_EQ(GetCapturedStdout(), expected.SerializeAsString()); close(fd); } diff --git a/cmds/input/src/com/android/commands/input/Input.java b/cmds/input/src/com/android/commands/input/Input.java index 9ee11f8571e2..d3ec32076292 100644 --- a/cmds/input/src/com/android/commands/input/Input.java +++ b/cmds/input/src/com/android/commands/input/Input.java @@ -88,8 +88,8 @@ public class Input { final boolean longpress = "--longpress".equals(args[index + 1]); final int start = longpress ? index + 2 : index + 1; inputSource = getSource(inputSource, InputDevice.SOURCE_KEYBOARD); - if (length > start) { - for (int i = start; i < length; i++) { + if (args.length > start) { + for (int i = start; i < args.length; i++) { int keyCode = KeyEvent.keyCodeFromString(args[i]); if (keyCode == KeyEvent.KEYCODE_UNKNOWN) { keyCode = KeyEvent.keyCodeFromString("KEYCODE_" + args[i]); diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 5fcb8a1a0892..a5eae15b50da 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -31,5 +31,11 @@ cc_library_host_shared { type: "full", export_proto_headers: true, }, + + export_shared_lib_headers: [ + "libplatformprotos", + ] + } + diff --git a/cmds/statsd/Android.mk b/cmds/statsd/Android.mk index 337aeaaf37ab..addba8c3a085 100644 --- a/cmds/statsd/Android.mk +++ b/cmds/statsd/Android.mk @@ -19,7 +19,7 @@ statsd_common_src := \ ../../core/java/android/os/IStatsManager.aidl \ src/stats_log.proto \ src/statsd_config.proto \ - src/atoms_copy.proto \ + src/atoms.proto \ src/anomaly/AnomalyMonitor.cpp \ src/anomaly/AnomalyTracker.cpp \ src/condition/CombinationConditionTracker.cpp \ @@ -51,8 +51,6 @@ statsd_common_src := \ src/metrics/MetricsManager.cpp \ src/metrics/metrics_manager_util.cpp \ src/packages/UidMap.cpp \ - src/storage/DropboxReader.cpp \ - src/storage/DropboxWriter.cpp \ src/storage/StorageManager.cpp \ src/StatsLogProcessor.cpp \ src/StatsService.cpp \ @@ -67,6 +65,9 @@ statsd_common_c_includes := \ statsd_common_aidl_includes := \ $(LOCAL_PATH)/../../core/java +statsd_common_static_libraries := \ + libplatformprotos + statsd_common_shared_libraries := \ libbase \ libbinder \ @@ -76,7 +77,6 @@ statsd_common_shared_libraries := \ libselinux \ libutils \ libservices \ - libandroidfw \ libprotoutil \ libstatslog \ libhardware \ @@ -121,12 +121,14 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := lite-static LOCAL_AIDL_INCLUDES := $(statsd_common_aidl_includes) LOCAL_C_INCLUDES += $(statsd_common_c_includes) +LOCAL_STATIC_LIBRARIES := $(statsd_common_static_libraries) + LOCAL_SHARED_LIBRARIES := $(statsd_common_shared_libraries) \ libgtest_prod LOCAL_MODULE_CLASS := EXECUTABLES -#LOCAL_INIT_RC := statsd.rc +LOCAL_INIT_RC := statsd.rc include $(BUILD_EXECUTABLE) @@ -174,17 +176,22 @@ LOCAL_SRC_FILES := \ tests/guardrail/StatsdStats_test.cpp LOCAL_STATIC_LIBRARIES := \ + $(statsd_common_static_libraries) \ libgmock LOCAL_SHARED_LIBRARIES := $(statsd_common_shared_libraries) LOCAL_PROTOC_OPTIMIZE_TYPE := lite +include $(BUILD_NATIVE_TEST) + + statsd_common_src:= statsd_common_aidl_includes:= statsd_common_c_includes:= +statsd_common_static_libraries:= +statsd_common_shared_libraries:= -include $(BUILD_NATIVE_TEST) ############################## diff --git a/cmds/statsd/src/StatsLogProcessor.cpp b/cmds/statsd/src/StatsLogProcessor.cpp index 7589b9387924..a3e39b636a68 100644 --- a/cmds/statsd/src/StatsLogProcessor.cpp +++ b/cmds/statsd/src/StatsLogProcessor.cpp @@ -111,9 +111,7 @@ void StatsLogProcessor::OnConfigUpdated(const ConfigKey& key, const StatsdConfig unique_ptr<MetricsManager> newMetricsManager = std::make_unique<MetricsManager>(key, config); auto it = mMetricsManagers.find(key); - if (it != mMetricsManagers.end()) { - it->second->finish(); - } else if (mMetricsManagers.size() > StatsdStats::kMaxConfigCount) { + if (it == mMetricsManagers.end() && mMetricsManagers.size() > StatsdStats::kMaxConfigCount) { ALOGE("Can't accept more configs!"); return; } @@ -167,11 +165,7 @@ void StatsLogProcessor::onDumpReport(const ConfigKey& key, vector<uint8_t>* outD // First, fill in ConfigMetricsReport using current data on memory, which // starts from filling in StatsLogReport's. - for (auto& m : it->second->onDumpReport()) { - // Add each vector of StatsLogReport into a repeated field. - proto.write(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS, - reinterpret_cast<char*>(m.get()->data()), m.get()->size()); - } + it->second->onDumpReport(&proto); // Fill in UidMap. auto uidMap = mUidMap->getOutput(key); @@ -205,7 +199,6 @@ void StatsLogProcessor::onDumpReport(const ConfigKey& key, vector<uint8_t>* outD void StatsLogProcessor::OnConfigRemoved(const ConfigKey& key) { auto it = mMetricsManagers.find(key); if (it != mMetricsManagers.end()) { - it->second->finish(); mMetricsManagers.erase(it); mUidMap->OnConfigRemoved(key); } @@ -231,8 +224,9 @@ void StatsLogProcessor::flushIfNecessary(uint64_t timestampNs, const ConfigKey& mLastByteSizeTimes[key] = timestampNs; if (totalBytes > StatsdStats::kMaxMetricsBytesPerConfig) { // Too late. We need to start clearing data. - // We ignore the return value so we force each metric producer to clear its contents. - metricsManager.onDumpReport(); + // TODO(b/70571383): By 12/15/2017 add API to drop data directly + ProtoOutputStream proto; + metricsManager.onDumpReport(&proto); StatsdStats::getInstance().noteDataDropped(key); VLOG("StatsD had to toss out metrics for %s", key.ToString().c_str()); } else if (totalBytes > .9 * StatsdStats::kMaxMetricsBytesPerConfig) { diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index d8f0facbaa9b..4dd25391302a 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -23,7 +23,6 @@ #include "config/ConfigManager.h" #include "guardrail/MemoryLeakTrackUtil.h" #include "guardrail/StatsdStats.h" -#include "storage/DropboxReader.h" #include "storage/StorageManager.h" #include <android-base/file.h> @@ -201,11 +200,6 @@ status_t StatsService::command(FILE* in, FILE* out, FILE* err, Vector<String8>& return cmd_config(in, out, err, args); } - // adb shell cmd stats print-stats-log - if (!args[0].compare(String8("print-stats-log")) && args.size() > 1) { - return cmd_print_stats_log(out, args); - } - if (!args[0].compare(String8("print-uid-map"))) { return cmd_print_uid_map(out); } @@ -503,15 +497,6 @@ status_t StatsService::cmd_print_stats(FILE* out, const Vector<String8>& args) { return NO_ERROR; } -status_t StatsService::cmd_print_stats_log(FILE* out, const Vector<String8>& args) { - long msec = 0; - - if (args.size() > 2) { - msec = strtol(args[2].string(), NULL, 10); - } - return DropboxReader::readStatsLogs(out, args[1].string(), msec); -} - status_t StatsService::cmd_print_uid_map(FILE* out) { mUidMap->printUidMap(out); return NO_ERROR; diff --git a/cmds/statsd/src/anomaly/AnomalyTracker.cpp b/cmds/statsd/src/anomaly/AnomalyTracker.cpp index e8b408328181..4777dcd32377 100644 --- a/cmds/statsd/src/anomaly/AnomalyTracker.cpp +++ b/cmds/statsd/src/anomaly/AnomalyTracker.cpp @@ -317,7 +317,7 @@ void AnomalyTracker::informAlarmsFired(const uint64_t& timestampNs, for (const auto& kv : matchedAlarms) { declareAnomaly(timestampNs /* TODO: , kv.first */); mAlarms.erase(kv.first); - firedAlarms.erase(kv.second); // No one else can also own it, so we're done with it. + firedAlarms.erase(kv.second); // No one else can also own it, so we're done with it. } } diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index c81fc1dec7ab..716fee6bb1fb 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -21,6 +21,8 @@ package android.os.statsd; option java_package = "com.android.os"; option java_outer_classname = "AtomsProto"; +import "frameworks/base/core/proto/android/app/activitymanager.proto"; + /** * The master atom class. This message defines all of the available * raw stats log events from the Android system, also known as "atoms." @@ -168,7 +170,7 @@ message UidProcessStateChanged { // The state. // TODO: Use the real (mapped) process states. - optional int32 state = 2; + optional android.app.ProcessState state = 2; } /** @@ -1072,4 +1074,4 @@ message ModemActivityInfoPulled { optional uint64 controller_rx_time_ms = 9; // product of current(mA), voltage(V) and time(ms) optional uint64 energy_used = 10; -}
\ No newline at end of file +} diff --git a/cmds/statsd/src/atoms_copy.proto b/cmds/statsd/src/atoms_copy.proto deleted file mode 100644 index 72bb38a394a7..000000000000 --- a/cmds/statsd/src/atoms_copy.proto +++ /dev/null @@ -1,1077 +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. - */ - -syntax = "proto2"; -option optimize_for = LITE_RUNTIME; - - -// TODO: Not the right package and class name -package android.os.statsd; -option java_package = "com.android.os"; -option java_outer_classname = "AtomsProto"; - -/** - * The master atom class. This message defines all of the available - * raw stats log events from the Android system, also known as "atoms." - * - * This field contains a single oneof with all of the available messages. - * The stats-log-api-gen tool runs as part of the Android build and - * generates the android.util.StatsLog class, which contains the constants - * and methods that Android uses to log. - * - * This Atom class is not actually built into the Android system. - * Instead, statsd on Android constructs these messages synthetically, - * in the format defined here and in stats_log.proto. - */ -message Atom { - // Pushed atoms start at 2. - oneof pushed { - // For StatsLog reasons, 1 is illegal and will not work. Must start at 2. - BleScanStateChanged ble_scan_state_changed = 2; - BleUnoptimizedScanStateChanged ble_unoptimized_scan_state_changed = 3; - BleScanResultReceived ble_scan_result_received = 4; - SensorStateChanged sensor_state_changed = 5; - GpsScanStateChanged gps_scan_state_changed = 6; // TODO: untested - SyncStateChanged sync_state_changed = 7; - ScheduledJobStateChanged scheduled_job_state_changed = 8; - ScreenBrightnessChanged screen_brightness_changed = 9; - WakelockStateChanged wakelock_state_changed = 10; - LongPartialWakelockStateChanged long_partial_wakelock_state_changed = 11; - MobileRadioPowerStateChanged mobile_radio_power_state_changed = 12; - WifiRadioPowerStateChanged wifi_radio_power_state_changed = 13; - // TODO: 14-19 are blank, but need not be - BatterySaverModeStateChanged battery_saver_mode_state_changed = 20; - DeviceIdleModeStateChanged device_idle_mode_state_changed = 21; - DeviceIdlingModeStateChanged device_idling_mode_state_changed = 22; - AudioStateChanged audio_state_changed = 23; - MediaCodecActivityChanged media_codec_activity_changed = 24; - CameraStateChanged camera_state_changed = 25; - FlashlightStateChanged flashlight_state_changed = 26; - UidProcessStateChanged uid_process_state_changed = 27; - ProcessLifeCycleStateChanged process_life_cycle_state_changed = 28; - ScreenStateChanged screen_state_changed = 29; - BatteryLevelChanged battery_level_changed = 30; - ChargingStateChanged charging_state_changed = 31; - PluggedStateChanged plugged_state_changed = 32; - DeviceTemperatureReported device_temperature_reported = 33; - DeviceOnStatusChanged device_on_status_changed = 34; - WakeupAlarmOccurred wakeup_alarm_occurred = 35; - KernelWakeupReported kernel_wakeup_reported = 36; - WifiLockStateChanged wifi_lock_state_changed = 37; - WifiSignalStrengthChanged wifi_signal_strength_changed = 38; - WifiScanStateChanged wifi_scan_state_changed = 39; - PhoneSignalStrengthChanged phone_signal_strength_changed = 40; - SettingChanged setting_changed = 41; - ActivityForegroundStateChanged activity_foreground_state_changed = 42; - IsolatedUidChanged isolated_uid_changed = 43; - PacketWakeupOccurred packet_wakeup_occurred = 44; - DropboxErrorChanged dropbox_error_changed = 45; - // TODO: Reorder the numbering so that the most frequent occur events occur in the first 15. - } - - // Pulled events will start at field 1000. - oneof pulled { - WifiBytesTransferred wifi_bytes_transferred = 1000; - WifiBytesTransferredByFgBg wifi_bytes_transferred_by_fg_bg = 1001; - MobileBytesTransferred mobile_bytes_transferred = 1002; - MobileBytesTransferredByFgBg mobile_bytes_transferred_by_fg_bg = 1003; - KernelWakelockPulled kernel_wakelock_pulled = 1004; - PowerStatePlatformSleepStatePulled power_state_platform_sleep_state_pulled = 1005; - PowerStateVoterPulled power_state_voter_pulled = 1006; - PowerStateSubsystemSleepStatePulled power_state_subsystem_sleep_state_pulled = 1007; - CpuTimePerFreqPulled cpu_time_per_freq_pulled = 1008; - CpuTimePerUidPulled cpu_time_per_uid_pulled = 1009; - CpuTimePerUidFreqPulled cpu_time_per_uid_freq_pulled = 1010; - WifiActivityEnergyInfoPulled wifi_activity_energy_info_pulled = 1011; - ModemActivityInfoPulled modem_activity_info_pulled = 1012; - } -} - -/** - * A WorkSource represents the chained attribution of applications that - * resulted in a particular bit of work being done. - */ -message WorkSource { - // The uid for a given element in the attribution chain. - repeated int32 uid = 1; - // The (optional) string tag for an element in the attribution chain. If the - // element has no tag, it is encoded as an empty string. - repeated string tag = 2; -} - -/* - * ***************************************************************************** - * Below are all of the individual atoms that are logged by Android via statsd. - * - * RULES: - * - The field ids for each atom must start at 1, and count upwards by 1. - * Skipping field ids is not allowed. - * - These form an API, so renaming, renumbering or removing fields is - * not allowed between android releases. (This is not currently enforced, - * but there will be a tool to enforce this restriction). - * - The types must be built-in protocol buffer types, namely, no sub-messages - * are allowed (yet). The bytes type is also not allowed. - * - The CamelCase name of the message type should match the - * underscore_separated name as defined in Atom. - * - If an atom represents work that can be attributed to an app, there can - * be exactly one WorkSource field. It must be field number 1. - * - A field that is a uid should be a string field, tagged with the [xxx] - * annotation. The generated code on android will be represented by UIDs, - * and those UIDs will be translated in xxx to those strings. - * - * CONVENTIONS: - * - Events are past tense. e.g. ScreenStateChanged, not ScreenStateChange. - * - If there is a UID, it goes first. Think in an object-oriented fashion. - * ***************************************************************************** - */ - -/** - * Logs when the screen state changes. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java - */ -message ScreenStateChanged { - // TODO: Use the real screen state. - enum State { - STATE_UNKNOWN = 0; - STATE_OFF = 1; - STATE_ON = 2; - STATE_DOZE = 3; - STATE_DOZE_SUSPEND = 4; - STATE_VR = 5; - STATE_ON_SUSPEND = 6; - } - // New screen state. - optional State display_state = 1; -} - -/** - * Logs that the state of a process state, as per the activity manager, has changed. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java - */ -message UidProcessStateChanged { - optional int32 uid = 1; // TODO: should be a string tagged w/ uid annotation - - // The state. - // TODO: Use the real (mapped) process states. - optional int32 state = 2; -} - -/** - * Logs that a process started, finished, crashed, or ANRed. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java - */ -message ProcessLifeCycleStateChanged { - // TODO: Use the real (mapped) process states. - optional int32 uid = 1; // TODO: should be a string tagged w/ uid annotation - - // TODO: What is this? - optional string name = 2; - - // What lifecycle state the process changed to. - // This enum is specific to atoms.proto. - enum Event { - PROCESS_FINISHED = 0; - PROCESS_STARTED = 1; - PROCESS_CRASHED = 2; - PROCESS_ANRED = 3; - } - optional Event event = 3; -} - -/** - * Logs when the ble scan state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message BleScanStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs when an unoptimized ble scan state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -// TODO: Consider changing to tracking per-scanner-id (log from AppScanStats). -message BleUnoptimizedScanStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs reporting of a ble scan finding results. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -// TODO: Consider changing to tracking per-scanner-id (log from AppScanStats). -message BleScanResultReceived { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - // Number of ble scan results returned. - optional int32 num_of_results = 2; -} - -/** - * Logs when a sensor state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message SensorStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - // TODO: Is there a way to get the actual name of the sensor? - // The id (int) of the sensor. - optional int32 sensor_id = 2; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 3; -} - - -/** - * Logs when GPS state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message GpsScanStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - - -/** - * Logs when a sync manager sync state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message SyncStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - // Name of the sync (as named in the app) - optional string name = 2; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 3; -} - -/** - * Logs when a job scheduler job state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message ScheduledJobStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - // Name of the job (as named in the app) - optional string name = 2; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 3; - - // TODO: Consider adding the stopReason (int) -} - -/** - * Logs when the audio state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message AudioStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs when the video codec state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message MediaCodecActivityChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs when the flashlight state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message FlashlightStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs when the camera state changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message CameraStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs that the state of a wakelock (per app and per wakelock name) has changed. - * - * Logged from: - * TODO - */ -message WakelockStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - // Type of wakelock. - enum Type { - PARTIAL = 0; - FULL = 1; - WINDOW = 2; - } - optional Type type = 2; - - // The wakelock tag (Called tag in the Java API, sometimes name elsewhere). - optional string tag = 3; - - enum State { - RELEASE = 0; - ACQUIRE = 1; - CHANGE_RELEASE = 2; - CHANGE_ACQUIRE = 3; - } - optional State state = 4; -} - -/** - * Logs when a partial wakelock is considered 'long' (over 1 min). - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message LongPartialWakelockStateChanged { - // TODO: Add attribution instead of uid? - optional int32 uid = 1; - - // The wakelock tag (Called tag in the Java API, sometimes name elsewhere). - optional string tag = 2; - - // TODO: I have no idea what this is. - optional string history_tag = 3; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 4; -} - -/** - * Logs Battery Saver state change. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message BatterySaverModeStateChanged { - enum State { - OFF = 0; - ON = 1; - } - optional State state = 1; -} - -/** - * Logs Doze mode state change. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message DeviceIdleModeStateChanged { - // TODO: Use the enum matching BatteryStats.DEVICE_IDLE_MODE_. - enum State { - DEVICE_IDLE_MODE_OFF = 0; - DEVICE_IDLE_MODE_LIGHT = 1; - DEVICE_IDLE_MODE_DEEP = 2; - } - optional State state = 1; -} - - -/** - * Logs state change of Doze mode including maintenance windows. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message DeviceIdlingModeStateChanged { - // TODO: Use the enum matching BatteryStats.DEVICE_IDLE_MODE_. - enum State { - DEVICE_IDLE_MODE_OFF = 0; - DEVICE_IDLE_MODE_LIGHT = 1; - DEVICE_IDLE_MODE_DEEP = 2; - } - optional State state = 1; -} - -/** - * Logs screen brightness level. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java - */ -message ScreenBrightnessChanged { - // Screen brightness level. Should be in [-1, 255] according to PowerManager.java. - optional int32 level = 1; -} - -/** - * Logs battery level (percent full, from 0 to 100). - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message BatteryLevelChanged { - // Battery level. Should be in [0, 100]. - optional int32 battery_level = 1; -} - -/** - * Logs change in charging status of the device. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message ChargingStateChanged { - // TODO: Link directly to BatteryManager.java's constants (via a proto). - enum State { - BATTERY_STATUS_UNKNOWN = 1; - BATTERY_STATUS_CHARGING = 2; - BATTERY_STATUS_DISCHARGING = 3; - BATTERY_STATUS_NOT_CHARGING = 4; - BATTERY_STATUS_FULL = 5; - } - optional State charging_state = 1; -} - -/** - * Logs whether the device is plugged in, and what power source it is using. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message PluggedStateChanged { - // TODO: Link directly to BatteryManager.java's constants (via a proto). - enum State { - // Note that NONE is not in BatteryManager.java's constants. - BATTERY_PLUGGED_NONE = 0; - // Power source is an AC charger. - BATTERY_PLUGGED_AC = 1; - // Power source is a USB port. - BATTERY_PLUGGED_USB = 2; - // Power source is wireless. - BATTERY_PLUGGED_WIRELESS = 4; - } - optional State plugged_state = 1; -} - -/** - * Logs the temperature of the device, in tenths of a degree Celsius. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message DeviceTemperatureReported { - // Temperature in tenths of a degree C. - optional int32 temperature = 1; -} - -// TODO: Define this more precisely. -// TODO: Log the ON state somewhere. It isn't currently logged anywhere. -/** - * Logs when the device turns off or on. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java - */ -message DeviceOnStatusChanged { - enum State { - OFF = 0; - ON = 1; - } - optional State state = 1; -} - -/** - * Logs when an app's wakeup alarm fires. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java - */ -message WakeupAlarmOccurred { - // TODO: Add attribution instead of uid? - optional int32 uid = 1; - - // Name of the wakeup alarm. - optional string tag = 2; -} - -/** - * Logs when an an app causes the mobile radio to change state. - * Changing from LOW to MEDIUM or HIGH can be considered the app waking the mobile radio. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message MobileRadioPowerStateChanged { - // TODO: Add attribution instead of uid? - optional int32 uid = 1; - - // TODO: Reference telephony/java/android/telephony/DataConnectionRealTimeInfo.java states. - enum PowerState { - DC_POWER_STATE_LOW = 1; - DC_POWER_STATE_MEDIUM = 2; - DC_POWER_STATE_HIGH = 3; - } - optional PowerState power_state = 2; -} - -/** - * Logs when an an app causes the wifi radio to change state. - * Changing from LOW to MEDIUM or HIGH can be considered the app waking the wifi radio. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message WifiRadioPowerStateChanged { - // TODO: Add attribution instead of uid? - optional int32 uid = 1; - - // TODO: Reference telephony/java/android/telephony/DataConnectionRealTimeInfo.java states. - enum PowerState { - DC_POWER_STATE_LOW = 1; - DC_POWER_STATE_MEDIUM = 2; - DC_POWER_STATE_HIGH = 3; - } - optional PowerState power_state = 2; -} - -/** - * Logs kernel wakeup reasons and aborts. - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java - */ -message KernelWakeupReported { - // Name of the kernel wakeup reason (or abort). - optional string wakeup_reason_name = 1; - - // Duration (in microseconds) for the wake-up interrupt to be serviced. - optional int64 duration_usec = 2; -} - -/** - * Logs wifi locks held by an app. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message WifiLockStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs wifi signal strength changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message WifiSignalStrengthChanged { - // TODO: Reference the actual telephony/java/android/telephony/SignalStrength.java states. - enum SignalStrength { - SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; - SIGNAL_STRENGTH_POOR = 1; - SIGNAL_STRENGTH_MODERATE = 2; - SIGNAL_STRENGTH_GOOD = 3; - SIGNAL_STRENGTH_GREAT = 4; - } - optional SignalStrength signal_strength = 1; -} - -/** - * Logs wifi scans performed by an app. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message WifiScanStateChanged { - // TODO: Add attribution instead of uid. - optional int32 uid = 1; - - enum State { - OFF = 0; - ON = 1; - } - optional State state = 2; -} - -/** - * Logs phone signal strength changes. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message PhoneSignalStrengthChanged { - // TODO: Reference the actual telephony/java/android/telephony/SignalStrength.java states. - enum SignalStrength { - SIGNAL_STRENGTH_NONE_OR_UNKNOWN = 0; - SIGNAL_STRENGTH_POOR = 1; - SIGNAL_STRENGTH_MODERATE = 2; - SIGNAL_STRENGTH_GOOD = 3; - SIGNAL_STRENGTH_GREAT = 4; - } - optional SignalStrength signal_strength = 1; -} - -/** - * Logs that a setting was updated. - * Logged from: - * frameworks/base/core/java/android/provider/Settings.java - * The tag and is_default allow resetting of settings to default values based on the specified - * tag. See Settings#putString(ContentResolver, String, String, String, boolean) for more details. - */ -message SettingChanged { - // The name of the setting. - optional string setting = 1; - - // The change being imposed on this setting. May represent a number, eg "3". - optional string value = 2; - - // The new value of this setting. For most settings, this is same as value. For some settings, - // value is +X or -X where X represents an element in a set. For example, if the previous value - // is A,B,C and value is -B, then new_value is A,C and prev_value is A,B,C. - // The +/- feature is currently only used for location_providers_allowed. - optional string new_value = 3; - - // The previous value of this setting. - optional string prev_value = 4; - - // The tag used with the is_default for resetting sets of settings. This is generally null. - optional string tag = 5; - - // 1 indicates that this setting with tag should be resettable. - optional int32 is_default = 6; - - // The user ID associated. Defined in android/os/UserHandle.java - optional int32 user = 7; -} - -/** - * Logs activity going to foreground or background - * - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/ActivityRecord.java - */ -message ActivityForegroundStateChanged { - enum Activity { - MOVE_TO_BACKGROUND = 0; - MOVE_TO_FOREGROUND = 1; - } - optional int32 uid = 1; - optional string pkg_name = 2; - optional string class_name = 3; - optional Activity activity = 4; -} - -/** - * Logs when an error is written to dropbox. - * Logged from: - * frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java - */ -message DropboxErrorChanged { - // The uid if available. -1 means not available. - optional int32 uid = 1; - - // Tag used when recording this error to dropbox. Contains data_ or system_ prefix. - optional string tag = 2; - - // The name of the process. - optional string process_name = 3; - - // The pid if available. -1 means not available. - optional int32 pid = 4; - - // 1 indicates is instant app. -1 indicates Not applicable. - optional int32 is_instant_app = 5; - - // The activity name if available. - optional string activity_name = 6; - - // 1 indicates in foreground. -1 indicates not available. - optional int32 is_foreground = 7; -} - -/** - * Pulls bytes transferred via wifi (Sum of foreground and background usage). - * - * Pulled from: - * StatsCompanionService (using BatteryStats to get which interfaces are wifi) - */ -message WifiBytesTransferred { - optional int32 uid = 1; - - optional int64 rx_bytes = 2; - - optional int64 rx_packets = 3; - - optional int64 tx_bytes = 4; - - optional int64 tx_packets = 5; -} - -/** - * Pulls bytes transferred via wifi (separated by foreground and background usage). - * - * Pulled from: - * StatsCompanionService (using BatteryStats to get which interfaces are wifi) - */ -message WifiBytesTransferredByFgBg { - optional int32 uid = 1; - - // 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats. - optional int32 is_foreground = 2; - - optional int64 rx_bytes = 3; - - optional int64 rx_packets = 4; - - optional int64 tx_bytes = 5; - - optional int64 tx_packets = 6; -} - -/** - * Pulls bytes transferred via mobile networks (Sum of foreground and background usage). - * - * Pulled from: - * StatsCompanionService (using BatteryStats to get which interfaces are mobile data) - */ -message MobileBytesTransferred { - optional int32 uid = 1; - - optional int64 rx_bytes = 2; - - optional int64 rx_packets = 3; - - optional int64 tx_bytes = 4; - - optional int64 tx_packets = 5; -} - -/** - * Pulls bytes transferred via mobile networks (separated by foreground and background usage). - * - * Pulled from: - * StatsCompanionService (using BatteryStats to get which interfaces are mobile data) - */ -message MobileBytesTransferredByFgBg { - optional int32 uid = 1; - - // 1 denotes foreground and 0 denotes background. This is called Set in NetworkStats. - optional int32 is_foreground = 2; - - optional int64 rx_bytes = 3; - - optional int64 rx_packets = 4; - - optional int64 tx_bytes = 5; - - optional int64 tx_packets = 6; -} - -/** - * Pulls the kernel wakelock durations. This atom is adapted from - * android/internal/os/KernelWakelockStats.java - * - * Pulled from: - * StatsCompanionService using KernelWakelockReader. - */ -message KernelWakelockPulled { - optional string name = 1; - - optional int32 count = 2; - - optional int32 version = 3; - - optional int64 time = 4; -} - -/** - * Pulls PowerStatePlatformSleepState. - * - * Definition here: - * hardware/interfaces/power/1.0/types.hal - */ -message PowerStatePlatformSleepStatePulled { - optional string name = 1; - optional uint64 residency_in_msec_since_boot = 2; - optional uint64 total_transitions = 3; - optional bool supported_only_in_suspend = 4; -} - -/** - * Pulls PowerStateVoter. - * - * Definition here: - * hardware/interfaces/power/1.0/types.hal - */ -message PowerStateVoterPulled { - optional string power_state_platform_sleep_state_name = 1; - optional string power_state_voter_name = 2; - optional uint64 total_time_in_msec_voted_for_since_boot = 3; - optional uint64 total_number_of_times_voted_since_boot = 4; -} - -/** - * Pulls PowerStateSubsystemSleepState. - * - * Definition here: - * hardware/interfaces/power/1.1/types.hal - */ -message PowerStateSubsystemSleepStatePulled { - optional string power_state_subsystem_name = 1; - optional string power_state_subsystem_sleep_state_name = 2; - optional uint64 residency_in_msec_since_boot = 3; - optional uint64 total_transitions = 4; - optional uint64 last_entry_timestamp_ms = 5; - optional bool supported_only_in_suspend = 6; -} - -/** - * Logs creation or removal of an isolated uid. Isolated uid's are temporary uid's to sandbox risky - * behavior in its own uid. However, the metrics of these isolated uid's almost always should be - * attributed back to the parent (host) uid. One example is Chrome. - * - * Logged from: - * frameworks/base/core/java/com/android/internal/os/BatteryStatsImpl.java - */ -message IsolatedUidChanged { - // The host UID. Generally, we should attribute metrics from the isolated uid to the host uid. - optional int32 parent_uid = 1; - - optional int32 isolated_uid = 2; - - // 1 denotes we're creating an isolated uid and 0 denotes removal. We expect an isolated uid to - // be removed before if it's used for another parent uid. - optional int32 is_create = 3; -} - -/** - * Pulls Cpu time per frequency. - * Note: this should be pulled for gauge metric only, without condition. - * The puller keeps internal state of last values. It should not be pulled by - * different metrics. - * The pulled data is delta of cpu time from last pull, calculated as - * following: - * if current time is larger than last value, take delta between the two. - * if current time is smaller than last value, there must be a cpu - * hotplug event, and the current time is taken as delta. - */ -message CpuTimePerFreqPulled { - optional uint32 cluster = 1; - optional uint32 freq_index = 2; - optional uint64 time = 3; -} - -/** - * Pulls Cpu Time Per Uid. - * Note that isolated process uid time should be attributed to host uids. - */ -message CpuTimePerUidPulled { - optional uint64 uid = 1; - optional uint64 user_time_ms = 2; - optional uint64 sys_time_ms = 3; -} - -/** - * Pulls Cpu Time Per Uid per frequency. - * Note that isolated process uid time should be attributed to host uids. - * For each uid, we order the time by descending frequencies. - */ -message CpuTimePerUidFreqPulled { - optional uint64 uid = 1; - optional uint64 freq_idx = 2; - optional uint64 time_ms = 3; -} - -/* - * Logs the reception of an incoming network packet causing the main system to wake up for - * processing that packet. These events are notified by the kernel via Netlink NFLOG to Netd - * and processed by WakeupController.cpp. - */ -message PacketWakeupOccurred { - // The uid owning the socket into which the packet was delivered, or -1 if the packet was - // delivered nowhere. - optional int32 uid = 1; - // The interface name on which the packet was received. - optional string iface = 2; - // The ethertype value of the packet. - optional int32 ethertype = 3; - // String representation of the destination MAC address of the packet. - optional string destination_hardware_address = 4; - // String representation of the source address of the packet if this was an IP packet. - optional string source_ip = 5; - // String representation of the destination address of the packet if this was an IP packet. - optional string destination_ip = 6; - // The value of the protocol field if this was an IPv4 packet or the value of the Next Header - // field if this was an IPv6 packet. The range of possible values is the same for both IP - // families. - optional int32 ip_next_header = 7; - // The source port if this was a TCP or UDP packet. - optional int32 source_port = 8; - // The destination port if this was a TCP or UDP packet. - optional int32 destination_port = 9; -} - -/** - * Pulls Wifi Controller Activity Energy Info - */ -message WifiActivityEnergyInfoPulled { - // timestamp(wall clock) of record creation - optional uint64 timestamp_ms = 1; - // stack reported state - // TODO: replace this with proto enum - optional int32 stack_state = 2; - // tx time in ms - optional uint64 controller_tx_time_ms = 3; - // rx time in ms - optional uint64 controller_rx_time_ms = 4; - // idle time in ms - optional uint64 controller_idle_time_ms = 5; - // product of current(mA), voltage(V) and time(ms) - optional uint64 controller_energy_used = 6; -} - -/** - * Pulls Modem Activity Energy Info - */ -message ModemActivityInfoPulled { - // timestamp(wall clock) of record creation - optional uint64 timestamp_ms = 1; - // sleep time in ms. - optional uint64 sleep_time_ms = 2; - // idle time in ms - optional uint64 controller_idle_time_ms = 3; - /** - * Tx power index - * index 0 = tx_power < 0dBm - * index 1 = 0dBm < tx_power < 5dBm - * index 2 = 5dBm < tx_power < 15dBm - * index 3 = 15dBm < tx_power < 20dBm - * index 4 = tx_power > 20dBm - */ - // tx time in ms at power level 0 - optional uint64 controller_tx_time_pl0_ms = 4; - // tx time in ms at power level 1 - optional uint64 controller_tx_time_pl1_ms = 5; - // tx time in ms at power level 2 - optional uint64 controller_tx_time_pl2_ms = 6; - // tx time in ms at power level 3 - optional uint64 controller_tx_time_pl3_ms = 7; - // tx time in ms at power level 4 - optional uint64 controller_tx_time_pl4_ms = 8; - // rx time in ms at power level 5 - optional uint64 controller_rx_time_ms = 9; - // product of current(mA), voltage(V) and time(ms) - optional uint64 energy_used = 10; -}
\ No newline at end of file diff --git a/cmds/statsd/src/config/ConfigManager.cpp b/cmds/statsd/src/config/ConfigManager.cpp index e52b2739c991..164f88f3df59 100644 --- a/cmds/statsd/src/config/ConfigManager.cpp +++ b/cmds/statsd/src/config/ConfigManager.cpp @@ -29,6 +29,12 @@ namespace android { namespace os { namespace statsd { +using std::map; +using std::pair; +using std::set; +using std::string; +using std::vector; + #define STATS_SERVICE_DIR "/data/misc/stats-service" using android::base::StringPrintf; @@ -41,8 +47,14 @@ ConfigManager::~ConfigManager() { } void ConfigManager::Startup() { - StorageManager::readConfigFromDisk(mConfigs); - + map<ConfigKey, StatsdConfig> configsFromDisk; + StorageManager::readConfigFromDisk(configsFromDisk); + // TODO(b/70667694): Make the configs from disk be used. And remove the fake config, + // and tests shouldn't call this Startup(), maybe call StartupForTest() so we don't read + // configs from disk for tests. + // for (const auto& pair : configsFromDisk) { + // UpdateConfig(pair.first, pair.second); + //} // this should be called from StatsService when it receives a statsd_config UpdateConfig(ConfigKey(1000, "fake"), build_fake_config()); } @@ -52,9 +64,8 @@ void ConfigManager::AddListener(const sp<ConfigListener>& listener) { } void ConfigManager::UpdateConfig(const ConfigKey& key, const StatsdConfig& config) { - // Add to map - mConfigs[key] = config; - // Why doesn't this work? mConfigs.insert({key, config}); + // Add to set + mConfigs.insert(key); // Save to disk update_saved_configs(key, config); @@ -74,7 +85,7 @@ void ConfigManager::RemoveConfigReceiver(const ConfigKey& key) { } void ConfigManager::RemoveConfig(const ConfigKey& key) { - unordered_map<ConfigKey, StatsdConfig>::iterator it = mConfigs.find(key); + auto it = mConfigs.find(key); if (it != mConfigs.end()) { // Remove from map mConfigs.erase(it); @@ -100,9 +111,9 @@ void ConfigManager::RemoveConfigs(int uid) { for (auto it = mConfigs.begin(); it != mConfigs.end();) { // Remove from map - if (it->first.GetUid() == uid) { - removed.push_back(it->first); - mConfigReceivers.erase(it->first); + if (it->GetUid() == uid) { + removed.push_back(*it); + mConfigReceivers.erase(*it); it = mConfigs.erase(it); } else { it++; @@ -123,10 +134,10 @@ void ConfigManager::RemoveAllConfigs() { for (auto it = mConfigs.begin(); it != mConfigs.end();) { // Remove from map - removed.push_back(it->first); - auto receiverIt = mConfigReceivers.find(it->first); + removed.push_back(*it); + auto receiverIt = mConfigReceivers.find(*it); if (receiverIt != mConfigReceivers.end()) { - mConfigReceivers.erase(it->first); + mConfigReceivers.erase(*it); } it = mConfigs.erase(it); } @@ -143,7 +154,7 @@ void ConfigManager::RemoveAllConfigs() { vector<ConfigKey> ConfigManager::GetAllConfigKeys() const { vector<ConfigKey> ret; for (auto it = mConfigs.cbegin(); it != mConfigs.cend(); ++it) { - ret.push_back(it->first); + ret.push_back(*it); } return ret; } @@ -160,15 +171,13 @@ const pair<string, string> ConfigManager::GetConfigReceiver(const ConfigKey& key void ConfigManager::Dump(FILE* out) { fprintf(out, "CONFIGURATIONS (%d)\n", (int)mConfigs.size()); fprintf(out, " uid name\n"); - for (unordered_map<ConfigKey, StatsdConfig>::const_iterator it = mConfigs.begin(); - it != mConfigs.end(); it++) { - fprintf(out, " %6d %s\n", it->first.GetUid(), it->first.GetName().c_str()); - auto receiverIt = mConfigReceivers.find(it->first); + for (const auto& key : mConfigs) { + fprintf(out, " %6d %s\n", key.GetUid(), key.GetName().c_str()); + auto receiverIt = mConfigReceivers.find(key); if (receiverIt != mConfigReceivers.end()) { fprintf(out, " -> received by %s, %s\n", receiverIt->second.first.c_str(), receiverIt->second.second.c_str()); } - // TODO: Print the contents of the config too. } } @@ -227,7 +236,8 @@ StatsdConfig build_fake_config() { metric->mutable_bucket()->set_bucket_size_millis(30 * 1000L); // Anomaly threshold for screen-on count. - Alert* alert = config.add_alert(); + // TODO(b/70627390): Uncomment once the bug is fixed. + /*Alert* alert = config.add_alert(); alert->set_name("ALERT_1"); alert->set_metric_name("METRIC_1"); alert->set_number_of_buckets(6); @@ -235,7 +245,7 @@ StatsdConfig build_fake_config() { alert->set_refractory_period_secs(30); Alert::IncidentdDetails* details = alert->mutable_incidentd_details(); details->add_section(12); - details->add_section(13); + details->add_section(13);*/ // Count process state changes, slice by uid. metric = config.add_count_metric(); @@ -246,6 +256,8 @@ StatsdConfig build_fake_config() { keyMatcher->set_key(UID_PROCESS_STATE_UID_KEY); // Anomaly threshold for background count. + // TODO(b/70627390): Uncomment once the bug is fixed. + /* alert = config.add_alert(); alert->set_name("ALERT_2"); alert->set_metric_name("METRIC_2"); @@ -254,7 +266,7 @@ StatsdConfig build_fake_config() { alert->set_refractory_period_secs(20); details = alert->mutable_incidentd_details(); details->add_section(14); - details->add_section(15); + details->add_section(15);*/ // Count process state changes, slice by uid, while SCREEN_IS_OFF metric = config.add_count_metric(); @@ -326,6 +338,8 @@ StatsdConfig build_fake_config() { durationMetric->set_what("SCREEN_IS_ON"); // Anomaly threshold for background count. + // TODO(b/70627390): Uncomment once the bug is fixed. + /* alert = config.add_alert(); alert->set_name("ALERT_8"); alert->set_metric_name("METRIC_8"); @@ -333,7 +347,7 @@ StatsdConfig build_fake_config() { alert->set_trigger_if_sum_gt(2000000000); // 2 seconds alert->set_refractory_period_secs(120); details = alert->mutable_incidentd_details(); - details->add_section(-1); + details->add_section(-1);*/ // Value metric to count KERNEL_WAKELOCK when screen turned on ValueMetric* valueMetric = config.add_value_metric(); diff --git a/cmds/statsd/src/config/ConfigManager.h b/cmds/statsd/src/config/ConfigManager.h index 90ea6c0ca064..ea42a3595d98 100644 --- a/cmds/statsd/src/config/ConfigManager.h +++ b/cmds/statsd/src/config/ConfigManager.h @@ -19,8 +19,9 @@ #include "config/ConfigKey.h" #include "config/ConfigListener.h" +#include <map> +#include <set> #include <string> -#include <unordered_map> #include <stdio.h> @@ -28,13 +29,7 @@ namespace android { namespace os { namespace statsd { -using android::RefBase; -using std::string; -using std::unordered_map; -using std::vector; -using std::pair; - -// Util function to Hard code a test metric for counting screen on events. +// Util function to build a hard coded config with test metrics. StatsdConfig build_fake_config(); /** @@ -43,7 +38,7 @@ StatsdConfig build_fake_config(); * TODO: Store the configs persistently too. * TODO: Dump method for debugging. */ -class ConfigManager : public virtual RefBase { +class ConfigManager : public virtual android::RefBase { public: ConfigManager(); virtual ~ConfigManager(); @@ -68,17 +63,17 @@ public: /** * Sets the broadcast receiver for a configuration key. */ - void SetConfigReceiver(const ConfigKey& key, const string& pkg, const string& cls); + void SetConfigReceiver(const ConfigKey& key, const std::string& pkg, const std::string& cls); /** * Returns the package name and class name representing the broadcast receiver for this config. */ - const pair<string, string> GetConfigReceiver(const ConfigKey& key) const; + const std::pair<std::string, std::string> GetConfigReceiver(const ConfigKey& key) const; /** * Returns all config keys registered. */ - vector<ConfigKey> GetAllConfigKeys() const; + std::vector<ConfigKey> GetAllConfigKeys() const; /** * Erase any broadcast receiver associated with this config key. @@ -121,18 +116,18 @@ private: /** * The Configs that have been set. Each config should */ - unordered_map<ConfigKey, StatsdConfig> mConfigs; + std::set<ConfigKey> mConfigs; /** * Each config key can be subscribed by up to one receiver, specified as the package name and * class name. */ - unordered_map<ConfigKey, pair<string, string>> mConfigReceivers; + std::map<ConfigKey, std::pair<std::string, std::string>> mConfigReceivers; /** * The ConfigListeners that will be told about changes. */ - vector<sp<ConfigListener>> mListeners; + std::vector<sp<ConfigListener>> mListeners; }; } // namespace statsd diff --git a/cmds/statsd/src/guardrail/StatsdStats.cpp b/cmds/statsd/src/guardrail/StatsdStats.cpp index b02b9daa4b2d..bf277f0a383d 100644 --- a/cmds/statsd/src/guardrail/StatsdStats.cpp +++ b/cmds/statsd/src/guardrail/StatsdStats.cpp @@ -310,7 +310,7 @@ void StatsdStats::addSubStatsToConfigLocked(const ConfigKey& key, for (const auto& stats : alertStats) { auto output = configStats.add_alert_stats(); output->set_name(stats.first); - output->set_declared_times(stats.second); + output->set_alerted_times(stats.second); VLOG("alert %s declared %d times", stats.first.c_str(), stats.second); } } diff --git a/cmds/statsd/src/logd/LogEvent.h b/cmds/statsd/src/logd/LogEvent.h index 7e8a96b2114e..176e16e3113a 100644 --- a/cmds/statsd/src/logd/LogEvent.h +++ b/cmds/statsd/src/logd/LogEvent.h @@ -105,6 +105,11 @@ public: */ void init(); + /** + * Set timestamp if the original timestamp is missing. + */ + void setTimestampNs(uint64_t timestampNs) {mTimestampNs = timestampNs;} + private: /** * Don't copy, it's slower. If we really need this we can add it but let's try to diff --git a/cmds/statsd/src/metrics/CountMetricProducer.cpp b/cmds/statsd/src/metrics/CountMetricProducer.cpp index 36ec6b98b2d7..7b865c2752d5 100644 --- a/cmds/statsd/src/metrics/CountMetricProducer.cpp +++ b/cmds/statsd/src/metrics/CountMetricProducer.cpp @@ -66,7 +66,7 @@ CountMetricProducer::CountMetricProducer(const ConfigKey& key, const CountMetric const int conditionIndex, const sp<ConditionWizard>& wizard, const uint64_t startTimeNs) - : MetricProducer(key, startTimeNs, conditionIndex, wizard), mMetric(metric) { + : MetricProducer(metric.name(), key, startTimeNs, conditionIndex, wizard) { // TODO: evaluate initial conditions. and set mConditionMet. if (metric.has_bucket() && metric.bucket().has_bucket_size_millis()) { mBucketSizeNs = metric.bucket().bucket_size_millis() * 1000 * 1000; @@ -83,8 +83,6 @@ CountMetricProducer::CountMetricProducer(const ConfigKey& key, const CountMetric mConditionSliced = true; } - startNewProtoOutputStreamLocked(mStartTimeNs); - VLOG("metric %s created. bucket size %lld start_time: %lld", metric.name().c_str(), (long long)mBucketSizeNs, (long long)mStartTimeNs); } @@ -93,28 +91,19 @@ CountMetricProducer::~CountMetricProducer() { VLOG("~CountMetricProducer() called"); } -void CountMetricProducer::startNewProtoOutputStreamLocked(long long startTime) { - mProto = std::make_unique<ProtoOutputStream>(); - mProto->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mMetric.name()); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, startTime); - mProtoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_COUNT_METRICS); -} - -void CountMetricProducer::finish() { -} - void CountMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eventTime) { - VLOG("Metric %s onSlicedConditionMayChange", mMetric.name().c_str()); + VLOG("Metric %s onSlicedConditionMayChange", mName.c_str()); } -std::unique_ptr<std::vector<uint8_t>> CountMetricProducer::onDumpReportLocked() { - long long endTime = time(nullptr) * NS_PER_SEC; +void CountMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, + ProtoOutputStream* protoOutput) { + flushIfNeededLocked(dumpTimeNs); + + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mName); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs); + long long protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_COUNT_METRICS); - // Dump current bucket if it's stale. - // If current bucket is still on-going, don't force dump current bucket. - // In finish(), We can force dump current bucket. - flushIfNeededLocked(endTime); - VLOG("metric %s dump report now...", mMetric.name().c_str()); + VLOG("metric %s dump report now...", mName.c_str()); for (const auto& counter : mPastBuckets) { const HashableDimensionKey& hashableKey = counter.first; @@ -125,59 +114,53 @@ std::unique_ptr<std::vector<uint8_t>> CountMetricProducer::onDumpReportLocked() continue; } long long wrapperToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); + protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); // First fill dimension (KeyValuePairs). for (const auto& kv : it->second) { - long long dimensionToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); - mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); + long long dimensionToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); + protoOutput->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); if (kv.has_value_str()) { - mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); } else if (kv.has_value_int()) { - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); } else if (kv.has_value_bool()) { - mProto->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); + protoOutput->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); } else if (kv.has_value_float()) { - mProto->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); + protoOutput->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); } - mProto->end(dimensionToken); + protoOutput->end(dimensionToken); } // Then fill bucket_info (CountBucketInfo). for (const auto& bucket : counter.second) { - long long bucketInfoToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, - (long long)bucket.mBucketStartNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, - (long long)bucket.mBucketEndNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_COUNT, (long long)bucket.mCount); - mProto->end(bucketInfoToken); + long long bucketInfoToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, + (long long)bucket.mBucketStartNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, + (long long)bucket.mBucketEndNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_COUNT, (long long)bucket.mCount); + protoOutput->end(bucketInfoToken); VLOG("\t bucket [%lld - %lld] count: %lld", (long long)bucket.mBucketStartNs, (long long)bucket.mBucketEndNs, (long long)bucket.mCount); } - mProto->end(wrapperToken); + protoOutput->end(wrapperToken); } - mProto->end(mProtoToken); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, - (long long)mCurrentBucketStartTimeNs); + protoOutput->end(protoToken); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, (long long)dumpTimeNs); - VLOG("metric %s dump report now...", mMetric.name().c_str()); - std::unique_ptr<std::vector<uint8_t>> buffer = serializeProtoLocked(); - - startNewProtoOutputStreamLocked(endTime); mPastBuckets.clear(); - - return buffer; + mStartTimeNs = mCurrentBucketStartTimeNs; // TODO: Clear mDimensionKeyMap once the report is dumped. } void CountMetricProducer::onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) { - VLOG("Metric %s onConditionChanged", mMetric.name().c_str()); + VLOG("Metric %s onConditionChanged", mName.c_str()); mCondition = conditionMet; } @@ -189,11 +172,10 @@ bool CountMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newKey) // 1. Report the tuple count if the tuple count > soft limit if (mCurrentSlicedCounter->size() > StatsdStats::kDimensionKeySizeSoftLimit - 1) { size_t newTupleCount = mCurrentSlicedCounter->size() + 1; - StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mMetric.name(), - newTupleCount); + StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mName, newTupleCount); // 2. Don't add more tuples, we are above the allowed threshold. Drop the data. if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { - ALOGE("CountMetric %s dropping data for dimension key %s", mMetric.name().c_str(), + ALOGE("CountMetric %s dropping data for dimension key %s", mName.c_str(), newKey.c_str()); return true; } @@ -205,7 +187,7 @@ bool CountMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newKey) void CountMetricProducer::onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const map<string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) { + const LogEvent& event) { uint64_t eventTimeNs = event.GetTimestampNs(); flushIfNeededLocked(eventTimeNs); @@ -235,7 +217,7 @@ void CountMetricProducer::onMatchedLogEventInternalLocked( mCurrentSlicedCounter->find(eventKey)->second); } - VLOG("metric %s %s->%lld", mMetric.name().c_str(), eventKey.c_str(), + VLOG("metric %s %s->%lld", mName.c_str(), eventKey.c_str(), (long long)(*mCurrentSlicedCounter)[eventKey]); } @@ -254,7 +236,7 @@ void CountMetricProducer::flushIfNeededLocked(const uint64_t& eventTimeNs) { info.mCount = counter.second; auto& bucketList = mPastBuckets[counter.first]; bucketList.push_back(info); - VLOG("metric %s, dump key value: %s -> %lld", mMetric.name().c_str(), counter.first.c_str(), + VLOG("metric %s, dump key value: %s -> %lld", mName.c_str(), counter.first.c_str(), (long long)counter.second); } @@ -267,7 +249,7 @@ void CountMetricProducer::flushIfNeededLocked(const uint64_t& eventTimeNs) { uint64_t numBucketsForward = (eventTimeNs - mCurrentBucketStartTimeNs) / mBucketSizeNs; mCurrentBucketStartTimeNs = mCurrentBucketStartTimeNs + numBucketsForward * mBucketSizeNs; mCurrentBucketNum += numBucketsForward; - VLOG("metric %s: new bucket start time: %lld", mMetric.name().c_str(), + VLOG("metric %s: new bucket start time: %lld", mName.c_str(), (long long)mCurrentBucketStartTimeNs); } diff --git a/cmds/statsd/src/metrics/CountMetricProducer.h b/cmds/statsd/src/metrics/CountMetricProducer.h index 800a2b9d186a..59995d2d845e 100644 --- a/cmds/statsd/src/metrics/CountMetricProducer.h +++ b/cmds/statsd/src/metrics/CountMetricProducer.h @@ -48,8 +48,6 @@ public: virtual ~CountMetricProducer(); - void finish() override; - // TODO: Implement this later. virtual void notifyAppUpgrade(const string& apk, const int uid, const int64_t version) override{}; @@ -60,11 +58,11 @@ protected: void onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) override; + const LogEvent& event) override; private: - // TODO: Pass a timestamp as a parameter in onDumpReport. - std::unique_ptr<std::vector<uint8_t>> onDumpReportLocked() override; + void onDumpReportLocked(const uint64_t dumpTimeNs, + android::util::ProtoOutputStream* protoOutput) override; // Internal interface to handle condition change. void onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) override; @@ -78,11 +76,6 @@ private: // Util function to flush the old packet. void flushIfNeededLocked(const uint64_t& newEventTime); - // Util function to init/reset the proto output stream. - void startNewProtoOutputStreamLocked(long long timestamp); - - const CountMetric mMetric; - // TODO: Add a lock to mPastBuckets. std::unordered_map<HashableDimensionKey, std::vector<CountBucket>> mPastBuckets; diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.cpp b/cmds/statsd/src/metrics/DurationMetricProducer.cpp index cedea301de27..6afbe458305c 100644 --- a/cmds/statsd/src/metrics/DurationMetricProducer.cpp +++ b/cmds/statsd/src/metrics/DurationMetricProducer.cpp @@ -68,8 +68,8 @@ DurationMetricProducer::DurationMetricProducer(const ConfigKey& key, const Durat const sp<ConditionWizard>& wizard, const vector<KeyMatcher>& internalDimension, const uint64_t startTimeNs) - : MetricProducer(key, startTimeNs, conditionIndex, wizard), - mMetric(metric), + : MetricProducer(metric.name(), key, startTimeNs, conditionIndex, wizard), + mAggregationType(metric.aggregation_type()), mStartIndex(startIndex), mStopIndex(stopIndex), mStopAllIndex(stopAllIndex), @@ -93,8 +93,6 @@ DurationMetricProducer::DurationMetricProducer(const ConfigKey& key, const Durat mConditionSliced = true; } - startNewProtoOutputStreamLocked(mStartTimeNs); - VLOG("metric %s created. bucket size %lld start_time: %lld", metric.name().c_str(), (long long)mBucketSizeNs, (long long)mStartTimeNs); } @@ -114,34 +112,22 @@ sp<AnomalyTracker> DurationMetricProducer::createAnomalyTracker(const Alert &ale return new AnomalyTracker(alert, mConfigKey); } -void DurationMetricProducer::startNewProtoOutputStreamLocked(long long startTime) { - mProto = std::make_unique<ProtoOutputStream>(); - mProto->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mMetric.name()); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, startTime); - mProtoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_DURATION_METRICS); -} - unique_ptr<DurationTracker> DurationMetricProducer::createDurationTracker( const HashableDimensionKey& eventKey) const { - switch (mMetric.aggregation_type()) { + switch (mAggregationType) { case DurationMetric_AggregationType_SUM: return make_unique<OringDurationTracker>( - mConfigKey, mMetric.name(), eventKey, mWizard, mConditionTrackerIndex, mNested, + mConfigKey, mName, eventKey, mWizard, mConditionTrackerIndex, mNested, mCurrentBucketStartTimeNs, mBucketSizeNs, mAnomalyTrackers); case DurationMetric_AggregationType_MAX_SPARSE: return make_unique<MaxDurationTracker>( - mConfigKey, mMetric.name(), eventKey, mWizard, mConditionTrackerIndex, mNested, + mConfigKey, mName, eventKey, mWizard, mConditionTrackerIndex, mNested, mCurrentBucketStartTimeNs, mBucketSizeNs, mAnomalyTrackers); } } -void DurationMetricProducer::finish() { - // TODO: write the StatsLogReport to dropbox using - // DropboxWriter. -} - void DurationMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eventTime) { - VLOG("Metric %s onSlicedConditionMayChange", mMetric.name().c_str()); + VLOG("Metric %s onSlicedConditionMayChange", mName.c_str()); flushIfNeededLocked(eventTime); // Now for each of the on-going event, check if the condition has changed for them. for (auto& pair : mCurrentSlicedDuration) { @@ -151,7 +137,7 @@ void DurationMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eve void DurationMetricProducer::onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) { - VLOG("Metric %s onConditionChanged", mMetric.name().c_str()); + VLOG("Metric %s onConditionChanged", mName.c_str()); mCondition = conditionMet; flushIfNeededLocked(eventTime); // TODO: need to populate the condition change time from the event which triggers the condition @@ -161,14 +147,15 @@ void DurationMetricProducer::onConditionChangedLocked(const bool conditionMet, } } -std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReportLocked() { - long long endTime = time(nullptr) * NS_PER_SEC; +void DurationMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, + ProtoOutputStream* protoOutput) { + flushIfNeededLocked(dumpTimeNs); + + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mName); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs); + long long protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_DURATION_METRICS); - // Dump current bucket if it's stale. - // If current bucket is still on-going, don't force dump current bucket. - // In finish(), We can force dump current bucket. - flushIfNeededLocked(endTime); - VLOG("metric %s dump report now...", mMetric.name().c_str()); + VLOG("metric %s dump report now...", mName.c_str()); for (const auto& pair : mPastBuckets) { const HashableDimensionKey& hashableKey = pair.first; @@ -180,49 +167,46 @@ std::unique_ptr<std::vector<uint8_t>> DurationMetricProducer::onDumpReportLocked } long long wrapperToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); + protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); // First fill dimension (KeyValuePairs). for (const auto& kv : it->second) { - long long dimensionToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); - mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); + long long dimensionToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); + protoOutput->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); if (kv.has_value_str()) { - mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); } else if (kv.has_value_int()) { - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); } else if (kv.has_value_bool()) { - mProto->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); + protoOutput->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); } else if (kv.has_value_float()) { - mProto->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); + protoOutput->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); } - mProto->end(dimensionToken); + protoOutput->end(dimensionToken); } // Then fill bucket_info (DurationBucketInfo). for (const auto& bucket : pair.second) { - long long bucketInfoToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, - (long long)bucket.mBucketStartNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, - (long long)bucket.mBucketEndNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_DURATION, (long long)bucket.mDuration); - mProto->end(bucketInfoToken); + long long bucketInfoToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, + (long long)bucket.mBucketStartNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, + (long long)bucket.mBucketEndNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_DURATION, (long long)bucket.mDuration); + protoOutput->end(bucketInfoToken); VLOG("\t bucket [%lld - %lld] duration: %lld", (long long)bucket.mBucketStartNs, (long long)bucket.mBucketEndNs, (long long)bucket.mDuration); } - mProto->end(wrapperToken); + protoOutput->end(wrapperToken); } - mProto->end(mProtoToken); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, - (long long)mCurrentBucketStartTimeNs); - std::unique_ptr<std::vector<uint8_t>> buffer = serializeProtoLocked(); - startNewProtoOutputStreamLocked(endTime); + protoOutput->end(protoToken); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, (long long)dumpTimeNs); mPastBuckets.clear(); - return buffer; + mStartTimeNs = mCurrentBucketStartTimeNs; } void DurationMetricProducer::flushIfNeededLocked(const uint64_t& eventTime) { @@ -252,11 +236,10 @@ bool DurationMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newK // 1. Report the tuple count if the tuple count > soft limit if (mCurrentSlicedDuration.size() > StatsdStats::kDimensionKeySizeSoftLimit - 1) { size_t newTupleCount = mCurrentSlicedDuration.size() + 1; - StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mMetric.name(), - newTupleCount); + StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mName, newTupleCount); // 2. Don't add more tuples, we are above the allowed threshold. Drop the data. if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { - ALOGE("DurationMetric %s dropping data for dimension key %s", mMetric.name().c_str(), + ALOGE("DurationMetric %s dropping data for dimension key %s", mName.c_str(), newKey.c_str()); return true; } @@ -267,7 +250,7 @@ bool DurationMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newK void DurationMetricProducer::onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const map<string, HashableDimensionKey>& conditionKeys, bool condition, - const LogEvent& event, bool scheduledPull) { + const LogEvent& event) { flushIfNeededLocked(event.GetTimestampNs()); if (matcherIndex == mStopAllIndex) { diff --git a/cmds/statsd/src/metrics/DurationMetricProducer.h b/cmds/statsd/src/metrics/DurationMetricProducer.h index 4bf9d1c957cb..e7aca7f42375 100644 --- a/cmds/statsd/src/metrics/DurationMetricProducer.h +++ b/cmds/statsd/src/metrics/DurationMetricProducer.h @@ -47,8 +47,6 @@ public: virtual sp<AnomalyTracker> createAnomalyTracker(const Alert &alert) override; - void finish() override; - // TODO: Implement this later. virtual void notifyAppUpgrade(const string& apk, const int uid, const int64_t version) override{}; @@ -59,11 +57,11 @@ protected: void onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKeys, bool condition, - const LogEvent& event, bool scheduledPull) override; + const LogEvent& event) override; private: - // TODO: Pass a timestamp as a parameter in onDumpReport. - std::unique_ptr<std::vector<uint8_t>> onDumpReportLocked() override; + void onDumpReportLocked(const uint64_t dumpTimeNs, + android::util::ProtoOutputStream* protoOutput) override; // Internal interface to handle condition change. void onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) override; @@ -77,10 +75,7 @@ private: // Util function to flush the old packet. void flushIfNeededLocked(const uint64_t& eventTime); - // Util function to init/reset the proto output stream. - void startNewProtoOutputStreamLocked(long long timestamp); - - const DurationMetric mMetric; + const DurationMetric_AggregationType mAggregationType; // Index of the SimpleAtomMatcher which defines the start. const size_t mStartIndex; diff --git a/cmds/statsd/src/metrics/EventMetricProducer.cpp b/cmds/statsd/src/metrics/EventMetricProducer.cpp index 8bdc9e3bf9fc..4752997d6d15 100644 --- a/cmds/statsd/src/metrics/EventMetricProducer.cpp +++ b/cmds/statsd/src/metrics/EventMetricProducer.cpp @@ -55,14 +55,14 @@ EventMetricProducer::EventMetricProducer(const ConfigKey& key, const EventMetric const int conditionIndex, const sp<ConditionWizard>& wizard, const uint64_t startTimeNs) - : MetricProducer(key, startTimeNs, conditionIndex, wizard), mMetric(metric) { + : MetricProducer(metric.name(), key, startTimeNs, conditionIndex, wizard) { if (metric.links().size() > 0) { mConditionLinks.insert(mConditionLinks.begin(), metric.links().begin(), metric.links().end()); mConditionSliced = true; } - startNewProtoOutputStreamLocked(mStartTimeNs); + startNewProtoOutputStreamLocked(); VLOG("metric %s created. bucket size %lld start_time: %lld", metric.name().c_str(), (long long)mBucketSizeNs, (long long)mStartTimeNs); @@ -72,45 +72,57 @@ EventMetricProducer::~EventMetricProducer() { VLOG("~EventMetricProducer() called"); } -void EventMetricProducer::startNewProtoOutputStreamLocked(long long startTime) { +void EventMetricProducer::startNewProtoOutputStreamLocked() { mProto = std::make_unique<ProtoOutputStream>(); - // TODO: We need to auto-generate the field IDs for StatsLogReport, EventMetricData, - // and StatsEvent. - mProto->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mMetric.name()); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, startTime); - mProtoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_EVENT_METRICS); } -void EventMetricProducer::finish() { +void EventMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eventTime) { } -void EventMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eventTime) { +std::unique_ptr<std::vector<uint8_t>> serializeProtoLocked(ProtoOutputStream& protoOutput) { + size_t bufferSize = protoOutput.size(); + + std::unique_ptr<std::vector<uint8_t>> buffer(new std::vector<uint8_t>(bufferSize)); + + size_t pos = 0; + auto it = protoOutput.data(); + while (it.readBuffer() != NULL) { + size_t toRead = it.currentToRead(); + std::memcpy(&((*buffer)[pos]), it.readBuffer(), toRead); + pos += toRead; + it.rp()->move(toRead); + } + + return buffer; } -std::unique_ptr<std::vector<uint8_t>> EventMetricProducer::onDumpReportLocked() { - long long endTime = time(nullptr) * NS_PER_SEC; - mProto->end(mProtoToken); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, endTime); +void EventMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, + ProtoOutputStream* protoOutput) { + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mName); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, (long long)dumpTimeNs); size_t bufferSize = mProto->size(); - VLOG("metric %s dump report now... proto size: %zu ", mMetric.name().c_str(), bufferSize); - std::unique_ptr<std::vector<uint8_t>> buffer = serializeProtoLocked(); + VLOG("metric %s dump report now... proto size: %zu ", mName.c_str(), bufferSize); + std::unique_ptr<std::vector<uint8_t>> buffer = serializeProtoLocked(*mProto); - startNewProtoOutputStreamLocked(endTime); + protoOutput->write(FIELD_TYPE_MESSAGE | FIELD_ID_EVENT_METRICS, + reinterpret_cast<char*>(buffer.get()->data()), buffer.get()->size()); - return buffer; + startNewProtoOutputStreamLocked(); + mStartTimeNs = dumpTimeNs; } void EventMetricProducer::onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) { - VLOG("Metric %s onConditionChanged", mMetric.name().c_str()); + VLOG("Metric %s onConditionChanged", mName.c_str()); mCondition = conditionMet; } void EventMetricProducer::onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) { + const LogEvent& event) { if (!condition) { return; } diff --git a/cmds/statsd/src/metrics/EventMetricProducer.h b/cmds/statsd/src/metrics/EventMetricProducer.h index da3b3cab49ba..d720ead50bad 100644 --- a/cmds/statsd/src/metrics/EventMetricProducer.h +++ b/cmds/statsd/src/metrics/EventMetricProducer.h @@ -40,8 +40,6 @@ public: virtual ~EventMetricProducer(); - void finish() override; - // TODO: Implement this later. virtual void notifyAppUpgrade(const string& apk, const int uid, const int64_t version) override{}; @@ -49,16 +47,16 @@ public: virtual void notifyAppRemoved(const string& apk, const int uid) override{}; protected: - void startNewProtoOutputStreamLocked(long long timestamp); + void startNewProtoOutputStreamLocked(); private: void onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) override; + const LogEvent& event) override; - // TODO: Pass a timestamp as a parameter in onDumpReport. - std::unique_ptr<std::vector<uint8_t>> onDumpReportLocked() override; + void onDumpReportLocked(const uint64_t dumpTimeNs, + android::util::ProtoOutputStream* protoOutput) override; // Internal interface to handle condition change. void onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) override; @@ -69,7 +67,9 @@ private: // Internal function to calculate the current used bytes. size_t byteSizeLocked() const override; - const EventMetric mMetric; + // Maps to a EventMetricDataWrapper. Storing atom events in ProtoOutputStream + // is more space efficient than storing LogEvent. + std::unique_ptr<android::util::ProtoOutputStream> mProto; }; } // namespace statsd diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp index 1f6bd58b5492..ae9b86fc3c9d 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.cpp +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.cpp @@ -67,8 +67,8 @@ GaugeMetricProducer::GaugeMetricProducer(const ConfigKey& key, const GaugeMetric const int conditionIndex, const sp<ConditionWizard>& wizard, const int pullTagId, const int64_t startTimeNs) - : MetricProducer(key, startTimeNs, conditionIndex, wizard), - mMetric(metric), + : MetricProducer(metric.name(), key, startTimeNs, conditionIndex, wizard), + mGaugeField(metric.gauge_field()), mPullTagId(pullTagId) { if (metric.has_bucket() && metric.bucket().has_bucket_size_millis()) { mBucketSizeNs = metric.bucket().bucket_size_millis() * 1000 * 1000; @@ -91,8 +91,6 @@ GaugeMetricProducer::GaugeMetricProducer(const ConfigKey& key, const GaugeMetric metric.bucket().bucket_size_millis()); } - startNewProtoOutputStreamLocked(mStartTimeNs); - VLOG("metric %s created. bucket size %lld start_time: %lld", metric.name().c_str(), (long long)mBucketSizeNs, (long long)mStartTimeNs); } @@ -104,23 +102,15 @@ GaugeMetricProducer::~GaugeMetricProducer() { } } -void GaugeMetricProducer::startNewProtoOutputStreamLocked(long long startTime) { - mProto = std::make_unique<ProtoOutputStream>(); - mProto->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mMetric.name()); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, startTime); - mProtoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_GAUGE_METRICS); -} - -void GaugeMetricProducer::finish() { -} +void GaugeMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, + ProtoOutputStream* protoOutput) { + VLOG("gauge metric %s dump report now...", mName.c_str()); -std::unique_ptr<std::vector<uint8_t>> GaugeMetricProducer::onDumpReportLocked() { - VLOG("gauge metric %s dump report now...", mMetric.name().c_str()); + flushIfNeededLocked(dumpTimeNs); - // Dump current bucket if it's stale. - // If current bucket is still on-going, don't force dump current bucket. - // In finish(), We can force dump current bucket. - flushIfNeededLocked(time(nullptr) * NS_PER_SEC); + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mName); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs); + long long protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_GAUGE_METRICS); for (const auto& pair : mPastBuckets) { const HashableDimensionKey& hashableKey = pair.first; @@ -132,57 +122,51 @@ std::unique_ptr<std::vector<uint8_t>> GaugeMetricProducer::onDumpReportLocked() VLOG(" dimension key %s", hashableKey.c_str()); long long wrapperToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); + protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); // First fill dimension (KeyValuePairs). for (const auto& kv : it->second) { - long long dimensionToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); - mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); + long long dimensionToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); + protoOutput->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); if (kv.has_value_str()) { - mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); } else if (kv.has_value_int()) { - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); } else if (kv.has_value_bool()) { - mProto->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); + protoOutput->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); } else if (kv.has_value_float()) { - mProto->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); + protoOutput->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); } - mProto->end(dimensionToken); + protoOutput->end(dimensionToken); } // Then fill bucket_info (GaugeBucketInfo). for (const auto& bucket : pair.second) { - long long bucketInfoToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, - (long long)bucket.mBucketStartNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, - (long long)bucket.mBucketEndNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_GAUGE, (long long)bucket.mGauge); - mProto->end(bucketInfoToken); + long long bucketInfoToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, + (long long)bucket.mBucketStartNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, + (long long)bucket.mBucketEndNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_GAUGE, (long long)bucket.mGauge); + protoOutput->end(bucketInfoToken); VLOG("\t bucket [%lld - %lld] count: %lld", (long long)bucket.mBucketStartNs, (long long)bucket.mBucketEndNs, (long long)bucket.mGauge); } - mProto->end(wrapperToken); + protoOutput->end(wrapperToken); } - mProto->end(mProtoToken); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, - (long long)mCurrentBucketStartTimeNs); + protoOutput->end(protoToken); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, (long long)dumpTimeNs); - std::unique_ptr<std::vector<uint8_t>> buffer = serializeProtoLocked(); - - startNewProtoOutputStreamLocked(time(nullptr) * NS_PER_SEC); mPastBuckets.clear(); - - return buffer; - + mStartTimeNs = mCurrentBucketStartTimeNs; // TODO: Clear mDimensionKeyMap once the report is dumped. } void GaugeMetricProducer::onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) { - VLOG("Metric %s onConditionChanged", mMetric.name().c_str()); + VLOG("Metric %s onConditionChanged", mName.c_str()); flushIfNeededLocked(eventTime); mCondition = conditionMet; @@ -203,18 +187,18 @@ void GaugeMetricProducer::onConditionChangedLocked(const bool conditionMet, return; } for (const auto& data : allData) { - onMatchedLogEventLocked(0, *data, false /*scheduledPull*/); + onMatchedLogEventLocked(0, *data); } flushIfNeededLocked(eventTime); } void GaugeMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eventTime) { - VLOG("Metric %s onSlicedConditionMayChange", mMetric.name().c_str()); + VLOG("Metric %s onSlicedConditionMayChange", mName.c_str()); } int64_t GaugeMetricProducer::getGauge(const LogEvent& event) { status_t err = NO_ERROR; - int64_t val = event.GetLong(mMetric.gauge_field(), &err); + int64_t val = event.GetLong(mGaugeField, &err); if (err == NO_ERROR) { return val; } else { @@ -227,7 +211,7 @@ void GaugeMetricProducer::onDataPulled(const std::vector<std::shared_ptr<LogEven std::lock_guard<std::mutex> lock(mMutex); for (const auto& data : allData) { - onMatchedLogEventLocked(0, *data, true /*scheduledPull*/); + onMatchedLogEventLocked(0, *data); } } @@ -238,11 +222,10 @@ bool GaugeMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newKey) // 1. Report the tuple count if the tuple count > soft limit if (mCurrentSlicedBucket->size() > StatsdStats::kDimensionKeySizeSoftLimit - 1) { size_t newTupleCount = mCurrentSlicedBucket->size() + 1; - StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mMetric.name(), - newTupleCount); + StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mName, newTupleCount); // 2. Don't add more tuples, we are above the allowed threshold. Drop the data. if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { - ALOGE("GaugeMetric %s dropping data for dimension key %s", mMetric.name().c_str(), + ALOGE("GaugeMetric %s dropping data for dimension key %s", mName.c_str(), newKey.c_str()); return true; } @@ -254,7 +237,7 @@ bool GaugeMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newKey) void GaugeMetricProducer::onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const map<string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) { + const LogEvent& event) { if (condition == false) { return; } @@ -305,8 +288,8 @@ void GaugeMetricProducer::flushIfNeededLocked(const uint64_t& eventTimeNs) { info.mGauge = slice.second; auto& bucketList = mPastBuckets[slice.first]; bucketList.push_back(info); - VLOG("gauge metric %s, dump key value: %s -> %lld", mMetric.name().c_str(), - slice.first.c_str(), (long long)slice.second); + VLOG("gauge metric %s, dump key value: %s -> %lld", mName.c_str(), slice.first.c_str(), + (long long)slice.second); } // Reset counters @@ -320,7 +303,7 @@ void GaugeMetricProducer::flushIfNeededLocked(const uint64_t& eventTimeNs) { int64_t numBucketsForward = (eventTimeNs - mCurrentBucketStartTimeNs) / mBucketSizeNs; mCurrentBucketStartTimeNs = mCurrentBucketStartTimeNs + numBucketsForward * mBucketSizeNs; mCurrentBucketNum += numBucketsForward; - VLOG("metric %s: new bucket start time: %lld", mMetric.name().c_str(), + VLOG("metric %s: new bucket start time: %lld", mName.c_str(), (long long)mCurrentBucketStartTimeNs); } diff --git a/cmds/statsd/src/metrics/GaugeMetricProducer.h b/cmds/statsd/src/metrics/GaugeMetricProducer.h index 36705b1f3cbe..6e6f2bbdf945 100644 --- a/cmds/statsd/src/metrics/GaugeMetricProducer.h +++ b/cmds/statsd/src/metrics/GaugeMetricProducer.h @@ -56,8 +56,6 @@ public: // Handles when the pulled data arrives. void onDataPulled(const std::vector<std::shared_ptr<LogEvent>>& data) override; - void finish() override; - // TODO: Implement this later. virtual void notifyAppUpgrade(const string& apk, const int uid, const int64_t version) override{}; @@ -68,11 +66,11 @@ protected: void onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) override; + const LogEvent& event) override; private: - // TODO: Pass a timestamp as a parameter in onDumpReport. - std::unique_ptr<std::vector<uint8_t>> onDumpReportLocked() override; + void onDumpReportLocked(const uint64_t dumpTimeNs, + android::util::ProtoOutputStream* protoOutput) override; // Internal interface to handle condition change. void onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) override; @@ -86,13 +84,10 @@ private: // Util function to flush the old packet. void flushIfNeededLocked(const uint64_t& eventTime); - // Util function to init/reset the proto output stream. - void startNewProtoOutputStreamLocked(long long timestamp); - // The default bucket size for gauge metric is 1 second. static const uint64_t kDefaultGaugemBucketSizeNs = 1000 * 1000 * 1000; - const GaugeMetric mMetric; + const int32_t mGaugeField; StatsPullerManager mStatsPullerManager; // tagId for pulled data. -1 if this is not pulled diff --git a/cmds/statsd/src/metrics/MetricProducer.cpp b/cmds/statsd/src/metrics/MetricProducer.cpp index 7e78a8558c4a..f38f3df13d9b 100644 --- a/cmds/statsd/src/metrics/MetricProducer.cpp +++ b/cmds/statsd/src/metrics/MetricProducer.cpp @@ -21,8 +21,7 @@ namespace statsd { using std::map; -void MetricProducer::onMatchedLogEventLocked(const size_t matcherIndex, const LogEvent& event, - bool scheduledPull) { +void MetricProducer::onMatchedLogEventLocked(const size_t matcherIndex, const LogEvent& event) { uint64_t eventTimeNs = event.GetTimestampNs(); // this is old event, maybe statsd restarted? if (eventTimeNs < mStartTimeNs) { @@ -60,25 +59,7 @@ void MetricProducer::onMatchedLogEventLocked(const size_t matcherIndex, const Lo condition = mCondition; } - onMatchedLogEventInternalLocked(matcherIndex, eventKey, conditionKeys, condition, event, - scheduledPull); -} - -std::unique_ptr<std::vector<uint8_t>> MetricProducer::serializeProtoLocked() { - size_t bufferSize = mProto->size(); - - std::unique_ptr<std::vector<uint8_t>> buffer(new std::vector<uint8_t>(bufferSize)); - - size_t pos = 0; - auto it = mProto->data(); - while (it.readBuffer() != NULL) { - size_t toRead = it.currentToRead(); - std::memcpy(&((*buffer)[pos]), it.readBuffer(), toRead); - pos += toRead; - it.rp()->move(toRead); - } - - return buffer; + onMatchedLogEventInternalLocked(matcherIndex, eventKey, conditionKeys, condition, event); } } // namespace statsd diff --git a/cmds/statsd/src/metrics/MetricProducer.h b/cmds/statsd/src/metrics/MetricProducer.h index adeb3cdf258a..d4a2195a798c 100644 --- a/cmds/statsd/src/metrics/MetricProducer.h +++ b/cmds/statsd/src/metrics/MetricProducer.h @@ -38,9 +38,10 @@ namespace statsd { // be a no-op. class MetricProducer : public virtual PackageInfoListener { public: - MetricProducer(const ConfigKey& key, const int64_t startTimeNs, const int conditionIndex, - const sp<ConditionWizard>& wizard) - : mConfigKey(key), + MetricProducer(const std::string& name, const ConfigKey& key, const int64_t startTimeNs, + const int conditionIndex, const sp<ConditionWizard>& wizard) + : mName(name), + mConfigKey(key), mStartTimeNs(startTimeNs), mCurrentBucketStartTimeNs(startTimeNs), mCurrentBucketNum(0), @@ -54,9 +55,9 @@ public: virtual ~MetricProducer(){}; // Consume the parsed stats log entry that already matched the "what" of the metric. - void onMatchedLogEvent(const size_t matcherIndex, const LogEvent& event, bool scheduledPull) { + void onMatchedLogEvent(const size_t matcherIndex, const LogEvent& event) { std::lock_guard<std::mutex> lock(mMutex); - onMatchedLogEventLocked(matcherIndex, event, scheduledPull); + onMatchedLogEventLocked(matcherIndex, event); } void onConditionChanged(const bool condition, const uint64_t eventTime) { @@ -74,16 +75,10 @@ public: return mConditionSliced; }; - // This is called when the metric collecting is done, e.g., when there is a new configuration - // coming. MetricProducer should do the clean up, and dump existing data to dropbox. - virtual void finish() = 0; - - // TODO: Pass a timestamp as a parameter in onDumpReport and update all its - // implementations. - // onDumpReport returns the proto-serialized output and clears the previously stored contents. - std::unique_ptr<std::vector<uint8_t>> onDumpReport() { + // Output the metrics data to [protoOutput]. All metrics reports end with the same timestamp. + void onDumpReport(const uint64_t dumpTimeNs, android::util::ProtoOutputStream* protoOutput) { std::lock_guard<std::mutex> lock(mMutex); - return onDumpReportLocked(); + return onDumpReportLocked(dumpTimeNs, protoOutput); } // Returns the memory in bytes currently used to store this metric's data. Does not change @@ -110,12 +105,16 @@ public: protected: virtual void onConditionChangedLocked(const bool condition, const uint64_t eventTime) = 0; virtual void onSlicedConditionMayChangeLocked(const uint64_t eventTime) = 0; - virtual std::unique_ptr<std::vector<uint8_t>> onDumpReportLocked() = 0; + virtual void onDumpReportLocked(const uint64_t dumpTimeNs, + android::util::ProtoOutputStream* protoOutput) = 0; virtual size_t byteSizeLocked() const = 0; + const std::string mName; + const ConfigKey mConfigKey; - const uint64_t mStartTimeNs; + // The start time for the current in memory metrics data. + uint64_t mStartTimeNs; uint64_t mCurrentBucketStartTimeNs; @@ -159,21 +158,12 @@ protected: virtual void onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) = 0; + const LogEvent& event) = 0; // Consume the parsed stats log entry that already matched the "what" of the metric. - void onMatchedLogEventLocked(const size_t matcherIndex, const LogEvent& event, - bool scheduledPull); - - std::unique_ptr<android::util::ProtoOutputStream> mProto; + void onMatchedLogEventLocked(const size_t matcherIndex, const LogEvent& event); - long long mProtoToken; - - // Read/Write mutex to make the producer thread-safe. - // TODO(yanglu): replace with std::shared_mutex when available in libc++. mutable std::mutex mMutex; - - std::unique_ptr<std::vector<uint8_t>> serializeProtoLocked(); }; } // namespace statsd diff --git a/cmds/statsd/src/metrics/MetricsManager.cpp b/cmds/statsd/src/metrics/MetricsManager.cpp index 9fdc6fa996da..3d0e20c54b71 100644 --- a/cmds/statsd/src/metrics/MetricsManager.cpp +++ b/cmds/statsd/src/metrics/MetricsManager.cpp @@ -27,6 +27,11 @@ #include "stats_util.h" #include <log/logprint.h> + +using android::util::FIELD_COUNT_REPEATED; +using android::util::FIELD_TYPE_MESSAGE; +using android::util::ProtoOutputStream; + using std::make_unique; using std::set; using std::string; @@ -37,17 +42,14 @@ namespace android { namespace os { namespace statsd { +const int FIELD_ID_METRICS = 1; + MetricsManager::MetricsManager(const ConfigKey& key, const StatsdConfig& config) : mConfigKey(key) { mConfigValid = initStatsdConfig(key, config, mTagIds, mAllAtomMatchers, mAllConditionTrackers, mAllMetricProducers, mAllAnomalyTrackers, mConditionToMetricMap, mTrackerToMetricMap, mTrackerToConditionMap); - // TODO: add alert size. - // no matter whether this config is valid, log it in the stats. - StatsdStats::getInstance().noteConfigReceived(key, mAllMetricProducers.size(), - mAllConditionTrackers.size(), - mAllAtomMatchers.size(), 0, mConfigValid); // Guardrail. Reject the config if it's too big. if (mAllMetricProducers.size() > StatsdStats::kMaxMetricCountPerConfig || mAllConditionTrackers.size() > StatsdStats::kMaxConditionCountPerConfig || @@ -55,6 +57,12 @@ MetricsManager::MetricsManager(const ConfigKey& key, const StatsdConfig& config) ALOGE("This config is too big! Reject!"); mConfigValid = false; } + + // TODO: add alert size. + // no matter whether this config is valid, log it in the stats. + StatsdStats::getInstance().noteConfigReceived(key, mAllMetricProducers.size(), + mAllConditionTrackers.size(), + mAllAtomMatchers.size(), 0, mConfigValid); } MetricsManager::~MetricsManager() { @@ -65,21 +73,17 @@ bool MetricsManager::isConfigValid() const { return mConfigValid; } -void MetricsManager::finish() { - for (auto& metricProducer : mAllMetricProducers) { - metricProducer->finish(); - } -} - -vector<std::unique_ptr<vector<uint8_t>>> MetricsManager::onDumpReport() { +void MetricsManager::onDumpReport(ProtoOutputStream* protoOutput) { VLOG("=========================Metric Reports Start=========================="); + uint64_t dumpTimeStampNs = time(nullptr) * NS_PER_SEC; // one StatsLogReport per MetricProduer - vector<std::unique_ptr<vector<uint8_t>>> reportList; for (auto& metric : mAllMetricProducers) { - reportList.push_back(metric->onDumpReport()); + long long token = + protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_METRICS); + metric->onDumpReport(dumpTimeStampNs, protoOutput); + protoOutput->end(token); } VLOG("=========================Metric Reports End=========================="); - return reportList; } // Consume the stats log if it's interesting to this metric. @@ -159,8 +163,7 @@ void MetricsManager::onLogEvent(const LogEvent& event) { auto& metricList = pair->second; for (const int metricIndex : metricList) { // pushed metrics are never scheduled pulls - mAllMetricProducers[metricIndex]->onMatchedLogEvent(i, event, - false /* schedulePull */); + mAllMetricProducers[metricIndex]->onMatchedLogEvent(i, event); } } } diff --git a/cmds/statsd/src/metrics/MetricsManager.h b/cmds/statsd/src/metrics/MetricsManager.h index 86c47333d7e6..34ea667c7b86 100644 --- a/cmds/statsd/src/metrics/MetricsManager.h +++ b/cmds/statsd/src/metrics/MetricsManager.h @@ -43,16 +43,13 @@ public: void onLogEvent(const LogEvent& event); - // Called when everything should wrap up. We are about to finish (e.g., new config comes). - void finish(); - void onAnomalyAlarmFired(const uint64_t timestampNs, unordered_set<sp<const AnomalyAlarm>, SpHash<AnomalyAlarm>>& anomalySet); void setAnomalyMonitor(const sp<AnomalyMonitor>& anomalyMonitor); // Config source owner can call onDumpReport() to get all the metrics collected. - virtual std::vector<std::unique_ptr<std::vector<uint8_t>>> onDumpReport(); + virtual void onDumpReport(android::util::ProtoOutputStream* protoOutput); // Computes the total byte size of all metrics managed by a single config source. // Does not change the state. diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.cpp b/cmds/statsd/src/metrics/ValueMetricProducer.cpp index 977aa88a14d2..9400a1c435eb 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.cpp +++ b/cmds/statsd/src/metrics/ValueMetricProducer.cpp @@ -73,13 +73,13 @@ ValueMetricProducer::ValueMetricProducer(const ConfigKey& key, const ValueMetric const sp<ConditionWizard>& wizard, const int pullTagId, const uint64_t startTimeNs, shared_ptr<StatsPullerManager> statsPullerManager) - : MetricProducer(key, startTimeNs, conditionIndex, wizard), - mMetric(metric), + : MetricProducer(metric.name(), key, startTimeNs, conditionIndex, wizard), + mValueField(metric.value_field()), mStatsPullerManager(statsPullerManager), mPullTagId(pullTagId) { // TODO: valuemetric for pushed events may need unlimited bucket length if (metric.has_bucket() && metric.bucket().has_bucket_size_millis()) { - mBucketSizeNs = mMetric.bucket().bucket_size_millis() * 1000 * 1000; + mBucketSizeNs = metric.bucket().bucket_size_millis() * 1000 * 1000; } else { mBucketSizeNs = kDefaultBucketSizeMillis * 1000 * 1000; } @@ -97,9 +97,6 @@ ValueMetricProducer::ValueMetricProducer(const ConfigKey& key, const ValueMetric mStatsPullerManager->RegisterReceiver(mPullTagId, this, metric.bucket().bucket_size_millis()); } - - startNewProtoOutputStreamLocked(mStartTimeNs); - VLOG("value metric %s created. bucket size %lld start_time: %lld", metric.name().c_str(), (long long)mBucketSizeNs, (long long)mStartTimeNs); } @@ -120,24 +117,17 @@ ValueMetricProducer::~ValueMetricProducer() { } } -void ValueMetricProducer::startNewProtoOutputStreamLocked(long long startTime) { - mProto = std::make_unique<ProtoOutputStream>(); - mProto->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mMetric.name()); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, startTime); - mProtoToken = mProto->start(FIELD_TYPE_MESSAGE | FIELD_ID_VALUE_METRICS); -} - -void ValueMetricProducer::finish() { - // TODO: write the StatsLogReport to dropbox using - // DropboxWriter. -} - void ValueMetricProducer::onSlicedConditionMayChangeLocked(const uint64_t eventTime) { - VLOG("Metric %s onSlicedConditionMayChange", mMetric.name().c_str()); + VLOG("Metric %s onSlicedConditionMayChange", mName.c_str()); } -std::unique_ptr<std::vector<uint8_t>> ValueMetricProducer::onDumpReportLocked() { - VLOG("metric %s dump report now...", mMetric.name().c_str()); +void ValueMetricProducer::onDumpReportLocked(const uint64_t dumpTimeNs, + ProtoOutputStream* protoOutput) { + VLOG("metric %s dump report now...", mName.c_str()); + flushIfNeededLocked(dumpTimeNs); + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_NAME, mName); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_REPORT_NANOS, (long long)mStartTimeNs); + long long protoToken = protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_ID_VALUE_METRICS); for (const auto& pair : mPastBuckets) { const HashableDimensionKey& hashableKey = pair.first; @@ -148,62 +138,63 @@ std::unique_ptr<std::vector<uint8_t>> ValueMetricProducer::onDumpReportLocked() continue; } long long wrapperToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); + protoOutput->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DATA); // First fill dimension (KeyValuePairs). for (const auto& kv : it->second) { - long long dimensionToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); - mProto->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); + long long dimensionToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_DIMENSION); + protoOutput->write(FIELD_TYPE_INT32 | FIELD_ID_KEY, kv.key()); if (kv.has_value_str()) { - mProto->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); + protoOutput->write(FIELD_TYPE_STRING | FIELD_ID_VALUE_STR, kv.value_str()); } else if (kv.has_value_int()) { - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE_INT, kv.value_int()); } else if (kv.has_value_bool()) { - mProto->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); + protoOutput->write(FIELD_TYPE_BOOL | FIELD_ID_VALUE_BOOL, kv.value_bool()); } else if (kv.has_value_float()) { - mProto->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); + protoOutput->write(FIELD_TYPE_FLOAT | FIELD_ID_VALUE_FLOAT, kv.value_float()); } - mProto->end(dimensionToken); + protoOutput->end(dimensionToken); } // Then fill bucket_info (ValueBucketInfo). for (const auto& bucket : pair.second) { - long long bucketInfoToken = - mProto->start(FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, - (long long)bucket.mBucketStartNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, - (long long)bucket.mBucketEndNs); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE, (long long)bucket.mValue); - mProto->end(bucketInfoToken); + long long bucketInfoToken = protoOutput->start( + FIELD_TYPE_MESSAGE | FIELD_COUNT_REPEATED | FIELD_ID_BUCKET_INFO); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_START_BUCKET_NANOS, + (long long)bucket.mBucketStartNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_BUCKET_NANOS, + (long long)bucket.mBucketEndNs); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_VALUE, (long long)bucket.mValue); + protoOutput->end(bucketInfoToken); VLOG("\t bucket [%lld - %lld] count: %lld", (long long)bucket.mBucketStartNs, (long long)bucket.mBucketEndNs, (long long)bucket.mValue); } - mProto->end(wrapperToken); + protoOutput->end(wrapperToken); } - mProto->end(mProtoToken); - mProto->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, - (long long)mCurrentBucketStartTimeNs); + protoOutput->end(protoToken); + protoOutput->write(FIELD_TYPE_INT64 | FIELD_ID_END_REPORT_NANOS, (long long)dumpTimeNs); - VLOG("metric %s dump report now...", mMetric.name().c_str()); - std::unique_ptr<std::vector<uint8_t>> buffer = serializeProtoLocked(); - - startNewProtoOutputStreamLocked(time(nullptr) * NS_PER_SEC); + VLOG("metric %s dump report now...", mName.c_str()); mPastBuckets.clear(); - - return buffer; - + mStartTimeNs = mCurrentBucketStartTimeNs; // TODO: Clear mDimensionKeyMap once the report is dumped. } void ValueMetricProducer::onConditionChangedLocked(const bool condition, const uint64_t eventTime) { mCondition = condition; + if (eventTime < mCurrentBucketStartTimeNs) { + VLOG("Skip event due to late arrival: %lld vs %lld", (long long)eventTime, + (long long)mCurrentBucketStartTimeNs); + return; + } + + flushIfNeededLocked(eventTime); + if (mPullTagId != -1) { if (mCondition == true) { - mStatsPullerManager->RegisterReceiver(mPullTagId, this, - mMetric.bucket().bucket_size_millis()); + mStatsPullerManager->RegisterReceiver(mPullTagId, this, mBucketSizeNs / 1000 / 1000); } else if (mCondition == false) { mStatsPullerManager->UnRegisterReceiver(mPullTagId, this); } @@ -214,9 +205,8 @@ void ValueMetricProducer::onConditionChangedLocked(const bool condition, const u return; } for (const auto& data : allData) { - onMatchedLogEventLocked(0, *data, false); + onMatchedLogEventLocked(0, *data); } - flushIfNeededLocked(eventTime); } return; } @@ -225,19 +215,26 @@ void ValueMetricProducer::onConditionChangedLocked(const bool condition, const u void ValueMetricProducer::onDataPulled(const std::vector<std::shared_ptr<LogEvent>>& allData) { std::lock_guard<std::mutex> lock(mMutex); - if (mCondition == true || !mMetric.has_condition()) { + if (mCondition == true || mConditionTrackerIndex < 0) { if (allData.size() == 0) { return; } - uint64_t eventTime = allData.at(0)->GetTimestampNs(); - // alarm is not accurate and might drift. - if (eventTime > mCurrentBucketStartTimeNs + mBucketSizeNs * 3 / 2) { - flushIfNeededLocked(eventTime); + // For scheduled pulled data, the effective event time is snap to the nearest + // bucket boundary to make bucket finalize. + uint64_t realEventTime = allData.at(0)->GetTimestampNs(); + uint64_t eventTime = mStartTimeNs + ((realEventTime - mStartTimeNs)/mBucketSizeNs) * mBucketSizeNs; + + mCondition = false; + for (const auto& data : allData) { + data->setTimestampNs(eventTime-1); + onMatchedLogEventLocked(0, *data); } + + mCondition = true; for (const auto& data : allData) { - onMatchedLogEventLocked(0, *data, true); + data->setTimestampNs(eventTime); + onMatchedLogEventLocked(0, *data); } - flushIfNeededLocked(eventTime); } } @@ -249,11 +246,10 @@ bool ValueMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newKey) } if (mCurrentSlicedBucket.size() > StatsdStats::kDimensionKeySizeSoftLimit - 1) { size_t newTupleCount = mCurrentSlicedBucket.size() + 1; - StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mMetric.name(), - newTupleCount); + StatsdStats::getInstance().noteMetricDimensionSize(mConfigKey, mName, newTupleCount); // 2. Don't add more tuples, we are above the allowed threshold. Drop the data. if (newTupleCount > StatsdStats::kDimensionKeySizeHardLimit) { - ALOGE("ValueMetric %s dropping data for dimension key %s", mMetric.name().c_str(), + ALOGE("ValueMetric %s dropping data for dimension key %s", mName.c_str(), newKey.c_str()); return true; } @@ -265,7 +261,7 @@ bool ValueMetricProducer::hitGuardRailLocked(const HashableDimensionKey& newKey) void ValueMetricProducer::onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const map<string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) { + const LogEvent& event) { uint64_t eventTimeNs = event.GetTimestampNs(); if (eventTimeNs < mCurrentBucketStartTimeNs) { VLOG("Skip event due to late arrival: %lld vs %lld", (long long)eventTimeNs, @@ -273,6 +269,8 @@ void ValueMetricProducer::onMatchedLogEventInternalLocked( return; } + flushIfNeededLocked(eventTimeNs); + if (hitGuardRailLocked(eventKey)) { return; } @@ -280,42 +278,27 @@ void ValueMetricProducer::onMatchedLogEventInternalLocked( long value = get_value(event); - if (mPullTagId != -1) { - if (scheduledPull) { - // scheduled pull always sets beginning of current bucket and end - // of next bucket - if (interval.raw.size() > 0) { - interval.raw.back().second = value; - } else { - interval.raw.push_back(make_pair(value, value)); - } - Interval& nextInterval = mNextSlicedBucket[eventKey]; - if (nextInterval.raw.size() == 0) { - nextInterval.raw.push_back(make_pair(value, 0)); - } else { - nextInterval.raw.front().first = value; - } + if (mPullTagId != -1) { // for pulled events + if (mCondition == true) { + interval.start = value; + interval.startUpdated = true; } else { - if (mCondition == true) { - interval.raw.push_back(make_pair(value, 0)); + if (interval.startUpdated) { + interval.sum += (value - interval.start); + interval.startUpdated = false; } else { - if (interval.raw.size() != 0) { - interval.raw.back().second = value; - } else { - interval.tainted = true; - VLOG("Data on condition true missing!"); - } + VLOG("No start for matching end %ld", value); + interval.tainted += 1; } } - } else { - flushIfNeededLocked(eventTimeNs); - interval.raw.push_back(make_pair(value, 0)); + } else { // for pushed events + interval.sum += value; } } long ValueMetricProducer::get_value(const LogEvent& event) { status_t err = NO_ERROR; - long val = event.GetLong(mMetric.value_field(), &err); + long val = event.GetLong(mValueField, &err); if (err == NO_ERROR) { return val; } else { @@ -339,27 +322,16 @@ void ValueMetricProducer::flushIfNeededLocked(const uint64_t& eventTimeNs) { int tainted = 0; for (const auto& slice : mCurrentSlicedBucket) { - long value = 0; - if (mPullTagId != -1) { - for (const auto& pair : slice.second.raw) { - value += (pair.second - pair.first); - } - } else { - for (const auto& pair : slice.second.raw) { - value += pair.first; - } - } tainted += slice.second.tainted; - info.mValue = value; - VLOG(" %s, %ld, %d", slice.first.c_str(), value, tainted); + info.mValue = slice.second.sum; // it will auto create new vector of ValuebucketInfo if the key is not found. auto& bucketList = mPastBuckets[slice.first]; bucketList.push_back(info); } + VLOG("%d tainted pairs in the bucket", tainted); // Reset counters - mCurrentSlicedBucket.swap(mNextSlicedBucket); - mNextSlicedBucket.clear(); + mCurrentSlicedBucket.clear(); int64_t numBucketsForward = (eventTimeNs - mCurrentBucketStartTimeNs) / mBucketSizeNs; mCurrentBucketStartTimeNs = mCurrentBucketStartTimeNs + numBucketsForward * mBucketSizeNs; @@ -368,7 +340,7 @@ void ValueMetricProducer::flushIfNeededLocked(const uint64_t& eventTimeNs) { if (numBucketsForward > 1) { VLOG("Skipping forward %lld buckets", (long long)numBucketsForward); } - VLOG("metric %s: new bucket start time: %lld", mMetric.name().c_str(), + VLOG("metric %s: new bucket start time: %lld", mName.c_str(), (long long)mCurrentBucketStartTimeNs); } diff --git a/cmds/statsd/src/metrics/ValueMetricProducer.h b/cmds/statsd/src/metrics/ValueMetricProducer.h index a2efd3fa976b..62e5d52b2b11 100644 --- a/cmds/statsd/src/metrics/ValueMetricProducer.h +++ b/cmds/statsd/src/metrics/ValueMetricProducer.h @@ -44,8 +44,6 @@ public: virtual ~ValueMetricProducer(); - void finish() override; - void onDataPulled(const std::vector<std::shared_ptr<LogEvent>>& data) override; // TODO: Implement this later. @@ -58,11 +56,11 @@ protected: void onMatchedLogEventInternalLocked( const size_t matcherIndex, const HashableDimensionKey& eventKey, const std::map<std::string, HashableDimensionKey>& conditionKey, bool condition, - const LogEvent& event, bool scheduledPull) override; + const LogEvent& event) override; private: - // TODO: Pass a timestamp as a parameter in onDumpReport. - std::unique_ptr<std::vector<uint8_t>> onDumpReportLocked() override; + void onDumpReportLocked(const uint64_t dumpTimeNs, + android::util::ProtoOutputStream* protoOutput) override; // Internal interface to handle condition change. void onConditionChangedLocked(const bool conditionMet, const uint64_t eventTime) override; @@ -76,10 +74,7 @@ private: // Util function to flush the old packet. void flushIfNeededLocked(const uint64_t& eventTime); - // Util function to init/reset the proto output stream. - void startNewProtoOutputStreamLocked(long long timestamp); - - const ValueMetric mMetric; + const int32_t mValueField; std::shared_ptr<StatsPullerManager> mStatsPullerManager; @@ -94,14 +89,19 @@ private: // internal state of a bucket. typedef struct { - std::vector<std::pair<long, long>> raw; - bool tainted; + // Pulled data always come in pair of <start, end>. This holds the value + // for start. The diff (end - start) is added to sum. + long start; + // Whether the start data point is updated + bool startUpdated; + // If end data point comes before the start, record this pair as tainted + // and the value is not added to the running sum. + int tainted; + // Running sum of known pairs in this bucket + long sum; } Interval; std::unordered_map<HashableDimensionKey, Interval> mCurrentSlicedBucket; - // If condition is true and pulling on schedule, the previous bucket value needs to be carried - // over to the next bucket. - std::unordered_map<HashableDimensionKey, Interval> mNextSlicedBucket; // Save the past buckets and we can clear when the StatsLogReport is dumped. // TODO: Add a lock to mPastBuckets. diff --git a/cmds/statsd/src/stats_log.proto b/cmds/statsd/src/stats_log.proto index f8b91fe0ef0a..20d9d5c15f1b 100644 --- a/cmds/statsd/src/stats_log.proto +++ b/cmds/statsd/src/stats_log.proto @@ -22,7 +22,7 @@ package android.os.statsd; option java_package = "com.android.os"; option java_outer_classname = "StatsLog"; -import "frameworks/base/cmds/statsd/src/atoms_copy.proto"; +import "frameworks/base/cmds/statsd/src/atoms.proto"; message KeyValuePair { optional int32 key = 1; @@ -195,7 +195,7 @@ message StatsdStatsReport { message AlertStats { optional string name = 1; - optional int32 declared_times = 2; + optional int32 alerted_times = 2; } message ConfigStats { diff --git a/cmds/statsd/src/stats_util.cpp b/cmds/statsd/src/stats_util.cpp index fcce2ff3b36e..bfa3254d5519 100644 --- a/cmds/statsd/src/stats_util.cpp +++ b/cmds/statsd/src/stats_util.cpp @@ -15,119 +15,11 @@ */ #include "stats_util.h" -#include <log/log_event_list.h> namespace android { namespace os { namespace statsd { -static inline uint32_t get4LE(const char* src) { - return src[0] | (src[1] << 8) | (src[2] << 16) | (src[3] << 24); -} - -int getTagId(log_msg msg) { - return get4LE(msg.msg()); -} - -EventMetricData parse(log_msg msg) { - // dump all statsd logs to dropbox for now. - // TODO: Add filtering, aggregation, etc. - EventMetricData eventMetricData; - - // set tag. - int tag = getTagId(msg); - // TODO: Replace the following line when we can serialize on the fly. - // eventMetricData.set_tag(tag); - - // set timestamp of the event. - eventMetricData.set_timestamp_nanos(msg.entry_v1.sec * NS_PER_SEC + msg.entry_v1.nsec); - - // start iterating k,v pairs. - android_log_context context = - create_android_log_parser(const_cast<log_msg*>(&msg)->msg() + sizeof(uint32_t), - const_cast<log_msg*>(&msg)->len() - sizeof(uint32_t)); - android_log_list_element elem; - - if (context) { - memset(&elem, 0, sizeof(elem)); - size_t index = 0; - int32_t key = -1; - - do { - elem = android_log_read_next(context); - switch ((int)elem.type) { - case EVENT_TYPE_INT: - if (index % 2 == 0) { - key = elem.data.int32; - } else { - // TODO: Fix the following lines when we can serialize on the fly. - /* - int32_t val = elem.data.int32; - KeyValuePair* keyValuePair = eventMetricData.add_key_value_pair(); - keyValuePair->set_key(key); - keyValuePair->set_value_int(val); - */ - } - index++; - break; - case EVENT_TYPE_FLOAT: - if (index % 2 == 1) { - // TODO: Fix the following lines when we can serialize on the fly. - /* - float val = elem.data.float32; - KeyValuePair* keyValuePair = eventMetricData.add_key_value_pair(); - keyValuePair->set_key(key); - keyValuePair->set_value_float(val); - */ - } - index++; - break; - case EVENT_TYPE_STRING: - if (index % 2 == 1) { - // TODO: Fix the following lines when we can serialize on the fly. - /* - char* val = elem.data.string; - KeyValuePair* keyValuePair = eventMetricData.add_key_value_pair(); - keyValuePair->set_key(key); - keyValuePair->set_value_str(val); - */ - } - index++; - break; - case EVENT_TYPE_LONG: - if (index % 2 == 1) { - // TODO: Fix the following lines when we can serialize on the fly. - /* - int64_t val = elem.data.int64; - KeyValuePair* keyValuePair = eventMetricData.add_key_value_pair(); - keyValuePair->set_key(key); - keyValuePair->set_value_int(val); - */ - } - index++; - break; - case EVENT_TYPE_LIST: - break; - case EVENT_TYPE_LIST_STOP: - break; - case EVENT_TYPE_UNKNOWN: - break; - default: - elem.complete = true; - break; - } - - if (elem.complete) { - break; - } - } while ((elem.type != EVENT_TYPE_UNKNOWN) && !elem.complete); - - android_log_destroy(&context); - } - - return eventMetricData; -} - // There is no existing hash function for the dimension key ("repeated KeyValuePair"). // Temporarily use a string concatenation as the hashable key. // TODO: Find a better hash function for std::vector<KeyValuePair>. diff --git a/cmds/statsd/src/stats_util.h b/cmds/statsd/src/stats_util.h index b7d8f97afaae..594561d3d294 100644 --- a/cmds/statsd/src/stats_util.h +++ b/cmds/statsd/src/stats_util.h @@ -16,11 +16,7 @@ #pragma once -#include "logd/LogReader.h" -#include "storage/DropboxWriter.h" - -#include <log/logprint.h> -#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" +#include "frameworks/base/cmds/statsd/src/stats_log.pb.h" #include <unordered_map> @@ -29,7 +25,6 @@ namespace os { namespace statsd { #define DEFAULT_DIMENSION_KEY "" -#define MATCHER_NOT_FOUND -2 typedef std::string HashableDimensionKey; @@ -37,10 +32,6 @@ typedef std::map<std::string, HashableDimensionKey> ConditionKey; typedef std::unordered_map<HashableDimensionKey, int64_t> DimToValMap; -EventMetricData parse(log_msg msg); - -int getTagId(log_msg msg); - std::string getHashableKey(std::vector<KeyValuePair> key); } // namespace statsd diff --git a/cmds/statsd/src/storage/DropboxReader.cpp b/cmds/statsd/src/storage/DropboxReader.cpp deleted file mode 100644 index c561959f8edd..000000000000 --- a/cmds/statsd/src/storage/DropboxReader.cpp +++ /dev/null @@ -1,120 +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. - */ -#include <android-base/file.h> -#include <android/os/DropBoxManager.h> -#include <androidfw/ZipUtils.h> - -#include "storage/DropboxReader.h" - -using android::base::unique_fd; -using android::binder::Status; -using android::os::DropBoxManager; -using android::sp; -using android::String16; -using android::ZipUtils; -using std::vector; - -namespace android { -namespace os { -namespace statsd { - -status_t DropboxReader::readStatsLogs(FILE* out, const string& tag, long msec) { - sp<DropBoxManager> dropbox = new DropBoxManager(); - StatsLogReport logReport; - - long timestamp = msec; - // instead of while(true), put a hard limit 1000. Dropbox won't have more than 1000 files. - for (int i = 0; i < 1000; i++) { - DropBoxManager::Entry entry; - Status status = dropbox->getNextEntry(String16(tag.c_str()), timestamp, &entry); - if (!status.isOk()) { - ALOGD("No more entries, or failed to read. We can't tell unfortunately."); - return android::OK; - } - - const unique_fd& fd = entry.getFd(); - - // use this timestamp for next query. - timestamp = entry.getTimestamp(); - - if (entry.getFlags() & DropBoxManager::IS_GZIPPED) { - if (!parseFromGzipFile(fd, logReport)) { - // Failed to parse from the file. Continue to fetch the next entry. - continue; - } - } else { - if (!parseFromFile(fd, logReport)) { - // Failed to parse from the file. Continue to fetch the next entry. - continue; - } - } - - printLog(out, logReport); - } - return android::OK; -} - -bool DropboxReader::parseFromGzipFile(const unique_fd& fd, StatsLogReport& logReport) { - FILE* file = fdopen(fd, "r"); - bool result = false; - bool scanResult; - int method; - long compressedLen; - long uncompressedLen; - unsigned long crc32; - scanResult = ZipUtils::examineGzip(file, &method, &uncompressedLen, &compressedLen, &crc32); - if (scanResult && method == kCompressDeflated) { - vector<uint8_t> buf(uncompressedLen); - if (ZipUtils::inflateToBuffer(file, &buf[0], uncompressedLen, compressedLen)) { - if (logReport.ParseFromArray(&buf[0], uncompressedLen)) { - result = true; - } - } - } else { - ALOGE("This isn't a valid deflated gzip file"); - } - fclose(file); - return result; -} - -// parse a non zipped file. -bool DropboxReader::parseFromFile(const unique_fd& fd, StatsLogReport& logReport) { - string content; - if (!android::base::ReadFdToString(fd, &content)) { - ALOGE("Failed to read file"); - return false; - } - if (!logReport.ParseFromString(content)) { - ALOGE("failed to parse log entry from data"); - return false; - } - return true; -} - -void DropboxReader::printLog(FILE* out, const StatsLogReport& logReport) { - fprintf(out, "start_time_ns=%lld, end_time_ns=%lld, ", logReport.start_report_nanos(), - logReport.end_report_nanos()); - for (int i = 0; i < logReport.event_metrics().data_size(); i++) { - EventMetricData eventMetricData = logReport.event_metrics().data(i); - // TODO: Pretty-print the proto. - // fprintf(out, "EventMetricData=%s", eventMetricData.SerializeAsString().c_str()); - } - fprintf(out, "\n"); -} - -} // namespace statsd -} // namespace os -} // namespace android diff --git a/cmds/statsd/src/storage/DropboxReader.h b/cmds/statsd/src/storage/DropboxReader.h deleted file mode 100644 index a5a28d9113da..000000000000 --- a/cmds/statsd/src/storage/DropboxReader.h +++ /dev/null @@ -1,52 +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. - */ - -#ifndef DROPBOX_READER_H -#define DROPBOX_READER_H - -#include <frameworks/base/cmds/statsd/src/stats_log.pb.h> - -#include <stdint.h> -#include <stdio.h> - -using android::base::unique_fd; -using android::status_t; -using std::string; - -namespace android { -namespace os { -namespace statsd { - -class DropboxReader { -public: - // msec is the start timestamp. - static status_t readStatsLogs(FILE* out, const string& tag, long msec); - -private: - static bool parseFromFile(const unique_fd& fd, StatsLogReport& logReport); - static bool parseFromGzipFile(const unique_fd& fd, StatsLogReport& logReport); - static void printLog(FILE* out, const StatsLogReport& logReport); - enum { - kCompressStored = 0, // no compression - kCompressDeflated = 8, // standard deflate - }; -}; - -} // namespace statsd -} // namespace os -} // namespace android - -#endif // DROPBOX_READER_H diff --git a/cmds/statsd/src/storage/DropboxWriter.cpp b/cmds/statsd/src/storage/DropboxWriter.cpp deleted file mode 100644 index e59bdbd1eb21..000000000000 --- a/cmds/statsd/src/storage/DropboxWriter.cpp +++ /dev/null @@ -1,64 +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. - */ - -#include <android/os/DropBoxManager.h> - -#include "storage/DropboxWriter.h" - -using android::binder::Status; -using android::os::DropBoxManager; -using android::sp; -using android::String16; -using std::vector; - -namespace android { -namespace os { -namespace statsd { - -DropboxWriter::DropboxWriter(const string& tag) : mTag(tag), mLogReport(), mBufferSize(0) { -} - -void DropboxWriter::addEventMetricData(const EventMetricData& eventMetricData) { - flushIfNecessary(eventMetricData); - EventMetricData* newEntry = mLogReport.mutable_event_metrics()->add_data(); - newEntry->CopyFrom(eventMetricData); - mBufferSize += eventMetricData.ByteSize(); -} - -void DropboxWriter::flushIfNecessary(const EventMetricData& eventMetricData) { - if (eventMetricData.ByteSize() + mBufferSize > kMaxSerializedBytes) { - flush(); - } -} - -void DropboxWriter::flush() { - // now we get an exact byte size of the output - const int numBytes = mLogReport.ByteSize(); - vector<uint8_t> buffer(numBytes); - sp<DropBoxManager> dropbox = new DropBoxManager(); - mLogReport.SerializeToArray(&buffer[0], numBytes); - Status status = dropbox->addData(String16(mTag.c_str()), &buffer[0], numBytes, 0 /* no flag */); - if (!status.isOk()) { - ALOGE("failed to write to dropbox"); - // TODO: What to do if flush fails?? - } - mLogReport.Clear(); - mBufferSize = 0; -} - -} // namespace statsd -} // namespace os -} // namespace android diff --git a/cmds/statsd/src/storage/DropboxWriter.h b/cmds/statsd/src/storage/DropboxWriter.h deleted file mode 100644 index d72f1032744a..000000000000 --- a/cmds/statsd/src/storage/DropboxWriter.h +++ /dev/null @@ -1,72 +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. - */ - -#ifndef DROPBOX_WRITER_H -#define DROPBOX_WRITER_H - -#include <utils/RefBase.h> -#include "frameworks/base/cmds/statsd/src/stats_log.pb.h" - -using std::string; - -namespace android { -namespace os { -namespace statsd { - -class DropboxWriter : public virtual RefBase { -public: - /* tag will be part of the file name, and used as the key to build the file index inside - DropBoxManagerService. - */ - DropboxWriter(const string& tag); - - void addEventMetricData(const EventMetricData& eventMetricData); - - /* Request a flush to dropbox. */ - void flush(); - -private: - /* Max *serialized* size of the logs kept in memory before flushing to dropbox. - Proto lite does not implement the SpaceUsed() function which gives the in memory byte size. - So we cap memory usage by limiting the serialized size. Note that protobuf's in memory size - is higher than its serialized size. DropboxManager will compress the file when the data is - larger than 4KB. So the final file size is less than this number. - */ - static const size_t kMaxSerializedBytes = 16 * 1024; - - const string mTag; - - /* Data that was captured for a single metric over a given interval of time. */ - StatsLogReport mLogReport; - - /* Current *serialized* size of the logs kept in memory. - To save computation, we will not calculate the size of the StatsLogReport every time when a - new entry is added, which would recursively call ByteSize() on every log entry. Instead, we - keep the sum of all individual stats log entry sizes. The size of a proto is approximately - the sum of the size of all member protos. - */ - size_t mBufferSize = 0; - - /* Check if the buffer size exceeds the max buffer size when the new entry is added, and flush - the logs to dropbox if true. */ - void flushIfNecessary(const EventMetricData& eventMetricData); -}; - -} // namespace statsd -} // namespace os -} // namespace android - -#endif // DROPBOX_WRITER_H diff --git a/cmds/statsd/src/storage/StorageManager.cpp b/cmds/statsd/src/storage/StorageManager.cpp index 3a4dfdaaf54d..9919abf7532a 100644 --- a/cmds/statsd/src/storage/StorageManager.cpp +++ b/cmds/statsd/src/storage/StorageManager.cpp @@ -23,13 +23,14 @@ #include <android-base/file.h> #include <dirent.h> -using android::util::FIELD_COUNT_REPEATED; -using android::util::FIELD_TYPE_MESSAGE; - namespace android { namespace os { namespace statsd { +using android::util::FIELD_COUNT_REPEATED; +using android::util::FIELD_TYPE_MESSAGE; +using std::map; + #define STATS_SERVICE_DIR "/data/misc/stats-service" // for ConfigMetricsReportList @@ -170,7 +171,7 @@ void StorageManager::appendConfigMetricsReport(const char* path, ProtoOutputStre } } -void StorageManager::readConfigFromDisk(unordered_map<ConfigKey, StatsdConfig>& configsMap) { +void StorageManager::readConfigFromDisk(map<ConfigKey, StatsdConfig>& configsMap) { unique_ptr<DIR, decltype(&closedir)> dir(opendir(STATS_SERVICE_DIR), closedir); if (dir == NULL) { VLOG("no default config on disk"); diff --git a/cmds/statsd/src/storage/StorageManager.h b/cmds/statsd/src/storage/StorageManager.h index 4c9abe58dbea..caf5b8b42887 100644 --- a/cmds/statsd/src/storage/StorageManager.h +++ b/cmds/statsd/src/storage/StorageManager.h @@ -66,7 +66,7 @@ public: /** * Call to load the saved configs from disk. */ - static void readConfigFromDisk(unordered_map<ConfigKey, StatsdConfig>& configsMap); + static void readConfigFromDisk(std::map<ConfigKey, StatsdConfig>& configsMap); }; } // namespace statsd diff --git a/cmds/statsd/tests/StatsLogProcessor_test.cpp b/cmds/statsd/tests/StatsLogProcessor_test.cpp index ff04d955ecd0..aff06ba02b34 100644 --- a/cmds/statsd/tests/StatsLogProcessor_test.cpp +++ b/cmds/statsd/tests/StatsLogProcessor_test.cpp @@ -32,6 +32,8 @@ namespace android { namespace os { namespace statsd { +using android::util::ProtoOutputStream; + #ifdef __ANDROID__ /** @@ -43,7 +45,7 @@ public: } MOCK_METHOD0(byteSize, size_t()); - MOCK_METHOD0(onDumpReport, std::vector<std::unique_ptr<std::vector<uint8_t>>>()); + MOCK_METHOD1(onDumpReport, void(ProtoOutputStream* output)); }; TEST(StatsLogProcessorTest, TestRateLimitByteSize) { @@ -101,7 +103,7 @@ TEST(StatsLogProcessorTest, TestDropWhenByteSizeTooLarge) { .Times(1) .WillRepeatedly(Return(int(StatsdStats::kMaxMetricsBytesPerConfig * 1.2))); - EXPECT_CALL(mockMetricsManager, onDumpReport()).Times(1); + EXPECT_CALL(mockMetricsManager, onDumpReport(_)).Times(1); // Expect to call the onDumpReport and skip the broadcast. p.flushIfNecessary(1, key, mockMetricsManager); @@ -114,4 +116,4 @@ GTEST_LOG_(INFO) << "This test does nothing.\n"; } // namespace statsd } // namespace os -} // namespace android
\ No newline at end of file +} // namespace android diff --git a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp index 9fed4f8b5e30..312de1b16664 100644 --- a/cmds/statsd/tests/guardrail/StatsdStats_test.cpp +++ b/cmds/statsd/tests/guardrail/StatsdStats_test.cpp @@ -163,9 +163,9 @@ TEST(StatsdStatsTest, TestSubStats) { EXPECT_EQ(2, configReport.alert_stats_size()); bool alert1first = !configReport.alert_stats(0).name().compare("alert1"); EXPECT_EQ("alert1", configReport.alert_stats(alert1first ? 0 : 1).name()); - EXPECT_EQ(2, configReport.alert_stats(alert1first ? 0 : 1).declared_times()); + EXPECT_EQ(2, configReport.alert_stats(alert1first ? 0 : 1).alerted_times()); EXPECT_EQ("alert2", configReport.alert_stats(alert1first ? 1 : 0).name()); - EXPECT_EQ(1, configReport.alert_stats(alert1first ? 1 : 0).declared_times()); + EXPECT_EQ(1, configReport.alert_stats(alert1first ? 1 : 0).alerted_times()); EXPECT_EQ(1, configReport.condition_stats_size()); EXPECT_EQ("condition1", configReport.condition_stats(0).name()); @@ -201,7 +201,7 @@ TEST(StatsdStatsTest, TestSubStats) { EXPECT_EQ(1, configReport2.alert_stats_size()); EXPECT_EQ("alert99", configReport2.alert_stats(0).name()); - EXPECT_EQ(1, configReport2.alert_stats(0).declared_times()); + EXPECT_EQ(1, configReport2.alert_stats(0).alerted_times()); } TEST(StatsdStatsTest, TestAtomLog) { diff --git a/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp b/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp index d973ba1676a9..51eabd5387c1 100644 --- a/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/CountMetricProducer_test.cpp @@ -54,8 +54,8 @@ TEST(CountMetricProducerTest, TestNonDimensionalEvents) { bucketStartTimeNs); // 2 events in bucket 1. - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event1, false); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event2, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event1); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event2); // Flushes at event #2. countProducer.flushIfNeededLocked(bucketStartTimeNs + 2); @@ -74,7 +74,7 @@ TEST(CountMetricProducerTest, TestNonDimensionalEvents) { // 1 matched event happens in bucket 2. LogEvent event3(tagId, bucketStartTimeNs + bucketSizeNs + 2); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event3, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event3); countProducer.flushIfNeededLocked(bucketStartTimeNs + 2 * bucketSizeNs + 1); EXPECT_EQ(1UL, countProducer.mPastBuckets.size()); EXPECT_TRUE(countProducer.mPastBuckets.find(DEFAULT_DIMENSION_KEY) != @@ -111,12 +111,12 @@ TEST(CountMetricProducerTest, TestEventsWithNonSlicedCondition) { CountMetricProducer countProducer(kConfigKey, metric, 1, wizard, bucketStartTimeNs); countProducer.onConditionChanged(true, bucketStartTimeNs); - countProducer.onMatchedLogEvent(1 /*matcher index*/, event1, false /*pulled*/); + countProducer.onMatchedLogEvent(1 /*matcher index*/, event1); EXPECT_EQ(0UL, countProducer.mPastBuckets.size()); countProducer.onConditionChanged(false /*new condition*/, bucketStartTimeNs + 2); // Upon this match event, the matched event1 is flushed. - countProducer.onMatchedLogEvent(1 /*matcher index*/, event2, false /*pulled*/); + countProducer.onMatchedLogEvent(1 /*matcher index*/, event2); EXPECT_EQ(0UL, countProducer.mPastBuckets.size()); countProducer.flushIfNeededLocked(bucketStartTimeNs + bucketSizeNs + 1); @@ -166,11 +166,11 @@ TEST(CountMetricProducerTest, TestEventsWithSlicedCondition) { CountMetricProducer countProducer(kConfigKey, metric, 1 /*condition tracker index*/, wizard, bucketStartTimeNs); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event1, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event1); countProducer.flushIfNeededLocked(bucketStartTimeNs + 1); EXPECT_EQ(0UL, countProducer.mPastBuckets.size()); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event2, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event2); countProducer.flushIfNeededLocked(bucketStartTimeNs + bucketSizeNs + 1); EXPECT_EQ(1UL, countProducer.mPastBuckets.size()); EXPECT_TRUE(countProducer.mPastBuckets.find(DEFAULT_DIMENSION_KEY) != @@ -217,29 +217,29 @@ TEST(CountMetricProducerTest, TestAnomalyDetection) { LogEvent event7(tagId, bucketStartTimeNs + 3 * bucketSizeNs + 3 + NS_PER_SEC); // Two events in bucket #0. - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event1, false); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event2, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event1); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event2); EXPECT_EQ(1UL, countProducer.mCurrentSlicedCounter->size()); EXPECT_EQ(2L, countProducer.mCurrentSlicedCounter->begin()->second); EXPECT_EQ(anomalyTracker->getLastAlarmTimestampNs(), -1LL); // One event in bucket #2. No alarm as bucket #0 is trashed out. - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event3, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event3); EXPECT_EQ(1UL, countProducer.mCurrentSlicedCounter->size()); EXPECT_EQ(1L, countProducer.mCurrentSlicedCounter->begin()->second); EXPECT_EQ(anomalyTracker->getLastAlarmTimestampNs(), -1LL); // Two events in bucket #3. - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event4, false); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event5, false); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event6, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event4); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event5); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event6); EXPECT_EQ(1UL, countProducer.mCurrentSlicedCounter->size()); EXPECT_EQ(3L, countProducer.mCurrentSlicedCounter->begin()->second); // Anomaly at event 6 is within refractory period. The alarm is at event 5 timestamp not event 6 EXPECT_EQ(anomalyTracker->getLastAlarmTimestampNs(), (long long)event5.GetTimestampNs()); - countProducer.onMatchedLogEvent(1 /*log matcher index*/, event7, false); + countProducer.onMatchedLogEvent(1 /*log matcher index*/, event7); EXPECT_EQ(1UL, countProducer.mCurrentSlicedCounter->size()); EXPECT_EQ(4L, countProducer.mCurrentSlicedCounter->begin()->second); EXPECT_EQ(anomalyTracker->getLastAlarmTimestampNs(), (long long)event7.GetTimestampNs()); diff --git a/cmds/statsd/tests/metrics/DurationMetricProducer_test.cpp b/cmds/statsd/tests/metrics/DurationMetricProducer_test.cpp index 3158c2757263..58a4ac6afd51 100644 --- a/cmds/statsd/tests/metrics/DurationMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/DurationMetricProducer_test.cpp @@ -56,8 +56,8 @@ TEST(DurationMetricTrackerTest, TestNoCondition) { kConfigKey, metric, -1 /*no condition*/, 1 /* start index */, 2 /* stop index */, 3 /* stop_all index */, false /*nesting*/, wizard, {}, bucketStartTimeNs); - durationProducer.onMatchedLogEvent(1 /* start index*/, event1, false /* scheduledPull */); - durationProducer.onMatchedLogEvent(2 /* stop index*/, event2, false /* scheduledPull */); + durationProducer.onMatchedLogEvent(1 /* start index*/, event1); + durationProducer.onMatchedLogEvent(2 /* stop index*/, event2); durationProducer.flushIfNeededLocked(bucketStartTimeNs + 2 * bucketSizeNs + 1); EXPECT_EQ(1UL, durationProducer.mPastBuckets.size()); EXPECT_TRUE(durationProducer.mPastBuckets.find(DEFAULT_DIMENSION_KEY) != @@ -94,14 +94,14 @@ TEST(DurationMetricTrackerTest, TestNonSlicedCondition) { EXPECT_FALSE(durationProducer.mCondition); EXPECT_FALSE(durationProducer.isConditionSliced()); - durationProducer.onMatchedLogEvent(1 /* start index*/, event1, false /* scheduledPull */); - durationProducer.onMatchedLogEvent(2 /* stop index*/, event2, false /* scheduledPull */); + durationProducer.onMatchedLogEvent(1 /* start index*/, event1); + durationProducer.onMatchedLogEvent(2 /* stop index*/, event2); durationProducer.flushIfNeededLocked(bucketStartTimeNs + bucketSizeNs + 1); EXPECT_EQ(0UL, durationProducer.mPastBuckets.size()); - durationProducer.onMatchedLogEvent(1 /* start index*/, event3, false /* scheduledPull */); + durationProducer.onMatchedLogEvent(1 /* start index*/, event3); durationProducer.onConditionChanged(true /* condition */, bucketStartTimeNs + bucketSizeNs + 2); - durationProducer.onMatchedLogEvent(2 /* stop index*/, event4, false /* scheduledPull */); + durationProducer.onMatchedLogEvent(2 /* stop index*/, event4); durationProducer.flushIfNeededLocked(bucketStartTimeNs + 2 * bucketSizeNs + 1); EXPECT_EQ(1UL, durationProducer.mPastBuckets.size()); EXPECT_TRUE(durationProducer.mPastBuckets.find(DEFAULT_DIMENSION_KEY) != diff --git a/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp b/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp index f3302fd5b8e9..e4fc67f95ec0 100644 --- a/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/EventMetricProducer_test.cpp @@ -50,8 +50,8 @@ TEST(EventMetricProducerTest, TestNoCondition) { EventMetricProducer eventProducer(kConfigKey, metric, -1 /*-1 meaning no condition*/, wizard, bucketStartTimeNs); - eventProducer.onMatchedLogEvent(1 /*matcher index*/, event1, false /*pulled*/); - eventProducer.onMatchedLogEvent(1 /*matcher index*/, event2, false /*pulled*/); + eventProducer.onMatchedLogEvent(1 /*matcher index*/, event1); + eventProducer.onMatchedLogEvent(1 /*matcher index*/, event2); // TODO: get the report and check the content after the ProtoOutputStream change is done. // eventProducer.onDumpReport(); @@ -74,11 +74,11 @@ TEST(EventMetricProducerTest, TestEventsWithNonSlicedCondition) { EventMetricProducer eventProducer(kConfigKey, metric, 1, wizard, bucketStartTimeNs); eventProducer.onConditionChanged(true /*condition*/, bucketStartTimeNs); - eventProducer.onMatchedLogEvent(1 /*matcher index*/, event1, false /*pulled*/); + eventProducer.onMatchedLogEvent(1 /*matcher index*/, event1); eventProducer.onConditionChanged(false /*condition*/, bucketStartTimeNs + 2); - eventProducer.onMatchedLogEvent(1 /*matcher index*/, event2, false /*pulled*/); + eventProducer.onMatchedLogEvent(1 /*matcher index*/, event2); // TODO: get the report and check the content after the ProtoOutputStream change is done. // eventProducer.onDumpReport(); @@ -115,8 +115,8 @@ TEST(EventMetricProducerTest, TestEventsWithSlicedCondition) { EventMetricProducer eventProducer(kConfigKey, metric, 1, wizard, bucketStartTimeNs); - eventProducer.onMatchedLogEvent(1 /*matcher index*/, event1, false /*pulled*/); - eventProducer.onMatchedLogEvent(1 /*matcher index*/, event2, false /*pulled*/); + eventProducer.onMatchedLogEvent(1 /*matcher index*/, event1); + eventProducer.onMatchedLogEvent(1 /*matcher index*/, event2); // TODO: get the report and check the content after the ProtoOutputStream change is done. // eventProducer.onDumpReport(); diff --git a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp index d3206977a89d..146a19d8cbfb 100644 --- a/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp +++ b/cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp @@ -35,23 +35,23 @@ namespace os { namespace statsd { const ConfigKey kConfigKey(0, "test"); +const int tagId = 1; +const string metricName = "test_metric"; +const int64_t bucketStartTimeNs = 10000000000; +const int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; +const int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; +const int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; +const int64_t bucket4StartTimeNs = bucketStartTimeNs + 3 * bucketSizeNs; + /* * Tests pulled atoms with no conditions */ TEST(ValueMetricProducerTest, TestNonDimensionalEvents) { - int64_t bucketStartTimeNs = 10000000000; - int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; - - int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; - int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; - ValueMetric metric; - metric.set_name("1"); + metric.set_name(metricName); metric.mutable_bucket()->set_bucket_size_millis(bucketSizeNs / 1000000); metric.set_value_field(2); - int tagId = 1; - sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>(); // TODO: pending refactor of StatsPullerManager // For now we still need this so that it doesn't do real pulling. @@ -65,8 +65,8 @@ TEST(ValueMetricProducerTest, TestNonDimensionalEvents) { vector<shared_ptr<LogEvent>> allData; allData.clear(); - shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 1); - event->write(1); + shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 1); + event->write(tagId); event->write(11); event->init(); allData.push_back(event); @@ -75,76 +75,60 @@ TEST(ValueMetricProducerTest, TestNonDimensionalEvents) { // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); ValueMetricProducer::Interval curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 11, 11 - EXPECT_EQ(11, curInterval.raw.front().first); - EXPECT_EQ(11, curInterval.raw.front().second); - ValueMetricProducer::Interval nextInterval = valueProducer.mNextSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, nextInterval.raw.size()); - // value is 11, 0 - EXPECT_EQ(11, nextInterval.raw.front().first); - EXPECT_EQ(0, nextInterval.raw.front().second); - EXPECT_EQ(0UL, valueProducer.mPastBuckets.size()); + // startUpdated:true tainted:0 sum:0 start:11 + EXPECT_EQ(true, curInterval.startUpdated); + EXPECT_EQ(0, curInterval.tainted); + EXPECT_EQ(0, curInterval.sum); + EXPECT_EQ(11, curInterval.start); + EXPECT_EQ(1UL, valueProducer.mPastBuckets.size()); + EXPECT_EQ(0, valueProducer.mPastBuckets.begin()->second.back().mValue); allData.clear(); - event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 1); - event->write(1); - event->write(22); + event = make_shared<LogEvent>(tagId, bucket3StartTimeNs + 1); + event->write(tagId); + event->write(23); event->init(); allData.push_back(event); valueProducer.onDataPulled(allData); // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 22, 0 - EXPECT_EQ(22, curInterval.raw.front().first); - EXPECT_EQ(0, curInterval.raw.front().second); - EXPECT_EQ(0UL, valueProducer.mNextSlicedBucket.size()); + // tartUpdated:false tainted:0 sum:12 + EXPECT_EQ(true, curInterval.startUpdated); + EXPECT_EQ(0, curInterval.tainted); + EXPECT_EQ(0, curInterval.sum); EXPECT_EQ(1UL, valueProducer.mPastBuckets.size()); - EXPECT_EQ(1UL, valueProducer.mPastBuckets.begin()->second.size()); - EXPECT_EQ(11, valueProducer.mPastBuckets.begin()->second.back().mValue); + EXPECT_EQ(2UL, valueProducer.mPastBuckets.begin()->second.size()); + EXPECT_EQ(12, valueProducer.mPastBuckets.begin()->second.back().mValue); allData.clear(); - event = make_shared<LogEvent>(tagId, bucket3StartTimeNs + 1); - event->write(1); - event->write(33); + event = make_shared<LogEvent>(tagId, bucket4StartTimeNs + 1); + event->write(tagId); + event->write(36); event->init(); allData.push_back(event); valueProducer.onDataPulled(allData); EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 33, 0 - EXPECT_EQ(33, curInterval.raw.front().first); - EXPECT_EQ(0, curInterval.raw.front().second); - EXPECT_EQ(0UL, valueProducer.mNextSlicedBucket.size()); + // startUpdated:false tainted:0 sum:12 + EXPECT_EQ(true, curInterval.startUpdated); + EXPECT_EQ(0, curInterval.tainted); + EXPECT_EQ(0, curInterval.sum); EXPECT_EQ(1UL, valueProducer.mPastBuckets.size()); - EXPECT_EQ(2UL, valueProducer.mPastBuckets.begin()->second.size()); - EXPECT_EQ(11, valueProducer.mPastBuckets.begin()->second.back().mValue); + EXPECT_EQ(3UL, valueProducer.mPastBuckets.begin()->second.size()); + EXPECT_EQ(13, valueProducer.mPastBuckets.begin()->second.back().mValue); } /* * Test pulled event with non sliced condition. */ TEST(ValueMetricProducerTest, TestEventsWithNonSlicedCondition) { - int64_t bucketStartTimeNs = 10000000000; - int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; - - int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; - int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; - ValueMetric metric; - metric.set_name("1"); + metric.set_name(metricName); metric.mutable_bucket()->set_bucket_size_millis(bucketSizeNs / 1000000); metric.set_value_field(2); metric.set_condition("SCREEN_ON"); - int tagId = 1; - sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>(); shared_ptr<MockStatsPullerManager> pullerManager = make_shared<StrictMock<MockStatsPullerManager>>(); @@ -153,28 +137,18 @@ TEST(ValueMetricProducerTest, TestEventsWithNonSlicedCondition) { EXPECT_CALL(*pullerManager, Pull(tagId, _)) .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { - int64_t bucketStartTimeNs = 10000000000; - int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; - - int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; - int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; data->clear(); shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); - event->write(1); + event->write(tagId); event->write(100); event->init(); data->push_back(event); return true; })) .WillOnce(Invoke([](int tagId, vector<std::shared_ptr<LogEvent>>* data) { - int64_t bucketStartTimeNs = 10000000000; - int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; - - int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; - int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; data->clear(); shared_ptr<LogEvent> event = make_shared<LogEvent>(tagId, bucket2StartTimeNs + 10); - event->write(1); + event->write(tagId); event->write(120); event->init(); data->push_back(event); @@ -184,17 +158,16 @@ TEST(ValueMetricProducerTest, TestEventsWithNonSlicedCondition) { ValueMetricProducer valueProducer(kConfigKey, metric, 1, wizard, tagId, bucketStartTimeNs, pullerManager); - valueProducer.onConditionChanged(true, bucketStartTimeNs + 10); + valueProducer.onConditionChanged(true, bucketStartTimeNs + 8); // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); ValueMetricProducer::Interval curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 100, 0 - EXPECT_EQ(100, curInterval.raw.front().first); - EXPECT_EQ(0, curInterval.raw.front().second); - EXPECT_EQ(0UL, valueProducer.mNextSlicedBucket.size()); + // startUpdated:false tainted:0 sum:0 start:100 + EXPECT_EQ(100, curInterval.start); + EXPECT_EQ(true, curInterval.startUpdated); + EXPECT_EQ(0, curInterval.tainted); + EXPECT_EQ(0, curInterval.sum); EXPECT_EQ(0UL, valueProducer.mPastBuckets.size()); vector<shared_ptr<LogEvent>> allData; @@ -209,11 +182,8 @@ TEST(ValueMetricProducerTest, TestEventsWithNonSlicedCondition) { // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 110, 0 - EXPECT_EQ(110, curInterval.raw.front().first); - EXPECT_EQ(0, curInterval.raw.front().second); + // startUpdated:false tainted:0 sum:0 start:110 + EXPECT_EQ(110, curInterval.start); EXPECT_EQ(1UL, valueProducer.mPastBuckets.size()); EXPECT_EQ(1UL, valueProducer.mPastBuckets.begin()->second.size()); EXPECT_EQ(10, valueProducer.mPastBuckets.begin()->second.back().mValue); @@ -223,27 +193,17 @@ TEST(ValueMetricProducerTest, TestEventsWithNonSlicedCondition) { // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 110, 120 - EXPECT_EQ(110, curInterval.raw.front().first); - EXPECT_EQ(120, curInterval.raw.front().second); + // startUpdated:false tainted:0 sum:0 start:110 + EXPECT_EQ(10, curInterval.sum); + EXPECT_EQ(false, curInterval.startUpdated); } TEST(ValueMetricProducerTest, TestPushedEventsWithoutCondition) { - int64_t bucketStartTimeNs = 10000000000; - int64_t bucketSizeNs = 60 * 1000 * 1000 * 1000LL; - - int64_t bucket2StartTimeNs = bucketStartTimeNs + bucketSizeNs; - int64_t bucket3StartTimeNs = bucketStartTimeNs + 2 * bucketSizeNs; - ValueMetric metric; - metric.set_name("1"); + metric.set_name(metricName); metric.mutable_bucket()->set_bucket_size_millis(bucketSizeNs / 1000000); metric.set_value_field(2); - int tagId = 1; - sp<MockConditionWizard> wizard = new NaggyMock<MockConditionWizard>(); shared_ptr<MockStatsPullerManager> pullerManager = make_shared<StrictMock<MockStatsPullerManager>>(); @@ -255,32 +215,22 @@ TEST(ValueMetricProducerTest, TestPushedEventsWithoutCondition) { event1->write(1); event1->write(10); event1->init(); - shared_ptr<LogEvent> event2 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 10); + shared_ptr<LogEvent> event2 = make_shared<LogEvent>(tagId, bucketStartTimeNs + 20); event2->write(1); event2->write(20); event2->init(); - valueProducer.onMatchedLogEvent(1 /*log matcher index*/, *event1, false); + valueProducer.onMatchedLogEvent(1 /*log matcher index*/, *event1); // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); ValueMetricProducer::Interval curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(1UL, curInterval.raw.size()); - // value is 10, 0 - EXPECT_EQ(10, curInterval.raw.front().first); - EXPECT_EQ(0, curInterval.raw.front().second); - EXPECT_EQ(0UL, valueProducer.mNextSlicedBucket.size()); + EXPECT_EQ(10, curInterval.sum); - valueProducer.onMatchedLogEvent(1 /*log matcher index*/, *event2, false); + valueProducer.onMatchedLogEvent(1 /*log matcher index*/, *event2); // has one slice EXPECT_EQ(1UL, valueProducer.mCurrentSlicedBucket.size()); curInterval = valueProducer.mCurrentSlicedBucket.begin()->second; - // has one raw pair - EXPECT_EQ(2UL, curInterval.raw.size()); - // value is 10, 20 - EXPECT_EQ(10, curInterval.raw.front().first); - EXPECT_EQ(20, curInterval.raw.back().first); - EXPECT_EQ(0UL, valueProducer.mNextSlicedBucket.size()); + EXPECT_EQ(30, curInterval.sum); valueProducer.flushIfNeededLocked(bucket3StartTimeNs); EXPECT_EQ(1UL, valueProducer.mPastBuckets.size()); diff --git a/cmds/statsd/tools/dogfood/Android.mk b/cmds/statsd/tools/dogfood/Android.mk index 1bd5f30b2f5c..6b0531d97c83 100644 --- a/cmds/statsd/tools/dogfood/Android.mk +++ b/cmds/statsd/tools/dogfood/Android.mk @@ -16,19 +16,19 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_PACKAGE_NAME := StatsdDogfood +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES += ../../src/stats_log.proto \ - ../../src/atoms_copy.proto - + ../../src/atoms.proto LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/../../src/ - -LOCAL_PROTOC_OPTIMIZE_TYPE := lite-static - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_STATIC_JAVA_LIBRARIES := platformprotoslite -LOCAL_PACKAGE_NAME := StatsdDogfood +LOCAL_PROTOC_OPTIMIZE_TYPE := lite LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true LOCAL_DEX_PREOPT := false -include $(BUILD_PACKAGE)
\ No newline at end of file +LOCAL_PROGUARD_ENABLED := disabled + +include $(BUILD_PACKAGE) diff --git a/cmds/statsd/tools/loadtest/Android.mk b/cmds/statsd/tools/loadtest/Android.mk index f3f0a7c2128f..0a0fd6647fbb 100644 --- a/cmds/statsd/tools/loadtest/Android.mk +++ b/cmds/statsd/tools/loadtest/Android.mk @@ -16,20 +16,20 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_PACKAGE_NAME := StatsdLoadtest +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES += ../../src/stats_log.proto \ - ../../src/atoms_copy.proto \ + ../../src/atoms.proto \ ../../src/statsd_config.proto - LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/../../src/ - -LOCAL_PROTOC_OPTIMIZE_TYPE := lite-static - LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_STATIC_JAVA_LIBRARIES := platformprotoslite -LOCAL_PACKAGE_NAME := StatsdLoadtest +LOCAL_PROTOC_OPTIMIZE_TYPE := lite LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true LOCAL_DEX_PREOPT := false +LOCAL_PROGUARD_ENABLED := disabled + include $(BUILD_PACKAGE) diff --git a/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml b/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml index 1e28f6730709..2a254df2302a 100644 --- a/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml +++ b/cmds/statsd/tools/loadtest/res/layout/activity_loadtest.xml @@ -160,13 +160,6 @@ android:layout_width="1dp" android:layout_height="30dp"/> - <Button - android:id="@+id/display_output" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/display_output" - android:textSize="30dp"/> - <Space android:layout_width="1dp" android:layout_height="30dp"/> diff --git a/cmds/statsd/tools/loadtest/res/raw/loadtest_config b/cmds/statsd/tools/loadtest/res/raw/loadtest_config Binary files differindex 78223674285d..fbce0e870e57 100755 --- a/cmds/statsd/tools/loadtest/res/raw/loadtest_config +++ b/cmds/statsd/tools/loadtest/res/raw/loadtest_config diff --git a/cmds/statsd/tools/loadtest/res/values/strings.xml b/cmds/statsd/tools/loadtest/res/values/strings.xml index cb38298873f0..522337ee656d 100644 --- a/cmds/statsd/tools/loadtest/res/values/strings.xml +++ b/cmds/statsd/tools/loadtest/res/values/strings.xml @@ -20,7 +20,6 @@ <string name="app_name">Statsd Loadtest</string> <string name="bucket_label">bucket size (mins): </string> <string name="burst_label">burst: </string> - <string name="display_output">Show metrics data</string> <string name="placebo">placebo</string> <string name="period_label">logging period (secs): </string> <string name="replication_label">metric replication: </string> diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java index 522dea61d188..a72f72e60faf 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/LoadtestActivity.java @@ -15,6 +15,7 @@ */ package com.android.statsd.loadtest; +import android.annotation.Nullable; import android.app.Activity; import android.app.AlarmManager; import android.app.PendingIntent; @@ -43,6 +44,10 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; +import com.android.os.StatsLog.ConfigMetricsReport; +import com.android.os.StatsLog.ConfigMetricsReportList; +import com.android.os.StatsLog.StatsdStatsReport; +import java.util.List; /** * Runs a load test for statsd. @@ -191,13 +196,6 @@ public class LoadtestActivity extends Activity { } }); - findViewById(R.id.display_output).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - fetchAndDisplayData(); - } - }); - mAlarmMgr = (AlarmManager) getSystemService(Context.ALARM_SERVICE); mStatsManager = (StatsManager) getSystemService("stats"); mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE); @@ -239,6 +237,48 @@ public class LoadtestActivity extends Activity { super.onDestroy(); } + @Nullable + public StatsdStatsReport getMetadata() { + if (!statsdRunning()) { + return null; + } + if (mStatsManager != null) { + byte[] data = mStatsManager.getMetadata(); + if (data != null) { + StatsdStatsReport report = null; + boolean good = false; + try { + return StatsdStatsReport.parseFrom(data); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + Log.d(TAG, "Bad StatsdStatsReport"); + } + } + } + return null; + } + + @Nullable + public List<ConfigMetricsReport> getData() { + if (!statsdRunning()) { + return null; + } + if (mStatsManager != null) { + byte[] data = mStatsManager.getData(ConfigFactory.CONFIG_NAME); + if (data != null) { + ConfigMetricsReportList reports = null; + try { + reports = ConfigMetricsReportList.parseFrom(data); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + Log.d(TAG, "Invalid data"); + } + if (reports != null) { + return reports.getReportsList(); + } + } + } + return null; + } + private void onPerfAlarm() { if (mPerfData != null) { mPerfData.onAlarm(this); @@ -285,6 +325,9 @@ public class LoadtestActivity extends Activity { // Prepare to push a sequence of atoms to logd. mPusher = new SequencePusher(mBurst, mPlacebo); + // Force a data flush by requesting data. + getData(); + // Create a config and push it to statsd. if (!setConfig(mFactory.getConfig(mReplication, mBucketMins * 60 * 1000, mPlacebo))) { return; @@ -355,42 +398,6 @@ public class LoadtestActivity extends Activity { mPlaceboCheckBox.setEnabled(!mStarted); } - private void fetchAndDisplayData() { - if (!statsdRunning()) { - return; - } - if (mStatsManager != null) { - byte[] data = mStatsManager.getData(ConfigFactory.CONFIG_NAME); - if (data != null) { - displayData(data); - } else { - mReportText.setText("Failed to pull data"); - } - } - } - - private void displayData(byte[] data) { - com.android.os.StatsLog.ConfigMetricsReportList reports = null; - boolean good = false; - if (data != null) { - try { - reports = com.android.os.StatsLog.ConfigMetricsReportList.parseFrom(data); - good = true; - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - // display it in the text view. - } - } - int size = data == null ? 0 : data.length; - StringBuilder sb = new StringBuilder(); - sb.append(good ? "Proto parsing OK!" : "Proto parsing Error!"); - sb.append(" size:").append(size).append("\n"); - - if (good && reports != null) { - DisplayProtoUtils.displayLogReport(sb, reports); - mReportText.setText(sb.toString()); - } - } - private boolean statsdRunning() { if (IStatsManager.Stub.asInterface(ServiceManager.getService("stats")) == null) { Log.d(TAG, "Statsd not running"); diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java index d82a0eadea65..d9513a15208a 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/MemoryDataRecorder.java @@ -39,7 +39,6 @@ public class MemoryDataRecorder extends PerfDataRecorder { @Override public void onAlarm(Context context) { - Log.d(TAG, "GOT ALARM IN MEM"); runDumpsysStats(context, DUMP_FILENAME, "meminfo"); readDumpData(context, DUMP_FILENAME, new MemInfoParser(mStartTimeMillis), mSb); } diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java index 81a84f53b503..555e6dd2d99d 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/NumericalWatcher.java @@ -22,7 +22,7 @@ import android.widget.TextView; public abstract class NumericalWatcher implements TextWatcher { - private static final String TAG = "loadtest.NumericalWatcher"; + private static final String TAG = "loadtest.NumericalWatcher"; private final TextView mTextView; private final int mMin; @@ -45,9 +45,6 @@ public abstract class NumericalWatcher implements TextWatcher { } int unsanitized = Integer.parseInt(s); int newValue = sanitize(unsanitized); - - Log.d(TAG, "YOYO " + currentValue + " " + newValue + " " + unsanitized); - if (currentValue != newValue || unsanitized != newValue) { currentValue = newValue; editable.clear(); diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java index 466524756c48..22ba9c5aca39 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfData.java @@ -51,13 +51,17 @@ public class PerfData extends PerfDataRecorder { private final Set<PerfDataRecorder> mRecorders; - public PerfData(Context context, boolean placebo, int replication, long bucketMins, - long periodSecs, int burst) { + public PerfData(LoadtestActivity loadtestActivity, boolean placebo, int replication, + long bucketMins, long periodSecs, int burst) { super(placebo, replication, bucketMins, periodSecs, burst); mRecorders = new HashSet(); mRecorders.add(new BatteryDataRecorder(placebo, replication, bucketMins, periodSecs, burst)); mRecorders.add(new MemoryDataRecorder(placebo, replication, bucketMins, periodSecs, burst)); - mAlarmMgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + mRecorders.add(new StatsdStatsRecorder(loadtestActivity, placebo, replication, bucketMins, + periodSecs, burst)); + mRecorders.add(new ValidationRecorder(loadtestActivity, placebo, replication, bucketMins, + periodSecs, burst)); + mAlarmMgr = (AlarmManager) loadtestActivity.getSystemService(Context.ALARM_SERVICE); } public void onDestroy() { diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java index 15a8e5c87131..5b5ba3766d04 100644 --- a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/PerfDataRecorder.java @@ -35,12 +35,12 @@ import java.util.Date; public abstract class PerfDataRecorder { private static final String TAG = "loadtest.PerfDataRecorder"; - protected final String mFileSuffix; + protected final String mTimeAsString; protected final String mColumnSuffix; protected PerfDataRecorder(boolean placebo, int replication, long bucketMins, long periodSecs, int burst) { - mFileSuffix = new SimpleDateFormat("YYYY_MM_dd_HH_mm_ss").format(new Date()); + mTimeAsString = new SimpleDateFormat("YYYY_MM_dd_HH_mm_ss").format(new Date()); mColumnSuffix = getColumnSuffix(placebo, replication, bucketMins, periodSecs, burst); } @@ -103,7 +103,7 @@ public abstract class PerfDataRecorder { /** Writes CSV data to a file. */ protected void writeData(Context context, String filePrefix, String columnPrefix, StringBuilder sb) { - File dataFile = new File(getStorageDir(), filePrefix + mFileSuffix + ".csv"); + File dataFile = new File(getStorageDir(), filePrefix + mTimeAsString + ".csv"); FileWriter writer = null; try { @@ -131,7 +131,7 @@ public abstract class PerfDataRecorder { private File getStorageDir() { File file = new File(Environment.getExternalStoragePublicDirectory( - Environment.DIRECTORY_DOCUMENTS), "loadtest"); + Environment.DIRECTORY_DOCUMENTS), "loadtest/" + mTimeAsString); if (!file.mkdirs()) { Log.e(TAG, "Directory not created"); } diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/StatsdStatsRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/StatsdStatsRecorder.java new file mode 100644 index 000000000000..4ef5dc2f6ca8 --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/StatsdStatsRecorder.java @@ -0,0 +1,61 @@ +/* + * 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.statsd.loadtest; + +import android.content.Context; +import android.util.Log; +import com.android.os.StatsLog.StatsdStatsReport; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class StatsdStatsRecorder extends PerfDataRecorder { + private static final String TAG = "loadtest.StatsdStatsRecorder"; + + private final LoadtestActivity mLoadtestActivity; + + public StatsdStatsRecorder(LoadtestActivity loadtestActivity, boolean placebo, int replication, + long bucketMins, long periodSecs, int burst) { + super(placebo, replication, bucketMins, periodSecs, burst); + mLoadtestActivity = loadtestActivity; + } + + @Override + public void startRecording(Context context) { + // Nothing to do. + } + + @Override + public void onAlarm(Context context) { + // Nothing to do. + } + + @Override + public void stopRecording(Context context) { + StatsdStatsReport metadata = mLoadtestActivity.getMetadata(); + if (metadata != null) { + int numConfigs = metadata.getConfigStatsCount(); + StringBuilder sb = new StringBuilder(); + StatsdStatsReport.ConfigStats configStats = metadata.getConfigStats(numConfigs - 1); + sb.append("metric_count,") + .append(configStats.getMetricCount() + "\n") + .append("condition_count,") + .append(configStats.getConditionCount() + "\n") + .append("matcher_count,") + .append(configStats.getMatcherCount() + "\n"); + writeData(context, "statsdstats_", "", sb); + } + } +} diff --git a/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ValidationRecorder.java b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ValidationRecorder.java new file mode 100644 index 000000000000..4b614aa19492 --- /dev/null +++ b/cmds/statsd/tools/loadtest/src/com/android/statsd/loadtest/ValidationRecorder.java @@ -0,0 +1,95 @@ +/* + * 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.statsd.loadtest; + +import android.content.Context; +import android.util.Log; +import com.android.os.StatsLog.ConfigMetricsReport; +import com.android.os.StatsLog.EventMetricData; +import com.android.os.StatsLog.StatsLogReport; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Checks the correctness of the stats. + */ +public class ValidationRecorder extends PerfDataRecorder { + private static final String TAG = "loadtest.ValidationRecorder"; + + private final LoadtestActivity mLoadtestActivity; + + public ValidationRecorder(LoadtestActivity loadtestActivity, boolean placebo, int replication, + long bucketMins, long periodSecs, int burst) { + super(placebo, replication, bucketMins, periodSecs, burst); + mLoadtestActivity = loadtestActivity; + } + + @Override + public void startRecording(Context context) { + // Nothing to do. + } + + @Override + public void onAlarm(Context context) { + validateData(); + } + + @Override + public void stopRecording(Context context) { + validateData(); + } + + private void validateData() { + List<ConfigMetricsReport> reports = mLoadtestActivity.getData(); + if (reports != null) { + Log.d(TAG, "GOT DATA"); + for (ConfigMetricsReport report : reports) { + for (StatsLogReport logReport : report.getMetricsList()) { + if (!logReport.hasMetricName()) { + Log.e(TAG, "Metric missing name."); + continue; + } + String metricName = logReport.getMetricName(); + if (metricName.startsWith("EVENT_BATTERY_LEVEL_CHANGES_WHILE_SCREEN_IS_ON_")) { + validateEventBatteryLevelChangesWhileScreenIsOn(logReport); + continue; + } + if (metricName.startsWith("EVENT_BATTERY_LEVEL_CHANGES_")) { + validateEventBatteryLevelChanges(logReport); + continue; + } + } + } + } + } + + private void validateEventBatteryLevelChanges(StatsLogReport logReport) { + Log.d(TAG, "Validating " + logReport.getMetricName()); + if (logReport.hasEventMetrics()) { + Log.d(TAG, "Num events captured: " + logReport.getEventMetrics().getDataCount()); + for (EventMetricData data : logReport.getEventMetrics().getDataList()) { + Log.d(TAG, " Event : " + data.getAtom()); + } + } else { + Log.d(TAG, "Metric is invalid"); + } + } + + private void validateEventBatteryLevelChangesWhileScreenIsOn(StatsLogReport logReport) { + Log.d(TAG, "Validating " + logReport.getMetricName()); + } +} diff --git a/config/compiled-classes-phone b/config/compiled-classes-phone deleted file mode 100644 index afa802c70fd4..000000000000 --- a/config/compiled-classes-phone +++ /dev/null @@ -1,8500 +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. -# -# -# -# Compiled-classes filter file for phones. -# -# Using a compiled-classes file filters non-mentioned classes from being compiled into -# the boot.oat file(s), reducing the size of the boot image. This is a tradeoff, as classes -# that have not been compiled must be run with the interpreter or through JIT. -# -# This file has been derived for mainline phone (and tablet) usage in concern with the -# preloaded-classes file, but is not used by default. To use this file, add a copy statement -# to your device.mk, e.g., -# -# PRODUCT_COPY_FILES += \ -# frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes -# -android.R$styleable -android.accessibilityservice.AccessibilityServiceInfo -android.accessibilityservice.AccessibilityServiceInfo$1 -android.accessibilityservice.IAccessibilityServiceClient -android.accessibilityservice.IAccessibilityServiceConnection -android.accessibilityservice.IAccessibilityServiceConnection$Stub -android.accounts.AbstractAccountAuthenticator -android.accounts.AbstractAccountAuthenticator$Transport -android.accounts.Account -android.accounts.Account$1 -android.accounts.AccountAndUser -android.accounts.AccountAuthenticatorResponse -android.accounts.AccountAuthenticatorResponse$1 -android.accounts.AccountManager -android.accounts.AccountManager$1 -android.accounts.AccountManager$11 -android.accounts.AccountManager$19 -android.accounts.AccountManager$3 -android.accounts.AccountManager$4 -android.accounts.AccountManager$AmsTask -android.accounts.AccountManager$AmsTask$1 -android.accounts.AccountManager$AmsTask$Response -android.accounts.AccountManager$BaseFutureTask -android.accounts.AccountManager$BaseFutureTask$1 -android.accounts.AccountManager$BaseFutureTask$Response -android.accounts.AccountManager$Future2Task -android.accounts.AccountManager$Future2Task$1 -android.accounts.AccountManagerCallback -android.accounts.AccountManagerFuture -android.accounts.AccountManagerInternal -android.accounts.AccountManagerInternal$OnAppPermissionChangeListener -android.accounts.AccountsException -android.accounts.AuthenticatorDescription -android.accounts.AuthenticatorDescription$1 -android.accounts.AuthenticatorException -android.accounts.IAccountAuthenticator -android.accounts.IAccountAuthenticator$Stub -android.accounts.IAccountAuthenticator$Stub$Proxy -android.accounts.IAccountAuthenticatorResponse -android.accounts.IAccountAuthenticatorResponse$Stub -android.accounts.IAccountAuthenticatorResponse$Stub$Proxy -android.accounts.IAccountManager -android.accounts.IAccountManager$Stub -android.accounts.IAccountManager$Stub$Proxy -android.accounts.IAccountManagerResponse -android.accounts.IAccountManagerResponse$Stub -android.accounts.IAccountManagerResponse$Stub$Proxy -android.accounts.OnAccountsUpdateListener -android.accounts.OperationCanceledException -android.animation.AnimationHandler -android.animation.AnimationHandler$1 -android.animation.AnimationHandler$AnimationFrameCallback -android.animation.AnimationHandler$AnimationFrameCallbackProvider -android.animation.AnimationHandler$MyFrameCallbackProvider -android.animation.Animator -android.animation.Animator$AnimatorConstantState -android.animation.Animator$AnimatorListener -android.animation.Animator$AnimatorPauseListener -android.animation.AnimatorInflater -android.animation.AnimatorInflater$PathDataEvaluator -android.animation.AnimatorListenerAdapter -android.animation.AnimatorSet -android.animation.AnimatorSet$1 -android.animation.AnimatorSet$2 -android.animation.AnimatorSet$3 -android.animation.AnimatorSet$AnimationEvent -android.animation.AnimatorSet$Builder -android.animation.AnimatorSet$Node -android.animation.AnimatorSet$SeekState -android.animation.ArgbEvaluator -android.animation.FloatArrayEvaluator -android.animation.FloatEvaluator -android.animation.FloatKeyframeSet -android.animation.IntEvaluator -android.animation.IntKeyframeSet -android.animation.Keyframe -android.animation.Keyframe$FloatKeyframe -android.animation.Keyframe$IntKeyframe -android.animation.Keyframe$ObjectKeyframe -android.animation.KeyframeSet -android.animation.Keyframes -android.animation.Keyframes$FloatKeyframes -android.animation.Keyframes$IntKeyframes -android.animation.LayoutTransition -android.animation.LayoutTransition$1 -android.animation.LayoutTransition$2 -android.animation.LayoutTransition$3 -android.animation.LayoutTransition$4 -android.animation.LayoutTransition$5 -android.animation.LayoutTransition$CleanupCallback -android.animation.LayoutTransition$TransitionListener -android.animation.ObjectAnimator -android.animation.PathKeyframes -android.animation.PathKeyframes$1 -android.animation.PathKeyframes$2 -android.animation.PathKeyframes$FloatKeyframesBase -android.animation.PathKeyframes$IntKeyframesBase -android.animation.PathKeyframes$SimpleKeyframes -android.animation.PropertyValuesHolder -android.animation.PropertyValuesHolder$1 -android.animation.PropertyValuesHolder$FloatPropertyValuesHolder -android.animation.PropertyValuesHolder$IntPropertyValuesHolder -android.animation.PropertyValuesHolder$PropertyValues -android.animation.PropertyValuesHolder$PropertyValues$DataSource -android.animation.RectEvaluator -android.animation.RevealAnimator -android.animation.StateListAnimator -android.animation.StateListAnimator$1 -android.animation.StateListAnimator$StateListAnimatorConstantState -android.animation.StateListAnimator$Tuple -android.animation.TimeAnimator -android.animation.TimeAnimator$TimeListener -android.animation.TimeInterpolator -android.animation.TypeEvaluator -android.animation.ValueAnimator -android.animation.ValueAnimator$AnimatorUpdateListener -android.app.-$Lambda$9I5WEMsoBc7l4QrNqZ4wx59yuHU -android.app.-$Lambda$9I5WEMsoBc7l4QrNqZ4wx59yuHU$1 -android.app.-$Lambda$CsyQO--8YdRe5wlajUCi-L98enA$1 -android.app.-$Lambda$CsyQO--8YdRe5wlajUCi-L98enA$2 -android.app.-$Lambda$CsyQO--8YdRe5wlajUCi-L98enA$3 -android.app.-$Lambda$FilBqgnXJrN9Mgyks1XHeAxzSTk -android.app.-$Lambda$c44uHH2WE4sJvw5tZZB6gRzEaHI -android.app.-$Lambda$c44uHH2WE4sJvw5tZZB6gRzEaHI$1 -android.app.-$Lambda$vZ1qb742P9hE4drBY-TrOZB_qKo -android.app.-$Lambda$w9bG0NLfK6B6UpQKzQS6S1ayAh0 -android.app.-$Lambda$w9bG0NLfK6B6UpQKzQS6S1ayAh0$1 -android.app.ActionBar -android.app.ActionBar$LayoutParams -android.app.Activity -android.app.Activity$HostCallbacks -android.app.ActivityManager -android.app.ActivityManager$1 -android.app.ActivityManager$AppTask -android.app.ActivityManager$MemoryInfo -android.app.ActivityManager$MemoryInfo$1 -android.app.ActivityManager$OnUidImportanceListener -android.app.ActivityManager$ProcessErrorStateInfo -android.app.ActivityManager$RecentTaskInfo -android.app.ActivityManager$RecentTaskInfo$1 -android.app.ActivityManager$RunningAppProcessInfo -android.app.ActivityManager$RunningAppProcessInfo$1 -android.app.ActivityManager$RunningServiceInfo -android.app.ActivityManager$RunningServiceInfo$1 -android.app.ActivityManager$RunningTaskInfo -android.app.ActivityManager$RunningTaskInfo$1 -android.app.ActivityManager$StackId -android.app.ActivityManager$StackInfo -android.app.ActivityManager$StackInfo$1 -android.app.ActivityManager$TaskDescription -android.app.ActivityManager$TaskDescription$1 -android.app.ActivityManager$TaskSnapshot -android.app.ActivityManager$TaskSnapshot$1 -android.app.ActivityManager$TaskThumbnail -android.app.ActivityManager$TaskThumbnailInfo -android.app.ActivityManager$TaskThumbnailInfo$1 -android.app.ActivityManager$UidObserver -android.app.ActivityManagerInternal -android.app.ActivityManagerInternal$SleepToken -android.app.ActivityOptions -android.app.ActivityOptions$1 -android.app.ActivityOptions$1$1 -android.app.ActivityOptions$OnAnimationFinishedListener -android.app.ActivityOptions$OnAnimationStartedListener -android.app.ActivityThread -android.app.ActivityThread$1 -android.app.ActivityThread$2 -android.app.ActivityThread$ActivityClientRecord -android.app.ActivityThread$ActivityConfigChangeData -android.app.ActivityThread$AppBindData -android.app.ActivityThread$ApplicationThread -android.app.ActivityThread$BindServiceData -android.app.ActivityThread$ContextCleanupInfo -android.app.ActivityThread$CreateServiceData -android.app.ActivityThread$DropBoxReporter -android.app.ActivityThread$EventLoggingReporter -android.app.ActivityThread$GcIdler -android.app.ActivityThread$H -android.app.ActivityThread$Idler -android.app.ActivityThread$NewIntentData -android.app.ActivityThread$Profiler -android.app.ActivityThread$ProviderClientRecord -android.app.ActivityThread$ProviderKey -android.app.ActivityThread$ProviderRefCount -android.app.ActivityThread$ReceiverData -android.app.ActivityThread$RequestAssistContextExtras -android.app.ActivityThread$ResultData -android.app.ActivityThread$ServiceArgsData -android.app.ActivityThread$StopInfo -android.app.ActivityTransitionCoordinator -android.app.ActivityTransitionCoordinator$ContinueTransitionListener -android.app.ActivityTransitionCoordinator$FixedEpicenterCallback -android.app.ActivityTransitionCoordinator$GhostViewListeners -android.app.ActivityTransitionCoordinator$SharedElementOriginalState -android.app.ActivityTransitionState -android.app.AlarmManager$AlarmClockInfo -android.app.AlarmManager$ListenerWrapper -android.app.AlarmManager$OnAlarmListener -android.app.AlertDialog -android.app.AlertDialog$Builder -android.app.AppGlobals -android.app.AppOpsManager -android.app.AppOpsManager$1 -android.app.AppOpsManager$OnOpChangedInternalListener -android.app.AppOpsManager$OnOpChangedListener -android.app.AppOpsManager$OpEntry -android.app.AppOpsManager$OpEntry$1 -android.app.AppOpsManager$PackageOps -android.app.AppOpsManager$PackageOps$1 -android.app.Application -android.app.Application$ActivityLifecycleCallbacks -android.app.ApplicationErrorReport -android.app.ApplicationErrorReport$AnrInfo -android.app.ApplicationErrorReport$CrashInfo -android.app.ApplicationErrorReport$ParcelableCrashInfo -android.app.ApplicationErrorReport$ParcelableCrashInfo$1 -android.app.ApplicationLoaders -android.app.ApplicationPackageManager -android.app.ApplicationPackageManager$MoveCallbackDelegate -android.app.ApplicationPackageManager$OnPermissionsChangeListenerDelegate -android.app.ApplicationPackageManager$ResourceName -android.app.AutomaticZenRule -android.app.BackStackRecord -android.app.BackStackRecord$Op -android.app.BroadcastOptions -android.app.ContentProviderHolder -android.app.ContentProviderHolder$1 -android.app.ContextImpl -android.app.ContextImpl$ApplicationContentResolver -android.app.DatePickerDialog$OnDateSetListener -android.app.DexLoadReporter -android.app.Dialog -android.app.Dialog$ListenersHandler -android.app.DialogFragment -android.app.DownloadManager -android.app.DownloadManager$CursorTranslator -android.app.DownloadManager$Query -android.app.EnterTransitionCoordinator -android.app.EnterTransitionCoordinator$1 -android.app.EnterTransitionCoordinator$2 -android.app.EnterTransitionCoordinator$3 -android.app.EnterTransitionCoordinator$4 -android.app.EnterTransitionCoordinator$5 -android.app.EnterTransitionCoordinator$6 -android.app.ExitTransitionCoordinator -android.app.ExitTransitionCoordinator$10 -android.app.ExitTransitionCoordinator$3 -android.app.ExitTransitionCoordinator$9 -android.app.Fragment -android.app.Fragment$1 -android.app.Fragment$AnimationInfo -android.app.FragmentContainer -android.app.FragmentController -android.app.FragmentHostCallback -android.app.FragmentManager -android.app.FragmentManager$BackStackEntry -android.app.FragmentManager$FragmentLifecycleCallbacks -android.app.FragmentManager$OnBackStackChangedListener -android.app.FragmentManagerImpl -android.app.FragmentManagerImpl$1 -android.app.FragmentManagerImpl$AnimateOnHWLayerIfNeededListener -android.app.FragmentManagerImpl$OpGenerator -android.app.FragmentManagerState -android.app.FragmentManagerState$1 -android.app.FragmentState -android.app.FragmentState$1 -android.app.FragmentTransaction -android.app.FragmentTransition -android.app.FragmentTransition$FragmentContainerTransition -android.app.IActivityContainer -android.app.IActivityContainer$Stub -android.app.IActivityContainerCallback -android.app.IActivityController -android.app.IActivityManager -android.app.IActivityManager$Stub -android.app.IActivityManager$Stub$Proxy -android.app.IAlarmCompleteListener -android.app.IAlarmCompleteListener$Stub -android.app.IAlarmCompleteListener$Stub$Proxy -android.app.IAlarmListener -android.app.IAlarmListener$Stub -android.app.IAlarmListener$Stub$Proxy -android.app.IAlarmManager -android.app.IAlarmManager$Stub -android.app.IAlarmManager$Stub$Proxy -android.app.IAppTask -android.app.IAppTask$Stub -android.app.IAppTask$Stub$Proxy -android.app.IApplicationThread -android.app.IApplicationThread$Stub -android.app.IApplicationThread$Stub$Proxy -android.app.IInstantAppResolver -android.app.IInstantAppResolver$Stub -android.app.IInstantAppResolver$Stub$Proxy -android.app.IInstrumentationWatcher -android.app.IInstrumentationWatcher$Stub -android.app.INotificationManager -android.app.INotificationManager$Stub -android.app.INotificationManager$Stub$Proxy -android.app.IProcessObserver -android.app.IProcessObserver$Stub -android.app.IProcessObserver$Stub$Proxy -android.app.ISearchManager -android.app.ISearchManager$Stub -android.app.ISearchManager$Stub$Proxy -android.app.IServiceConnection -android.app.IServiceConnection$Stub -android.app.IServiceConnection$Stub$Proxy -android.app.IStopUserCallback -android.app.ITaskStackListener -android.app.ITaskStackListener$Stub -android.app.ITaskStackListener$Stub$Proxy -android.app.ITransientNotification -android.app.ITransientNotification$Stub -android.app.ITransientNotification$Stub$Proxy -android.app.IUiAutomationConnection -android.app.IUiAutomationConnection$Stub -android.app.IUiModeManager -android.app.IUiModeManager$Stub -android.app.IUiModeManager$Stub$Proxy -android.app.IUidObserver -android.app.IUidObserver$Stub -android.app.IUidObserver$Stub$Proxy -android.app.IUserSwitchObserver -android.app.IUserSwitchObserver$Stub -android.app.IUserSwitchObserver$Stub$Proxy -android.app.IWallpaperManager -android.app.IWallpaperManager$Stub -android.app.IWallpaperManager$Stub$Proxy -android.app.IWallpaperManagerCallback -android.app.IWallpaperManagerCallback$Stub -android.app.IWallpaperManagerCallback$Stub$Proxy -android.app.InstantAppResolverService -android.app.InstantAppResolverService$1 -android.app.InstantAppResolverService$InstantAppResolutionCallback -android.app.InstantAppResolverService$ServiceHandler -android.app.Instrumentation -android.app.IntentReceiverLeaked -android.app.IntentService -android.app.IntentService$ServiceHandler -android.app.JobSchedulerImpl -android.app.KeyguardManager -android.app.ListActivity -android.app.ListFragment -android.app.ListFragment$1 -android.app.ListFragment$2 -android.app.LoadedApk -android.app.LoadedApk$ReceiverDispatcher -android.app.LoadedApk$ReceiverDispatcher$Args -android.app.LoadedApk$ReceiverDispatcher$InnerReceiver -android.app.LoadedApk$ServiceDispatcher -android.app.LoadedApk$ServiceDispatcher$ConnectionInfo -android.app.LoadedApk$ServiceDispatcher$DeathMonitor -android.app.LoadedApk$ServiceDispatcher$InnerConnection -android.app.LoadedApk$ServiceDispatcher$RunConnection -android.app.LoadedApk$WarningContextClassLoader -android.app.LoaderManager -android.app.LoaderManager$LoaderCallbacks -android.app.LoaderManagerImpl -android.app.LoaderManagerImpl$LoaderInfo -android.app.NativeActivity -android.app.Notification -android.app.Notification$1 -android.app.Notification$Action -android.app.Notification$Action$1 -android.app.Notification$Action$Builder -android.app.Notification$BigPictureStyle -android.app.Notification$BigTextStyle -android.app.Notification$Builder -android.app.Notification$BuilderRemoteViews -android.app.Notification$DecoratedCustomViewStyle -android.app.Notification$DecoratedMediaCustomViewStyle -android.app.Notification$Extender -android.app.Notification$InboxStyle -android.app.Notification$MediaStyle -android.app.Notification$MessagingStyle -android.app.Notification$StandardTemplateParams -android.app.Notification$Style -android.app.Notification$TvExtender -android.app.Notification$WearableExtender -android.app.NotificationChannel -android.app.NotificationChannel$1 -android.app.NotificationChannelGroup -android.app.NotificationChannelGroup$1 -android.app.NotificationManager -android.app.NotificationManager$Policy -android.app.NotificationManager$Policy$1 -android.app.OnActivityPausedListener -android.app.PackageInstallObserver -android.app.PackageInstallObserver$1 -android.app.PendingIntent -android.app.PendingIntent$1 -android.app.PendingIntent$CanceledException -android.app.PendingIntent$FinishedDispatcher -android.app.PendingIntent$OnFinished -android.app.PendingIntent$OnMarshaledListener -android.app.PictureInPictureParams -android.app.PictureInPictureParams$1 -android.app.PictureInPictureParams$Builder -android.app.ProfilerInfo -android.app.ProgressDialog -android.app.QueuedWork -android.app.QueuedWork$QueuedWorkHandler -android.app.ReceiverRestrictedContext -android.app.RemoteAction -android.app.RemoteAction$1 -android.app.RemoteInput -android.app.RemoteInput$1 -android.app.ResourcesManager -android.app.ResourcesManager$1 -android.app.ResourcesManager$ActivityResources -android.app.ResultInfo -android.app.ResultInfo$1 -android.app.SearchableInfo -android.app.SearchableInfo$1 -android.app.Service -android.app.ServiceConnectionLeaked -android.app.ServiceStartArgs -android.app.ServiceStartArgs$1 -android.app.SharedElementCallback -android.app.SharedElementCallback$1 -android.app.SharedElementCallback$OnSharedElementsReadyListener -android.app.SharedPreferencesImpl -android.app.SharedPreferencesImpl$1 -android.app.SharedPreferencesImpl$2 -android.app.SharedPreferencesImpl$EditorImpl -android.app.SharedPreferencesImpl$EditorImpl$1 -android.app.SharedPreferencesImpl$EditorImpl$2 -android.app.SharedPreferencesImpl$EditorImpl$3 -android.app.SharedPreferencesImpl$MemoryCommitResult -android.app.StatusBarManager -android.app.SynchronousUserSwitchObserver -android.app.SystemServiceRegistry -android.app.SystemServiceRegistry$1 -android.app.SystemServiceRegistry$10 -android.app.SystemServiceRegistry$11 -android.app.SystemServiceRegistry$12 -android.app.SystemServiceRegistry$13 -android.app.SystemServiceRegistry$14 -android.app.SystemServiceRegistry$15 -android.app.SystemServiceRegistry$16 -android.app.SystemServiceRegistry$17 -android.app.SystemServiceRegistry$18 -android.app.SystemServiceRegistry$19 -android.app.SystemServiceRegistry$2 -android.app.SystemServiceRegistry$20 -android.app.SystemServiceRegistry$21 -android.app.SystemServiceRegistry$22 -android.app.SystemServiceRegistry$23 -android.app.SystemServiceRegistry$24 -android.app.SystemServiceRegistry$25 -android.app.SystemServiceRegistry$26 -android.app.SystemServiceRegistry$27 -android.app.SystemServiceRegistry$28 -android.app.SystemServiceRegistry$29 -android.app.SystemServiceRegistry$3 -android.app.SystemServiceRegistry$30 -android.app.SystemServiceRegistry$31 -android.app.SystemServiceRegistry$32 -android.app.SystemServiceRegistry$33 -android.app.SystemServiceRegistry$34 -android.app.SystemServiceRegistry$35 -android.app.SystemServiceRegistry$36 -android.app.SystemServiceRegistry$37 -android.app.SystemServiceRegistry$38 -android.app.SystemServiceRegistry$39 -android.app.SystemServiceRegistry$4 -android.app.SystemServiceRegistry$40 -android.app.SystemServiceRegistry$41 -android.app.SystemServiceRegistry$42 -android.app.SystemServiceRegistry$43 -android.app.SystemServiceRegistry$44 -android.app.SystemServiceRegistry$45 -android.app.SystemServiceRegistry$46 -android.app.SystemServiceRegistry$47 -android.app.SystemServiceRegistry$48 -android.app.SystemServiceRegistry$49 -android.app.SystemServiceRegistry$5 -android.app.SystemServiceRegistry$50 -android.app.SystemServiceRegistry$51 -android.app.SystemServiceRegistry$52 -android.app.SystemServiceRegistry$53 -android.app.SystemServiceRegistry$54 -android.app.SystemServiceRegistry$55 -android.app.SystemServiceRegistry$56 -android.app.SystemServiceRegistry$57 -android.app.SystemServiceRegistry$58 -android.app.SystemServiceRegistry$59 -android.app.SystemServiceRegistry$6 -android.app.SystemServiceRegistry$60 -android.app.SystemServiceRegistry$61 -android.app.SystemServiceRegistry$62 -android.app.SystemServiceRegistry$63 -android.app.SystemServiceRegistry$64 -android.app.SystemServiceRegistry$65 -android.app.SystemServiceRegistry$66 -android.app.SystemServiceRegistry$67 -android.app.SystemServiceRegistry$68 -android.app.SystemServiceRegistry$69 -android.app.SystemServiceRegistry$7 -android.app.SystemServiceRegistry$70 -android.app.SystemServiceRegistry$71 -android.app.SystemServiceRegistry$72 -android.app.SystemServiceRegistry$73 -android.app.SystemServiceRegistry$74 -android.app.SystemServiceRegistry$75 -android.app.SystemServiceRegistry$76 -android.app.SystemServiceRegistry$77 -android.app.SystemServiceRegistry$78 -android.app.SystemServiceRegistry$79 -android.app.SystemServiceRegistry$8 -android.app.SystemServiceRegistry$80 -android.app.SystemServiceRegistry$81 -android.app.SystemServiceRegistry$82 -android.app.SystemServiceRegistry$9 -android.app.SystemServiceRegistry$CachedServiceFetcher -android.app.SystemServiceRegistry$ServiceFetcher -android.app.SystemServiceRegistry$StaticApplicationContextServiceFetcher -android.app.SystemServiceRegistry$StaticServiceFetcher -android.app.TaskStackListener -android.app.TimePickerDialog$OnTimeSetListener -android.app.UiModeManager -android.app.UserSwitchObserver -android.app.Vr2dDisplayProperties -android.app.VrManager -android.app.WaitResult -android.app.WallpaperInfo -android.app.WallpaperManager -android.app.WallpaperManager$Globals -android.app.admin.DeviceAdminInfo -android.app.admin.DeviceAdminInfo$1 -android.app.admin.DeviceAdminInfo$PolicyInfo -android.app.admin.DevicePolicyManager -android.app.admin.DevicePolicyManagerInternal -android.app.admin.DevicePolicyManagerInternal$OnCrossProfileWidgetProvidersChangeListener -android.app.admin.IDevicePolicyManager -android.app.admin.IDevicePolicyManager$Stub -android.app.admin.IDevicePolicyManager$Stub$Proxy -android.app.admin.PasswordMetrics -android.app.admin.PasswordMetrics$1 -android.app.admin.SecurityLog -android.app.admin.SecurityLog$SecurityEvent -android.app.admin.SecurityLog$SecurityEvent$1 -android.app.admin.SystemUpdateInfo -android.app.admin.SystemUpdateInfo$1 -android.app.admin.SystemUpdatePolicy -android.app.admin.SystemUpdatePolicy$1 -android.app.assist.AssistContent -android.app.assist.AssistStructure -android.app.assist.AssistStructure$1 -android.app.assist.AssistStructure$AutofillOverlay -android.app.assist.AssistStructure$ParcelTransferReader -android.app.assist.AssistStructure$ParcelTransferWriter -android.app.assist.AssistStructure$SendChannel -android.app.assist.AssistStructure$ViewNode -android.app.assist.AssistStructure$ViewNodeBuilder -android.app.assist.AssistStructure$ViewNodeText -android.app.assist.AssistStructure$ViewStackEntry -android.app.assist.AssistStructure$WindowNode -android.app.backup.BackupAgent -android.app.backup.BackupAgentHelper -android.app.backup.BackupDataInput -android.app.backup.BackupDataInput$EntityHeader -android.app.backup.BackupDataOutput -android.app.backup.BackupHelper -android.app.backup.BackupHelperDispatcher -android.app.backup.BackupHelperDispatcher$Header -android.app.backup.BackupManager -android.app.backup.BackupTransport -android.app.backup.BackupTransport$TransportImpl -android.app.backup.FileBackupHelperBase -android.app.backup.FullBackup -android.app.backup.FullBackupDataOutput -android.app.backup.IBackupManager -android.app.backup.IBackupManager$Stub -android.app.backup.IBackupManager$Stub$Proxy -android.app.backup.IBackupManagerMonitor -android.app.backup.IBackupObserver -android.app.backup.IFullBackupRestoreObserver -android.app.backup.IRestoreSession -android.app.backup.ISelectBackupTransportCallback -android.app.backup.RestoreDescription -android.app.backup.RestoreSet -android.app.job.IJobCallback -android.app.job.IJobCallback$Stub -android.app.job.IJobCallback$Stub$Proxy -android.app.job.IJobScheduler -android.app.job.IJobScheduler$Stub -android.app.job.IJobScheduler$Stub$Proxy -android.app.job.IJobService -android.app.job.IJobService$Stub -android.app.job.IJobService$Stub$Proxy -android.app.job.JobInfo -android.app.job.JobInfo$1 -android.app.job.JobInfo$Builder -android.app.job.JobInfo$TriggerContentUri -android.app.job.JobInfo$TriggerContentUri$1 -android.app.job.JobParameters -android.app.job.JobParameters$1 -android.app.job.JobScheduler -android.app.job.JobService -android.app.job.JobService$1 -android.app.job.JobServiceEngine -android.app.job.JobServiceEngine$JobHandler -android.app.job.JobServiceEngine$JobInterface -android.app.job.JobWorkItem -android.app.trust.IStrongAuthTracker -android.app.trust.IStrongAuthTracker$Stub -android.app.trust.IStrongAuthTracker$Stub$Proxy -android.app.trust.ITrustListener -android.app.trust.ITrustListener$Stub -android.app.trust.ITrustListener$Stub$Proxy -android.app.trust.ITrustManager -android.app.trust.ITrustManager$Stub -android.app.trust.ITrustManager$Stub$Proxy -android.app.trust.TrustManager -android.app.trust.TrustManager$1 -android.app.trust.TrustManager$2 -android.app.trust.TrustManager$TrustListener -android.app.usage.CacheQuotaHint -android.app.usage.CacheQuotaHint$1 -android.app.usage.CacheQuotaHint$Builder -android.app.usage.ConfigurationStats -android.app.usage.ConfigurationStats$1 -android.app.usage.ExternalStorageStats -android.app.usage.ICacheQuotaService -android.app.usage.ICacheQuotaService$Stub -android.app.usage.ICacheQuotaService$Stub$Proxy -android.app.usage.IStorageStatsManager -android.app.usage.IStorageStatsManager$Stub -android.app.usage.IUsageStatsManager -android.app.usage.IUsageStatsManager$Stub -android.app.usage.IUsageStatsManager$Stub$Proxy -android.app.usage.NetworkStatsManager -android.app.usage.StorageStats -android.app.usage.StorageStatsManager -android.app.usage.TimeSparseArray -android.app.usage.UsageEvents -android.app.usage.UsageEvents$1 -android.app.usage.UsageEvents$Event -android.app.usage.UsageStats -android.app.usage.UsageStats$1 -android.app.usage.UsageStatsManager -android.app.usage.UsageStatsManagerInternal -android.app.usage.UsageStatsManagerInternal$AppIdleStateChangeListener -android.appwidget.AppWidgetHost -android.appwidget.AppWidgetHost$Callbacks -android.appwidget.AppWidgetHost$UpdateHandler -android.appwidget.AppWidgetHostView -android.appwidget.AppWidgetHostView$1 -android.appwidget.AppWidgetHostView$ParcelableSparseArray -android.appwidget.AppWidgetHostView$ParcelableSparseArray$1 -android.appwidget.AppWidgetManager -android.appwidget.AppWidgetProvider -android.appwidget.AppWidgetProviderInfo -android.appwidget.AppWidgetProviderInfo$1 -android.appwidget.PendingHostUpdate -android.appwidget.PendingHostUpdate$1 -android.bluetooth.BluetoothA2dp -android.bluetooth.BluetoothA2dp$1 -android.bluetooth.BluetoothA2dp$2 -android.bluetooth.BluetoothActivityEnergyInfo -android.bluetooth.BluetoothAdapter -android.bluetooth.BluetoothAdapter$1 -android.bluetooth.BluetoothAdapter$BluetoothStateChangeCallback -android.bluetooth.BluetoothCodecConfig -android.bluetooth.BluetoothCodecConfig$1 -android.bluetooth.BluetoothCodecStatus -android.bluetooth.BluetoothDevice -android.bluetooth.BluetoothDevice$1 -android.bluetooth.BluetoothDevice$2 -android.bluetooth.BluetoothGatt -android.bluetooth.BluetoothGattCallback -android.bluetooth.BluetoothGattCharacteristic -android.bluetooth.BluetoothGattDescriptor -android.bluetooth.BluetoothGattService -android.bluetooth.BluetoothHeadset -android.bluetooth.BluetoothHeadset$1 -android.bluetooth.BluetoothHeadset$2 -android.bluetooth.BluetoothHeadset$3 -android.bluetooth.BluetoothHealthAppConfiguration -android.bluetooth.BluetoothHidHost -android.bluetooth.BluetoothHidHost$1 -android.bluetooth.BluetoothHidHost$2 -android.bluetooth.BluetoothInputStream -android.bluetooth.BluetoothManager -android.bluetooth.BluetoothMap -android.bluetooth.BluetoothMap$1 -android.bluetooth.BluetoothMap$2 -android.bluetooth.BluetoothOutputStream -android.bluetooth.BluetoothPan -android.bluetooth.BluetoothPan$1 -android.bluetooth.BluetoothPan$2 -android.bluetooth.BluetoothPbap -android.bluetooth.BluetoothPbap$1 -android.bluetooth.BluetoothPbap$2 -android.bluetooth.BluetoothPbap$ServiceListener -android.bluetooth.BluetoothProfile -android.bluetooth.BluetoothProfile$ServiceListener -android.bluetooth.BluetoothServerSocket -android.bluetooth.BluetoothSocket -android.bluetooth.BluetoothSocket$SocketState -android.bluetooth.BluetoothUuid -android.bluetooth.IBluetooth -android.bluetooth.IBluetooth$Stub -android.bluetooth.IBluetooth$Stub$Proxy -android.bluetooth.IBluetoothA2dp -android.bluetooth.IBluetoothA2dp$Stub -android.bluetooth.IBluetoothA2dp$Stub$Proxy -android.bluetooth.IBluetoothCallback -android.bluetooth.IBluetoothCallback$Stub -android.bluetooth.IBluetoothCallback$Stub$Proxy -android.bluetooth.IBluetoothGatt -android.bluetooth.IBluetoothGatt$Stub -android.bluetooth.IBluetoothGatt$Stub$Proxy -android.bluetooth.IBluetoothGattCallback -android.bluetooth.IBluetoothGattServerCallback -android.bluetooth.IBluetoothHeadset -android.bluetooth.IBluetoothHeadset$Stub -android.bluetooth.IBluetoothHeadset$Stub$Proxy -android.bluetooth.IBluetoothHeadsetPhone -android.bluetooth.IBluetoothHeadsetPhone$Stub -android.bluetooth.IBluetoothHeadsetPhone$Stub$Proxy -android.bluetooth.IBluetoothHealth -android.bluetooth.IBluetoothHealth$Stub -android.bluetooth.IBluetoothHealthCallback -android.bluetooth.IBluetoothHidHost -android.bluetooth.IBluetoothHidHost$Stub -android.bluetooth.IBluetoothHidHost$Stub$Proxy -android.bluetooth.IBluetoothManager -android.bluetooth.IBluetoothManager$Stub -android.bluetooth.IBluetoothManager$Stub$Proxy -android.bluetooth.IBluetoothManagerCallback -android.bluetooth.IBluetoothManagerCallback$Stub -android.bluetooth.IBluetoothManagerCallback$Stub$Proxy -android.bluetooth.IBluetoothMap -android.bluetooth.IBluetoothMap$Stub -android.bluetooth.IBluetoothMap$Stub$Proxy -android.bluetooth.IBluetoothPan -android.bluetooth.IBluetoothPan$Stub -android.bluetooth.IBluetoothPan$Stub$Proxy -android.bluetooth.IBluetoothPbap -android.bluetooth.IBluetoothPbap$Stub -android.bluetooth.IBluetoothPbap$Stub$Proxy -android.bluetooth.IBluetoothProfileServiceConnection -android.bluetooth.IBluetoothProfileServiceConnection$Stub -android.bluetooth.IBluetoothProfileServiceConnection$Stub$Proxy -android.bluetooth.IBluetoothSap -android.bluetooth.IBluetoothSap$Stub -android.bluetooth.IBluetoothStateChangeCallback -android.bluetooth.IBluetoothStateChangeCallback$Stub -android.bluetooth.IBluetoothStateChangeCallback$Stub$Proxy -android.bluetooth.OobData -android.bluetooth.UidTraffic -android.bluetooth.UidTraffic$1 -android.bluetooth.le.AdvertiseData -android.bluetooth.le.AdvertisingSetParameters -android.bluetooth.le.BluetoothLeAdvertiser -android.bluetooth.le.BluetoothLeScanner -android.bluetooth.le.BluetoothLeScanner$BleScanCallbackWrapper -android.bluetooth.le.BluetoothLeScanner$BleScanCallbackWrapper$1 -android.bluetooth.le.BluetoothLeUtils -android.bluetooth.le.IAdvertisingSetCallback -android.bluetooth.le.IPeriodicAdvertisingCallback -android.bluetooth.le.IScannerCallback -android.bluetooth.le.IScannerCallback$Stub -android.bluetooth.le.IScannerCallback$Stub$Proxy -android.bluetooth.le.PeriodicAdvertisingParameters -android.bluetooth.le.ScanCallback -android.bluetooth.le.ScanFilter -android.bluetooth.le.ScanFilter$1 -android.bluetooth.le.ScanFilter$Builder -android.bluetooth.le.ScanRecord -android.bluetooth.le.ScanResult -android.bluetooth.le.ScanResult$1 -android.bluetooth.le.ScanSettings -android.bluetooth.le.ScanSettings$1 -android.bluetooth.le.ScanSettings$Builder -android.companion.AssociationRequest -android.companion.CompanionDeviceManager -android.companion.ICompanionDeviceManager -android.companion.ICompanionDeviceManager$Stub -android.companion.IFindDeviceCallback -android.content.AbstractThreadedSyncAdapter -android.content.AbstractThreadedSyncAdapter$ISyncAdapterImpl -android.content.AbstractThreadedSyncAdapter$SyncThread -android.content.ActivityNotFoundException -android.content.AsyncQueryHandler -android.content.AsyncQueryHandler$WorkerArgs -android.content.AsyncQueryHandler$WorkerHandler -android.content.AsyncTaskLoader -android.content.AsyncTaskLoader$LoadTask -android.content.BroadcastReceiver -android.content.BroadcastReceiver$PendingResult -android.content.BroadcastReceiver$PendingResult$1 -android.content.ClipData -android.content.ClipData$1 -android.content.ClipData$Item -android.content.ClipDescription -android.content.ClipDescription$1 -android.content.ClipboardManager -android.content.ClipboardManager$1 -android.content.ClipboardManager$2 -android.content.ClipboardManager$OnPrimaryClipChangedListener -android.content.ComponentCallbacks -android.content.ComponentCallbacks2 -android.content.ComponentName -android.content.ComponentName$1 -android.content.ContentProvider -android.content.ContentProvider$PipeDataWriter -android.content.ContentProvider$Transport -android.content.ContentProviderClient -android.content.ContentProviderClient$CursorWrapperInner -android.content.ContentProviderNative -android.content.ContentProviderOperation -android.content.ContentProviderOperation$1 -android.content.ContentProviderOperation$Builder -android.content.ContentProviderProxy -android.content.ContentProviderResult -android.content.ContentProviderResult$1 -android.content.ContentQueryMap -android.content.ContentResolver -android.content.ContentResolver$1 -android.content.ContentResolver$CursorWrapperInner -android.content.ContentResolver$ParcelFileDescriptorInner -android.content.ContentUris -android.content.ContentValues -android.content.ContentValues$1 -android.content.Context -android.content.ContextWrapper -android.content.CursorLoader -android.content.DialogInterface -android.content.DialogInterface$OnCancelListener -android.content.DialogInterface$OnClickListener -android.content.DialogInterface$OnDismissListener -android.content.DialogInterface$OnKeyListener -android.content.DialogInterface$OnMultiChoiceClickListener -android.content.DialogInterface$OnShowListener -android.content.IClipboard -android.content.IClipboard$Stub -android.content.IClipboard$Stub$Proxy -android.content.IContentProvider -android.content.IContentService -android.content.IContentService$Stub -android.content.IContentService$Stub$Proxy -android.content.IIntentReceiver -android.content.IIntentReceiver$Stub -android.content.IIntentReceiver$Stub$Proxy -android.content.IIntentSender -android.content.IIntentSender$Stub -android.content.IIntentSender$Stub$Proxy -android.content.IOnPrimaryClipChangedListener -android.content.IOnPrimaryClipChangedListener$Stub -android.content.IRestrictionsManager -android.content.IRestrictionsManager$Stub -android.content.IRestrictionsManager$Stub$Proxy -android.content.ISyncAdapter -android.content.ISyncAdapter$Stub -android.content.ISyncAdapter$Stub$Proxy -android.content.ISyncContext -android.content.ISyncContext$Stub -android.content.ISyncContext$Stub$Proxy -android.content.ISyncStatusObserver -android.content.ISyncStatusObserver$Stub -android.content.ISyncStatusObserver$Stub$Proxy -android.content.Intent -android.content.Intent$1 -android.content.Intent$FilterComparison -android.content.Intent$ShortcutIconResource -android.content.Intent$ShortcutIconResource$1 -android.content.IntentFilter -android.content.IntentFilter$1 -android.content.IntentFilter$AuthorityEntry -android.content.IntentFilter$MalformedMimeTypeException -android.content.IntentSender -android.content.IntentSender$1 -android.content.IntentSender$SendIntentException -android.content.Loader -android.content.Loader$ForceLoadContentObserver -android.content.Loader$OnLoadCanceledListener -android.content.Loader$OnLoadCompleteListener -android.content.OperationApplicationException -android.content.PeriodicSync -android.content.PeriodicSync$1 -android.content.ReceiverCallNotAllowedException -android.content.RestrictionEntry -android.content.RestrictionEntry$1 -android.content.RestrictionsManager -android.content.SearchRecentSuggestionsProvider -android.content.SearchRecentSuggestionsProvider$DatabaseHelper -android.content.ServiceConnection -android.content.SharedPreferences -android.content.SharedPreferences$Editor -android.content.SharedPreferences$OnSharedPreferenceChangeListener -android.content.SyncAdapterType -android.content.SyncAdapterType$1 -android.content.SyncAdaptersCache -android.content.SyncAdaptersCache$MySerializer -android.content.SyncContext -android.content.SyncInfo -android.content.SyncInfo$1 -android.content.SyncRequest -android.content.SyncRequest$1 -android.content.SyncRequest$Builder -android.content.SyncResult -android.content.SyncResult$1 -android.content.SyncStats -android.content.SyncStats$1 -android.content.SyncStatusInfo -android.content.SyncStatusInfo$1 -android.content.SyncStatusObserver -android.content.UndoManager -android.content.UndoManager$UndoState -android.content.UndoOperation -android.content.UndoOwner -android.content.UriMatcher -android.content.om.IOverlayManager -android.content.om.IOverlayManager$Stub -android.content.om.OverlayInfo -android.content.pm.ActivityInfo -android.content.pm.ActivityInfo$1 -android.content.pm.ActivityInfo$WindowLayout -android.content.pm.ApplicationInfo -android.content.pm.ApplicationInfo$1 -android.content.pm.AuxiliaryResolveInfo -android.content.pm.BaseParceledListSlice -android.content.pm.BaseParceledListSlice$1 -android.content.pm.ChangedPackages -android.content.pm.ComponentInfo -android.content.pm.ConfigurationInfo -android.content.pm.ConfigurationInfo$1 -android.content.pm.FallbackCategoryProvider -android.content.pm.FeatureGroupInfo -android.content.pm.FeatureGroupInfo$1 -android.content.pm.FeatureInfo -android.content.pm.FeatureInfo$1 -android.content.pm.ILauncherApps -android.content.pm.ILauncherApps$Stub -android.content.pm.ILauncherApps$Stub$Proxy -android.content.pm.IOnAppsChangedListener -android.content.pm.IOnAppsChangedListener$Stub -android.content.pm.IOnAppsChangedListener$Stub$Proxy -android.content.pm.IOnPermissionsChangeListener -android.content.pm.IOnPermissionsChangeListener$Stub -android.content.pm.IOnPermissionsChangeListener$Stub$Proxy -android.content.pm.IOtaDexopt -android.content.pm.IOtaDexopt$Stub -android.content.pm.IPackageDataObserver -android.content.pm.IPackageDataObserver$Stub -android.content.pm.IPackageDataObserver$Stub$Proxy -android.content.pm.IPackageDeleteObserver -android.content.pm.IPackageDeleteObserver2 -android.content.pm.IPackageInstallObserver -android.content.pm.IPackageInstallObserver2 -android.content.pm.IPackageInstallObserver2$Stub -android.content.pm.IPackageInstaller -android.content.pm.IPackageInstaller$Stub -android.content.pm.IPackageInstaller$Stub$Proxy -android.content.pm.IPackageInstallerCallback -android.content.pm.IPackageInstallerCallback$Stub -android.content.pm.IPackageInstallerCallback$Stub$Proxy -android.content.pm.IPackageInstallerSession -android.content.pm.IPackageInstallerSession$Stub -android.content.pm.IPackageInstallerSession$Stub$Proxy -android.content.pm.IPackageManager -android.content.pm.IPackageManager$Stub -android.content.pm.IPackageManager$Stub$Proxy -android.content.pm.IPackageMoveObserver -android.content.pm.IPackageMoveObserver$Stub -android.content.pm.IPackageMoveObserver$Stub$Proxy -android.content.pm.IPackageStatsObserver -android.content.pm.IPackageStatsObserver$Stub -android.content.pm.IShortcutService -android.content.pm.IShortcutService$Stub -android.content.pm.IShortcutService$Stub$Proxy -android.content.pm.InstantAppRequest -android.content.pm.InstantAppResolveInfo$InstantAppDigest -android.content.pm.InstantAppResolveInfo$InstantAppDigest$1 -android.content.pm.InstrumentationInfo -android.content.pm.InstrumentationInfo$1 -android.content.pm.IntentFilterVerificationInfo -android.content.pm.IntentFilterVerificationInfo$1 -android.content.pm.KeySet -android.content.pm.LauncherActivityInfo -android.content.pm.LauncherApps -android.content.pm.LauncherApps$1 -android.content.pm.LauncherApps$Callback -android.content.pm.LauncherApps$CallbackMessageHandler -android.content.pm.LauncherApps$CallbackMessageHandler$CallbackInfo -android.content.pm.LauncherApps$ShortcutQuery -android.content.pm.PackageCleanItem -android.content.pm.PackageInfo -android.content.pm.PackageInfo$1 -android.content.pm.PackageInfoLite -android.content.pm.PackageInfoLite$1 -android.content.pm.PackageInstaller -android.content.pm.PackageInstaller$Session -android.content.pm.PackageInstaller$SessionCallback -android.content.pm.PackageInstaller$SessionCallbackDelegate -android.content.pm.PackageInstaller$SessionInfo -android.content.pm.PackageInstaller$SessionInfo$1 -android.content.pm.PackageInstaller$SessionParams -android.content.pm.PackageInstaller$SessionParams$1 -android.content.pm.PackageItemInfo -android.content.pm.PackageManager -android.content.pm.PackageManager$MoveCallback -android.content.pm.PackageManager$NameNotFoundException -android.content.pm.PackageManager$OnPermissionsChangedListener -android.content.pm.PackageManagerInternal -android.content.pm.PackageManagerInternal$ExternalSourcesPolicy -android.content.pm.PackageManagerInternal$PackagesProvider -android.content.pm.PackageManagerInternal$SyncAdapterPackagesProvider -android.content.pm.PackageParser -android.content.pm.PackageParser$Activity -android.content.pm.PackageParser$Activity$1 -android.content.pm.PackageParser$ActivityIntentInfo -android.content.pm.PackageParser$ApkLite -android.content.pm.PackageParser$Callback -android.content.pm.PackageParser$CallbackImpl -android.content.pm.PackageParser$Component -android.content.pm.PackageParser$IntentInfo -android.content.pm.PackageParser$NewPermissionInfo -android.content.pm.PackageParser$Package -android.content.pm.PackageParser$Package$1 -android.content.pm.PackageParser$PackageLite -android.content.pm.PackageParser$PackageParserException -android.content.pm.PackageParser$ParseComponentArgs -android.content.pm.PackageParser$ParsePackageItemArgs -android.content.pm.PackageParser$Permission -android.content.pm.PackageParser$Permission$1 -android.content.pm.PackageParser$PermissionGroup -android.content.pm.PackageParser$PermissionGroup$1 -android.content.pm.PackageParser$Provider -android.content.pm.PackageParser$Provider$1 -android.content.pm.PackageParser$ProviderIntentInfo -android.content.pm.PackageParser$Service -android.content.pm.PackageParser$Service$1 -android.content.pm.PackageParser$ServiceIntentInfo -android.content.pm.PackageParser$SplitNameComparator -android.content.pm.PackageParser$SplitPermissionInfo -android.content.pm.PackageStats -android.content.pm.PackageUserState -android.content.pm.ParceledListSlice -android.content.pm.ParceledListSlice$1 -android.content.pm.PathPermission -android.content.pm.PathPermission$1 -android.content.pm.PermissionGroupInfo -android.content.pm.PermissionGroupInfo$1 -android.content.pm.PermissionInfo -android.content.pm.PermissionInfo$1 -android.content.pm.ProviderInfo -android.content.pm.ProviderInfo$1 -android.content.pm.RegisteredServicesCache -android.content.pm.RegisteredServicesCache$1 -android.content.pm.RegisteredServicesCache$2 -android.content.pm.RegisteredServicesCache$3 -android.content.pm.RegisteredServicesCache$ServiceInfo -android.content.pm.RegisteredServicesCache$UserServices -android.content.pm.RegisteredServicesCacheListener -android.content.pm.ResolveInfo -android.content.pm.ResolveInfo$1 -android.content.pm.SELinuxUtil -android.content.pm.ServiceInfo -android.content.pm.ServiceInfo$1 -android.content.pm.SharedLibraryInfo -android.content.pm.SharedLibraryInfo$1 -android.content.pm.ShortcutInfo -android.content.pm.ShortcutInfo$1 -android.content.pm.ShortcutInfo$Builder -android.content.pm.ShortcutManager -android.content.pm.ShortcutServiceInternal -android.content.pm.ShortcutServiceInternal$ShortcutChangeListener -android.content.pm.Signature -android.content.pm.Signature$1 -android.content.pm.StringParceledListSlice -android.content.pm.StringParceledListSlice$1 -android.content.pm.UserInfo -android.content.pm.UserInfo$1 -android.content.pm.VerifierDeviceIdentity -android.content.pm.VerifierInfo -android.content.pm.VersionedPackage -android.content.pm.VersionedPackage$1 -android.content.pm.XmlSerializerAndParser -android.content.pm.split.DefaultSplitAssetLoader -android.content.pm.split.SplitAssetLoader -android.content.pm.split.SplitDependencyLoader$IllegalDependencyException -android.content.res.AssetFileDescriptor -android.content.res.AssetFileDescriptor$1 -android.content.res.AssetFileDescriptor$AutoCloseInputStream -android.content.res.AssetManager -android.content.res.AssetManager$AssetInputStream -android.content.res.ColorStateList -android.content.res.ColorStateList$1 -android.content.res.ColorStateList$ColorStateListFactory -android.content.res.CompatResources -android.content.res.CompatibilityInfo -android.content.res.CompatibilityInfo$1 -android.content.res.CompatibilityInfo$2 -android.content.res.ComplexColor -android.content.res.Configuration -android.content.res.Configuration$1 -android.content.res.ConfigurationBoundResourceCache -android.content.res.ConstantState -android.content.res.DrawableCache -android.content.res.GradientColor -android.content.res.ObbInfo -android.content.res.ObbInfo$1 -android.content.res.ObbScanner -android.content.res.Resources -android.content.res.Resources$NotFoundException -android.content.res.Resources$Theme -android.content.res.Resources$ThemeKey -android.content.res.ResourcesImpl -android.content.res.ResourcesImpl$ThemeImpl -android.content.res.ResourcesKey -android.content.res.StringBlock -android.content.res.StringBlock$StyleIDs -android.content.res.ThemedResourceCache -android.content.res.TypedArray -android.content.res.XmlBlock -android.content.res.XmlBlock$Parser -android.content.res.XmlResourceParser -android.database.AbstractCursor -android.database.AbstractCursor$SelfContentObserver -android.database.AbstractWindowedCursor -android.database.BulkCursorDescriptor -android.database.BulkCursorDescriptor$1 -android.database.BulkCursorNative -android.database.BulkCursorProxy -android.database.BulkCursorToCursorAdaptor -android.database.CharArrayBuffer -android.database.ContentObservable -android.database.ContentObserver -android.database.ContentObserver$NotificationRunnable -android.database.ContentObserver$Transport -android.database.CrossProcessCursor -android.database.CrossProcessCursorWrapper -android.database.Cursor -android.database.CursorIndexOutOfBoundsException -android.database.CursorToBulkCursorAdaptor -android.database.CursorToBulkCursorAdaptor$ContentObserverProxy -android.database.CursorWindow -android.database.CursorWindow$1 -android.database.CursorWrapper -android.database.DataSetObservable -android.database.DataSetObserver -android.database.DatabaseErrorHandler -android.database.DatabaseUtils -android.database.DatabaseUtils$InsertHelper -android.database.DefaultDatabaseErrorHandler -android.database.IBulkCursor -android.database.IContentObserver -android.database.IContentObserver$Stub -android.database.IContentObserver$Stub$Proxy -android.database.MatrixCursor -android.database.MatrixCursor$RowBuilder -android.database.MergeCursor -android.database.MergeCursor$1 -android.database.Observable -android.database.SQLException -android.database.StaleDataException -android.database.sqlite.DatabaseObjectNotClosedException -android.database.sqlite.SQLiteAbortException -android.database.sqlite.SQLiteCantOpenDatabaseException -android.database.sqlite.SQLiteClosable -android.database.sqlite.SQLiteConnection -android.database.sqlite.SQLiteConnection$Operation -android.database.sqlite.SQLiteConnection$OperationLog -android.database.sqlite.SQLiteConnection$PreparedStatement -android.database.sqlite.SQLiteConnection$PreparedStatementCache -android.database.sqlite.SQLiteConnectionPool -android.database.sqlite.SQLiteConnectionPool$AcquiredConnectionStatus -android.database.sqlite.SQLiteConnectionPool$ConnectionWaiter -android.database.sqlite.SQLiteConstraintException -android.database.sqlite.SQLiteCursor -android.database.sqlite.SQLiteCursorDriver -android.database.sqlite.SQLiteCustomFunction -android.database.sqlite.SQLiteDatabase -android.database.sqlite.SQLiteDatabase$1 -android.database.sqlite.SQLiteDatabase$2 -android.database.sqlite.SQLiteDatabase$CursorFactory -android.database.sqlite.SQLiteDatabase$CustomFunction -android.database.sqlite.SQLiteDatabaseConfiguration -android.database.sqlite.SQLiteDatabaseCorruptException -android.database.sqlite.SQLiteDatabaseLockedException -android.database.sqlite.SQLiteDebug -android.database.sqlite.SQLiteDebug$PagerStats -android.database.sqlite.SQLiteDirectCursorDriver -android.database.sqlite.SQLiteDiskIOException -android.database.sqlite.SQLiteDoneException -android.database.sqlite.SQLiteException -android.database.sqlite.SQLiteFullException -android.database.sqlite.SQLiteGlobal -android.database.sqlite.SQLiteOpenHelper -android.database.sqlite.SQLiteProgram -android.database.sqlite.SQLiteQuery -android.database.sqlite.SQLiteQueryBuilder -android.database.sqlite.SQLiteReadOnlyDatabaseException -android.database.sqlite.SQLiteSession -android.database.sqlite.SQLiteSession$Transaction -android.database.sqlite.SQLiteStatement -android.database.sqlite.SQLiteStatementInfo -android.database.sqlite.SQLiteTransactionListener -android.database.sqlite.SqliteWrapper -android.ddm.DdmHandleAppName -android.ddm.DdmHandleExit -android.ddm.DdmHandleHeap -android.ddm.DdmHandleHello -android.ddm.DdmHandleNativeHeap -android.ddm.DdmHandleProfiling -android.ddm.DdmHandleThread -android.ddm.DdmHandleViewDebug -android.ddm.DdmRegister -android.drm.DrmManagerClient$OnErrorListener -android.drm.DrmManagerClient$OnEventListener -android.drm.DrmManagerClient$OnInfoListener -android.drm.DrmOutputStream -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8 -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8$1 -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8$2 -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8$4 -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8$6 -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8$7 -android.graphics.-$Lambda$ZrP-zejiEXAqfwV-MyP5lE9mYC8$8 -android.graphics.BaseCanvas -android.graphics.Bitmap -android.graphics.Bitmap$1 -android.graphics.Bitmap$CompressFormat -android.graphics.Bitmap$Config -android.graphics.BitmapFactory -android.graphics.BitmapFactory$Options -android.graphics.BitmapRegionDecoder -android.graphics.BitmapShader -android.graphics.BlurMaskFilter -android.graphics.BlurMaskFilter$Blur -android.graphics.Camera -android.graphics.Canvas -android.graphics.Canvas$EdgeType -android.graphics.Canvas$NoImagePreloadHolder -android.graphics.CanvasProperty -android.graphics.Color -android.graphics.ColorFilter -android.graphics.ColorMatrix -android.graphics.ColorMatrixColorFilter -android.graphics.ColorSpace -android.graphics.ColorSpace$Adaptation -android.graphics.ColorSpace$Lab -android.graphics.ColorSpace$Model -android.graphics.ColorSpace$Named -android.graphics.ColorSpace$Rgb -android.graphics.ColorSpace$Rgb$TransferParameters -android.graphics.ColorSpace$Xyz -android.graphics.ComposePathEffect -android.graphics.ComposeShader -android.graphics.CornerPathEffect -android.graphics.DashPathEffect -android.graphics.DiscretePathEffect -android.graphics.DrawFilter -android.graphics.EmbossMaskFilter -android.graphics.FontFamily -android.graphics.FontListParser -android.graphics.GraphicBuffer -android.graphics.GraphicBuffer$1 -android.graphics.ImageFormat -android.graphics.Insets -android.graphics.Interpolator -android.graphics.Interpolator$Result -android.graphics.LightingColorFilter -android.graphics.LinearGradient -android.graphics.MaskFilter -android.graphics.Matrix -android.graphics.Matrix$1 -android.graphics.Matrix$NoImagePreloadHolder -android.graphics.Matrix$ScaleToFit -android.graphics.Movie -android.graphics.NinePatch -android.graphics.NinePatch$InsetStruct -android.graphics.Outline -android.graphics.Paint -android.graphics.Paint$Align -android.graphics.Paint$Cap -android.graphics.Paint$FontMetrics -android.graphics.Paint$FontMetricsInt -android.graphics.Paint$Join -android.graphics.Paint$NoImagePreloadHolder -android.graphics.Paint$Style -android.graphics.PaintFlagsDrawFilter -android.graphics.Path -android.graphics.Path$Direction -android.graphics.Path$FillType -android.graphics.Path$Op -android.graphics.PathDashPathEffect -android.graphics.PathEffect -android.graphics.PathMeasure -android.graphics.Picture -android.graphics.Picture$RecordingCanvas -android.graphics.PixelFormat -android.graphics.Point -android.graphics.Point$1 -android.graphics.PointF -android.graphics.PointF$1 -android.graphics.PorterDuff -android.graphics.PorterDuff$Mode -android.graphics.PorterDuffColorFilter -android.graphics.PorterDuffXfermode -android.graphics.RadialGradient -android.graphics.Rect -android.graphics.Rect$1 -android.graphics.Rect$UnflattenHelper -android.graphics.RectF -android.graphics.RectF$1 -android.graphics.Region -android.graphics.Region$1 -android.graphics.Region$Op -android.graphics.RegionIterator -android.graphics.Shader -android.graphics.Shader$TileMode -android.graphics.SumPathEffect -android.graphics.SurfaceTexture -android.graphics.SurfaceTexture$1 -android.graphics.SurfaceTexture$OnFrameAvailableListener -android.graphics.SweepGradient -android.graphics.TableMaskFilter -android.graphics.TemporaryBuffer -android.graphics.Typeface -android.graphics.Typeface$Builder -android.graphics.Xfermode -android.graphics.YuvImage -android.graphics.drawable.AdaptiveIconDrawable -android.graphics.drawable.AdaptiveIconDrawable$ChildDrawable -android.graphics.drawable.AdaptiveIconDrawable$LayerState -android.graphics.drawable.Animatable -android.graphics.drawable.Animatable2 -android.graphics.drawable.Animatable2$AnimationCallback -android.graphics.drawable.AnimatedStateListDrawable -android.graphics.drawable.AnimatedStateListDrawable$AnimatedStateListState -android.graphics.drawable.AnimatedStateListDrawable$AnimatedVectorDrawableTransition -android.graphics.drawable.AnimatedStateListDrawable$AnimationDrawableTransition -android.graphics.drawable.AnimatedStateListDrawable$FrameInterpolator -android.graphics.drawable.AnimatedStateListDrawable$Transition -android.graphics.drawable.AnimatedVectorDrawable -android.graphics.drawable.AnimatedVectorDrawable$1 -android.graphics.drawable.AnimatedVectorDrawable$2 -android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState -android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState$PendingAnimator -android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimator -android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimatorRT -android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimatorUI -android.graphics.drawable.AnimationDrawable -android.graphics.drawable.AnimationDrawable$AnimationState -android.graphics.drawable.BitmapDrawable -android.graphics.drawable.BitmapDrawable$BitmapState -android.graphics.drawable.ClipDrawable -android.graphics.drawable.ClipDrawable$ClipState -android.graphics.drawable.ColorDrawable -android.graphics.drawable.ColorDrawable$ColorState -android.graphics.drawable.Drawable -android.graphics.drawable.Drawable$Callback -android.graphics.drawable.Drawable$ConstantState -android.graphics.drawable.DrawableContainer -android.graphics.drawable.DrawableContainer$1 -android.graphics.drawable.DrawableContainer$BlockInvalidateCallback -android.graphics.drawable.DrawableContainer$DrawableContainerState -android.graphics.drawable.DrawableInflater -android.graphics.drawable.DrawableWrapper -android.graphics.drawable.DrawableWrapper$DrawableWrapperState -android.graphics.drawable.GradientDrawable -android.graphics.drawable.GradientDrawable$GradientState -android.graphics.drawable.GradientDrawable$Orientation -android.graphics.drawable.Icon -android.graphics.drawable.Icon$1 -android.graphics.drawable.InsetDrawable -android.graphics.drawable.InsetDrawable$InsetState -android.graphics.drawable.InsetDrawable$InsetValue -android.graphics.drawable.LayerDrawable -android.graphics.drawable.LayerDrawable$ChildDrawable -android.graphics.drawable.LayerDrawable$LayerState -android.graphics.drawable.NinePatchDrawable -android.graphics.drawable.NinePatchDrawable$NinePatchState -android.graphics.drawable.PaintDrawable -android.graphics.drawable.PictureDrawable -android.graphics.drawable.RippleBackground -android.graphics.drawable.RippleBackground$1 -android.graphics.drawable.RippleBackground$BackgroundProperty -android.graphics.drawable.RippleComponent -android.graphics.drawable.RippleComponent$RenderNodeAnimatorSet -android.graphics.drawable.RippleDrawable -android.graphics.drawable.RippleDrawable$RippleState -android.graphics.drawable.RippleForeground -android.graphics.drawable.RippleForeground$1 -android.graphics.drawable.RippleForeground$2 -android.graphics.drawable.RippleForeground$3 -android.graphics.drawable.RippleForeground$4 -android.graphics.drawable.RippleForeground$LogDecelerateInterpolator -android.graphics.drawable.RotateDrawable -android.graphics.drawable.RotateDrawable$RotateState -android.graphics.drawable.ScaleDrawable -android.graphics.drawable.ScaleDrawable$ScaleState -android.graphics.drawable.ShapeDrawable -android.graphics.drawable.ShapeDrawable$ShaderFactory -android.graphics.drawable.ShapeDrawable$ShapeState -android.graphics.drawable.StateListDrawable -android.graphics.drawable.StateListDrawable$StateListState -android.graphics.drawable.TransitionDrawable -android.graphics.drawable.TransitionDrawable$TransitionState -android.graphics.drawable.VectorDrawable -android.graphics.drawable.VectorDrawable$VClipPath -android.graphics.drawable.VectorDrawable$VFullPath -android.graphics.drawable.VectorDrawable$VFullPath$1 -android.graphics.drawable.VectorDrawable$VFullPath$10 -android.graphics.drawable.VectorDrawable$VFullPath$2 -android.graphics.drawable.VectorDrawable$VFullPath$3 -android.graphics.drawable.VectorDrawable$VFullPath$4 -android.graphics.drawable.VectorDrawable$VFullPath$5 -android.graphics.drawable.VectorDrawable$VFullPath$6 -android.graphics.drawable.VectorDrawable$VFullPath$7 -android.graphics.drawable.VectorDrawable$VFullPath$8 -android.graphics.drawable.VectorDrawable$VFullPath$9 -android.graphics.drawable.VectorDrawable$VGroup -android.graphics.drawable.VectorDrawable$VGroup$1 -android.graphics.drawable.VectorDrawable$VGroup$2 -android.graphics.drawable.VectorDrawable$VGroup$3 -android.graphics.drawable.VectorDrawable$VGroup$4 -android.graphics.drawable.VectorDrawable$VGroup$5 -android.graphics.drawable.VectorDrawable$VGroup$6 -android.graphics.drawable.VectorDrawable$VGroup$7 -android.graphics.drawable.VectorDrawable$VGroup$8 -android.graphics.drawable.VectorDrawable$VGroup$9 -android.graphics.drawable.VectorDrawable$VObject -android.graphics.drawable.VectorDrawable$VPath -android.graphics.drawable.VectorDrawable$VPath$1 -android.graphics.drawable.VectorDrawable$VectorDrawableState -android.graphics.drawable.VectorDrawable$VectorDrawableState$1 -android.graphics.drawable.shapes.OvalShape -android.graphics.drawable.shapes.RectShape -android.graphics.drawable.shapes.RoundRectShape -android.graphics.drawable.shapes.Shape -android.graphics.fonts.FontVariationAxis -android.graphics.pdf.PdfDocument -android.graphics.pdf.PdfEditor -android.graphics.pdf.PdfRenderer -android.hardware.Camera -android.hardware.Camera$CameraInfo -android.hardware.Camera$ErrorCallback -android.hardware.Camera$Face -android.hardware.CameraStatus -android.hardware.CameraStatus$1 -android.hardware.ConsumerIrManager -android.hardware.GeomagneticField -android.hardware.GeomagneticField$LegendreTable -android.hardware.HardwareBuffer -android.hardware.HardwareBuffer$1 -android.hardware.ICameraService -android.hardware.ICameraService$Stub -android.hardware.ICameraService$Stub$Proxy -android.hardware.ICameraServiceListener -android.hardware.ICameraServiceListener$Stub -android.hardware.ICameraServiceProxy -android.hardware.ICameraServiceProxy$Stub -android.hardware.IConsumerIrService -android.hardware.IConsumerIrService$Stub -android.hardware.ISerialManager -android.hardware.ISerialManager$Stub -android.hardware.Sensor -android.hardware.SensorAdditionalInfo -android.hardware.SensorEvent -android.hardware.SensorEventListener -android.hardware.SensorManager -android.hardware.SerialManager -android.hardware.SerialPort -android.hardware.SystemSensorManager -android.hardware.SystemSensorManager$BaseEventQueue -android.hardware.SystemSensorManager$SensorEventQueue -android.hardware.SystemSensorManager$TriggerEventQueue -android.hardware.TriggerEvent -android.hardware.TriggerEventListener -android.hardware.camera2.CameraAccessException -android.hardware.camera2.CameraCaptureSession -android.hardware.camera2.CameraCaptureSession$CaptureCallback -android.hardware.camera2.CameraCaptureSession$StateCallback -android.hardware.camera2.CameraCharacteristics -android.hardware.camera2.CameraCharacteristics$1 -android.hardware.camera2.CameraCharacteristics$2 -android.hardware.camera2.CameraCharacteristics$3 -android.hardware.camera2.CameraCharacteristics$4 -android.hardware.camera2.CameraCharacteristics$5 -android.hardware.camera2.CameraCharacteristics$Key -android.hardware.camera2.CameraDevice -android.hardware.camera2.CameraDevice$StateCallback -android.hardware.camera2.CameraManager -android.hardware.camera2.CameraManager$AvailabilityCallback -android.hardware.camera2.CameraManager$CameraManagerGlobal -android.hardware.camera2.CameraManager$CameraManagerGlobal$1 -android.hardware.camera2.CameraManager$CameraManagerGlobal$2 -android.hardware.camera2.CameraManager$CameraManagerGlobal$3 -android.hardware.camera2.CameraManager$CameraManagerGlobal$4 -android.hardware.camera2.CameraManager$TorchCallback -android.hardware.camera2.CameraMetadata -android.hardware.camera2.CaptureFailure -android.hardware.camera2.CaptureRequest -android.hardware.camera2.CaptureRequest$1 -android.hardware.camera2.CaptureRequest$2 -android.hardware.camera2.CaptureRequest$Builder -android.hardware.camera2.CaptureRequest$Key -android.hardware.camera2.CaptureResult -android.hardware.camera2.CaptureResult$1 -android.hardware.camera2.CaptureResult$2 -android.hardware.camera2.CaptureResult$3 -android.hardware.camera2.CaptureResult$Key -android.hardware.camera2.DngCreator -android.hardware.camera2.ICameraDeviceCallbacks -android.hardware.camera2.ICameraDeviceCallbacks$Stub -android.hardware.camera2.ICameraDeviceUser -android.hardware.camera2.ICameraDeviceUser$Stub -android.hardware.camera2.ICameraDeviceUser$Stub$Proxy -android.hardware.camera2.TotalCaptureResult -android.hardware.camera2.dispatch.ArgumentReplacingDispatcher -android.hardware.camera2.dispatch.BroadcastDispatcher -android.hardware.camera2.dispatch.Dispatchable -android.hardware.camera2.dispatch.DuckTypingDispatcher -android.hardware.camera2.dispatch.HandlerDispatcher -android.hardware.camera2.dispatch.HandlerDispatcher$1 -android.hardware.camera2.dispatch.InvokeDispatcher -android.hardware.camera2.dispatch.MethodNameInvoker -android.hardware.camera2.impl.CallbackProxies$DeviceCaptureCallbackProxy -android.hardware.camera2.impl.CallbackProxies$SessionStateCallbackProxy -android.hardware.camera2.impl.CameraCaptureSessionCore -android.hardware.camera2.impl.CameraCaptureSessionImpl -android.hardware.camera2.impl.CameraCaptureSessionImpl$1 -android.hardware.camera2.impl.CameraCaptureSessionImpl$2 -android.hardware.camera2.impl.CameraCaptureSessionImpl$AbortDrainListener -android.hardware.camera2.impl.CameraCaptureSessionImpl$IdleDrainListener -android.hardware.camera2.impl.CameraCaptureSessionImpl$SequenceDrainListener -android.hardware.camera2.impl.CameraDeviceImpl -android.hardware.camera2.impl.CameraDeviceImpl$1 -android.hardware.camera2.impl.CameraDeviceImpl$10 -android.hardware.camera2.impl.CameraDeviceImpl$2 -android.hardware.camera2.impl.CameraDeviceImpl$3 -android.hardware.camera2.impl.CameraDeviceImpl$4 -android.hardware.camera2.impl.CameraDeviceImpl$5 -android.hardware.camera2.impl.CameraDeviceImpl$6 -android.hardware.camera2.impl.CameraDeviceImpl$7 -android.hardware.camera2.impl.CameraDeviceImpl$9 -android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks -android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$2 -android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$3 -android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$4 -android.hardware.camera2.impl.CameraDeviceImpl$CaptureCallback -android.hardware.camera2.impl.CameraDeviceImpl$CaptureCallbackHolder -android.hardware.camera2.impl.CameraDeviceImpl$FrameNumberTracker -android.hardware.camera2.impl.CameraDeviceImpl$RequestLastFrameNumbersHolder -android.hardware.camera2.impl.CameraDeviceImpl$StateCallbackKK -android.hardware.camera2.impl.CameraMetadataNative -android.hardware.camera2.impl.CameraMetadataNative$1 -android.hardware.camera2.impl.CameraMetadataNative$10 -android.hardware.camera2.impl.CameraMetadataNative$11 -android.hardware.camera2.impl.CameraMetadataNative$12 -android.hardware.camera2.impl.CameraMetadataNative$13 -android.hardware.camera2.impl.CameraMetadataNative$14 -android.hardware.camera2.impl.CameraMetadataNative$15 -android.hardware.camera2.impl.CameraMetadataNative$16 -android.hardware.camera2.impl.CameraMetadataNative$17 -android.hardware.camera2.impl.CameraMetadataNative$18 -android.hardware.camera2.impl.CameraMetadataNative$19 -android.hardware.camera2.impl.CameraMetadataNative$2 -android.hardware.camera2.impl.CameraMetadataNative$3 -android.hardware.camera2.impl.CameraMetadataNative$4 -android.hardware.camera2.impl.CameraMetadataNative$5 -android.hardware.camera2.impl.CameraMetadataNative$6 -android.hardware.camera2.impl.CameraMetadataNative$7 -android.hardware.camera2.impl.CameraMetadataNative$8 -android.hardware.camera2.impl.CameraMetadataNative$9 -android.hardware.camera2.impl.CameraMetadataNative$Key -android.hardware.camera2.impl.CaptureResultExtras -android.hardware.camera2.impl.CaptureResultExtras$1 -android.hardware.camera2.impl.GetCommand -android.hardware.camera2.impl.ICameraDeviceUserWrapper -android.hardware.camera2.impl.SetCommand -android.hardware.camera2.legacy.LegacyCameraDevice -android.hardware.camera2.legacy.LegacyExceptionUtils -android.hardware.camera2.legacy.LegacyExceptionUtils$BufferQueueAbandonedException -android.hardware.camera2.legacy.PerfMeasurement -android.hardware.camera2.marshal.MarshalHelpers -android.hardware.camera2.marshal.MarshalQueryable -android.hardware.camera2.marshal.MarshalRegistry -android.hardware.camera2.marshal.MarshalRegistry$MarshalToken -android.hardware.camera2.marshal.Marshaler -android.hardware.camera2.marshal.impl.MarshalQueryableArray -android.hardware.camera2.marshal.impl.MarshalQueryableArray$MarshalerArray -android.hardware.camera2.marshal.impl.MarshalQueryableBlackLevelPattern -android.hardware.camera2.marshal.impl.MarshalQueryableBlackLevelPattern$MarshalerBlackLevelPattern -android.hardware.camera2.marshal.impl.MarshalQueryableBoolean -android.hardware.camera2.marshal.impl.MarshalQueryableBoolean$MarshalerBoolean -android.hardware.camera2.marshal.impl.MarshalQueryableColorSpaceTransform -android.hardware.camera2.marshal.impl.MarshalQueryableColorSpaceTransform$MarshalerColorSpaceTransform -android.hardware.camera2.marshal.impl.MarshalQueryableEnum -android.hardware.camera2.marshal.impl.MarshalQueryableHighSpeedVideoConfiguration -android.hardware.camera2.marshal.impl.MarshalQueryableHighSpeedVideoConfiguration$MarshalerHighSpeedVideoConfiguration -android.hardware.camera2.marshal.impl.MarshalQueryableMeteringRectangle -android.hardware.camera2.marshal.impl.MarshalQueryableMeteringRectangle$MarshalerMeteringRectangle -android.hardware.camera2.marshal.impl.MarshalQueryableNativeByteToInteger -android.hardware.camera2.marshal.impl.MarshalQueryableNativeByteToInteger$MarshalerNativeByteToInteger -android.hardware.camera2.marshal.impl.MarshalQueryablePair -android.hardware.camera2.marshal.impl.MarshalQueryablePair$MarshalerPair -android.hardware.camera2.marshal.impl.MarshalQueryableParcelable -android.hardware.camera2.marshal.impl.MarshalQueryablePrimitive -android.hardware.camera2.marshal.impl.MarshalQueryablePrimitive$MarshalerPrimitive -android.hardware.camera2.marshal.impl.MarshalQueryableRange -android.hardware.camera2.marshal.impl.MarshalQueryableRange$MarshalerRange -android.hardware.camera2.marshal.impl.MarshalQueryableRect -android.hardware.camera2.marshal.impl.MarshalQueryableRect$MarshalerRect -android.hardware.camera2.marshal.impl.MarshalQueryableReprocessFormatsMap -android.hardware.camera2.marshal.impl.MarshalQueryableReprocessFormatsMap$MarshalerReprocessFormatsMap -android.hardware.camera2.marshal.impl.MarshalQueryableRggbChannelVector -android.hardware.camera2.marshal.impl.MarshalQueryableRggbChannelVector$MarshalerRggbChannelVector -android.hardware.camera2.marshal.impl.MarshalQueryableSize -android.hardware.camera2.marshal.impl.MarshalQueryableSize$MarshalerSize -android.hardware.camera2.marshal.impl.MarshalQueryableSizeF -android.hardware.camera2.marshal.impl.MarshalQueryableStreamConfiguration -android.hardware.camera2.marshal.impl.MarshalQueryableStreamConfiguration$MarshalerStreamConfiguration -android.hardware.camera2.marshal.impl.MarshalQueryableStreamConfigurationDuration -android.hardware.camera2.marshal.impl.MarshalQueryableStreamConfigurationDuration$MarshalerStreamConfigurationDuration -android.hardware.camera2.marshal.impl.MarshalQueryableString -android.hardware.camera2.params.BlackLevelPattern -android.hardware.camera2.params.ColorSpaceTransform -android.hardware.camera2.params.Face -android.hardware.camera2.params.HighSpeedVideoConfiguration -android.hardware.camera2.params.InputConfiguration -android.hardware.camera2.params.LensShadingMap -android.hardware.camera2.params.MeteringRectangle -android.hardware.camera2.params.OutputConfiguration -android.hardware.camera2.params.OutputConfiguration$1 -android.hardware.camera2.params.ReprocessFormatsMap -android.hardware.camera2.params.RggbChannelVector -android.hardware.camera2.params.StreamConfiguration -android.hardware.camera2.params.StreamConfigurationDuration -android.hardware.camera2.params.StreamConfigurationMap -android.hardware.camera2.params.TonemapCurve -android.hardware.camera2.utils.HashCodeHelpers -android.hardware.camera2.utils.SubmitInfo -android.hardware.camera2.utils.SubmitInfo$1 -android.hardware.camera2.utils.SurfaceUtils -android.hardware.camera2.utils.TaskDrainer -android.hardware.camera2.utils.TaskDrainer$1 -android.hardware.camera2.utils.TaskDrainer$DrainListener -android.hardware.camera2.utils.TaskSingleDrainer -android.hardware.camera2.utils.TypeReference -android.hardware.camera2.utils.TypeReference$SpecializedBaseTypeReference -android.hardware.camera2.utils.TypeReference$SpecializedTypeReference -android.hardware.display.DisplayManager -android.hardware.display.DisplayManager$DisplayListener -android.hardware.display.DisplayManagerGlobal -android.hardware.display.DisplayManagerGlobal$DisplayListenerDelegate -android.hardware.display.DisplayManagerGlobal$DisplayManagerCallback -android.hardware.display.DisplayManagerInternal -android.hardware.display.DisplayManagerInternal$DisplayPowerCallbacks -android.hardware.display.DisplayManagerInternal$DisplayPowerRequest -android.hardware.display.DisplayManagerInternal$DisplayTransactionListener -android.hardware.display.DisplayViewport -android.hardware.display.IDisplayManager -android.hardware.display.IDisplayManager$Stub -android.hardware.display.IDisplayManager$Stub$Proxy -android.hardware.display.IDisplayManagerCallback -android.hardware.display.IDisplayManagerCallback$Stub -android.hardware.display.IDisplayManagerCallback$Stub$Proxy -android.hardware.display.IVirtualDisplayCallback -android.hardware.display.WifiDisplay -android.hardware.display.WifiDisplay$1 -android.hardware.display.WifiDisplaySessionInfo -android.hardware.display.WifiDisplaySessionInfo$1 -android.hardware.display.WifiDisplayStatus -android.hardware.display.WifiDisplayStatus$1 -android.hardware.fingerprint.Fingerprint -android.hardware.fingerprint.Fingerprint$1 -android.hardware.fingerprint.FingerprintManager -android.hardware.fingerprint.FingerprintManager$1 -android.hardware.fingerprint.FingerprintManager$2 -android.hardware.fingerprint.FingerprintManager$AuthenticationCallback -android.hardware.fingerprint.FingerprintManager$AuthenticationResult -android.hardware.fingerprint.FingerprintManager$LockoutResetCallback -android.hardware.fingerprint.FingerprintManager$MyHandler -android.hardware.fingerprint.IFingerprintClientActiveCallback -android.hardware.fingerprint.IFingerprintService -android.hardware.fingerprint.IFingerprintService$Stub -android.hardware.fingerprint.IFingerprintService$Stub$Proxy -android.hardware.fingerprint.IFingerprintServiceLockoutResetCallback -android.hardware.fingerprint.IFingerprintServiceLockoutResetCallback$Stub -android.hardware.fingerprint.IFingerprintServiceLockoutResetCallback$Stub$Proxy -android.hardware.fingerprint.IFingerprintServiceReceiver -android.hardware.fingerprint.IFingerprintServiceReceiver$Stub -android.hardware.hdmi.HdmiControlManager -android.hardware.hdmi.HdmiPlaybackClient$DisplayStatusCallback -android.hardware.input.IInputDevicesChangedListener -android.hardware.input.IInputDevicesChangedListener$Stub -android.hardware.input.IInputDevicesChangedListener$Stub$Proxy -android.hardware.input.IInputManager -android.hardware.input.IInputManager$Stub -android.hardware.input.IInputManager$Stub$Proxy -android.hardware.input.ITabletModeChangedListener -android.hardware.input.InputDeviceIdentifier -android.hardware.input.InputDeviceIdentifier$1 -android.hardware.input.InputManager -android.hardware.input.InputManager$InputDeviceListener -android.hardware.input.InputManager$InputDeviceListenerDelegate -android.hardware.input.InputManager$InputDevicesChangedListener -android.hardware.input.InputManager$OnTabletModeChangedListener -android.hardware.input.InputManagerInternal -android.hardware.input.KeyboardLayout -android.hardware.input.KeyboardLayout$1 -android.hardware.input.TouchCalibration -android.hardware.input.TouchCalibration$1 -android.hardware.location.ActivityRecognitionHardware -android.hardware.location.ContextHubInfo -android.hardware.location.ContextHubInfo$1 -android.hardware.location.ContextHubManager -android.hardware.location.ContextHubManager$1 -android.hardware.location.ContextHubManager$Callback -android.hardware.location.ContextHubManager$ICallback -android.hardware.location.ContextHubMessage -android.hardware.location.ContextHubMessage$1 -android.hardware.location.GeofenceHardware -android.hardware.location.GeofenceHardware$GeofenceHardwareMonitorCallbackWrapper -android.hardware.location.GeofenceHardwareCallback -android.hardware.location.GeofenceHardwareImpl -android.hardware.location.GeofenceHardwareImpl$1 -android.hardware.location.GeofenceHardwareImpl$2 -android.hardware.location.GeofenceHardwareImpl$3 -android.hardware.location.GeofenceHardwareImpl$Reaper -android.hardware.location.GeofenceHardwareMonitorCallback -android.hardware.location.GeofenceHardwareService -android.hardware.location.GeofenceHardwareService$1 -android.hardware.location.IActivityRecognitionHardware -android.hardware.location.IActivityRecognitionHardware$Stub -android.hardware.location.IActivityRecognitionHardwareClient -android.hardware.location.IActivityRecognitionHardwareClient$Stub -android.hardware.location.IActivityRecognitionHardwareClient$Stub$Proxy -android.hardware.location.IActivityRecognitionHardwareWatcher -android.hardware.location.IContextHubCallback -android.hardware.location.IContextHubCallback$Stub -android.hardware.location.IContextHubCallback$Stub$Proxy -android.hardware.location.IContextHubService -android.hardware.location.IContextHubService$Stub -android.hardware.location.IContextHubService$Stub$Proxy -android.hardware.location.IFusedLocationHardware -android.hardware.location.IGeofenceHardware -android.hardware.location.IGeofenceHardware$Stub -android.hardware.location.IGeofenceHardware$Stub$Proxy -android.hardware.location.IGeofenceHardwareMonitorCallback -android.hardware.location.IGeofenceHardwareMonitorCallback$Stub -android.hardware.location.IGeofenceHardwareMonitorCallback$Stub$Proxy -android.hardware.location.MemoryRegion -android.hardware.location.MemoryRegion$1 -android.hardware.location.NanoApp -android.hardware.location.NanoAppFilter -android.hardware.location.NanoAppFilter$1 -android.hardware.location.NanoAppInstanceInfo -android.hardware.location.NanoAppInstanceInfo$1 -android.hardware.radio.RadioManager -android.hardware.radio.RadioManager$AmBandConfig -android.hardware.radio.RadioManager$AmBandConfig$1 -android.hardware.radio.RadioManager$AmBandDescriptor -android.hardware.radio.RadioManager$AmBandDescriptor$1 -android.hardware.radio.RadioManager$BandConfig -android.hardware.radio.RadioManager$BandConfig$1 -android.hardware.radio.RadioManager$BandDescriptor -android.hardware.radio.RadioManager$BandDescriptor$1 -android.hardware.radio.RadioManager$FmBandConfig -android.hardware.radio.RadioManager$FmBandConfig$1 -android.hardware.radio.RadioManager$FmBandDescriptor -android.hardware.radio.RadioManager$FmBandDescriptor$1 -android.hardware.radio.RadioManager$ModuleProperties -android.hardware.radio.RadioManager$ModuleProperties$1 -android.hardware.radio.RadioManager$ProgramInfo -android.hardware.radio.RadioManager$ProgramInfo$1 -android.hardware.radio.RadioMetadata -android.hardware.radio.RadioMetadata$1 -android.hardware.radio.RadioModule -android.hardware.radio.RadioTuner -android.hardware.radio.V1_0.Call -android.hardware.radio.V1_0.CardStatus -android.hardware.radio.V1_0.CdmaSignalStrength -android.hardware.radio.V1_0.CellIdentity -android.hardware.radio.V1_0.CellIdentityCdma -android.hardware.radio.V1_0.CellIdentityGsm -android.hardware.radio.V1_0.CellIdentityLte -android.hardware.radio.V1_0.CellIdentityTdscdma -android.hardware.radio.V1_0.CellIdentityWcdma -android.hardware.radio.V1_0.CellInfo -android.hardware.radio.V1_0.CellInfoCdma -android.hardware.radio.V1_0.CellInfoGsm -android.hardware.radio.V1_0.CellInfoLte -android.hardware.radio.V1_0.CellInfoTdscdma -android.hardware.radio.V1_0.CellInfoType -android.hardware.radio.V1_0.CellInfoWcdma -android.hardware.radio.V1_0.DataRegStateResult -android.hardware.radio.V1_0.EvdoSignalStrength -android.hardware.radio.V1_0.GsmSignalStrength -android.hardware.radio.V1_0.HardwareConfig -android.hardware.radio.V1_0.IRadio -android.hardware.radio.V1_0.IRadio$Proxy -android.hardware.radio.V1_0.IRadioIndication -android.hardware.radio.V1_0.IRadioIndication$Stub -android.hardware.radio.V1_0.IRadioResponse -android.hardware.radio.V1_0.IRadioResponse$Stub -android.hardware.radio.V1_0.LceStatusInfo -android.hardware.radio.V1_0.LteSignalStrength -android.hardware.radio.V1_0.RadioCapability -android.hardware.radio.V1_0.RadioResponseInfo -android.hardware.radio.V1_0.RegState -android.hardware.radio.V1_0.SignalStrength -android.hardware.radio.V1_0.TdScdmaSignalStrength -android.hardware.radio.V1_0.VoiceRegStateResult -android.hardware.radio.V1_0.WcdmaSignalStrength -android.hardware.radio.deprecated.V1_0.IOemHook -android.hardware.radio.deprecated.V1_0.IOemHook$Proxy -android.hardware.radio.deprecated.V1_0.IOemHookIndication -android.hardware.radio.deprecated.V1_0.IOemHookIndication$Stub -android.hardware.radio.deprecated.V1_0.IOemHookResponse -android.hardware.radio.deprecated.V1_0.IOemHookResponse$Stub -android.hardware.soundtrigger.IRecognitionStatusCallback -android.hardware.soundtrigger.IRecognitionStatusCallback$Stub -android.hardware.soundtrigger.KeyphraseEnrollmentInfo -android.hardware.soundtrigger.KeyphraseMetadata -android.hardware.soundtrigger.SoundTrigger -android.hardware.soundtrigger.SoundTrigger$ConfidenceLevel -android.hardware.soundtrigger.SoundTrigger$ConfidenceLevel$1 -android.hardware.soundtrigger.SoundTrigger$GenericRecognitionEvent -android.hardware.soundtrigger.SoundTrigger$GenericRecognitionEvent$1 -android.hardware.soundtrigger.SoundTrigger$GenericSoundModel -android.hardware.soundtrigger.SoundTrigger$Keyphrase -android.hardware.soundtrigger.SoundTrigger$Keyphrase$1 -android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionEvent -android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionEvent$1 -android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionExtra -android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionExtra$1 -android.hardware.soundtrigger.SoundTrigger$KeyphraseSoundModel -android.hardware.soundtrigger.SoundTrigger$KeyphraseSoundModel$1 -android.hardware.soundtrigger.SoundTrigger$ModuleProperties -android.hardware.soundtrigger.SoundTrigger$ModuleProperties$1 -android.hardware.soundtrigger.SoundTrigger$RecognitionConfig -android.hardware.soundtrigger.SoundTrigger$RecognitionConfig$1 -android.hardware.soundtrigger.SoundTrigger$RecognitionEvent -android.hardware.soundtrigger.SoundTrigger$RecognitionEvent$1 -android.hardware.soundtrigger.SoundTrigger$SoundModel -android.hardware.soundtrigger.SoundTrigger$SoundModelEvent -android.hardware.soundtrigger.SoundTrigger$SoundModelEvent$1 -android.hardware.soundtrigger.SoundTrigger$StatusListener -android.hardware.soundtrigger.SoundTriggerModule -android.hardware.usb.IUsbManager -android.hardware.usb.IUsbManager$Stub -android.hardware.usb.IUsbManager$Stub$Proxy -android.hardware.usb.UsbAccessory -android.hardware.usb.UsbDevice -android.hardware.usb.UsbDeviceConnection -android.hardware.usb.UsbManager -android.hardware.usb.UsbPort -android.hardware.usb.UsbPort$1 -android.hardware.usb.UsbPortStatus -android.hardware.usb.UsbPortStatus$1 -android.hardware.usb.UsbRequest -android.hidl.base.V1_0.DebugInfo -android.hidl.base.V1_0.IBase -android.hidl.manager.V1_0.IServiceManager -android.hidl.manager.V1_0.IServiceManager$Proxy -android.hidl.manager.V1_0.IServiceNotification -android.hidl.manager.V1_0.IServiceNotification$Stub -android.icu.impl.BMPSet -android.icu.impl.CacheBase -android.icu.impl.CacheValue -android.icu.impl.CacheValue$NullValue -android.icu.impl.CacheValue$SoftValue -android.icu.impl.CacheValue$Strength -android.icu.impl.CalendarUtil -android.icu.impl.CalendarUtil$CalendarPreferences -android.icu.impl.CaseMapImpl -android.icu.impl.CaseMapImpl$GreekUpper -android.icu.impl.CaseMapImpl$StringContextIterator -android.icu.impl.CharTrie -android.icu.impl.CharacterIteration -android.icu.impl.ClassLoaderUtil -android.icu.impl.CurrencyData -android.icu.impl.CurrencyData$CurrencyDisplayInfo -android.icu.impl.CurrencyData$CurrencyDisplayInfoProvider -android.icu.impl.CurrencyData$CurrencySpacingInfo -android.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingPattern -android.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingType -android.icu.impl.DateNumberFormat -android.icu.impl.DontCareFieldPosition -android.icu.impl.Grego -android.icu.impl.ICUBinary -android.icu.impl.ICUBinary$Authenticate -android.icu.impl.ICUBinary$DatPackageReader -android.icu.impl.ICUBinary$DatPackageReader$IsAcceptable -android.icu.impl.ICUBinary$DataFile -android.icu.impl.ICUBinary$PackageDataFile -android.icu.impl.ICUCache -android.icu.impl.ICUConfig -android.icu.impl.ICUCurrencyDisplayInfoProvider -android.icu.impl.ICUCurrencyDisplayInfoProvider$ICUCurrencyDisplayInfo -android.icu.impl.ICUCurrencyDisplayInfoProvider$ICUCurrencyDisplayInfo$SpacingInfoSink -android.icu.impl.ICUCurrencyMetaInfo -android.icu.impl.ICUCurrencyMetaInfo$Collector -android.icu.impl.ICUCurrencyMetaInfo$CurrencyCollector -android.icu.impl.ICUCurrencyMetaInfo$UniqueList -android.icu.impl.ICUData -android.icu.impl.ICUDebug -android.icu.impl.ICULangDataTables -android.icu.impl.ICULocaleService -android.icu.impl.ICULocaleService$ICUResourceBundleFactory -android.icu.impl.ICULocaleService$LocaleKey -android.icu.impl.ICULocaleService$LocaleKeyFactory -android.icu.impl.ICUNotifier -android.icu.impl.ICURWLock -android.icu.impl.ICURegionDataTables -android.icu.impl.ICUResourceBundle -android.icu.impl.ICUResourceBundle$1 -android.icu.impl.ICUResourceBundle$2 -android.icu.impl.ICUResourceBundle$3 -android.icu.impl.ICUResourceBundle$3$1 -android.icu.impl.ICUResourceBundle$4 -android.icu.impl.ICUResourceBundle$AvailEntry -android.icu.impl.ICUResourceBundle$Loader -android.icu.impl.ICUResourceBundle$OpenType -android.icu.impl.ICUResourceBundle$WholeBundle -android.icu.impl.ICUResourceBundleImpl -android.icu.impl.ICUResourceBundleImpl$ResourceArray -android.icu.impl.ICUResourceBundleImpl$ResourceBinary -android.icu.impl.ICUResourceBundleImpl$ResourceContainer -android.icu.impl.ICUResourceBundleImpl$ResourceInt -android.icu.impl.ICUResourceBundleImpl$ResourceIntVector -android.icu.impl.ICUResourceBundleImpl$ResourceString -android.icu.impl.ICUResourceBundleImpl$ResourceTable -android.icu.impl.ICUResourceBundleReader -android.icu.impl.ICUResourceBundleReader$Array -android.icu.impl.ICUResourceBundleReader$Array16 -android.icu.impl.ICUResourceBundleReader$Array32 -android.icu.impl.ICUResourceBundleReader$Container -android.icu.impl.ICUResourceBundleReader$IsAcceptable -android.icu.impl.ICUResourceBundleReader$ReaderCache -android.icu.impl.ICUResourceBundleReader$ReaderCacheKey -android.icu.impl.ICUResourceBundleReader$ReaderValue -android.icu.impl.ICUResourceBundleReader$ResourceCache -android.icu.impl.ICUResourceBundleReader$ResourceCache$Level -android.icu.impl.ICUResourceBundleReader$Table -android.icu.impl.ICUResourceBundleReader$Table16 -android.icu.impl.ICUResourceBundleReader$Table1632 -android.icu.impl.ICUResourceTableAccess -android.icu.impl.ICUService -android.icu.impl.ICUService$CacheEntry -android.icu.impl.ICUService$Factory -android.icu.impl.ICUService$Key -android.icu.impl.IDNA2003 -android.icu.impl.JavaTimeZone -android.icu.impl.LocaleDisplayNamesImpl -android.icu.impl.LocaleDisplayNamesImpl$Cache -android.icu.impl.LocaleDisplayNamesImpl$CapitalizationContextUsage -android.icu.impl.LocaleDisplayNamesImpl$DataTable -android.icu.impl.LocaleDisplayNamesImpl$DataTables -android.icu.impl.LocaleDisplayNamesImpl$ICUDataTable -android.icu.impl.LocaleDisplayNamesImpl$ICUDataTables -android.icu.impl.LocaleDisplayNamesImpl$LangDataTables -android.icu.impl.LocaleDisplayNamesImpl$RegionDataTables -android.icu.impl.LocaleIDParser -android.icu.impl.LocaleIDs -android.icu.impl.Norm2AllModes -android.icu.impl.Norm2AllModes$1 -android.icu.impl.Norm2AllModes$ComposeNormalizer2 -android.icu.impl.Norm2AllModes$DecomposeNormalizer2 -android.icu.impl.Norm2AllModes$FCDNormalizer2 -android.icu.impl.Norm2AllModes$NFCSingleton -android.icu.impl.Norm2AllModes$NFKCSingleton -android.icu.impl.Norm2AllModes$NoopNormalizer2 -android.icu.impl.Norm2AllModes$Norm2AllModesSingleton -android.icu.impl.Norm2AllModes$Normalizer2WithImpl -android.icu.impl.Normalizer2Impl -android.icu.impl.Normalizer2Impl$1 -android.icu.impl.Normalizer2Impl$IsAcceptable -android.icu.impl.Normalizer2Impl$ReorderingBuffer -android.icu.impl.OlsonTimeZone -android.icu.impl.Pair -android.icu.impl.PatternProps -android.icu.impl.PatternTokenizer -android.icu.impl.PluralRulesLoader -android.icu.impl.ReplaceableUCharacterIterator -android.icu.impl.RuleCharacterIterator -android.icu.impl.SimpleCache -android.icu.impl.SimpleFormatterImpl -android.icu.impl.SoftCache -android.icu.impl.StandardPlural -android.icu.impl.StringPrepDataReader -android.icu.impl.Trie -android.icu.impl.Trie$DataManipulate -android.icu.impl.Trie$DefaultGetFoldingOffset -android.icu.impl.Trie2 -android.icu.impl.Trie2$1 -android.icu.impl.Trie2$Range -android.icu.impl.Trie2$Trie2Iterator -android.icu.impl.Trie2$UTrie2Header -android.icu.impl.Trie2$ValueMapper -android.icu.impl.Trie2$ValueWidth -android.icu.impl.Trie2_16 -android.icu.impl.Trie2_32 -android.icu.impl.UBiDiProps -android.icu.impl.UBiDiProps$IsAcceptable -android.icu.impl.UCaseProps -android.icu.impl.UCaseProps$ContextIterator -android.icu.impl.UCaseProps$IsAcceptable -android.icu.impl.UCharacterProperty -android.icu.impl.UCharacterProperty$1 -android.icu.impl.UCharacterProperty$10 -android.icu.impl.UCharacterProperty$11 -android.icu.impl.UCharacterProperty$12 -android.icu.impl.UCharacterProperty$13 -android.icu.impl.UCharacterProperty$14 -android.icu.impl.UCharacterProperty$15 -android.icu.impl.UCharacterProperty$16 -android.icu.impl.UCharacterProperty$17 -android.icu.impl.UCharacterProperty$18 -android.icu.impl.UCharacterProperty$19 -android.icu.impl.UCharacterProperty$2 -android.icu.impl.UCharacterProperty$20 -android.icu.impl.UCharacterProperty$21 -android.icu.impl.UCharacterProperty$22 -android.icu.impl.UCharacterProperty$23 -android.icu.impl.UCharacterProperty$3 -android.icu.impl.UCharacterProperty$4 -android.icu.impl.UCharacterProperty$5 -android.icu.impl.UCharacterProperty$6 -android.icu.impl.UCharacterProperty$7 -android.icu.impl.UCharacterProperty$8 -android.icu.impl.UCharacterProperty$9 -android.icu.impl.UCharacterProperty$BiDiIntProperty -android.icu.impl.UCharacterProperty$BinaryProperty -android.icu.impl.UCharacterProperty$CaseBinaryProperty -android.icu.impl.UCharacterProperty$CombiningClassIntProperty -android.icu.impl.UCharacterProperty$IntProperty -android.icu.impl.UCharacterProperty$IsAcceptable -android.icu.impl.UCharacterProperty$NormInertBinaryProperty -android.icu.impl.UCharacterProperty$NormQuickCheckIntProperty -android.icu.impl.UPropertyAliases -android.icu.impl.UPropertyAliases$IsAcceptable -android.icu.impl.URLHandler$URLVisitor -android.icu.impl.UResource$Array -android.icu.impl.UResource$Key -android.icu.impl.UResource$Sink -android.icu.impl.UResource$Table -android.icu.impl.UResource$Value -android.icu.impl.USerializedSet -android.icu.impl.Utility -android.icu.impl.ZoneMeta -android.icu.impl.ZoneMeta$CustomTimeZoneCache -android.icu.impl.ZoneMeta$SystemTimeZoneCache -android.icu.impl.coll.Collation -android.icu.impl.coll.CollationCompare -android.icu.impl.coll.CollationData -android.icu.impl.coll.CollationDataReader -android.icu.impl.coll.CollationDataReader$IsAcceptable -android.icu.impl.coll.CollationFCD -android.icu.impl.coll.CollationFastLatin -android.icu.impl.coll.CollationIterator -android.icu.impl.coll.CollationIterator$CEBuffer -android.icu.impl.coll.CollationKeys -android.icu.impl.coll.CollationKeys$LevelCallback -android.icu.impl.coll.CollationKeys$SortKeyByteSink -android.icu.impl.coll.CollationLoader -android.icu.impl.coll.CollationRoot -android.icu.impl.coll.CollationSettings -android.icu.impl.coll.CollationTailoring -android.icu.impl.coll.ContractionsAndExpansions -android.icu.impl.coll.FCDUTF16CollationIterator -android.icu.impl.coll.SharedObject -android.icu.impl.coll.SharedObject$Reference -android.icu.impl.coll.UTF16CollationIterator -android.icu.impl.locale.AsciiUtil -android.icu.impl.locale.BaseLocale -android.icu.impl.locale.BaseLocale$Cache -android.icu.impl.locale.BaseLocale$Key -android.icu.impl.locale.LocaleObjectCache -android.icu.impl.locale.LocaleObjectCache$CacheEntry -android.icu.impl.locale.LocaleSyntaxException -android.icu.lang.UCharacter -android.icu.lang.UCharacterEnums$ECharacterCategory -android.icu.lang.UCharacterEnums$ECharacterDirection -android.icu.lang.UScript -android.icu.lang.UScript$ScriptUsage -android.icu.math.BigDecimal -android.icu.math.MathContext -android.icu.text.AlphabeticIndex -android.icu.text.AlphabeticIndex$1 -android.icu.text.AlphabeticIndex$Bucket -android.icu.text.AlphabeticIndex$Bucket$LabelType -android.icu.text.AlphabeticIndex$BucketList -android.icu.text.AlphabeticIndex$ImmutableIndex -android.icu.text.Bidi -android.icu.text.Bidi$ImpTabPair -android.icu.text.BreakIterator -android.icu.text.BreakIterator$BreakIteratorCache -android.icu.text.BreakIterator$BreakIteratorServiceShim -android.icu.text.BreakIteratorFactory -android.icu.text.BreakIteratorFactory$BFService -android.icu.text.BreakIteratorFactory$BFService$1RBBreakIteratorFactory -android.icu.text.CaseMap -android.icu.text.CaseMap$Upper -android.icu.text.CollationKey -android.icu.text.Collator -android.icu.text.Collator$ServiceShim -android.icu.text.CollatorServiceShim -android.icu.text.CollatorServiceShim$CService -android.icu.text.CollatorServiceShim$CService$1CollatorFactory -android.icu.text.CurrencyDisplayNames -android.icu.text.CurrencyMetaInfo -android.icu.text.CurrencyMetaInfo$CurrencyDigits -android.icu.text.CurrencyMetaInfo$CurrencyFilter -android.icu.text.CurrencyPluralInfo -android.icu.text.DateFormat -android.icu.text.DateFormat$BooleanAttribute -android.icu.text.DateFormat$Field -android.icu.text.DateFormatSymbols -android.icu.text.DateFormatSymbols$1 -android.icu.text.DateFormatSymbols$CalendarDataSink -android.icu.text.DateFormatSymbols$CalendarDataSink$AliasType -android.icu.text.DateFormatSymbols$CapitalizationContextUsage -android.icu.text.DateIntervalFormat -android.icu.text.DateIntervalFormat$BestMatchInfo -android.icu.text.DateIntervalFormat$SkeletonAndItsBestMatch -android.icu.text.DateIntervalInfo -android.icu.text.DateIntervalInfo$DateIntervalSink -android.icu.text.DateIntervalInfo$PatternInfo -android.icu.text.DateTimePatternGenerator -android.icu.text.DateTimePatternGenerator$AppendItemFormatsSink -android.icu.text.DateTimePatternGenerator$AppendItemNamesSink -android.icu.text.DateTimePatternGenerator$AvailableFormatsSink -android.icu.text.DateTimePatternGenerator$DTPGflags -android.icu.text.DateTimePatternGenerator$DateTimeMatcher -android.icu.text.DateTimePatternGenerator$DayPeriodAllowedHoursSink -android.icu.text.DateTimePatternGenerator$DistanceInfo -android.icu.text.DateTimePatternGenerator$FormatParser -android.icu.text.DateTimePatternGenerator$PatternInfo -android.icu.text.DateTimePatternGenerator$PatternWithMatcher -android.icu.text.DateTimePatternGenerator$PatternWithSkeletonFlag -android.icu.text.DateTimePatternGenerator$SkeletonFields -android.icu.text.DateTimePatternGenerator$VariableField -android.icu.text.DecimalFormat -android.icu.text.DecimalFormat$Unit -android.icu.text.DecimalFormatSymbols -android.icu.text.DecimalFormatSymbols$1 -android.icu.text.DecimalFormatSymbols$CacheData -android.icu.text.DecimalFormatSymbols$DecFmtDataSink -android.icu.text.DigitList -android.icu.text.DisplayContext -android.icu.text.DisplayContext$Type -android.icu.text.Edits -android.icu.text.IDNA -android.icu.text.LanguageBreakEngine -android.icu.text.ListFormatter$Style -android.icu.text.LocaleDisplayNames -android.icu.text.LocaleDisplayNames$DialectHandling -android.icu.text.MeasureFormat -android.icu.text.MeasureFormat$FormatWidth -android.icu.text.MeasureFormat$ImmutableNumberFormat -android.icu.text.MeasureFormat$MeasureFormatData -android.icu.text.MeasureFormat$UnitDataSink -android.icu.text.Normalizer -android.icu.text.Normalizer$FCDMode -android.icu.text.Normalizer$Mode -android.icu.text.Normalizer$ModeImpl -android.icu.text.Normalizer$NFCMode -android.icu.text.Normalizer$NFCModeImpl -android.icu.text.Normalizer$NFDMode -android.icu.text.Normalizer$NFKCMode -android.icu.text.Normalizer$NFKDMode -android.icu.text.Normalizer$NFKDModeImpl -android.icu.text.Normalizer$NONEMode -android.icu.text.Normalizer$QuickCheckResult -android.icu.text.Normalizer2 -android.icu.text.NumberFormat -android.icu.text.NumberFormat$Field -android.icu.text.NumberFormat$NumberFormatShim -android.icu.text.NumberFormatServiceShim -android.icu.text.NumberFormatServiceShim$NFService -android.icu.text.NumberFormatServiceShim$NFService$1RBNumberFormatFactory -android.icu.text.NumberingSystem -android.icu.text.NumberingSystem$1 -android.icu.text.NumberingSystem$2 -android.icu.text.NumberingSystem$LocaleLookupData -android.icu.text.PluralRanges -android.icu.text.PluralRanges$Matrix -android.icu.text.PluralRules -android.icu.text.PluralRules$1 -android.icu.text.PluralRules$AndConstraint -android.icu.text.PluralRules$BinaryConstraint -android.icu.text.PluralRules$Constraint -android.icu.text.PluralRules$Factory -android.icu.text.PluralRules$FixedDecimal -android.icu.text.PluralRules$FixedDecimalRange -android.icu.text.PluralRules$FixedDecimalSamples -android.icu.text.PluralRules$Operand -android.icu.text.PluralRules$PluralType -android.icu.text.PluralRules$RangeConstraint -android.icu.text.PluralRules$Rule -android.icu.text.PluralRules$RuleList -android.icu.text.PluralRules$SampleType -android.icu.text.PluralRules$SimpleTokenizer -android.icu.text.QuantityFormatter -android.icu.text.RBBIDataWrapper -android.icu.text.RBBIDataWrapper$IsAcceptable -android.icu.text.RBBIDataWrapper$RBBIDataHeader -android.icu.text.RBBIDataWrapper$TrieFoldingFunc -android.icu.text.RawCollationKey -android.icu.text.RelativeDateTimeFormatter -android.icu.text.RelativeDateTimeFormatter$AbsoluteUnit -android.icu.text.RelativeDateTimeFormatter$Cache -android.icu.text.RelativeDateTimeFormatter$Cache$1 -android.icu.text.RelativeDateTimeFormatter$Direction -android.icu.text.RelativeDateTimeFormatter$Loader -android.icu.text.RelativeDateTimeFormatter$RelDateTimeDataSink -android.icu.text.RelativeDateTimeFormatter$RelDateTimeDataSink$DateTimeUnit -android.icu.text.RelativeDateTimeFormatter$RelativeDateTimeFormatterData -android.icu.text.RelativeDateTimeFormatter$RelativeUnit -android.icu.text.RelativeDateTimeFormatter$Style -android.icu.text.Replaceable -android.icu.text.ReplaceableString -android.icu.text.RuleBasedBreakIterator -android.icu.text.RuleBasedBreakIterator$LookAheadResults -android.icu.text.RuleBasedCollator -android.icu.text.RuleBasedCollator$CollationBuffer -android.icu.text.RuleBasedCollator$CollationKeyByteSink -android.icu.text.RuleBasedCollator$FCDUTF16NFDIterator -android.icu.text.RuleBasedCollator$NFDIterator -android.icu.text.RuleBasedCollator$UTF16NFDIterator -android.icu.text.SimpleDateFormat -android.icu.text.SimpleDateFormat$PatternItem -android.icu.text.StringPrep -android.icu.text.StringPrepParseException -android.icu.text.TimeZoneNames$NameType -android.icu.text.UCharacterIterator -android.icu.text.UFieldPosition -android.icu.text.UFormat -android.icu.text.UForwardCharacterIterator -android.icu.text.UTF16 -android.icu.text.UTF16$StringComparator -android.icu.text.UnhandledBreakEngine -android.icu.text.UnicodeFilter -android.icu.text.UnicodeMatcher -android.icu.text.UnicodeSet -android.icu.text.UnicodeSet$Filter -android.icu.text.UnicodeSet$GeneralCategoryMaskFilter -android.icu.text.UnicodeSet$IntPropertyFilter -android.icu.text.UnicodeSet$UnicodeSetIterator2 -android.icu.util.BasicTimeZone -android.icu.util.ByteArrayWrapper -android.icu.util.BytesTrie -android.icu.util.BytesTrie$Result -android.icu.util.Calendar -android.icu.util.Calendar$CalType -android.icu.util.Calendar$FormatConfiguration -android.icu.util.Calendar$PatternData -android.icu.util.Calendar$WeekData -android.icu.util.Calendar$WeekDataCache -android.icu.util.CharsTrie -android.icu.util.CharsTrie$Entry -android.icu.util.CharsTrie$Iterator -android.icu.util.Currency -android.icu.util.Currency$1 -android.icu.util.Currency$CurrencyUsage -android.icu.util.Currency$EquivalenceRelation -android.icu.util.CurrencyAmount -android.icu.util.Freezable -android.icu.util.GregorianCalendar -android.icu.util.ICUException -android.icu.util.ICUUncheckedIOException -android.icu.util.LocaleData -android.icu.util.Measure -android.icu.util.MeasureUnit -android.icu.util.MeasureUnit$1 -android.icu.util.MeasureUnit$2 -android.icu.util.MeasureUnit$3 -android.icu.util.MeasureUnit$Factory -android.icu.util.Output -android.icu.util.SimpleTimeZone -android.icu.util.TimeUnit -android.icu.util.TimeZone -android.icu.util.TimeZone$ConstantZone -android.icu.util.ULocale -android.icu.util.ULocale$1 -android.icu.util.ULocale$2 -android.icu.util.ULocale$Category -android.icu.util.ULocale$JDKLocaleHelper -android.icu.util.ULocale$Type -android.icu.util.UResourceBundle -android.icu.util.UResourceBundle$RootType -android.icu.util.UResourceBundleIterator -android.icu.util.UResourceTypeMismatchException -android.icu.util.VersionInfo -android.inputmethodservice.AbstractInputMethodService -android.inputmethodservice.AbstractInputMethodService$AbstractInputMethodImpl -android.inputmethodservice.AbstractInputMethodService$AbstractInputMethodSessionImpl -android.inputmethodservice.IInputMethodSessionWrapper -android.inputmethodservice.IInputMethodSessionWrapper$ImeInputEventReceiver -android.inputmethodservice.IInputMethodWrapper -android.inputmethodservice.IInputMethodWrapper$InputMethodSessionCallbackWrapper -android.inputmethodservice.InputMethodService -android.inputmethodservice.InputMethodService$1 -android.inputmethodservice.InputMethodService$2 -android.inputmethodservice.InputMethodService$InputMethodImpl -android.inputmethodservice.InputMethodService$InputMethodSessionImpl -android.inputmethodservice.InputMethodService$Insets -android.inputmethodservice.InputMethodService$SettingsObserver -android.inputmethodservice.SoftInputWindow -android.location.Address -android.location.Address$1 -android.location.BatchedLocationCallbackTransport -android.location.BatchedLocationCallbackTransport$CallbackTransport -android.location.Country -android.location.Country$1 -android.location.CountryDetector -android.location.CountryDetector$ListenerTransport -android.location.CountryDetector$ListenerTransport$1 -android.location.CountryListener -android.location.Criteria -android.location.Criteria$1 -android.location.Geocoder -android.location.GeocoderParams -android.location.GeocoderParams$1 -android.location.Geofence -android.location.GnssMeasurementCallbackTransport -android.location.GnssMeasurementCallbackTransport$ListenerTransport -android.location.GnssNavigationMessageCallbackTransport -android.location.GnssNavigationMessageCallbackTransport$ListenerTransport -android.location.GnssStatus -android.location.GnssStatus$Callback -android.location.GpsSatellite -android.location.GpsStatus -android.location.GpsStatus$1 -android.location.GpsStatus$Listener -android.location.GpsStatus$SatelliteIterator -android.location.IBatchedLocationCallback -android.location.IBatchedLocationCallback$Stub -android.location.ICountryDetector -android.location.ICountryDetector$Stub -android.location.ICountryDetector$Stub$Proxy -android.location.ICountryListener -android.location.ICountryListener$Stub -android.location.ICountryListener$Stub$Proxy -android.location.IFusedProvider -android.location.IFusedProvider$Stub -android.location.IGeocodeProvider -android.location.IGeocodeProvider$Stub -android.location.IGeocodeProvider$Stub$Proxy -android.location.IGeofenceProvider -android.location.IGeofenceProvider$Stub -android.location.IGeofenceProvider$Stub$Proxy -android.location.IGnssMeasurementsListener -android.location.IGnssMeasurementsListener$Stub -android.location.IGnssNavigationMessageListener -android.location.IGnssNavigationMessageListener$Stub -android.location.IGnssStatusListener -android.location.IGnssStatusListener$Stub -android.location.IGnssStatusListener$Stub$Proxy -android.location.IGnssStatusProvider -android.location.IGnssStatusProvider$Stub -android.location.IGpsGeofenceHardware -android.location.IGpsGeofenceHardware$Stub -android.location.ILocationListener -android.location.ILocationListener$Stub -android.location.ILocationListener$Stub$Proxy -android.location.ILocationManager -android.location.ILocationManager$Stub -android.location.ILocationManager$Stub$Proxy -android.location.INetInitiatedListener -android.location.INetInitiatedListener$Stub -android.location.LocalListenerHelper -android.location.Location -android.location.Location$1 -android.location.Location$2 -android.location.Location$BearingDistanceCache -android.location.LocationListener -android.location.LocationManager -android.location.LocationManager$GnssStatusListenerTransport -android.location.LocationManager$GnssStatusListenerTransport$1 -android.location.LocationManager$GnssStatusListenerTransport$GnssHandler -android.location.LocationManager$ListenerTransport -android.location.LocationManager$ListenerTransport$1 -android.location.LocationManager$ListenerTransport$2 -android.location.LocationProvider -android.location.LocationRequest -android.location.LocationRequest$1 -android.media.AudioAttributes -android.media.AudioAttributes$1 -android.media.AudioAttributes$Builder -android.media.AudioDeviceCallback -android.media.AudioDeviceInfo -android.media.AudioDevicePort -android.media.AudioDevicePortConfig -android.media.AudioFocusInfo -android.media.AudioFocusInfo$1 -android.media.AudioFocusRequest -android.media.AudioFocusRequest$Builder -android.media.AudioFormat -android.media.AudioFormat$1 -android.media.AudioFormat$Builder -android.media.AudioGain -android.media.AudioGainConfig -android.media.AudioHandle -android.media.AudioManager -android.media.AudioManager$1 -android.media.AudioManager$2 -android.media.AudioManager$3 -android.media.AudioManager$FocusRequestInfo -android.media.AudioManager$NativeEventHandlerDelegate -android.media.AudioManager$NativeEventHandlerDelegate$1 -android.media.AudioManager$OnAmPortUpdateListener -android.media.AudioManager$OnAudioFocusChangeListener -android.media.AudioManager$OnAudioPortUpdateListener -android.media.AudioManager$ServiceEventHandlerDelegate -android.media.AudioManager$ServiceEventHandlerDelegate$1 -android.media.AudioManagerInternal -android.media.AudioManagerInternal$RingerModeDelegate -android.media.AudioMixPort -android.media.AudioMixPortConfig -android.media.AudioPatch -android.media.AudioPlaybackConfiguration -android.media.AudioPlaybackConfiguration$1 -android.media.AudioPlaybackConfiguration$IPlayerShell -android.media.AudioPlaybackConfiguration$PlayerDeathMonitor -android.media.AudioPort -android.media.AudioPortConfig -android.media.AudioPortEventHandler -android.media.AudioPortEventHandler$1 -android.media.AudioRecord -android.media.AudioRoutesInfo -android.media.AudioRoutesInfo$1 -android.media.AudioRouting -android.media.AudioSystem -android.media.AudioSystem$AudioRecordingCallback -android.media.AudioSystem$DynamicPolicyCallback -android.media.AudioSystem$ErrorCallback -android.media.AudioTimestamp -android.media.AudioTrack -android.media.BufferingParams -android.media.BufferingParams$1 -android.media.CamcorderProfile -android.media.CameraProfile -android.media.DecoderCapabilities -android.media.DeniedByServerException -android.media.EncoderCapabilities -android.media.ExifInterface -android.media.ExifInterface$ByteOrderedDataInputStream -android.media.ExifInterface$ExifAttribute -android.media.ExifInterface$ExifTag -android.media.IAudioFocusDispatcher -android.media.IAudioFocusDispatcher$Stub -android.media.IAudioFocusDispatcher$Stub$Proxy -android.media.IAudioRoutesObserver -android.media.IAudioRoutesObserver$Stub -android.media.IAudioRoutesObserver$Stub$Proxy -android.media.IAudioService -android.media.IAudioService$Stub -android.media.IAudioService$Stub$Proxy -android.media.IMediaHTTPConnection -android.media.IMediaHTTPConnection$Stub -android.media.IMediaHTTPService -android.media.IMediaHTTPService$Stub -android.media.IMediaResourceMonitor -android.media.IMediaResourceMonitor$Stub -android.media.IMediaRouterClient -android.media.IMediaRouterClient$Stub -android.media.IMediaRouterClient$Stub$Proxy -android.media.IMediaRouterService -android.media.IMediaRouterService$Stub -android.media.IMediaRouterService$Stub$Proxy -android.media.IPlaybackConfigDispatcher -android.media.IPlaybackConfigDispatcher$Stub -android.media.IPlayer -android.media.IPlayer$Stub -android.media.IPlayer$Stub$Proxy -android.media.IRecordingConfigDispatcher -android.media.IRecordingConfigDispatcher$Stub -android.media.IRemoteVolumeController -android.media.IRemoteVolumeController$Stub -android.media.IRemoteVolumeController$Stub$Proxy -android.media.IRemoteVolumeObserver -android.media.IRemoteVolumeObserver$Stub -android.media.IRingtonePlayer -android.media.IRingtonePlayer$Stub -android.media.IRingtonePlayer$Stub$Proxy -android.media.IVolumeController -android.media.IVolumeController$Stub -android.media.IVolumeController$Stub$Proxy -android.media.Image -android.media.Image$Plane -android.media.ImageReader -android.media.ImageReader$ListenerHandler -android.media.ImageReader$OnImageAvailableListener -android.media.ImageReader$SurfaceImage -android.media.ImageReader$SurfaceImage$SurfacePlane -android.media.ImageUtils -android.media.ImageWriter -android.media.ImageWriter$ListenerHandler -android.media.ImageWriter$OnImageReleasedListener -android.media.ImageWriter$WriterSurfaceImage -android.media.ImageWriter$WriterSurfaceImage$SurfacePlane -android.media.JetPlayer -android.media.MediaCodec -android.media.MediaCodec$BufferInfo -android.media.MediaCodec$BufferMap -android.media.MediaCodec$BufferMap$CodecBuffer -android.media.MediaCodec$CodecException -android.media.MediaCodec$CryptoException -android.media.MediaCodec$CryptoInfo -android.media.MediaCodec$CryptoInfo$Pattern -android.media.MediaCodec$EventHandler -android.media.MediaCodec$PersistentSurface -android.media.MediaCodecInfo -android.media.MediaCodecInfo$AudioCapabilities -android.media.MediaCodecInfo$CodecCapabilities -android.media.MediaCodecInfo$CodecProfileLevel -android.media.MediaCodecInfo$EncoderCapabilities -android.media.MediaCodecInfo$Feature -android.media.MediaCodecInfo$VideoCapabilities -android.media.MediaCodecList -android.media.MediaCrypto -android.media.MediaCryptoException -android.media.MediaDescrambler -android.media.MediaDescription -android.media.MediaDescription$1 -android.media.MediaDescription$Builder -android.media.MediaDrm -android.media.MediaDrm$Certificate -android.media.MediaDrm$EventHandler -android.media.MediaDrm$KeyRequest -android.media.MediaDrm$MediaDrmStateException -android.media.MediaDrm$OnEventListener -android.media.MediaDrm$ProvisionRequest -android.media.MediaDrmException -android.media.MediaExtractor -android.media.MediaFile -android.media.MediaFile$MediaFileType -android.media.MediaFormat -android.media.MediaHTTPConnection -android.media.MediaHTTPService -android.media.MediaMetadata -android.media.MediaMetadata$1 -android.media.MediaMetadata$Builder -android.media.MediaMetadataRetriever -android.media.MediaMuxer -android.media.MediaPlayer -android.media.MediaPlayer$1 -android.media.MediaPlayer$2 -android.media.MediaPlayer$4 -android.media.MediaPlayer$4$1 -android.media.MediaPlayer$EventHandler -android.media.MediaPlayer$OnCompletionListener -android.media.MediaPlayer$OnErrorListener -android.media.MediaPlayer$OnInfoListener -android.media.MediaPlayer$OnPreparedListener -android.media.MediaPlayer$OnSeekCompleteListener -android.media.MediaPlayer$OnSubtitleDataListener -android.media.MediaPlayer$TimeProvider -android.media.MediaPlayer$TimeProvider$EventHandler -android.media.MediaPlayer$TrackInfo -android.media.MediaPlayer$TrackInfo$1 -android.media.MediaRecorder -android.media.MediaRecorder$EventHandler -android.media.MediaRecorder$OnErrorListener -android.media.MediaRouter -android.media.MediaRouter$Callback -android.media.MediaRouter$CallbackInfo -android.media.MediaRouter$RouteCategory -android.media.MediaRouter$RouteGroup -android.media.MediaRouter$RouteInfo -android.media.MediaRouter$RouteInfo$1 -android.media.MediaRouter$SimpleCallback -android.media.MediaRouter$Static -android.media.MediaRouter$Static$1 -android.media.MediaRouter$Static$Client -android.media.MediaRouter$Static$Client$1 -android.media.MediaRouter$VolumeCallback -android.media.MediaRouter$VolumeChangeReceiver -android.media.MediaRouter$WifiDisplayStatusChangedReceiver -android.media.MediaRouterClientState -android.media.MediaRouterClientState$1 -android.media.MediaRouterClientState$RouteInfo -android.media.MediaRouterClientState$RouteInfo$1 -android.media.MediaScanner -android.media.MediaScannerConnection -android.media.MediaScannerConnection$OnScanCompletedListener -android.media.MediaSync -android.media.MediaTimeProvider -android.media.MediaTimeProvider$OnMediaTimeListener -android.media.MiniThumbFile -android.media.NotProvisionedException -android.media.PlaybackParams -android.media.PlaybackParams$1 -android.media.PlayerBase -android.media.PlayerBase$IAppOpsCallbackWrapper -android.media.PlayerBase$IPlayerWrapper -android.media.PlayerBase$PlayerIdCard -android.media.PlayerBase$PlayerIdCard$1 -android.media.PlayerProxy -android.media.Rating -android.media.Rating$1 -android.media.RemoteDisplay -android.media.ResampleInputStream -android.media.SoundPool -android.media.SoundPool$Builder -android.media.SoundPool$EventHandler -android.media.SoundPool$OnLoadCompleteListener -android.media.SubtitleController -android.media.SubtitleController$1 -android.media.SubtitleController$2 -android.media.SubtitleController$Anchor -android.media.SubtitleController$Listener -android.media.SubtitleTrack -android.media.SyncParams -android.media.ThumbnailUtils -android.media.ThumbnailUtils$SizedThumbnailBitmap -android.media.ToneGenerator -android.media.UnsupportedSchemeException -android.media.Utils -android.media.Utils$1 -android.media.Utils$2 -android.media.VolumeAutomation -android.media.VolumePolicy -android.media.VolumePolicy$1 -android.media.VolumeShaper -android.media.VolumeShaper$Configuration -android.media.VolumeShaper$Configuration$1 -android.media.VolumeShaper$Configuration$Builder -android.media.VolumeShaper$Operation -android.media.VolumeShaper$Operation$1 -android.media.VolumeShaper$Operation$Builder -android.media.VolumeShaper$State -android.media.VolumeShaper$State$1 -android.media.audiofx.AudioEffect -android.media.audiofx.AudioEffect$Descriptor -android.media.audiofx.LoudnessEnhancer -android.media.audiofx.Virtualizer -android.media.audiofx.Visualizer -android.media.audiopolicy.AudioMix -android.media.audiopolicy.AudioMixingRule -android.media.audiopolicy.AudioMixingRule$AudioMixMatchCriterion -android.media.audiopolicy.AudioPolicyConfig -android.media.audiopolicy.IAudioPolicyCallback -android.media.audiopolicy.IAudioPolicyCallback$Stub -android.media.browse.MediaBrowser -android.media.browse.MediaBrowser$1 -android.media.browse.MediaBrowser$2 -android.media.browse.MediaBrowser$6 -android.media.browse.MediaBrowser$ConnectionCallback -android.media.browse.MediaBrowser$MediaServiceConnection -android.media.browse.MediaBrowser$MediaServiceConnection$1 -android.media.browse.MediaBrowser$ServiceCallbacks -android.media.midi.IMidiDeviceListener -android.media.midi.IMidiDeviceOpenCallback -android.media.midi.IMidiDeviceServer -android.media.midi.IMidiManager -android.media.midi.IMidiManager$Stub -android.media.midi.MidiDeviceInfo -android.media.midi.MidiDeviceStatus -android.media.midi.MidiManager -android.media.projection.IMediaProjection -android.media.projection.IMediaProjectionManager -android.media.projection.IMediaProjectionManager$Stub -android.media.projection.IMediaProjectionManager$Stub$Proxy -android.media.projection.IMediaProjectionWatcherCallback -android.media.projection.IMediaProjectionWatcherCallback$Stub -android.media.projection.IMediaProjectionWatcherCallback$Stub$Proxy -android.media.projection.MediaProjectionInfo -android.media.projection.MediaProjectionManager -android.media.projection.MediaProjectionManager$Callback -android.media.projection.MediaProjectionManager$CallbackDelegate -android.media.session.IActiveSessionsListener -android.media.session.IActiveSessionsListener$Stub -android.media.session.IActiveSessionsListener$Stub$Proxy -android.media.session.ICallback -android.media.session.ICallback$Stub -android.media.session.ICallback$Stub$Proxy -android.media.session.IOnMediaKeyListener -android.media.session.IOnVolumeKeyLongPressListener -android.media.session.ISession -android.media.session.ISession$Stub -android.media.session.ISession$Stub$Proxy -android.media.session.ISessionCallback -android.media.session.ISessionCallback$Stub -android.media.session.ISessionCallback$Stub$Proxy -android.media.session.ISessionController -android.media.session.ISessionController$Stub -android.media.session.ISessionController$Stub$Proxy -android.media.session.ISessionControllerCallback -android.media.session.ISessionControllerCallback$Stub -android.media.session.ISessionControllerCallback$Stub$Proxy -android.media.session.ISessionManager -android.media.session.ISessionManager$Stub -android.media.session.ISessionManager$Stub$Proxy -android.media.session.MediaController -android.media.session.MediaController$Callback -android.media.session.MediaController$CallbackStub -android.media.session.MediaController$MessageHandler -android.media.session.MediaController$PlaybackInfo -android.media.session.MediaController$TransportControls -android.media.session.MediaSession -android.media.session.MediaSession$Callback -android.media.session.MediaSession$CallbackMessageHandler -android.media.session.MediaSession$CallbackStub -android.media.session.MediaSession$QueueItem -android.media.session.MediaSession$QueueItem$1 -android.media.session.MediaSession$Token -android.media.session.MediaSession$Token$1 -android.media.session.MediaSessionManager -android.media.session.MediaSessionManager$Callback -android.media.session.MediaSessionManager$CallbackImpl -android.media.session.MediaSessionManager$CallbackImpl$3 -android.media.session.MediaSessionManager$CallbackImpl$4 -android.media.session.MediaSessionManager$OnActiveSessionsChangedListener -android.media.session.MediaSessionManager$SessionsChangedWrapper -android.media.session.MediaSessionManager$SessionsChangedWrapper$1 -android.media.session.MediaSessionManager$SessionsChangedWrapper$1$1 -android.media.session.ParcelableVolumeInfo -android.media.session.ParcelableVolumeInfo$1 -android.media.session.PlaybackState -android.media.session.PlaybackState$1 -android.media.session.PlaybackState$Builder -android.media.session.PlaybackState$CustomAction -android.media.session.PlaybackState$CustomAction$1 -android.media.session.PlaybackState$CustomAction$Builder -android.media.soundtrigger.SoundTriggerManager -android.media.tv.TvInputHardwareInfo$Builder -android.media.tv.TvInputManager -android.media.tv.TvStreamConfig -android.media.tv.TvStreamConfig$Builder -android.metrics.LogMaker -android.mtp.MtpDatabase -android.mtp.MtpDevice -android.mtp.MtpDeviceInfo -android.mtp.MtpEvent -android.mtp.MtpObjectInfo -android.mtp.MtpPropertyGroup -android.mtp.MtpPropertyList -android.mtp.MtpServer -android.mtp.MtpStorage -android.mtp.MtpStorageInfo -android.net.ConnectivityManager -android.net.ConnectivityManager$CallbackHandler -android.net.ConnectivityManager$NetworkCallback -android.net.ConnectivityManager$OnNetworkActiveListener -android.net.ConnectivityManager$PacketKeepaliveCallback -android.net.ConnectivityMetricsEvent -android.net.ConnectivityMetricsEvent$1 -android.net.ConnectivityThread -android.net.ConnectivityThread$Singleton -android.net.Credentials -android.net.DataUsageRequest -android.net.DhcpInfo -android.net.DhcpInfo$1 -android.net.DhcpResults -android.net.DhcpResults$1 -android.net.EthernetManager -android.net.EthernetManager$1 -android.net.EthernetManager$2 -android.net.EventLogTags -android.net.IConnectivityManager -android.net.IConnectivityManager$Stub -android.net.IConnectivityManager$Stub$Proxy -android.net.IEthernetManager -android.net.IEthernetManager$Stub -android.net.IEthernetServiceListener -android.net.IEthernetServiceListener$Stub -android.net.IIpConnectivityMetrics -android.net.IIpConnectivityMetrics$Stub -android.net.IIpSecService -android.net.IIpSecService$Stub -android.net.INetd -android.net.INetd$Stub -android.net.INetd$Stub$Proxy -android.net.INetdEventCallback -android.net.INetworkManagementEventObserver -android.net.INetworkManagementEventObserver$Stub -android.net.INetworkPolicyListener -android.net.INetworkPolicyListener$Stub -android.net.INetworkPolicyListener$Stub$Proxy -android.net.INetworkPolicyManager -android.net.INetworkPolicyManager$Stub -android.net.INetworkPolicyManager$Stub$Proxy -android.net.INetworkRecommendationProvider -android.net.INetworkRecommendationProvider$Stub -android.net.INetworkRecommendationProvider$Stub$Proxy -android.net.INetworkScoreCache -android.net.INetworkScoreCache$Stub -android.net.INetworkScoreCache$Stub$Proxy -android.net.INetworkScoreService -android.net.INetworkScoreService$Stub -android.net.INetworkScoreService$Stub$Proxy -android.net.INetworkStatsService -android.net.INetworkStatsService$Stub -android.net.INetworkStatsService$Stub$Proxy -android.net.INetworkStatsSession -android.net.InterfaceConfiguration -android.net.InterfaceConfiguration$1 -android.net.IpConfiguration -android.net.IpConfiguration$1 -android.net.IpConfiguration$IpAssignment -android.net.IpConfiguration$ProxySettings -android.net.IpPrefix -android.net.IpPrefix$1 -android.net.IpSecConfig -android.net.IpSecManager -android.net.LinkAddress -android.net.LinkAddress$1 -android.net.LinkProperties -android.net.LinkProperties$1 -android.net.LinkProperties$CompareResult -android.net.LinkProperties$ProvisioningChange -android.net.LocalServerSocket -android.net.LocalSocket -android.net.LocalSocketAddress -android.net.LocalSocketAddress$Namespace -android.net.LocalSocketImpl -android.net.LocalSocketImpl$SocketInputStream -android.net.LocalSocketImpl$SocketOutputStream -android.net.MatchAllNetworkSpecifier -android.net.MatchAllNetworkSpecifier$1 -android.net.Network -android.net.Network$1 -android.net.Network$2 -android.net.Network$NetworkBoundSocketFactory -android.net.NetworkAgent -android.net.NetworkCapabilities -android.net.NetworkCapabilities$1 -android.net.NetworkConfig -android.net.NetworkFactory -android.net.NetworkFactory$NetworkRequestInfo -android.net.NetworkIdentity -android.net.NetworkInfo -android.net.NetworkInfo$1 -android.net.NetworkInfo$DetailedState -android.net.NetworkInfo$State -android.net.NetworkKey -android.net.NetworkKey$1 -android.net.NetworkMisc -android.net.NetworkMisc$1 -android.net.NetworkPolicy -android.net.NetworkPolicy$1 -android.net.NetworkPolicyManager -android.net.NetworkQuotaInfo -android.net.NetworkRecommendationProvider -android.net.NetworkRecommendationProvider$ServiceWrapper -android.net.NetworkRecommendationProvider$ServiceWrapper$1 -android.net.NetworkRequest -android.net.NetworkRequest$1 -android.net.NetworkRequest$Builder -android.net.NetworkRequest$Type -android.net.NetworkScoreManager -android.net.NetworkScorerAppData -android.net.NetworkScorerAppData$1 -android.net.NetworkSpecifier -android.net.NetworkState -android.net.NetworkState$1 -android.net.NetworkStats -android.net.NetworkStats$1 -android.net.NetworkStats$Entry -android.net.NetworkStats$NonMonotonicObserver -android.net.NetworkStatsHistory -android.net.NetworkStatsHistory$1 -android.net.NetworkStatsHistory$DataStreamUtils -android.net.NetworkStatsHistory$Entry -android.net.NetworkTemplate -android.net.NetworkTemplate$1 -android.net.NetworkUtils -android.net.ParseException -android.net.Proxy -android.net.ProxyInfo -android.net.ProxyInfo$1 -android.net.RouteInfo -android.net.RouteInfo$1 -android.net.RssiCurve -android.net.RssiCurve$1 -android.net.SSLCertificateSocketFactory -android.net.SSLCertificateSocketFactory$1 -android.net.SSLSessionCache -android.net.ScoredNetwork -android.net.ScoredNetwork$1 -android.net.SntpClient -android.net.StaticIpConfiguration -android.net.StaticIpConfiguration$1 -android.net.StringNetworkSpecifier -android.net.StringNetworkSpecifier$1 -android.net.TrafficStats -android.net.UidRange -android.net.Uri -android.net.Uri$1 -android.net.Uri$AbstractHierarchicalUri -android.net.Uri$AbstractPart -android.net.Uri$Builder -android.net.Uri$HierarchicalUri -android.net.Uri$OpaqueUri -android.net.Uri$Part -android.net.Uri$Part$EmptyPart -android.net.Uri$PathPart -android.net.Uri$PathSegments -android.net.Uri$PathSegmentsBuilder -android.net.Uri$StringUri -android.net.WebAddress -android.net.WifiKey -android.net.WifiKey$1 -android.net.http.AndroidHttpClient -android.net.http.AndroidHttpClient$1 -android.net.http.AndroidHttpClient$2 -android.net.http.AndroidHttpClient$CurlLogger -android.net.http.AndroidHttpClient$LoggingConfiguration -android.net.http.HttpResponseCache -android.net.http.SslCertificate -android.net.http.X509TrustManagerExtensions -android.net.metrics.ApfProgramEvent -android.net.metrics.ApfProgramEvent$1 -android.net.metrics.ApfStats -android.net.metrics.ApfStats$1 -android.net.metrics.ConnectStats -android.net.metrics.DefaultNetworkEvent -android.net.metrics.DefaultNetworkEvent$1 -android.net.metrics.DhcpClientEvent -android.net.metrics.DhcpClientEvent$1 -android.net.metrics.DnsEvent -android.net.metrics.IpConnectivityLog -android.net.metrics.IpManagerEvent -android.net.metrics.IpManagerEvent$1 -android.net.metrics.NetworkEvent -android.net.metrics.NetworkEvent$1 -android.net.metrics.RaEvent -android.net.metrics.RaEvent$1 -android.net.metrics.RaEvent$Builder -android.net.metrics.ValidationProbeEvent -android.net.metrics.ValidationProbeEvent$1 -android.net.metrics.ValidationProbeEvent$Decoder -android.net.nsd.INsdManager -android.net.nsd.INsdManager$Stub -android.net.nsd.NsdManager -android.net.sip.ISipService -android.net.sip.ISipService$Stub -android.net.sip.SipManager -android.net.wifi.IRttManager -android.net.wifi.IRttManager$Stub -android.net.wifi.IWifiManager -android.net.wifi.IWifiManager$Stub -android.net.wifi.IWifiManager$Stub$Proxy -android.net.wifi.IWifiScanner -android.net.wifi.IWifiScanner$Stub -android.net.wifi.IWifiScanner$Stub$Proxy -android.net.wifi.ParcelUtil -android.net.wifi.RttManager -android.net.wifi.RttManager$RttCapabilities -android.net.wifi.RttManager$RttListener -android.net.wifi.RttManager$RttResult -android.net.wifi.ScanResult -android.net.wifi.ScanResult$1 -android.net.wifi.ScanResult$InformationElement -android.net.wifi.ScanSettings -android.net.wifi.SupplicantState -android.net.wifi.SupplicantState$1 -android.net.wifi.WifiActivityEnergyInfo -android.net.wifi.WifiActivityEnergyInfo$1 -android.net.wifi.WifiConfiguration -android.net.wifi.WifiConfiguration$1 -android.net.wifi.WifiConfiguration$KeyMgmt -android.net.wifi.WifiConfiguration$NetworkSelectionStatus -android.net.wifi.WifiConfiguration$Visibility -android.net.wifi.WifiConnectionStatistics -android.net.wifi.WifiConnectionStatistics$1 -android.net.wifi.WifiEnterpriseConfig -android.net.wifi.WifiEnterpriseConfig$1 -android.net.wifi.WifiInfo -android.net.wifi.WifiInfo$1 -android.net.wifi.WifiLinkLayerStats -android.net.wifi.WifiLinkLayerStats$1 -android.net.wifi.WifiManager -android.net.wifi.WifiManager$ActionListener -android.net.wifi.WifiManager$MulticastLock -android.net.wifi.WifiManager$WifiLock -android.net.wifi.WifiNetworkScoreCache -android.net.wifi.WifiNetworkScoreCache$CacheListener -android.net.wifi.WifiNetworkScoreCache$CacheListener$1 -android.net.wifi.WifiScanner -android.net.wifi.WifiScanner$ActionListener -android.net.wifi.WifiScanner$ChannelSpec -android.net.wifi.WifiScanner$ParcelableScanData -android.net.wifi.WifiScanner$ParcelableScanData$1 -android.net.wifi.WifiScanner$ParcelableScanResults -android.net.wifi.WifiScanner$ParcelableScanResults$1 -android.net.wifi.WifiScanner$PnoScanListener -android.net.wifi.WifiScanner$ScanData -android.net.wifi.WifiScanner$ScanData$1 -android.net.wifi.WifiScanner$ScanListener -android.net.wifi.WifiScanner$ScanSettings -android.net.wifi.WifiScanner$ScanSettings$1 -android.net.wifi.WifiScanner$ScanSettings$HiddenNetwork -android.net.wifi.WifiScanner$ServiceHandler -android.net.wifi.WifiSsid -android.net.wifi.WifiSsid$1 -android.net.wifi.WpsInfo -android.net.wifi.WpsInfo$1 -android.net.wifi.aware.WifiAwareManager -android.net.wifi.hotspot2.PasspointConfiguration -android.net.wifi.p2p.IWifiP2pManager -android.net.wifi.p2p.IWifiP2pManager$Stub -android.net.wifi.p2p.WifiP2pConfig -android.net.wifi.p2p.WifiP2pConfig$1 -android.net.wifi.p2p.WifiP2pDevice -android.net.wifi.p2p.WifiP2pDevice$1 -android.net.wifi.p2p.WifiP2pDeviceList -android.net.wifi.p2p.WifiP2pDeviceList$1 -android.net.wifi.p2p.WifiP2pGroup -android.net.wifi.p2p.WifiP2pGroup$1 -android.net.wifi.p2p.WifiP2pGroupList -android.net.wifi.p2p.WifiP2pGroupList$1 -android.net.wifi.p2p.WifiP2pGroupList$2 -android.net.wifi.p2p.WifiP2pGroupList$GroupDeleteListener -android.net.wifi.p2p.WifiP2pInfo -android.net.wifi.p2p.WifiP2pInfo$1 -android.net.wifi.p2p.WifiP2pManager -android.net.wifi.p2p.WifiP2pWfdInfo -android.net.wifi.p2p.WifiP2pWfdInfo$1 -android.nfc.BeamShareData -android.nfc.FormatException -android.nfc.IAppCallback -android.nfc.IAppCallback$Stub -android.nfc.IAppCallback$Stub$Proxy -android.nfc.INfcAdapter -android.nfc.INfcAdapter$Stub -android.nfc.INfcAdapter$Stub$Proxy -android.nfc.INfcAdapterExtras -android.nfc.INfcCardEmulation -android.nfc.INfcCardEmulation$Stub -android.nfc.INfcCardEmulation$Stub$Proxy -android.nfc.INfcFCardEmulation -android.nfc.INfcFCardEmulation$Stub -android.nfc.INfcFCardEmulation$Stub$Proxy -android.nfc.INfcTag -android.nfc.INfcTag$Stub -android.nfc.INfcTag$Stub$Proxy -android.nfc.INfcUnlockHandler -android.nfc.ITagRemovedCallback -android.nfc.NdefMessage -android.nfc.NfcActivityManager -android.nfc.NfcActivityManager$NfcActivityState -android.nfc.NfcActivityManager$NfcApplicationState -android.nfc.NfcAdapter -android.nfc.NfcAdapter$1 -android.nfc.NfcAdapter$CreateBeamUrisCallback -android.nfc.NfcAdapter$CreateNdefMessageCallback -android.nfc.NfcAdapter$OnNdefPushCompleteCallback -android.nfc.NfcEvent -android.nfc.NfcManager -android.nfc.Tag -android.nfc.TechListParcel -android.nfc.TransceiveResult -android.nfc.cardemulation.AidGroup -android.nfc.cardemulation.AidGroup$1 -android.nfc.cardemulation.ApduServiceInfo -android.nfc.cardemulation.ApduServiceInfo$1 -android.nfc.cardemulation.CardEmulation -android.nfc.cardemulation.HostApduService -android.nfc.cardemulation.HostApduService$MsgHandler -android.opengl.EGL14 -android.opengl.EGLConfig -android.opengl.EGLContext -android.opengl.EGLDisplay -android.opengl.EGLExt -android.opengl.EGLObjectHandle -android.opengl.EGLSurface -android.opengl.ETC1 -android.opengl.GLES10 -android.opengl.GLES10Ext -android.opengl.GLES11 -android.opengl.GLES11Ext -android.opengl.GLES20 -android.opengl.GLES30 -android.opengl.GLES31 -android.opengl.GLES31Ext -android.opengl.GLES32 -android.opengl.GLUtils -android.opengl.Matrix -android.opengl.Visibility -android.os.-$Lambda$-dncxFEc2F2bgG2fsIoC6FC6WNE -android.os.-$Lambda$-dncxFEc2F2bgG2fsIoC6FC6WNE$1 -android.os.-$Lambda$6x30vPJhBKUfNY8tswxuZo3DCe0 -android.os.AsyncResult -android.os.AsyncTask -android.os.AsyncTask$1 -android.os.AsyncTask$2 -android.os.AsyncTask$3 -android.os.AsyncTask$AsyncTaskResult -android.os.AsyncTask$InternalHandler -android.os.AsyncTask$SerialExecutor -android.os.AsyncTask$SerialExecutor$1 -android.os.AsyncTask$Status -android.os.AsyncTask$WorkerRunnable -android.os.BadParcelableException -android.os.BaseBundle -android.os.BaseBundle$NoImagePreloadHolder -android.os.BatteryManager -android.os.BatteryManagerInternal -android.os.BatteryProperties -android.os.BatteryProperties$1 -android.os.BatteryStats -android.os.BatteryStats$BitDescription -android.os.BatteryStats$ControllerActivityCounter -android.os.BatteryStats$Counter -android.os.BatteryStats$DailyItem -android.os.BatteryStats$HistoryEventTracker -android.os.BatteryStats$HistoryItem -android.os.BatteryStats$HistoryStepDetails -android.os.BatteryStats$HistoryTag -android.os.BatteryStats$IntToString -android.os.BatteryStats$LevelStepTracker -android.os.BatteryStats$LongCounter -android.os.BatteryStats$LongCounterArray -android.os.BatteryStats$PackageChange -android.os.BatteryStats$Timer -android.os.BatteryStats$Uid -android.os.BatteryStats$Uid$Pid -android.os.BatteryStats$Uid$Pkg -android.os.BatteryStats$Uid$Pkg$Serv -android.os.BatteryStats$Uid$Sensor -android.os.BatteryStats$Uid$Wakelock -android.os.Binder -android.os.BinderProxy -android.os.Build -android.os.Build$VERSION -android.os.Bundle -android.os.Bundle$1 -android.os.CancellationSignal -android.os.CancellationSignal$OnCancelListener -android.os.CancellationSignal$Transport -android.os.CommonTimeConfig$OnServerDiedListener -android.os.ConditionVariable -android.os.CountDownTimer -android.os.CpuUsageInfo -android.os.CpuUsageInfo$1 -android.os.DeadObjectException -android.os.DeadSystemException -android.os.Debug -android.os.Debug$MemoryInfo -android.os.Debug$MemoryInfo$1 -android.os.DropBoxManager -android.os.DropBoxManager$Entry -android.os.DropBoxManager$Entry$1 -android.os.Environment -android.os.Environment$UserEnvironment -android.os.FactoryTest -android.os.FileBridge -android.os.FileBridge$FileBridgeOutputStream -android.os.FileObserver$ObserverThread -android.os.FileUtils -android.os.GraphicsEnvironment -android.os.Handler -android.os.Handler$BlockingRunnable -android.os.Handler$Callback -android.os.Handler$MessengerImpl -android.os.HandlerThread -android.os.HardwarePropertiesManager -android.os.HwBinder -android.os.HwBlob -android.os.HwParcel -android.os.HwRemoteBinder -android.os.IBatteryPropertiesListener -android.os.IBatteryPropertiesListener$Stub -android.os.IBatteryPropertiesRegistrar -android.os.IBatteryPropertiesRegistrar$Stub -android.os.IBatteryPropertiesRegistrar$Stub$Proxy -android.os.IBinder -android.os.IBinder$DeathRecipient -android.os.ICancellationSignal -android.os.ICancellationSignal$Stub -android.os.ICancellationSignal$Stub$Proxy -android.os.IDeviceIdentifiersPolicyService -android.os.IDeviceIdentifiersPolicyService$Stub -android.os.IDeviceIdleController -android.os.IDeviceIdleController$Stub -android.os.IDeviceIdleController$Stub$Proxy -android.os.IHardwarePropertiesManager -android.os.IHardwarePropertiesManager$Stub -android.os.IHardwarePropertiesManager$Stub$Proxy -android.os.IHwBinder -android.os.IHwBinder$DeathRecipient -android.os.IHwInterface -android.os.IIncidentManager -android.os.IIncidentManager$Stub -android.os.IInstalld -android.os.IInstalld$Stub -android.os.IInstalld$Stub$Proxy -android.os.IInterface -android.os.IMaintenanceActivityListener -android.os.IMessenger -android.os.IMessenger$Stub -android.os.IMessenger$Stub$Proxy -android.os.INetworkActivityListener -android.os.INetworkManagementService -android.os.INetworkManagementService$Stub -android.os.INetworkManagementService$Stub$Proxy -android.os.IPermissionController -android.os.IPermissionController$Stub -android.os.IPowerManager -android.os.IPowerManager$Stub -android.os.IPowerManager$Stub$Proxy -android.os.IProcessInfoService -android.os.IProcessInfoService$Stub -android.os.IProgressListener -android.os.IRecoverySystem -android.os.IRecoverySystem$Stub -android.os.IRecoverySystemProgressListener -android.os.IRemoteCallback -android.os.IRemoteCallback$Stub -android.os.IRemoteCallback$Stub$Proxy -android.os.ISchedulingPolicyService -android.os.ISchedulingPolicyService$Stub -android.os.IServiceManager -android.os.IUpdateLock -android.os.IUpdateLock$Stub -android.os.IUserManager -android.os.IUserManager$Stub -android.os.IUserManager$Stub$Proxy -android.os.IVibratorService -android.os.IVibratorService$Stub -android.os.IVibratorService$Stub$Proxy -android.os.IncidentManager -android.os.LocaleList -android.os.LocaleList$1 -android.os.Looper -android.os.MemoryFile -android.os.Message -android.os.Message$1 -android.os.MessageQueue -android.os.MessageQueue$FileDescriptorRecord -android.os.MessageQueue$IdleHandler -android.os.MessageQueue$OnFileDescriptorEventListener -android.os.Messenger -android.os.Messenger$1 -android.os.OperationCanceledException -android.os.Parcel -android.os.Parcel$1 -android.os.Parcel$2 -android.os.Parcel$ReadWriteHelper -android.os.ParcelFileDescriptor -android.os.ParcelFileDescriptor$1 -android.os.ParcelFileDescriptor$2 -android.os.ParcelFileDescriptor$AutoCloseInputStream -android.os.ParcelFileDescriptor$AutoCloseOutputStream -android.os.ParcelFileDescriptor$OnCloseListener -android.os.ParcelFileDescriptor$Status -android.os.ParcelFormatException -android.os.ParcelUuid -android.os.ParcelUuid$1 -android.os.Parcelable -android.os.Parcelable$ClassLoaderCreator -android.os.Parcelable$Creator -android.os.ParcelableException -android.os.ParcelableParcel -android.os.ParcelableParcel$1 -android.os.PatternMatcher -android.os.PatternMatcher$1 -android.os.PersistableBundle -android.os.PersistableBundle$1 -android.os.PersistableBundle$MyReadMapCallback -android.os.PooledStringReader -android.os.PooledStringWriter -android.os.PowerManager -android.os.PowerManager$WakeLock -android.os.PowerManager$WakeLock$1 -android.os.PowerManagerInternal -android.os.PowerManagerInternal$LowPowerModeListener -android.os.PowerSaveState -android.os.PowerSaveState$1 -android.os.PowerSaveState$Builder -android.os.Process -android.os.Process$ProcessStartResult -android.os.RecoverySystem -android.os.RecoverySystem$ProgressListener -android.os.Registrant -android.os.RegistrantList -android.os.RemoteCallback -android.os.RemoteCallback$1 -android.os.RemoteCallback$2 -android.os.RemoteCallback$OnResultListener -android.os.RemoteCallbackList -android.os.RemoteCallbackList$Callback -android.os.RemoteException -android.os.ResultReceiver -android.os.ResultReceiver$1 -android.os.ResultReceiver$MyResultReceiver -android.os.ResultReceiver$MyRunnable -android.os.SELinux -android.os.Seccomp -android.os.ServiceManager -android.os.ServiceManager$ServiceNotFoundException -android.os.ServiceManagerNative -android.os.ServiceManagerProxy -android.os.ServiceSpecificException -android.os.ShellCallback -android.os.StatFs -android.os.StrictMode -android.os.StrictMode$1 -android.os.StrictMode$2 -android.os.StrictMode$3 -android.os.StrictMode$4 -android.os.StrictMode$5 -android.os.StrictMode$6 -android.os.StrictMode$7 -android.os.StrictMode$8 -android.os.StrictMode$9 -android.os.StrictMode$AndroidBlockGuardPolicy -android.os.StrictMode$AndroidBlockGuardPolicy$1 -android.os.StrictMode$AndroidCloseGuardReporter -android.os.StrictMode$InstanceTracker -android.os.StrictMode$Span -android.os.StrictMode$ThreadPolicy -android.os.StrictMode$ThreadPolicy$Builder -android.os.StrictMode$ThreadSpanState -android.os.StrictMode$ViolationInfo -android.os.StrictMode$ViolationInfo$1 -android.os.StrictMode$VmPolicy -android.os.StrictMode$VmPolicy$Builder -android.os.SynchronousResultReceiver -android.os.SynchronousResultReceiver$Result -android.os.SystemClock -android.os.SystemProperties -android.os.SystemService -android.os.SystemService$1 -android.os.SystemService$State -android.os.SystemVibrator -android.os.TokenWatcher -android.os.TokenWatcher$1 -android.os.Trace -android.os.Trace$1 -android.os.TransactionTooLargeException -android.os.UEventObserver -android.os.UEventObserver$UEvent -android.os.UEventObserver$UEventThread -android.os.UpdateLock -android.os.UserHandle -android.os.UserHandle$1 -android.os.UserManager -android.os.UserManager$EnforcingUser -android.os.UserManager$EnforcingUser$1 -android.os.UserManagerInternal -android.os.UserManagerInternal$UserRestrictionsListener -android.os.VibrationEffect -android.os.VibrationEffect$1 -android.os.VibrationEffect$OneShot -android.os.VibrationEffect$Prebaked -android.os.VibrationEffect$Prebaked$1 -android.os.VibrationEffect$Waveform -android.os.VibrationEffect$Waveform$1 -android.os.Vibrator -android.os.VintfObject -android.os.VintfRuntimeInfo -android.os.WorkSource -android.os.WorkSource$1 -android.os.ZygoteProcess -android.os.ZygoteProcess$ZygoteState -android.os.ZygoteStartFailedEx -android.os.health.HealthStatsParceler -android.os.health.SystemHealthManager -android.os.storage.DiskInfo -android.os.storage.DiskInfo$1 -android.os.storage.IObbActionListener -android.os.storage.IObbActionListener$Stub -android.os.storage.IStorageEventListener -android.os.storage.IStorageEventListener$Stub -android.os.storage.IStorageEventListener$Stub$Proxy -android.os.storage.IStorageManager -android.os.storage.IStorageManager$Stub -android.os.storage.IStorageManager$Stub$Proxy -android.os.storage.IStorageShutdownObserver -android.os.storage.StorageEventListener -android.os.storage.StorageManager -android.os.storage.StorageManager$ObbActionListener -android.os.storage.StorageManager$StorageEventListenerDelegate -android.os.storage.StorageManagerInternal -android.os.storage.StorageManagerInternal$ExternalStorageMountPolicy -android.os.storage.StorageVolume -android.os.storage.StorageVolume$1 -android.os.storage.VolumeInfo -android.os.storage.VolumeInfo$1 -android.os.storage.VolumeInfo$2 -android.os.storage.VolumeRecord -android.os.storage.VolumeRecord$1 -android.preference.GenericInflater$Parent -android.preference.Preference -android.preference.Preference$BaseSavedState -android.preference.Preference$BaseSavedState$1 -android.preference.Preference$OnPreferenceChangeListener -android.preference.PreferenceActivity -android.preference.PreferenceFragment -android.preference.PreferenceFragment$OnPreferenceStartFragmentCallback -android.preference.PreferenceGroup -android.preference.PreferenceManager -android.preference.PreferenceManager$OnPreferenceTreeClickListener -android.preference.PreferenceScreen -android.print.IPrintDocumentAdapter -android.print.IPrintJobStateChangeListener -android.print.IPrintManager -android.print.IPrintManager$Stub -android.print.IPrintServicesChangeListener -android.print.IPrintSpooler -android.print.IPrintSpooler$Stub -android.print.IPrintSpooler$Stub$Proxy -android.print.IPrintSpoolerCallbacks -android.print.IPrintSpoolerCallbacks$Stub -android.print.IPrintSpoolerClient -android.print.IPrintSpoolerClient$Stub -android.print.IPrinterDiscoveryObserver -android.print.PageRange -android.print.PrintAttributes -android.print.PrintDocumentAdapter -android.print.PrintDocumentAdapter$LayoutResultCallback -android.print.PrintDocumentAdapter$WriteResultCallback -android.print.PrintJobId -android.print.PrintJobInfo -android.print.PrintManager -android.print.PrinterId -android.printservice.IPrintServiceClient -android.printservice.IPrintServiceClient$Stub -android.printservice.PrintServiceInfo -android.printservice.PrintServiceInfo$1 -android.printservice.recommendation.IRecommendationsChangeListener -android.provider.-$Lambda$87WmhkvObehVg0OMBzwa_MTVV8g -android.provider.-$Lambda$a7Jyr6j_Mb70hHJ2ssL1AAhKh4c -android.provider.BaseColumns -android.provider.BlockedNumberContract -android.provider.BlockedNumberContract$BlockedNumbers -android.provider.CalendarContract -android.provider.CalendarContract$Attendees -android.provider.CalendarContract$AttendeesColumns -android.provider.CalendarContract$CalendarAlerts -android.provider.CalendarContract$CalendarAlertsColumns -android.provider.CalendarContract$CalendarCache -android.provider.CalendarContract$CalendarCacheColumns -android.provider.CalendarContract$CalendarColumns -android.provider.CalendarContract$CalendarSyncColumns -android.provider.CalendarContract$Calendars -android.provider.CalendarContract$Colors -android.provider.CalendarContract$ColorsColumns -android.provider.CalendarContract$Events -android.provider.CalendarContract$EventsColumns -android.provider.CalendarContract$ExtendedProperties -android.provider.CalendarContract$ExtendedPropertiesColumns -android.provider.CalendarContract$Instances -android.provider.CalendarContract$Reminders -android.provider.CalendarContract$RemindersColumns -android.provider.CalendarContract$SyncColumns -android.provider.CallLog -android.provider.CallLog$Calls -android.provider.ContactsContract -android.provider.ContactsContract$BaseSyncColumns -android.provider.ContactsContract$CommonDataKinds$BaseTypes -android.provider.ContactsContract$CommonDataKinds$Callable -android.provider.ContactsContract$CommonDataKinds$CommonColumns -android.provider.ContactsContract$CommonDataKinds$Email -android.provider.ContactsContract$CommonDataKinds$Event -android.provider.ContactsContract$CommonDataKinds$Im -android.provider.ContactsContract$CommonDataKinds$Phone -android.provider.ContactsContract$CommonDataKinds$Relation -android.provider.ContactsContract$CommonDataKinds$StructuredPostal -android.provider.ContactsContract$ContactCounts -android.provider.ContactsContract$ContactNameColumns -android.provider.ContactsContract$ContactOptionsColumns -android.provider.ContactsContract$ContactStatusColumns -android.provider.ContactsContract$Contacts -android.provider.ContactsContract$ContactsColumns -android.provider.ContactsContract$Data -android.provider.ContactsContract$DataColumns -android.provider.ContactsContract$DataColumnsWithJoins -android.provider.ContactsContract$DataUsageFeedback -android.provider.ContactsContract$DataUsageStatColumns -android.provider.ContactsContract$DeletedContacts -android.provider.ContactsContract$DeletedContactsColumns -android.provider.ContactsContract$Directory -android.provider.ContactsContract$DisplayPhoto -android.provider.ContactsContract$Groups -android.provider.ContactsContract$GroupsColumns -android.provider.ContactsContract$MetadataSync -android.provider.ContactsContract$MetadataSyncColumns -android.provider.ContactsContract$PhoneLookup -android.provider.ContactsContract$PhoneLookupColumns -android.provider.ContactsContract$Profile -android.provider.ContactsContract$ProviderStatus -android.provider.ContactsContract$RawContacts -android.provider.ContactsContract$RawContactsColumns -android.provider.ContactsContract$RawContactsEntity -android.provider.ContactsContract$StatusColumns -android.provider.ContactsContract$SyncColumns -android.provider.DocumentsContract -android.provider.DocumentsContract$Path -android.provider.DocumentsProvider -android.provider.Downloads -android.provider.Downloads$Impl -android.provider.FontsContract -android.provider.FontsContract$1 -android.provider.MediaStore$Audio -android.provider.MediaStore$Audio$AlbumColumns -android.provider.MediaStore$Audio$Albums -android.provider.MediaStore$Audio$AudioColumns -android.provider.MediaStore$Audio$Media -android.provider.MediaStore$Audio$Playlists -android.provider.MediaStore$Audio$PlaylistsColumns -android.provider.MediaStore$Files -android.provider.MediaStore$Images$ImageColumns -android.provider.MediaStore$Images$Media -android.provider.MediaStore$Images$Thumbnails -android.provider.MediaStore$MediaColumns -android.provider.MediaStore$Video$Media -android.provider.MediaStore$Video$VideoColumns -android.provider.OpenableColumns -android.provider.SearchIndexableData -android.provider.SearchIndexableResource -android.provider.SearchIndexablesProvider -android.provider.SearchRecentSuggestions -android.provider.Settings -android.provider.Settings$ContentProviderHolder -android.provider.Settings$GenerationTracker -android.provider.Settings$Global -android.provider.Settings$NameValueCache -android.provider.Settings$NameValueTable -android.provider.Settings$Secure -android.provider.Settings$SettingNotFoundException -android.provider.Settings$System -android.provider.Settings$System$1 -android.provider.Settings$System$2 -android.provider.Settings$System$3 -android.provider.Settings$System$4 -android.provider.Settings$System$5 -android.provider.Settings$System$6 -android.provider.Settings$System$7 -android.provider.Settings$System$8 -android.provider.Settings$System$9 -android.provider.Settings$System$DiscreteValueValidator -android.provider.Settings$System$InclusiveFloatRangeValidator -android.provider.Settings$System$InclusiveIntegerRangeValidator -android.provider.Settings$System$Validator -android.provider.SyncStateContract$Columns -android.provider.Telephony$BaseMmsColumns -android.provider.Telephony$Carriers -android.provider.Telephony$Mms -android.provider.Telephony$MmsSms -android.provider.Telephony$ServiceStateTable -android.provider.Telephony$Sms -android.provider.Telephony$TextBasedSmsColumns -android.provider.Telephony$Threads -android.provider.Telephony$ThreadsColumns -android.provider.UserDictionary$Words -android.provider.VoicemailContract$Status -android.provider.VoicemailContract$Voicemails -android.renderscript.Allocation -android.renderscript.BaseObj -android.renderscript.Matrix4f -android.renderscript.RenderScriptCacheDir -android.security.GateKeeper -android.security.IKeyChainService -android.security.IKeyChainService$Stub -android.security.IKeyChainService$Stub$Proxy -android.security.IKeystoreService -android.security.IKeystoreService$Stub -android.security.IKeystoreService$Stub$Proxy -android.security.KeyChain -android.security.KeyChain$1 -android.security.KeyChain$KeyChainConnection -android.security.KeyStore -android.security.NetworkSecurityPolicy -android.security.keymaster.IKeyAttestationApplicationIdProvider -android.security.keymaster.IKeyAttestationApplicationIdProvider$Stub -android.security.keymaster.KeyAttestationApplicationId -android.security.keymaster.KeymasterArguments -android.security.keymaster.KeymasterArguments$1 -android.security.keystore.AndroidKeyStoreBCWorkaroundProvider -android.security.keystore.AndroidKeyStoreKeyGeneratorSpi -android.security.keystore.AndroidKeyStoreKeyGeneratorSpi$AES -android.security.keystore.AndroidKeyStoreProvider -android.security.keystore.AndroidKeyStoreSpi -android.security.keystore.ArrayUtils -android.security.keystore.KeyGenParameterSpec -android.security.keystore.KeyGenParameterSpec$Builder -android.security.keystore.KeyInfo -android.security.keystore.KeyPermanentlyInvalidatedException -android.security.keystore.KeyProperties -android.security.keystore.KeyProperties$BlockMode -android.security.keystore.KeyProperties$EncryptionPadding -android.security.keystore.KeyProperties$Purpose -android.security.keystore.KeymasterUtils -android.security.keystore.UserNotAuthenticatedException -android.security.keystore.Utils -android.security.net.config.ApplicationConfig -android.security.net.config.CertificateSource -android.security.net.config.CertificatesEntryRef -android.security.net.config.ConfigNetworkSecurityPolicy -android.security.net.config.ConfigSource -android.security.net.config.DirectoryCertificateSource -android.security.net.config.DirectoryCertificateSource$1 -android.security.net.config.DirectoryCertificateSource$3 -android.security.net.config.DirectoryCertificateSource$CertSelector -android.security.net.config.KeyStoreCertificateSource -android.security.net.config.KeyStoreConfigSource -android.security.net.config.ManifestConfigSource -android.security.net.config.ManifestConfigSource$DefaultConfigSource -android.security.net.config.NetworkSecurityConfig -android.security.net.config.NetworkSecurityConfig$1 -android.security.net.config.NetworkSecurityConfig$Builder -android.security.net.config.NetworkSecurityConfigProvider -android.security.net.config.NetworkSecurityTrustManager -android.security.net.config.PinSet -android.security.net.config.RootTrustManager -android.security.net.config.RootTrustManagerFactorySpi -android.security.net.config.SystemCertificateSource -android.security.net.config.TrustedCertificateStoreAdapter -android.security.net.config.UserCertificateSource -android.security.net.config.XmlConfigSource -android.security.net.config.XmlConfigSource$ParserException -android.service.autofill.-$Lambda$svbjmB3NFhHnuZrn67G14PFSJlY -android.service.autofill.AutofillService -android.service.autofill.AutofillService$1 -android.service.autofill.AutofillServiceInfo -android.service.autofill.FillCallback -android.service.autofill.FillContext -android.service.autofill.FillContext$1 -android.service.autofill.FillEventHistory -android.service.autofill.FillRequest -android.service.autofill.FillRequest$1 -android.service.autofill.FillResponse -android.service.autofill.IAutoFillService -android.service.autofill.IAutoFillService$Stub -android.service.autofill.IAutoFillService$Stub$Proxy -android.service.autofill.IFillCallback -android.service.autofill.IFillCallback$Stub -android.service.autofill.IFillCallback$Stub$Proxy -android.service.autofill.SaveCallback -android.service.autofill.SaveRequest -android.service.carrier.CarrierIdentifier -android.service.carrier.CarrierIdentifier$1 -android.service.carrier.ICarrierService -android.service.carrier.ICarrierService$Stub -android.service.carrier.ICarrierService$Stub$Proxy -android.service.dreams.DreamManagerInternal -android.service.dreams.IDreamManager -android.service.dreams.IDreamManager$Stub -android.service.dreams.IDreamManager$Stub$Proxy -android.service.gatekeeper.IGateKeeperService -android.service.gatekeeper.IGateKeeperService$Stub -android.service.gatekeeper.IGateKeeperService$Stub$Proxy -android.service.media.IMediaBrowserService -android.service.media.IMediaBrowserService$Stub -android.service.media.IMediaBrowserService$Stub$Proxy -android.service.media.IMediaBrowserServiceCallbacks -android.service.media.IMediaBrowserServiceCallbacks$Stub -android.service.notification.Adjustment -android.service.notification.Condition -android.service.notification.Condition$1 -android.service.notification.ConditionProviderService -android.service.notification.ConditionProviderService$H -android.service.notification.ConditionProviderService$Provider -android.service.notification.IConditionListener -android.service.notification.IConditionListener$Stub -android.service.notification.IConditionProvider -android.service.notification.IConditionProvider$Stub -android.service.notification.INotificationListener -android.service.notification.INotificationListener$Stub -android.service.notification.INotificationListener$Stub$Proxy -android.service.notification.IStatusBarNotificationHolder -android.service.notification.IStatusBarNotificationHolder$Stub -android.service.notification.IStatusBarNotificationHolder$Stub$Proxy -android.service.notification.NotificationListenerService -android.service.notification.NotificationListenerService$MyHandler -android.service.notification.NotificationListenerService$NotificationListenerWrapper -android.service.notification.NotificationListenerService$Ranking -android.service.notification.NotificationListenerService$RankingMap -android.service.notification.NotificationListenerService$RankingMap$1 -android.service.notification.NotificationRankingUpdate -android.service.notification.NotificationRankingUpdate$1 -android.service.notification.StatusBarNotification -android.service.notification.StatusBarNotification$1 -android.service.notification.ZenModeConfig -android.service.notification.ZenModeConfig$1 -android.service.notification.ZenModeConfig$Diff -android.service.notification.ZenModeConfig$EventInfo -android.service.notification.ZenModeConfig$ScheduleInfo -android.service.notification.ZenModeConfig$ZenRule -android.service.notification.ZenModeConfig$ZenRule$1 -android.service.oemlock.IOemLockService -android.service.oemlock.IOemLockService$Stub -android.service.oemlock.OemLockManager -android.service.persistentdata.IPersistentDataBlockService -android.service.persistentdata.IPersistentDataBlockService$Stub -android.service.persistentdata.IPersistentDataBlockService$Stub$Proxy -android.service.persistentdata.PersistentDataBlockManager -android.service.quicksettings.IQSService -android.service.quicksettings.IQSService$Stub -android.service.quicksettings.Tile -android.service.textservice.SpellCheckerService -android.service.textservice.SpellCheckerService$InternalISpellCheckerSession -android.service.textservice.SpellCheckerService$Session -android.service.textservice.SpellCheckerService$SpellCheckerServiceBinder -android.service.voice.AlwaysOnHotwordDetector -android.service.voice.AlwaysOnHotwordDetector$Callback -android.service.voice.AlwaysOnHotwordDetector$EventPayload -android.service.voice.AlwaysOnHotwordDetector$MyHandler -android.service.voice.AlwaysOnHotwordDetector$RefreshAvailabiltyTask -android.service.voice.AlwaysOnHotwordDetector$SoundTriggerListener -android.service.voice.IVoiceInteractionService -android.service.voice.IVoiceInteractionService$Stub -android.service.voice.IVoiceInteractionService$Stub$Proxy -android.service.voice.IVoiceInteractionSession -android.service.voice.VoiceInteractionManagerInternal -android.service.voice.VoiceInteractionService -android.service.voice.VoiceInteractionService$1 -android.service.voice.VoiceInteractionService$MyHandler -android.service.voice.VoiceInteractionServiceInfo -android.service.vr.IPersistentVrStateCallbacks -android.service.vr.IPersistentVrStateCallbacks$Stub -android.service.vr.IVrManager -android.service.vr.IVrManager$Stub -android.service.vr.IVrManager$Stub$Proxy -android.service.vr.IVrStateCallbacks -android.service.vr.IVrStateCallbacks$Stub -android.service.vr.IVrStateCallbacks$Stub$Proxy -android.service.wallpaper.IWallpaperConnection -android.service.wallpaper.IWallpaperConnection$Stub -android.service.wallpaper.IWallpaperConnection$Stub$Proxy -android.service.wallpaper.IWallpaperEngine -android.service.wallpaper.IWallpaperEngine$Stub -android.service.wallpaper.IWallpaperEngine$Stub$Proxy -android.service.wallpaper.IWallpaperService -android.service.wallpaper.IWallpaperService$Stub -android.service.wallpaper.IWallpaperService$Stub$Proxy -android.service.wallpaper.WallpaperService -android.service.wallpaper.WallpaperService$Engine -android.service.wallpaper.WallpaperService$Engine$1 -android.service.wallpaper.WallpaperService$Engine$2 -android.service.wallpaper.WallpaperService$Engine$3 -android.service.wallpaper.WallpaperService$Engine$WallpaperInputEventReceiver -android.service.wallpaper.WallpaperService$IWallpaperEngineWrapper -android.service.wallpaper.WallpaperService$IWallpaperServiceWrapper -android.service.wallpaper.WallpaperService$WallpaperCommand -android.speech.SpeechRecognizer -android.speech.tts.AbstractEventLogger -android.speech.tts.AbstractSynthesisCallback -android.speech.tts.AudioPlaybackHandler -android.speech.tts.AudioPlaybackHandler$MessageLoop -android.speech.tts.EventLogger -android.speech.tts.FileSynthesisCallback -android.speech.tts.ITextToSpeechCallback -android.speech.tts.ITextToSpeechCallback$Stub -android.speech.tts.ITextToSpeechCallback$Stub$Proxy -android.speech.tts.ITextToSpeechService -android.speech.tts.ITextToSpeechService$Stub -android.speech.tts.ITextToSpeechService$Stub$Proxy -android.speech.tts.SynthesisCallback -android.speech.tts.SynthesisRequest -android.speech.tts.TextToSpeech -android.speech.tts.TextToSpeech$10 -android.speech.tts.TextToSpeech$16 -android.speech.tts.TextToSpeech$17 -android.speech.tts.TextToSpeech$7 -android.speech.tts.TextToSpeech$Action -android.speech.tts.TextToSpeech$Connection -android.speech.tts.TextToSpeech$Connection$1 -android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask -android.speech.tts.TextToSpeech$EngineInfo -android.speech.tts.TextToSpeech$OnInitListener -android.speech.tts.TextToSpeechService -android.speech.tts.TextToSpeechService$1 -android.speech.tts.TextToSpeechService$CallbackMap -android.speech.tts.TextToSpeechService$SpeechItem -android.speech.tts.TextToSpeechService$SynthHandler -android.speech.tts.TextToSpeechService$SynthHandler$1 -android.speech.tts.TextToSpeechService$SynthHandler$2 -android.speech.tts.TextToSpeechService$SynthThread -android.speech.tts.TextToSpeechService$SynthesisSpeechItem -android.speech.tts.TextToSpeechService$SynthesisToFileOutputStreamSpeechItem -android.speech.tts.TextToSpeechService$UtteranceProgressDispatcher -android.speech.tts.TextToSpeechService$UtteranceSpeechItem -android.speech.tts.TextToSpeechService$UtteranceSpeechItemWithParams -android.speech.tts.TtsEngines -android.speech.tts.TtsEngines$EngineInfoComparator -android.speech.tts.UtteranceProgressListener -android.system.ErrnoException -android.system.GaiException -android.system.NetlinkSocketAddress -android.system.Os -android.system.OsConstants -android.system.PacketSocketAddress -android.system.StructAddrinfo -android.system.StructFlock -android.system.StructGroupReq -android.system.StructIcmpHdr -android.system.StructIfaddrs -android.system.StructLinger -android.system.StructPasswd -android.system.StructPollfd -android.system.StructStat -android.system.StructStatVfs -android.system.StructTimeval -android.system.StructUcred -android.system.StructUtsname -android.system.UnixSocketAddress -android.telecom.-$Lambda$afyb_ODGzn3xMew6fjs8ANSIdVo -android.telecom.CallAudioState -android.telecom.CallAudioState$1 -android.telecom.Conference -android.telecom.Conference$Listener -android.telecom.Conferenceable -android.telecom.Connection -android.telecom.Connection$1 -android.telecom.Connection$2 -android.telecom.Connection$FailureSignalingConnection -android.telecom.Connection$Listener -android.telecom.ConnectionRequest -android.telecom.ConnectionRequest$1 -android.telecom.ConnectionRequest$Builder -android.telecom.ConnectionService -android.telecom.ConnectionService$1 -android.telecom.ConnectionService$2 -android.telecom.ConnectionService$2$1 -android.telecom.ConnectionService$3 -android.telecom.ConnectionService$4 -android.telecom.ConnectionService$5 -android.telecom.ConnectionService$5$1 -android.telecom.ConnectionServiceAdapter -android.telecom.DefaultDialerManager -android.telecom.DisconnectCause -android.telecom.DisconnectCause$1 -android.telecom.Log -android.telecom.Log$1 -android.telecom.Logging.-$Lambda$OwO3BlCgqcOx28O1BaOAPVPor24 -android.telecom.Logging.-$Lambda$OwO3BlCgqcOx28O1BaOAPVPor24$1 -android.telecom.Logging.-$Lambda$OwO3BlCgqcOx28O1BaOAPVPor24$2 -android.telecom.Logging.EventManager -android.telecom.Logging.EventManager$Event -android.telecom.Logging.EventManager$EventListener -android.telecom.Logging.EventManager$EventRecord -android.telecom.Logging.EventManager$Loggable -android.telecom.Logging.EventManager$TimedEventPair -android.telecom.Logging.Runnable -android.telecom.Logging.Runnable$1 -android.telecom.Logging.Session -android.telecom.Logging.Session$Info -android.telecom.Logging.Session$Info$1 -android.telecom.Logging.SessionManager -android.telecom.Logging.SessionManager$ICurrentThreadId -android.telecom.Logging.SessionManager$ISessionCleanupTimeoutMs -android.telecom.Logging.SessionManager$ISessionIdQueryHandler -android.telecom.Logging.SessionManager$ISessionListener -android.telecom.ParcelableCall -android.telecom.ParcelableCall$1 -android.telecom.ParcelableConference -android.telecom.ParcelableConnection -android.telecom.ParcelableConnection$1 -android.telecom.PhoneAccount -android.telecom.PhoneAccount$1 -android.telecom.PhoneAccount$Builder -android.telecom.PhoneAccountHandle -android.telecom.PhoneAccountHandle$1 -android.telecom.RemoteConnectionManager -android.telecom.StatusHints -android.telecom.TelecomAnalytics -android.telecom.TelecomManager -android.telecom.VideoProfile -android.telecom.VideoProfile$1 -android.telephony.CarrierConfigManager -android.telephony.CellIdentityWcdma -android.telephony.CellIdentityWcdma$1 -android.telephony.CellInfo -android.telephony.CellInfo$1 -android.telephony.CellInfoCdma -android.telephony.CellInfoGsm -android.telephony.CellInfoLte -android.telephony.CellInfoWcdma -android.telephony.CellInfoWcdma$1 -android.telephony.CellLocation -android.telephony.CellSignalStrength -android.telephony.CellSignalStrengthWcdma -android.telephony.CellSignalStrengthWcdma$1 -android.telephony.ClientRequestStats -android.telephony.ClientRequestStats$1 -android.telephony.DisconnectCause -android.telephony.IccOpenLogicalChannelResponse -android.telephony.ModemActivityInfo -android.telephony.PhoneNumberFormattingTextWatcher -android.telephony.PhoneNumberUtils -android.telephony.PhoneStateListener -android.telephony.PhoneStateListener$1 -android.telephony.PhoneStateListener$IPhoneStateListenerStub -android.telephony.PreciseCallState -android.telephony.PreciseCallState$1 -android.telephony.PreciseDataConnectionState -android.telephony.PreciseDataConnectionState$1 -android.telephony.RadioAccessFamily -android.telephony.Rlog -android.telephony.ServiceState -android.telephony.ServiceState$1 -android.telephony.SignalStrength -android.telephony.SignalStrength$1 -android.telephony.SmsManager -android.telephony.SmsMessage -android.telephony.SubscriptionInfo -android.telephony.SubscriptionInfo$1 -android.telephony.SubscriptionManager -android.telephony.SubscriptionManager$OnSubscriptionsChangedListener -android.telephony.SubscriptionManager$OnSubscriptionsChangedListener$1 -android.telephony.SubscriptionManager$OnSubscriptionsChangedListener$2 -android.telephony.TelephonyHistogram -android.telephony.TelephonyHistogram$1 -android.telephony.TelephonyManager -android.telephony.TelephonyManager$MultiSimVariants -android.telephony.VisualVoicemailSmsFilterSettings -android.telephony.VoLteServiceState -android.telephony.VoLteServiceState$1 -android.telephony.gsm.GsmCellLocation -android.telephony.ims.stub.ImsConfigImplBase -android.telephony.ims.stub.ImsEcbmImplBase -android.telephony.ims.stub.ImsUtImplBase -android.telephony.ims.stub.ImsUtListenerImplBase -android.text.AndroidBidi -android.text.AndroidCharacter -android.text.Annotation -android.text.BidiFormatter -android.text.BidiFormatter$DirectionalityEstimator -android.text.BoringLayout -android.text.BoringLayout$Metrics -android.text.CharSequenceCharacterIterator -android.text.ClipboardManager -android.text.DynamicLayout -android.text.DynamicLayout$ChangeWatcher -android.text.Editable -android.text.Editable$Factory -android.text.FontConfig -android.text.FontConfig$Alias -android.text.FontConfig$Family -android.text.FontConfig$Font -android.text.GetChars -android.text.GraphicsOperations -android.text.Html -android.text.Html$HtmlParser -android.text.Html$TagHandler -android.text.HtmlToSpannedConverter -android.text.HtmlToSpannedConverter$Bold -android.text.HtmlToSpannedConverter$Href -android.text.Hyphenator -android.text.Hyphenator$HyphenationData -android.text.InputFilter -android.text.InputFilter$LengthFilter -android.text.InputType -android.text.Layout -android.text.Layout$Alignment -android.text.Layout$Directions -android.text.Layout$Ellipsizer -android.text.Layout$SpannedEllipsizer -android.text.MeasuredText -android.text.NoCopySpan -android.text.NoCopySpan$Concrete -android.text.PackedIntVector -android.text.PackedObjectVector -android.text.ParcelableSpan -android.text.Selection -android.text.Selection$END -android.text.Selection$PositionIterator -android.text.Selection$START -android.text.SpanSet -android.text.SpanWatcher -android.text.Spannable -android.text.Spannable$Factory -android.text.SpannableString -android.text.SpannableStringBuilder -android.text.SpannableStringInternal -android.text.Spanned -android.text.SpannedString -android.text.StaticLayout -android.text.StaticLayout$Builder -android.text.StaticLayout$LineBreaks -android.text.TextDirectionHeuristic -android.text.TextDirectionHeuristics -android.text.TextDirectionHeuristics$AnyStrong -android.text.TextDirectionHeuristics$FirstStrong -android.text.TextDirectionHeuristics$TextDirectionAlgorithm -android.text.TextDirectionHeuristics$TextDirectionHeuristicImpl -android.text.TextDirectionHeuristics$TextDirectionHeuristicInternal -android.text.TextDirectionHeuristics$TextDirectionHeuristicLocale -android.text.TextLine -android.text.TextPaint -android.text.TextUtils -android.text.TextUtils$1 -android.text.TextUtils$EllipsizeCallback -android.text.TextUtils$SimpleStringSplitter -android.text.TextUtils$StringSplitter -android.text.TextUtils$TruncateAt -android.text.TextWatcher -android.text.format.DateFormat -android.text.format.DateUtils -android.text.format.Formatter -android.text.format.Formatter$BytesResult -android.text.format.Time -android.text.format.Time$TimeCalculator -android.text.format.TimeFormatter -android.text.method.AllCapsTransformationMethod -android.text.method.ArrowKeyMovementMethod -android.text.method.BaseKeyListener -android.text.method.BaseMovementMethod -android.text.method.DialerKeyListener -android.text.method.KeyListener -android.text.method.LinkMovementMethod -android.text.method.MetaKeyKeyListener -android.text.method.MovementMethod -android.text.method.NumberKeyListener -android.text.method.PasswordTransformationMethod -android.text.method.QwertyKeyListener -android.text.method.QwertyKeyListener$Replaced -android.text.method.ReplacementTransformationMethod -android.text.method.ReplacementTransformationMethod$ReplacementCharSequence -android.text.method.ReplacementTransformationMethod$SpannedReplacementCharSequence -android.text.method.ScrollingMovementMethod -android.text.method.SingleLineTransformationMethod -android.text.method.TextKeyListener -android.text.method.TextKeyListener$Capitalize -android.text.method.TextKeyListener$SettingsObserver -android.text.method.Touch -android.text.method.Touch$DragState -android.text.method.TransformationMethod -android.text.method.TransformationMethod2 -android.text.method.WordIterator -android.text.style.AlignmentSpan -android.text.style.BackgroundColorSpan -android.text.style.CharacterStyle -android.text.style.CharacterStyle$Passthrough -android.text.style.ClickableSpan -android.text.style.DynamicDrawableSpan -android.text.style.EasyEditSpan -android.text.style.ForegroundColorSpan -android.text.style.ImageSpan -android.text.style.LeadingMarginSpan -android.text.style.LeadingMarginSpan$LeadingMarginSpan2 -android.text.style.LeadingMarginSpan$Standard -android.text.style.LineBackgroundSpan -android.text.style.LineHeightSpan -android.text.style.LineHeightSpan$WithDensity -android.text.style.MetricAffectingSpan -android.text.style.MetricAffectingSpan$Passthrough -android.text.style.ParagraphStyle -android.text.style.RelativeSizeSpan -android.text.style.ReplacementSpan -android.text.style.SpellCheckSpan -android.text.style.StrikethroughSpan -android.text.style.StyleSpan -android.text.style.SuggestionSpan -android.text.style.TabStopSpan -android.text.style.TextAppearanceSpan -android.text.style.TtsSpan -android.text.style.TtsSpan$Builder -android.text.style.TtsSpan$SemioticClassBuilder -android.text.style.TtsSpan$TelephoneBuilder -android.text.style.TtsSpan$VerbatimBuilder -android.text.style.TypefaceSpan -android.text.style.URLSpan -android.text.style.UnderlineSpan -android.text.style.UpdateAppearance -android.text.style.UpdateLayout -android.text.style.WrapTogetherSpan -android.text.util.Linkify -android.text.util.Linkify$1 -android.text.util.Linkify$2 -android.text.util.Linkify$3 -android.text.util.Linkify$4 -android.text.util.Linkify$MatchFilter -android.text.util.Linkify$TransformFilter -android.text.util.Rfc822Token -android.text.util.Rfc822Tokenizer -android.transition.ArcMotion -android.transition.AutoTransition -android.transition.ChangeBounds -android.transition.ChangeBounds$1 -android.transition.ChangeBounds$2 -android.transition.ChangeBounds$3 -android.transition.ChangeBounds$4 -android.transition.ChangeBounds$5 -android.transition.ChangeBounds$6 -android.transition.ChangeBounds$9 -android.transition.ChangeClipBounds -android.transition.ChangeImageTransform -android.transition.ChangeImageTransform$1 -android.transition.ChangeImageTransform$2 -android.transition.ChangeTransform -android.transition.ChangeTransform$1 -android.transition.ChangeTransform$2 -android.transition.ChangeTransform$3 -android.transition.ChangeTransform$GhostListener -android.transition.ChangeTransform$PathAnimatorMatrix -android.transition.ChangeTransform$Transforms -android.transition.CircularPropagation -android.transition.Explode -android.transition.Fade -android.transition.Fade$1 -android.transition.Fade$FadeAnimatorListener -android.transition.PathMotion -android.transition.Scene -android.transition.SidePropagation -android.transition.Slide -android.transition.Slide$1 -android.transition.Slide$2 -android.transition.Slide$3 -android.transition.Slide$4 -android.transition.Slide$5 -android.transition.Slide$6 -android.transition.Slide$CalculateSlide -android.transition.Slide$CalculateSlideHorizontal -android.transition.Slide$CalculateSlideVertical -android.transition.Transition -android.transition.Transition$1 -android.transition.Transition$2 -android.transition.Transition$3 -android.transition.Transition$AnimationInfo -android.transition.Transition$ArrayListManager -android.transition.Transition$EpicenterCallback -android.transition.Transition$TransitionListener -android.transition.TransitionInflater -android.transition.TransitionListenerAdapter -android.transition.TransitionManager -android.transition.TransitionManager$MultiListener -android.transition.TransitionManager$MultiListener$1 -android.transition.TransitionPropagation -android.transition.TransitionSet -android.transition.TransitionSet$TransitionSetListener -android.transition.TransitionUtils -android.transition.TransitionValues -android.transition.TransitionValuesMaps -android.transition.Visibility -android.transition.Visibility$1 -android.transition.Visibility$VisibilityInfo -android.transition.VisibilityPropagation -android.util.AndroidException -android.util.AndroidRuntimeException -android.util.ArrayMap -android.util.ArrayMap$1 -android.util.ArraySet -android.util.ArraySet$1 -android.util.AtomicFile -android.util.AttributeSet -android.util.Base64 -android.util.Base64$Coder -android.util.Base64$Decoder -android.util.Base64$Encoder -android.util.TimingsTraceLog -android.util.ByteStringUtils -android.util.ContainerHelpers -android.util.DebugUtils -android.util.DisplayMetrics -android.util.EventLog -android.util.EventLog$Event -android.util.FastImmutableArraySet -android.util.FastImmutableArraySet$FastIterator -android.util.FloatProperty -android.util.IconDrawableFactory -android.util.IntArray -android.util.IntProperty -android.util.JsonReader -android.util.JsonScope -android.util.JsonToken -android.util.JsonWriter -android.util.KeyValueListParser -android.util.LauncherIcons -android.util.LauncherIcons$ShadowDrawable -android.util.LauncherIcons$ShadowDrawable$MyConstantState -android.util.LocalLog -android.util.LocalLog$ReadOnlyLocalLog -android.util.Log -android.util.Log$1 -android.util.Log$ImmediateLogWriter -android.util.Log$TerribleFailure -android.util.Log$TerribleFailureHandler -android.util.LogPrinter -android.util.LongArray -android.util.LongSparseArray -android.util.LongSparseLongArray -android.util.LruCache -android.util.MapCollections -android.util.MapCollections$ArrayIterator -android.util.MapCollections$EntrySet -android.util.MapCollections$KeySet -android.util.MapCollections$MapIterator -android.util.MapCollections$ValuesCollection -android.util.MathUtils -android.util.MemoryIntArray -android.util.MemoryIntArray$1 -android.util.MergedConfiguration -android.util.MergedConfiguration$1 -android.util.MutableBoolean -android.util.MutableInt -android.util.MutableLong -android.util.NtpTrustedTime -android.util.Pair -android.util.PathParser -android.util.PathParser$PathData -android.util.Patterns -android.util.Pools$Pool -android.util.Pools$SimplePool -android.util.Pools$SynchronizedPool -android.util.Printer -android.util.Property -android.util.Range -android.util.Rational -android.util.ReflectiveProperty -android.util.Singleton -android.util.Size -android.util.SizeF -android.util.Slog -android.util.SparseArray -android.util.SparseBooleanArray -android.util.SparseIntArray -android.util.SparseLongArray -android.util.Spline -android.util.Spline$MonotoneCubicSpline -android.util.StateSet -android.util.SuperNotCalledException -android.util.TimeFormatException -android.util.TimeUtils -android.util.TimedRemoteCaller -android.util.TimingLogger -android.util.TrustedTime -android.util.TypedValue -android.util.Xml -android.util.Xml$XmlSerializerFactory -android.util.XmlPullAttributes -android.util.apk.ApkSignatureSchemeV2Verifier -android.util.apk.ApkSignatureSchemeV2Verifier$SignatureNotFoundException -android.util.apk.ZipUtils -android.util.jar.StrictJarFile -android.util.jar.StrictJarFile$EntryIterator -android.util.jar.StrictJarFile$FDStream -android.util.jar.StrictJarFile$JarFileInputStream -android.util.jar.StrictJarFile$ZipInflaterInputStream -android.util.jar.StrictJarManifest -android.util.jar.StrictJarManifest$Chunk -android.util.jar.StrictJarManifestReader -android.util.jar.StrictJarVerifier -android.util.jar.StrictJarVerifier$VerifierEntry -android.view.-$Lambda$6k_RnLLpNi5zg27ubDxN4lDdBbk -android.view.-$Lambda$6k_RnLLpNi5zg27ubDxN4lDdBbk$1 -android.view.-$Lambda$6k_RnLLpNi5zg27ubDxN4lDdBbk$2 -android.view.-$Lambda$6k_RnLLpNi5zg27ubDxN4lDdBbk$3 -android.view.-$Lambda$P6MTGFSudLpwrqb6oVD8FdorW1c -android.view.-$Lambda$iU_USrtPm1XIm5H9QYQvXfBGDE4 -android.view.-$Lambda$iU_USrtPm1XIm5H9QYQvXfBGDE4$1 -android.view.AbsSavedState -android.view.AbsSavedState$1 -android.view.AbsSavedState$2 -android.view.ActionMode -android.view.ActionMode$Callback -android.view.ActionMode$Callback2 -android.view.ActionProvider -android.view.ActionProvider$SubUiVisibilityListener -android.view.AppTransitionAnimationSpec -android.view.AppTransitionAnimationSpec$1 -android.view.Choreographer -android.view.Choreographer$1 -android.view.Choreographer$2 -android.view.Choreographer$CallbackQueue -android.view.Choreographer$CallbackRecord -android.view.Choreographer$FrameCallback -android.view.Choreographer$FrameDisplayEventReceiver -android.view.Choreographer$FrameHandler -android.view.ContextMenu -android.view.ContextMenu$ContextMenuInfo -android.view.ContextThemeWrapper -android.view.Display -android.view.Display$HdrCapabilities -android.view.Display$HdrCapabilities$1 -android.view.Display$Mode -android.view.Display$Mode$1 -android.view.DisplayAdjustments -android.view.DisplayEventReceiver -android.view.DisplayInfo -android.view.DisplayInfo$1 -android.view.DisplayListCanvas -android.view.DragEvent -android.view.FallbackEventHandler -android.view.FocusFinder -android.view.FocusFinder$1 -android.view.FocusFinder$FocusSorter -android.view.FocusFinder$UserSpecifiedFocusComparator -android.view.FocusFinder$UserSpecifiedFocusComparator$NextFocusGetter -android.view.FrameInfo -android.view.FrameMetrics -android.view.FrameMetricsObserver -android.view.FrameStats -android.view.GestureDetector -android.view.GestureDetector$GestureHandler -android.view.GestureDetector$OnContextClickListener -android.view.GestureDetector$OnDoubleTapListener -android.view.GestureDetector$OnGestureListener -android.view.GestureDetector$SimpleOnGestureListener -android.view.GhostView -android.view.Gravity -android.view.HandlerActionQueue -android.view.HandlerActionQueue$HandlerAction -android.view.HardwareLayer -android.view.IAppTransitionAnimationSpecsFuture -android.view.IAppTransitionAnimationSpecsFuture$Stub -android.view.IAppTransitionAnimationSpecsFuture$Stub$Proxy -android.view.IApplicationToken -android.view.IApplicationToken$Stub -android.view.IDockedStackListener -android.view.IDockedStackListener$Stub -android.view.IDockedStackListener$Stub$Proxy -android.view.IGraphicsStats -android.view.IGraphicsStats$Stub -android.view.IGraphicsStats$Stub$Proxy -android.view.IGraphicsStatsCallback -android.view.IGraphicsStatsCallback$Stub -android.view.IGraphicsStatsCallback$Stub$Proxy -android.view.IInputFilter -android.view.IOnKeyguardExitResult -android.view.IPinnedStackController -android.view.IPinnedStackController$Stub -android.view.IPinnedStackController$Stub$Proxy -android.view.IPinnedStackListener -android.view.IPinnedStackListener$Stub -android.view.IPinnedStackListener$Stub$Proxy -android.view.IRotationWatcher -android.view.IRotationWatcher$Stub -android.view.IRotationWatcher$Stub$Proxy -android.view.IWindow -android.view.IWindow$Stub -android.view.IWindow$Stub$Proxy -android.view.IWindowFocusObserver -android.view.IWindowId -android.view.IWindowId$Stub -android.view.IWindowId$Stub$Proxy -android.view.IWindowManager -android.view.IWindowManager$Stub -android.view.IWindowManager$Stub$Proxy -android.view.IWindowSession -android.view.IWindowSession$Stub -android.view.IWindowSession$Stub$Proxy -android.view.IWindowSessionCallback -android.view.IWindowSessionCallback$Stub -android.view.IWindowSessionCallback$Stub$Proxy -android.view.InflateException -android.view.InputChannel -android.view.InputChannel$1 -android.view.InputDevice -android.view.InputDevice$1 -android.view.InputDevice$MotionRange -android.view.InputEvent -android.view.InputEvent$1 -android.view.InputEventConsistencyVerifier -android.view.InputEventReceiver -android.view.InputEventReceiver$Factory -android.view.InputEventSender -android.view.InputQueue -android.view.InputQueue$Callback -android.view.InputQueue$FinishedInputEventCallback -android.view.KeyCharacterMap -android.view.KeyCharacterMap$1 -android.view.KeyCharacterMap$FallbackAction -android.view.KeyEvent -android.view.KeyEvent$1 -android.view.KeyEvent$Callback -android.view.KeyEvent$DispatcherState -android.view.KeyboardShortcutGroup -android.view.KeyboardShortcutGroup$1 -android.view.KeyboardShortcutInfo -android.view.KeyboardShortcutInfo$1 -android.view.LayoutInflater -android.view.LayoutInflater$Factory -android.view.LayoutInflater$Factory2 -android.view.LayoutInflater$FactoryMerger -android.view.LayoutInflater$Filter -android.view.MagnificationSpec -android.view.Menu -android.view.MenuInflater -android.view.MenuInflater$MenuState -android.view.MenuItem -android.view.MenuItem$OnActionExpandListener -android.view.MenuItem$OnMenuItemClickListener -android.view.MotionEvent -android.view.MotionEvent$1 -android.view.MotionEvent$PointerCoords -android.view.MotionEvent$PointerProperties -android.view.NotificationHeaderView -android.view.NotificationHeaderView$1 -android.view.NotificationHeaderView$HeaderTouchListener -android.view.OrientationEventListener -android.view.OrientationEventListener$SensorEventListenerImpl -android.view.PointerIcon -android.view.PointerIcon$1 -android.view.RecordingCanvas -android.view.RemotableViewMethod -android.view.RenderNode -android.view.RenderNode$NoImagePreloadHolder -android.view.RenderNodeAnimator -android.view.RenderNodeAnimator$1 -android.view.RenderNodeAnimatorSetHelper -android.view.ScaleGestureDetector -android.view.ScaleGestureDetector$1 -android.view.ScaleGestureDetector$OnScaleGestureListener -android.view.ScaleGestureDetector$SimpleOnScaleGestureListener -android.view.SearchEvent -android.view.SubMenu -android.view.Surface -android.view.Surface$1 -android.view.Surface$CompatibleCanvas -android.view.Surface$OutOfResourcesException -android.view.SurfaceControl -android.view.SurfaceControl$PhysicalDisplayInfo -android.view.SurfaceHolder -android.view.SurfaceHolder$Callback -android.view.SurfaceHolder$Callback2 -android.view.SurfaceSession -android.view.SurfaceView -android.view.SurfaceView$1 -android.view.SurfaceView$2 -android.view.SurfaceView$3 -android.view.SurfaceView$4 -android.view.TextureView -android.view.TextureView$1 -android.view.TextureView$SurfaceTextureListener -android.view.ThreadedRenderer -android.view.ThreadedRenderer$DrawCallbacks -android.view.ThreadedRenderer$ProcessInitializer -android.view.ThreadedRenderer$ProcessInitializer$1 -android.view.TouchDelegate -android.view.VelocityTracker -android.view.VelocityTracker$Estimator -android.view.View -android.view.View$1 -android.view.View$10 -android.view.View$11 -android.view.View$12 -android.view.View$2 -android.view.View$3 -android.view.View$4 -android.view.View$5 -android.view.View$6 -android.view.View$7 -android.view.View$8 -android.view.View$9 -android.view.View$AccessibilityDelegate -android.view.View$AttachInfo -android.view.View$AttachInfo$Callbacks -android.view.View$BaseSavedState -android.view.View$BaseSavedState$1 -android.view.View$CheckForLongPress -android.view.View$CheckForTap -android.view.View$DeclaredOnClickListener -android.view.View$ForegroundInfo -android.view.View$ListenerInfo -android.view.View$MatchIdPredicate -android.view.View$MeasureSpec -android.view.View$OnApplyWindowInsetsListener -android.view.View$OnAttachStateChangeListener -android.view.View$OnClickListener -android.view.View$OnCreateContextMenuListener -android.view.View$OnDragListener -android.view.View$OnFocusChangeListener -android.view.View$OnGenericMotionListener -android.view.View$OnHoverListener -android.view.View$OnKeyListener -android.view.View$OnLayoutChangeListener -android.view.View$OnLongClickListener -android.view.View$OnScrollChangeListener -android.view.View$OnSystemUiVisibilityChangeListener -android.view.View$OnTouchListener -android.view.View$PerformClick -android.view.View$ScrollabilityCache -android.view.View$TintInfo -android.view.View$TooltipInfo -android.view.View$TransformationInfo -android.view.View$UnsetPressedState -android.view.View$VisibilityChangeForAutofillHandler -android.view.ViewAnimationUtils -android.view.ViewConfiguration -android.view.ViewDebug$CapturedViewProperty -android.view.ViewDebug$ExportedProperty -android.view.ViewDebug$HierarchyHandler -android.view.ViewGroup -android.view.ViewGroup$1 -android.view.ViewGroup$2 -android.view.ViewGroup$3 -android.view.ViewGroup$4 -android.view.ViewGroup$ChildListForAutoFill -android.view.ViewGroup$LayoutParams -android.view.ViewGroup$MarginLayoutParams -android.view.ViewGroup$OnHierarchyChangeListener -android.view.ViewGroup$TouchTarget -android.view.ViewGroupOverlay -android.view.ViewManager -android.view.ViewOutlineProvider -android.view.ViewOutlineProvider$1 -android.view.ViewOutlineProvider$2 -android.view.ViewOutlineProvider$3 -android.view.ViewOverlay -android.view.ViewOverlay$OverlayViewGroup -android.view.ViewParent -android.view.ViewPropertyAnimator -android.view.ViewPropertyAnimator$1 -android.view.ViewPropertyAnimator$2 -android.view.ViewPropertyAnimator$3 -android.view.ViewPropertyAnimator$AnimatorEventListener -android.view.ViewPropertyAnimator$NameValuesHolder -android.view.ViewPropertyAnimator$PropertyBundle -android.view.ViewRootImpl -android.view.ViewRootImpl$1 -android.view.ViewRootImpl$2 -android.view.ViewRootImpl$4 -android.view.ViewRootImpl$AccessibilityInteractionConnectionManager -android.view.ViewRootImpl$ActivityConfigCallback -android.view.ViewRootImpl$AsyncInputStage -android.view.ViewRootImpl$ConfigChangedCallback -android.view.ViewRootImpl$ConsumeBatchedInputImmediatelyRunnable -android.view.ViewRootImpl$ConsumeBatchedInputRunnable -android.view.ViewRootImpl$EarlyPostImeInputStage -android.view.ViewRootImpl$HighContrastTextManager -android.view.ViewRootImpl$ImeInputStage -android.view.ViewRootImpl$InputStage -android.view.ViewRootImpl$InvalidateOnAnimationRunnable -android.view.ViewRootImpl$NativePostImeInputStage -android.view.ViewRootImpl$NativePreImeInputStage -android.view.ViewRootImpl$QueuedInputEvent -android.view.ViewRootImpl$SyntheticInputStage -android.view.ViewRootImpl$SyntheticJoystickHandler -android.view.ViewRootImpl$SyntheticKeyboardHandler -android.view.ViewRootImpl$SyntheticTouchNavigationHandler -android.view.ViewRootImpl$SyntheticTouchNavigationHandler$1 -android.view.ViewRootImpl$SyntheticTrackballHandler -android.view.ViewRootImpl$SystemUiVisibilityInfo -android.view.ViewRootImpl$TrackballAxis -android.view.ViewRootImpl$TraversalRunnable -android.view.ViewRootImpl$ViewPostImeInputStage -android.view.ViewRootImpl$ViewPreImeInputStage -android.view.ViewRootImpl$ViewRootHandler -android.view.ViewRootImpl$W -android.view.ViewRootImpl$WindowInputEventReceiver -android.view.ViewRootImpl$WindowStoppedCallback -android.view.ViewStructure -android.view.ViewStructure$HtmlInfo -android.view.ViewStub -android.view.ViewStub$OnInflateListener -android.view.ViewStub$ViewReplaceRunnable -android.view.ViewTreeObserver -android.view.ViewTreeObserver$CopyOnWriteArray -android.view.ViewTreeObserver$CopyOnWriteArray$Access -android.view.ViewTreeObserver$InternalInsetsInfo -android.view.ViewTreeObserver$OnComputeInternalInsetsListener -android.view.ViewTreeObserver$OnDrawListener -android.view.ViewTreeObserver$OnGlobalFocusChangeListener -android.view.ViewTreeObserver$OnGlobalLayoutListener -android.view.ViewTreeObserver$OnPreDrawListener -android.view.ViewTreeObserver$OnScrollChangedListener -android.view.ViewTreeObserver$OnTouchModeChangeListener -android.view.Window -android.view.Window$Callback -android.view.Window$OnWindowDismissedCallback -android.view.Window$OnWindowSwipeDismissedCallback -android.view.Window$WindowControllerCallback -android.view.WindowAnimationFrameStats -android.view.WindowAnimationFrameStats$1 -android.view.WindowCallbackWrapper -android.view.WindowCallbacks -android.view.WindowContentFrameStats -android.view.WindowContentFrameStats$1 -android.view.WindowId -android.view.WindowId$1 -android.view.WindowInsets -android.view.WindowLeaked -android.view.WindowManager -android.view.WindowManager$BadTokenException -android.view.WindowManager$InvalidDisplayException -android.view.WindowManager$KeyboardShortcutsReceiver -android.view.WindowManager$LayoutParams -android.view.WindowManager$LayoutParams$1 -android.view.WindowManagerGlobal -android.view.WindowManagerGlobal$1 -android.view.WindowManagerGlobal$2 -android.view.WindowManagerImpl -android.view.WindowManagerPolicyConstants -android.view.WindowManagerPolicyConstants$PointerEventListener -android.view.accessibility.AccessibilityEvent -android.view.accessibility.AccessibilityEvent$1 -android.view.accessibility.AccessibilityEventSource -android.view.accessibility.AccessibilityManager -android.view.accessibility.AccessibilityManager$1 -android.view.accessibility.AccessibilityManager$AccessibilityServicesStateChangeListener -android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener -android.view.accessibility.AccessibilityManager$HighTextContrastChangeListener -android.view.accessibility.AccessibilityManager$MyCallback -android.view.accessibility.AccessibilityManager$TouchExplorationStateChangeListener -android.view.accessibility.AccessibilityNodeInfo -android.view.accessibility.AccessibilityNodeInfo$AccessibilityAction -android.view.accessibility.AccessibilityNodeProvider -android.view.accessibility.AccessibilityRecord -android.view.accessibility.CaptioningManager -android.view.accessibility.CaptioningManager$1 -android.view.accessibility.CaptioningManager$CaptionStyle -android.view.accessibility.CaptioningManager$CaptioningChangeListener -android.view.accessibility.CaptioningManager$MyContentObserver -android.view.accessibility.IAccessibilityInteractionConnection -android.view.accessibility.IAccessibilityInteractionConnection$Stub -android.view.accessibility.IAccessibilityInteractionConnection$Stub$Proxy -android.view.accessibility.IAccessibilityInteractionConnectionCallback -android.view.accessibility.IAccessibilityManager -android.view.accessibility.IAccessibilityManager$Stub -android.view.accessibility.IAccessibilityManager$Stub$Proxy -android.view.accessibility.IAccessibilityManagerClient -android.view.accessibility.IAccessibilityManagerClient$Stub -android.view.accessibility.IAccessibilityManagerClient$Stub$Proxy -android.view.animation.AccelerateDecelerateInterpolator -android.view.animation.AccelerateInterpolator -android.view.animation.AlphaAnimation -android.view.animation.Animation -android.view.animation.Animation$1 -android.view.animation.Animation$2 -android.view.animation.Animation$3 -android.view.animation.Animation$AnimationListener -android.view.animation.Animation$Description -android.view.animation.Animation$NoImagePreloadHolder -android.view.animation.AnimationSet -android.view.animation.AnimationUtils -android.view.animation.AnimationUtils$1 -android.view.animation.AnimationUtils$AnimationState -android.view.animation.BaseInterpolator -android.view.animation.ClipRectAnimation -android.view.animation.CycleInterpolator -android.view.animation.DecelerateInterpolator -android.view.animation.GridLayoutAnimationController$AnimationParameters -android.view.animation.Interpolator -android.view.animation.LayoutAnimationController -android.view.animation.LayoutAnimationController$AnimationParameters -android.view.animation.LinearInterpolator -android.view.animation.OvershootInterpolator -android.view.animation.PathInterpolator -android.view.animation.ScaleAnimation -android.view.animation.Transformation -android.view.animation.TranslateAnimation -android.view.autofill.AutofillId -android.view.autofill.AutofillId$1 -android.view.autofill.AutofillManager -android.view.autofill.AutofillManager$AutofillClient -android.view.autofill.AutofillManager$AutofillManagerClient -android.view.autofill.AutofillValue -android.view.autofill.AutofillValue$1 -android.view.autofill.Helper -android.view.autofill.IAutoFillManager -android.view.autofill.IAutoFillManager$Stub -android.view.autofill.IAutoFillManager$Stub$Proxy -android.view.autofill.IAutoFillManagerClient -android.view.autofill.IAutoFillManagerClient$Stub -android.view.autofill.IAutoFillManagerClient$Stub$Proxy -android.view.autofill.IAutofillWindowPresenter -android.view.inputmethod.BaseInputConnection -android.view.inputmethod.CompletionInfo -android.view.inputmethod.CompletionInfo$1 -android.view.inputmethod.ComposingText -android.view.inputmethod.CorrectionInfo -android.view.inputmethod.CursorAnchorInfo -android.view.inputmethod.CursorAnchorInfo$Builder -android.view.inputmethod.EditorInfo -android.view.inputmethod.EditorInfo$1 -android.view.inputmethod.ExtractedText -android.view.inputmethod.ExtractedText$1 -android.view.inputmethod.ExtractedTextRequest -android.view.inputmethod.ExtractedTextRequest$1 -android.view.inputmethod.InputBinding -android.view.inputmethod.InputBinding$1 -android.view.inputmethod.InputConnection -android.view.inputmethod.InputConnectionInspector -android.view.inputmethod.InputConnectionWrapper -android.view.inputmethod.InputContentInfo -android.view.inputmethod.InputMethod -android.view.inputmethod.InputMethod$SessionCallback -android.view.inputmethod.InputMethodInfo -android.view.inputmethod.InputMethodInfo$1 -android.view.inputmethod.InputMethodManager -android.view.inputmethod.InputMethodManager$1 -android.view.inputmethod.InputMethodManager$2 -android.view.inputmethod.InputMethodManager$ControlledInputConnectionWrapper -android.view.inputmethod.InputMethodManager$FinishedInputEventCallback -android.view.inputmethod.InputMethodManager$H -android.view.inputmethod.InputMethodManager$ImeInputEventSender -android.view.inputmethod.InputMethodManager$PendingEvent -android.view.inputmethod.InputMethodManagerInternal -android.view.inputmethod.InputMethodSession -android.view.inputmethod.InputMethodSession$EventCallback -android.view.inputmethod.InputMethodSubtype -android.view.inputmethod.InputMethodSubtype$1 -android.view.inputmethod.InputMethodSubtype$InputMethodSubtypeBuilder -android.view.inputmethod.InputMethodSubtypeArray -android.view.textclassifier.TextClassificationManager -android.view.textclassifier.TextClassifier -android.view.textclassifier.TextClassifier$1 -android.view.textclassifier.TextClassifierImpl -android.view.textservice.SpellCheckerInfo -android.view.textservice.SpellCheckerInfo$1 -android.view.textservice.SpellCheckerSession -android.view.textservice.SpellCheckerSession$1 -android.view.textservice.SpellCheckerSession$InternalListener -android.view.textservice.SpellCheckerSession$SpellCheckerSessionListener -android.view.textservice.SpellCheckerSession$SpellCheckerSessionListenerImpl -android.view.textservice.SpellCheckerSession$SpellCheckerSessionListenerImpl$SpellCheckerParams -android.view.textservice.SpellCheckerSubtype -android.view.textservice.SpellCheckerSubtype$1 -android.view.textservice.SuggestionsInfo -android.view.textservice.TextInfo -android.view.textservice.TextServicesManager -android.webkit.ConsoleMessage -android.webkit.ConsoleMessage$MessageLevel -android.webkit.CookieManager -android.webkit.CookieSyncManager -android.webkit.DownloadListener -android.webkit.GeolocationPermissions -android.webkit.IWebViewUpdateService -android.webkit.IWebViewUpdateService$Stub -android.webkit.IWebViewUpdateService$Stub$Proxy -android.webkit.JavascriptInterface -android.webkit.MimeTypeMap -android.webkit.ServiceWorkerClient -android.webkit.ServiceWorkerController -android.webkit.ServiceWorkerWebSettings -android.webkit.TokenBindingService -android.webkit.URLUtil -android.webkit.UserPackage -android.webkit.ValueCallback -android.webkit.WebBackForwardList -android.webkit.WebChromeClient -android.webkit.WebChromeClient$CustomViewCallback -android.webkit.WebIconDatabase -android.webkit.WebMessage -android.webkit.WebMessagePort -android.webkit.WebResourceRequest -android.webkit.WebSettings -android.webkit.WebSettings$LayoutAlgorithm -android.webkit.WebSettings$PluginState -android.webkit.WebSettings$RenderPriority -android.webkit.WebSettings$ZoomDensity -android.webkit.WebStorage -android.webkit.WebSyncManager -android.webkit.WebView -android.webkit.WebView$FindListener -android.webkit.WebView$HitTestResult -android.webkit.WebView$PictureListener -android.webkit.WebView$PrivateAccess -android.webkit.WebView$VisualStateCallback -android.webkit.WebViewClient -android.webkit.WebViewDatabase -android.webkit.WebViewDelegate -android.webkit.WebViewDelegate$1 -android.webkit.WebViewDelegate$OnTraceEnabledChangeListener -android.webkit.WebViewFactory -android.webkit.WebViewFactory$1 -android.webkit.WebViewFactory$MissingWebViewPackageException -android.webkit.WebViewFactory$RelroFileCreator -android.webkit.WebViewFactoryProvider -android.webkit.WebViewFactoryProvider$Statics -android.webkit.WebViewProvider -android.webkit.WebViewProvider$ScrollDelegate -android.webkit.WebViewProvider$ViewDelegate -android.webkit.WebViewProviderInfo -android.webkit.WebViewProviderInfo$1 -android.webkit.WebViewProviderResponse -android.webkit.WebViewProviderResponse$1 -android.webkit.WebViewZygote -android.widget.-$Lambda$ISuHLqeK-K4pmesAfzlFglc3xF4 -android.widget.-$Lambda$ISuHLqeK-K4pmesAfzlFglc3xF4$1 -android.widget.-$Lambda$ISuHLqeK-K4pmesAfzlFglc3xF4$2 -android.widget.-$Lambda$ISuHLqeK-K4pmesAfzlFglc3xF4$3 -android.widget.-$Lambda$tfOQKOmkDz_xLYaBQX_cysn8vbE -android.widget.AbsListView -android.widget.AbsListView$3 -android.widget.AbsListView$AdapterDataSetObserver -android.widget.AbsListView$CheckForTap -android.widget.AbsListView$FlingRunnable -android.widget.AbsListView$FlingRunnable$1 -android.widget.AbsListView$LayoutParams -android.widget.AbsListView$MultiChoiceModeListener -android.widget.AbsListView$MultiChoiceModeWrapper -android.widget.AbsListView$OnScrollListener -android.widget.AbsListView$PerformClick -android.widget.AbsListView$RecycleBin -android.widget.AbsListView$RecyclerListener -android.widget.AbsListView$SavedState -android.widget.AbsListView$SavedState$1 -android.widget.AbsListView$SelectionBoundsAdjuster -android.widget.AbsListView$WindowRunnnable -android.widget.AbsSeekBar -android.widget.AbsSpinner -android.widget.AbsSpinner$RecycleBin -android.widget.AbsoluteLayout -android.widget.ActionMenuPresenter -android.widget.ActionMenuPresenter$1 -android.widget.ActionMenuPresenter$2 -android.widget.ActionMenuPresenter$ActionMenuPopupCallback -android.widget.ActionMenuPresenter$OverflowMenuButton -android.widget.ActionMenuPresenter$OverflowMenuButton$1 -android.widget.ActionMenuPresenter$PopupPresenterCallback -android.widget.ActionMenuView -android.widget.ActionMenuView$ActionMenuChildView -android.widget.ActionMenuView$ActionMenuPresenterCallback -android.widget.ActionMenuView$LayoutParams -android.widget.ActionMenuView$MenuBuilderCallback -android.widget.ActionMenuView$OnMenuItemClickListener -android.widget.Adapter -android.widget.AdapterView -android.widget.AdapterView$AdapterDataSetObserver -android.widget.AdapterView$OnItemClickListener -android.widget.AdapterView$OnItemLongClickListener -android.widget.AdapterView$OnItemSelectedListener -android.widget.AdapterView$SelectionNotifier -android.widget.ArrayAdapter -android.widget.AutoCompleteTextView -android.widget.AutoCompleteTextView$DropDownItemClickListener -android.widget.AutoCompleteTextView$MyWatcher -android.widget.AutoCompleteTextView$PassThroughClickListener -android.widget.AutoCompleteTextView$PopupDataSetObserver -android.widget.AutoCompleteTextView$PopupDataSetObserver$1 -android.widget.AutoCompleteTextView$Validator -android.widget.BaseAdapter -android.widget.Button -android.widget.CheckBox -android.widget.Checkable -android.widget.CheckedTextView -android.widget.Chronometer -android.widget.Chronometer$1 -android.widget.CompoundButton -android.widget.CompoundButton$OnCheckedChangeListener -android.widget.CursorAdapter -android.widget.CursorFilter$CursorFilterClient -android.widget.DatePicker -android.widget.DateTimeView -android.widget.DateTimeView$ReceiverInfo -android.widget.DateTimeView$ReceiverInfo$1 -android.widget.DateTimeView$ReceiverInfo$2 -android.widget.DropDownListView -android.widget.EdgeEffect -android.widget.EditText -android.widget.Editor -android.widget.Editor$1 -android.widget.Editor$2 -android.widget.Editor$Blink -android.widget.Editor$CursorAnchorInfoNotifier -android.widget.Editor$CursorController -android.widget.Editor$EditOperation -android.widget.Editor$EditOperation$1 -android.widget.Editor$HandleView -android.widget.Editor$InputContentType -android.widget.Editor$InputMethodState -android.widget.Editor$InsertionHandleView -android.widget.Editor$InsertionHandleView$2 -android.widget.Editor$InsertionPointCursorController -android.widget.Editor$PositionListener -android.widget.Editor$ProcessTextIntentActionsHandler -android.widget.Editor$SelectionModifierCursorController -android.widget.Editor$SpanController -android.widget.Editor$SuggestionHelper -android.widget.Editor$SuggestionHelper$SuggestionSpanComparator -android.widget.Editor$TextRenderNode -android.widget.Editor$TextViewPositionListener -android.widget.Editor$UndoInputFilter -android.widget.ExpandableListConnector -android.widget.FastScroller -android.widget.FastScroller$1 -android.widget.FastScroller$2 -android.widget.FastScroller$3 -android.widget.FastScroller$4 -android.widget.FastScroller$5 -android.widget.FastScroller$6 -android.widget.Filter -android.widget.Filter$FilterListener -android.widget.Filter$FilterResults -android.widget.Filter$RequestArguments -android.widget.Filter$RequestHandler -android.widget.Filter$ResultsHandler -android.widget.Filterable -android.widget.ForwardingListener -android.widget.FrameLayout -android.widget.FrameLayout$LayoutParams -android.widget.GridLayout -android.widget.GridLayout$1 -android.widget.GridLayout$2 -android.widget.GridLayout$3 -android.widget.GridLayout$4 -android.widget.GridLayout$5 -android.widget.GridLayout$6 -android.widget.GridLayout$6$1 -android.widget.GridLayout$7 -android.widget.GridLayout$8 -android.widget.GridLayout$Alignment -android.widget.GridLayout$Arc -android.widget.GridLayout$Assoc -android.widget.GridLayout$Axis -android.widget.GridLayout$Axis$1 -android.widget.GridLayout$Bounds -android.widget.GridLayout$Interval -android.widget.GridLayout$LayoutParams -android.widget.GridLayout$MutableInt -android.widget.GridLayout$PackedMap -android.widget.GridLayout$Spec -android.widget.GridView -android.widget.HeaderViewListAdapter -android.widget.HorizontalScrollView -android.widget.HorizontalScrollView$SavedState -android.widget.HorizontalScrollView$SavedState$1 -android.widget.ImageButton -android.widget.ImageView -android.widget.ImageView$ImageDrawableCallback -android.widget.ImageView$ScaleType -android.widget.LinearLayout -android.widget.LinearLayout$LayoutParams -android.widget.ListAdapter -android.widget.ListPopupWindow -android.widget.ListPopupWindow$2 -android.widget.ListPopupWindow$3 -android.widget.ListPopupWindow$ListSelectorHider -android.widget.ListPopupWindow$PopupDataSetObserver -android.widget.ListPopupWindow$PopupScrollListener -android.widget.ListPopupWindow$PopupTouchInterceptor -android.widget.ListPopupWindow$ResizePopupRunnable -android.widget.ListView -android.widget.ListView$ArrowScrollFocusResult -android.widget.ListView$FixedViewInfo -android.widget.MediaController -android.widget.MediaController$MediaPlayerControl -android.widget.MultiAutoCompleteTextView -android.widget.MultiAutoCompleteTextView$Tokenizer -android.widget.NumberPicker -android.widget.NumberPicker$Formatter -android.widget.NumberPicker$OnValueChangeListener -android.widget.OverScroller -android.widget.OverScroller$SplineOverScroller -android.widget.PopupMenu -android.widget.PopupMenu$1 -android.widget.PopupMenu$2 -android.widget.PopupMenu$3 -android.widget.PopupMenu$OnMenuItemClickListener -android.widget.PopupWindow -android.widget.PopupWindow$1 -android.widget.PopupWindow$2 -android.widget.PopupWindow$OnDismissListener -android.widget.PopupWindow$PopupBackgroundView -android.widget.PopupWindow$PopupDecorView -android.widget.PopupWindow$PopupDecorView$1 -android.widget.ProgressBar -android.widget.ProgressBar$1 -android.widget.ProgressBar$ProgressTintInfo -android.widget.ProgressBar$RefreshData -android.widget.ProgressBar$RefreshProgressRunnable -android.widget.ProgressBar$SavedState -android.widget.ProgressBar$SavedState$1 -android.widget.QuickContactBadge -android.widget.QuickContactBadge$QueryHandler -android.widget.RadioButton -android.widget.RadioGroup -android.widget.RadioGroup$CheckedStateTracker -android.widget.RadioGroup$LayoutParams -android.widget.RadioGroup$OnCheckedChangeListener -android.widget.RadioGroup$PassThroughHierarchyChangeListener -android.widget.RatingBar -android.widget.RelativeLayout -android.widget.RelativeLayout$DependencyGraph -android.widget.RelativeLayout$DependencyGraph$Node -android.widget.RelativeLayout$LayoutParams -android.widget.RemoteViews -android.widget.RemoteViews$1 -android.widget.RemoteViews$2 -android.widget.RemoteViews$3 -android.widget.RemoteViews$Action -android.widget.RemoteViews$ActionException -android.widget.RemoteViews$AsyncApplyTask -android.widget.RemoteViews$BitmapCache -android.widget.RemoteViews$BitmapReflectionAction -android.widget.RemoteViews$LayoutParamAction -android.widget.RemoteViews$OnClickHandler -android.widget.RemoteViews$OnViewAppliedListener -android.widget.RemoteViews$ReflectionAction -android.widget.RemoteViews$RemoteView -android.widget.RemoteViews$RemoteViewsContextWrapper -android.widget.RemoteViews$RunnableAction -android.widget.RemoteViews$RuntimeAction -android.widget.RemoteViews$SetDrawableTint -android.widget.RemoteViews$SetOnClickPendingIntent -android.widget.RemoteViews$SetOnClickPendingIntent$1 -android.widget.RemoteViews$ViewGroupAction -android.widget.RemoteViews$ViewGroupAction$1 -android.widget.RemoteViews$ViewGroupAction$2 -android.widget.RemoteViews$ViewPaddingAction -android.widget.RemoteViews$ViewTree -android.widget.RemoteViewsAdapter$RemoteAdapterConnectionCallback -android.widget.ResourceCursorAdapter -android.widget.RtlSpacingHelper -android.widget.ScrollBarDrawable -android.widget.ScrollView -android.widget.ScrollView$SavedState -android.widget.ScrollView$SavedState$1 -android.widget.Scroller -android.widget.Scroller$ViscousFluidInterpolator -android.widget.SearchView$OnCloseListener -android.widget.SectionIndexer -android.widget.SeekBar -android.widget.SeekBar$OnSeekBarChangeListener -android.widget.SelectionActionModeHelper -android.widget.SelectionActionModeHelper$SelectionTracker -android.widget.SelectionActionModeHelper$TextClassificationHelper -android.widget.SimpleCursorAdapter -android.widget.Space -android.widget.SpellChecker -android.widget.SpellChecker$SpellParser -android.widget.Spinner -android.widget.Spinner$1 -android.widget.Spinner$DialogPopup -android.widget.Spinner$DropDownAdapter -android.widget.Spinner$DropdownPopup -android.widget.Spinner$DropdownPopup$1 -android.widget.Spinner$SpinnerPopup -android.widget.SpinnerAdapter -android.widget.Switch -android.widget.Switch$1 -android.widget.TabHost -android.widget.TabHost$1 -android.widget.TabHost$2 -android.widget.TabHost$ContentStrategy -android.widget.TabHost$FactoryContentStrategy -android.widget.TabHost$IndicatorStrategy -android.widget.TabHost$OnTabChangeListener -android.widget.TabHost$TabContentFactory -android.widget.TabHost$TabSpec -android.widget.TabHost$ViewIndicatorStrategy -android.widget.TabWidget -android.widget.TabWidget$OnTabSelectionChanged -android.widget.TabWidget$TabClickListener -android.widget.TableLayout -android.widget.TextClock -android.widget.TextClock$1 -android.widget.TextClock$2 -android.widget.TextClock$FormatChangeObserver -android.widget.TextSwitcher -android.widget.TextView -android.widget.TextView$2 -android.widget.TextView$3 -android.widget.TextView$BufferType -android.widget.TextView$ChangeWatcher -android.widget.TextView$CharWrapper -android.widget.TextView$Drawables -android.widget.TextView$Marquee -android.widget.TextView$Marquee$1 -android.widget.TextView$Marquee$2 -android.widget.TextView$Marquee$3 -android.widget.TextView$OnEditorActionListener -android.widget.TextView$SavedState -android.widget.TextView$SavedState$1 -android.widget.ThemedSpinnerAdapter -android.widget.TimePicker -android.widget.TimePicker$OnTimeChangedListener -android.widget.Toast -android.widget.Toast$TN -android.widget.Toast$TN$1 -android.widget.ToggleButton -android.widget.Toolbar -android.widget.Toolbar$1 -android.widget.Toolbar$2 -android.widget.Toolbar$ExpandedActionViewMenuPresenter -android.widget.Toolbar$LayoutParams -android.widget.Toolbar$OnMenuItemClickListener -android.widget.VideoView -android.widget.ViewAnimator -android.widget.ViewFlipper -android.widget.ViewFlipper$1 -android.widget.ViewFlipper$2 -android.widget.ViewSwitcher -android.widget.WrapperListAdapter -com.android.framework.protobuf.nano.CodedInputByteBufferNano -com.android.framework.protobuf.nano.CodedOutputByteBufferNano -com.android.framework.protobuf.nano.InternalNano -com.android.framework.protobuf.nano.InvalidProtocolBufferNanoException -com.android.framework.protobuf.nano.MessageNano -com.android.framework.protobuf.nano.WireFormatNano -com.android.i18n.phonenumbers.AlternateFormatsCountryCodeSet -com.android.i18n.phonenumbers.AsYouTypeFormatter -com.android.i18n.phonenumbers.CountryCodeToRegionCodeMap -com.android.i18n.phonenumbers.MetadataLoader -com.android.i18n.phonenumbers.MetadataManager -com.android.i18n.phonenumbers.MetadataManager$1 -com.android.i18n.phonenumbers.MetadataSource -com.android.i18n.phonenumbers.MultiFileMetadataSourceImpl -com.android.i18n.phonenumbers.NumberParseException -com.android.i18n.phonenumbers.NumberParseException$ErrorType -com.android.i18n.phonenumbers.PhoneNumberMatcher -com.android.i18n.phonenumbers.PhoneNumberMatcher$State -com.android.i18n.phonenumbers.PhoneNumberUtil -com.android.i18n.phonenumbers.PhoneNumberUtil$1 -com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency -com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency$1 -com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency$2 -com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency$3 -com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency$4 -com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberFormat -com.android.i18n.phonenumbers.PhoneNumberUtil$PhoneNumberType -com.android.i18n.phonenumbers.PhoneNumberUtil$ValidationResult -com.android.i18n.phonenumbers.Phonemetadata$NumberFormat -com.android.i18n.phonenumbers.Phonemetadata$PhoneMetadata -com.android.i18n.phonenumbers.Phonemetadata$PhoneMetadataCollection -com.android.i18n.phonenumbers.Phonemetadata$PhoneNumberDesc -com.android.i18n.phonenumbers.Phonenumber$PhoneNumber -com.android.i18n.phonenumbers.Phonenumber$PhoneNumber$CountryCodeSource -com.android.i18n.phonenumbers.RegexCache -com.android.i18n.phonenumbers.RegexCache$LRUCache -com.android.i18n.phonenumbers.RegexCache$LRUCache$1 -com.android.i18n.phonenumbers.ShortNumbersRegionCodeSet -com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder -com.android.i18n.phonenumbers.prefixmapper.MappingFileProvider -com.android.i18n.phonenumbers.prefixmapper.PrefixFileReader -com.android.ims.-$Lambda$AvFHcs3Z6Dq6dkOugMW9Kc7Qzng$4 -com.android.ims.ImsCall$Listener -com.android.ims.ImsCallForwardInfo -com.android.ims.ImsCallProfile -com.android.ims.ImsConfig -com.android.ims.ImsConfigListener -com.android.ims.ImsConfigListener$Stub -com.android.ims.ImsConnectionStateListener -com.android.ims.ImsEcbm -com.android.ims.ImsEcbm$ImsEcbmListenerProxy -com.android.ims.ImsEcbmStateListener -com.android.ims.ImsException -com.android.ims.ImsExternalCallStateListener -com.android.ims.ImsManager -com.android.ims.ImsManager$1 -com.android.ims.ImsManager$ImsRegistrationListenerProxy -com.android.ims.ImsManager$ImsServiceDeathRecipient -com.android.ims.ImsReasonInfo -com.android.ims.ImsReasonInfo$1 -com.android.ims.ImsSsInfo -com.android.ims.internal.IImsCallSession -com.android.ims.internal.IImsCallSessionListener -com.android.ims.internal.IImsConfig -com.android.ims.internal.IImsConfig$Stub -com.android.ims.internal.IImsEcbm -com.android.ims.internal.IImsEcbm$Stub -com.android.ims.internal.IImsEcbmListener -com.android.ims.internal.IImsEcbmListener$Stub -com.android.ims.internal.IImsMultiEndpoint -com.android.ims.internal.IImsRegistrationListener -com.android.ims.internal.IImsRegistrationListener$Stub -com.android.ims.internal.IImsService -com.android.ims.internal.IImsService$Stub -com.android.ims.internal.IImsServiceController -com.android.ims.internal.IImsServiceFeatureCallback -com.android.ims.internal.IImsUt -com.android.ims.internal.IImsUt$Stub -com.android.ims.internal.IImsUtListener -com.android.ims.internal.IImsUtListener$Stub -com.android.internal.R$styleable -com.android.internal.alsa.AlsaCardsParser -com.android.internal.alsa.AlsaCardsParser$AlsaCardRecord -com.android.internal.alsa.AlsaDevicesParser -com.android.internal.alsa.LineTokenizer -com.android.internal.app.AlertController -com.android.internal.app.AlertController$1 -com.android.internal.app.AlertController$AlertParams -com.android.internal.app.AlertController$AlertParams$1 -com.android.internal.app.AlertController$AlertParams$4 -com.android.internal.app.AlertController$ButtonHandler -com.android.internal.app.AlertController$RecycleListView -com.android.internal.app.AssistUtils -com.android.internal.app.ColorDisplayController -com.android.internal.app.ColorDisplayController$Callback -com.android.internal.app.IAppOpsCallback -com.android.internal.app.IAppOpsCallback$Stub -com.android.internal.app.IAppOpsCallback$Stub$Proxy -com.android.internal.app.IAppOpsService -com.android.internal.app.IAppOpsService$Stub -com.android.internal.app.IAppOpsService$Stub$Proxy -com.android.internal.app.IAssistScreenshotReceiver -com.android.internal.app.IBatteryStats -com.android.internal.app.IBatteryStats$Stub -com.android.internal.app.IBatteryStats$Stub$Proxy -com.android.internal.app.IMediaContainerService -com.android.internal.app.IMediaContainerService$Stub -com.android.internal.app.IMediaContainerService$Stub$Proxy -com.android.internal.app.ISoundTriggerService -com.android.internal.app.ISoundTriggerService$Stub -com.android.internal.app.IVoiceInteractionManagerService -com.android.internal.app.IVoiceInteractionManagerService$Stub -com.android.internal.app.IVoiceInteractionManagerService$Stub$Proxy -com.android.internal.app.IVoiceInteractionSessionListener -com.android.internal.app.IVoiceInteractionSessionListener$Stub -com.android.internal.app.IVoiceInteractionSessionListener$Stub$Proxy -com.android.internal.app.IVoiceInteractionSessionShowCallback -com.android.internal.app.IVoiceInteractionSessionShowCallback$Stub -com.android.internal.app.IVoiceInteractor -com.android.internal.app.IVoiceInteractor$Stub -com.android.internal.app.ProcessMap -com.android.internal.app.ResolverActivity -com.android.internal.app.ToolbarActionBar -com.android.internal.app.ToolbarActionBar$1 -com.android.internal.app.ToolbarActionBar$2 -com.android.internal.app.ToolbarActionBar$ActionMenuPresenterCallback -com.android.internal.app.ToolbarActionBar$MenuBuilderCallback -com.android.internal.app.ToolbarActionBar$ToolbarCallbackWrapper -com.android.internal.app.WindowDecorActionBar -com.android.internal.app.WindowDecorActionBar$1 -com.android.internal.app.WindowDecorActionBar$2 -com.android.internal.app.WindowDecorActionBar$3 -com.android.internal.app.WindowDecorActionBar$ActionModeImpl -com.android.internal.app.procstats.DurationsTable -com.android.internal.app.procstats.IProcessStats -com.android.internal.app.procstats.IProcessStats$Stub -com.android.internal.app.procstats.ProcessState -com.android.internal.app.procstats.ProcessState$1 -com.android.internal.app.procstats.ProcessStats -com.android.internal.app.procstats.ProcessStats$1 -com.android.internal.app.procstats.ProcessStats$PackageState -com.android.internal.app.procstats.ProcessStats$ProcessStateHolder -com.android.internal.app.procstats.PssTable -com.android.internal.app.procstats.ServiceState -com.android.internal.app.procstats.SparseMappingTable -com.android.internal.app.procstats.SparseMappingTable$Table -com.android.internal.app.procstats.SysMemUsageTable -com.android.internal.appwidget.IAppWidgetHost -com.android.internal.appwidget.IAppWidgetHost$Stub -com.android.internal.appwidget.IAppWidgetHost$Stub$Proxy -com.android.internal.appwidget.IAppWidgetService -com.android.internal.appwidget.IAppWidgetService$Stub -com.android.internal.appwidget.IAppWidgetService$Stub$Proxy -com.android.internal.backup.IBackupTransport -com.android.internal.backup.IBackupTransport$Stub -com.android.internal.backup.IBackupTransport$Stub$Proxy -com.android.internal.backup.LocalTransport -com.android.internal.backup.LocalTransportService -com.android.internal.content.FileSystemProvider -com.android.internal.content.NativeLibraryHelper -com.android.internal.content.NativeLibraryHelper$Handle -com.android.internal.content.PackageHelper -com.android.internal.content.PackageHelper$1 -com.android.internal.content.PackageHelper$TestableInterface -com.android.internal.content.PackageMonitor -com.android.internal.content.ReferrerIntent -com.android.internal.content.ReferrerIntent$1 -com.android.internal.graphics.drawable.AnimationScaleListDrawable -com.android.internal.graphics.drawable.AnimationScaleListDrawable$AnimationScaleListState -com.android.internal.hardware.AmbientDisplayConfiguration -com.android.internal.inputmethod.IInputContentUriToken -com.android.internal.inputmethod.InputMethodSubtypeHandle -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$ControllerImpl -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$DynamicRotationList -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$ImeSubtypeListItem -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$InputMethodAndSubtypeList -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$InputMethodAndSubtypeList$1 -com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$StaticRotationList -com.android.internal.inputmethod.InputMethodUtils -com.android.internal.inputmethod.InputMethodUtils$1 -com.android.internal.inputmethod.InputMethodUtils$InputMethodListBuilder -com.android.internal.inputmethod.InputMethodUtils$InputMethodSettings -com.android.internal.inputmethod.LocaleUtils -com.android.internal.inputmethod.LocaleUtils$LocaleExtractor -com.android.internal.inputmethod.LocaleUtils$ScoreEntry -com.android.internal.location.GpsNetInitiatedHandler -com.android.internal.location.GpsNetInitiatedHandler$1 -com.android.internal.location.GpsNetInitiatedHandler$2 -com.android.internal.location.ILocationProvider -com.android.internal.location.ILocationProvider$Stub -com.android.internal.location.ILocationProvider$Stub$Proxy -com.android.internal.location.ProviderProperties -com.android.internal.location.ProviderProperties$1 -com.android.internal.location.ProviderRequest -com.android.internal.location.ProviderRequest$1 -com.android.internal.logging.AndroidConfig -com.android.internal.logging.AndroidHandler -com.android.internal.logging.AndroidHandler$1 -com.android.internal.logging.EventLogTags -com.android.internal.logging.MetricsLogger -com.android.internal.net.LegacyVpnInfo -com.android.internal.net.NetworkStatsFactory -com.android.internal.net.VpnConfig -com.android.internal.net.VpnInfo -com.android.internal.net.VpnProfile -com.android.internal.notification.SystemNotificationChannels -com.android.internal.os.AndroidPrintStream -com.android.internal.os.AppFuseMount -com.android.internal.os.AtomicFile -com.android.internal.os.BackgroundThread -com.android.internal.os.BatteryStatsHelper -com.android.internal.os.BatteryStatsImpl -com.android.internal.os.BatteryStatsImpl$1 -com.android.internal.os.BatteryStatsImpl$6 -com.android.internal.os.BatteryStatsImpl$BatchTimer -com.android.internal.os.BatteryStatsImpl$BatteryCallback -com.android.internal.os.BatteryStatsImpl$Clocks -com.android.internal.os.BatteryStatsImpl$ControllerActivityCounterImpl -com.android.internal.os.BatteryStatsImpl$Counter -com.android.internal.os.BatteryStatsImpl$DualTimer -com.android.internal.os.BatteryStatsImpl$DurationTimer -com.android.internal.os.BatteryStatsImpl$ExternalStatsSync -com.android.internal.os.BatteryStatsImpl$LongSamplingCounter -com.android.internal.os.BatteryStatsImpl$LongSamplingCounterArray -com.android.internal.os.BatteryStatsImpl$MyHandler -com.android.internal.os.BatteryStatsImpl$OverflowArrayMap -com.android.internal.os.BatteryStatsImpl$PlatformIdleStateCallback -com.android.internal.os.BatteryStatsImpl$SamplingTimer -com.android.internal.os.BatteryStatsImpl$StopwatchTimer -com.android.internal.os.BatteryStatsImpl$SystemClocks -com.android.internal.os.BatteryStatsImpl$TimeBase -com.android.internal.os.BatteryStatsImpl$TimeBaseObs -com.android.internal.os.BatteryStatsImpl$Timer -com.android.internal.os.BatteryStatsImpl$Uid -com.android.internal.os.BatteryStatsImpl$Uid$1 -com.android.internal.os.BatteryStatsImpl$Uid$2 -com.android.internal.os.BatteryStatsImpl$Uid$3 -com.android.internal.os.BatteryStatsImpl$Uid$Pkg -com.android.internal.os.BatteryStatsImpl$Uid$Pkg$Serv -com.android.internal.os.BatteryStatsImpl$Uid$Sensor -com.android.internal.os.BatteryStatsImpl$Uid$Wakelock -com.android.internal.os.BinderInternal -com.android.internal.os.BinderInternal$GcWatcher -com.android.internal.os.FuseAppLoop -com.android.internal.os.FuseAppLoop$1 -com.android.internal.os.FuseUnavailableMountException -com.android.internal.os.HandlerCaller -com.android.internal.os.HandlerCaller$Callback -com.android.internal.os.HandlerCaller$MyHandler -com.android.internal.os.IDropBoxManagerService -com.android.internal.os.IDropBoxManagerService$Stub -com.android.internal.os.IDropBoxManagerService$Stub$Proxy -com.android.internal.os.IResultReceiver -com.android.internal.os.IResultReceiver$Stub -com.android.internal.os.IResultReceiver$Stub$Proxy -com.android.internal.os.KernelCpuSpeedReader -com.android.internal.os.KernelMemoryBandwidthStats -com.android.internal.os.KernelUidCpuFreqTimeReader -com.android.internal.os.KernelUidCpuTimeReader -com.android.internal.os.KernelWakelockReader -com.android.internal.os.KernelWakelockStats -com.android.internal.os.KernelWakelockStats$Entry -com.android.internal.os.LoggingPrintStream -com.android.internal.os.LoggingPrintStream$1 -com.android.internal.os.PathClassLoaderFactory -com.android.internal.os.PowerProfile -com.android.internal.os.PowerProfile$CpuClusterKey -com.android.internal.os.ProcessCpuTracker -com.android.internal.os.ProcessCpuTracker$1 -com.android.internal.os.ProcessCpuTracker$FilterStats -com.android.internal.os.ProcessCpuTracker$Stats -com.android.internal.os.RoSystemProperties -com.android.internal.os.RuntimeInit -com.android.internal.os.RuntimeInit$1 -com.android.internal.os.RuntimeInit$Arguments -com.android.internal.os.RuntimeInit$KillApplicationHandler -com.android.internal.os.RuntimeInit$LoggingHandler -com.android.internal.os.SamplingProfilerIntegration -com.android.internal.os.SomeArgs -com.android.internal.os.Zygote -com.android.internal.os.Zygote$MethodAndArgsCaller -com.android.internal.os.ZygoteConnection -com.android.internal.os.ZygoteConnection$Arguments -com.android.internal.os.ZygoteInit -com.android.internal.os.ZygoteSecurityException -com.android.internal.os.ZygoteServer -com.android.internal.policy.DecorContext -com.android.internal.policy.DecorView -com.android.internal.policy.DecorView$1 -com.android.internal.policy.DecorView$ActionModeCallback2Wrapper -com.android.internal.policy.DecorView$ColorViewAttributes -com.android.internal.policy.DecorView$ColorViewState -com.android.internal.policy.DividerSnapAlgorithm -com.android.internal.policy.DividerSnapAlgorithm$SnapTarget -com.android.internal.policy.DockedDividerUtils -com.android.internal.policy.IKeyguardDismissCallback -com.android.internal.policy.IKeyguardDrawnCallback -com.android.internal.policy.IKeyguardDrawnCallback$Stub -com.android.internal.policy.IKeyguardDrawnCallback$Stub$Proxy -com.android.internal.policy.IKeyguardExitCallback -com.android.internal.policy.IKeyguardService -com.android.internal.policy.IKeyguardService$Stub -com.android.internal.policy.IKeyguardService$Stub$Proxy -com.android.internal.policy.IKeyguardStateCallback -com.android.internal.policy.IKeyguardStateCallback$Stub -com.android.internal.policy.IKeyguardStateCallback$Stub$Proxy -com.android.internal.policy.IShortcutService -com.android.internal.policy.IShortcutService$Stub -com.android.internal.policy.IShortcutService$Stub$Proxy -com.android.internal.policy.PhoneFallbackEventHandler -com.android.internal.policy.PhoneLayoutInflater -com.android.internal.policy.PhoneWindow -com.android.internal.policy.PhoneWindow$1 -com.android.internal.policy.PhoneWindow$ActionMenuPresenterCallback -com.android.internal.policy.PhoneWindow$PanelFeatureState -com.android.internal.policy.PhoneWindow$PhoneWindowMenuCallback -com.android.internal.policy.PhoneWindow$RotationWatcher -com.android.internal.policy.PhoneWindow$RotationWatcher$1 -com.android.internal.policy.PipSnapAlgorithm -com.android.internal.statusbar.IStatusBar -com.android.internal.statusbar.IStatusBar$Stub -com.android.internal.statusbar.IStatusBar$Stub$Proxy -com.android.internal.statusbar.IStatusBarService -com.android.internal.statusbar.IStatusBarService$Stub -com.android.internal.statusbar.IStatusBarService$Stub$Proxy -com.android.internal.statusbar.NotificationVisibility -com.android.internal.statusbar.NotificationVisibility$1 -com.android.internal.statusbar.StatusBarIcon -com.android.internal.statusbar.StatusBarIcon$1 -com.android.internal.telecom.IConnectionService -com.android.internal.telecom.IConnectionService$Stub -com.android.internal.telecom.IConnectionService$Stub$Proxy -com.android.internal.telecom.IConnectionServiceAdapter -com.android.internal.telecom.IConnectionServiceAdapter$Stub -com.android.internal.telecom.IConnectionServiceAdapter$Stub$Proxy -com.android.internal.telecom.IInCallAdapter -com.android.internal.telecom.IInCallAdapter$Stub -com.android.internal.telecom.IInCallService -com.android.internal.telecom.IInCallService$Stub -com.android.internal.telecom.IInCallService$Stub$Proxy -com.android.internal.telecom.ITelecomService -com.android.internal.telecom.ITelecomService$Stub -com.android.internal.telecom.ITelecomService$Stub$Proxy -com.android.internal.telecom.IVideoProvider -com.android.internal.telecom.IVideoProvider$Stub -com.android.internal.telecom.RemoteServiceCallback -com.android.internal.telecom.RemoteServiceCallback$Stub -com.android.internal.telecom.RemoteServiceCallback$Stub$Proxy -com.android.internal.telephony.AppSmsManager -com.android.internal.telephony.BaseCommands -com.android.internal.telephony.Call -com.android.internal.telephony.Call$SrvccState -com.android.internal.telephony.Call$State -com.android.internal.telephony.CallManager -com.android.internal.telephony.CallManager$CallManagerHandler -com.android.internal.telephony.CallStateException -com.android.internal.telephony.CallTracker -com.android.internal.telephony.CallerInfo -com.android.internal.telephony.CallerInfoAsyncQuery -com.android.internal.telephony.CallerInfoAsyncQuery$CallerInfoAsyncQueryHandler -com.android.internal.telephony.CallerInfoAsyncQuery$CallerInfoAsyncQueryHandler$CallerInfoWorkerHandler -com.android.internal.telephony.CallerInfoAsyncQuery$CookieWrapper -com.android.internal.telephony.CallerInfoAsyncQuery$OnQueryCompleteListener -com.android.internal.telephony.CarrierActionAgent -com.android.internal.telephony.CarrierActionAgent$1 -com.android.internal.telephony.CarrierActionAgent$SettingsObserver -com.android.internal.telephony.CarrierAppUtils -com.android.internal.telephony.CarrierServiceBindHelper -com.android.internal.telephony.CarrierServiceBindHelper$1 -com.android.internal.telephony.CarrierServiceBindHelper$2 -com.android.internal.telephony.CarrierServiceBindHelper$AppBinding -com.android.internal.telephony.CarrierServiceBindHelper$CarrierServicePackageMonitor -com.android.internal.telephony.CarrierServiceStateTracker -com.android.internal.telephony.CarrierServiceStateTracker$1 -com.android.internal.telephony.CarrierSignalAgent -com.android.internal.telephony.CarrierSignalAgent$1 -com.android.internal.telephony.CellBroadcastHandler -com.android.internal.telephony.CellNetworkScanResult -com.android.internal.telephony.ClientWakelockAccountant -com.android.internal.telephony.ClientWakelockTracker -com.android.internal.telephony.CommandException -com.android.internal.telephony.CommandException$Error -com.android.internal.telephony.CommandsInterface -com.android.internal.telephony.CommandsInterface$RadioState -com.android.internal.telephony.Connection -com.android.internal.telephony.DctConstants$Activity -com.android.internal.telephony.DctConstants$State -com.android.internal.telephony.DebugService -com.android.internal.telephony.DefaultPhoneNotifier -com.android.internal.telephony.DeviceStateMonitor -com.android.internal.telephony.DeviceStateMonitor$1 -com.android.internal.telephony.DeviceStateMonitor$2 -com.android.internal.telephony.EncodeException -com.android.internal.telephony.GsmAlphabet -com.android.internal.telephony.GsmAlphabet$TextEncodingDetails -com.android.internal.telephony.GsmCdmaCall -com.android.internal.telephony.GsmCdmaCallTracker -com.android.internal.telephony.GsmCdmaCallTracker$1 -com.android.internal.telephony.GsmCdmaConnection -com.android.internal.telephony.GsmCdmaPhone -com.android.internal.telephony.GsmCdmaPhone$1 -com.android.internal.telephony.GsmCdmaPhone$2 -com.android.internal.telephony.HardwareConfig -com.android.internal.telephony.ICarrierConfigLoader -com.android.internal.telephony.ICarrierConfigLoader$Stub -com.android.internal.telephony.ICarrierConfigLoader$Stub$Proxy -com.android.internal.telephony.IIccPhoneBook -com.android.internal.telephony.IIccPhoneBook$Stub -com.android.internal.telephony.IMms -com.android.internal.telephony.IMms$Stub -com.android.internal.telephony.IOnSubscriptionsChangedListener -com.android.internal.telephony.IOnSubscriptionsChangedListener$Stub -com.android.internal.telephony.IOnSubscriptionsChangedListener$Stub$Proxy -com.android.internal.telephony.IPhoneStateListener -com.android.internal.telephony.IPhoneStateListener$Stub -com.android.internal.telephony.IPhoneStateListener$Stub$Proxy -com.android.internal.telephony.IPhoneSubInfo -com.android.internal.telephony.IPhoneSubInfo$Stub -com.android.internal.telephony.IPhoneSubInfo$Stub$Proxy -com.android.internal.telephony.ISms -com.android.internal.telephony.ISms$Stub -com.android.internal.telephony.ISms$Stub$Proxy -com.android.internal.telephony.ISub -com.android.internal.telephony.ISub$Stub -com.android.internal.telephony.ISub$Stub$Proxy -com.android.internal.telephony.ITelephony -com.android.internal.telephony.ITelephony$Stub -com.android.internal.telephony.ITelephony$Stub$Proxy -com.android.internal.telephony.ITelephonyRegistry -com.android.internal.telephony.ITelephonyRegistry$Stub -com.android.internal.telephony.ITelephonyRegistry$Stub$Proxy -com.android.internal.telephony.IWapPushManager -com.android.internal.telephony.IccCard -com.android.internal.telephony.IccCardConstants$State -com.android.internal.telephony.IccPhoneBookInterfaceManager -com.android.internal.telephony.IccPhoneBookInterfaceManager$1 -com.android.internal.telephony.IccProvider -com.android.internal.telephony.IccSmsInterfaceManager -com.android.internal.telephony.IccSmsInterfaceManager$1 -com.android.internal.telephony.IccSmsInterfaceManager$CdmaBroadcastRangeManager -com.android.internal.telephony.IccSmsInterfaceManager$CellBroadcastRangeManager -com.android.internal.telephony.ImsSMSDispatcher -com.android.internal.telephony.InboundSmsHandler -com.android.internal.telephony.InboundSmsHandler$1 -com.android.internal.telephony.InboundSmsHandler$DefaultState -com.android.internal.telephony.InboundSmsHandler$DeliveringState -com.android.internal.telephony.InboundSmsHandler$IdleState -com.android.internal.telephony.InboundSmsHandler$NewMessageNotificationActionReceiver -com.android.internal.telephony.InboundSmsHandler$StartupState -com.android.internal.telephony.InboundSmsHandler$WaitingState -com.android.internal.telephony.IntRangeManager -com.android.internal.telephony.OemHookIndication -com.android.internal.telephony.OemHookResponse -com.android.internal.telephony.OperatorInfo -com.android.internal.telephony.Phone -com.android.internal.telephony.Phone$1 -com.android.internal.telephony.PhoneConstantConversions -com.android.internal.telephony.PhoneConstants$DataState -com.android.internal.telephony.PhoneConstants$State -com.android.internal.telephony.PhoneFactory -com.android.internal.telephony.PhoneInternalInterface -com.android.internal.telephony.PhoneInternalInterface$DataActivityState -com.android.internal.telephony.PhoneNotifier -com.android.internal.telephony.PhoneSubInfoController -com.android.internal.telephony.PhoneSwitcher -com.android.internal.telephony.PhoneSwitcher$1 -com.android.internal.telephony.PhoneSwitcher$2 -com.android.internal.telephony.PhoneSwitcher$PhoneState -com.android.internal.telephony.PhoneSwitcher$PhoneSwitcherNetworkRequestListener -com.android.internal.telephony.ProxyController -com.android.internal.telephony.ProxyController$1 -com.android.internal.telephony.RIL -com.android.internal.telephony.RIL$RadioProxyDeathRecipient -com.android.internal.telephony.RIL$RilHandler -com.android.internal.telephony.RILConstants -com.android.internal.telephony.RILRequest -com.android.internal.telephony.RadioCapability -com.android.internal.telephony.RadioIndication -com.android.internal.telephony.RadioResponse -com.android.internal.telephony.RatRatcheter -com.android.internal.telephony.RatRatcheter$1 -com.android.internal.telephony.RestrictedState -com.android.internal.telephony.RetryManager -com.android.internal.telephony.RilWakelockInfo -com.android.internal.telephony.SMSDispatcher -com.android.internal.telephony.SMSDispatcher$SettingsObserver -com.android.internal.telephony.ServiceStateTracker -com.android.internal.telephony.ServiceStateTracker$1 -com.android.internal.telephony.ServiceStateTracker$2 -com.android.internal.telephony.ServiceStateTracker$3 -com.android.internal.telephony.ServiceStateTracker$CellInfoResult -com.android.internal.telephony.ServiceStateTracker$SstSubscriptionsChangedListener -com.android.internal.telephony.SimActivationTracker -com.android.internal.telephony.SimActivationTracker$1 -com.android.internal.telephony.SmsApplication -com.android.internal.telephony.SmsApplication$SmsApplicationData -com.android.internal.telephony.SmsApplication$SmsPackageMonitor -com.android.internal.telephony.SmsBroadcastUndelivered -com.android.internal.telephony.SmsBroadcastUndelivered$1 -com.android.internal.telephony.SmsBroadcastUndelivered$ScanRawTableThread -com.android.internal.telephony.SmsMessageBase -com.android.internal.telephony.SmsStorageMonitor -com.android.internal.telephony.SmsStorageMonitor$1 -com.android.internal.telephony.SmsUsageMonitor -com.android.internal.telephony.SmsUsageMonitor$SettingsObserver -com.android.internal.telephony.SmsUsageMonitor$SettingsObserverHandler -com.android.internal.telephony.SubscriptionController -com.android.internal.telephony.SubscriptionController$ScLocalLog -com.android.internal.telephony.SubscriptionInfoUpdater -com.android.internal.telephony.SubscriptionInfoUpdater$1 -com.android.internal.telephony.SubscriptionInfoUpdater$2 -com.android.internal.telephony.SubscriptionMonitor -com.android.internal.telephony.SubscriptionMonitor$1 -com.android.internal.telephony.SubscriptionMonitor$2 -com.android.internal.telephony.TelephonyCapabilities -com.android.internal.telephony.TelephonyComponentFactory -com.android.internal.telephony.TelephonyDevController -com.android.internal.telephony.TelephonyTester -com.android.internal.telephony.TelephonyTester$1 -com.android.internal.telephony.UiccPhoneBookController -com.android.internal.telephony.UiccSmsController -com.android.internal.telephony.WakeLockStateMachine -com.android.internal.telephony.WakeLockStateMachine$1 -com.android.internal.telephony.WakeLockStateMachine$DefaultState -com.android.internal.telephony.WakeLockStateMachine$IdleState -com.android.internal.telephony.WakeLockStateMachine$WaitingState -com.android.internal.telephony.WapPushOverSms -com.android.internal.telephony.WapPushOverSms$1 -com.android.internal.telephony.WapPushOverSms$BindServiceThread -com.android.internal.telephony.cat.AppInterface -com.android.internal.telephony.cat.CatLog -com.android.internal.telephony.cat.CatService -com.android.internal.telephony.cdma.CdmaInboundSmsHandler -com.android.internal.telephony.cdma.CdmaSMSDispatcher -com.android.internal.telephony.cdma.CdmaServiceCategoryProgramHandler -com.android.internal.telephony.cdma.CdmaServiceCategoryProgramHandler$1 -com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager -com.android.internal.telephony.cdma.EriInfo -com.android.internal.telephony.cdma.EriManager -com.android.internal.telephony.cdma.EriManager$EriFile -com.android.internal.telephony.dataconnection.ApnContext -com.android.internal.telephony.dataconnection.DataConnection -com.android.internal.telephony.dataconnection.DataEnabledSettings -com.android.internal.telephony.dataconnection.DcController -com.android.internal.telephony.dataconnection.DcController$1 -com.android.internal.telephony.dataconnection.DcController$DccDefaultState -com.android.internal.telephony.dataconnection.DcFailBringUp -com.android.internal.telephony.dataconnection.DcFailCause -com.android.internal.telephony.dataconnection.DcRequest -com.android.internal.telephony.dataconnection.DcTesterDeactivateAll -com.android.internal.telephony.dataconnection.DcTesterDeactivateAll$1 -com.android.internal.telephony.dataconnection.DcTesterFailBringUpAll -com.android.internal.telephony.dataconnection.DcTesterFailBringUpAll$1 -com.android.internal.telephony.dataconnection.DcTracker -com.android.internal.telephony.dataconnection.DcTracker$1 -com.android.internal.telephony.dataconnection.DcTracker$2 -com.android.internal.telephony.dataconnection.DcTracker$3 -com.android.internal.telephony.dataconnection.DcTracker$4 -com.android.internal.telephony.dataconnection.DcTracker$ApnChangeObserver -com.android.internal.telephony.dataconnection.DcTracker$DataAllowFailReason -com.android.internal.telephony.dataconnection.DcTracker$DataAllowFailReasonType -com.android.internal.telephony.dataconnection.DcTracker$RetryFailures -com.android.internal.telephony.dataconnection.DcTracker$SettingsObserver -com.android.internal.telephony.dataconnection.DcTracker$TxRxSum -com.android.internal.telephony.dataconnection.TelephonyNetworkFactory -com.android.internal.telephony.dataconnection.TelephonyNetworkFactory$InternalHandler -com.android.internal.telephony.gsm.GsmCellBroadcastHandler -com.android.internal.telephony.gsm.GsmInboundSmsHandler -com.android.internal.telephony.gsm.GsmSMSDispatcher -com.android.internal.telephony.gsm.SmsMessage -com.android.internal.telephony.gsm.UsimDataDownloadHandler -com.android.internal.telephony.ims.-$Lambda$6hDwuvYxqWrzW_Ex5wc53XnUOpg -com.android.internal.telephony.ims.-$Lambda$6hDwuvYxqWrzW_Ex5wc53XnUOpg$1 -com.android.internal.telephony.ims.-$Lambda$6hDwuvYxqWrzW_Ex5wc53XnUOpg$2 -com.android.internal.telephony.ims.ImsResolver -com.android.internal.telephony.ims.ImsResolver$1 -com.android.internal.telephony.ims.ImsResolver$2 -com.android.internal.telephony.ims.ImsResolver$3 -com.android.internal.telephony.ims.ImsResolver$ImsServiceControllerFactory -com.android.internal.telephony.ims.ImsResolver$SubscriptionManagerProxy -com.android.internal.telephony.ims.ImsServiceController$ImsServiceControllerCallbacks -com.android.internal.telephony.imsphone.-$Lambda$tILLuSJl16qfDJK1ikBVGFm2D5w -com.android.internal.telephony.imsphone.-$Lambda$tILLuSJl16qfDJK1ikBVGFm2D5w$1 -com.android.internal.telephony.imsphone.ImsExternalCallTracker -com.android.internal.telephony.imsphone.ImsExternalCallTracker$1 -com.android.internal.telephony.imsphone.ImsExternalCallTracker$2 -com.android.internal.telephony.imsphone.ImsExternalCallTracker$ExternalCallStateListener -com.android.internal.telephony.imsphone.ImsExternalCallTracker$ExternalConnectionListener -com.android.internal.telephony.imsphone.ImsExternalCallTracker$ImsCallNotify -com.android.internal.telephony.imsphone.ImsExternalConnection$Listener -com.android.internal.telephony.imsphone.ImsPhone -com.android.internal.telephony.imsphone.ImsPhone$1 -com.android.internal.telephony.imsphone.ImsPhone$2 -com.android.internal.telephony.imsphone.ImsPhone$3 -com.android.internal.telephony.imsphone.ImsPhoneBase -com.android.internal.telephony.imsphone.ImsPhoneCall -com.android.internal.telephony.imsphone.ImsPhoneCallTracker -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$1 -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$2 -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$3 -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$4 -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$5 -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$IRetryTimeout -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$PhoneStateListener -com.android.internal.telephony.imsphone.ImsPhoneCommandInterface -com.android.internal.telephony.imsphone.ImsPhoneFactory -com.android.internal.telephony.imsphone.ImsPullCall -com.android.internal.telephony.metrics.CallSessionEventBuilder -com.android.internal.telephony.metrics.InProgressCallSession -com.android.internal.telephony.metrics.InProgressSmsSession -com.android.internal.telephony.metrics.SmsSessionEventBuilder -com.android.internal.telephony.metrics.TelephonyEventBuilder -com.android.internal.telephony.metrics.TelephonyMetrics -com.android.internal.telephony.nano.TelephonyProto$ImsCapabilities -com.android.internal.telephony.nano.TelephonyProto$ImsConnectionState -com.android.internal.telephony.nano.TelephonyProto$ImsReasonInfo -com.android.internal.telephony.nano.TelephonyProto$RilDataCall -com.android.internal.telephony.nano.TelephonyProto$SmsSession$Event -com.android.internal.telephony.nano.TelephonyProto$TelephonyCallSession$Event -com.android.internal.telephony.nano.TelephonyProto$TelephonyCallSession$Event$RilCall -com.android.internal.telephony.nano.TelephonyProto$TelephonyEvent -com.android.internal.telephony.nano.TelephonyProto$TelephonyServiceState -com.android.internal.telephony.nano.TelephonyProto$TelephonyServiceState$TelephonyOperator -com.android.internal.telephony.nano.TelephonyProto$TelephonySettings -com.android.internal.telephony.protobuf.nano.CodedOutputByteBufferNano -com.android.internal.telephony.protobuf.nano.ExtendableMessageNano -com.android.internal.telephony.protobuf.nano.InternalNano -com.android.internal.telephony.protobuf.nano.InvalidProtocolBufferNanoException -com.android.internal.telephony.protobuf.nano.MessageNano -com.android.internal.telephony.protobuf.nano.WireFormatNano -com.android.internal.telephony.test.SimulatedRadioControl -com.android.internal.telephony.uicc.IccCardApplicationStatus -com.android.internal.telephony.uicc.IccCardApplicationStatus$AppType -com.android.internal.telephony.uicc.IccCardProxy -com.android.internal.telephony.uicc.IccCardStatus -com.android.internal.telephony.uicc.IccCardStatus$CardState -com.android.internal.telephony.uicc.IccCardStatus$PinState -com.android.internal.telephony.uicc.IccConstants -com.android.internal.telephony.uicc.IccRecords -com.android.internal.telephony.uicc.IccUtils -com.android.internal.telephony.uicc.UiccCard -com.android.internal.telephony.uicc.UiccCard$1 -com.android.internal.telephony.uicc.UiccCardApplication -com.android.internal.telephony.uicc.UiccController -com.android.internal.telephony.uicc.UiccStateChangedLauncher -com.android.internal.telephony.util.NotificationChannelController -com.android.internal.telephony.util.NotificationChannelController$1 -com.android.internal.textservice.ISpellCheckerService -com.android.internal.textservice.ISpellCheckerService$Stub -com.android.internal.textservice.ISpellCheckerService$Stub$Proxy -com.android.internal.textservice.ISpellCheckerServiceCallback -com.android.internal.textservice.ISpellCheckerServiceCallback$Stub -com.android.internal.textservice.ISpellCheckerServiceCallback$Stub$Proxy -com.android.internal.textservice.ISpellCheckerSession -com.android.internal.textservice.ISpellCheckerSession$Stub -com.android.internal.textservice.ISpellCheckerSession$Stub$Proxy -com.android.internal.textservice.ISpellCheckerSessionListener -com.android.internal.textservice.ISpellCheckerSessionListener$Stub -com.android.internal.textservice.ISpellCheckerSessionListener$Stub$Proxy -com.android.internal.textservice.ITextServicesManager -com.android.internal.textservice.ITextServicesManager$Stub -com.android.internal.textservice.ITextServicesManager$Stub$Proxy -com.android.internal.textservice.ITextServicesSessionListener -com.android.internal.textservice.ITextServicesSessionListener$Stub -com.android.internal.textservice.ITextServicesSessionListener$Stub$Proxy -com.android.internal.transition.EpicenterTranslateClipReveal -com.android.internal.transition.TransitionConstants -com.android.internal.util.ArrayUtils -com.android.internal.util.AsyncChannel -com.android.internal.util.AsyncChannel$AsyncChannelConnection -com.android.internal.util.AsyncChannel$DeathMonitor -com.android.internal.util.AsyncChannel$SyncMessenger -com.android.internal.util.AsyncChannel$SyncMessenger$SyncHandler -com.android.internal.util.BitUtils -com.android.internal.util.CollectionUtils -com.android.internal.util.ConcurrentUtils -com.android.internal.util.ConcurrentUtils$1 -com.android.internal.util.ConcurrentUtils$1$1 -com.android.internal.util.DumpUtils$Dump -com.android.internal.util.ExponentiallyBucketedHistogram -com.android.internal.util.FastMath -com.android.internal.util.FastPrintWriter -com.android.internal.util.FastPrintWriter$DummyWriter -com.android.internal.util.FastXmlSerializer -com.android.internal.util.FileRotator -com.android.internal.util.FileRotator$FileInfo -com.android.internal.util.FileRotator$Reader -com.android.internal.util.FileRotator$Rewriter -com.android.internal.util.FileRotator$Writer -com.android.internal.util.GrowingArrayUtils -com.android.internal.util.HexDump -com.android.internal.util.IState -com.android.internal.util.ImageUtils -com.android.internal.util.IndentingPrintWriter -com.android.internal.util.IntPair -com.android.internal.util.JournaledFile -com.android.internal.util.LineBreakBufferedWriter -com.android.internal.util.LocalLog -com.android.internal.util.MemInfoReader -com.android.internal.util.MessageUtils -com.android.internal.util.NotificationColorUtil -com.android.internal.util.NotificationColorUtil$ColorUtilsFromCompat -com.android.internal.util.NotificationMessagingUtil -com.android.internal.util.NotificationMessagingUtil$1 -com.android.internal.util.Preconditions -com.android.internal.util.ProcFileReader -com.android.internal.util.ProgressReporter -com.android.internal.util.RingBufferIndices -com.android.internal.util.ScreenShapeHelper -com.android.internal.util.State -com.android.internal.util.StateMachine -com.android.internal.util.StateMachine$LogRec -com.android.internal.util.StateMachine$LogRecords -com.android.internal.util.StateMachine$SmHandler -com.android.internal.util.StateMachine$SmHandler$HaltingState -com.android.internal.util.StateMachine$SmHandler$QuittingState -com.android.internal.util.StateMachine$SmHandler$StateInfo -com.android.internal.util.ToBooleanFunction -com.android.internal.util.TokenBucket -com.android.internal.util.VirtualRefBasePtr -com.android.internal.util.WakeupMessage -com.android.internal.util.XmlUtils -com.android.internal.util.XmlUtils$ReadMapCallback -com.android.internal.util.XmlUtils$WriteMapCallback -com.android.internal.view.ActionBarPolicy -com.android.internal.view.BaseIWindow -com.android.internal.view.BaseSurfaceHolder -com.android.internal.view.IInputConnectionWrapper -com.android.internal.view.IInputConnectionWrapper$MyHandler -com.android.internal.view.IInputContext -com.android.internal.view.IInputContext$Stub -com.android.internal.view.IInputContext$Stub$Proxy -com.android.internal.view.IInputContextCallback -com.android.internal.view.IInputContextCallback$Stub -com.android.internal.view.IInputContextCallback$Stub$Proxy -com.android.internal.view.IInputMethod -com.android.internal.view.IInputMethod$Stub -com.android.internal.view.IInputMethod$Stub$Proxy -com.android.internal.view.IInputMethodClient -com.android.internal.view.IInputMethodClient$Stub -com.android.internal.view.IInputMethodClient$Stub$Proxy -com.android.internal.view.IInputMethodManager -com.android.internal.view.IInputMethodManager$Stub -com.android.internal.view.IInputMethodManager$Stub$Proxy -com.android.internal.view.IInputMethodSession -com.android.internal.view.IInputMethodSession$Stub -com.android.internal.view.IInputMethodSession$Stub$Proxy -com.android.internal.view.IInputSessionCallback -com.android.internal.view.IInputSessionCallback$Stub -com.android.internal.view.IInputSessionCallback$Stub$Proxy -com.android.internal.view.InputBindResult -com.android.internal.view.InputBindResult$1 -com.android.internal.view.InputConnectionWrapper -com.android.internal.view.InputConnectionWrapper$InputContextCallback -com.android.internal.view.OneShotPreDrawListener -com.android.internal.view.RootViewSurfaceTaker -com.android.internal.view.RotationPolicy -com.android.internal.view.RotationPolicy$RotationPolicyListener -com.android.internal.view.RotationPolicy$RotationPolicyListener$1 -com.android.internal.view.SurfaceCallbackHelper -com.android.internal.view.SurfaceCallbackHelper$1 -com.android.internal.view.SurfaceFlingerVsyncChoreographer -com.android.internal.view.WindowManagerPolicyThread -com.android.internal.view.animation.FallbackLUTInterpolator -com.android.internal.view.animation.HasNativeInterpolator -com.android.internal.view.animation.NativeInterpolatorFactory -com.android.internal.view.animation.NativeInterpolatorFactoryHelper -com.android.internal.view.menu.ActionMenuItem -com.android.internal.view.menu.ActionMenuItemView -com.android.internal.view.menu.ActionMenuItemView$PopupCallback -com.android.internal.view.menu.BaseMenuPresenter -com.android.internal.view.menu.ContextMenuBuilder -com.android.internal.view.menu.MenuBuilder -com.android.internal.view.menu.MenuBuilder$Callback -com.android.internal.view.menu.MenuBuilder$ItemInvoker -com.android.internal.view.menu.MenuHelper -com.android.internal.view.menu.MenuItemImpl -com.android.internal.view.menu.MenuPopupHelper -com.android.internal.view.menu.MenuPopupHelper$1 -com.android.internal.view.menu.MenuPresenter -com.android.internal.view.menu.MenuPresenter$Callback -com.android.internal.view.menu.MenuView -com.android.internal.view.menu.MenuView$ItemView -com.android.internal.view.menu.ShowableListMenu -com.android.internal.widget.-$Lambda$LaTFiUorkqfcqmu-zMQbCLeO77c -com.android.internal.widget.AbsActionBarView -com.android.internal.widget.AbsActionBarView$VisibilityAnimListener -com.android.internal.widget.ActionBarContainer -com.android.internal.widget.ActionBarContainer$ActionBarBackgroundDrawable -com.android.internal.widget.ActionBarContextView -com.android.internal.widget.ActionBarContextView$1 -com.android.internal.widget.ActionBarOverlayLayout -com.android.internal.widget.ActionBarOverlayLayout$1 -com.android.internal.widget.ActionBarOverlayLayout$2 -com.android.internal.widget.ActionBarOverlayLayout$3 -com.android.internal.widget.ActionBarOverlayLayout$4 -com.android.internal.widget.ActionBarOverlayLayout$5 -com.android.internal.widget.ActionBarOverlayLayout$ActionBarVisibilityCallback -com.android.internal.widget.ActionBarOverlayLayout$LayoutParams -com.android.internal.widget.AlertDialogLayout -com.android.internal.widget.BackgroundFallback -com.android.internal.widget.ButtonBarLayout -com.android.internal.widget.CachingIconView -com.android.internal.widget.DecorContentParent -com.android.internal.widget.DecorToolbar -com.android.internal.widget.DialogTitle -com.android.internal.widget.EditableInputConnection -com.android.internal.widget.ICheckCredentialProgressCallback -com.android.internal.widget.ILockSettings -com.android.internal.widget.ILockSettings$Stub -com.android.internal.widget.ILockSettings$Stub$Proxy -com.android.internal.widget.ImageFloatingTextView -com.android.internal.widget.LockPatternUtils -com.android.internal.widget.LockPatternUtils$RequestThrottledException -com.android.internal.widget.LockPatternUtils$StrongAuthTracker -com.android.internal.widget.LockPatternUtils$StrongAuthTracker$1 -com.android.internal.widget.LockPatternUtils$StrongAuthTracker$H -com.android.internal.widget.MediaNotificationView -com.android.internal.widget.NotificationActionListLayout -com.android.internal.widget.NotificationExpandButton -com.android.internal.widget.ScrollBarUtils -com.android.internal.widget.ToolbarWidgetWrapper -com.android.internal.widget.ToolbarWidgetWrapper$1 -com.android.internal.widget.ToolbarWidgetWrapper$2 -com.android.internal.widget.VerifyCredentialResponse -com.android.okhttp.Address -com.android.okhttp.AndroidInternal -com.android.okhttp.AndroidShimResponseCache -com.android.okhttp.Authenticator -com.android.okhttp.Cache -com.android.okhttp.Cache$1 -com.android.okhttp.Cache$CacheRequestImpl -com.android.okhttp.Cache$CacheRequestImpl$1 -com.android.okhttp.Cache$Entry -com.android.okhttp.CacheControl -com.android.okhttp.CacheControl$Builder -com.android.okhttp.CertificatePinner -com.android.okhttp.CertificatePinner$Builder -com.android.okhttp.CipherSuite -com.android.okhttp.ConfigAwareConnectionPool -com.android.okhttp.ConfigAwareConnectionPool$1 -com.android.okhttp.Connection -com.android.okhttp.ConnectionPool -com.android.okhttp.ConnectionPool$1 -com.android.okhttp.ConnectionSpec -com.android.okhttp.ConnectionSpec$Builder -com.android.okhttp.Dispatcher -com.android.okhttp.Dns -com.android.okhttp.Dns$1 -com.android.okhttp.Handshake -com.android.okhttp.Headers -com.android.okhttp.Headers$Builder -com.android.okhttp.HttpHandler -com.android.okhttp.HttpHandler$CleartextURLFilter -com.android.okhttp.HttpUrl -com.android.okhttp.HttpUrl$Builder -com.android.okhttp.HttpUrl$Builder$ParseResult -com.android.okhttp.HttpsHandler -com.android.okhttp.OkCacheContainer -com.android.okhttp.OkHttpClient -com.android.okhttp.OkHttpClient$1 -com.android.okhttp.OkUrlFactory -com.android.okhttp.Protocol -com.android.okhttp.Request -com.android.okhttp.Request$Builder -com.android.okhttp.RequestBody -com.android.okhttp.RequestBody$2 -com.android.okhttp.Response -com.android.okhttp.Response$Builder -com.android.okhttp.ResponseBody -com.android.okhttp.Route -com.android.okhttp.TlsVersion -com.android.okhttp.internal.ConnectionSpecSelector -com.android.okhttp.internal.DiskLruCache -com.android.okhttp.internal.DiskLruCache$1 -com.android.okhttp.internal.DiskLruCache$2 -com.android.okhttp.internal.DiskLruCache$3 -com.android.okhttp.internal.DiskLruCache$Editor -com.android.okhttp.internal.DiskLruCache$Editor$1 -com.android.okhttp.internal.DiskLruCache$Entry -com.android.okhttp.internal.FaultHidingSink -com.android.okhttp.internal.Internal -com.android.okhttp.internal.InternalCache -com.android.okhttp.internal.OptionalMethod -com.android.okhttp.internal.Platform -com.android.okhttp.internal.RouteDatabase -com.android.okhttp.internal.URLFilter -com.android.okhttp.internal.Util -com.android.okhttp.internal.Util$1 -com.android.okhttp.internal.http.AuthenticatorAdapter -com.android.okhttp.internal.http.CacheRequest -com.android.okhttp.internal.http.CacheStrategy -com.android.okhttp.internal.http.CacheStrategy$Factory -com.android.okhttp.internal.http.HeaderParser -com.android.okhttp.internal.http.Http1xStream -com.android.okhttp.internal.http.Http1xStream$AbstractSource -com.android.okhttp.internal.http.Http1xStream$ChunkedSink -com.android.okhttp.internal.http.Http1xStream$ChunkedSource -com.android.okhttp.internal.http.Http1xStream$FixedLengthSink -com.android.okhttp.internal.http.Http1xStream$FixedLengthSource -com.android.okhttp.internal.http.Http1xStream$UnknownLengthSource -com.android.okhttp.internal.http.HttpEngine -com.android.okhttp.internal.http.HttpEngine$1 -com.android.okhttp.internal.http.HttpEngine$2 -com.android.okhttp.internal.http.HttpMethod -com.android.okhttp.internal.http.HttpStream -com.android.okhttp.internal.http.OkHeaders -com.android.okhttp.internal.http.OkHeaders$1 -com.android.okhttp.internal.http.RealResponseBody -com.android.okhttp.internal.http.RequestException -com.android.okhttp.internal.http.RequestLine -com.android.okhttp.internal.http.RetryableSink -com.android.okhttp.internal.http.RouteException -com.android.okhttp.internal.http.RouteSelector -com.android.okhttp.internal.http.StatusLine -com.android.okhttp.internal.http.StreamAllocation -com.android.okhttp.internal.huc.DelegatingHttpsURLConnection -com.android.okhttp.internal.huc.HttpURLConnectionImpl -com.android.okhttp.internal.huc.HttpsURLConnectionImpl -com.android.okhttp.internal.io.FileSystem -com.android.okhttp.internal.io.FileSystem$1 -com.android.okhttp.internal.io.RealConnection -com.android.okhttp.internal.tls.OkHostnameVerifier -com.android.okhttp.okio.AsyncTimeout -com.android.okhttp.okio.AsyncTimeout$1 -com.android.okhttp.okio.AsyncTimeout$2 -com.android.okhttp.okio.AsyncTimeout$Watchdog -com.android.okhttp.okio.Base64 -com.android.okhttp.okio.Buffer -com.android.okhttp.okio.BufferedSink -com.android.okhttp.okio.BufferedSource -com.android.okhttp.okio.ByteString -com.android.okhttp.okio.ForwardingSink -com.android.okhttp.okio.ForwardingTimeout -com.android.okhttp.okio.GzipSource -com.android.okhttp.okio.InflaterSource -com.android.okhttp.okio.Okio -com.android.okhttp.okio.Okio$1 -com.android.okhttp.okio.Okio$2 -com.android.okhttp.okio.Okio$3 -com.android.okhttp.okio.RealBufferedSink -com.android.okhttp.okio.RealBufferedSink$1 -com.android.okhttp.okio.RealBufferedSource -com.android.okhttp.okio.RealBufferedSource$1 -com.android.okhttp.okio.Segment -com.android.okhttp.okio.SegmentPool -com.android.okhttp.okio.Sink -com.android.okhttp.okio.Source -com.android.okhttp.okio.Timeout -com.android.okhttp.okio.Timeout$1 -com.android.okhttp.okio.Util -com.android.org.bouncycastle.asn1.ASN1BitString -com.android.org.bouncycastle.asn1.ASN1Choice -com.android.org.bouncycastle.asn1.ASN1Encodable -com.android.org.bouncycastle.asn1.ASN1EncodableVector -com.android.org.bouncycastle.asn1.ASN1InputStream -com.android.org.bouncycastle.asn1.ASN1Integer -com.android.org.bouncycastle.asn1.ASN1Null -com.android.org.bouncycastle.asn1.ASN1Object -com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier -com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier$OidHandle -com.android.org.bouncycastle.asn1.ASN1OutputStream -com.android.org.bouncycastle.asn1.ASN1Primitive -com.android.org.bouncycastle.asn1.ASN1Sequence -com.android.org.bouncycastle.asn1.ASN1Set -com.android.org.bouncycastle.asn1.ASN1StreamParser -com.android.org.bouncycastle.asn1.ASN1String -com.android.org.bouncycastle.asn1.ASN1TaggedObject -com.android.org.bouncycastle.asn1.ASN1TaggedObjectParser -com.android.org.bouncycastle.asn1.ASN1UTCTime -com.android.org.bouncycastle.asn1.BERTags -com.android.org.bouncycastle.asn1.DERBitString -com.android.org.bouncycastle.asn1.DERFactory -com.android.org.bouncycastle.asn1.DERNull -com.android.org.bouncycastle.asn1.DEROutputStream -com.android.org.bouncycastle.asn1.DERPrintableString -com.android.org.bouncycastle.asn1.DERSequence -com.android.org.bouncycastle.asn1.DERSet -com.android.org.bouncycastle.asn1.DERTaggedObject -com.android.org.bouncycastle.asn1.DLSequence -com.android.org.bouncycastle.asn1.DLSet -com.android.org.bouncycastle.asn1.DefiniteLengthInputStream -com.android.org.bouncycastle.asn1.InMemoryRepresentable -com.android.org.bouncycastle.asn1.IndefiniteLengthInputStream -com.android.org.bouncycastle.asn1.LimitedInputStream -com.android.org.bouncycastle.asn1.OIDTokenizer -com.android.org.bouncycastle.asn1.StreamUtil -com.android.org.bouncycastle.asn1.bc.BCObjectIdentifiers -com.android.org.bouncycastle.asn1.iana.IANAObjectIdentifiers -com.android.org.bouncycastle.asn1.misc.MiscObjectIdentifiers -com.android.org.bouncycastle.asn1.nist.NISTObjectIdentifiers -com.android.org.bouncycastle.asn1.oiw.OIWObjectIdentifiers -com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers -com.android.org.bouncycastle.asn1.x500.RDN -com.android.org.bouncycastle.asn1.x500.X500Name -com.android.org.bouncycastle.asn1.x500.X500NameStyle -com.android.org.bouncycastle.asn1.x500.style.AbstractX500NameStyle -com.android.org.bouncycastle.asn1.x500.style.BCStyle -com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier -com.android.org.bouncycastle.asn1.x509.Certificate -com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo -com.android.org.bouncycastle.asn1.x509.TBSCertificate -com.android.org.bouncycastle.asn1.x509.Time -com.android.org.bouncycastle.asn1.x509.X509ObjectIdentifiers -com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers -com.android.org.bouncycastle.crypto.AsymmetricBlockCipher -com.android.org.bouncycastle.crypto.CipherKeyGenerator -com.android.org.bouncycastle.crypto.CipherParameters -com.android.org.bouncycastle.crypto.CryptoException -com.android.org.bouncycastle.crypto.Digest -com.android.org.bouncycastle.crypto.ExtendedDigest -com.android.org.bouncycastle.crypto.InvalidCipherTextException -com.android.org.bouncycastle.crypto.KeyGenerationParameters -com.android.org.bouncycastle.crypto.Mac -com.android.org.bouncycastle.crypto.PBEParametersGenerator -com.android.org.bouncycastle.crypto.digests.AndroidDigestFactory -com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryInterface -com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL -com.android.org.bouncycastle.crypto.digests.EncodableDigest -com.android.org.bouncycastle.crypto.digests.GeneralDigest -com.android.org.bouncycastle.crypto.digests.OpenSSLDigest -com.android.org.bouncycastle.crypto.digests.OpenSSLDigest$SHA1 -com.android.org.bouncycastle.crypto.digests.SHA1Digest -com.android.org.bouncycastle.crypto.encodings.OAEPEncoding -com.android.org.bouncycastle.crypto.engines.RSABlindedEngine -com.android.org.bouncycastle.crypto.engines.RSACoreEngine -com.android.org.bouncycastle.crypto.generators.PKCS12ParametersGenerator -com.android.org.bouncycastle.crypto.io.MacInputStream -com.android.org.bouncycastle.crypto.macs.HMac -com.android.org.bouncycastle.crypto.params.KeyParameter -com.android.org.bouncycastle.jcajce.provider.asymmetric.DH$Mappings -com.android.org.bouncycastle.jcajce.provider.asymmetric.DSA$Mappings -com.android.org.bouncycastle.jcajce.provider.asymmetric.EC$Mappings -com.android.org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings -com.android.org.bouncycastle.jcajce.provider.asymmetric.X509$Mappings -com.android.org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil -com.android.org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi$EC -com.android.org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.rsa.CipherSpi$NoPadding -com.android.org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi -com.android.org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl -com.android.org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory -com.android.org.bouncycastle.jcajce.provider.asymmetric.x509.PEMUtil -com.android.org.bouncycastle.jcajce.provider.asymmetric.x509.X509CertificateObject -com.android.org.bouncycastle.jcajce.provider.config.ConfigurableProvider -com.android.org.bouncycastle.jcajce.provider.config.ProviderConfiguration -com.android.org.bouncycastle.jcajce.provider.config.ProviderConfigurationPermission -com.android.org.bouncycastle.jcajce.provider.digest.DigestAlgorithmProvider -com.android.org.bouncycastle.jcajce.provider.digest.MD5 -com.android.org.bouncycastle.jcajce.provider.digest.MD5$Mappings -com.android.org.bouncycastle.jcajce.provider.digest.SHA1 -com.android.org.bouncycastle.jcajce.provider.digest.SHA1$KeyGenerator -com.android.org.bouncycastle.jcajce.provider.digest.SHA1$Mappings -com.android.org.bouncycastle.jcajce.provider.digest.SHA224 -com.android.org.bouncycastle.jcajce.provider.digest.SHA224$Mappings -com.android.org.bouncycastle.jcajce.provider.digest.SHA256 -com.android.org.bouncycastle.jcajce.provider.digest.SHA256$Mappings -com.android.org.bouncycastle.jcajce.provider.digest.SHA384 -com.android.org.bouncycastle.jcajce.provider.digest.SHA384$Mappings -com.android.org.bouncycastle.jcajce.provider.digest.SHA512 -com.android.org.bouncycastle.jcajce.provider.digest.SHA512$Mappings -com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings -com.android.org.bouncycastle.jcajce.provider.keystore.PKCS12$Mappings -com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi -com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std -com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$StoreEntry -com.android.org.bouncycastle.jcajce.provider.symmetric.AES -com.android.org.bouncycastle.jcajce.provider.symmetric.AES$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.ARC4 -com.android.org.bouncycastle.jcajce.provider.symmetric.ARC4$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.Blowfish -com.android.org.bouncycastle.jcajce.provider.symmetric.Blowfish$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.DES -com.android.org.bouncycastle.jcajce.provider.symmetric.DES$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.DESede -com.android.org.bouncycastle.jcajce.provider.symmetric.DESede$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2 -com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12 -com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.PBES2AlgorithmParameters -com.android.org.bouncycastle.jcajce.provider.symmetric.PBES2AlgorithmParameters$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.RC2 -com.android.org.bouncycastle.jcajce.provider.symmetric.RC2$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.SymmetricAlgorithmProvider -com.android.org.bouncycastle.jcajce.provider.symmetric.Twofish -com.android.org.bouncycastle.jcajce.provider.symmetric.Twofish$Mappings -com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator -com.android.org.bouncycastle.jcajce.provider.util.AlgorithmProvider -com.android.org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider -com.android.org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter -com.android.org.bouncycastle.jcajce.provider.util.DigestFactory -com.android.org.bouncycastle.jcajce.util.BCJcaJceHelper -com.android.org.bouncycastle.jcajce.util.JcaJceHelper -com.android.org.bouncycastle.jcajce.util.ProviderJcaJceHelper -com.android.org.bouncycastle.jce.interfaces.BCKeyStore -com.android.org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier -com.android.org.bouncycastle.jce.provider.BouncyCastleProvider -com.android.org.bouncycastle.jce.provider.BouncyCastleProvider$1 -com.android.org.bouncycastle.jce.provider.BouncyCastleProviderConfiguration -com.android.org.bouncycastle.jce.provider.CertStoreCollectionSpi -com.android.org.bouncycastle.util.Arrays -com.android.org.bouncycastle.util.Encodable -com.android.org.bouncycastle.util.Integers -com.android.org.bouncycastle.util.Iterable -com.android.org.bouncycastle.util.Memoable -com.android.org.bouncycastle.util.Pack -com.android.org.bouncycastle.util.Strings -com.android.org.bouncycastle.util.Strings$1 -com.android.org.bouncycastle.util.io.Streams -com.android.org.conscrypt.AbstractOpenSSLSession -com.android.org.conscrypt.AbstractSessionContext -com.android.org.conscrypt.AbstractSessionContext$1 -com.android.org.conscrypt.AddressUtils -com.android.org.conscrypt.ArrayUtils -com.android.org.conscrypt.ByteArray -com.android.org.conscrypt.CertBlacklist -com.android.org.conscrypt.CertificatePriorityComparator -com.android.org.conscrypt.ChainStrengthAnalyzer -com.android.org.conscrypt.ClientSessionContext -com.android.org.conscrypt.ClientSessionContext$HostAndPort -com.android.org.conscrypt.CryptoUpcalls -com.android.org.conscrypt.EvpMdRef$MD5 -com.android.org.conscrypt.EvpMdRef$SHA1 -com.android.org.conscrypt.EvpMdRef$SHA256 -com.android.org.conscrypt.FileClientSessionCache -com.android.org.conscrypt.FileClientSessionCache$CacheFile -com.android.org.conscrypt.FileClientSessionCache$Impl -com.android.org.conscrypt.Hex -com.android.org.conscrypt.JSSEProvider -com.android.org.conscrypt.KeyManagerFactoryImpl -com.android.org.conscrypt.KeyManagerImpl -com.android.org.conscrypt.NativeCrypto -com.android.org.conscrypt.NativeCrypto$SSLHandshakeCallbacks -com.android.org.conscrypt.NativeCryptoJni -com.android.org.conscrypt.NativeRef -com.android.org.conscrypt.NativeRef$EC_GROUP -com.android.org.conscrypt.NativeRef$EC_POINT -com.android.org.conscrypt.NativeRef$EVP_CIPHER_CTX -com.android.org.conscrypt.NativeRef$EVP_MD_CTX -com.android.org.conscrypt.NativeRef$EVP_PKEY -com.android.org.conscrypt.NativeRef$HMAC_CTX -com.android.org.conscrypt.OpenSSLBIOInputStream -com.android.org.conscrypt.OpenSSLCipher -com.android.org.conscrypt.OpenSSLCipher$EVP_CIPHER -com.android.org.conscrypt.OpenSSLCipher$EVP_CIPHER$AES -com.android.org.conscrypt.OpenSSLCipher$EVP_CIPHER$AES$CBC -com.android.org.conscrypt.OpenSSLCipher$EVP_CIPHER$AES$CBC$PKCS5Padding -com.android.org.conscrypt.OpenSSLCipher$EVP_CIPHER$AES_BASE -com.android.org.conscrypt.OpenSSLCipher$Mode -com.android.org.conscrypt.OpenSSLCipher$Padding -com.android.org.conscrypt.OpenSSLContextImpl -com.android.org.conscrypt.OpenSSLContextImpl$TLSv12 -com.android.org.conscrypt.OpenSSLECGroupContext -com.android.org.conscrypt.OpenSSLECKeyFactory -com.android.org.conscrypt.OpenSSLECPointContext -com.android.org.conscrypt.OpenSSLECPublicKey -com.android.org.conscrypt.OpenSSLExtendedSessionImpl -com.android.org.conscrypt.OpenSSLKey -com.android.org.conscrypt.OpenSSLKeyHolder -com.android.org.conscrypt.OpenSSLMac -com.android.org.conscrypt.OpenSSLMac$HmacSHA1 -com.android.org.conscrypt.OpenSSLMac$HmacSHA256 -com.android.org.conscrypt.OpenSSLMessageDigestJDK -com.android.org.conscrypt.OpenSSLMessageDigestJDK$MD5 -com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA1 -com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA256 -com.android.org.conscrypt.OpenSSLProvider -com.android.org.conscrypt.OpenSSLRSAKeyFactory -com.android.org.conscrypt.OpenSSLRSAPublicKey -com.android.org.conscrypt.OpenSSLRandom -com.android.org.conscrypt.OpenSSLSessionImpl -com.android.org.conscrypt.OpenSSLSignature -com.android.org.conscrypt.OpenSSLSignature$EngineType -com.android.org.conscrypt.OpenSSLSignature$RSAPKCS1Padding -com.android.org.conscrypt.OpenSSLSignature$SHA1RSA -com.android.org.conscrypt.OpenSSLSignature$SHA256RSA -com.android.org.conscrypt.OpenSSLSocketFactoryImpl -com.android.org.conscrypt.OpenSSLSocketImpl -com.android.org.conscrypt.OpenSSLSocketImpl$SSLInputStream -com.android.org.conscrypt.OpenSSLSocketImpl$SSLOutputStream -com.android.org.conscrypt.OpenSSLSocketImplWrapper -com.android.org.conscrypt.OpenSSLX509CertPath -com.android.org.conscrypt.OpenSSLX509CertPath$Encoding -com.android.org.conscrypt.OpenSSLX509Certificate -com.android.org.conscrypt.OpenSSLX509CertificateFactory -com.android.org.conscrypt.OpenSSLX509CertificateFactory$1 -com.android.org.conscrypt.OpenSSLX509CertificateFactory$2 -com.android.org.conscrypt.OpenSSLX509CertificateFactory$Parser -com.android.org.conscrypt.OpenSSLX509CertificateFactory$ParsingException -com.android.org.conscrypt.Platform -com.android.org.conscrypt.SSLClientSessionCache -com.android.org.conscrypt.SSLParametersImpl -com.android.org.conscrypt.SSLParametersImpl$AliasChooser -com.android.org.conscrypt.SSLParametersImpl$PSKCallbacks -com.android.org.conscrypt.SSLUtils -com.android.org.conscrypt.ServerSessionContext -com.android.org.conscrypt.TrustManagerFactoryImpl -com.android.org.conscrypt.TrustManagerImpl -com.android.org.conscrypt.TrustManagerImpl$ExtendedKeyUsagePKIXCertPathChecker -com.android.org.conscrypt.TrustManagerImpl$TrustAnchorComparator -com.android.org.conscrypt.TrustedCertificateIndex -com.android.org.conscrypt.TrustedCertificateKeyStoreSpi -com.android.org.conscrypt.TrustedCertificateStore -com.android.org.conscrypt.TrustedCertificateStore$1 -com.android.org.conscrypt.TrustedCertificateStore$2 -com.android.org.conscrypt.TrustedCertificateStore$4 -com.android.org.conscrypt.TrustedCertificateStore$5 -com.android.org.conscrypt.TrustedCertificateStore$CertSelector -com.android.org.conscrypt.TrustedCertificateStore$PreloadHolder -com.android.org.conscrypt.ct.CTLogInfo -com.android.org.conscrypt.ct.CTLogStore -com.android.org.conscrypt.ct.CTLogStoreImpl -com.android.org.conscrypt.ct.CTLogStoreImpl$InvalidLogFileException -com.android.org.conscrypt.ct.CTPolicy -com.android.org.conscrypt.ct.CTPolicyImpl -com.android.org.conscrypt.ct.CTVerifier -com.android.org.conscrypt.ct.KnownLogs -com.android.org.conscrypt.ct.SerializationException -com.android.server.AppWidgetBackupBridge -com.android.server.BootReceiver -com.android.server.BootReceiver$1 -com.android.server.BootReceiver$2 -com.android.server.LocalServices -com.android.server.NetworkManagementSocketTagger -com.android.server.NetworkManagementSocketTagger$1 -com.android.server.NetworkManagementSocketTagger$SocketTags -com.android.server.SystemConfig -com.android.server.SystemConfig$PermissionEntry -com.android.server.WidgetBackupProvider -com.android.server.backup.AccountSyncSettingsBackupHelper -com.android.server.net.BaseNetworkObserver -com.android.server.net.DnsServerEntry -com.android.server.net.DnsServerRepository -com.android.server.net.NetlinkTracker -com.android.server.net.NetlinkTracker$Callback -com.android.server.sip.SipService -com.android.server.sip.SipService$ConnectivityReceiver -com.android.server.sip.SipService$MyExecutor -com.android.server.sip.SipWakeLock -com.android.server.sip.SipWakeupTimer -com.android.server.sip.SipWakeupTimer$MyEventComparator -com.android.server.wifi.nano.WifiMetricsProto$AlertReasonCount -com.android.server.wifi.nano.WifiMetricsProto$ConnectionEvent -com.android.server.wifi.nano.WifiMetricsProto$RouterFingerPrint -com.android.server.wifi.nano.WifiMetricsProto$RssiPollCount -com.android.server.wifi.nano.WifiMetricsProto$SoftApDurationBucket -com.android.server.wifi.nano.WifiMetricsProto$SoftApReturnCodeCount -com.android.server.wifi.nano.WifiMetricsProto$StaEvent -com.android.server.wifi.nano.WifiMetricsProto$StaEvent$ConfigInfo -com.android.server.wifi.nano.WifiMetricsProto$WifiLog -com.android.server.wifi.nano.WifiMetricsProto$WifiLog$ScanReturnEntry -com.android.server.wifi.nano.WifiMetricsProto$WifiLog$WifiSystemStateEntry -com.android.server.wifi.nano.WifiMetricsProto$WifiScoreCount -com.android.server.wm.nano.WindowManagerProtos$TaskSnapshotProto -com.google.android.collect.Lists -com.google.android.collect.Maps -com.google.android.collect.Sets -com.google.android.gles_jni.EGLConfigImpl -com.google.android.gles_jni.EGLContextImpl -com.google.android.gles_jni.EGLDisplayImpl -com.google.android.gles_jni.EGLImpl -com.google.android.gles_jni.EGLSurfaceImpl -com.google.android.gles_jni.GLImpl -com.google.android.mms.MmsException -dalvik.annotation.optimization.CriticalNative -dalvik.annotation.optimization.FastNative -dalvik.system.-$Lambda$xxvwQBVHC44UYbpcpA8j0sUqLOo -dalvik.system.BaseDexClassLoader -dalvik.system.BaseDexClassLoader$Reporter -dalvik.system.BlockGuard -dalvik.system.BlockGuard$1 -dalvik.system.BlockGuard$2 -dalvik.system.BlockGuard$BlockGuardPolicyException -dalvik.system.BlockGuard$Policy -dalvik.system.ClassExt -dalvik.system.CloseGuard -dalvik.system.CloseGuard$DefaultReporter -dalvik.system.CloseGuard$DefaultTracker -dalvik.system.CloseGuard$Reporter -dalvik.system.CloseGuard$Tracker -dalvik.system.DalvikLogHandler -dalvik.system.DalvikLogging -dalvik.system.DexClassLoader -dalvik.system.DexFile -dalvik.system.DexFile$DFEnum -dalvik.system.DexPathList -dalvik.system.DexPathList$Element -dalvik.system.DexPathList$NativeLibraryElement -dalvik.system.EmulatedStackFrame -dalvik.system.EmulatedStackFrame$Range -dalvik.system.PathClassLoader -dalvik.system.SocketTagger -dalvik.system.SocketTagger$1 -dalvik.system.VMDebug -dalvik.system.VMRuntime -dalvik.system.VMStack -dalvik.system.ZygoteHooks -java.io.Bits -java.io.BufferedInputStream -java.io.BufferedOutputStream -java.io.BufferedReader -java.io.BufferedWriter -java.io.ByteArrayInputStream -java.io.ByteArrayOutputStream -java.io.CharArrayWriter -java.io.Closeable -java.io.Console -java.io.DataInput -java.io.DataInputStream -java.io.DataOutput -java.io.DataOutputStream -java.io.DefaultFileSystem -java.io.EOFException -java.io.ExpiringCache -java.io.ExpiringCache$1 -java.io.ExpiringCache$Entry -java.io.Externalizable -java.io.File -java.io.File$PathStatus -java.io.File$TempDirectory -java.io.FileDescriptor -java.io.FileDescriptor$1 -java.io.FileFilter -java.io.FileInputStream -java.io.FileInputStream$UseManualSkipException -java.io.FileNotFoundException -java.io.FileOutputStream -java.io.FileReader -java.io.FileSystem -java.io.FileWriter -java.io.FilenameFilter -java.io.FilterInputStream -java.io.FilterOutputStream -java.io.FilterReader -java.io.Flushable -java.io.IOException -java.io.InputStream -java.io.InputStreamReader -java.io.InterruptedIOException -java.io.InvalidClassException -java.io.InvalidObjectException -java.io.ObjectInput -java.io.ObjectInputStream -java.io.ObjectInputStream$BlockDataInputStream -java.io.ObjectInputStream$HandleTable -java.io.ObjectInputStream$HandleTable$HandleList -java.io.ObjectInputStream$PeekInputStream -java.io.ObjectInputStream$ValidationList -java.io.ObjectOutput -java.io.ObjectOutputStream -java.io.ObjectOutputStream$BlockDataOutputStream -java.io.ObjectOutputStream$HandleTable -java.io.ObjectOutputStream$PutField -java.io.ObjectOutputStream$ReplaceTable -java.io.ObjectStreamClass -java.io.ObjectStreamClass$1 -java.io.ObjectStreamClass$2 -java.io.ObjectStreamClass$3 -java.io.ObjectStreamClass$4 -java.io.ObjectStreamClass$5 -java.io.ObjectStreamClass$Caches -java.io.ObjectStreamClass$ClassDataSlot -java.io.ObjectStreamClass$EntryFuture -java.io.ObjectStreamClass$ExceptionInfo -java.io.ObjectStreamClass$FieldReflector -java.io.ObjectStreamClass$FieldReflectorKey -java.io.ObjectStreamClass$MemberSignature -java.io.ObjectStreamClass$WeakClassKey -java.io.ObjectStreamConstants -java.io.ObjectStreamException -java.io.ObjectStreamField -java.io.OutputStream -java.io.OutputStreamWriter -java.io.PrintStream -java.io.PrintWriter -java.io.PushbackInputStream -java.io.PushbackReader -java.io.RandomAccessFile -java.io.Reader -java.io.SequenceInputStream -java.io.SerialCallbackContext -java.io.Serializable -java.io.SerializablePermission -java.io.StreamCorruptedException -java.io.StringReader -java.io.StringWriter -java.io.UnixFileSystem -java.io.UnsupportedEncodingException -java.io.Writer -java.lang.-$Lambda$S9HjrJh0nDg7IyU6wZdPArnZWRQ -java.lang.-$Lambda$S9HjrJh0nDg7IyU6wZdPArnZWRQ$1 -java.lang.AbstractMethodError -java.lang.AbstractStringBuilder -java.lang.AndroidHardcodedSystemProperties -java.lang.Appendable -java.lang.ArithmeticException -java.lang.ArrayIndexOutOfBoundsException -java.lang.ArrayStoreException -java.lang.AssertionError -java.lang.AutoCloseable -java.lang.Boolean -java.lang.BootClassLoader -java.lang.Byte -java.lang.Byte$ByteCache -java.lang.CaseMapper -java.lang.CaseMapper$1 -java.lang.CharSequence -java.lang.CharSequence$1CharIterator -java.lang.CharSequence$1CodePointIterator -java.lang.Character -java.lang.Character$CharacterCache -java.lang.Character$Subset -java.lang.Character$UnicodeBlock -java.lang.Class -java.lang.Class$Caches -java.lang.ClassCastException -java.lang.ClassLoader -java.lang.ClassLoader$SystemClassLoader -java.lang.ClassNotFoundException -java.lang.CloneNotSupportedException -java.lang.Cloneable -java.lang.Comparable -java.lang.Daemons -java.lang.Daemons$Daemon -java.lang.Daemons$FinalizerDaemon -java.lang.Daemons$FinalizerWatchdogDaemon -java.lang.Daemons$HeapTaskDaemon -java.lang.Daemons$ReferenceQueueDaemon -java.lang.Deprecated -java.lang.DexCache -java.lang.Double -java.lang.Enum -java.lang.Enum$1 -java.lang.EnumConstantNotPresentException -java.lang.Error -java.lang.Exception -java.lang.ExceptionInInitializerError -java.lang.Float -java.lang.IllegalAccessError -java.lang.IllegalAccessException -java.lang.IllegalArgumentException -java.lang.IllegalMonitorStateException -java.lang.IllegalStateException -java.lang.IllegalThreadStateException -java.lang.IncompatibleClassChangeError -java.lang.IndexOutOfBoundsException -java.lang.InheritableThreadLocal -java.lang.InstantiationError -java.lang.InstantiationException -java.lang.Integer -java.lang.Integer$IntegerCache -java.lang.InternalError -java.lang.InterruptedException -java.lang.Iterable -java.lang.JavaLangAccess -java.lang.LinkageError -java.lang.Long -java.lang.Long$LongCache -java.lang.Math -java.lang.Math$RandomNumberGeneratorHolder -java.lang.NegativeArraySizeException -java.lang.NoClassDefFoundError -java.lang.NoSuchFieldError -java.lang.NoSuchFieldException -java.lang.NoSuchMethodError -java.lang.NoSuchMethodException -java.lang.NullPointerException -java.lang.Number -java.lang.NumberFormatException -java.lang.Object -java.lang.OutOfMemoryError -java.lang.Package -java.lang.Process -java.lang.ProcessBuilder -java.lang.ProcessEnvironment -java.lang.Readable -java.lang.ReflectiveOperationException -java.lang.Runnable -java.lang.Runtime -java.lang.RuntimeException -java.lang.RuntimePermission -java.lang.SecurityException -java.lang.SecurityManager -java.lang.Short -java.lang.Short$ShortCache -java.lang.StackOverflowError -java.lang.StackTraceElement -java.lang.StrictMath -java.lang.String -java.lang.String$CaseInsensitiveComparator -java.lang.StringBuffer -java.lang.StringBuilder -java.lang.StringFactory -java.lang.StringIndexOutOfBoundsException -java.lang.System -java.lang.System$PropertiesWithNonOverrideableDefaults -java.lang.Thread -java.lang.Thread$1 -java.lang.Thread$Caches -java.lang.Thread$State -java.lang.Thread$UncaughtExceptionHandler -java.lang.Thread$WeakClassKey -java.lang.ThreadDeath -java.lang.ThreadGroup -java.lang.ThreadLocal -java.lang.ThreadLocal$SuppliedThreadLocal -java.lang.ThreadLocal$ThreadLocalMap -java.lang.ThreadLocal$ThreadLocalMap$Entry -java.lang.Throwable -java.lang.Throwable$PrintStreamOrWriter -java.lang.Throwable$SentinelHolder -java.lang.Throwable$WrappedPrintStream -java.lang.Throwable$WrappedPrintWriter -java.lang.TypeNotPresentException -java.lang.UNIXProcess -java.lang.UnsatisfiedLinkError -java.lang.UnsupportedOperationException -java.lang.VMClassLoader -java.lang.VerifyError -java.lang.VirtualMachineError -java.lang.Void -java.lang.annotation.Annotation -java.lang.annotation.AnnotationTypeMismatchException -java.lang.annotation.IncompleteAnnotationException -java.lang.annotation.Inherited -java.lang.annotation.Retention -java.lang.annotation.Target -java.lang.invoke.CallSite -java.lang.invoke.ConstantCallSite -java.lang.invoke.MethodHandle -java.lang.invoke.MethodHandleImpl -java.lang.invoke.MethodHandleImpl$HandleInfo -java.lang.invoke.MethodHandleInfo -java.lang.invoke.MethodHandleStatics -java.lang.invoke.MethodHandles -java.lang.invoke.MethodHandles$Lookup -java.lang.invoke.MethodType -java.lang.invoke.MethodType$ConcurrentWeakInternSet -java.lang.invoke.MethodType$ConcurrentWeakInternSet$WeakEntry -java.lang.invoke.MethodTypeForm -java.lang.invoke.Transformers$BindTo -java.lang.invoke.Transformers$Collector -java.lang.invoke.Transformers$Construct -java.lang.invoke.Transformers$Spreader -java.lang.invoke.Transformers$Transformer -java.lang.invoke.Transformers$VarargsCollector -java.lang.invoke.WrongMethodTypeException -java.lang.ref.FinalizerReference -java.lang.ref.FinalizerReference$Sentinel -java.lang.ref.PhantomReference -java.lang.ref.Reference -java.lang.ref.ReferenceQueue -java.lang.ref.SoftReference -java.lang.ref.WeakReference -java.lang.reflect.AccessibleObject -java.lang.reflect.AnnotatedElement -java.lang.reflect.Array -java.lang.reflect.Constructor -java.lang.reflect.Executable -java.lang.reflect.Executable$GenericInfo -java.lang.reflect.Field -java.lang.reflect.GenericArrayType -java.lang.reflect.GenericDeclaration -java.lang.reflect.InvocationHandler -java.lang.reflect.InvocationTargetException -java.lang.reflect.MalformedParametersException -java.lang.reflect.Member -java.lang.reflect.Method -java.lang.reflect.Method$1 -java.lang.reflect.Modifier -java.lang.reflect.Parameter -java.lang.reflect.ParameterizedType -java.lang.reflect.Proxy -java.lang.reflect.Proxy$1 -java.lang.reflect.Proxy$Key1 -java.lang.reflect.Proxy$Key2 -java.lang.reflect.Proxy$KeyFactory -java.lang.reflect.Proxy$KeyX -java.lang.reflect.Proxy$ProxyClassFactory -java.lang.reflect.Type -java.lang.reflect.TypeVariable -java.lang.reflect.UndeclaredThrowableException -java.lang.reflect.WeakCache -java.lang.reflect.WeakCache$CacheKey -java.lang.reflect.WeakCache$CacheValue -java.lang.reflect.WeakCache$Factory -java.lang.reflect.WeakCache$LookupValue -java.lang.reflect.WeakCache$Value -java.lang.reflect.WildcardType -java.math.BigDecimal -java.math.BigInt -java.math.BigInteger -java.math.Conversion -java.math.Division -java.math.MathContext -java.math.Multiplication -java.math.NativeBN -java.math.RoundingMode -java.net.AbstractPlainDatagramSocketImpl -java.net.AbstractPlainSocketImpl -java.net.AddressCache -java.net.AddressCache$AddressCacheEntry -java.net.AddressCache$AddressCacheKey -java.net.ConnectException -java.net.CookieHandler -java.net.CookieManager -java.net.CookiePolicy -java.net.CookiePolicy$1 -java.net.CookiePolicy$2 -java.net.CookiePolicy$3 -java.net.CookieStore -java.net.DatagramPacket -java.net.DatagramSocket -java.net.DatagramSocket$1 -java.net.DatagramSocketImpl -java.net.DefaultDatagramSocketImplFactory -java.net.DefaultFileNameMap -java.net.DefaultInterface -java.net.FileNameMap -java.net.HttpURLConnection -java.net.IDN -java.net.InMemoryCookieStore -java.net.Inet4Address -java.net.Inet6Address -java.net.Inet6Address$Inet6AddressHolder -java.net.Inet6AddressImpl -java.net.InetAddress -java.net.InetAddress$1 -java.net.InetAddress$InetAddressHolder -java.net.InetAddressImpl -java.net.InetSocketAddress -java.net.InetSocketAddress$InetSocketAddressHolder -java.net.InterfaceAddress -java.net.JarURLConnection -java.net.MalformedURLException -java.net.MulticastSocket -java.net.NetworkInterface -java.net.NetworkInterface$1checkedAddresses -java.net.NoRouteToHostException -java.net.Parts -java.net.PlainDatagramSocketImpl -java.net.PlainSocketImpl -java.net.PortUnreachableException -java.net.ProtocolException -java.net.ProtocolFamily -java.net.Proxy -java.net.Proxy$Type -java.net.ProxySelector -java.net.ResponseCache -java.net.ServerSocket -java.net.Socket -java.net.Socket$1 -java.net.Socket$2 -java.net.Socket$3 -java.net.SocketAddress -java.net.SocketException -java.net.SocketImpl -java.net.SocketInputStream -java.net.SocketOptions -java.net.SocketOutputStream -java.net.SocketTimeoutException -java.net.SocksConsts -java.net.SocksSocketImpl -java.net.StandardProtocolFamily -java.net.URI -java.net.URI$Parser -java.net.URISyntaxException -java.net.URL -java.net.URLConnection -java.net.URLDecoder -java.net.URLEncoder -java.net.URLStreamHandler -java.net.URLStreamHandlerFactory -java.net.UnknownHostException -java.net.UnknownServiceException -java.nio.Bits -java.nio.Buffer -java.nio.BufferOverflowException -java.nio.BufferUnderflowException -java.nio.ByteBuffer -java.nio.ByteBufferAsCharBuffer -java.nio.ByteBufferAsDoubleBuffer -java.nio.ByteBufferAsFloatBuffer -java.nio.ByteBufferAsIntBuffer -java.nio.ByteBufferAsLongBuffer -java.nio.ByteBufferAsShortBuffer -java.nio.ByteOrder -java.nio.CharBuffer -java.nio.DirectByteBuffer -java.nio.DirectByteBuffer$MemoryRef -java.nio.DoubleBuffer -java.nio.FloatBuffer -java.nio.HeapByteBuffer -java.nio.HeapCharBuffer -java.nio.IntBuffer -java.nio.InvalidMarkException -java.nio.LongBuffer -java.nio.MappedByteBuffer -java.nio.NIOAccess -java.nio.NioUtils -java.nio.ReadOnlyBufferException -java.nio.ShortBuffer -java.nio.StringCharBuffer -java.nio.channels.AsynchronousCloseException -java.nio.channels.ByteChannel -java.nio.channels.CancelledKeyException -java.nio.channels.Channel -java.nio.channels.Channels -java.nio.channels.Channels$1 -java.nio.channels.ClosedByInterruptException -java.nio.channels.ClosedChannelException -java.nio.channels.DatagramChannel -java.nio.channels.FileChannel -java.nio.channels.FileChannel$MapMode -java.nio.channels.FileLock -java.nio.channels.GatheringByteChannel -java.nio.channels.InterruptibleChannel -java.nio.channels.MulticastChannel -java.nio.channels.NetworkChannel -java.nio.channels.NonWritableChannelException -java.nio.channels.OverlappingFileLockException -java.nio.channels.ReadableByteChannel -java.nio.channels.ScatteringByteChannel -java.nio.channels.SeekableByteChannel -java.nio.channels.SelectableChannel -java.nio.channels.SelectionKey -java.nio.channels.Selector -java.nio.channels.ServerSocketChannel -java.nio.channels.SocketChannel -java.nio.channels.WritableByteChannel -java.nio.channels.spi.AbstractInterruptibleChannel -java.nio.channels.spi.AbstractInterruptibleChannel$1 -java.nio.channels.spi.AbstractSelectableChannel -java.nio.channels.spi.AbstractSelectionKey -java.nio.channels.spi.AbstractSelector -java.nio.channels.spi.AbstractSelector$1 -java.nio.channels.spi.SelectorProvider -java.nio.channels.spi.SelectorProvider$1 -java.nio.charset.CharacterCodingException -java.nio.charset.Charset -java.nio.charset.CharsetDecoder -java.nio.charset.CharsetDecoderICU -java.nio.charset.CharsetEncoder -java.nio.charset.CharsetEncoderICU -java.nio.charset.CharsetICU -java.nio.charset.CoderResult -java.nio.charset.CoderResult$1 -java.nio.charset.CoderResult$2 -java.nio.charset.CoderResult$Cache -java.nio.charset.CodingErrorAction -java.nio.charset.IllegalCharsetNameException -java.nio.charset.StandardCharsets -java.nio.charset.UnsupportedCharsetException -java.nio.file.AccessMode -java.nio.file.CopyOption -java.nio.file.FileAlreadyExistsException -java.nio.file.FileSystem -java.nio.file.FileSystemException -java.nio.file.FileSystems -java.nio.file.FileSystems$DefaultFileSystemHolder -java.nio.file.FileSystems$DefaultFileSystemHolder$1 -java.nio.file.Files -java.nio.file.LinkOption -java.nio.file.NoSuchFileException -java.nio.file.OpenOption -java.nio.file.Path -java.nio.file.Paths -java.nio.file.StandardOpenOption -java.nio.file.Watchable -java.nio.file.attribute.AttributeView -java.nio.file.attribute.BasicFileAttributeView -java.nio.file.attribute.BasicFileAttributes -java.nio.file.attribute.FileAttribute -java.nio.file.attribute.FileAttributeView -java.nio.file.attribute.PosixFileAttributes -java.nio.file.spi.FileSystemProvider -java.security.AccessControlContext -java.security.AccessControlException -java.security.AccessController -java.security.AlgorithmConstraints -java.security.AlgorithmParameters -java.security.AlgorithmParametersSpi -java.security.BasicPermission -java.security.CodeSigner -java.security.CryptoPrimitive -java.security.DigestException -java.security.GeneralSecurityException -java.security.Guard -java.security.InvalidAlgorithmParameterException -java.security.InvalidKeyException -java.security.InvalidParameterException -java.security.Key -java.security.KeyException -java.security.KeyFactory -java.security.KeyFactorySpi -java.security.KeyManagementException -java.security.KeyPair -java.security.KeyPairGenerator -java.security.KeyPairGeneratorSpi -java.security.KeyStore -java.security.KeyStore$1 -java.security.KeyStoreException -java.security.KeyStoreSpi -java.security.MessageDigest -java.security.MessageDigest$Delegate -java.security.MessageDigestSpi -java.security.NoSuchAlgorithmException -java.security.NoSuchProviderException -java.security.Permission -java.security.PermissionCollection -java.security.Permissions -java.security.Principal -java.security.PrivateKey -java.security.PrivilegedAction -java.security.PrivilegedActionException -java.security.PrivilegedExceptionAction -java.security.ProtectionDomain -java.security.Provider -java.security.Provider$EngineDescription -java.security.Provider$Service -java.security.Provider$ServiceKey -java.security.Provider$UString -java.security.PublicKey -java.security.SecureRandom -java.security.SecureRandomSpi -java.security.Security -java.security.Signature -java.security.Signature$Delegate -java.security.SignatureException -java.security.SignatureSpi -java.security.UnrecoverableEntryException -java.security.UnrecoverableKeyException -java.security.cert.CRL -java.security.cert.CRLException -java.security.cert.CRLReason -java.security.cert.CertPath -java.security.cert.CertPathBuilderException -java.security.cert.CertPathChecker -java.security.cert.CertPathHelperImpl -java.security.cert.CertPathParameters -java.security.cert.CertPathValidator -java.security.cert.CertPathValidatorException -java.security.cert.CertPathValidatorResult -java.security.cert.CertPathValidatorSpi -java.security.cert.CertSelector -java.security.cert.CertStore -java.security.cert.CertStoreException -java.security.cert.CertStoreParameters -java.security.cert.CertStoreSpi -java.security.cert.Certificate -java.security.cert.CertificateEncodingException -java.security.cert.CertificateException -java.security.cert.CertificateExpiredException -java.security.cert.CertificateFactory -java.security.cert.CertificateFactorySpi -java.security.cert.CertificateNotYetValidException -java.security.cert.CertificateParsingException -java.security.cert.CollectionCertStoreParameters -java.security.cert.Extension -java.security.cert.PKIXCertPathChecker -java.security.cert.PKIXCertPathValidatorResult -java.security.cert.PKIXParameters -java.security.cert.PKIXRevocationChecker -java.security.cert.PKIXRevocationChecker$Option -java.security.cert.PolicyNode -java.security.cert.PolicyQualifierInfo -java.security.cert.TrustAnchor -java.security.cert.X509CertSelector -java.security.cert.X509Certificate -java.security.cert.X509Extension -java.security.interfaces.DSAKey -java.security.interfaces.DSAPublicKey -java.security.interfaces.ECKey -java.security.interfaces.ECPrivateKey -java.security.interfaces.ECPublicKey -java.security.interfaces.RSAKey -java.security.interfaces.RSAPrivateKey -java.security.interfaces.RSAPublicKey -java.security.spec.AlgorithmParameterSpec -java.security.spec.ECField -java.security.spec.ECFieldFp -java.security.spec.ECGenParameterSpec -java.security.spec.ECParameterSpec -java.security.spec.ECPoint -java.security.spec.ECPrivateKeySpec -java.security.spec.ECPublicKeySpec -java.security.spec.EllipticCurve -java.security.spec.EncodedKeySpec -java.security.spec.InvalidKeySpecException -java.security.spec.InvalidParameterSpecException -java.security.spec.KeySpec -java.security.spec.MGF1ParameterSpec -java.security.spec.PKCS8EncodedKeySpec -java.security.spec.RSAPrivateCrtKeySpec -java.security.spec.RSAPrivateKeySpec -java.security.spec.RSAPublicKeySpec -java.security.spec.X509EncodedKeySpec -java.sql.Timestamp -java.text.AttributedCharacterIterator$Attribute -java.text.Bidi -java.text.BreakIterator -java.text.CalendarBuilder -java.text.CharacterIterator -java.text.CollationKey -java.text.Collator -java.text.DateFormat -java.text.DateFormat$Field -java.text.DateFormatSymbols -java.text.DecimalFormat -java.text.DecimalFormatSymbols -java.text.DontCareFieldPosition -java.text.DontCareFieldPosition$1 -java.text.FieldPosition -java.text.FieldPosition$Delegate -java.text.Format -java.text.Format$Field -java.text.Format$FieldDelegate -java.text.IcuIteratorWrapper -java.text.MessageFormat -java.text.MessageFormat$Field -java.text.Normalizer -java.text.Normalizer$Form -java.text.NumberFormat -java.text.ParseException -java.text.ParsePosition -java.text.RuleBasedCollator -java.text.SimpleDateFormat -java.text.StringCharacterIterator -java.time.DateTimeException -java.util.-$Lambda$4EqhxufgNKat19m0CB0-toH_lzo -java.util.-$Lambda$4EqhxufgNKat19m0CB0-toH_lzo$1 -java.util.-$Lambda$4EqhxufgNKat19m0CB0-toH_lzo$2 -java.util.-$Lambda$4EqhxufgNKat19m0CB0-toH_lzo$3 -java.util.-$Lambda$4EqhxufgNKat19m0CB0-toH_lzo$4 -java.util.-$Lambda$4EqhxufgNKat19m0CB0-toH_lzo$5 -java.util.-$Lambda$aUGKT4ItCOku5-JSG-x8Aqj2pJw -java.util.-$Lambda$aUGKT4ItCOku5-JSG-x8Aqj2pJw$1 -java.util.-$Lambda$aUGKT4ItCOku5-JSG-x8Aqj2pJw$2 -java.util.-$Lambda$aUGKT4ItCOku5-JSG-x8Aqj2pJw$3 -java.util.AbstractCollection -java.util.AbstractList -java.util.AbstractList$Itr -java.util.AbstractList$ListItr -java.util.AbstractMap -java.util.AbstractMap$1 -java.util.AbstractMap$2 -java.util.AbstractMap$2$1 -java.util.AbstractMap$SimpleEntry -java.util.AbstractMap$SimpleImmutableEntry -java.util.AbstractQueue -java.util.AbstractSequentialList -java.util.AbstractSet -java.util.ArrayDeque -java.util.ArrayDeque$DeqIterator -java.util.ArrayDeque$DescendingIterator -java.util.ArrayList -java.util.ArrayList$ArrayListSpliterator -java.util.ArrayList$Itr -java.util.ArrayList$ListItr -java.util.ArrayList$SubList -java.util.ArrayList$SubList$1 -java.util.ArrayPrefixHelpers$CumulateTask -java.util.ArrayPrefixHelpers$DoubleCumulateTask -java.util.ArrayPrefixHelpers$IntCumulateTask -java.util.ArrayPrefixHelpers$LongCumulateTask -java.util.Arrays -java.util.Arrays$ArrayList -java.util.Arrays$NaturalOrder -java.util.ArraysParallelSortHelpers$FJByte$Sorter -java.util.ArraysParallelSortHelpers$FJChar$Sorter -java.util.ArraysParallelSortHelpers$FJDouble$Sorter -java.util.ArraysParallelSortHelpers$FJFloat$Sorter -java.util.ArraysParallelSortHelpers$FJInt$Sorter -java.util.ArraysParallelSortHelpers$FJLong$Sorter -java.util.ArraysParallelSortHelpers$FJObject$Sorter -java.util.ArraysParallelSortHelpers$FJShort$Sorter -java.util.Base64 -java.util.Base64$Decoder -java.util.Base64$Encoder -java.util.BitSet -java.util.Calendar -java.util.Collection -java.util.Collections -java.util.Collections$1 -java.util.Collections$2 -java.util.Collections$3 -java.util.Collections$AsLIFOQueue -java.util.Collections$CheckedCollection -java.util.Collections$CheckedList -java.util.Collections$CheckedMap -java.util.Collections$CheckedNavigableMap -java.util.Collections$CheckedNavigableSet -java.util.Collections$CheckedQueue -java.util.Collections$CheckedRandomAccessList -java.util.Collections$CheckedSet -java.util.Collections$CheckedSortedMap -java.util.Collections$CheckedSortedSet -java.util.Collections$CopiesList -java.util.Collections$EmptyEnumeration -java.util.Collections$EmptyIterator -java.util.Collections$EmptyList -java.util.Collections$EmptyListIterator -java.util.Collections$EmptyMap -java.util.Collections$EmptySet -java.util.Collections$ReverseComparator -java.util.Collections$ReverseComparator2 -java.util.Collections$SetFromMap -java.util.Collections$SingletonList -java.util.Collections$SingletonMap -java.util.Collections$SingletonSet -java.util.Collections$SynchronizedCollection -java.util.Collections$SynchronizedList -java.util.Collections$SynchronizedMap -java.util.Collections$SynchronizedNavigableMap -java.util.Collections$SynchronizedNavigableSet -java.util.Collections$SynchronizedRandomAccessList -java.util.Collections$SynchronizedSet -java.util.Collections$SynchronizedSortedMap -java.util.Collections$SynchronizedSortedSet -java.util.Collections$UnmodifiableCollection -java.util.Collections$UnmodifiableCollection$1 -java.util.Collections$UnmodifiableList -java.util.Collections$UnmodifiableList$1 -java.util.Collections$UnmodifiableMap -java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet -java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$1 -java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableEntry -java.util.Collections$UnmodifiableNavigableMap -java.util.Collections$UnmodifiableNavigableMap$EmptyNavigableMap -java.util.Collections$UnmodifiableNavigableSet -java.util.Collections$UnmodifiableNavigableSet$EmptyNavigableSet -java.util.Collections$UnmodifiableRandomAccessList -java.util.Collections$UnmodifiableSet -java.util.Collections$UnmodifiableSortedMap -java.util.Collections$UnmodifiableSortedSet -java.util.ComparableTimSort -java.util.Comparator -java.util.Comparators$NaturalOrderComparator -java.util.Comparators$NullComparator -java.util.ConcurrentModificationException -java.util.Currency -java.util.Date -java.util.Deque -java.util.Dictionary -java.util.DualPivotQuicksort -java.util.EmptyStackException -java.util.EnumMap -java.util.EnumMap$1 -java.util.EnumMap$EntryIterator -java.util.EnumMap$EntryIterator$Entry -java.util.EnumMap$EntrySet -java.util.EnumMap$EnumMapIterator -java.util.EnumMap$KeyIterator -java.util.EnumMap$KeySet -java.util.EnumMap$ValueIterator -java.util.EnumMap$Values -java.util.EnumSet -java.util.EnumSet$SerializationProxy -java.util.Enumeration -java.util.EventListener -java.util.FormatFlagsConversionMismatchException -java.util.Formattable -java.util.Formatter -java.util.Formatter$Conversion -java.util.Formatter$DateTime -java.util.Formatter$FixedString -java.util.Formatter$Flags -java.util.Formatter$FormatSpecifier -java.util.Formatter$FormatSpecifierParser -java.util.Formatter$FormatString -java.util.FormatterClosedException -java.util.GregorianCalendar -java.util.HashMap -java.util.HashMap$EntryIterator -java.util.HashMap$EntrySet -java.util.HashMap$HashIterator -java.util.HashMap$KeyIterator -java.util.HashMap$KeySet -java.util.HashMap$Node -java.util.HashMap$TreeNode -java.util.HashMap$ValueIterator -java.util.HashMap$Values -java.util.HashSet -java.util.Hashtable -java.util.Hashtable$EntrySet -java.util.Hashtable$Enumerator -java.util.Hashtable$HashtableEntry -java.util.Hashtable$KeySet -java.util.Hashtable$ValueCollection -java.util.IdentityHashMap -java.util.IdentityHashMap$EntryIterator -java.util.IdentityHashMap$EntryIterator$Entry -java.util.IdentityHashMap$EntrySet -java.util.IdentityHashMap$IdentityHashMapIterator -java.util.IdentityHashMap$KeyIterator -java.util.IdentityHashMap$KeySet -java.util.IdentityHashMap$ValueIterator -java.util.IdentityHashMap$Values -java.util.IllegalFormatException -java.util.IllformedLocaleException -java.util.Iterator -java.util.JumboEnumSet -java.util.JumboEnumSet$EnumSetIterator -java.util.LinkedHashMap -java.util.LinkedHashMap$LinkedEntryIterator -java.util.LinkedHashMap$LinkedEntrySet -java.util.LinkedHashMap$LinkedHashIterator -java.util.LinkedHashMap$LinkedHashMapEntry -java.util.LinkedHashMap$LinkedKeyIterator -java.util.LinkedHashMap$LinkedKeySet -java.util.LinkedHashMap$LinkedValueIterator -java.util.LinkedHashMap$LinkedValues -java.util.LinkedHashSet -java.util.LinkedList -java.util.LinkedList$DescendingIterator -java.util.LinkedList$ListItr -java.util.LinkedList$Node -java.util.List -java.util.ListIterator -java.util.Locale -java.util.Locale$Builder -java.util.Locale$Cache -java.util.Locale$Category -java.util.Locale$FilteringMode -java.util.Locale$LanguageRange -java.util.Locale$LocaleKey -java.util.Locale$NoImagePreloadHolder -java.util.Map -java.util.Map$Entry -java.util.MissingFormatArgumentException -java.util.MissingResourceException -java.util.NavigableMap -java.util.NavigableSet -java.util.NoSuchElementException -java.util.Objects -java.util.Observable -java.util.Observer -java.util.Optional -java.util.PrimitiveIterator -java.util.PrimitiveIterator$OfInt -java.util.PriorityQueue -java.util.PriorityQueue$Itr -java.util.Properties -java.util.Properties$LineReader -java.util.PropertyResourceBundle -java.util.Queue -java.util.Random -java.util.RandomAccess -java.util.RandomAccessSubList -java.util.RegularEnumSet -java.util.RegularEnumSet$EnumSetIterator -java.util.ResourceBundle -java.util.ResourceBundle$1 -java.util.ResourceBundle$BundleReference -java.util.ResourceBundle$CacheKey -java.util.ResourceBundle$CacheKeyReference -java.util.ResourceBundle$Control -java.util.ResourceBundle$Control$1 -java.util.ResourceBundle$Control$CandidateListCache -java.util.ResourceBundle$LoaderReference -java.util.Scanner -java.util.Scanner$1 -java.util.ServiceConfigurationError -java.util.ServiceLoader -java.util.ServiceLoader$1 -java.util.ServiceLoader$LazyIterator -java.util.Set -java.util.SimpleTimeZone -java.util.SortedMap -java.util.SortedSet -java.util.Spliterator -java.util.Spliterator$OfDouble -java.util.Spliterator$OfInt -java.util.Spliterator$OfLong -java.util.Spliterator$OfPrimitive -java.util.Spliterators -java.util.Spliterators$EmptySpliterator -java.util.Spliterators$EmptySpliterator$OfDouble -java.util.Spliterators$EmptySpliterator$OfInt -java.util.Spliterators$EmptySpliterator$OfLong -java.util.Spliterators$EmptySpliterator$OfRef -java.util.Spliterators$IntArraySpliterator -java.util.Spliterators$IteratorSpliterator -java.util.Stack -java.util.StringJoiner -java.util.StringTokenizer -java.util.SubList -java.util.SubList$1 -java.util.TaskQueue -java.util.TimSort -java.util.TimeZone -java.util.Timer -java.util.Timer$1 -java.util.TimerTask -java.util.TimerThread -java.util.TreeMap -java.util.TreeMap$AscendingSubMap -java.util.TreeMap$AscendingSubMap$AscendingEntrySetView -java.util.TreeMap$EntryIterator -java.util.TreeMap$EntrySet -java.util.TreeMap$KeyIterator -java.util.TreeMap$KeySet -java.util.TreeMap$NavigableSubMap -java.util.TreeMap$NavigableSubMap$EntrySetView -java.util.TreeMap$NavigableSubMap$SubMapEntryIterator -java.util.TreeMap$NavigableSubMap$SubMapIterator -java.util.TreeMap$NavigableSubMap$SubMapKeyIterator -java.util.TreeMap$PrivateEntryIterator -java.util.TreeMap$TreeMapEntry -java.util.TreeMap$ValueIterator -java.util.TreeMap$Values -java.util.TreeSet -java.util.UUID -java.util.UUID$Holder -java.util.UnknownFormatConversionException -java.util.Vector -java.util.Vector$1 -java.util.Vector$Itr -java.util.WeakHashMap -java.util.WeakHashMap$Entry -java.util.WeakHashMap$EntrySet -java.util.WeakHashMap$HashIterator -java.util.WeakHashMap$KeyIterator -java.util.WeakHashMap$KeySet -java.util.WeakHashMap$ValueIterator -java.util.WeakHashMap$Values -java.util.concurrent.-$Lambda$xR9BLpu6SifNikvFgr4lEiECBsk -java.util.concurrent.AbstractExecutorService -java.util.concurrent.ArrayBlockingQueue -java.util.concurrent.BlockingDeque -java.util.concurrent.BlockingQueue -java.util.concurrent.Callable -java.util.concurrent.CancellationException -java.util.concurrent.CompletableFuture -java.util.concurrent.CompletableFuture$AltResult -java.util.concurrent.CompletableFuture$AsynchronousCompletionTask -java.util.concurrent.CompletableFuture$Completion -java.util.concurrent.CompletionStage -java.util.concurrent.ConcurrentHashMap -java.util.concurrent.ConcurrentHashMap$BaseIterator -java.util.concurrent.ConcurrentHashMap$BulkTask -java.util.concurrent.ConcurrentHashMap$CollectionView -java.util.concurrent.ConcurrentHashMap$CounterCell -java.util.concurrent.ConcurrentHashMap$EntryIterator -java.util.concurrent.ConcurrentHashMap$EntrySetView -java.util.concurrent.ConcurrentHashMap$ForEachEntryTask -java.util.concurrent.ConcurrentHashMap$ForEachKeyTask -java.util.concurrent.ConcurrentHashMap$ForEachMappingTask -java.util.concurrent.ConcurrentHashMap$ForEachTransformedEntryTask -java.util.concurrent.ConcurrentHashMap$ForEachTransformedKeyTask -java.util.concurrent.ConcurrentHashMap$ForEachTransformedMappingTask -java.util.concurrent.ConcurrentHashMap$ForEachTransformedValueTask -java.util.concurrent.ConcurrentHashMap$ForEachValueTask -java.util.concurrent.ConcurrentHashMap$ForwardingNode -java.util.concurrent.ConcurrentHashMap$KeyIterator -java.util.concurrent.ConcurrentHashMap$KeySetView -java.util.concurrent.ConcurrentHashMap$KeySpliterator -java.util.concurrent.ConcurrentHashMap$MapEntry -java.util.concurrent.ConcurrentHashMap$MapReduceEntriesTask -java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToDoubleTask -java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToIntTask -java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToLongTask -java.util.concurrent.ConcurrentHashMap$MapReduceKeysTask -java.util.concurrent.ConcurrentHashMap$MapReduceKeysToDoubleTask -java.util.concurrent.ConcurrentHashMap$MapReduceKeysToIntTask -java.util.concurrent.ConcurrentHashMap$MapReduceKeysToLongTask -java.util.concurrent.ConcurrentHashMap$MapReduceMappingsTask -java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToDoubleTask -java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToIntTask -java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToLongTask -java.util.concurrent.ConcurrentHashMap$MapReduceValuesTask -java.util.concurrent.ConcurrentHashMap$MapReduceValuesToDoubleTask -java.util.concurrent.ConcurrentHashMap$MapReduceValuesToIntTask -java.util.concurrent.ConcurrentHashMap$MapReduceValuesToLongTask -java.util.concurrent.ConcurrentHashMap$Node -java.util.concurrent.ConcurrentHashMap$ReduceEntriesTask -java.util.concurrent.ConcurrentHashMap$ReduceKeysTask -java.util.concurrent.ConcurrentHashMap$ReduceValuesTask -java.util.concurrent.ConcurrentHashMap$ReservationNode -java.util.concurrent.ConcurrentHashMap$SearchEntriesTask -java.util.concurrent.ConcurrentHashMap$SearchKeysTask -java.util.concurrent.ConcurrentHashMap$SearchMappingsTask -java.util.concurrent.ConcurrentHashMap$SearchValuesTask -java.util.concurrent.ConcurrentHashMap$Segment -java.util.concurrent.ConcurrentHashMap$Traverser -java.util.concurrent.ConcurrentHashMap$TreeBin -java.util.concurrent.ConcurrentHashMap$TreeNode -java.util.concurrent.ConcurrentHashMap$ValueIterator -java.util.concurrent.ConcurrentHashMap$ValuesView -java.util.concurrent.ConcurrentLinkedDeque -java.util.concurrent.ConcurrentLinkedDeque$Node -java.util.concurrent.ConcurrentLinkedQueue -java.util.concurrent.ConcurrentLinkedQueue$Itr -java.util.concurrent.ConcurrentLinkedQueue$Node -java.util.concurrent.ConcurrentMap -java.util.concurrent.ConcurrentNavigableMap -java.util.concurrent.ConcurrentSkipListMap -java.util.concurrent.ConcurrentSkipListMap$HeadIndex -java.util.concurrent.ConcurrentSkipListMap$Index -java.util.concurrent.ConcurrentSkipListMap$Iter -java.util.concurrent.ConcurrentSkipListMap$Node -java.util.concurrent.ConcurrentSkipListMap$ValueIterator -java.util.concurrent.ConcurrentSkipListMap$Values -java.util.concurrent.CopyOnWriteArrayList -java.util.concurrent.CopyOnWriteArrayList$COWIterator -java.util.concurrent.CopyOnWriteArraySet -java.util.concurrent.CountDownLatch -java.util.concurrent.CountDownLatch$Sync -java.util.concurrent.CountedCompleter -java.util.concurrent.DelayQueue -java.util.concurrent.Delayed -java.util.concurrent.ExecutionException -java.util.concurrent.Executor -java.util.concurrent.ExecutorService -java.util.concurrent.Executors -java.util.concurrent.Executors$DefaultThreadFactory -java.util.concurrent.Executors$DelegatedExecutorService -java.util.concurrent.Executors$DelegatedScheduledExecutorService -java.util.concurrent.Executors$FinalizableDelegatedExecutorService -java.util.concurrent.Executors$RunnableAdapter -java.util.concurrent.ForkJoinPool -java.util.concurrent.ForkJoinPool$1 -java.util.concurrent.ForkJoinPool$DefaultForkJoinWorkerThreadFactory -java.util.concurrent.ForkJoinPool$ForkJoinWorkerThreadFactory -java.util.concurrent.ForkJoinTask -java.util.concurrent.ForkJoinTask$ExceptionNode -java.util.concurrent.Future -java.util.concurrent.FutureTask -java.util.concurrent.FutureTask$WaitNode -java.util.concurrent.LinkedBlockingDeque -java.util.concurrent.LinkedBlockingDeque$AbstractItr -java.util.concurrent.LinkedBlockingDeque$Itr -java.util.concurrent.LinkedBlockingDeque$Node -java.util.concurrent.LinkedBlockingQueue -java.util.concurrent.LinkedBlockingQueue$Itr -java.util.concurrent.LinkedBlockingQueue$Node -java.util.concurrent.PriorityBlockingQueue -java.util.concurrent.RejectedExecutionException -java.util.concurrent.RejectedExecutionHandler -java.util.concurrent.RunnableFuture -java.util.concurrent.RunnableScheduledFuture -java.util.concurrent.ScheduledExecutorService -java.util.concurrent.ScheduledFuture -java.util.concurrent.ScheduledThreadPoolExecutor -java.util.concurrent.ScheduledThreadPoolExecutor$DelayedWorkQueue -java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask -java.util.concurrent.Semaphore -java.util.concurrent.Semaphore$NonfairSync -java.util.concurrent.Semaphore$Sync -java.util.concurrent.SynchronousQueue -java.util.concurrent.SynchronousQueue$TransferQueue -java.util.concurrent.SynchronousQueue$TransferStack -java.util.concurrent.SynchronousQueue$TransferStack$SNode -java.util.concurrent.SynchronousQueue$Transferer -java.util.concurrent.ThreadFactory -java.util.concurrent.ThreadLocalRandom -java.util.concurrent.ThreadLocalRandom$1 -java.util.concurrent.ThreadPoolExecutor -java.util.concurrent.ThreadPoolExecutor$AbortPolicy -java.util.concurrent.ThreadPoolExecutor$DiscardOldestPolicy -java.util.concurrent.ThreadPoolExecutor$DiscardPolicy -java.util.concurrent.ThreadPoolExecutor$Worker -java.util.concurrent.TimeUnit -java.util.concurrent.TimeUnit$1 -java.util.concurrent.TimeUnit$2 -java.util.concurrent.TimeUnit$3 -java.util.concurrent.TimeUnit$4 -java.util.concurrent.TimeUnit$5 -java.util.concurrent.TimeUnit$6 -java.util.concurrent.TimeUnit$7 -java.util.concurrent.TimeoutException -java.util.concurrent.atomic.AtomicBoolean -java.util.concurrent.atomic.AtomicInteger -java.util.concurrent.atomic.AtomicIntegerArray -java.util.concurrent.atomic.AtomicIntegerFieldUpdater -java.util.concurrent.atomic.AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl -java.util.concurrent.atomic.AtomicIntegerFieldUpdater$AtomicIntegerFieldUpdaterImpl$1 -java.util.concurrent.atomic.AtomicLong -java.util.concurrent.atomic.AtomicLongArray -java.util.concurrent.atomic.AtomicReference -java.util.concurrent.atomic.AtomicReferenceArray -java.util.concurrent.atomic.AtomicReferenceFieldUpdater -java.util.concurrent.atomic.AtomicReferenceFieldUpdater$AtomicReferenceFieldUpdaterImpl -java.util.concurrent.locks.AbstractOwnableSynchronizer -java.util.concurrent.locks.AbstractQueuedSynchronizer -java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject -java.util.concurrent.locks.AbstractQueuedSynchronizer$Node -java.util.concurrent.locks.Condition -java.util.concurrent.locks.Lock -java.util.concurrent.locks.LockSupport -java.util.concurrent.locks.ReadWriteLock -java.util.concurrent.locks.ReentrantLock -java.util.concurrent.locks.ReentrantLock$FairSync -java.util.concurrent.locks.ReentrantLock$NonfairSync -java.util.concurrent.locks.ReentrantLock$Sync -java.util.concurrent.locks.ReentrantReadWriteLock -java.util.concurrent.locks.ReentrantReadWriteLock$FairSync -java.util.concurrent.locks.ReentrantReadWriteLock$NonfairSync -java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock -java.util.concurrent.locks.ReentrantReadWriteLock$Sync -java.util.concurrent.locks.ReentrantReadWriteLock$Sync$HoldCounter -java.util.concurrent.locks.ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter -java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock -java.util.function.-$Lambda$1MZdIZ-DL_fjy9l0o8IMJk57T2g -java.util.function.-$Lambda$VGDeaUHZQIZywZW2ttlyhwk3Cmk -java.util.function.-$Lambda$VGDeaUHZQIZywZW2ttlyhwk3Cmk$1 -java.util.function.BiConsumer -java.util.function.BiFunction -java.util.function.BinaryOperator -java.util.function.Consumer -java.util.function.DoubleBinaryOperator -java.util.function.DoubleUnaryOperator -java.util.function.Function -java.util.function.IntBinaryOperator -java.util.function.IntConsumer -java.util.function.IntFunction -java.util.function.IntToDoubleFunction -java.util.function.IntToLongFunction -java.util.function.IntUnaryOperator -java.util.function.LongBinaryOperator -java.util.function.LongConsumer -java.util.function.LongUnaryOperator -java.util.function.Predicate -java.util.function.Supplier -java.util.function.ToDoubleBiFunction -java.util.function.ToDoubleFunction -java.util.function.ToIntBiFunction -java.util.function.ToIntFunction -java.util.function.ToLongBiFunction -java.util.function.ToLongFunction -java.util.function.UnaryOperator -java.util.jar.Attributes -java.util.jar.Attributes$Name -java.util.jar.JarEntry -java.util.jar.JarFile -java.util.jar.JarFile$JarEntryIterator -java.util.jar.JarFile$JarFileEntry -java.util.jar.JarVerifier -java.util.jar.JarVerifier$1 -java.util.jar.JarVerifier$VerifierStream -java.util.jar.Manifest -java.util.jar.Manifest$FastInputStream -java.util.logging.ErrorManager -java.util.logging.FileHandler -java.util.logging.FileHandler$InitializationErrorManager -java.util.logging.FileHandler$MeteredStream -java.util.logging.Filter -java.util.logging.Formatter -java.util.logging.Handler -java.util.logging.Level -java.util.logging.Level$KnownLevel -java.util.logging.LogManager -java.util.logging.LogManager$1 -java.util.logging.LogManager$2 -java.util.logging.LogManager$3 -java.util.logging.LogManager$5 -java.util.logging.LogManager$Cleaner -java.util.logging.LogManager$LogNode -java.util.logging.LogManager$LoggerContext -java.util.logging.LogManager$LoggerContext$1 -java.util.logging.LogManager$LoggerWeakRef -java.util.logging.LogManager$RootLogger -java.util.logging.LogManager$SystemLoggerContext -java.util.logging.LogRecord -java.util.logging.Logger -java.util.logging.Logger$1 -java.util.logging.Logger$LoggerBundle -java.util.logging.LoggingPermission -java.util.logging.LoggingProxyImpl -java.util.logging.SimpleFormatter -java.util.logging.StreamHandler -java.util.logging.XMLFormatter -java.util.prefs.AbstractPreferences -java.util.prefs.FileSystemPreferences -java.util.prefs.Preferences -java.util.regex.MatchResult -java.util.regex.Matcher -java.util.regex.Matcher$OffsetBasedMatchResult -java.util.regex.Pattern -java.util.regex.PatternSyntaxException -java.util.stream.-$Lambda$DJvCeprCIGMk0JvfSkTmQUmEYKA$1 -java.util.stream.-$Lambda$QgGTJrv63_zzBbeGjswm_UMqEbo$12 -java.util.stream.-$Lambda$QgGTJrv63_zzBbeGjswm_UMqEbo$5 -java.util.stream.-$Lambda$QgGTJrv63_zzBbeGjswm_UMqEbo$6 -java.util.stream.-$Lambda$RYrQKhHyGc-mMxiERR98xxRAWkA$5 -java.util.stream.-$Lambda$ioGbka_-VkWTFjRjTt8T4zzsxgk$3 -java.util.stream.-$Lambda$ioGbka_-VkWTFjRjTt8T4zzsxgk$7 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$21 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$22 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$26 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$4 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$5 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$51 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$54 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$67 -java.util.stream.-$Lambda$qTstLJg88fs2C3g6LH-R51vCVP0$83 -java.util.stream.AbstractPipeline -java.util.stream.AbstractSpinedBuffer -java.util.stream.BaseStream -java.util.stream.Collector -java.util.stream.Collector$Characteristics -java.util.stream.Collectors -java.util.stream.Collectors$CollectorImpl -java.util.stream.DistinctOps -java.util.stream.DistinctOps$1 -java.util.stream.DistinctOps$1$2 -java.util.stream.DoubleStream -java.util.stream.FindOps -java.util.stream.FindOps$FindOp -java.util.stream.FindOps$FindSink -java.util.stream.FindOps$FindSink$OfRef -java.util.stream.ForEachOps -java.util.stream.ForEachOps$ForEachOp -java.util.stream.ForEachOps$ForEachOp$OfRef -java.util.stream.IntPipeline -java.util.stream.IntPipeline$4 -java.util.stream.IntPipeline$4$1 -java.util.stream.IntPipeline$Head -java.util.stream.IntPipeline$StatelessOp -java.util.stream.IntStream -java.util.stream.LongPipeline -java.util.stream.LongPipeline$StatelessOp -java.util.stream.LongStream -java.util.stream.Node -java.util.stream.Node$Builder -java.util.stream.Node$Builder$OfInt -java.util.stream.Node$OfDouble -java.util.stream.Node$OfInt -java.util.stream.Node$OfLong -java.util.stream.Node$OfPrimitive -java.util.stream.Nodes -java.util.stream.Nodes$EmptyNode -java.util.stream.Nodes$EmptyNode$OfDouble -java.util.stream.Nodes$EmptyNode$OfInt -java.util.stream.Nodes$EmptyNode$OfLong -java.util.stream.Nodes$EmptyNode$OfRef -java.util.stream.Nodes$IntSpinedNodeBuilder -java.util.stream.PipelineHelper -java.util.stream.ReduceOps -java.util.stream.ReduceOps$3 -java.util.stream.ReduceOps$3ReducingSink -java.util.stream.ReduceOps$8 -java.util.stream.ReduceOps$8ReducingSink -java.util.stream.ReduceOps$AccumulatingSink -java.util.stream.ReduceOps$Box -java.util.stream.ReduceOps$ReduceOp -java.util.stream.ReferencePipeline -java.util.stream.ReferencePipeline$2 -java.util.stream.ReferencePipeline$2$1 -java.util.stream.ReferencePipeline$3 -java.util.stream.ReferencePipeline$3$1 -java.util.stream.ReferencePipeline$4 -java.util.stream.ReferencePipeline$4$1 -java.util.stream.ReferencePipeline$5 -java.util.stream.ReferencePipeline$5$1 -java.util.stream.ReferencePipeline$Head -java.util.stream.ReferencePipeline$StatefulOp -java.util.stream.ReferencePipeline$StatelessOp -java.util.stream.Sink -java.util.stream.Sink$ChainedInt -java.util.stream.Sink$ChainedReference -java.util.stream.Sink$OfInt -java.util.stream.Sink$OfLong -java.util.stream.SliceOps -java.util.stream.SliceOps$1 -java.util.stream.SliceOps$1$1 -java.util.stream.SpinedBuffer$OfInt -java.util.stream.SpinedBuffer$OfPrimitive -java.util.stream.Stream -java.util.stream.StreamOpFlag -java.util.stream.StreamOpFlag$MaskBuilder -java.util.stream.StreamOpFlag$Type -java.util.stream.StreamShape -java.util.stream.StreamSpliterators$InfiniteSupplyingSpliterator -java.util.stream.StreamSpliterators$InfiniteSupplyingSpliterator$OfRef -java.util.stream.StreamSupport -java.util.stream.TerminalOp -java.util.stream.TerminalSink -java.util.zip.Adler32 -java.util.zip.CRC32 -java.util.zip.CheckedInputStream -java.util.zip.Checksum -java.util.zip.DataFormatException -java.util.zip.Deflater -java.util.zip.DeflaterOutputStream -java.util.zip.GZIPInputStream -java.util.zip.GZIPInputStream$1 -java.util.zip.GZIPOutputStream -java.util.zip.Inflater -java.util.zip.InflaterInputStream -java.util.zip.ZStreamRef -java.util.zip.ZipCoder -java.util.zip.ZipConstants -java.util.zip.ZipEntry -java.util.zip.ZipException -java.util.zip.ZipFile -java.util.zip.ZipFile$ZipEntryIterator -java.util.zip.ZipFile$ZipFileInflaterInputStream -java.util.zip.ZipFile$ZipFileInputStream -java.util.zip.ZipInputStream -java.util.zip.ZipUtils -javax.crypto.BadPaddingException -javax.crypto.Cipher -javax.crypto.Cipher$CipherSpiAndProvider -javax.crypto.Cipher$InitParams -javax.crypto.Cipher$InitType -javax.crypto.Cipher$NeedToSet -javax.crypto.Cipher$SpiAndProviderUpdater -javax.crypto.Cipher$Transform -javax.crypto.CipherSpi -javax.crypto.IllegalBlockSizeException -javax.crypto.JarVerifier -javax.crypto.JceSecurity -javax.crypto.JceSecurity$1 -javax.crypto.KeyGenerator -javax.crypto.KeyGeneratorSpi -javax.crypto.Mac -javax.crypto.MacSpi -javax.crypto.NoSuchPaddingException -javax.crypto.NullCipher -javax.crypto.SecretKey -javax.crypto.ShortBufferException -javax.crypto.spec.IvParameterSpec -javax.crypto.spec.OAEPParameterSpec -javax.crypto.spec.PBEParameterSpec -javax.crypto.spec.PSource -javax.crypto.spec.PSource$PSpecified -javax.crypto.spec.SecretKeySpec -javax.microedition.khronos.egl.EGL -javax.microedition.khronos.egl.EGL10 -javax.microedition.khronos.egl.EGLConfig -javax.microedition.khronos.egl.EGLContext -javax.microedition.khronos.egl.EGLDisplay -javax.microedition.khronos.egl.EGLSurface -javax.microedition.khronos.opengles.GL -javax.microedition.khronos.opengles.GL10 -javax.microedition.khronos.opengles.GL10Ext -javax.microedition.khronos.opengles.GL11 -javax.microedition.khronos.opengles.GL11Ext -javax.microedition.khronos.opengles.GL11ExtensionPack -javax.net.DefaultSocketFactory -javax.net.ServerSocketFactory -javax.net.SocketFactory -javax.net.ssl.ExtendedSSLSession -javax.net.ssl.HandshakeCompletedListener -javax.net.ssl.HostnameVerifier -javax.net.ssl.HttpsURLConnection -javax.net.ssl.KeyManager -javax.net.ssl.KeyManagerFactory -javax.net.ssl.KeyManagerFactory$1 -javax.net.ssl.KeyManagerFactorySpi -javax.net.ssl.SNIHostName -javax.net.ssl.SNIServerName -javax.net.ssl.SSLContext -javax.net.ssl.SSLContextSpi -javax.net.ssl.SSLEngine -javax.net.ssl.SSLException -javax.net.ssl.SSLParameters -javax.net.ssl.SSLPeerUnverifiedException -javax.net.ssl.SSLProtocolException -javax.net.ssl.SSLServerSocketFactory -javax.net.ssl.SSLSession -javax.net.ssl.SSLSessionContext -javax.net.ssl.SSLSocket -javax.net.ssl.SSLSocketFactory -javax.net.ssl.SSLSocketFactory$1 -javax.net.ssl.TrustManager -javax.net.ssl.TrustManagerFactory -javax.net.ssl.TrustManagerFactory$1 -javax.net.ssl.TrustManagerFactorySpi -javax.net.ssl.X509ExtendedKeyManager -javax.net.ssl.X509ExtendedTrustManager -javax.net.ssl.X509KeyManager -javax.net.ssl.X509TrustManager -javax.security.auth.Destroyable -javax.security.auth.callback.UnsupportedCallbackException -javax.security.auth.x500.X500Principal -javax.security.cert.Certificate -javax.security.cert.CertificateEncodingException -javax.security.cert.CertificateException -javax.security.cert.X509Certificate -javax.sip.SipException -javax.xml.parsers.ParserConfigurationException -javax.xml.parsers.SAXParser -javax.xml.parsers.SAXParserFactory -javax.xml.transform.TransformerConfigurationException -javax.xml.transform.TransformerException -junit.framework.Assert -libcore.icu.CollationKeyICU -libcore.icu.DateIntervalFormat -libcore.icu.DateUtilsBridge -libcore.icu.ICU -libcore.icu.LocaleData -libcore.icu.NativeConverter -libcore.icu.RelativeDateTimeFormatter -libcore.icu.RelativeDateTimeFormatter$FormatterCache -libcore.icu.TimeZoneNames -libcore.icu.TimeZoneNames$1 -libcore.icu.TimeZoneNames$ZoneStringsCache -libcore.internal.StringPool -libcore.io.AsynchronousCloseMonitor -libcore.io.BlockGuardOs -libcore.io.BufferIterator -libcore.io.ClassPathURLStreamHandler -libcore.io.ClassPathURLStreamHandler$ClassPathURLConnection -libcore.io.ClassPathURLStreamHandler$ClassPathURLConnection$1 -libcore.io.DropBox -libcore.io.DropBox$DefaultReporter -libcore.io.DropBox$Reporter -libcore.io.EventLogger -libcore.io.EventLogger$DefaultReporter -libcore.io.EventLogger$Reporter -libcore.io.ForwardingOs -libcore.io.IoBridge -libcore.io.IoTracker -libcore.io.IoTracker$Mode -libcore.io.IoUtils -libcore.io.IoUtils$FileReader -libcore.io.Libcore -libcore.io.Linux -libcore.io.Memory -libcore.io.MemoryMappedFile -libcore.io.NioBufferIterator -libcore.io.Os -libcore.io.Streams -libcore.math.MathUtils -libcore.net.MimeUtils -libcore.net.NetworkSecurityPolicy -libcore.net.NetworkSecurityPolicy$DefaultNetworkSecurityPolicy -libcore.net.UriCodec -libcore.net.event.NetworkEventDispatcher -libcore.net.event.NetworkEventListener -libcore.reflect.AnnotatedElements -libcore.reflect.AnnotationFactory -libcore.reflect.AnnotationMember -libcore.reflect.AnnotationMember$DefaultValues -libcore.reflect.GenericArrayTypeImpl -libcore.reflect.GenericSignatureParser -libcore.reflect.ListOfTypes -libcore.reflect.ListOfVariables -libcore.reflect.ParameterizedTypeImpl -libcore.reflect.TypeVariableImpl -libcore.reflect.Types -libcore.util.BasicLruCache -libcore.util.CharsetUtils -libcore.util.CollectionUtils -libcore.util.EmptyArray -libcore.util.HexEncoding -libcore.util.NativeAllocationRegistry -libcore.util.NativeAllocationRegistry$CleanerRunner -libcore.util.NativeAllocationRegistry$CleanerThunk -libcore.util.Objects -libcore.util.TimeZoneDataFiles -libcore.util.ZoneInfo -libcore.util.ZoneInfo$CheckedArithmeticException -libcore.util.ZoneInfo$OffsetInterval -libcore.util.ZoneInfo$WallTime -libcore.util.ZoneInfoDB -libcore.util.ZoneInfoDB$TzData -libcore.util.ZoneInfoDB$TzData$1 -org.apache.commons.logging.Log -org.apache.commons.logging.LogFactory -org.apache.commons.logging.impl.Jdk14Logger -org.apache.commons.logging.impl.WeakHashtable -org.apache.harmony.dalvik.NativeTestTarget -org.apache.harmony.dalvik.ddmc.Chunk -org.apache.harmony.dalvik.ddmc.ChunkHandler -org.apache.harmony.dalvik.ddmc.DdmServer -org.apache.harmony.dalvik.ddmc.DdmVmInternal -org.apache.harmony.luni.internal.util.TimezoneGetter -org.apache.harmony.xml.ExpatAttributes -org.apache.harmony.xml.ExpatException -org.apache.harmony.xml.ExpatParser -org.apache.harmony.xml.ExpatParser$CurrentAttributes -org.apache.harmony.xml.ExpatParser$ExpatLocator -org.apache.harmony.xml.ExpatReader -org.apache.harmony.xml.parsers.SAXParserFactoryImpl -org.apache.harmony.xml.parsers.SAXParserImpl -org.apache.http.ConnectionReuseStrategy -org.apache.http.FormattedHeader -org.apache.http.Header -org.apache.http.HeaderElement -org.apache.http.HeaderElementIterator -org.apache.http.HeaderIterator -org.apache.http.HttpClientConnection -org.apache.http.HttpConnection -org.apache.http.HttpConnectionMetrics -org.apache.http.HttpEntity -org.apache.http.HttpEntityEnclosingRequest -org.apache.http.HttpException -org.apache.http.HttpHost -org.apache.http.HttpInetConnection -org.apache.http.HttpMessage -org.apache.http.HttpRequest -org.apache.http.HttpRequestFactory -org.apache.http.HttpRequestInterceptor -org.apache.http.HttpResponse -org.apache.http.HttpResponseFactory -org.apache.http.HttpResponseInterceptor -org.apache.http.HttpServerConnection -org.apache.http.HttpVersion -org.apache.http.NameValuePair -org.apache.http.ParseException -org.apache.http.ProtocolException -org.apache.http.ProtocolVersion -org.apache.http.ReasonPhraseCatalog -org.apache.http.RequestLine -org.apache.http.StatusLine -org.apache.http.auth.AuthSchemeFactory -org.apache.http.auth.AuthSchemeRegistry -org.apache.http.auth.AuthState -org.apache.http.auth.AuthenticationException -org.apache.http.client.AuthenticationHandler -org.apache.http.client.ClientProtocolException -org.apache.http.client.CookieStore -org.apache.http.client.CredentialsProvider -org.apache.http.client.HttpClient -org.apache.http.client.HttpRequestRetryHandler -org.apache.http.client.HttpResponseException -org.apache.http.client.RedirectHandler -org.apache.http.client.RequestDirector -org.apache.http.client.ResponseHandler -org.apache.http.client.UserTokenHandler -org.apache.http.client.entity.UrlEncodedFormEntity -org.apache.http.client.methods.AbortableHttpRequest -org.apache.http.client.methods.HttpEntityEnclosingRequestBase -org.apache.http.client.methods.HttpGet -org.apache.http.client.methods.HttpPost -org.apache.http.client.methods.HttpPut -org.apache.http.client.methods.HttpRequestBase -org.apache.http.client.methods.HttpUriRequest -org.apache.http.client.params.HttpClientParams -org.apache.http.client.protocol.RequestAddCookies -org.apache.http.client.protocol.RequestDefaultHeaders -org.apache.http.client.protocol.RequestProxyAuthentication -org.apache.http.client.protocol.RequestTargetAuthentication -org.apache.http.client.protocol.ResponseProcessCookies -org.apache.http.client.utils.URIUtils -org.apache.http.client.utils.URLEncodedUtils -org.apache.http.conn.BasicManagedEntity -org.apache.http.conn.ClientConnectionManager -org.apache.http.conn.ClientConnectionOperator -org.apache.http.conn.ClientConnectionRequest -org.apache.http.conn.ConnectTimeoutException -org.apache.http.conn.ConnectionKeepAliveStrategy -org.apache.http.conn.ConnectionReleaseTrigger -org.apache.http.conn.EofSensorInputStream -org.apache.http.conn.EofSensorWatcher -org.apache.http.conn.ManagedClientConnection -org.apache.http.conn.OperatedClientConnection -org.apache.http.conn.params.ConnManagerPNames -org.apache.http.conn.params.ConnManagerParamBean -org.apache.http.conn.params.ConnManagerParams -org.apache.http.conn.params.ConnManagerParams$1 -org.apache.http.conn.params.ConnPerRoute -org.apache.http.conn.params.ConnPerRouteBean -org.apache.http.conn.params.ConnRoutePNames -org.apache.http.conn.params.ConnRouteParams -org.apache.http.conn.routing.BasicRouteDirector -org.apache.http.conn.routing.HttpRoute -org.apache.http.conn.routing.HttpRouteDirector -org.apache.http.conn.routing.HttpRoutePlanner -org.apache.http.conn.routing.RouteInfo -org.apache.http.conn.routing.RouteInfo$LayerType -org.apache.http.conn.routing.RouteInfo$TunnelType -org.apache.http.conn.routing.RouteTracker -org.apache.http.conn.scheme.LayeredSocketFactory -org.apache.http.conn.scheme.PlainSocketFactory -org.apache.http.conn.scheme.Scheme -org.apache.http.conn.scheme.SchemeRegistry -org.apache.http.conn.scheme.SocketFactory -org.apache.http.conn.ssl.AbstractVerifier -org.apache.http.conn.ssl.AllowAllHostnameVerifier -org.apache.http.conn.ssl.AndroidDistinguishedNameParser -org.apache.http.conn.ssl.BrowserCompatHostnameVerifier -org.apache.http.conn.ssl.SSLSocketFactory -org.apache.http.conn.ssl.StrictHostnameVerifier -org.apache.http.conn.ssl.X509HostnameVerifier -org.apache.http.cookie.ClientCookie -org.apache.http.cookie.Cookie -org.apache.http.cookie.CookieAttributeHandler -org.apache.http.cookie.CookieIdentityComparator -org.apache.http.cookie.CookieOrigin -org.apache.http.cookie.CookiePathComparator -org.apache.http.cookie.CookieSpec -org.apache.http.cookie.CookieSpecFactory -org.apache.http.cookie.CookieSpecRegistry -org.apache.http.cookie.MalformedCookieException -org.apache.http.cookie.SetCookie -org.apache.http.entity.AbstractHttpEntity -org.apache.http.entity.BasicHttpEntity -org.apache.http.entity.ByteArrayEntity -org.apache.http.entity.ContentLengthStrategy -org.apache.http.entity.HttpEntityWrapper -org.apache.http.entity.InputStreamEntity -org.apache.http.entity.StringEntity -org.apache.http.impl.AbstractHttpClientConnection -org.apache.http.impl.AbstractHttpServerConnection -org.apache.http.impl.DefaultConnectionReuseStrategy -org.apache.http.impl.DefaultHttpRequestFactory -org.apache.http.impl.DefaultHttpResponseFactory -org.apache.http.impl.DefaultHttpServerConnection -org.apache.http.impl.EnglishReasonPhraseCatalog -org.apache.http.impl.HttpConnectionMetricsImpl -org.apache.http.impl.SocketHttpClientConnection -org.apache.http.impl.SocketHttpServerConnection -org.apache.http.impl.auth.BasicSchemeFactory -org.apache.http.impl.auth.DigestSchemeFactory -org.apache.http.impl.client.AbstractAuthenticationHandler -org.apache.http.impl.client.AbstractHttpClient -org.apache.http.impl.client.BasicCookieStore -org.apache.http.impl.client.BasicCredentialsProvider -org.apache.http.impl.client.ClientParamsStack -org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy -org.apache.http.impl.client.DefaultHttpClient -org.apache.http.impl.client.DefaultHttpRequestRetryHandler -org.apache.http.impl.client.DefaultProxyAuthenticationHandler -org.apache.http.impl.client.DefaultRedirectHandler -org.apache.http.impl.client.DefaultRequestDirector -org.apache.http.impl.client.DefaultTargetAuthenticationHandler -org.apache.http.impl.client.DefaultUserTokenHandler -org.apache.http.impl.client.EntityEnclosingRequestWrapper -org.apache.http.impl.client.RequestWrapper -org.apache.http.impl.client.RoutedRequest -org.apache.http.impl.client.TunnelRefusedException -org.apache.http.impl.conn.AbstractClientConnAdapter -org.apache.http.impl.conn.AbstractPoolEntry -org.apache.http.impl.conn.AbstractPooledConnAdapter -org.apache.http.impl.conn.DefaultClientConnection -org.apache.http.impl.conn.DefaultClientConnectionOperator -org.apache.http.impl.conn.DefaultResponseParser -org.apache.http.impl.conn.IdleConnectionHandler -org.apache.http.impl.conn.IdleConnectionHandler$TimeValues -org.apache.http.impl.conn.ProxySelectorRoutePlanner -org.apache.http.impl.conn.tsccm.AbstractConnPool -org.apache.http.impl.conn.tsccm.BasicPoolEntry -org.apache.http.impl.conn.tsccm.BasicPoolEntryRef -org.apache.http.impl.conn.tsccm.BasicPooledConnAdapter -org.apache.http.impl.conn.tsccm.ConnPoolByRoute -org.apache.http.impl.conn.tsccm.ConnPoolByRoute$1 -org.apache.http.impl.conn.tsccm.PoolEntryRequest -org.apache.http.impl.conn.tsccm.RefQueueHandler -org.apache.http.impl.conn.tsccm.RefQueueWorker -org.apache.http.impl.conn.tsccm.RouteSpecificPool -org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager -org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager$1 -org.apache.http.impl.conn.tsccm.WaitingThreadAborter -org.apache.http.impl.cookie.AbstractCookieAttributeHandler -org.apache.http.impl.cookie.AbstractCookieSpec -org.apache.http.impl.cookie.BasicClientCookie -org.apache.http.impl.cookie.BasicCommentHandler -org.apache.http.impl.cookie.BasicDomainHandler -org.apache.http.impl.cookie.BasicExpiresHandler -org.apache.http.impl.cookie.BasicMaxAgeHandler -org.apache.http.impl.cookie.BasicPathHandler -org.apache.http.impl.cookie.BasicSecureHandler -org.apache.http.impl.cookie.BestMatchSpec -org.apache.http.impl.cookie.BestMatchSpecFactory -org.apache.http.impl.cookie.BrowserCompatSpec -org.apache.http.impl.cookie.BrowserCompatSpecFactory -org.apache.http.impl.cookie.CookieSpecBase -org.apache.http.impl.cookie.DateParseException -org.apache.http.impl.cookie.DateUtils -org.apache.http.impl.cookie.DateUtils$DateFormatHolder -org.apache.http.impl.cookie.DateUtils$DateFormatHolder$1 -org.apache.http.impl.cookie.NetscapeDomainHandler -org.apache.http.impl.cookie.NetscapeDraftHeaderParser -org.apache.http.impl.cookie.NetscapeDraftSpec -org.apache.http.impl.cookie.NetscapeDraftSpecFactory -org.apache.http.impl.cookie.RFC2109DomainHandler -org.apache.http.impl.cookie.RFC2109Spec -org.apache.http.impl.cookie.RFC2109SpecFactory -org.apache.http.impl.cookie.RFC2109VersionHandler -org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler -org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler -org.apache.http.impl.cookie.RFC2965DomainAttributeHandler -org.apache.http.impl.cookie.RFC2965PortAttributeHandler -org.apache.http.impl.cookie.RFC2965Spec -org.apache.http.impl.cookie.RFC2965SpecFactory -org.apache.http.impl.cookie.RFC2965VersionAttributeHandler -org.apache.http.impl.entity.EntityDeserializer -org.apache.http.impl.entity.EntitySerializer -org.apache.http.impl.entity.LaxContentLengthStrategy -org.apache.http.impl.entity.StrictContentLengthStrategy -org.apache.http.impl.io.AbstractMessageParser -org.apache.http.impl.io.AbstractMessageWriter -org.apache.http.impl.io.AbstractSessionInputBuffer -org.apache.http.impl.io.AbstractSessionOutputBuffer -org.apache.http.impl.io.ChunkedInputStream -org.apache.http.impl.io.ContentLengthInputStream -org.apache.http.impl.io.ContentLengthOutputStream -org.apache.http.impl.io.HttpRequestParser -org.apache.http.impl.io.HttpRequestWriter -org.apache.http.impl.io.HttpResponseWriter -org.apache.http.impl.io.HttpTransportMetricsImpl -org.apache.http.impl.io.IdentityOutputStream -org.apache.http.impl.io.SocketInputBuffer -org.apache.http.impl.io.SocketOutputBuffer -org.apache.http.io.HttpMessageParser -org.apache.http.io.HttpMessageWriter -org.apache.http.io.HttpTransportMetrics -org.apache.http.io.SessionInputBuffer -org.apache.http.io.SessionOutputBuffer -org.apache.http.message.AbstractHttpMessage -org.apache.http.message.BasicHeader -org.apache.http.message.BasicHeaderElement -org.apache.http.message.BasicHeaderElementIterator -org.apache.http.message.BasicHeaderValueParser -org.apache.http.message.BasicHttpRequest -org.apache.http.message.BasicHttpResponse -org.apache.http.message.BasicLineFormatter -org.apache.http.message.BasicLineParser -org.apache.http.message.BasicListHeaderIterator -org.apache.http.message.BasicNameValuePair -org.apache.http.message.BasicRequestLine -org.apache.http.message.BasicStatusLine -org.apache.http.message.BufferedHeader -org.apache.http.message.HeaderGroup -org.apache.http.message.HeaderValueParser -org.apache.http.message.LineFormatter -org.apache.http.message.LineParser -org.apache.http.message.ParserCursor -org.apache.http.params.AbstractHttpParams -org.apache.http.params.BasicHttpParams -org.apache.http.params.CoreConnectionPNames -org.apache.http.params.CoreProtocolPNames -org.apache.http.params.DefaultedHttpParams -org.apache.http.params.HttpAbstractParamBean -org.apache.http.params.HttpConnectionParams -org.apache.http.params.HttpParams -org.apache.http.params.HttpProtocolParams -org.apache.http.protocol.BasicHttpContext -org.apache.http.protocol.BasicHttpProcessor -org.apache.http.protocol.DefaultedHttpContext -org.apache.http.protocol.HTTP -org.apache.http.protocol.HttpContext -org.apache.http.protocol.HttpProcessor -org.apache.http.protocol.HttpRequestExecutor -org.apache.http.protocol.HttpRequestHandler -org.apache.http.protocol.HttpRequestHandlerRegistry -org.apache.http.protocol.HttpRequestHandlerResolver -org.apache.http.protocol.HttpRequestInterceptorList -org.apache.http.protocol.HttpResponseInterceptorList -org.apache.http.protocol.HttpService -org.apache.http.protocol.RequestConnControl -org.apache.http.protocol.RequestContent -org.apache.http.protocol.RequestExpectContinue -org.apache.http.protocol.RequestTargetHost -org.apache.http.protocol.RequestUserAgent -org.apache.http.protocol.ResponseConnControl -org.apache.http.protocol.ResponseContent -org.apache.http.protocol.UriPatternMatcher -org.apache.http.util.ByteArrayBuffer -org.apache.http.util.CharArrayBuffer -org.apache.http.util.EntityUtils -org.apache.http.util.LangUtils -org.ccil.cowan.tagsoup.AttributesImpl -org.ccil.cowan.tagsoup.AutoDetector -org.ccil.cowan.tagsoup.Element -org.ccil.cowan.tagsoup.ElementType -org.ccil.cowan.tagsoup.HTMLModels -org.ccil.cowan.tagsoup.HTMLScanner -org.ccil.cowan.tagsoup.HTMLSchema -org.ccil.cowan.tagsoup.Parser -org.ccil.cowan.tagsoup.Parser$1 -org.ccil.cowan.tagsoup.ScanHandler -org.ccil.cowan.tagsoup.Scanner -org.ccil.cowan.tagsoup.Schema -org.json.JSON -org.json.JSONArray -org.json.JSONException -org.json.JSONObject -org.json.JSONObject$1 -org.json.JSONStringer -org.json.JSONStringer$Scope -org.json.JSONTokener -org.kxml2.io.KXmlParser -org.kxml2.io.KXmlParser$ValueContext -org.kxml2.io.KXmlSerializer -org.xml.sax.Attributes -org.xml.sax.ContentHandler -org.xml.sax.DTDHandler -org.xml.sax.EntityResolver -org.xml.sax.ErrorHandler -org.xml.sax.InputSource -org.xml.sax.Locator -org.xml.sax.SAXException -org.xml.sax.SAXNotRecognizedException -org.xml.sax.SAXNotSupportedException -org.xml.sax.SAXParseException -org.xml.sax.XMLReader -org.xml.sax.ext.DeclHandler -org.xml.sax.ext.DefaultHandler2 -org.xml.sax.ext.EntityResolver2 -org.xml.sax.ext.LexicalHandler -org.xml.sax.helpers.AttributesImpl -org.xml.sax.helpers.DefaultHandler -org.xmlpull.v1.XmlPullParser -org.xmlpull.v1.XmlPullParserException -org.xmlpull.v1.XmlPullParserFactory -org.xmlpull.v1.XmlSerializer -sun.invoke.util.BytecodeDescriptor -sun.invoke.util.VerifyAccess -sun.invoke.util.Wrapper -sun.invoke.util.Wrapper$Format -sun.misc.ASCIICaseInsensitiveComparator -sun.misc.Cleaner -sun.misc.CompoundEnumeration -sun.misc.FDBigInteger -sun.misc.FloatingDecimal -sun.misc.FloatingDecimal$1 -sun.misc.FloatingDecimal$ASCIIToBinaryBuffer -sun.misc.FloatingDecimal$ASCIIToBinaryConverter -sun.misc.FloatingDecimal$BinaryToASCIIBuffer -sun.misc.FloatingDecimal$BinaryToASCIIConverter -sun.misc.FloatingDecimal$ExceptionalBinaryToASCIIBuffer -sun.misc.FloatingDecimal$PreparedASCIIToBinaryBuffer -sun.misc.FormattedFloatingDecimal -sun.misc.FormattedFloatingDecimal$1 -sun.misc.FormattedFloatingDecimal$Form -sun.misc.IOUtils -sun.misc.JavaIOFileDescriptorAccess -sun.misc.LRUCache -sun.misc.REException -sun.misc.SharedSecrets -sun.misc.Unsafe -sun.misc.VM -sun.misc.Version -sun.net.ConnectionResetException -sun.net.NetHooks -sun.net.NetProperties -sun.net.NetProperties$1 -sun.net.ResourceManager -sun.net.spi.DefaultProxySelector -sun.net.spi.DefaultProxySelector$1 -sun.net.spi.DefaultProxySelector$NonProxyInfo -sun.net.spi.nameservice.NameService -sun.net.util.IPAddressUtil -sun.net.www.ParseUtil -sun.net.www.protocol.file.Handler -sun.net.www.protocol.jar.Handler -sun.nio.ch.AbstractPollArrayWrapper -sun.nio.ch.AbstractPollSelectorImpl -sun.nio.ch.AllocatedNativeObject -sun.nio.ch.ChannelInputStream -sun.nio.ch.DatagramChannelImpl -sun.nio.ch.DatagramDispatcher -sun.nio.ch.DefaultSelectorProvider -sun.nio.ch.DirectBuffer -sun.nio.ch.FileChannelImpl -sun.nio.ch.FileChannelImpl$Unmapper -sun.nio.ch.FileDescriptorHolderSocketImpl -sun.nio.ch.FileDispatcher -sun.nio.ch.FileDispatcherImpl -sun.nio.ch.FileKey -sun.nio.ch.FileLockImpl -sun.nio.ch.FileLockTable -sun.nio.ch.IOStatus -sun.nio.ch.IOUtil -sun.nio.ch.Interruptible -sun.nio.ch.NativeDispatcher -sun.nio.ch.NativeObject -sun.nio.ch.NativeThread -sun.nio.ch.NativeThreadSet -sun.nio.ch.Net -sun.nio.ch.Net$1 -sun.nio.ch.Net$4 -sun.nio.ch.PollArrayWrapper -sun.nio.ch.PollSelectorImpl -sun.nio.ch.PollSelectorProvider -sun.nio.ch.SelChImpl -sun.nio.ch.SelectionKeyImpl -sun.nio.ch.SelectorImpl -sun.nio.ch.SelectorProviderImpl -sun.nio.ch.ServerSocketChannelImpl -sun.nio.ch.SharedFileLockTable -sun.nio.ch.SharedFileLockTable$FileLockReference -sun.nio.ch.SocketAdaptor -sun.nio.ch.SocketAdaptor$1 -sun.nio.ch.SocketAdaptor$2 -sun.nio.ch.SocketAdaptor$SocketInputStream -sun.nio.ch.SocketChannelImpl -sun.nio.ch.SocketDispatcher -sun.nio.ch.Util -sun.nio.ch.Util$1 -sun.nio.ch.Util$2 -sun.nio.ch.Util$BufferCache -sun.nio.cs.ArrayDecoder -sun.nio.cs.ArrayEncoder -sun.nio.cs.StreamDecoder -sun.nio.cs.StreamEncoder -sun.nio.cs.ThreadLocalCoders -sun.nio.cs.ThreadLocalCoders$1 -sun.nio.cs.ThreadLocalCoders$2 -sun.nio.cs.ThreadLocalCoders$Cache -sun.nio.fs.AbstractBasicFileAttributeView -sun.nio.fs.AbstractFileSystemProvider -sun.nio.fs.AbstractPath -sun.nio.fs.DefaultFileSystemProvider -sun.nio.fs.DynamicFileAttributeView -sun.nio.fs.LinuxFileSystem -sun.nio.fs.LinuxFileSystemProvider -sun.nio.fs.NativeBuffer -sun.nio.fs.NativeBuffer$Deallocator -sun.nio.fs.NativeBuffers -sun.nio.fs.UnixChannelFactory -sun.nio.fs.UnixChannelFactory$Flags -sun.nio.fs.UnixConstants -sun.nio.fs.UnixException -sun.nio.fs.UnixFileAttributeViews -sun.nio.fs.UnixFileAttributeViews$Basic -sun.nio.fs.UnixFileAttributes -sun.nio.fs.UnixFileAttributes$UnixAsBasicFileAttributes -sun.nio.fs.UnixFileModeAttribute -sun.nio.fs.UnixFileStoreAttributes -sun.nio.fs.UnixFileSystem -sun.nio.fs.UnixFileSystemProvider -sun.nio.fs.UnixMountEntry -sun.nio.fs.UnixNativeDispatcher -sun.nio.fs.UnixPath -sun.nio.fs.Util -sun.reflect.misc.ReflectUtil -sun.security.action.GetBooleanAction -sun.security.action.GetIntegerAction -sun.security.action.GetPropertyAction -sun.security.jca.GetInstance -sun.security.jca.GetInstance$Instance -sun.security.jca.JCAUtil -sun.security.jca.ProviderConfig -sun.security.jca.ProviderConfig$2 -sun.security.jca.ProviderList -sun.security.jca.ProviderList$1 -sun.security.jca.ProviderList$2 -sun.security.jca.ProviderList$3 -sun.security.jca.ProviderList$ServiceList -sun.security.jca.ProviderList$ServiceList$1 -sun.security.jca.Providers -sun.security.jca.ServiceId -sun.security.pkcs.ContentInfo -sun.security.pkcs.PKCS7 -sun.security.pkcs.PKCS7$VerbatimX509Certificate -sun.security.pkcs.PKCS7$WrappedX509Certificate -sun.security.pkcs.PKCS9Attribute -sun.security.pkcs.SignerInfo -sun.security.provider.CertPathProvider -sun.security.provider.X509Factory -sun.security.provider.certpath.AdaptableX509CertSelector -sun.security.provider.certpath.AlgorithmChecker -sun.security.provider.certpath.BasicChecker -sun.security.provider.certpath.CertId -sun.security.provider.certpath.CertPathHelper -sun.security.provider.certpath.ConstraintsChecker -sun.security.provider.certpath.KeyChecker -sun.security.provider.certpath.OCSP$RevocationStatus -sun.security.provider.certpath.OCSP$RevocationStatus$CertStatus -sun.security.provider.certpath.OCSPResponse -sun.security.provider.certpath.OCSPResponse$ResponseStatus -sun.security.provider.certpath.OCSPResponse$SingleResponse -sun.security.provider.certpath.PKIX -sun.security.provider.certpath.PKIX$ValidatorParams -sun.security.provider.certpath.PKIXCertPathValidator -sun.security.provider.certpath.PKIXMasterCertPathValidator -sun.security.provider.certpath.PolicyChecker -sun.security.provider.certpath.PolicyNodeImpl -sun.security.provider.certpath.RevocationChecker -sun.security.provider.certpath.RevocationChecker$1 -sun.security.provider.certpath.RevocationChecker$Mode -sun.security.provider.certpath.RevocationChecker$RevocationProperties -sun.security.util.AbstractAlgorithmConstraints -sun.security.util.AbstractAlgorithmConstraints$1 -sun.security.util.AlgorithmDecomposer -sun.security.util.BitArray -sun.security.util.ByteArrayLexOrder -sun.security.util.ByteArrayTagOrder -sun.security.util.Cache -sun.security.util.Cache$EqualByteArray -sun.security.util.CertConstraintParameters -sun.security.util.Debug -sun.security.util.DerEncoder -sun.security.util.DerIndefLenConverter -sun.security.util.DerInputBuffer -sun.security.util.DerInputStream -sun.security.util.DerOutputStream -sun.security.util.DerValue -sun.security.util.DisabledAlgorithmConstraints -sun.security.util.DisabledAlgorithmConstraints$Constraint -sun.security.util.DisabledAlgorithmConstraints$Constraint$Operator -sun.security.util.DisabledAlgorithmConstraints$Constraints -sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraint -sun.security.util.KeyUtil -sun.security.util.Length -sun.security.util.ManifestDigester -sun.security.util.ManifestDigester$Entry -sun.security.util.ManifestDigester$Position -sun.security.util.ManifestEntryVerifier -sun.security.util.ManifestEntryVerifier$SunProviderHolder -sun.security.util.MemoryCache -sun.security.util.MemoryCache$CacheEntry -sun.security.util.MemoryCache$SoftCacheEntry -sun.security.util.ObjectIdentifier -sun.security.util.SignatureFileVerifier -sun.security.x509.AVA -sun.security.x509.AVAKeyword -sun.security.x509.AccessDescription -sun.security.x509.AlgorithmId -sun.security.x509.AuthorityInfoAccessExtension -sun.security.x509.AuthorityKeyIdentifierExtension -sun.security.x509.BasicConstraintsExtension -sun.security.x509.CRLDistributionPointsExtension -sun.security.x509.CRLNumberExtension -sun.security.x509.CRLReasonCodeExtension -sun.security.x509.CertAttrSet -sun.security.x509.CertificateAlgorithmId -sun.security.x509.CertificateExtensions -sun.security.x509.CertificateIssuerExtension -sun.security.x509.CertificatePoliciesExtension -sun.security.x509.CertificatePolicyId -sun.security.x509.CertificateSerialNumber -sun.security.x509.CertificateValidity -sun.security.x509.CertificateVersion -sun.security.x509.CertificateX509Key -sun.security.x509.DNSName -sun.security.x509.DeltaCRLIndicatorExtension -sun.security.x509.DistributionPoint -sun.security.x509.ExtendedKeyUsageExtension -sun.security.x509.Extension -sun.security.x509.FreshestCRLExtension -sun.security.x509.GeneralName -sun.security.x509.GeneralNameInterface -sun.security.x509.GeneralNames -sun.security.x509.InhibitAnyPolicyExtension -sun.security.x509.IssuerAlternativeNameExtension -sun.security.x509.IssuingDistributionPointExtension -sun.security.x509.KeyIdentifier -sun.security.x509.KeyUsageExtension -sun.security.x509.NameConstraintsExtension -sun.security.x509.NetscapeCertTypeExtension -sun.security.x509.OCSPNoCheckExtension -sun.security.x509.OIDMap -sun.security.x509.OIDMap$OIDInfo -sun.security.x509.PKIXExtensions -sun.security.x509.PolicyConstraintsExtension -sun.security.x509.PolicyInformation -sun.security.x509.PolicyMappingsExtension -sun.security.x509.PrivateKeyUsageExtension -sun.security.x509.RDN -sun.security.x509.SerialNumber -sun.security.x509.SubjectAlternativeNameExtension -sun.security.x509.SubjectInfoAccessExtension -sun.security.x509.SubjectKeyIdentifierExtension -sun.security.x509.URIName -sun.security.x509.X500Name -sun.security.x509.X500Name$1 -sun.security.x509.X509AttributeName -sun.security.x509.X509CertImpl -sun.security.x509.X509CertInfo -sun.security.x509.X509Key -sun.util.calendar.AbstractCalendar -sun.util.calendar.BaseCalendar -sun.util.calendar.BaseCalendar$Date -sun.util.calendar.CalendarDate -sun.util.calendar.CalendarSystem -sun.util.calendar.CalendarUtils -sun.util.calendar.Gregorian -sun.util.calendar.Gregorian$Date -sun.util.calendar.JulianCalendar -sun.util.calendar.LocalGregorianCalendar -sun.util.locale.BaseLocale -sun.util.locale.BaseLocale$Cache -sun.util.locale.BaseLocale$Key -sun.util.locale.Extension -sun.util.locale.InternalLocaleBuilder -sun.util.locale.InternalLocaleBuilder$CaseInsensitiveChar -sun.util.locale.LanguageTag -sun.util.locale.LocaleExtensions -sun.util.locale.LocaleObjectCache -sun.util.locale.LocaleObjectCache$CacheEntry -sun.util.locale.LocaleSyntaxException -sun.util.locale.LocaleUtils -sun.util.locale.ParseStatus -sun.util.locale.StringTokenIterator -sun.util.locale.UnicodeLocaleExtension -sun.util.logging.LoggingProxy -sun.util.logging.LoggingSupport -sun.util.logging.LoggingSupport$1 -sun.util.logging.LoggingSupport$2 -sun.util.logging.PlatformLogger -sun.util.logging.PlatformLogger$1 -sun.util.logging.PlatformLogger$JavaLoggerProxy -sun.util.logging.PlatformLogger$Level -sun.util.logging.PlatformLogger$LoggerProxy diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 8824643db447..97dcb90bbb99 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -391,8 +391,12 @@ public abstract class AccessibilityService extends Service { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SHOW_MODE_AUTO, SHOW_MODE_HIDDEN}) - public @interface SoftKeyboardShowMode {}; + @IntDef(prefix = { "SHOW_MODE_" }, value = { + SHOW_MODE_AUTO, + SHOW_MODE_HIDDEN + }) + public @interface SoftKeyboardShowMode {} + public static final int SHOW_MODE_AUTO = 0; public static final int SHOW_MODE_HIDDEN = 1; diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index bd9c9fa30536..782733f552a6 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -290,8 +290,13 @@ public class AccountManager { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({VISIBILITY_UNDEFINED, VISIBILITY_VISIBLE, VISIBILITY_USER_MANAGED_VISIBLE, - VISIBILITY_NOT_VISIBLE, VISIBILITY_USER_MANAGED_NOT_VISIBLE}) + @IntDef(prefix = { "VISIBILITY_" }, value = { + VISIBILITY_UNDEFINED, + VISIBILITY_VISIBLE, + VISIBILITY_USER_MANAGED_VISIBLE, + VISIBILITY_NOT_VISIBLE, + VISIBILITY_USER_MANAGED_NOT_VISIBLE + }) public @interface AccountVisibility { } diff --git a/core/java/android/annotation/CallbackExecutor.java b/core/java/android/annotation/CallbackExecutor.java new file mode 100644 index 000000000000..5671a3d2b6d6 --- /dev/null +++ b/core/java/android/annotation/CallbackExecutor.java @@ -0,0 +1,41 @@ +/* + * 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.annotation; + +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.SOURCE; + +import android.content.Context; +import android.os.AsyncTask; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.util.concurrent.Executor; + +/** + * @paramDoc Callback and listener events are dispatched through this + * {@link Executor}, providing an easy way to control which thread is + * used. To dispatch events through the main thread of your + * application, you can use {@link Context#getMainExecutor()}. To + * dispatch events through a shared thread pool, you can use + * {@link AsyncTask#THREAD_POOL_EXECUTOR}. + * @hide + */ +@Retention(SOURCE) +@Target(PARAMETER) +public @interface CallbackExecutor { +} diff --git a/core/java/android/annotation/Condemned.java b/core/java/android/annotation/Condemned.java new file mode 100644 index 000000000000..186409b3e204 --- /dev/null +++ b/core/java/android/annotation/Condemned.java @@ -0,0 +1,44 @@ +/* + * 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.annotation; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.LOCAL_VARIABLE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.SOURCE; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * A program element annotated @Condemned is one that programmers are + * blocked from using, typically because it's about to be completely destroyed. + * <p> + * This is a stronger version of @Deprecated, and it's typically used to + * mark APIs that only existed temporarily in a preview SDK, and which only + * continue to exist temporarily to support binary compatibility. + * + * @hide + */ +@Retention(SOURCE) +@Target(value={CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE}) +public @interface Condemned { +} diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java index 0e8326de45ec..04ff48cecdc0 100644 --- a/core/java/android/app/ActionBar.java +++ b/core/java/android/app/ActionBar.java @@ -95,7 +95,11 @@ import java.lang.annotation.RetentionPolicy; public abstract class ActionBar { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS}) + @IntDef(prefix = { "NAVIGATION_MODE_" }, value = { + NAVIGATION_MODE_STANDARD, + NAVIGATION_MODE_LIST, + NAVIGATION_MODE_TABS + }) public @interface NavigationMode {} /** @@ -139,15 +143,14 @@ public abstract class ActionBar { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - DISPLAY_USE_LOGO, - DISPLAY_SHOW_HOME, - DISPLAY_HOME_AS_UP, - DISPLAY_SHOW_TITLE, - DISPLAY_SHOW_CUSTOM, - DISPLAY_TITLE_MULTIPLE_LINES - }) + @IntDef(flag = true, prefix = { "DISPLAY_" }, value = { + DISPLAY_USE_LOGO, + DISPLAY_SHOW_HOME, + DISPLAY_HOME_AS_UP, + DISPLAY_SHOW_TITLE, + DISPLAY_SHOW_CUSTOM, + DISPLAY_TITLE_MULTIPLE_LINES + }) public @interface DisplayOptions {} /** diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index e33b79e51fb6..847082a0a4e1 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -175,7 +175,7 @@ public class ActivityManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "BUGREPORT_OPTION_" }, value = { BUGREPORT_OPTION_FULL, BUGREPORT_OPTION_INTERACTIVE, BUGREPORT_OPTION_REMOTE, @@ -533,10 +533,10 @@ public class ActivityManager { // to frameworks/base/core/proto/android/app/activitymanager.proto and the following method must // be updated to correctly map between them. /** - * Maps ActivityManager.PROCESS_STATE_ values to ActivityManagerProto.ProcessState enum. + * Maps ActivityManager.PROCESS_STATE_ values to ProcessState enum. * * @param amInt a process state of the form ActivityManager.PROCESS_STATE_ - * @return the value of the corresponding android.app.ActivityManagerProto's ProcessState enum. + * @return the value of the corresponding ActivityManager's ProcessState enum. * @hide */ public static final int processStateAmToProto(int amInt) { diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index a9c4d3705afc..6666fcc77e00 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -261,6 +261,11 @@ public abstract class ActivityManagerInternal { public abstract void notifyNetworkPolicyRulesUpdated(int uid, long procStateSeq); /** + * Called after the voice interaction service has changed. + */ + public abstract void notifyActiveVoiceInteractionServiceChanged(ComponentName component); + + /** * Called after virtual display Id is updated by * {@link com.android.server.vr.Vr2dDisplay} with a specific * {@param vr2dDisplayId}. diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5369adf4aad1..ef446c2d72c3 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -80,6 +80,7 @@ import android.os.DropBoxManager; import android.os.Environment; import android.os.GraphicsEnvironment; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.IBinder; import android.os.LocaleList; import android.os.Looper; @@ -172,6 +173,7 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.TimeZone; +import java.util.concurrent.Executor; final class RemoteServiceException extends AndroidRuntimeException { public RemoteServiceException(String msg) { @@ -242,6 +244,7 @@ public final class ActivityThread extends ClientTransactionHandler { final ApplicationThread mAppThread = new ApplicationThread(); final Looper mLooper = Looper.myLooper(); final H mH = new H(); + final Executor mExecutor = new HandlerExecutor(mH); final ArrayMap<IBinder, ActivityClientRecord> mActivities = new ArrayMap<>(); // List of new activities (via ActivityRecord.nextIdle) that should // be reported when next we idle. @@ -1943,6 +1946,10 @@ public final class ActivityThread extends ClientTransactionHandler { return mLooper; } + public Executor getExecutor() { + return mExecutor; + } + public Application getApplication() { return mInitialApplication; } @@ -3152,7 +3159,8 @@ public final class ActivityThread extends ClientTransactionHandler { data.intent.setExtrasClassLoader(cl); data.intent.prepareToEnterProcess(); data.setExtrasClassLoader(cl); - receiver = (BroadcastReceiver)cl.loadClass(component).newInstance(); + receiver = packageInfo.getAppFactory() + .instantiateReceiver(cl, data.info.name, data.intent); } catch (Exception e) { if (DEBUG_BROADCAST) Slog.i(TAG, "Finishing failed broadcast to " + data.intent.getComponent()); @@ -3307,7 +3315,8 @@ public final class ActivityThread extends ClientTransactionHandler { Service service = null; try { java.lang.ClassLoader cl = packageInfo.getClassLoader(); - service = (Service) cl.loadClass(data.info.name).newInstance(); + service = packageInfo.getAppFactory() + .instantiateService(cl, data.info.name, data.intent); } catch (Exception e) { if (!mInstrumentation.onException(service, e)) { throw new RuntimeException( @@ -5644,6 +5653,7 @@ public final class ActivityThread extends ClientTransactionHandler { } } else { mInstrumentation = new Instrumentation(); + mInstrumentation.basicInit(this); } if ((data.appInfo.flags&ApplicationInfo.FLAG_LARGE_HEAP) != 0) { @@ -6175,8 +6185,13 @@ public final class ActivityThread extends ClientTransactionHandler { try { final java.lang.ClassLoader cl = c.getClassLoader(); - localProvider = (ContentProvider)cl. - loadClass(info.name).newInstance(); + LoadedApk packageInfo = peekPackageInfo(ai.packageName, true); + if (packageInfo == null) { + // System startup case. + packageInfo = getSystemContext().mPackageInfo; + } + localProvider = packageInfo.getAppFactory() + .instantiateProvider(cl, info.name); provider = localProvider.getIContentProvider(); if (provider == null) { Slog.e(TAG, "Failed to instantiate class " + @@ -6322,6 +6337,7 @@ public final class ActivityThread extends ClientTransactionHandler { UserHandle.myUserId()); try { mInstrumentation = new Instrumentation(); + mInstrumentation.basicInit(this); ContextImpl context = ContextImpl.createAppContext( this, getSystemContext().mPackageInfo); mInitialApplication = context.mPackageInfo.makeApplication(true, null); diff --git a/core/java/android/app/AppComponentFactory.java b/core/java/android/app/AppComponentFactory.java new file mode 100644 index 000000000000..4df737999434 --- /dev/null +++ b/core/java/android/app/AppComponentFactory.java @@ -0,0 +1,112 @@ +/* + * 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.app; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.BroadcastReceiver; +import android.content.ContentProvider; +import android.content.Intent; + +/** + * Interface used to control the instantiation of manifest elements. + * + * @see #instantiateApplication + * @see #instantiateActivity + * @see #instantiateService + * @see #instantiateReceiver + * @see #instantiateProvider + */ +public class AppComponentFactory { + + /** + * Allows application to override the creation of the application object. This can be used to + * perform things such as dependency injection or class loader changes to these + * classes. + * + * @param cl The default classloader to use for instantiation. + * @param className The class to be instantiated. + */ + public @NonNull Application instantiateApplication(@NonNull ClassLoader cl, + @NonNull String className) + throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return (Application) cl.loadClass(className).newInstance(); + } + + /** + * Allows application to override the creation of activities. This can be used to + * perform things such as dependency injection or class loader changes to these + * classes. + * + * @param cl The default classloader to use for instantiation. + * @param className The class to be instantiated. + * @param intent Intent creating the class. + */ + public @NonNull Activity instantiateActivity(@NonNull ClassLoader cl, @NonNull String className, + @Nullable Intent intent) + throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return (Activity) cl.loadClass(className).newInstance(); + } + + /** + * Allows application to override the creation of receivers. This can be used to + * perform things such as dependency injection or class loader changes to these + * classes. + * + * @param cl The default classloader to use for instantiation. + * @param className The class to be instantiated. + * @param intent Intent creating the class. + */ + public @NonNull BroadcastReceiver instantiateReceiver(@NonNull ClassLoader cl, + @NonNull String className, @Nullable Intent intent) + throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return (BroadcastReceiver) cl.loadClass(className).newInstance(); + } + + /** + * Allows application to override the creation of services. This can be used to + * perform things such as dependency injection or class loader changes to these + * classes. + * + * @param cl The default classloader to use for instantiation. + * @param className The class to be instantiated. + * @param intent Intent creating the class. + */ + public @NonNull Service instantiateService(@NonNull ClassLoader cl, + @NonNull String className, @Nullable Intent intent) + throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return (Service) cl.loadClass(className).newInstance(); + } + + /** + * Allows application to override the creation of providers. This can be used to + * perform things such as dependency injection or class loader changes to these + * classes. + * + * @param cl The default classloader to use for instantiation. + * @param className The class to be instantiated. + */ + public @NonNull ContentProvider instantiateProvider(@NonNull ClassLoader cl, + @NonNull String className) + throws InstantiationException, IllegalAccessException, ClassNotFoundException { + return (ContentProvider) cl.loadClass(className).newInstance(); + } + + /** + * @hide + */ + public static AppComponentFactory DEFAULT = new AppComponentFactory(); +} diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index c1a51044e349..c9435746f287 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -258,8 +258,10 @@ public class AppOpsManager { public static final int OP_CHANGE_WIFI_STATE = 71; /** @hide Request package deletion through package installer */ public static final int OP_REQUEST_DELETE_PACKAGES = 72; + /** @hide Bind an accessibility service. */ + public static final int OP_BIND_ACCESSIBILITY_SERVICE = 73; /** @hide */ - public static final int _NUM_OP = 73; + public static final int _NUM_OP = 74; /** Access to coarse location information. */ public static final String OPSTR_COARSE_LOCATION = "android:coarse_location"; @@ -503,6 +505,7 @@ public class AppOpsManager { OP_RUN_ANY_IN_BACKGROUND, OP_CHANGE_WIFI_STATE, OP_REQUEST_DELETE_PACKAGES, + OP_BIND_ACCESSIBILITY_SERVICE, }; /** @@ -583,6 +586,7 @@ public class AppOpsManager { null, // OP_RUN_ANY_IN_BACKGROUND null, // OP_CHANGE_WIFI_STATE null, // OP_REQUEST_DELETE_PACKAGES + null, // OP_BIND_ACCESSIBILITY_SERVICE }; /** @@ -663,6 +667,7 @@ public class AppOpsManager { "RUN_ANY_IN_BACKGROUND", "CHANGE_WIFI_STATE", "REQUEST_DELETE_PACKAGES", + "BIND_ACCESSIBILITY_SERVICE", }; /** @@ -743,6 +748,7 @@ public class AppOpsManager { null, // no permission for OP_RUN_ANY_IN_BACKGROUND Manifest.permission.CHANGE_WIFI_STATE, Manifest.permission.REQUEST_DELETE_PACKAGES, + Manifest.permission.BIND_ACCESSIBILITY_SERVICE, }; /** @@ -824,6 +830,7 @@ public class AppOpsManager { null, // OP_RUN_ANY_IN_BACKGROUND null, // OP_CHANGE_WIFI_STATE null, // REQUEST_DELETE_PACKAGES + null, // OP_BIND_ACCESSIBILITY_SERVICE }; /** @@ -904,6 +911,7 @@ public class AppOpsManager { false, // OP_RUN_ANY_IN_BACKGROUND false, // OP_CHANGE_WIFI_STATE false, // OP_REQUEST_DELETE_PACKAGES + false, // OP_BIND_ACCESSIBILITY_SERVICE }; /** @@ -983,6 +991,7 @@ public class AppOpsManager { AppOpsManager.MODE_ALLOWED, // OP_RUN_ANY_IN_BACKGROUND AppOpsManager.MODE_ALLOWED, // OP_CHANGE_WIFI_STATE AppOpsManager.MODE_ALLOWED, // REQUEST_DELETE_PACKAGES + AppOpsManager.MODE_ALLOWED, // OP_BIND_ACCESSIBILITY_SERVICE }; /** @@ -1066,6 +1075,7 @@ public class AppOpsManager { false, // OP_RUN_ANY_IN_BACKGROUND false, // OP_CHANGE_WIFI_STATE false, // OP_REQUEST_DELETE_PACKAGES + false, // OP_BIND_ACCESSIBILITY_SERVICE }; /** diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index b0d020a7e328..a2de0f44962a 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -90,6 +90,7 @@ import java.io.InputStream; import java.nio.ByteOrder; import java.util.ArrayList; import java.util.Objects; +import java.util.concurrent.Executor; class ReceiverRestrictedContext extends ContextWrapper { ReceiverRestrictedContext(Context base) { @@ -250,6 +251,11 @@ class ContextImpl extends Context { } @Override + public Executor getMainExecutor() { + return mMainThread.getExecutor(); + } + + @Override public Context getApplicationContext() { return (mPackageInfo != null) ? mPackageInfo.getApplication() : mMainThread.getApplication(); diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java index 0f4a7fb500a3..1103649cb9a9 100644 --- a/core/java/android/app/FragmentTransaction.java +++ b/core/java/android/app/FragmentTransaction.java @@ -182,7 +182,12 @@ public abstract class FragmentTransaction { public static final int TRANSIT_FRAGMENT_FADE = 3 | TRANSIT_ENTER_MASK; /** @hide */ - @IntDef({TRANSIT_NONE, TRANSIT_FRAGMENT_OPEN, TRANSIT_FRAGMENT_CLOSE, TRANSIT_FRAGMENT_FADE}) + @IntDef(prefix = { "TRANSIT_" }, value = { + TRANSIT_NONE, + TRANSIT_FRAGMENT_OPEN, + TRANSIT_FRAGMENT_CLOSE, + TRANSIT_FRAGMENT_FADE + }) @Retention(RetentionPolicy.SOURCE) public @interface Transit {} diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index d49e11f47fea..490b2bf39f53 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1114,7 +1114,10 @@ public class Instrumentation { public Application newApplication(ClassLoader cl, String className, Context context) throws InstantiationException, IllegalAccessException, ClassNotFoundException { - return newApplication(cl.loadClass(className), context); + Application app = getFactory(context.getPackageName()) + .instantiateApplication(cl, className); + app.attach(context); + return app; } /** @@ -1201,7 +1204,15 @@ public class Instrumentation { Intent intent) throws InstantiationException, IllegalAccessException, ClassNotFoundException { - return (Activity)cl.loadClass(className).newInstance(); + String pkg = intent.getComponent().getPackageName(); + return getFactory(pkg).instantiateActivity(cl, className, intent); + } + + private AppComponentFactory getFactory(String pkg) { + LoadedApk apk = mThread.peekPackageInfo(pkg, true); + // This is in the case of starting up "android". + if (apk == null) apk = mThread.getSystemContext().mPackageInfo; + return apk.getAppFactory(); } private void prePerformCreate(Activity activity) { @@ -1950,6 +1961,14 @@ public class Instrumentation { mUiAutomationConnection = uiAutomationConnection; } + /** + * Only sets the ActivityThread up, keeps everything else null because app is not being + * instrumented. + */ + final void basicInit(ActivityThread thread) { + mThread = thread; + } + /** @hide */ public static void checkStartActivityResult(int res, Object intent) { if (!ActivityManager.isStartResultFatalError(res)) { diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index ebd101494588..ab00a7ddde55 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -125,6 +125,7 @@ public final class LoadedApk { = new ArrayMap<>(); private final ArrayMap<Context, ArrayMap<ServiceConnection, LoadedApk.ServiceDispatcher>> mUnboundServices = new ArrayMap<>(); + private AppComponentFactory mAppComponentFactory; Application getApplication() { return mApplication; @@ -148,6 +149,7 @@ public final class LoadedApk { mIncludeCode = includeCode; mRegisterPackage = registerPackage; mDisplayAdjustments.setCompatibilityInfo(compatInfo); + mAppComponentFactory = createAppFactory(mApplicationInfo, mBaseClassLoader); } private static ApplicationInfo adjustNativeLibraryPaths(ApplicationInfo info) { @@ -203,6 +205,7 @@ public final class LoadedApk { mRegisterPackage = false; mClassLoader = ClassLoader.getSystemClassLoader(); mResources = Resources.getSystem(); + mAppComponentFactory = createAppFactory(mApplicationInfo, mClassLoader); } /** @@ -212,6 +215,23 @@ public final class LoadedApk { assert info.packageName.equals("android"); mApplicationInfo = info; mClassLoader = classLoader; + mAppComponentFactory = createAppFactory(info, classLoader); + } + + private AppComponentFactory createAppFactory(ApplicationInfo appInfo, ClassLoader cl) { + if (appInfo.appComponentFactory != null) { + try { + return (AppComponentFactory) cl.loadClass(appInfo.appComponentFactory) + .newInstance(); + } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { + Slog.e(TAG, "Unable to instantiate appComponentFactory", e); + } + } + return AppComponentFactory.DEFAULT; + } + + public AppComponentFactory getAppFactory() { + return mAppComponentFactory; } public String getPackageName() { @@ -313,6 +333,7 @@ public final class LoadedApk { getClassLoader()); } } + mAppComponentFactory = createAppFactory(aInfo, mClassLoader); } private void setApplicationInfo(ApplicationInfo aInfo) { diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index fb9efe6f321d..705f9a0513f6 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -577,7 +577,13 @@ public class Notification implements Parcelable public int flags; /** @hide */ - @IntDef({PRIORITY_DEFAULT,PRIORITY_LOW,PRIORITY_MIN,PRIORITY_HIGH,PRIORITY_MAX}) + @IntDef(prefix = { "PRIORITY_" }, value = { + PRIORITY_DEFAULT, + PRIORITY_LOW, + PRIORITY_MIN, + PRIORITY_HIGH, + PRIORITY_MAX + }) @Retention(RetentionPolicy.SOURCE) public @interface Priority {} diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 23c4166da104..85a9be355878 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -80,9 +80,14 @@ public class StatusBarManager { public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS | DISABLE2_NOTIFICATION_SHADE | DISABLE2_GLOBAL_ACTIONS; - @IntDef(flag = true, - value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS, DISABLE2_SYSTEM_ICONS, - DISABLE2_NOTIFICATION_SHADE, DISABLE2_GLOBAL_ACTIONS}) + @IntDef(flag = true, prefix = { "DISABLE2_" }, value = { + DISABLE2_NONE, + DISABLE2_MASK, + DISABLE2_QUICK_SETTINGS, + DISABLE2_SYSTEM_ICONS, + DISABLE2_NOTIFICATION_SHADE, + DISABLE2_GLOBAL_ACTIONS + }) @Retention(RetentionPolicy.SOURCE) public @interface Disable2Flags {} diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index bc616686eced..0da5e24929aa 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -98,7 +98,11 @@ public class UiModeManager { public static String ACTION_EXIT_DESK_MODE = "android.app.action.EXIT_DESK_MODE"; /** @hide */ - @IntDef({MODE_NIGHT_AUTO, MODE_NIGHT_NO, MODE_NIGHT_YES}) + @IntDef(prefix = { "MODE_" }, value = { + MODE_NIGHT_AUTO, + MODE_NIGHT_NO, + MODE_NIGHT_YES + }) @Retention(RetentionPolicy.SOURCE) public @interface NightMode {} diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 081bd814b30c..3829afb04eaa 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -176,7 +176,7 @@ public class WallpaperManager { // flags for which kind of wallpaper to act on /** @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_SYSTEM, FLAG_LOCK }) diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index 80399ae65c58..085fc79f58e4 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -89,7 +89,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu public static final int WINDOWING_MODE_FREEFORM = 5; /** @hide */ - @IntDef({ + @IntDef(prefix = { "WINDOWING_MODE_" }, value = { WINDOWING_MODE_UNDEFINED, WINDOWING_MODE_FULLSCREEN, WINDOWING_MODE_PINNED, @@ -115,7 +115,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu public static final int ACTIVITY_TYPE_ASSISTANT = 4; /** @hide */ - @IntDef({ + @IntDef(prefix = { "ACTIVITY_TYPE_" }, value = { ACTIVITY_TYPE_UNDEFINED, ACTIVITY_TYPE_STANDARD, ACTIVITY_TYPE_HOME, @@ -138,13 +138,12 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu public static final int WINDOW_CONFIG_ACTIVITY_TYPE = 1 << 3; /** @hide */ - @IntDef(flag = true, - value = { - WINDOW_CONFIG_BOUNDS, - WINDOW_CONFIG_APP_BOUNDS, - WINDOW_CONFIG_WINDOWING_MODE, - WINDOW_CONFIG_ACTIVITY_TYPE - }) + @IntDef(flag = true, prefix = { "WINDOW_CONFIG_" }, value = { + WINDOW_CONFIG_BOUNDS, + WINDOW_CONFIG_APP_BOUNDS, + WINDOW_CONFIG_WINDOWING_MODE, + WINDOW_CONFIG_ACTIVITY_TYPE + }) public @interface WindowConfig {} public WindowConfiguration() { diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index d0d98c9fb10f..2e697ac0e6bb 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -368,9 +368,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - BUGREPORT_FAILURE_FAILED_COMPLETING, - BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE + @IntDef(prefix = { "BUGREPORT_FAILURE_" }, value = { + BUGREPORT_FAILURE_FAILED_COMPLETING, + BUGREPORT_FAILURE_FILE_NO_LONGER_AVAILABLE }) public @interface BugreportFailureCode {} diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index cfff3614a8e4..70153c7d7f6b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -16,7 +16,9 @@ package android.app.admin; +import android.annotation.CallbackExecutor; import android.annotation.ColorInt; +import android.annotation.Condemned; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; @@ -49,6 +51,7 @@ import android.net.ProxyInfo; import android.net.Uri; import android.os.Bundle; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.Parcelable; import android.os.PersistableBundle; import android.os.Process; @@ -61,6 +64,9 @@ import android.security.AttestedKeyPair; import android.security.Credentials; import android.security.KeyChain; import android.security.KeyChainException; +import android.security.keymaster.KeymasterCertificateChain; +import android.security.keystore.AttestationUtils; +import android.security.keystore.KeyAttestationException; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.ParcelableKeyGenParameterSpec; import android.service.restrictions.RestrictionsReceiver; @@ -94,6 +100,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.concurrent.Executor; /** * Public interface for managing policies enforced on a device. Most clients of this class must be @@ -1372,8 +1379,13 @@ public class DevicePolicyManager { /** * @hide */ - @IntDef({STATE_USER_UNMANAGED, STATE_USER_SETUP_INCOMPLETE, STATE_USER_SETUP_COMPLETE, - STATE_USER_SETUP_FINALIZED, STATE_USER_PROFILE_COMPLETE}) + @IntDef(prefix = { "STATE_USER_" }, value = { + STATE_USER_UNMANAGED, + STATE_USER_SETUP_INCOMPLETE, + STATE_USER_SETUP_COMPLETE, + STATE_USER_SETUP_FINALIZED, + STATE_USER_PROFILE_COMPLETE + }) @Retention(RetentionPolicy.SOURCE) public @interface UserProvisioningState {} @@ -1546,11 +1558,13 @@ public class DevicePolicyManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({CODE_OK, CODE_HAS_DEVICE_OWNER, CODE_USER_HAS_PROFILE_OWNER, CODE_USER_NOT_RUNNING, + @IntDef(prefix = { "CODE_" }, value = { + CODE_OK, CODE_HAS_DEVICE_OWNER, CODE_USER_HAS_PROFILE_OWNER, CODE_USER_NOT_RUNNING, CODE_USER_SETUP_COMPLETED, CODE_NOT_SYSTEM_USER, CODE_HAS_PAIRED, CODE_MANAGED_USERS_NOT_SUPPORTED, CODE_SYSTEM_USER, CODE_CANNOT_ADD_MANAGED_PROFILE, CODE_NOT_SYSTEM_USER_SPLIT, CODE_DEVICE_ADMIN_NOT_SUPPORTED, - CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER, CODE_ADD_MANAGED_PROFILE_DISALLOWED}) + CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER, CODE_ADD_MANAGED_PROFILE_DISALLOWED + }) public @interface ProvisioningPreCondition {} /** @@ -1632,11 +1646,15 @@ public class DevicePolicyManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = {LOCK_TASK_FEATURE_NONE, LOCK_TASK_FEATURE_SYSTEM_INFO, - LOCK_TASK_FEATURE_NOTIFICATIONS, LOCK_TASK_FEATURE_HOME, - LOCK_TASK_FEATURE_RECENTS, LOCK_TASK_FEATURE_GLOBAL_ACTIONS, - LOCK_TASK_FEATURE_KEYGUARD}) + @IntDef(flag = true, prefix = { "LOCK_TASK_FEATURE_" }, value = { + LOCK_TASK_FEATURE_NONE, + LOCK_TASK_FEATURE_SYSTEM_INFO, + LOCK_TASK_FEATURE_NOTIFICATIONS, + LOCK_TASK_FEATURE_HOME, + LOCK_TASK_FEATURE_RECENTS, + LOCK_TASK_FEATURE_GLOBAL_ACTIONS, + LOCK_TASK_FEATURE_KEYGUARD + }) public @interface LockTaskFeature {} /** @@ -3165,7 +3183,9 @@ public class DevicePolicyManager { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY}) + @IntDef(flag = true, prefix = { "FLAG_EVICT_" }, value = { + FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY + }) public @interface LockNowFlag {} /** @@ -3988,15 +4008,27 @@ public class DevicePolicyManager { try { final ParcelableKeyGenParameterSpec parcelableSpec = new ParcelableKeyGenParameterSpec(keySpec); + KeymasterCertificateChain attestationChain = new KeymasterCertificateChain(); final boolean success = mService.generateKeyPair( - admin, mContext.getPackageName(), algorithm, parcelableSpec); + admin, mContext.getPackageName(), algorithm, parcelableSpec, attestationChain); if (!success) { Log.e(TAG, "Error generating key via DevicePolicyManagerService."); return null; } - final KeyPair keyPair = KeyChain.getKeyPair(mContext, keySpec.getKeystoreAlias()); - return new AttestedKeyPair(keyPair, null); + final String alias = keySpec.getKeystoreAlias(); + final KeyPair keyPair = KeyChain.getKeyPair(mContext, alias); + Certificate[] outputChain = null; + try { + if (AttestationUtils.isChainValid(attestationChain)) { + outputChain = AttestationUtils.parseCertificateChain(attestationChain); + } + } catch (KeyAttestationException e) { + Log.e(TAG, "Error parsing attestation chain for alias " + alias, e); + mService.removeKeyPair(admin, mContext.getPackageName(), alias); + return null; + } + return new AttestedKeyPair(keyPair, outputChain); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } catch (KeyChainException e) { @@ -4278,16 +4310,16 @@ public class DevicePolicyManager { /** * Called by a device owner to request a bugreport. * <p> - * If the device contains secondary users or profiles, they must be affiliated with the device - * owner user. Otherwise a {@link SecurityException} will be thrown. See - * {@link #setAffiliationIds}. + * If the device contains secondary users or profiles, they must be affiliated with the device. + * Otherwise a {@link SecurityException} will be thrown. See {@link #isAffiliatedUser}. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @return {@code true} if the bugreport collection started successfully, or {@code false} if it * wasn't triggered because a previous bugreport operation is still active (either the * bugreport is still running or waiting for the user to share or decline) * @throws SecurityException if {@code admin} is not a device owner, or there is at least one - * profile or secondary user that is not affiliated with the device owner user. + * profile or secondary user that is not affiliated with the device. + * @see #isAffiliatedUser */ public boolean requestBugreport(@NonNull ComponentName admin) { throwIfParentInstance("requestBugreport"); @@ -6229,12 +6261,13 @@ public class DevicePolicyManager { /** * @hide */ - @IntDef( - flag = true, - prefix = {"SKIP_", "MAKE_USER_", "START_", "LEAVE_"}, - value = {SKIP_SETUP_WIZARD, MAKE_USER_EPHEMERAL, MAKE_USER_DEMO, - START_USER_IN_BACKGROUND, LEAVE_ALL_SYSTEM_APPS_ENABLED} - ) + @IntDef(flag = true, prefix = { "SKIP_", "MAKE_USER_", "START_", "LEAVE_" }, value = { + SKIP_SETUP_WIZARD, + MAKE_USER_EPHEMERAL, + MAKE_USER_DEMO, + START_USER_IN_BACKGROUND, + LEAVE_ALL_SYSTEM_APPS_ENABLED + }) @Retention(RetentionPolicy.SOURCE) public @interface CreateAndManageUserFlags {} @@ -6335,14 +6368,14 @@ public class DevicePolicyManager { } /** - * Called by a profile owner that is affiliated with the device owner to stop the calling user + * Called by a profile owner that is affiliated with the device to stop the calling user * and switch back to primary. * <p> This has no effect when called on a managed profile. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @return {@code true} if the exit was successful, {@code false} otherwise. - * @throws SecurityException if {@code admin} is not a profile owner affiliated with the device - * owner. + * @throws SecurityException if {@code admin} is not a profile owner affiliated with the device. + * @see #isAffiliatedUser */ public boolean logoutUser(@NonNull ComponentName admin) { throwIfParentInstance("logoutUser"); @@ -6630,7 +6663,7 @@ public class DevicePolicyManager { * This function can be called by a device owner, profile owner or a delegate given * the {@link #DELEGATION_INSTALL_EXISTING_PACKAGE} scope via {@link #setDelegatedScopes}. * When called in a secondary user or managed profile, the user/profile must be affiliated with - * the device owner. See {@link #setAffiliationIds}. + * the device. See {@link #isAffiliatedUser}. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageName The package to be installed in the calling profile. @@ -6639,7 +6672,7 @@ public class DevicePolicyManager { * an affiliated user or profile. * @see #setKeepUninstalledPackages * @see #setDelegatedScopes - * @see #setAffiliationIds + * @see #isAffiliatedUser * @see #DELEGATION_PACKAGE_ACCESS */ public boolean installExistingPackage(@NonNull ComponentName admin, String packageName) { @@ -6726,13 +6759,14 @@ public class DevicePolicyManager { * package list results in locked tasks belonging to those packages to be finished. * <p> * This function can only be called by the device owner or by a profile owner of a user/profile - * that is affiliated with the device owner user. See {@link #setAffiliationIds}. Any packages + * that is affiliated with the device. See {@link #isAffiliatedUser}. Any packages * set via this method will be cleared if the user becomes unaffiliated. * * @param packages The list of packages allowed to enter lock task mode * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of * an affiliated user or profile. + * @see #isAffiliatedUser * @see Activity#startLockTask() * @see DeviceAdminReceiver#onLockTaskModeEntering(Context, Intent, String) * @see DeviceAdminReceiver#onLockTaskModeExiting(Context, Intent) @@ -6755,6 +6789,7 @@ public class DevicePolicyManager { * * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of * an affiliated user or profile. + * @see #isAffiliatedUser * @see #setLockTaskPackages */ public @NonNull String[] getLockTaskPackages(@NonNull ComponentName admin) { @@ -6794,7 +6829,7 @@ public class DevicePolicyManager { * enabled. * <p> * This function can only be called by the device owner or by a profile owner of a user/profile - * that is affiliated with the device owner user. See {@link #setAffiliationIds}. Any features + * that is affiliated with the device. See {@link #isAffiliatedUser}. Any features * set via this method will be cleared if the user becomes unaffiliated. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. @@ -6808,6 +6843,7 @@ public class DevicePolicyManager { * {@link #LOCK_TASK_FEATURE_KEYGUARD} * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of * an affiliated user or profile. + * @see #isAffiliatedUser */ public void setLockTaskFeatures(@NonNull ComponentName admin, @LockTaskFeature int flags) { throwIfParentInstance("setLockTaskFeatures"); @@ -6827,7 +6863,8 @@ public class DevicePolicyManager { * @return bitfield of flags. See {@link #setLockTaskFeatures(ComponentName, int)} for a list. * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of * an affiliated user or profile. - * @see #setLockTaskFeatures(ComponentName, int) + * @see #isAffiliatedUser + * @see #setLockTaskFeatures */ public @LockTaskFeature int getLockTaskFeatures(@NonNull ComponentName admin) { throwIfParentInstance("getLockTaskFeatures"); @@ -7825,6 +7862,7 @@ public class DevicePolicyManager { * @param admin Which device owner this request is associated with. * @param enabled whether security logging should be enabled or not. * @throws SecurityException if {@code admin} is not a device owner. + * @see #setAffiliationIds * @see #retrieveSecurityLogs */ public void setSecurityLoggingEnabled(@NonNull ComponentName admin, boolean enabled) { @@ -7863,14 +7901,14 @@ public class DevicePolicyManager { * owner has been notified via {@link DeviceAdminReceiver#onSecurityLogsAvailable}. * * <p>If there is any other user or profile on the device, it must be affiliated with the - * device owner. Otherwise a {@link SecurityException} will be thrown. See - * {@link #setAffiliationIds} + * device. Otherwise a {@link SecurityException} will be thrown. See {@link #isAffiliatedUser}. * * @param admin Which device owner this request is associated with. * @return the new batch of security logs which is a list of {@link SecurityEvent}, * or {@code null} if rate limitation is exceeded or if logging is currently disabled. * @throws SecurityException if {@code admin} is not a device owner, or there is at least one - * profile or secondary user that is not affiliated with the device owner user. + * profile or secondary user that is not affiliated with the device. + * @see #isAffiliatedUser * @see DeviceAdminReceiver#onSecurityLogsAvailable */ public @Nullable List<SecurityEvent> retrieveSecurityLogs(@NonNull ComponentName admin) { @@ -7913,14 +7951,14 @@ public class DevicePolicyManager { * about data corruption when parsing. </strong> * * <p>If there is any other user or profile on the device, it must be affiliated with the - * device owner. Otherwise a {@link SecurityException} will be thrown. See - * {@link #setAffiliationIds} + * device. Otherwise a {@link SecurityException} will be thrown. See {@link #isAffiliatedUser}. * * @param admin Which device owner this request is associated with. * @return Device logs from before the latest reboot of the system, or {@code null} if this API * is not supported on the device. * @throws SecurityException if {@code admin} is not a device owner, or there is at least one - * profile or secondary user that is not affiliated with the device owner user. + * profile or secondary user that is not affiliated with the device. + * @see #isAffiliatedUser * @see #retrieveSecurityLogs */ public @Nullable List<SecurityEvent> retrievePreRebootSecurityLogs( @@ -8128,6 +8166,9 @@ public class DevicePolicyManager { * Indicates the entity that controls the device or profile owner. Two users/profiles are * affiliated if the set of ids set by their device or profile owners intersect. * + * <p>A user/profile that is affiliated with the device owner user is considered to be + * affiliated with the device. + * * <p><strong>Note:</strong> Features that depend on user affiliation (such as security logging * or {@link #bindDeviceAdminServiceAsUser}) won't be available when a secondary user or profile * is created, until it becomes affiliated. Therefore it is recommended that the appropriate @@ -8138,6 +8179,7 @@ public class DevicePolicyManager { * @param ids A set of opaque non-empty affiliation ids. * * @throws IllegalArgumentException if {@code ids} is null or contains an empty string. + * @see #isAffiliatedUser */ public void setAffiliationIds(@NonNull ComponentName admin, @NonNull Set<String> ids) { throwIfParentInstance("setAffiliationIds"); @@ -8165,13 +8207,12 @@ public class DevicePolicyManager { } /** - * @hide * Returns whether this user/profile is affiliated with the device. * <p> * By definition, the user that the device owner runs on is always affiliated with the device. * Any other user/profile is considered affiliated with the device if the set specified by its * profile owner via {@link #setAffiliationIds} intersects with the device owner's. - * + * @see #setAffiliationIds */ public boolean isAffiliatedUser() { throwIfParentInstance("isAffiliatedUser"); @@ -8384,6 +8425,7 @@ public class DevicePolicyManager { * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param enabled whether network logging should be enabled or not. * @throws SecurityException if {@code admin} is not a device owner. + * @see #setAffiliationIds * @see #retrieveNetworkLogs */ public void setNetworkLoggingEnabled(@NonNull ComponentName admin, boolean enabled) { @@ -8439,7 +8481,8 @@ public class DevicePolicyManager { * {@code null} if the batch represented by batchToken is no longer available or if * logging is disabled. * @throws SecurityException if {@code admin} is not a device owner, or there is at least one - * profile or secondary user that is not affiliated with the device owner user. + * profile or secondary user that is not affiliated with the device. + * @see #setAffiliationIds * @see DeviceAdminReceiver#onNetworkLogsAvailable */ public @Nullable List<NetworkEvent> retrieveNetworkLogs(@NonNull ComponentName admin, @@ -8617,6 +8660,15 @@ public class DevicePolicyManager { } } + /** {@hide} */ + @Condemned + @Deprecated + public boolean clearApplicationUserData(@NonNull ComponentName admin, + @NonNull String packageName, @NonNull OnClearApplicationUserDataListener listener, + @NonNull Handler handler) { + return clearApplicationUserData(admin, packageName, listener, new HandlerExecutor(handler)); + } + /** * Called by the device owner or profile owner to clear application user data of a given * package. The behaviour of this is equivalent to the target application calling @@ -8628,19 +8680,20 @@ public class DevicePolicyManager { * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageName The name of the package which will have its user data wiped. * @param listener A callback object that will inform the caller when the clearing is done. - * @param handler The handler indicating the thread on which the listener should be invoked. + * @param executor The executor through which the listener should be invoked. * @throws SecurityException if the caller is not the device owner/profile owner. * @return whether the clearing succeeded. */ public boolean clearApplicationUserData(@NonNull ComponentName admin, @NonNull String packageName, @NonNull OnClearApplicationUserDataListener listener, - @NonNull Handler handler) { + @NonNull @CallbackExecutor Executor executor) { throwIfParentInstance("clearAppData"); + Preconditions.checkNotNull(executor); try { return mService.clearApplicationUserData(admin, packageName, new IPackageDataObserver.Stub() { public void onRemoveCompleted(String pkg, boolean succeeded) { - handler.post(() -> + executor.execute(() -> listener.onApplicationUserDataCleared(pkg, succeeded)); } }); @@ -8715,4 +8768,44 @@ public class DevicePolicyManager { throw re.rethrowFromSystemServer(); } } + + //TODO STOPSHIP Add link to onTransferComplete callback when implemented. + /** + * Transfers the current administrator. All policies from the current administrator are + * migrated to the new administrator. The whole operation is atomic - the transfer is either + * complete or not done at all. + * + * Depending on the current administrator (device owner, profile owner, corporate owned + * profile owner), you have the following expected behaviour: + * <ul> + * <li>A device owner can only be transferred to a new device owner</li> + * <li>A profile owner can only be transferred to a new profile owner</li> + * <li>A corporate owned managed profile can have two cases: + * <ul> + * <li>If the device owner and profile owner are the same package, + * both will be transferred.</li> + * <li>If the device owner and profile owner are different packages, + * and if this method is called from the profile owner, only the profile owner + * is transferred. Similarly, if it is called from the device owner, only + * the device owner is transferred.</li> + * </ul> + * </li> + * </ul> + * + * @param admin Which {@link DeviceAdminReceiver} this request is associated with. + * @param target Which {@link DeviceAdminReceiver} we want the new administrator to be. + * @param bundle Parameters - This bundle allows the current administrator to pass data to the + * new administrator. The parameters will be received in the + * onTransferComplete callback. + * @hide + */ + public void transferOwner(@NonNull ComponentName admin, @NonNull ComponentName target, + PersistableBundle bundle) { + throwIfParentInstance("transferOwner"); + try { + mService.transferOwner(admin, target, bundle); + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } + } } diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index b76618b25e7d..2e5359492dab 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -36,6 +36,7 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.RemoteCallback; import android.os.UserHandle; +import android.security.keymaster.KeymasterCertificateChain; import android.security.keystore.ParcelableKeyGenParameterSpec; import java.util.List; @@ -166,7 +167,9 @@ interface IDevicePolicyManager { in byte[] certBuffer, in byte[] certChainBuffer, String alias, boolean requestAccess, boolean isUserSelectable); boolean removeKeyPair(in ComponentName who, in String callerPackage, String alias); - boolean generateKeyPair(in ComponentName who, in String callerPackage, in String algorithm, in ParcelableKeyGenParameterSpec keySpec); + boolean generateKeyPair(in ComponentName who, in String callerPackage, in String algorithm, + in ParcelableKeyGenParameterSpec keySpec, + out KeymasterCertificateChain attestationChain); void choosePrivateKeyAlias(int uid, in Uri uri, in String alias, IBinder aliasCallback); void setDelegatedScopes(in ComponentName who, in String delegatePackage, in List<String> scopes); @@ -378,4 +381,5 @@ interface IDevicePolicyManager { boolean isLogoutEnabled(); List<String> getDisallowedSystemApps(in ComponentName admin, int userId, String provisioningAction); + void transferOwner(in ComponentName admin, in ComponentName target, in PersistableBundle bundle); } diff --git a/core/java/android/app/admin/PasswordMetrics.java b/core/java/android/app/admin/PasswordMetrics.java index 4658a47444f9..5fee853275fb 100644 --- a/core/java/android/app/admin/PasswordMetrics.java +++ b/core/java/android/app/admin/PasswordMetrics.java @@ -223,7 +223,12 @@ public class PasswordMetrics implements Parcelable { } @Retention(RetentionPolicy.SOURCE) - @IntDef({CHAR_UPPER_CASE, CHAR_LOWER_CASE, CHAR_DIGIT, CHAR_SYMBOL}) + @IntDef(prefix = { "CHAR_" }, value = { + CHAR_UPPER_CASE, + CHAR_LOWER_CASE, + CHAR_DIGIT, + CHAR_SYMBOL + }) private @interface CharacterCatagory {} private static final int CHAR_LOWER_CASE = 0; private static final int CHAR_UPPER_CASE = 1; diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index 2b590e0d4301..0f93c59282df 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -43,10 +43,17 @@ public class SecurityLog { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({TAG_ADB_SHELL_INTERACTIVE, TAG_ADB_SHELL_CMD, TAG_SYNC_RECV_FILE, TAG_SYNC_SEND_FILE, - TAG_APP_PROCESS_START, TAG_KEYGUARD_DISMISSED, TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT, - TAG_KEYGUARD_SECURED}) - public @interface SECURITY_LOG_TAG {} + @IntDef(prefix = { "TAG_" }, value = { + TAG_ADB_SHELL_INTERACTIVE, + TAG_ADB_SHELL_CMD, + TAG_SYNC_RECV_FILE, + TAG_SYNC_SEND_FILE, + TAG_APP_PROCESS_START, + TAG_KEYGUARD_DISMISSED, + TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT, + TAG_KEYGUARD_SECURED + }) + public @interface SecurityLogTag {} /** * Indicate that an ADB interactive shell was opened via "adb shell". @@ -143,13 +150,8 @@ public class SecurityLog { /** * Returns the tag of this log entry, which specifies entry's semantics. - * Could be one of {@link SecurityLog#TAG_SYNC_RECV_FILE}, - * {@link SecurityLog#TAG_SYNC_SEND_FILE}, {@link SecurityLog#TAG_ADB_SHELL_CMD}, - * {@link SecurityLog#TAG_ADB_SHELL_INTERACTIVE}, {@link SecurityLog#TAG_APP_PROCESS_START}, - * {@link SecurityLog#TAG_KEYGUARD_DISMISSED}, {@link SecurityLog#TAG_KEYGUARD_SECURED}, - * {@link SecurityLog#TAG_KEYGUARD_DISMISS_AUTH_ATTEMPT}. */ - public @SECURITY_LOG_TAG int getTag() { + public @SecurityLogTag int getTag() { return mEvent.getTag(); } diff --git a/core/java/android/app/admin/SystemUpdateInfo.java b/core/java/android/app/admin/SystemUpdateInfo.java index fa31273eff7b..b0376b503fd9 100644 --- a/core/java/android/app/admin/SystemUpdateInfo.java +++ b/core/java/android/app/admin/SystemUpdateInfo.java @@ -52,7 +52,11 @@ public final class SystemUpdateInfo implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SECURITY_PATCH_STATE_FALSE, SECURITY_PATCH_STATE_TRUE, SECURITY_PATCH_STATE_UNKNOWN}) + @IntDef(prefix = { "SECURITY_PATCH_STATE_" }, value = { + SECURITY_PATCH_STATE_FALSE, + SECURITY_PATCH_STATE_TRUE, + SECURITY_PATCH_STATE_UNKNOWN + }) public @interface SecurityPatchState {} private static final String ATTR_RECEIVED_TIME = "received-time"; diff --git a/core/java/android/app/admin/SystemUpdatePolicy.java b/core/java/android/app/admin/SystemUpdatePolicy.java index 995d98a7bb36..232a688762de 100644 --- a/core/java/android/app/admin/SystemUpdatePolicy.java +++ b/core/java/android/app/admin/SystemUpdatePolicy.java @@ -36,10 +36,11 @@ import java.lang.annotation.RetentionPolicy; public class SystemUpdatePolicy implements Parcelable { /** @hide */ - @IntDef({ - TYPE_INSTALL_AUTOMATIC, - TYPE_INSTALL_WINDOWED, - TYPE_POSTPONE}) + @IntDef(prefix = { "TYPE_" }, value = { + TYPE_INSTALL_AUTOMATIC, + TYPE_INSTALL_WINDOWED, + TYPE_POSTPONE + }) @Retention(RetentionPolicy.SOURCE) @interface SystemUpdatePolicyType {} diff --git a/core/java/android/app/servertransaction/ActivityLifecycleItem.java b/core/java/android/app/servertransaction/ActivityLifecycleItem.java index 24141e5152b9..0fdc7c56fd01 100644 --- a/core/java/android/app/servertransaction/ActivityLifecycleItem.java +++ b/core/java/android/app/servertransaction/ActivityLifecycleItem.java @@ -27,8 +27,17 @@ import java.lang.annotation.RetentionPolicy; */ public abstract class ActivityLifecycleItem extends ClientTransactionItem { - @IntDef({UNDEFINED, PRE_ON_CREATE, ON_CREATE, ON_START, ON_RESUME, ON_PAUSE, ON_STOP, - ON_DESTROY, ON_RESTART}) + @IntDef(prefix = { "UNDEFINED", "PRE_", "ON_" }, value = { + UNDEFINED, + PRE_ON_CREATE, + ON_CREATE, + ON_START, + ON_RESUME, + ON_PAUSE, + ON_STOP, + ON_DESTROY, + ON_RESTART + }) @Retention(RetentionPolicy.SOURCE) public @interface LifecycleState{} public static final int UNDEFINED = -1; diff --git a/core/java/android/app/slice/ISliceListener.aidl b/core/java/android/app/slice/ISliceListener.aidl new file mode 100644 index 000000000000..d293fd46d298 --- /dev/null +++ b/core/java/android/app/slice/ISliceListener.aidl @@ -0,0 +1,25 @@ +/** + * 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.app.slice; + +import android.app.slice.ISliceManager; +import android.app.slice.Slice; + +/** @hide */ +oneway interface ISliceListener { + void onSliceUpdated(in Slice s); +} diff --git a/core/java/android/app/slice/ISliceManager.aidl b/core/java/android/app/slice/ISliceManager.aidl index 6e52f385bcf7..5f0e542f4b12 100644 --- a/core/java/android/app/slice/ISliceManager.aidl +++ b/core/java/android/app/slice/ISliceManager.aidl @@ -16,6 +16,17 @@ package android.app.slice; +import android.app.slice.ISliceListener; +import android.app.slice.SliceSpec; +import android.net.Uri; + /** @hide */ interface ISliceManager { + void addSliceListener(in Uri uri, String pkg, in ISliceListener listener, + in SliceSpec[] specs); + void removeSliceListener(in Uri uri, String pkg, in ISliceListener listener); + void pinSlice(String pkg, in Uri uri, in SliceSpec[] specs); + void unpinSlice(String pkg, in Uri uri); + boolean hasSliceAccess(String pkg); + SliceSpec[] getPinnedSpecs(in Uri uri, String pkg); } diff --git a/core/java/android/app/slice/Slice.aidl b/core/java/android/app/slice/Slice.aidl new file mode 100644 index 000000000000..e097f9d09a9a --- /dev/null +++ b/core/java/android/app/slice/Slice.aidl @@ -0,0 +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.app.slice; + +parcelable Slice; diff --git a/core/java/android/app/slice/Slice.java b/core/java/android/app/slice/Slice.java index b13067ee97e3..e61e8b290519 100644 --- a/core/java/android/app/slice/Slice.java +++ b/core/java/android/app/slice/Slice.java @@ -125,6 +125,11 @@ public final class Slice implements Parcelable { */ public static final String HINT_HIDDEN = "hidden"; /** + * Hint indicating this content should be shown instead of the normal content when the slice + * is in small format. + */ + public static final String HINT_SUMMARY = "summary"; + /** * Hint to indicate that this content has a toggle action associated with it. To indicate that * the toggle is on, use {@link #HINT_SELECTED}. When the toggle state changes, the intent * associated with it will be sent along with an extra {@link #EXTRA_TOGGLE_STATE} which can be diff --git a/core/java/android/app/slice/SliceManager.java b/core/java/android/app/slice/SliceManager.java index e99f67632712..f8e19c12b810 100644 --- a/core/java/android/app/slice/SliceManager.java +++ b/core/java/android/app/slice/SliceManager.java @@ -17,8 +17,11 @@ package android.app.slice; import android.annotation.SystemService; +import android.app.slice.ISliceListener.Stub; import android.content.Context; +import android.net.Uri; import android.os.Handler; +import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceManager.ServiceNotFoundException; @@ -36,4 +39,93 @@ public class SliceManager { mService = ISliceManager.Stub.asInterface( ServiceManager.getServiceOrThrow(Context.SLICE_SERVICE)); } + + /** + */ + public void addSliceListener(Uri uri, SliceListener listener, SliceSpec[] specs) { + try { + mService.addSliceListener(uri, mContext.getPackageName(), listener.mStub, specs); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + */ + public void removeSliceListener(Uri uri, SliceListener listener) { + try { + mService.removeSliceListener(uri, mContext.getPackageName(), listener.mStub); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + */ + public void pinSlice(Uri uri, SliceSpec[] specs) { + try { + mService.pinSlice(mContext.getPackageName(), uri, specs); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + */ + public void unpinSlice(Uri uri) { + try { + mService.unpinSlice(mContext.getPackageName(), uri); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + */ + public boolean hasSliceAccess() { + try { + return mService.hasSliceAccess(mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + */ + public SliceSpec[] getPinnedSpecs(Uri uri) { + try { + return mService.getPinnedSpecs(uri, mContext.getPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** + */ + public abstract static class SliceListener { + private final Handler mHandler; + + /** + */ + public SliceListener() { + this(Handler.getMain()); + } + + /** + */ + public SliceListener(Handler h) { + mHandler = h; + } + + /** + */ + public abstract void onSliceUpdated(Slice s); + + private final ISliceListener.Stub mStub = new Stub() { + @Override + public void onSliceUpdated(Slice s) throws RemoteException { + mHandler.post(() -> SliceListener.this.onSliceUpdated(s)); + } + }; + } } diff --git a/core/java/android/app/slice/SliceProvider.java b/core/java/android/app/slice/SliceProvider.java index ac5365c35f49..7dcd2fead73f 100644 --- a/core/java/android/app/slice/SliceProvider.java +++ b/core/java/android/app/slice/SliceProvider.java @@ -105,6 +105,14 @@ public abstract class SliceProvider extends ContentProvider { /** * @hide */ + public static final String METHOD_PIN = "pin"; + /** + * @hide + */ + public static final String METHOD_UNPIN = "unpin"; + /** + * @hide + */ public static final String EXTRA_INTENT = "slice_intent"; /** * @hide @@ -143,6 +151,18 @@ public abstract class SliceProvider extends ContentProvider { } /** + * @hide + */ + public void onSlicePinned(Uri sliceUri) { + } + + /** + * @hide + */ + public void onSliceUnpinned(Uri sliceUri) { + } + + /** * This method must be overridden if an {@link IntentFilter} is specified on the SliceProvider. * In that case, this method can be called and is expected to return a non-null Uri representing * a slice. Otherwise this will throw {@link UnsupportedOperationException}. @@ -221,6 +241,7 @@ public abstract class SliceProvider extends ContentProvider { getContext().enforceCallingPermission(permission.BIND_SLICE, "Slice binding requires the permission BIND_SLICE"); Intent intent = extras.getParcelable(EXTRA_INTENT); + if (intent == null) return null; Uri uri = onMapIntentToUri(intent); List<SliceSpec> supportedSpecs = extras.getParcelableArrayList(EXTRA_SUPPORTED_SPECS); Bundle b = new Bundle(); @@ -231,10 +252,62 @@ public abstract class SliceProvider extends ContentProvider { b.putParcelable(EXTRA_SLICE, null); } return b; + } else if (method.equals(METHOD_PIN)) { + Uri uri = extras.getParcelable(EXTRA_BIND_URI); + if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.myUid())) { + getContext().enforceUriPermission(uri, permission.BIND_SLICE, + permission.BIND_SLICE, Binder.getCallingPid(), Binder.getCallingUid(), + Intent.FLAG_GRANT_WRITE_URI_PERMISSION, + "Slice binding requires the permission BIND_SLICE"); + } + handlePinSlice(uri); + } else if (method.equals(METHOD_UNPIN)) { + Uri uri = extras.getParcelable(EXTRA_BIND_URI); + if (!UserHandle.isSameApp(Binder.getCallingUid(), Process.myUid())) { + getContext().enforceUriPermission(uri, permission.BIND_SLICE, + permission.BIND_SLICE, Binder.getCallingPid(), Binder.getCallingUid(), + Intent.FLAG_GRANT_WRITE_URI_PERMISSION, + "Slice binding requires the permission BIND_SLICE"); + } + handleUnpinSlice(uri); } return super.call(method, arg, extras); } + private void handlePinSlice(Uri sliceUri) { + if (Looper.myLooper() == Looper.getMainLooper()) { + onSlicePinned(sliceUri); + } else { + CountDownLatch latch = new CountDownLatch(1); + Handler.getMain().post(() -> { + onSlicePinned(sliceUri); + latch.countDown(); + }); + try { + latch.await(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + } + + private void handleUnpinSlice(Uri sliceUri) { + if (Looper.myLooper() == Looper.getMainLooper()) { + onSliceUnpinned(sliceUri); + } else { + CountDownLatch latch = new CountDownLatch(1); + Handler.getMain().post(() -> { + onSliceUnpinned(sliceUri); + latch.countDown(); + }); + try { + latch.await(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + } + private Slice handleBindSlice(Uri sliceUri, List<SliceSpec> supportedSpecs) { if (Looper.myLooper() == Looper.getMainLooper()) { return onBindSliceStrict(sliceUri, supportedSpecs); diff --git a/core/java/android/app/slice/SliceSpec.aidl b/core/java/android/app/slice/SliceSpec.aidl new file mode 100644 index 000000000000..92e98b78a7e8 --- /dev/null +++ b/core/java/android/app/slice/SliceSpec.aidl @@ -0,0 +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.app.slice; + +parcelable SliceSpec; diff --git a/core/java/android/app/slice/SliceSpec.java b/core/java/android/app/slice/SliceSpec.java index 433b67e9aacb..8cc0384c1007 100644 --- a/core/java/android/app/slice/SliceSpec.java +++ b/core/java/android/app/slice/SliceSpec.java @@ -103,6 +103,11 @@ public final class SliceSpec implements Parcelable { return mType.equals(other.mType) && mRevision == other.mRevision; } + @Override + public String toString() { + return String.format("SliceSpec{%s,%d}", mType, mRevision); + } + public static final Creator<SliceSpec> CREATOR = new Creator<SliceSpec>() { @Override public SliceSpec createFromParcel(Parcel source) { diff --git a/core/java/android/app/timezone/Callback.java b/core/java/android/app/timezone/Callback.java index aea8038056ab..e3840be6fe10 100644 --- a/core/java/android/app/timezone/Callback.java +++ b/core/java/android/app/timezone/Callback.java @@ -30,9 +30,14 @@ import java.lang.annotation.RetentionPolicy; public abstract class Callback { @Retention(RetentionPolicy.SOURCE) - @IntDef({SUCCESS, ERROR_UNKNOWN_FAILURE, ERROR_INSTALL_BAD_DISTRO_STRUCTURE, - ERROR_INSTALL_BAD_DISTRO_FORMAT_VERSION, ERROR_INSTALL_RULES_TOO_OLD, - ERROR_INSTALL_VALIDATION_ERROR}) + @IntDef(prefix = { "SUCCESS", "ERROR_" }, value = { + SUCCESS, + ERROR_UNKNOWN_FAILURE, + ERROR_INSTALL_BAD_DISTRO_STRUCTURE, + ERROR_INSTALL_BAD_DISTRO_FORMAT_VERSION, + ERROR_INSTALL_RULES_TOO_OLD, + ERROR_INSTALL_VALIDATION_ERROR + }) public @interface AsyncResultCode {} /** diff --git a/core/java/android/app/timezone/RulesManager.java b/core/java/android/app/timezone/RulesManager.java index 417e7d26f4f5..0a38eb9ae777 100644 --- a/core/java/android/app/timezone/RulesManager.java +++ b/core/java/android/app/timezone/RulesManager.java @@ -69,7 +69,11 @@ public final class RulesManager { private static final boolean DEBUG = false; @Retention(RetentionPolicy.SOURCE) - @IntDef({SUCCESS, ERROR_UNKNOWN_FAILURE, ERROR_OPERATION_IN_PROGRESS}) + @IntDef(prefix = { "SUCCESS", "ERROR_" }, value = { + SUCCESS, + ERROR_UNKNOWN_FAILURE, + ERROR_OPERATION_IN_PROGRESS + }) public @interface ResultCode {} /** diff --git a/core/java/android/app/timezone/RulesState.java b/core/java/android/app/timezone/RulesState.java index ec247ebf502f..16309fab0924 100644 --- a/core/java/android/app/timezone/RulesState.java +++ b/core/java/android/app/timezone/RulesState.java @@ -63,11 +63,12 @@ import java.lang.annotation.RetentionPolicy; public final class RulesState implements Parcelable { @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "STAGED_OPERATION_" }, value = { STAGED_OPERATION_UNKNOWN, STAGED_OPERATION_NONE, STAGED_OPERATION_UNINSTALL, - STAGED_OPERATION_INSTALL }) + STAGED_OPERATION_INSTALL + }) private @interface StagedOperationType {} /** Staged state could not be determined. */ @@ -80,10 +81,11 @@ public final class RulesState implements Parcelable { public static final int STAGED_OPERATION_INSTALL = 3; @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "DISTRO_STATUS_" }, value = { DISTRO_STATUS_UNKNOWN, DISTRO_STATUS_NONE, - DISTRO_STATUS_INSTALLED }) + DISTRO_STATUS_INSTALLED + }) private @interface DistroStatus {} /** The current distro status could not be determined. */ diff --git a/core/java/android/app/usage/NetworkStats.java b/core/java/android/app/usage/NetworkStats.java index 222e9a0e5e0c..2e44a630b056 100644 --- a/core/java/android/app/usage/NetworkStats.java +++ b/core/java/android/app/usage/NetworkStats.java @@ -129,7 +129,11 @@ public final class NetworkStats implements AutoCloseable { */ public static class Bucket { /** @hide */ - @IntDef({STATE_ALL, STATE_DEFAULT, STATE_FOREGROUND}) + @IntDef(prefix = { "STATE_" }, value = { + STATE_ALL, + STATE_DEFAULT, + STATE_FOREGROUND + }) @Retention(RetentionPolicy.SOURCE) public @interface State {} @@ -164,7 +168,11 @@ public final class NetworkStats implements AutoCloseable { public static final int UID_TETHERING = TrafficStats.UID_TETHERING; /** @hide */ - @IntDef({METERED_ALL, METERED_NO, METERED_YES}) + @IntDef(prefix = { "METERED_" }, value = { + METERED_ALL, + METERED_NO, + METERED_YES + }) @Retention(RetentionPolicy.SOURCE) public @interface Metered {} @@ -187,7 +195,11 @@ public final class NetworkStats implements AutoCloseable { public static final int METERED_YES = 0x2; /** @hide */ - @IntDef({ROAMING_ALL, ROAMING_NO, ROAMING_YES}) + @IntDef(prefix = { "ROAMING_" }, value = { + ROAMING_ALL, + ROAMING_NO, + ROAMING_YES + }) @Retention(RetentionPolicy.SOURCE) public @interface Roaming {} diff --git a/core/java/android/app/usage/UsageEvents.java b/core/java/android/app/usage/UsageEvents.java index 8200414fa6bd..f04e9074ec4a 100644 --- a/core/java/android/app/usage/UsageEvents.java +++ b/core/java/android/app/usage/UsageEvents.java @@ -110,10 +110,9 @@ public final class UsageEvents implements Parcelable { public static final int FLAG_IS_PACKAGE_INSTANT_APP = 1 << 0; /** @hide */ - @IntDef(flag = true, - value = { - FLAG_IS_PACKAGE_INSTANT_APP, - }) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_IS_PACKAGE_INSTANT_APP, + }) @Retention(RetentionPolicy.SOURCE) public @interface EventFlags {} diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 1fc45c9fdb94..edb6a74bbea4 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -151,7 +151,7 @@ public final class UsageStatsManager { public static final String REASON_PREDICTED = "predicted"; /** @hide */ - @IntDef(flag = false, value = { + @IntDef(flag = false, prefix = { "STANDBY_BUCKET_" }, value = { STANDBY_BUCKET_EXEMPTED, STANDBY_BUCKET_ACTIVE, STANDBY_BUCKET_WORKING_SET, diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index c7be0f36ecef..3290d57f13a3 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -156,7 +156,7 @@ public final class BluetoothAdapter { "android.bluetooth.adapter.extra.PREVIOUS_STATE"; /** @hide */ - @IntDef({ + @IntDef(prefix = { "STATE_" }, value = { STATE_OFF, STATE_TURNING_ON, STATE_ON, @@ -357,7 +357,11 @@ public final class BluetoothAdapter { "android.bluetooth.adapter.extra.PREVIOUS_SCAN_MODE"; /** @hide */ - @IntDef({SCAN_MODE_NONE, SCAN_MODE_CONNECTABLE, SCAN_MODE_CONNECTABLE_DISCOVERABLE}) + @IntDef(prefix = { "SCAN_" }, value = { + SCAN_MODE_NONE, + SCAN_MODE_CONNECTABLE, + SCAN_MODE_CONNECTABLE_DISCOVERABLE + }) @Retention(RetentionPolicy.SOURCE) public @interface ScanMode {} diff --git a/core/java/android/companion/DeviceFilter.java b/core/java/android/companion/DeviceFilter.java index 9b4fdfdf5108..10135a451dda 100644 --- a/core/java/android/companion/DeviceFilter.java +++ b/core/java/android/companion/DeviceFilter.java @@ -62,7 +62,11 @@ public interface DeviceFilter<D extends Parcelable> extends Parcelable { } /** @hide */ - @IntDef({MEDIUM_TYPE_BLUETOOTH, MEDIUM_TYPE_BLUETOOTH_LE, MEDIUM_TYPE_WIFI}) + @IntDef(prefix = { "MEDIUM_TYPE_" }, value = { + MEDIUM_TYPE_BLUETOOTH, + MEDIUM_TYPE_BLUETOOTH_LE, + MEDIUM_TYPE_WIFI + }) @Retention(RetentionPolicy.SOURCE) @interface MediumType {} } diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 9ccc552f77f5..8d2e141ae78f 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -335,7 +335,7 @@ public abstract class ContentResolver { public static final String EXTRA_HONORED_ARGS = "android.content.extra.HONORED_ARGS"; /** @hide */ - @IntDef(flag = false, value = { + @IntDef(flag = false, prefix = { "QUERY_SORT_DIRECTION_" }, value = { QUERY_SORT_DIRECTION_ASCENDING, QUERY_SORT_DIRECTION_DESCENDING }) @@ -482,11 +482,10 @@ public abstract class ContentResolver { public static final int SYNC_OBSERVER_TYPE_ALL = 0x7fffffff; /** @hide */ - @IntDef(flag = true, - value = { - NOTIFY_SYNC_TO_NETWORK, - NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS - }) + @IntDef(flag = true, prefix = { "NOTIFY_" }, value = { + NOTIFY_SYNC_TO_NETWORK, + NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS + }) @Retention(RetentionPolicy.SOURCE) public @interface NotifyFlags {} diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a47433093988..137c1697d498 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -51,6 +51,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.Environment; import android.os.Handler; +import android.os.HandlerExecutor; import android.os.IBinder; import android.os.Looper; import android.os.StatFs; @@ -75,6 +76,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.concurrent.Executor; /** * Interface to global information about an application environment. This is @@ -219,17 +221,16 @@ public abstract class Context { public static final int MODE_NO_LOCALIZED_COLLATORS = 0x0010; /** @hide */ - @IntDef(flag = true, - value = { - BIND_AUTO_CREATE, - BIND_DEBUG_UNBIND, - BIND_NOT_FOREGROUND, - BIND_ABOVE_CLIENT, - BIND_ALLOW_OOM_MANAGEMENT, - BIND_WAIVE_PRIORITY, - BIND_IMPORTANT, - BIND_ADJUST_WITH_ACTIVITY - }) + @IntDef(flag = true, prefix = { "BIND_" }, value = { + BIND_AUTO_CREATE, + BIND_DEBUG_UNBIND, + BIND_NOT_FOREGROUND, + BIND_ABOVE_CLIENT, + BIND_ALLOW_OOM_MANAGEMENT, + BIND_WAIVE_PRIORITY, + BIND_IMPORTANT, + BIND_ADJUST_WITH_ACTIVITY + }) @Retention(RetentionPolicy.SOURCE) public @interface BindServiceFlags {} @@ -404,10 +405,9 @@ public abstract class Context { public static final int BIND_EXTERNAL_SERVICE = 0x80000000; /** @hide */ - @IntDef(flag = true, - value = { - RECEIVER_VISIBLE_TO_INSTANT_APPS - }) + @IntDef(flag = true, prefix = { "RECEIVER_VISIBLE_" }, value = { + RECEIVER_VISIBLE_TO_INSTANT_APPS + }) @Retention(RetentionPolicy.SOURCE) public @interface RegisterReceiverFlags {} @@ -462,6 +462,16 @@ public abstract class Context { public abstract Looper getMainLooper(); /** + * Return an {@link Executor} that will run enqueued tasks on the main + * thread associated with this context. This is the thread used to dispatch + * calls to application components (activities, services, etc). + */ + public Executor getMainExecutor() { + // This is pretty inefficient, which is why ContextImpl overrides it + return new HandlerExecutor(new Handler(getMainLooper())); + } + + /** * Return the context of the single, global Application object of the * current process. This generally should only be used if you need a * Context whose lifecycle is separate from the current context, that is diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 85acdc6b8101..67de4fe6bc4b 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -45,6 +45,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.concurrent.Executor; /** * Proxying implementation of Context that simply delegates all of its calls to @@ -103,7 +104,12 @@ public class ContextWrapper extends Context { public Looper getMainLooper() { return mBase.getMainLooper(); } - + + @Override + public Executor getMainExecutor() { + return mBase.getMainExecutor(); + } + @Override public Context getApplicationContext() { return mBase.getApplicationContext(); diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 6fb1afde22ec..e940769ada60 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5690,11 +5690,14 @@ public class Intent implements Parcelable, Cloneable { private static final int COPY_MODE_HISTORY = 2; /** @hide */ - @IntDef(value = {COPY_MODE_ALL, COPY_MODE_FILTER, COPY_MODE_HISTORY}) + @IntDef(prefix = { "COPY_MODE_" }, value = { + COPY_MODE_ALL, + COPY_MODE_FILTER, + COPY_MODE_HISTORY + }) @Retention(RetentionPolicy.SOURCE) public @interface CopyMode {} - /** * Create an empty intent. */ @@ -8966,17 +8969,16 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @IntDef(flag = true, - value = { - FILL_IN_ACTION, - FILL_IN_DATA, - FILL_IN_CATEGORIES, - FILL_IN_COMPONENT, - FILL_IN_PACKAGE, - FILL_IN_SOURCE_BOUNDS, - FILL_IN_SELECTOR, - FILL_IN_CLIP_DATA - }) + @IntDef(flag = true, prefix = { "FILL_IN_" }, value = { + FILL_IN_ACTION, + FILL_IN_DATA, + FILL_IN_CATEGORIES, + FILL_IN_COMPONENT, + FILL_IN_PACKAGE, + FILL_IN_SOURCE_BOUNDS, + FILL_IN_SELECTOR, + FILL_IN_CLIP_DATA + }) @Retention(RetentionPolicy.SOURCE) public @interface FillInFlags {} diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index f8cdce64c139..14617116bc7f 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -262,10 +262,10 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { public static final int COLOR_MODE_HDR = 2; /** @hide */ - @IntDef({ - COLOR_MODE_DEFAULT, - COLOR_MODE_WIDE_COLOR_GAMUT, - COLOR_MODE_HDR, + @IntDef(prefix = { "COLOR_MODE_" }, value = { + COLOR_MODE_DEFAULT, + COLOR_MODE_WIDE_COLOR_GAMUT, + COLOR_MODE_HDR, }) @Retention(RetentionPolicy.SOURCE) public @interface ColorMode {} @@ -492,7 +492,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { public int flags; /** @hide */ - @IntDef({ + @IntDef(prefix = { "SCREEN_ORIENTATION_" }, value = { SCREEN_ORIENTATION_UNSET, SCREEN_ORIENTATION_UNSPECIFIED, SCREEN_ORIENTATION_LANDSCAPE, @@ -638,25 +638,24 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { public int screenOrientation = SCREEN_ORIENTATION_UNSPECIFIED; /** @hide */ - @IntDef(flag = true, - value = { - CONFIG_MCC, - CONFIG_MNC, - CONFIG_LOCALE, - CONFIG_TOUCHSCREEN, - CONFIG_KEYBOARD, - CONFIG_KEYBOARD_HIDDEN, - CONFIG_NAVIGATION, - CONFIG_ORIENTATION, - CONFIG_SCREEN_LAYOUT, - CONFIG_UI_MODE, - CONFIG_SCREEN_SIZE, - CONFIG_SMALLEST_SCREEN_SIZE, - CONFIG_DENSITY, - CONFIG_LAYOUT_DIRECTION, - CONFIG_COLOR_MODE, - CONFIG_FONT_SCALE, - }) + @IntDef(flag = true, prefix = { "CONFIG_" }, value = { + CONFIG_MCC, + CONFIG_MNC, + CONFIG_LOCALE, + CONFIG_TOUCHSCREEN, + CONFIG_KEYBOARD, + CONFIG_KEYBOARD_HIDDEN, + CONFIG_NAVIGATION, + CONFIG_ORIENTATION, + CONFIG_SCREEN_LAYOUT, + CONFIG_UI_MODE, + CONFIG_SCREEN_SIZE, + CONFIG_SMALLEST_SCREEN_SIZE, + CONFIG_DENSITY, + CONFIG_LAYOUT_DIRECTION, + CONFIG_COLOR_MODE, + CONFIG_FONT_SCALE, + }) @Retention(RetentionPolicy.SOURCE) public @interface Config {} diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index c73b853a02cb..15e119b20a2e 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -953,6 +953,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public int targetSandboxVersion; /** + * The factory of this package, as specified by the <manifest> + * tag's {@link android.R.styleable#AndroidManifestApplication_appComponentFactory} + * attribute. + */ + public String appComponentFactory; + + /** * The category of this app. Categories are used to cluster multiple apps * together into meaningful groups, such as when summarizing battery, * network, or disk usage. Apps should only define this value when they fit @@ -1268,6 +1275,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { targetSandboxVersion = orig.targetSandboxVersion; classLoaderName = orig.classLoaderName; splitClassLoaderNames = orig.splitClassLoaderNames; + appComponentFactory = orig.appComponentFactory; } public String toString() { @@ -1340,6 +1348,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { dest.writeStringArray(splitClassLoaderNames); dest.writeInt(compileSdkVersion); dest.writeString(compileSdkVersionCodename); + dest.writeString(appComponentFactory); } public static final Parcelable.Creator<ApplicationInfo> CREATOR @@ -1409,6 +1418,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { splitClassLoaderNames = source.readStringArray(); compileSdkVersion = source.readInt(); compileSdkVersionCodename = source.readString(); + appComponentFactory = source.readString(); } /** diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index d09ba0b55a3c..b4a7eec0fb4c 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -343,14 +343,13 @@ public class LauncherApps { public static final int FLAG_GET_KEY_FIELDS_ONLY = 1 << 2; /** @hide */ - @IntDef(flag = true, - value = { - FLAG_MATCH_DYNAMIC, - FLAG_MATCH_PINNED, - FLAG_MATCH_MANIFEST, - FLAG_GET_KEY_FIELDS_ONLY, - FLAG_MATCH_MANIFEST, - }) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_MATCH_DYNAMIC, + FLAG_MATCH_PINNED, + FLAG_MATCH_MANIFEST, + FLAG_GET_KEY_FIELDS_ONLY, + FLAG_MATCH_MANIFEST, + }) @Retention(RetentionPolicy.SOURCE) public @interface QueryFlags {} @@ -1380,7 +1379,10 @@ public class LauncherApps { public static final int REQUEST_TYPE_APPWIDGET = 2; /** @hide */ - @IntDef(value = {REQUEST_TYPE_SHORTCUT}) + @IntDef(prefix = { "REQUEST_TYPE_" }, value = { + REQUEST_TYPE_SHORTCUT, + REQUEST_TYPE_APPWIDGET + }) @Retention(RetentionPolicy.SOURCE) public @interface RequestType {} diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 97c2b7d11354..2bbcfffbe946 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -32,7 +32,6 @@ import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_ACTIVITIES_RESIZE_ import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_ACTIVITIES_RESIZE_MODE_UNRESIZEABLE; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME; -import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NOT_APK; @@ -87,7 +86,8 @@ import android.util.Slog; import android.util.SparseArray; import android.util.TypedValue; import android.util.apk.ApkSignatureSchemeV2Verifier; -import android.util.jar.StrictJarFile; +import android.util.apk.ApkSignatureVerifier; +import android.util.apk.SignatureNotFoundException; import android.view.Gravity; import com.android.internal.R; @@ -106,12 +106,10 @@ import java.io.File; import java.io.FileDescriptor; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Constructor; -import java.security.GeneralSecurityException; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; import java.security.PublicKey; @@ -129,8 +127,6 @@ import java.util.List; import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.zip.ZipEntry; /** * Parser for package files (APKs) on disk. This supports apps packaged either @@ -173,7 +169,7 @@ public class PackageParser { // TODO: refactor "codePath" to "apkPath" /** File name in an APK for the Android manifest. */ - private static final String ANDROID_MANIFEST_FILENAME = "AndroidManifest.xml"; + public static final String ANDROID_MANIFEST_FILENAME = "AndroidManifest.xml"; /** Path prefix for apps on expanded storage */ private static final String MNT_EXPAND = "/mnt/expand/"; @@ -821,23 +817,6 @@ public class PackageParser { return pi; } - private static Certificate[][] loadCertificates(StrictJarFile jarFile, ZipEntry entry) - throws PackageParserException { - InputStream is = null; - try { - // We must read the stream for the JarEntry to retrieve - // its certificates. - is = jarFile.getInputStream(entry); - readFullyIgnoringContents(is); - return jarFile.getCertificateChains(entry); - } catch (IOException | RuntimeException e) { - throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION, - "Failed reading " + entry.getName() + " in " + jarFile, e); - } finally { - IoUtils.closeQuietly(is); - } - } - public static final int PARSE_MUST_BE_APK = 1 << 0; public static final int PARSE_IGNORE_PROCESSES = 1 << 1; public static final int PARSE_FORWARD_LOCK = 1 << 2; @@ -1517,7 +1496,7 @@ public class PackageParser { pkg.mCertificates = certificates; try { - pkg.mSignatures = convertToSignatures(certificates); + pkg.mSignatures = ApkSignatureVerifier.convertToSignatures(certificates); } catch (CertificateEncodingException e) { // certificates weren't encoded properly; something went wrong throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, @@ -1580,157 +1559,46 @@ public class PackageParser { throws PackageParserException { final String apkPath = apkFile.getAbsolutePath(); - // Try to verify the APK using APK Signature Scheme v2. - boolean verified = false; - { - Certificate[][] allSignersCerts = null; - Signature[] signatures = null; - try { - Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "verifyV2"); - allSignersCerts = ApkSignatureSchemeV2Verifier.verify(apkPath); - signatures = convertToSignatures(allSignersCerts); - // APK verified using APK Signature Scheme v2. - verified = true; - } catch (ApkSignatureSchemeV2Verifier.SignatureNotFoundException e) { - // No APK Signature Scheme v2 signature found - if ((parseFlags & PARSE_IS_EPHEMERAL) != 0) { - throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, - "No APK Signature Scheme v2 signature in ephemeral package " + apkPath, - e); + boolean untrusted = (parseFlags & PARSE_IS_SYSTEM_DIR) == 0; + int minSignatureScheme = ApkSignatureVerifier.VERSION_JAR_SIGNATURE_SCHEME; + if ((parseFlags & PARSE_IS_EPHEMERAL) != 0 || pkg.applicationInfo.isStaticSharedLibrary()) { + // must use v2 signing scheme + minSignatureScheme = ApkSignatureVerifier.VERSION_APK_SIGNATURE_SCHEME_V2; + } + try { + ApkSignatureVerifier.Result verified = + ApkSignatureVerifier.verify(apkPath, minSignatureScheme, untrusted); + if (pkg.mCertificates == null) { + pkg.mCertificates = verified.certs; + pkg.mSignatures = verified.sigs; + pkg.mSigningKeys = new ArraySet<>(verified.certs.length); + for (int i = 0; i < verified.certs.length; i++) { + Certificate[] signerCerts = verified.certs[i]; + Certificate signerCert = signerCerts[0]; + pkg.mSigningKeys.add(signerCert.getPublicKey()); } - // Static shared libraries must use only the V2 signing scheme - if (pkg.applicationInfo.isStaticSharedLibrary()) { - throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, - "Static shared libs must use v2 signature scheme " + apkPath); + } else { + if (!Signature.areExactMatch(pkg.mSignatures, verified.sigs)) { + throw new PackageParserException( + INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES, + apkPath + " has mismatched certificates"); } - } catch (Exception e) { - // APK Signature Scheme v2 signature was found but did not verify + } + } catch (SignatureNotFoundException e) { + if ((parseFlags & PARSE_IS_EPHEMERAL) != 0) { throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, - "Failed to collect certificates from " + apkPath - + " using APK Signature Scheme v2", + "No APK Signature Scheme v2 signature in ephemeral package " + apkPath, e); - } finally { - Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); - } - - if (verified) { - if (pkg.mCertificates == null) { - pkg.mCertificates = allSignersCerts; - pkg.mSignatures = signatures; - pkg.mSigningKeys = new ArraySet<>(allSignersCerts.length); - for (int i = 0; i < allSignersCerts.length; i++) { - Certificate[] signerCerts = allSignersCerts[i]; - Certificate signerCert = signerCerts[0]; - pkg.mSigningKeys.add(signerCert.getPublicKey()); - } - } else { - if (!Signature.areExactMatch(pkg.mSignatures, signatures)) { - throw new PackageParserException( - INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES, - apkPath + " has mismatched certificates"); - } - } - // Not yet done, because we need to confirm that AndroidManifest.xml exists and, - // if requested, that classes.dex exists. - } - } - - StrictJarFile jarFile = null; - try { - Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "strictJarFileCtor"); - // Ignore signature stripping protections when verifying APKs from system partition. - // For those APKs we only care about extracting signer certificates, and don't care - // about verifying integrity. - boolean signatureSchemeRollbackProtectionsEnforced = - (parseFlags & PARSE_IS_SYSTEM_DIR) == 0; - jarFile = new StrictJarFile( - apkPath, - !verified, // whether to verify JAR signature - signatureSchemeRollbackProtectionsEnforced); - Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); - - // Always verify manifest, regardless of source - final ZipEntry manifestEntry = jarFile.findEntry(ANDROID_MANIFEST_FILENAME); - if (manifestEntry == null) { - throw new PackageParserException(INSTALL_PARSE_FAILED_BAD_MANIFEST, - "Package " + apkPath + " has no manifest"); - } - - // Optimization: early termination when APK already verified - if (verified) { - return; - } - - // APK's integrity needs to be verified using JAR signature scheme. - Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "verifyV1"); - final List<ZipEntry> toVerify = new ArrayList<>(); - toVerify.add(manifestEntry); - - // If we're parsing an untrusted package, verify all contents - if ((parseFlags & PARSE_IS_SYSTEM_DIR) == 0) { - final Iterator<ZipEntry> i = jarFile.iterator(); - while (i.hasNext()) { - final ZipEntry entry = i.next(); - - if (entry.isDirectory()) continue; - - final String entryName = entry.getName(); - if (entryName.startsWith("META-INF/")) continue; - if (entryName.equals(ANDROID_MANIFEST_FILENAME)) continue; - - toVerify.add(entry); - } } - - // Verify that entries are signed consistently with the first entry - // we encountered. Note that for splits, certificates may have - // already been populated during an earlier parse of a base APK. - for (ZipEntry entry : toVerify) { - final Certificate[][] entryCerts = loadCertificates(jarFile, entry); - if (ArrayUtils.isEmpty(entryCerts)) { - throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, - "Package " + apkPath + " has no certificates at entry " - + entry.getName()); - } - final Signature[] entrySignatures = convertToSignatures(entryCerts); - - if (pkg.mCertificates == null) { - pkg.mCertificates = entryCerts; - pkg.mSignatures = entrySignatures; - pkg.mSigningKeys = new ArraySet<PublicKey>(); - for (int i=0; i < entryCerts.length; i++) { - pkg.mSigningKeys.add(entryCerts[i][0].getPublicKey()); - } - } else { - if (!Signature.areExactMatch(pkg.mSignatures, entrySignatures)) { - throw new PackageParserException( - INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES, "Package " + apkPath - + " has mismatched certificates at entry " - + entry.getName()); - } - } + if (pkg.applicationInfo.isStaticSharedLibrary()) { + throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, + "Static shared libs must use v2 signature scheme " + apkPath); } - Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); - } catch (GeneralSecurityException e) { - throw new PackageParserException(INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING, - "Failed to collect certificates from " + apkPath, e); - } catch (IOException | RuntimeException e) { throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, - "Failed to collect certificates from " + apkPath, e); - } finally { - closeQuietly(jarFile); + "No APK Signature Scheme v2 signature in package " + apkPath, e); } } - private static Signature[] convertToSignatures(Certificate[][] certs) - throws CertificateEncodingException { - final Signature[] res = new Signature[certs.length]; - for (int i = 0; i < certs.length; i++) { - res[i] = new Signature(certs[i]); - } - return res; - } - private static AssetManager newConfiguredAssetManager() { AssetManager assetManager = new AssetManager(); assetManager.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3756,6 +3624,11 @@ public class PackageParser { } ai.taskAffinity = buildTaskAffinityName(ai.packageName, ai.packageName, str, outError); + String factory = sa.getNonResourceString( + com.android.internal.R.styleable.AndroidManifestApplication_appComponentFactory); + if (factory != null) { + ai.appComponentFactory = buildClassName(ai.packageName, factory, outError); + } if (outError[0] == null) { CharSequence pname; @@ -7647,33 +7520,6 @@ public class PackageParser { sCompatibilityModeEnabled = compatibilityModeEnabled; } - private static AtomicReference<byte[]> sBuffer = new AtomicReference<byte[]>(); - - public static long readFullyIgnoringContents(InputStream in) throws IOException { - byte[] buffer = sBuffer.getAndSet(null); - if (buffer == null) { - buffer = new byte[4096]; - } - - int n = 0; - int count = 0; - while ((n = in.read(buffer, 0, buffer.length)) != -1) { - count += n; - } - - sBuffer.set(buffer); - return count; - } - - public static void closeQuietly(StrictJarFile jarFile) { - if (jarFile != null) { - try { - jarFile.close(); - } catch (Exception ignored) { - } - } - } - public static class PackageParserException extends Exception { public final int error; diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java index 2f1b256dccdf..33bc9515409f 100644 --- a/core/java/android/content/pm/SharedLibraryInfo.java +++ b/core/java/android/content/pm/SharedLibraryInfo.java @@ -36,13 +36,11 @@ import java.util.List; public final class SharedLibraryInfo implements Parcelable { /** @hide */ - @IntDef( - flag = true, - value = { - TYPE_BUILTIN, - TYPE_DYNAMIC, - TYPE_STATIC, - }) + @IntDef(flag = true, prefix = { "TYPE_" }, value = { + TYPE_BUILTIN, + TYPE_DYNAMIC, + TYPE_STATIC, + }) @Retention(RetentionPolicy.SOURCE) @interface Type{} diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java index 9ff077576bfd..8839cf9d35a7 100644 --- a/core/java/android/content/pm/ShortcutInfo.java +++ b/core/java/android/content/pm/ShortcutInfo.java @@ -109,8 +109,7 @@ public final class ShortcutInfo implements Parcelable { public static final int FLAG_SHADOW = 1 << 12; /** @hide */ - @IntDef(flag = true, - value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_DYNAMIC, FLAG_PINNED, FLAG_HAS_ICON_RES, @@ -153,15 +152,14 @@ public final class ShortcutInfo implements Parcelable { | CLONE_REMOVE_RES_NAMES; /** @hide */ - @IntDef(flag = true, - value = { - CLONE_REMOVE_ICON, - CLONE_REMOVE_INTENT, - CLONE_REMOVE_NON_KEY_INFO, - CLONE_REMOVE_RES_NAMES, - CLONE_REMOVE_FOR_CREATOR, - CLONE_REMOVE_FOR_LAUNCHER - }) + @IntDef(flag = true, prefix = { "CLONE_" }, value = { + CLONE_REMOVE_ICON, + CLONE_REMOVE_INTENT, + CLONE_REMOVE_NON_KEY_INFO, + CLONE_REMOVE_RES_NAMES, + CLONE_REMOVE_FOR_CREATOR, + CLONE_REMOVE_FOR_LAUNCHER + }) @Retention(RetentionPolicy.SOURCE) public @interface CloneFlags {} @@ -212,7 +210,7 @@ public final class ShortcutInfo implements Parcelable { public static final int DISABLED_REASON_OTHER_RESTORE_ISSUE = 103; /** @hide */ - @IntDef(value = { + @IntDef(prefix = { "DISABLED_REASON_" }, value = { DISABLED_REASON_NOT_DISABLED, DISABLED_REASON_BY_APP, DISABLED_REASON_APP_CHANGED, @@ -220,7 +218,7 @@ public final class ShortcutInfo implements Parcelable { DISABLED_REASON_BACKUP_NOT_SUPPORTED, DISABLED_REASON_SIGNATURE_MISMATCH, DISABLED_REASON_OTHER_RESTORE_ISSUE, - }) + }) @Retention(RetentionPolicy.SOURCE) public @interface DisabledReason{} diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 26efda108bb6..eb309799fe0f 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -781,25 +781,24 @@ public final class Configuration implements Parcelable, Comparable<Configuration public int seq; /** @hide */ - @IntDef(flag = true, - value = { - NATIVE_CONFIG_MCC, - NATIVE_CONFIG_MNC, - NATIVE_CONFIG_LOCALE, - NATIVE_CONFIG_TOUCHSCREEN, - NATIVE_CONFIG_KEYBOARD, - NATIVE_CONFIG_KEYBOARD_HIDDEN, - NATIVE_CONFIG_NAVIGATION, - NATIVE_CONFIG_ORIENTATION, - NATIVE_CONFIG_DENSITY, - NATIVE_CONFIG_SCREEN_SIZE, - NATIVE_CONFIG_VERSION, - NATIVE_CONFIG_SCREEN_LAYOUT, - NATIVE_CONFIG_UI_MODE, - NATIVE_CONFIG_SMALLEST_SCREEN_SIZE, - NATIVE_CONFIG_LAYOUTDIR, - NATIVE_CONFIG_COLOR_MODE, - }) + @IntDef(flag = true, prefix = { "NATIVE_CONFIG_" }, value = { + NATIVE_CONFIG_MCC, + NATIVE_CONFIG_MNC, + NATIVE_CONFIG_LOCALE, + NATIVE_CONFIG_TOUCHSCREEN, + NATIVE_CONFIG_KEYBOARD, + NATIVE_CONFIG_KEYBOARD_HIDDEN, + NATIVE_CONFIG_NAVIGATION, + NATIVE_CONFIG_ORIENTATION, + NATIVE_CONFIG_DENSITY, + NATIVE_CONFIG_SCREEN_SIZE, + NATIVE_CONFIG_VERSION, + NATIVE_CONFIG_SCREEN_LAYOUT, + NATIVE_CONFIG_UI_MODE, + NATIVE_CONFIG_SMALLEST_SCREEN_SIZE, + NATIVE_CONFIG_LAYOUTDIR, + NATIVE_CONFIG_COLOR_MODE, + }) @Retention(RetentionPolicy.SOURCE) public @interface NativeConfig {} diff --git a/core/java/android/content/res/GradientColor.java b/core/java/android/content/res/GradientColor.java index e4659613147d..35ad5033e395 100644 --- a/core/java/android/content/res/GradientColor.java +++ b/core/java/android/content/res/GradientColor.java @@ -75,9 +75,14 @@ public class GradientColor extends ComplexColor { private static final boolean DBG_GRADIENT = false; - @IntDef({TILE_MODE_CLAMP, TILE_MODE_REPEAT, TILE_MODE_MIRROR}) + @IntDef(prefix = { "TILE_MODE_" }, value = { + TILE_MODE_CLAMP, + TILE_MODE_REPEAT, + TILE_MODE_MIRROR + }) @Retention(RetentionPolicy.SOURCE) private @interface GradientTileMode {} + private static final int TILE_MODE_CLAMP = 0; private static final int TILE_MODE_REPEAT = 1; private static final int TILE_MODE_MIRROR = 2; diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index b111ad30f27d..7866b52cc68c 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -42,7 +42,15 @@ import libcore.util.NativeAllocationRegistry; public final class HardwareBuffer implements Parcelable, AutoCloseable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({RGBA_8888, RGBA_FP16, RGBA_1010102, RGBX_8888, RGB_888, RGB_565, BLOB}) + @IntDef(prefix = { "RGB", "BLOB" }, value = { + RGBA_8888, + RGBA_FP16, + RGBA_1010102, + RGBX_8888, + RGB_888, + RGB_565, + BLOB + }) public @interface Format { } diff --git a/core/java/android/hardware/SensorAdditionalInfo.java b/core/java/android/hardware/SensorAdditionalInfo.java index 7c876cfcb80a..5ff627f48017 100644 --- a/core/java/android/hardware/SensorAdditionalInfo.java +++ b/core/java/android/hardware/SensorAdditionalInfo.java @@ -68,8 +68,15 @@ public class SensorAdditionalInfo { * * @hide */ - @IntDef({TYPE_FRAME_BEGIN, TYPE_FRAME_END, TYPE_UNTRACKED_DELAY, TYPE_INTERNAL_TEMPERATURE, - TYPE_VEC3_CALIBRATION, TYPE_SENSOR_PLACEMENT, TYPE_SAMPLING}) + @IntDef(prefix = { "TYPE_" }, value = { + TYPE_FRAME_BEGIN, + TYPE_FRAME_END, + TYPE_UNTRACKED_DELAY, + TYPE_INTERNAL_TEMPERATURE, + TYPE_VEC3_CALIBRATION, + TYPE_SENSOR_PLACEMENT, + TYPE_SAMPLING + }) @Retention(RetentionPolicy.SOURCE) public @interface AdditionalInfoType {} diff --git a/core/java/android/hardware/SensorDirectChannel.java b/core/java/android/hardware/SensorDirectChannel.java index 36607c90778b..214d3ec28df8 100644 --- a/core/java/android/hardware/SensorDirectChannel.java +++ b/core/java/android/hardware/SensorDirectChannel.java @@ -40,8 +40,12 @@ public final class SensorDirectChannel implements Channel { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = {TYPE_MEMORY_FILE, TYPE_HARDWARE_BUFFER}) - public @interface MemoryType {}; + @IntDef(flag = true, prefix = { "TYPE_" }, value = { + TYPE_MEMORY_FILE, + TYPE_HARDWARE_BUFFER + }) + public @interface MemoryType {} + /** * Shared memory type ashmem, wrapped in MemoryFile object. * @@ -60,8 +64,13 @@ public final class SensorDirectChannel implements Channel { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = {RATE_STOP, RATE_NORMAL, RATE_FAST, RATE_VERY_FAST}) - public @interface RateLevel {}; + @IntDef(flag = true, prefix = { "RATE_" }, value = { + RATE_STOP, + RATE_NORMAL, + RATE_FAST, + RATE_VERY_FAST + }) + public @interface RateLevel {} /** * Sensor stopped (no event output). diff --git a/core/java/android/hardware/camera2/CameraAccessException.java b/core/java/android/hardware/camera2/CameraAccessException.java index f9b659c67e86..d238797c7ea9 100644 --- a/core/java/android/hardware/camera2/CameraAccessException.java +++ b/core/java/android/hardware/camera2/CameraAccessException.java @@ -16,7 +16,6 @@ package android.hardware.camera2; -import android.annotation.NonNull; import android.annotation.IntDef; import android.util.AndroidException; @@ -81,15 +80,16 @@ public class CameraAccessException extends AndroidException { */ public static final int CAMERA_DEPRECATED_HAL = 1000; - /** @hide */ - @Retention(RetentionPolicy.SOURCE) - @IntDef( - {CAMERA_IN_USE, - MAX_CAMERAS_IN_USE, - CAMERA_DISABLED, - CAMERA_DISCONNECTED, - CAMERA_ERROR}) - public @interface AccessError {}; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(prefix = { "CAMERA_", "MAX_CAMERAS_IN_USE" }, value = { + CAMERA_IN_USE, + MAX_CAMERAS_IN_USE, + CAMERA_DISABLED, + CAMERA_DISCONNECTED, + CAMERA_ERROR + }) + public @interface AccessError {} // Make the eclipse warning about serializable exceptions go away private static final long serialVersionUID = 5630338637471475675L; // randomly generated diff --git a/core/java/android/hardware/display/BrightnessConfiguration.aidl b/core/java/android/hardware/display/BrightnessConfiguration.aidl new file mode 100644 index 000000000000..5b6b4645fa45 --- /dev/null +++ b/core/java/android/hardware/display/BrightnessConfiguration.aidl @@ -0,0 +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.hardware.display; + +parcelable BrightnessConfiguration; diff --git a/core/java/android/hardware/display/BrightnessConfiguration.java b/core/java/android/hardware/display/BrightnessConfiguration.java new file mode 100644 index 000000000000..6c3be816e87b --- /dev/null +++ b/core/java/android/hardware/display/BrightnessConfiguration.java @@ -0,0 +1,175 @@ +/* + * 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.hardware.display; + +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Pair; + +import com.android.internal.util.Preconditions; + +import java.util.Arrays; + +/** @hide */ +public final class BrightnessConfiguration implements Parcelable { + private final float[] mLux; + private final float[] mNits; + + private BrightnessConfiguration(float[] lux, float[] nits) { + mLux = lux; + mNits = nits; + } + + /** + * Gets the base brightness as curve. + * + * The curve is returned as a pair of float arrays, the first representing all of the lux + * points of the brightness curve and the second representing all of the nits values of the + * brightness curve. + * + * @return the control points for the brightness curve. + */ + public Pair<float[], float[]> getCurve() { + return Pair.create(Arrays.copyOf(mLux, mLux.length), Arrays.copyOf(mNits, mNits.length)); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeFloatArray(mLux); + dest.writeFloatArray(mNits); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("BrightnessConfiguration{["); + final int size = mLux.length; + for (int i = 0; i < size; i++) { + if (i != 0) { + sb.append(", "); + } + sb.append("(").append(mLux[i]).append(", ").append(mNits[i]).append(")"); + } + sb.append("]}"); + return sb.toString(); + } + + @Override + public int hashCode() { + int result = 1; + result = result * 31 + Arrays.hashCode(mLux); + result = result * 31 + Arrays.hashCode(mNits); + return result; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof BrightnessConfiguration)) { + return false; + } + final BrightnessConfiguration other = (BrightnessConfiguration) o; + return Arrays.equals(mLux, other.mLux) && Arrays.equals(mNits, other.mNits); + } + + public static final Creator<BrightnessConfiguration> CREATOR = + new Creator<BrightnessConfiguration>() { + public BrightnessConfiguration createFromParcel(Parcel in) { + Builder builder = new Builder(); + float[] lux = in.createFloatArray(); + float[] nits = in.createFloatArray(); + builder.setCurve(lux, nits); + return builder.build(); + } + + public BrightnessConfiguration[] newArray(int size) { + return new BrightnessConfiguration[size]; + } + }; + + /** + * A builder class for {@link BrightnessConfiguration}s. + */ + public static class Builder { + private float[] mCurveLux; + private float[] mCurveNits; + + /** + * Sets the control points for the brightness curve. + * + * Brightness curves must have strictly increasing ambient brightness values in lux and + * monotonically increasing display brightness values in nits. In addition, the initial + * control point must be 0 lux. + * + * @throws IllegalArgumentException if the initial control point is not at 0 lux. + * @throws IllegalArgumentException if the lux levels are not strictly increasing. + * @throws IllegalArgumentException if the nit levels are not monotonically increasing. + */ + public Builder setCurve(float[] lux, float[] nits) { + Preconditions.checkNotNull(lux); + Preconditions.checkNotNull(nits); + if (lux.length == 0 || nits.length == 0) { + throw new IllegalArgumentException("Lux and nits arrays must not be empty"); + } + if (lux.length != nits.length) { + throw new IllegalArgumentException("Lux and nits arrays must be the same length"); + } + if (lux[0] != 0) { + throw new IllegalArgumentException("Initial control point must be for 0 lux"); + } + Preconditions.checkArrayElementsInRange(lux, 0, Float.MAX_VALUE, "lux"); + Preconditions.checkArrayElementsInRange(nits, 0, Float.MAX_VALUE, "nits"); + checkMonotonic(lux, true/*strictly increasing*/, "lux"); + checkMonotonic(nits, false /*strictly increasing*/, "nits"); + mCurveLux = lux; + mCurveNits = nits; + return this; + } + + /** + * Builds the {@link BrightnessConfiguration}. + * + * A brightness curve <b>must</b> be set before calling this. + */ + public BrightnessConfiguration build() { + if (mCurveLux == null || mCurveNits == null) { + throw new IllegalStateException("A curve must be set!"); + } + return new BrightnessConfiguration(mCurveLux, mCurveNits); + } + + private static void checkMonotonic(float[] vals, boolean strictlyIncreasing, String name) { + if (vals.length <= 1) { + return; + } + float prev = vals[0]; + for (int i = 1; i < vals.length; i++) { + if (prev > vals[i] || prev == vals[i] && strictlyIncreasing) { + String condition = strictlyIncreasing ? "strictly increasing" : "monotonic"; + throw new IllegalArgumentException(name + " values must be " + condition); + } + prev = vals[i]; + } + } + } +} diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 97ca231bf68c..7de667dcaa2b 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -27,6 +27,7 @@ import android.content.Context; import android.graphics.Point; import android.media.projection.MediaProjection; import android.os.Handler; +import android.os.UserHandle; import android.util.SparseArray; import android.view.Display; import android.view.Surface; @@ -634,6 +635,27 @@ public final class DisplayManager { } /** + * Sets the global display brightness configuration. + * + * @hide + */ + public void setBrightnessConfiguration(BrightnessConfiguration c) { + setBrightnessConfigurationForUser(c, UserHandle.myUserId()); + } + + /** + * Sets the global display brightness configuration for a specific user. + * + * Note this requires the INTERACT_ACROSS_USERS permission if setting the configuration for a + * user other than the one you're currently running as. + * + * @hide + */ + public void setBrightnessConfigurationForUser(BrightnessConfiguration c, int userId) { + mGlobal.setBrightnessConfigurationForUser(c, userId); + } + + /** * Listens for changes in available display devices. */ public interface DisplayListener { diff --git a/core/java/android/hardware/display/DisplayManagerGlobal.java b/core/java/android/hardware/display/DisplayManagerGlobal.java index c3f82f56dad8..bf4cc1d826a9 100644 --- a/core/java/android/hardware/display/DisplayManagerGlobal.java +++ b/core/java/android/hardware/display/DisplayManagerGlobal.java @@ -487,6 +487,19 @@ public final class DisplayManagerGlobal { } } + /** + * Sets the global brightness configuration for a given user. + * + * @hide + */ + public void setBrightnessConfigurationForUser(BrightnessConfiguration c, int userId) { + try { + mDm.setBrightnessConfigurationForUser(c, userId); + } catch (RemoteException ex) { + throw ex.rethrowFromSystemServer(); + } + } + private final class DisplayManagerCallback extends IDisplayManagerCallback.Stub { @Override public void onDisplayEvent(int displayId, int event) { diff --git a/core/java/android/hardware/display/IDisplayManager.aidl b/core/java/android/hardware/display/IDisplayManager.aidl index f2ed9e7571d3..8afae6ec9010 100644 --- a/core/java/android/hardware/display/IDisplayManager.aidl +++ b/core/java/android/hardware/display/IDisplayManager.aidl @@ -18,6 +18,7 @@ package android.hardware.display; import android.content.pm.ParceledListSlice; import android.graphics.Point; +import android.hardware.display.BrightnessConfiguration; import android.hardware.display.IDisplayManagerCallback; import android.hardware.display.IVirtualDisplayCallback; import android.hardware.display.WifiDisplay; @@ -89,4 +90,9 @@ interface IDisplayManager { // STOPSHIP remove when adaptive brightness code is updated to accept curves. // Requires BRIGHTNESS_SLIDER_USAGE permission. void setBrightness(int brightness); + + // Sets the global brightness configuration for a given user. Requires + // CONFIGURE_DISPLAY_BRIGHTNESS, and INTERACT_ACROSS_USER if the user being configured is not + // the same as the calling user. + void setBrightnessConfigurationForUser(in BrightnessConfiguration c, int userId); } diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index c531a899f45d..1de8882e057a 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -188,7 +188,11 @@ public final class InputManager { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SWITCH_STATE_UNKNOWN, SWITCH_STATE_OFF, SWITCH_STATE_ON}) + @IntDef(prefix = { "SWITCH_STATE_" }, value = { + SWITCH_STATE_UNKNOWN, + SWITCH_STATE_OFF, + SWITCH_STATE_ON + }) public @interface SwitchState {} /** diff --git a/core/java/android/hardware/location/ContextHubTransaction.java b/core/java/android/hardware/location/ContextHubTransaction.java index b808de3a11d6..2a66cbc24b77 100644 --- a/core/java/android/hardware/location/ContextHubTransaction.java +++ b/core/java/android/hardware/location/ContextHubTransaction.java @@ -47,13 +47,15 @@ public class ContextHubTransaction<T> { * Constants describing the type of a transaction through the Context Hub Service. */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "TYPE_" }, value = { TYPE_LOAD_NANOAPP, TYPE_UNLOAD_NANOAPP, TYPE_ENABLE_NANOAPP, TYPE_DISABLE_NANOAPP, - TYPE_QUERY_NANOAPPS}) - public @interface Type {} + TYPE_QUERY_NANOAPPS + }) + public @interface Type { } + public static final int TYPE_LOAD_NANOAPP = 0; public static final int TYPE_UNLOAD_NANOAPP = 1; public static final int TYPE_ENABLE_NANOAPP = 2; @@ -64,7 +66,7 @@ public class ContextHubTransaction<T> { * Constants describing the result of a transaction or request through the Context Hub Service. */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "TRANSACTION_" }, value = { TRANSACTION_SUCCESS, TRANSACTION_FAILED_UNKNOWN, TRANSACTION_FAILED_BAD_PARAMS, @@ -73,7 +75,8 @@ public class ContextHubTransaction<T> { TRANSACTION_FAILED_AT_HUB, TRANSACTION_FAILED_TIMEOUT, TRANSACTION_FAILED_SERVICE_INTERNAL_FAILURE, - TRANSACTION_FAILED_HAL_UNAVAILABLE}) + TRANSACTION_FAILED_HAL_UNAVAILABLE + }) public @interface Result {} public static final int TRANSACTION_SUCCESS = 0; /** diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java index 26238304d8e9..b7e6b66fb755 100644 --- a/core/java/android/hardware/location/NanoAppInstanceInfo.java +++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java @@ -16,9 +16,7 @@ package android.hardware.location; - import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; @@ -26,50 +24,51 @@ import android.os.Parcelable; import libcore.util.EmptyArray; /** + * Describes an instance of a nanoapp, used by the internal state manged by ContextHubService. + * + * TODO(b/69270990) Remove this class once the old API is deprecated. + * TODO(b/70624255) Clean up toString() by removing unnecessary fields + * * @hide */ @SystemApi public class NanoAppInstanceInfo { - private String mPublisher; - private String mName; + private static final String PRE_LOADED_GENERIC_UNKNOWN = "Preloaded app, unknown"; + private String mPublisher = PRE_LOADED_GENERIC_UNKNOWN; + private String mName = PRE_LOADED_GENERIC_UNKNOWN; + private int mHandle; private long mAppId; private int mAppVersion; + private int mContexthubId; - private int mNeededReadMemBytes; - private int mNeededWriteMemBytes; - private int mNeededExecMemBytes; + private int mNeededReadMemBytes = 0; + private int mNeededWriteMemBytes = 0; + private int mNeededExecMemBytes = 0; - private int[] mNeededSensors; - private int[] mOutputEvents; - - private int mContexthubId; - private int mHandle; + private int[] mNeededSensors = EmptyArray.INT; + private int[] mOutputEvents = EmptyArray.INT; public NanoAppInstanceInfo() { - mNeededSensors = EmptyArray.INT; - mOutputEvents = EmptyArray.INT; } /** - * get the publisher of this app - * - * @return String - name of the publisher + * @hide */ - public String getPublisher() { - return mPublisher; + public NanoAppInstanceInfo(int handle, long appId, int appVersion, int contextHubId) { + mHandle = handle; + mAppId = appId; + mAppVersion = appVersion; + mContexthubId = contextHubId; } - /** - * set the publisher name for the app - * - * @param publisher - name of the publisher + * get the publisher of this app * - * @hide + * @return String - name of the publisher */ - public void setPublisher(String publisher) { - mPublisher = publisher; + public String getPublisher() { + return mPublisher; } /** @@ -82,17 +81,6 @@ public class NanoAppInstanceInfo { } /** - * set the name of the app - * - * @param name - name of the app - * - * @hide - */ - public void setName(String name) { - mName = name; - } - - /** * Get the application identifier * * @return int - application identifier @@ -102,17 +90,6 @@ public class NanoAppInstanceInfo { } /** - * Set the application identifier - * - * @param appId - application identifier - * - * @hide - */ - public void setAppId(long appId) { - mAppId = appId; - } - - /** * Get the application version * * NOTE: There is a race condition where shortly after loading, this @@ -127,17 +104,6 @@ public class NanoAppInstanceInfo { } /** - * Set the application version - * - * @param appVersion - version of the app - * - * @hide - */ - public void setAppVersion(int appVersion) { - mAppVersion = appVersion; - } - - /** * Get the read memory needed by the app * * @return int - readable memory needed in bytes @@ -147,17 +113,6 @@ public class NanoAppInstanceInfo { } /** - * Set the read memory needed by the app - * - * @param neededReadMemBytes - readable Memory needed in bytes - * - * @hide - */ - public void setNeededReadMemBytes(int neededReadMemBytes) { - mNeededReadMemBytes = neededReadMemBytes; - } - - /** * get writable memory needed by the app * * @return int - writable memory needed by the app @@ -167,18 +122,6 @@ public class NanoAppInstanceInfo { } /** - * set writable memory needed by the app - * - * @param neededWriteMemBytes - writable memory needed by the - * app - * - * @hide - */ - public void setNeededWriteMemBytes(int neededWriteMemBytes) { - mNeededWriteMemBytes = neededWriteMemBytes; - } - - /** * get executable memory needed by the app * * @return int - executable memory needed by the app @@ -188,18 +131,6 @@ public class NanoAppInstanceInfo { } /** - * set executable memory needed by the app - * - * @param neededExecMemBytes - executable memory needed by the - * app - * - * @hide - */ - public void setNeededExecMemBytes(int neededExecMemBytes) { - mNeededExecMemBytes = neededExecMemBytes; - } - - /** * Get the sensors needed by this app * * @return int[] all the required sensors needed by this app @@ -210,17 +141,6 @@ public class NanoAppInstanceInfo { } /** - * set the sensors needed by this app - * - * @param neededSensors - all the sensors needed by this app - * - * @hide - */ - public void setNeededSensors(@Nullable int[] neededSensors) { - mNeededSensors = neededSensors != null ? neededSensors : EmptyArray.INT; - } - - /** * get the events generated by this app * * @return all the events that can be generated by this app @@ -231,18 +151,6 @@ public class NanoAppInstanceInfo { } /** - * set the output events that can be generated by this app - * - * @param outputEvents - the events that may be generated by - * this app - * - * @hide - */ - public void setOutputEvents(@Nullable int[] outputEvents) { - mOutputEvents = outputEvents != null ? outputEvents : EmptyArray.INT; - } - - /** * get the context hub identifier * * @return int - system unique hub identifier @@ -252,17 +160,6 @@ public class NanoAppInstanceInfo { } /** - * set the context hub identifier - * - * @param contexthubId - system wide unique identifier - * - * @hide - */ - public void setContexthubId(int contexthubId) { - mContexthubId = contexthubId; - } - - /** * get a handle to the nano app instance * * @return int - handle to this instance @@ -271,18 +168,6 @@ public class NanoAppInstanceInfo { return mHandle; } - /** - * set the handle for an app instance - * - * @param handle - handle to this instance - * - * @hide - */ - public void setHandle(int handle) { - mHandle = handle; - } - - private NanoAppInstanceInfo(Parcel in) { mPublisher = in.readString(); mName = in.readString(); diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java index 4f4361f6f1eb..4d54e31b8c5d 100644 --- a/core/java/android/hardware/radio/RadioManager.java +++ b/core/java/android/hardware/radio/RadioManager.java @@ -161,7 +161,8 @@ public class RadioManager { private final Set<Integer> mSupportedIdentifierTypes; @NonNull private final Map<String, String> mVendorInfo; - ModuleProperties(int id, String serviceName, int classId, String implementor, + /** @hide */ + public ModuleProperties(int id, String serviceName, int classId, String implementor, String product, String version, String serial, int numTuners, int numAudioSources, boolean isCaptureSupported, BandDescriptor[] bands, boolean isBgScanSupported, @ProgramSelector.ProgramType int[] supportedProgramTypes, diff --git a/core/java/android/net/IIpSecService.aidl b/core/java/android/net/IIpSecService.aidl index 0b1ea98f2e12..d9b57db18071 100644 --- a/core/java/android/net/IIpSecService.aidl +++ b/core/java/android/net/IIpSecService.aidl @@ -30,7 +30,7 @@ import android.os.ParcelFileDescriptor; */ interface IIpSecService { - IpSecSpiResponse reserveSecurityParameterIndex( + IpSecSpiResponse allocateSecurityParameterIndex( int direction, in String remoteAddress, int requestedSpi, in IBinder binder); void releaseSecurityParameterIndex(int resourceId); diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index a9e60ec88a8e..6a4b8914780c 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -46,7 +46,7 @@ import java.net.Socket; * to create a VPN should use {@link VpnService}. * * @see <a href="https://tools.ietf.org/html/rfc4301">RFC 4301, Security Architecture for the - * Internet Protocol</a> + * Internet Protocol</a> */ @SystemService(Context.IPSEC_SERVICE) public final class IpSecManager { @@ -59,8 +59,7 @@ public final class IpSecManager { * * @hide */ - @TestApi - public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; + @TestApi public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; /** @hide */ public interface Status { @@ -78,7 +77,7 @@ public final class IpSecManager { * <p>The combination of remote {@code InetAddress} and SPI must be unique across all apps on * one device. If this error is encountered, a new SPI is required before a transform may be * created. This error can be avoided by calling {@link - * IpSecManager#reserveSecurityParameterIndex}. + * IpSecManager#allocateSecurityParameterIndex}. */ public static final class SpiUnavailableException extends AndroidException { private final int mSpi; @@ -121,7 +120,7 @@ public final class IpSecManager { * This class represents a reserved SPI. * * <p>Objects of this type are used to track reserved security parameter indices. They can be - * obtained by calling {@link IpSecManager#reserveSecurityParameterIndex} and must be released + * obtained by calling {@link IpSecManager#allocateSecurityParameterIndex} and must be released * by calling {@link #close()} when they are no longer needed. */ public static final class SecurityParameterIndex implements AutoCloseable { @@ -170,7 +169,7 @@ public final class IpSecManager { mRemoteAddress = remoteAddress; try { IpSecSpiResponse result = - mService.reserveSecurityParameterIndex( + mService.allocateSecurityParameterIndex( direction, remoteAddress.getHostAddress(), spi, new Binder()); if (result == null) { @@ -228,7 +227,7 @@ public final class IpSecManager { * for this user * @throws SpiUnavailableException indicating that a particular SPI cannot be reserved */ - public SecurityParameterIndex reserveSecurityParameterIndex( + public SecurityParameterIndex allocateSecurityParameterIndex( int direction, InetAddress remoteAddress) throws ResourceUnavailableException { try { return new SecurityParameterIndex( @@ -255,7 +254,7 @@ public final class IpSecManager { * for this user * @throws SpiUnavailableException indicating that the requested SPI could not be reserved */ - public SecurityParameterIndex reserveSecurityParameterIndex( + public SecurityParameterIndex allocateSecurityParameterIndex( int direction, InetAddress remoteAddress, int requestedSpi) throws SpiUnavailableException, ResourceUnavailableException { if (requestedSpi == IpSecManager.INVALID_SECURITY_PARAMETER_INDEX) { @@ -273,16 +272,18 @@ public final class IpSecManager { * unprotected traffic can resume on that socket. * * <p>For security reasons, the destination address of any traffic on the socket must match the - * remote {@code InetAddress} of the {@code IpSecTransform}. Attempts to send traffic to any + * remote {@code InetAddress} of the {@code IpSecTransform}. Attempts to send traffic to any * other IP address will result in an IOException. In addition, reads and writes on the socket * will throw IOException if the user deactivates the transform (by calling {@link * IpSecTransform#close()}) without calling {@link #removeTransportModeTransform}. * - * <h4>Rekey Procedure</h4> <p>When applying a new tranform to a socket, the previous transform - * will be removed. However, inbound traffic on the old transform will continue to be decrypted - * until that transform is deallocated by calling {@link IpSecTransform#close()}. This overlap - * allows rekey procedures where both transforms are valid until both endpoints are using the - * new transform and all in-flight packets have been received. + * <h4>Rekey Procedure</h4> + * + * <p>When applying a new tranform to a socket, the previous transform will be removed. However, + * inbound traffic on the old transform will continue to be decrypted until that transform is + * deallocated by calling {@link IpSecTransform#close()}. This overlap allows rekey procedures + * where both transforms are valid until both endpoints are using the new transform and all + * in-flight packets have been received. * * @param socket a stream socket * @param transform a transport mode {@code IpSecTransform} @@ -310,11 +311,13 @@ public final class IpSecManager { * will throw IOException if the user deactivates the transform (by calling {@link * IpSecTransform#close()}) without calling {@link #removeTransportModeTransform}. * - * <h4>Rekey Procedure</h4> <p>When applying a new tranform to a socket, the previous transform - * will be removed. However, inbound traffic on the old transform will continue to be decrypted - * until that transform is deallocated by calling {@link IpSecTransform#close()}. This overlap - * allows rekey procedures where both transforms are valid until both endpoints are using the - * new transform and all in-flight packets have been received. + * <h4>Rekey Procedure</h4> + * + * <p>When applying a new tranform to a socket, the previous transform will be removed. However, + * inbound traffic on the old transform will continue to be decrypted until that transform is + * deallocated by calling {@link IpSecTransform#close()}. This overlap allows rekey procedures + * where both transforms are valid until both endpoints are using the new transform and all + * in-flight packets have been received. * * @param socket a datagram socket * @param transform a transport mode {@code IpSecTransform} @@ -342,11 +345,13 @@ public final class IpSecManager { * will throw IOException if the user deactivates the transform (by calling {@link * IpSecTransform#close()}) without calling {@link #removeTransportModeTransform}. * - * <h4>Rekey Procedure</h4> <p>When applying a new tranform to a socket, the previous transform - * will be removed. However, inbound traffic on the old transform will continue to be decrypted - * until that transform is deallocated by calling {@link IpSecTransform#close()}. This overlap - * allows rekey procedures where both transforms are valid until both endpoints are using the - * new transform and all in-flight packets have been received. + * <h4>Rekey Procedure</h4> + * + * <p>When applying a new tranform to a socket, the previous transform will be removed. However, + * inbound traffic on the old transform will continue to be decrypted until that transform is + * deallocated by calling {@link IpSecTransform#close()}. This overlap allows rekey procedures + * where both transforms are valid until both endpoints are using the new transform and all + * in-flight packets have been received. * * @param socket a socket file descriptor * @param transform a transport mode {@code IpSecTransform} @@ -379,7 +384,8 @@ public final class IpSecManager { * Applications should probably not use this API directly. Instead, they should use {@link * VpnService} to provide VPN capability in a more generic fashion. * - * TODO: Update javadoc for tunnel mode APIs at the same time the APIs are re-worked. + * <p>TODO: Update javadoc for tunnel mode APIs at the same time the APIs are re-worked. + * * @param net a {@link Network} that will be tunneled via IP Sec. * @param transform an {@link IpSecTransform}, which must be an active Tunnel Mode transform. * @hide @@ -469,7 +475,8 @@ public final class IpSecManager { * all traffic that cannot be routed to the Tunnel's outbound interface. If that interface is * lost, all traffic will drop. * - * TODO: Update javadoc for tunnel mode APIs at the same time the APIs are re-worked. + * <p>TODO: Update javadoc for tunnel mode APIs at the same time the APIs are re-worked. + * * @param net a network that currently has transform applied to it. * @param transform a Tunnel Mode IPsec Transform that has been previously applied to the given * network diff --git a/core/java/android/net/IpSecTransform.java b/core/java/android/net/IpSecTransform.java index cda4ec762caf..7cd742b417a4 100644 --- a/core/java/android/net/IpSecTransform.java +++ b/core/java/android/net/IpSecTransform.java @@ -47,7 +47,7 @@ import java.net.InetAddress; * system resources. * * @see <a href="https://tools.ietf.org/html/rfc4301">RFC 4301, Security Architecture for the - * Internet Protocol</a> + * Internet Protocol</a> */ public final class IpSecTransform implements AutoCloseable { private static final String TAG = "IpSecTransform"; @@ -116,8 +116,7 @@ public final class IpSecTransform implements AutoCloseable { } /** - * Checks the result status and throws an appropriate exception if - * the status is not Status.OK. + * Checks the result status and throws an appropriate exception if the status is not Status.OK. */ private void checkResultStatus(int status) throws IOException, IpSecManager.ResourceUnavailableException, @@ -267,9 +266,7 @@ public final class IpSecTransform implements AutoCloseable { return; } - /** - * This class is used to build {@link IpSecTransform} objects. - */ + /** This class is used to build {@link IpSecTransform} objects. */ public static class Builder { private Context mContext; private IpSecConfig mConfig; @@ -339,7 +336,7 @@ public final class IpSecTransform implements AutoCloseable { * * <p>Because IPsec operates at the IP layer, this 32-bit identifier uniquely identifies * packets to a given destination address. To prevent SPI collisions, values should be - * reserved by calling {@link IpSecManager#reserveSecurityParameterIndex}. + * reserved by calling {@link IpSecManager#allocateSecurityParameterIndex}. * * <p>If the SPI and algorithms are omitted for one direction, traffic in that direction * will not be encrypted or authenticated. @@ -374,10 +371,9 @@ public final class IpSecTransform implements AutoCloseable { * <p>This allows IPsec traffic to pass through a NAT. * * @see <a href="https://tools.ietf.org/html/rfc3948">RFC 3948, UDP Encapsulation of IPsec - * ESP Packets</a> + * ESP Packets</a> * @see <a href="https://tools.ietf.org/html/rfc7296#section-2.23">RFC 7296 section 2.23, - * NAT Traversal of IKEv2</a> - * + * NAT Traversal of IKEv2</a> * @param localSocket a socket for sending and receiving encapsulated traffic * @param remotePort the UDP port number of the remote host that will send and receive * encapsulated traffic. In the case of IKEv2, this should be port 4500. @@ -402,7 +398,6 @@ public final class IpSecTransform implements AutoCloseable { * * @param intervalSeconds the maximum number of seconds between keepalive packets. Must be * between 20s and 3600s. - * * @hide */ @SystemApi @@ -418,7 +413,6 @@ public final class IpSecTransform implements AutoCloseable { * will not affect any network traffic until it has been applied to one or more sockets. * * @see IpSecManager#applyTransportModeTransform - * * @param remoteAddress the remote {@code InetAddress} of traffic on sockets that will use * this transform * @throws IllegalArgumentException indicating that a particular combination of transform @@ -453,8 +447,8 @@ public final class IpSecTransform implements AutoCloseable { */ public IpSecTransform buildTunnelModeTransform( InetAddress localAddress, InetAddress remoteAddress) { - //FIXME: argument validation here - //throw new IllegalArgumentException("Natt Keepalive requires UDP Encapsulation"); + // FIXME: argument validation here + // throw new IllegalArgumentException("Natt Keepalive requires UDP Encapsulation"); mConfig.setLocalAddress(localAddress.getHostAddress()); mConfig.setRemoteAddress(remoteAddress.getHostAddress()); mConfig.setMode(MODE_TUNNEL); diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index d1ce60e9ff08..6758d95fa6b6 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS @@ -1,6 +1,7 @@ ek@google.com hugobenichi@google.com jsharkey@android.com +jchalard@google.com lorenzo@google.com satk@google.com silberst@google.com diff --git a/core/java/android/os/HandlerExecutor.java b/core/java/android/os/HandlerExecutor.java new file mode 100644 index 000000000000..416b24b5ed05 --- /dev/null +++ b/core/java/android/os/HandlerExecutor.java @@ -0,0 +1,45 @@ +/* + * 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.os; + +import android.annotation.NonNull; + +import com.android.internal.util.Preconditions; + +import java.util.concurrent.Executor; +import java.util.concurrent.RejectedExecutionException; + +/** + * An adapter {@link Executor} that posts all executed tasks onto the given + * {@link Handler}. + * + * @hide + */ +public class HandlerExecutor implements Executor { + private final Handler mHandler; + + public HandlerExecutor(@NonNull Handler handler) { + mHandler = Preconditions.checkNotNull(handler); + } + + @Override + public void execute(Runnable command) { + if (!mHandler.post(command)) { + throw new RejectedExecutionException(mHandler + " is shutting down"); + } + } +} diff --git a/core/java/android/os/HardwarePropertiesManager.java b/core/java/android/os/HardwarePropertiesManager.java index aad202e77710..eae7d7014bb1 100644 --- a/core/java/android/os/HardwarePropertiesManager.java +++ b/core/java/android/os/HardwarePropertiesManager.java @@ -40,9 +40,11 @@ public class HardwarePropertiesManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - DEVICE_TEMPERATURE_CPU, DEVICE_TEMPERATURE_GPU, DEVICE_TEMPERATURE_BATTERY, - DEVICE_TEMPERATURE_SKIN + @IntDef(prefix = { "DEVICE_TEMPERATURE_" }, value = { + DEVICE_TEMPERATURE_CPU, + DEVICE_TEMPERATURE_GPU, + DEVICE_TEMPERATURE_BATTERY, + DEVICE_TEMPERATURE_SKIN }) public @interface DeviceTemperatureType {} @@ -50,9 +52,11 @@ public class HardwarePropertiesManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - TEMPERATURE_CURRENT, TEMPERATURE_THROTTLING, TEMPERATURE_SHUTDOWN, - TEMPERATURE_THROTTLING_BELOW_VR_MIN + @IntDef(prefix = { "TEMPERATURE_" }, value = { + TEMPERATURE_CURRENT, + TEMPERATURE_THROTTLING, + TEMPERATURE_SHUTDOWN, + TEMPERATURE_THROTTLING_BELOW_VR_MIN }) public @interface TemperatureSource {} diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index 624e28a67ae6..96e7a598ab73 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -871,7 +871,11 @@ public final class MessageQueue { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={EVENT_INPUT, EVENT_OUTPUT, EVENT_ERROR}) + @IntDef(flag = true, prefix = { "EVENT_" }, value = { + EVENT_INPUT, + EVENT_OUTPUT, + EVENT_ERROR + }) public @interface Events {} /** diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 01fe5bfee6c7..56c639135657 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -466,7 +466,7 @@ public final class PowerManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "SHUTDOWN_REASON_" }, value = { SHUTDOWN_REASON_UNKNOWN, SHUTDOWN_REASON_SHUTDOWN, SHUTDOWN_REASON_REBOOT, diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 61dd462f2e07..fb60bbb483b1 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -103,8 +103,12 @@ public class UserManager { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={RESTRICTION_NOT_SET, RESTRICTION_SOURCE_SYSTEM, - RESTRICTION_SOURCE_DEVICE_OWNER, RESTRICTION_SOURCE_PROFILE_OWNER}) + @IntDef(flag = true, prefix = { "RESTRICTION_" }, value = { + RESTRICTION_NOT_SET, + RESTRICTION_SOURCE_SYSTEM, + RESTRICTION_SOURCE_DEVICE_OWNER, + RESTRICTION_SOURCE_PROFILE_OWNER + }) @SystemApi public @interface UserRestrictionSource {} diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 4796712f2d98..9833fe15dd3c 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1690,7 +1690,7 @@ public class StorageManager { public static final int FLAG_ALLOCATE_DEFY_HALF_RESERVED = 1 << 2; /** @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_ALLOCATE_" }, value = { FLAG_ALLOCATE_AGGRESSIVE, FLAG_ALLOCATE_DEFY_ALL_RESERVED, FLAG_ALLOCATE_DEFY_HALF_RESERVED, diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index ce5b11ee33f1..f0d9a0cebbdb 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -49,8 +49,9 @@ import java.util.Map; public final class PrintAttributes implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = { - COLOR_MODE_MONOCHROME, COLOR_MODE_COLOR + @IntDef(flag = true, prefix = { "COLOR_MODE_" }, value = { + COLOR_MODE_MONOCHROME, + COLOR_MODE_COLOR }) @interface ColorMode { } @@ -64,8 +65,10 @@ public final class PrintAttributes implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = { - DUPLEX_MODE_NONE, DUPLEX_MODE_LONG_EDGE, DUPLEX_MODE_SHORT_EDGE + @IntDef(flag = true, prefix = { "DUPLEX_MODE_" }, value = { + DUPLEX_MODE_NONE, + DUPLEX_MODE_LONG_EDGE, + DUPLEX_MODE_SHORT_EDGE }) @interface DuplexMode { } diff --git a/core/java/android/print/PrintDocumentInfo.java b/core/java/android/print/PrintDocumentInfo.java index 61434041ff5a..55c902e19c35 100644 --- a/core/java/android/print/PrintDocumentInfo.java +++ b/core/java/android/print/PrintDocumentInfo.java @@ -83,11 +83,14 @@ public final class PrintDocumentInfo implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - CONTENT_TYPE_UNKNOWN, CONTENT_TYPE_DOCUMENT, CONTENT_TYPE_PHOTO + @IntDef(prefix = { "CONTENT_TYPE_" }, value = { + CONTENT_TYPE_UNKNOWN, + CONTENT_TYPE_DOCUMENT, + CONTENT_TYPE_PHOTO }) public @interface ContentType { } + /** * Content type: unknown. */ diff --git a/core/java/android/print/PrintJobInfo.java b/core/java/android/print/PrintJobInfo.java index 94686a8ee456..85fdd642095c 100644 --- a/core/java/android/print/PrintJobInfo.java +++ b/core/java/android/print/PrintJobInfo.java @@ -45,9 +45,14 @@ import java.util.Arrays; public final class PrintJobInfo implements Parcelable { /** @hide */ - @IntDef({ - STATE_CREATED, STATE_QUEUED, STATE_STARTED, STATE_BLOCKED, STATE_COMPLETED, - STATE_FAILED, STATE_CANCELED + @IntDef(prefix = { "STATE_" }, value = { + STATE_CREATED, + STATE_QUEUED, + STATE_STARTED, + STATE_BLOCKED, + STATE_COMPLETED, + STATE_FAILED, + STATE_CANCELED }) @Retention(RetentionPolicy.SOURCE) public @interface State { diff --git a/core/java/android/print/PrinterInfo.java b/core/java/android/print/PrinterInfo.java index 88feab7fc2ca..e79cc651c48b 100644 --- a/core/java/android/print/PrinterInfo.java +++ b/core/java/android/print/PrinterInfo.java @@ -53,12 +53,15 @@ import java.lang.annotation.RetentionPolicy; public final class PrinterInfo implements Parcelable { /** @hide */ - @IntDef({ - STATUS_IDLE, STATUS_BUSY, STATUS_UNAVAILABLE + @IntDef(prefix = { "STATUS_" }, value = { + STATUS_IDLE, + STATUS_BUSY, + STATUS_UNAVAILABLE }) @Retention(RetentionPolicy.SOURCE) public @interface Status { } + /** Printer status: the printer is idle and ready to print. */ public static final int STATUS_IDLE = PrinterInfoProto.STATUS_IDLE; diff --git a/core/java/android/provider/FontsContract.java b/core/java/android/provider/FontsContract.java index d8540ffd639a..a1d1c5736116 100644 --- a/core/java/android/provider/FontsContract.java +++ b/core/java/android/provider/FontsContract.java @@ -283,7 +283,11 @@ public class FontsContract { public static final int STATUS_REJECTED = 3; /** @hide */ - @IntDef({STATUS_OK, STATUS_WRONG_CERTIFICATES, STATUS_UNEXPECTED_DATA_PROVIDED}) + @IntDef(prefix = { "STATUS_" }, value = { + STATUS_OK, + STATUS_WRONG_CERTIFICATES, + STATUS_UNEXPECTED_DATA_PROVIDED + }) @Retention(RetentionPolicy.SOURCE) @interface FontResultStatus {} @@ -438,9 +442,13 @@ public class FontsContract { public static final int FAIL_REASON_MALFORMED_QUERY = Columns.RESULT_CODE_MALFORMED_QUERY; /** @hide */ - @IntDef({ FAIL_REASON_PROVIDER_NOT_FOUND, FAIL_REASON_FONT_LOAD_ERROR, - FAIL_REASON_FONT_NOT_FOUND, FAIL_REASON_FONT_UNAVAILABLE, - FAIL_REASON_MALFORMED_QUERY }) + @IntDef(prefix = { "FAIL_" }, value = { + FAIL_REASON_PROVIDER_NOT_FOUND, + FAIL_REASON_FONT_LOAD_ERROR, + FAIL_REASON_FONT_NOT_FOUND, + FAIL_REASON_FONT_UNAVAILABLE, + FAIL_REASON_MALFORMED_QUERY + }) @Retention(RetentionPolicy.SOURCE) @interface FontRequestFailReason {} diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6b1632a0a693..4ecbdf587600 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1689,7 +1689,7 @@ public final class Settings { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "RESET_MODE_" }, value = { RESET_MODE_PACKAGE_DEFAULTS, RESET_MODE_UNTRUSTED_DEFAULTS, RESET_MODE_UNTRUSTED_CHANGES, @@ -11143,6 +11143,15 @@ public final class Settings { */ public static final String NOTIFICATION_SNOOZE_OPTIONS = "notification_snooze_options"; + + /** + * Enable GNSS Raw Measurements Full Tracking? + * 0 = no + * 1 = yes + * @hide + */ + public static final String ENABLE_GNSS_RAW_MEAS_FULL_TRACKING = + "enable_gnss_raw_meas_full_tracking"; } /** diff --git a/core/java/android/security/recoverablekeystore/KeyDerivationParameters.aidl b/core/java/android/security/recoverablekeystore/KeyDerivationParameters.aidl new file mode 100644 index 000000000000..fe13179cab47 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyDerivationParameters.aidl @@ -0,0 +1,20 @@ +/* + * 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.security.recoverablekeystore; + +/* @hide */ +parcelable KeyDerivationParameters; diff --git a/core/java/android/security/recoverablekeystore/KeyDerivationParameters.java b/core/java/android/security/recoverablekeystore/KeyDerivationParameters.java new file mode 100644 index 000000000000..2205c416921d --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyDerivationParameters.java @@ -0,0 +1,112 @@ +/* + * 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.security.recoverablekeystore; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import com.android.internal.util.Preconditions; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Collection of parameters which define a key derivation function. + * Supports + * + * <ul> + * <li>SHA256 + * <li>Argon2id + * </ul> + * @hide + */ +public final class KeyDerivationParameters implements Parcelable { + private final int mAlgorithm; + private byte[] mSalt; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ALGORITHM_SHA256, ALGORITHM_ARGON2ID}) + public @interface KeyDerivationAlgorithm { + } + + /** + * Salted SHA256 + */ + public static final int ALGORITHM_SHA256 = 1; + + /** + * Argon2ID + */ + // TODO: add Argon2ID support. + public static final int ALGORITHM_ARGON2ID = 2; + + /** + * Creates instance of the class to to derive key using salted SHA256 hash. + */ + public KeyDerivationParameters createSHA256Parameters(@NonNull byte[] salt) { + return new KeyDerivationParameters(ALGORITHM_SHA256, salt); + } + + private KeyDerivationParameters(@KeyDerivationAlgorithm int algorithm, @NonNull byte[] salt) { + mAlgorithm = algorithm; + mSalt = Preconditions.checkNotNull(salt); + } + + /** + * Gets algorithm. + */ + public @KeyDerivationAlgorithm int getAlgorithm() { + return mAlgorithm; + } + + /** + * Gets salt. + */ + public @NonNull byte[] getSalt() { + return mSalt; + } + + public static final Parcelable.Creator<KeyDerivationParameters> CREATOR = + new Parcelable.Creator<KeyDerivationParameters>() { + public KeyDerivationParameters createFromParcel(Parcel in) { + return new KeyDerivationParameters(in); + } + + public KeyDerivationParameters[] newArray(int length) { + return new KeyDerivationParameters[length]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(mAlgorithm); + out.writeByteArray(mSalt); + } + + protected KeyDerivationParameters(Parcel in) { + mAlgorithm = in.readInt(); + mSalt = in.createByteArray(); + } + + @Override + public int describeContents() { + return 0; + } +} diff --git a/core/java/android/security/recoverablekeystore/KeyEntryRecoveryData.aidl b/core/java/android/security/recoverablekeystore/KeyEntryRecoveryData.aidl new file mode 100644 index 000000000000..1058463aa561 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyEntryRecoveryData.aidl @@ -0,0 +1,20 @@ +/* + * 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.security.keystore.recoverablekeystore; + +/* @hide */ +parcelable KeyEntryRecoveryData; diff --git a/core/java/android/security/recoverablekeystore/KeyEntryRecoveryData.java b/core/java/android/security/recoverablekeystore/KeyEntryRecoveryData.java new file mode 100644 index 000000000000..80f5aa71acd8 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyEntryRecoveryData.java @@ -0,0 +1,90 @@ +/* + * 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.security.recoverablekeystore; + +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import com.android.internal.util.Preconditions; + + +/** + * Helper class with data necessary recover a single application key, given a recovery key. + * + * <ul> + * <li>Alias - Keystore alias of the key. + * <li>Encrypted key material. + * </ul> + * + * Note that Application info is not included. Recovery Agent can only make its own keys + * recoverable. + * + * @hide + */ +public final class KeyEntryRecoveryData implements Parcelable { + private final byte[] mAlias; + // The only supported format is AES-256 symmetric key. + private final byte[] mEncryptedKeyMaterial; + + public KeyEntryRecoveryData(@NonNull byte[] alias, @NonNull byte[] encryptedKeyMaterial) { + mAlias = Preconditions.checkNotNull(alias); + mEncryptedKeyMaterial = Preconditions.checkNotNull(encryptedKeyMaterial); + } + + /** + * Application-specific alias of the key. + * @see java.security.KeyStore.aliases + */ + public @NonNull byte[] getAlias() { + return mAlias; + } + + /** + * Encrypted key material encrypted by recovery key. + */ + public @NonNull byte[] getEncryptedKeyMaterial() { + return mEncryptedKeyMaterial; + } + + public static final Parcelable.Creator<KeyEntryRecoveryData> CREATOR = + new Parcelable.Creator<KeyEntryRecoveryData>() { + public KeyEntryRecoveryData createFromParcel(Parcel in) { + return new KeyEntryRecoveryData(in); + } + + public KeyEntryRecoveryData[] newArray(int length) { + return new KeyEntryRecoveryData[length]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeByteArray(mAlias); + out.writeByteArray(mEncryptedKeyMaterial); + } + + protected KeyEntryRecoveryData(Parcel in) { + mAlias = in.createByteArray(); + mEncryptedKeyMaterial = in.createByteArray(); + } + + @Override + public int describeContents() { + return 0; + } +} diff --git a/core/java/android/security/recoverablekeystore/KeyStoreRecoveryData.aidl b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryData.aidl new file mode 100644 index 000000000000..bd760516c6c3 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryData.aidl @@ -0,0 +1,20 @@ +/* + * 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.security.recoverablekeystore; + +/* @hide */ +parcelable KeyStoreRecoveryData; diff --git a/core/java/android/security/recoverablekeystore/KeyStoreRecoveryData.java b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryData.java new file mode 100644 index 000000000000..087f7a25688d --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryData.java @@ -0,0 +1,115 @@ +/* + * 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.security.recoverablekeystore; + +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import com.android.internal.util.Preconditions; + +import java.util.List; + +/** + * Helper class which returns data necessary to recover keys. + * Contains + * + * <ul> + * <li>Snapshot version. + * <li>Recovery metadata with UI and key derivation parameters. + * <li>List of application keys encrypted by recovery key. + * <li>Encrypted recovery key. + * </ul> + * + * @hide + */ +public final class KeyStoreRecoveryData implements Parcelable { + private final int mSnapshotVersion; + private final List<KeyStoreRecoveryMetadata> mRecoveryMetadata; + private final List<KeyEntryRecoveryData> mApplicationKeyBlobs; + private final byte[] mEncryptedRecoveryKeyBlob; + + public KeyStoreRecoveryData(int snapshotVersion, @NonNull List<KeyStoreRecoveryMetadata> + recoveryMetadata, @NonNull List<KeyEntryRecoveryData> applicationKeyBlobs, + @NonNull byte[] encryptedRecoveryKeyBlob) { + mSnapshotVersion = snapshotVersion; + mRecoveryMetadata = Preconditions.checkNotNull(recoveryMetadata); + mApplicationKeyBlobs = Preconditions.checkNotNull(applicationKeyBlobs); + mEncryptedRecoveryKeyBlob = Preconditions.checkNotNull(encryptedRecoveryKeyBlob); + } + + /** + * Snapshot version for given account. It is incremented when user secret or list of application + * keys changes. + */ + public int getSnapshotVersion() { + return mSnapshotVersion; + } + + /** + * UI and key derivation parameters. Note that combination of secrets may be used. + */ + public @NonNull List<KeyStoreRecoveryMetadata> getRecoveryMetadata() { + return mRecoveryMetadata; + } + + /** + * List of application keys, with key material encrypted by + * the recovery key ({@link #getEncryptedRecoveryKeyBlob}). + */ + public @NonNull List<KeyEntryRecoveryData> getApplicationKeyBlobs() { + return mApplicationKeyBlobs; + } + + /** + * Recovery key blob, encrypted by user secret and recovery service public key. + */ + public @NonNull byte[] getEncryptedRecoveryKeyBlob() { + return mEncryptedRecoveryKeyBlob; + } + + public static final Parcelable.Creator<KeyStoreRecoveryData> CREATOR = + new Parcelable.Creator<KeyStoreRecoveryData>() { + public KeyStoreRecoveryData createFromParcel(Parcel in) { + return new KeyStoreRecoveryData(in); + } + + public KeyStoreRecoveryData[] newArray(int length) { + return new KeyStoreRecoveryData[length]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(mSnapshotVersion); + out.writeTypedList(mRecoveryMetadata); + out.writeByteArray(mEncryptedRecoveryKeyBlob); + out.writeTypedList(mApplicationKeyBlobs); + } + + protected KeyStoreRecoveryData(Parcel in) { + mSnapshotVersion = in.readInt(); + mRecoveryMetadata = in.createTypedArrayList(KeyStoreRecoveryMetadata.CREATOR); + mEncryptedRecoveryKeyBlob = in.createByteArray(); + mApplicationKeyBlobs = in.createTypedArrayList(KeyEntryRecoveryData.CREATOR); + } + + @Override + public int describeContents() { + return 0; + } +} diff --git a/core/java/android/security/recoverablekeystore/KeyStoreRecoveryMetadata.aidl b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryMetadata.aidl new file mode 100644 index 000000000000..e1d49defe157 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryMetadata.aidl @@ -0,0 +1,20 @@ +/* + * 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.security.recoverablekeystore; + +/* @hide */ +parcelable KeyStoreRecoveryMetadata; diff --git a/core/java/android/security/recoverablekeystore/KeyStoreRecoveryMetadata.java b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryMetadata.java new file mode 100644 index 000000000000..43f9c80571b3 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/KeyStoreRecoveryMetadata.java @@ -0,0 +1,180 @@ +/* + * 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.security.recoverablekeystore; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +import com.android.internal.util.Preconditions; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; + +/** + * Helper class with data necessary to recover Keystore on a new device. + * It defines UI shown to the user and a way to derive a cryptographic key from user output. + * + * @hide + */ +public final class KeyStoreRecoveryMetadata implements Parcelable { + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({TYPE_LOCKSCREEN, TYPE_CUSTOM_PASSWORD}) + public @interface UserSecretType { + } + + /** + * Lockscreen secret is required to recover KeyStore. + */ + public static final int TYPE_LOCKSCREEN = 1; + + /** + * Custom passphrase, unrelated to lock screen, is required to recover KeyStore. + */ + public static final int TYPE_CUSTOM_PASSWORD = 2; + + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({TYPE_PIN, TYPE_PASSWORD, TYPE_PATTERN}) + public @interface LockScreenUiFormat { + } + + /** + * Pin with digits only. + */ + public static final int TYPE_PIN = 1; + + /** + * Password. String with latin-1 characters only. + */ + public static final int TYPE_PASSWORD = 2; + + /** + * Pattern with 3 by 3 grid. + */ + public static final int TYPE_PATTERN = 3; + + @UserSecretType + private final int mUserSecretType; + + @LockScreenUiFormat + private final int mLockScreenUiFormat; + + /** + * Parameters of key derivation function, including algorithm, difficulty, salt. + */ + private KeyDerivationParameters mKeyDerivationParameters; + private byte[] mSecret; // Derived from user secret. The field must have limited visibility. + + /** + * @param secret Constructor creates a reference to the secret. Caller must use + * @link {#clearSecret} to overwrite its value in memory. + */ + public KeyStoreRecoveryMetadata(@UserSecretType int userSecretType, + @LockScreenUiFormat int lockScreenUiFormat, + @NonNull KeyDerivationParameters keyDerivationParameters, @NonNull byte[] secret) { + mUserSecretType = userSecretType; + mLockScreenUiFormat = lockScreenUiFormat; + mKeyDerivationParameters = Preconditions.checkNotNull(keyDerivationParameters); + mSecret = Preconditions.checkNotNull(secret); + } + + /** + * Specifies UX shown to user during recovery. + * + * @see KeyStore.TYPE_PIN + * @see KeyStore.TYPE_PASSWORD + * @see KeyStore.TYPE_PATTERN + */ + public @LockScreenUiFormat int getLockScreenUiFormat() { + return mLockScreenUiFormat; + } + + /** + * Specifies function used to derive symmetric key from user input + * Format is defined in separate util class. + */ + public @NonNull KeyDerivationParameters getKeyDerivationParameters() { + return mKeyDerivationParameters; + } + + /** + * Secret string derived from user input. + */ + public @NonNull byte[] getSecret() { + return mSecret; + } + + /** + * @see KeyStore.TYPE_LOCKSCREEN + * @see KeyStore.TYPE_CUSTOM_PASSWORD + */ + public @UserSecretType int getUserSecretType() { + return mUserSecretType; + } + + /** + * Removes secret from memory than object is no longer used. + * Since finalizer call is not reliable, please use @link {#clearSecret} directly. + */ + @Override + protected void finalize() throws Throwable { + clearSecret(); + super.finalize(); + } + + /** + * Fills mSecret with zeroes. + */ + public void clearSecret() { + Arrays.fill(mSecret, (byte) 0); + } + + public static final Parcelable.Creator<KeyStoreRecoveryMetadata> CREATOR = + new Parcelable.Creator<KeyStoreRecoveryMetadata>() { + public KeyStoreRecoveryMetadata createFromParcel(Parcel in) { + return new KeyStoreRecoveryMetadata(in); + } + + public KeyStoreRecoveryMetadata[] newArray(int length) { + return new KeyStoreRecoveryMetadata[length]; + } + }; + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeInt(mUserSecretType); + out.writeInt(mLockScreenUiFormat); + out.writeTypedObject(mKeyDerivationParameters, flags); + out.writeByteArray(mSecret); + } + + protected KeyStoreRecoveryMetadata(Parcel in) { + mUserSecretType = in.readInt(); + mLockScreenUiFormat = in.readInt(); + mKeyDerivationParameters = in.readTypedObject(KeyDerivationParameters.CREATOR); + mSecret = in.createByteArray(); + } + + @Override + public int describeContents() { + return 0; + } +} diff --git a/core/java/android/security/recoverablekeystore/RecoverableKeyStoreLoader.java b/core/java/android/security/recoverablekeystore/RecoverableKeyStoreLoader.java new file mode 100644 index 000000000000..0510320d3e11 --- /dev/null +++ b/core/java/android/security/recoverablekeystore/RecoverableKeyStoreLoader.java @@ -0,0 +1,228 @@ +/* + * 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.security.recoverablekeystore; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.content.pm.PackageManager.NameNotFoundException; +import android.os.ServiceManager; + +import com.android.internal.widget.ILockSettings; + +import java.util.List; + +/** + * A wrapper around KeyStore which lets key be exported to + * trusted hardware on server side and recovered later. + * + * @hide + */ +public class RecoverableKeyStoreLoader { + + private final ILockSettings mBinder; + + // Exception codes, should be in sync with {@code KeyStoreException}. + public static final int SYSTEM_ERROR = 4; + + public static final int UNINITIALIZED_RECOVERY_PUBLIC_KEY = 20; + + // Too many updates to recovery public key or server parameters. + public static final int RATE_LIMIT_EXCEEDED = 21; + + private RecoverableKeyStoreLoader(ILockSettings binder) { + mBinder = binder; + } + + /** + * @hide + */ + public static RecoverableKeyStoreLoader getInstance() { + ILockSettings lockSettings = + ILockSettings.Stub.asInterface(ServiceManager.getService("lock_settings")); + return new RecoverableKeyStoreLoader(lockSettings); + } + + /** + * @hide + */ + public static class RecoverableKeyStoreLoaderException extends Exception { + private final int mErrorCode; + + public RecoverableKeyStoreLoaderException(int errorCode, String message) { + super(message); + mErrorCode = errorCode; + } + + public int getErrorCode() { + return mErrorCode; + } + } + + /** + * Initializes key recovery service for the calling application. RecoverableKeyStoreLoader + * randomly chooses one of the keys from the list + * and keeps it to use for future key export operations. Collection of all keys + * in the list must be signed by the provided {@code rootCertificateAlias}, which must also be + * present in the list of root certificates preinstalled on the device. The random selection + * allows RecoverableKeyStoreLoader to select which of a set of remote recovery service + * devices will be used. + * + * <p>In addition, RecoverableKeyStoreLoader enforces a delay of three months between + * consecutive initialization attempts, to limit the ability of an attacker to often switch + * remote recovery devices and significantly increase number of recovery attempts. + * + * @param rootCertificateAlias alias of a root certificate preinstalled on the device + * @param signedPublicKeyList binary blob a list of X509 certificates and signature + * @throws RecoverableKeyStoreLoaderException if signature is invalid, or key rotation was rate + * limited. + * @hide + */ + public void initRecoveryService(@NonNull String rootCertificateAlias, + @NonNull byte[] signedPublicKeyList) + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + // TODO: extend widget/ILockSettings.aidl + /* try { + mBinder.initRecoveryService(rootCertificate, publicKeyList); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } */ + } + + /** + * Returns data necessary to store all recoverable keys for given account. + * Key material is encrypted with user secret and recovery public key. + */ + public KeyStoreRecoveryData getRecoveryData(@NonNull byte[] account) + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Server parameters used to generate new recovery key blobs. This value will be included in + * {@code KeyStoreRecoveryData.getEncryptedRecoveryKeyBlob()}. + * The same value must be included in vaultParams {@link startRecoverySession} + * + * @see #getRecoveryData + * @throws RecoverableKeyStoreLoaderException If parameters rotation is rate limited. + */ + public void updateServerParameters(long serverParameters) + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Updates recovery status for given keys. + * It is used to notify keystore that key was successfully stored on the server or + * there were an error. Returned as a part of KeyInfo data structure. + * + * @param packageName Application whose recoverable keys' statuses are to be updated. + * @param aliases List of application-specific key aliases. If the array is empty, updates the + * status for all existing recoverable keys. + * @param status Status specific to recovery agent. + */ + public void setRecoveryStatus(@NonNull String packageName, @Nullable String[] aliases, + int status) throws NameNotFoundException, RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Specifies a set of secret types used for end-to-end keystore encryption. + * Knowing all of them is necessary to recover data. + * + * @param secretTypes {@link KeyStoreRecoveryMetadata#TYPE_LOCKSCREEN} or + * {@link KeyStoreRecoveryMetadata#TYPE_CUSTOM_PASSWORD} + */ + public void setRecoverySecretTypes(@NonNull @KeyStoreRecoveryMetadata.UserSecretType + int[] secretTypes) throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Defines a set of secret types used for end-to-end keystore encryption. + * Knowing all of them is necessary to generate KeyStoreRecoveryData. + * @see KeyStoreRecoveryData + */ + public @NonNull @KeyStoreRecoveryMetadata.UserSecretType int[] getRecoverySecretTypes() + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Returns a list of recovery secret types, necessary to create a pending recovery snapshot. + * When user enters a secret of a pending type + * {@link #recoverySecretAvailable} should be called. + */ + public @NonNull @KeyStoreRecoveryMetadata.UserSecretType int[] getPendingRecoverySecretTypes() + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Method notifies KeyStore that a user-generated secret is available. + * This method generates a symmetric session key which a trusted remote device can use + * to return a recovery key. + * Caller should use {@link KeyStoreRecoveryMetadata#clearSecret} to override the secret value + * in memory. + * + * @param recoverySecret user generated secret together with parameters necessary to + * regenerate it on a new device. + */ + public void recoverySecretAvailable(@NonNull KeyStoreRecoveryMetadata recoverySecret) + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Initializes recovery session and returns a blob with proof of recovery secrets possession. + * The method generates symmetric key for a session, which trusted remote device can use + * to return recovery key. + * + * @param sessionId ID for recovery session. + * @param verifierPublicKey Certificate with Public key used to create the recovery blob on + * the source device. Keystore will verify the certificate using root of trust. + * @param vaultParams Must match the parameters in the corresponding field in the recovery blob. + * Used to limit number of guesses. + * @param vaultChallenge Data passed from server for this recovery session and used to prevent + * replay attacks + * @param secrets Secrets provided by user, the method only uses type and secret fields. + * @return Binary blob with recovery claim. It is encrypted with verifierPublicKey and + * contains a proof of user secrets, session symmetric key and parameters necessary to identify + * the counter with the number of failed recovery attempts. + */ + public @NonNull byte[] startRecoverySession(@NonNull String sessionId, + @NonNull byte[] verifierPublicKey, @NonNull byte[] vaultParams, + @NonNull byte[] vaultChallenge, @NonNull List<KeyStoreRecoveryMetadata> secrets) + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } + + /** + * Imports keys. + * + * @param sessionId Id for recovery session, same as in = {@link startRecoverySession}. + * @param recoveryKeyBlob Recovery blob encrypted by symmetric key generated for this session. + * @param applicationKeys Application keys. Key material can be decrypted using recoveryKeyBlob + * and session. KeyStore only uses package names from the application info in + * {@link KeyEntryRecoveryData}. Caller is responsibility to perform certificates check. + */ + public void recoverKeys(@NonNull String sessionId, @NonNull byte[] recoveryKeyBlob, + @NonNull List<KeyEntryRecoveryData> applicationKeys) + throws RecoverableKeyStoreLoaderException { + throw new RecoverableKeyStoreLoaderException(SYSTEM_ERROR, "Not implemented"); + } +} diff --git a/core/java/android/service/autofill/FillEventHistory.java b/core/java/android/service/autofill/FillEventHistory.java index facad2d1ab30..a527f16105b9 100644 --- a/core/java/android/service/autofill/FillEventHistory.java +++ b/core/java/android/service/autofill/FillEventHistory.java @@ -226,12 +226,13 @@ public final class FillEventHistory implements Parcelable { public static final int TYPE_CONTEXT_COMMITTED = 4; /** @hide */ - @IntDef( - value = {TYPE_DATASET_SELECTED, - TYPE_DATASET_AUTHENTICATION_SELECTED, - TYPE_AUTHENTICATION_SELECTED, - TYPE_SAVE_SHOWN, - TYPE_CONTEXT_COMMITTED}) + @IntDef(prefix = { "TYPE_" }, value = { + TYPE_DATASET_SELECTED, + TYPE_DATASET_AUTHENTICATION_SELECTED, + TYPE_AUTHENTICATION_SELECTED, + TYPE_SAVE_SHOWN, + TYPE_CONTEXT_COMMITTED + }) @Retention(RetentionPolicy.SOURCE) @interface EventIds{} diff --git a/core/java/android/service/autofill/FillRequest.java b/core/java/android/service/autofill/FillRequest.java index ddc92f6a656f..33619ac68cf0 100644 --- a/core/java/android/service/autofill/FillRequest.java +++ b/core/java/android/service/autofill/FillRequest.java @@ -69,9 +69,9 @@ public final class FillRequest implements Parcelable { public static final int INVALID_REQUEST_ID = Integer.MIN_VALUE; /** @hide */ - @IntDef( - flag = true, - value = {FLAG_MANUAL_REQUEST}) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_MANUAL_REQUEST + }) @Retention(RetentionPolicy.SOURCE) @interface RequestFlags{} diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index 04db69845c86..014d3e8c42c9 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -63,7 +63,7 @@ public final class FillResponse implements Parcelable { public static final int FLAG_DISABLE_ACTIVITY_ONLY = 0x2; /** @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_TRACK_CONTEXT_COMMITED, FLAG_DISABLE_ACTIVITY_ONLY }) diff --git a/core/java/android/service/autofill/SaveInfo.java b/core/java/android/service/autofill/SaveInfo.java index 0b50f074c4c1..a5a6177dedc3 100644 --- a/core/java/android/service/autofill/SaveInfo.java +++ b/core/java/android/service/autofill/SaveInfo.java @@ -198,23 +198,22 @@ public final class SaveInfo implements Parcelable { public static final int NEGATIVE_BUTTON_STYLE_REJECT = 1; /** @hide */ - @IntDef( - value = { - NEGATIVE_BUTTON_STYLE_CANCEL, - NEGATIVE_BUTTON_STYLE_REJECT}) + @IntDef(prefix = { "NEGATIVE_BUTTON_STYLE_" }, value = { + NEGATIVE_BUTTON_STYLE_CANCEL, + NEGATIVE_BUTTON_STYLE_REJECT + }) @Retention(RetentionPolicy.SOURCE) @interface NegativeButtonStyle{} /** @hide */ - @IntDef( - flag = true, - value = { - SAVE_DATA_TYPE_GENERIC, - SAVE_DATA_TYPE_PASSWORD, - SAVE_DATA_TYPE_ADDRESS, - SAVE_DATA_TYPE_CREDIT_CARD, - SAVE_DATA_TYPE_USERNAME, - SAVE_DATA_TYPE_EMAIL_ADDRESS}) + @IntDef(flag = true, prefix = { "SAVE_DATA_TYPE_" }, value = { + SAVE_DATA_TYPE_GENERIC, + SAVE_DATA_TYPE_PASSWORD, + SAVE_DATA_TYPE_ADDRESS, + SAVE_DATA_TYPE_CREDIT_CARD, + SAVE_DATA_TYPE_USERNAME, + SAVE_DATA_TYPE_EMAIL_ADDRESS + }) @Retention(RetentionPolicy.SOURCE) @interface SaveDataType{} @@ -235,9 +234,10 @@ public final class SaveInfo implements Parcelable { public static final int FLAG_DONT_SAVE_ON_FINISH = 0x2; /** @hide */ - @IntDef( - flag = true, - value = {FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE, FLAG_DONT_SAVE_ON_FINISH}) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE, + FLAG_DONT_SAVE_ON_FINISH + }) @Retention(RetentionPolicy.SOURCE) @interface SaveInfoFlags{} diff --git a/core/java/android/service/dreams/OWNERS b/core/java/android/service/dreams/OWNERS new file mode 100644 index 000000000000..3c9bbf8797ea --- /dev/null +++ b/core/java/android/service/dreams/OWNERS @@ -0,0 +1,3 @@ +dsandler@google.com +michaelwr@google.com +roosa@google.com diff --git a/core/java/android/service/notification/Condition.java b/core/java/android/service/notification/Condition.java index 447afe62fd1a..2a352adcee18 100644 --- a/core/java/android/service/notification/Condition.java +++ b/core/java/android/service/notification/Condition.java @@ -39,7 +39,12 @@ public final class Condition implements Parcelable { public static final String SCHEME = "condition"; /** @hide */ - @IntDef({STATE_FALSE, STATE_TRUE, STATE_TRUE, STATE_ERROR}) + @IntDef(prefix = { "STATE_" }, value = { + STATE_FALSE, + STATE_TRUE, + STATE_UNKNOWN, + STATE_ERROR + }) @Retention(RetentionPolicy.SOURCE) public @interface State {} diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index dac663e765ea..18d4a1e63804 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -229,8 +229,11 @@ public abstract class NotificationListenerService extends Service { /** @hide */ - @IntDef({NOTIFICATION_CHANNEL_OR_GROUP_ADDED, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED, - NOTIFICATION_CHANNEL_OR_GROUP_DELETED}) + @IntDef(prefix = { "NOTIFICATION_CHANNEL_OR_GROUP_" }, value = { + NOTIFICATION_CHANNEL_OR_GROUP_ADDED, + NOTIFICATION_CHANNEL_OR_GROUP_UPDATED, + NOTIFICATION_CHANNEL_OR_GROUP_DELETED + }) @Retention(RetentionPolicy.SOURCE) public @interface ChannelOrGroupModificationTypes {} diff --git a/core/java/android/service/persistentdata/PersistentDataBlockManager.java b/core/java/android/service/persistentdata/PersistentDataBlockManager.java index 9332a5be78cc..0bf68b734b8a 100644 --- a/core/java/android/service/persistentdata/PersistentDataBlockManager.java +++ b/core/java/android/service/persistentdata/PersistentDataBlockManager.java @@ -65,10 +65,10 @@ public class PersistentDataBlockManager { */ public static final int FLASH_LOCK_LOCKED = 1; - @IntDef({ - FLASH_LOCK_UNKNOWN, - FLASH_LOCK_LOCKED, - FLASH_LOCK_UNLOCKED, + @IntDef(prefix = { "FLASH_LOCK_" }, value = { + FLASH_LOCK_UNKNOWN, + FLASH_LOCK_LOCKED, + FLASH_LOCK_UNLOCKED, }) @Retention(RetentionPolicy.SOURCE) public @interface FlashLockState {} diff --git a/core/java/android/service/settings/suggestions/Suggestion.java b/core/java/android/service/settings/suggestions/Suggestion.java index cfeb7fcead38..11e1e674a747 100644 --- a/core/java/android/service/settings/suggestions/Suggestion.java +++ b/core/java/android/service/settings/suggestions/Suggestion.java @@ -38,7 +38,7 @@ public final class Suggestion implements Parcelable { /** * @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_HAS_BUTTON, }) @Retention(RetentionPolicy.SOURCE) diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java index 5ef934ed88e3..4bade9f9f9ca 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -114,11 +114,10 @@ public class TrustAgentService extends Service { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - FLAG_GRANT_TRUST_INITIATED_BY_USER, - FLAG_GRANT_TRUST_DISMISS_KEYGUARD, - }) + @IntDef(flag = true, prefix = { "FLAG_GRANT_TRUST_" }, value = { + FLAG_GRANT_TRUST_INITIATED_BY_USER, + FLAG_GRANT_TRUST_DISMISS_KEYGUARD, + }) public @interface GrantTrustFlags {} @@ -138,11 +137,10 @@ public class TrustAgentService extends Service { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - TOKEN_STATE_ACTIVE, - TOKEN_STATE_INACTIVE, - }) + @IntDef(flag = true, prefix = { "TOKEN_STATE_" }, value = { + TOKEN_STATE_ACTIVE, + TOKEN_STATE_INACTIVE, + }) public @interface TokenState {} private static final int MSG_UNLOCK_ATTEMPT = 1; diff --git a/core/java/android/service/voice/AlwaysOnHotwordDetector.java b/core/java/android/service/voice/AlwaysOnHotwordDetector.java index 9464a8754fa8..76d89ef039c8 100644 --- a/core/java/android/service/voice/AlwaysOnHotwordDetector.java +++ b/core/java/android/service/voice/AlwaysOnHotwordDetector.java @@ -87,11 +87,11 @@ public class AlwaysOnHotwordDetector { // Keyphrase management actions. Used in getManageIntent() ----// @Retention(RetentionPolicy.SOURCE) - @IntDef(value = { - MANAGE_ACTION_ENROLL, - MANAGE_ACTION_RE_ENROLL, - MANAGE_ACTION_UN_ENROLL - }) + @IntDef(prefix = { "MANAGE_ACTION_" }, value = { + MANAGE_ACTION_ENROLL, + MANAGE_ACTION_RE_ENROLL, + MANAGE_ACTION_UN_ENROLL + }) private @interface ManageActions {} /** @@ -116,12 +116,11 @@ public class AlwaysOnHotwordDetector { //-- Flags for startRecognition ----// /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - RECOGNITION_FLAG_NONE, - RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO, - RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS - }) + @IntDef(flag = true, prefix = { "RECOGNITION_FLAG_" }, value = { + RECOGNITION_FLAG_NONE, + RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO, + RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS + }) public @interface RecognitionFlags {} /** @@ -150,11 +149,10 @@ public class AlwaysOnHotwordDetector { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - RECOGNITION_MODE_VOICE_TRIGGER, - RECOGNITION_MODE_USER_IDENTIFICATION, - }) + @IntDef(flag = true, prefix = { "RECOGNITION_MODE_" }, value = { + RECOGNITION_MODE_VOICE_TRIGGER, + RECOGNITION_MODE_USER_IDENTIFICATION, + }) public @interface RecognitionModes {} /** diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index 763ea2ca3859..01562b328ecc 100644 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -80,8 +80,15 @@ public class TextToSpeech { public static final int STOPPED = -2; /** @hide */ - @IntDef({ERROR_SYNTHESIS, ERROR_SERVICE, ERROR_OUTPUT, ERROR_NETWORK, ERROR_NETWORK_TIMEOUT, - ERROR_INVALID_REQUEST, ERROR_NOT_INSTALLED_YET}) + @IntDef(prefix = { "ERROR_" }, value = { + ERROR_SYNTHESIS, + ERROR_SERVICE, + ERROR_OUTPUT, + ERROR_NETWORK, + ERROR_NETWORK_TIMEOUT, + ERROR_INVALID_REQUEST, + ERROR_NOT_INSTALLED_YET + }) @Retention(RetentionPolicy.SOURCE) public @interface Error {} diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java index 4654e83c1af6..7386e3e88561 100644 --- a/core/java/android/text/FontConfig.java +++ b/core/java/android/text/FontConfig.java @@ -179,7 +179,11 @@ public final class FontConfig { /** @hide */ @Retention(SOURCE) - @IntDef({VARIANT_DEFAULT, VARIANT_COMPACT, VARIANT_ELEGANT}) + @IntDef(prefix = { "VARIANT_" }, value = { + VARIANT_DEFAULT, + VARIANT_COMPACT, + VARIANT_ELEGANT + }) public @interface Variant {} /** diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 2a693a1841e6..bf4b6ac5194f 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -48,7 +48,11 @@ import java.util.Arrays; */ public abstract class Layout { /** @hide */ - @IntDef({BREAK_STRATEGY_SIMPLE, BREAK_STRATEGY_HIGH_QUALITY, BREAK_STRATEGY_BALANCED}) + @IntDef(prefix = { "BREAK_STRATEGY_" }, value = { + BREAK_STRATEGY_SIMPLE, + BREAK_STRATEGY_HIGH_QUALITY, + BREAK_STRATEGY_BALANCED + }) @Retention(RetentionPolicy.SOURCE) public @interface BreakStrategy {} @@ -73,8 +77,11 @@ public abstract class Layout { public static final int BREAK_STRATEGY_BALANCED = 2; /** @hide */ - @IntDef({HYPHENATION_FREQUENCY_NORMAL, HYPHENATION_FREQUENCY_FULL, - HYPHENATION_FREQUENCY_NONE}) + @IntDef(prefix = { "HYPHENATION_FREQUENCY_" }, value = { + HYPHENATION_FREQUENCY_NORMAL, + HYPHENATION_FREQUENCY_FULL, + HYPHENATION_FREQUENCY_NONE + }) @Retention(RetentionPolicy.SOURCE) public @interface HyphenationFrequency {} @@ -105,7 +112,10 @@ public abstract class Layout { ArrayUtils.emptyArray(ParagraphStyle.class); /** @hide */ - @IntDef({JUSTIFICATION_MODE_NONE, JUSTIFICATION_MODE_INTER_WORD}) + @IntDef(prefix = { "JUSTIFICATION_MODE_" }, value = { + JUSTIFICATION_MODE_NONE, + JUSTIFICATION_MODE_INTER_WORD + }) @Retention(RetentionPolicy.SOURCE) public @interface JustificationMode {} @@ -2267,7 +2277,10 @@ public abstract class Layout { private int mJustificationMode; /** @hide */ - @IntDef({DIR_LEFT_TO_RIGHT, DIR_RIGHT_TO_LEFT}) + @IntDef(prefix = { "DIR_" }, value = { + DIR_LEFT_TO_RIGHT, + DIR_RIGHT_TO_LEFT + }) @Retention(RetentionPolicy.SOURCE) public @interface Direction {} @@ -2308,7 +2321,10 @@ public abstract class Layout { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({TEXT_SELECTION_LAYOUT_RIGHT_TO_LEFT, TEXT_SELECTION_LAYOUT_LEFT_TO_RIGHT}) + @IntDef(prefix = { "TEXT_SELECTION_LAYOUT_" }, value = { + TEXT_SELECTION_LAYOUT_RIGHT_TO_LEFT, + TEXT_SELECTION_LAYOUT_LEFT_TO_RIGHT + }) public @interface TextSelectionLayout {} /** @hide */ diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java index 5b851caa6344..f0838a169a45 100644 --- a/core/java/android/transition/Visibility.java +++ b/core/java/android/transition/Visibility.java @@ -52,7 +52,10 @@ public abstract class Visibility extends Transition { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={MODE_IN, MODE_OUT}) + @IntDef(flag = true, prefix = { "MODE_" }, value = { + MODE_IN, + MODE_OUT + }) @interface VisibilityMode {} /** diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java index 180812340ba8..a74a8821eba6 100644 --- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java +++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java @@ -917,18 +917,6 @@ public class ApkSignatureSchemeV2Verifier { } } - public static class SignatureNotFoundException extends Exception { - private static final long serialVersionUID = 1L; - - public SignatureNotFoundException(String message) { - super(message); - } - - public SignatureNotFoundException(String message, Throwable cause) { - super(message, cause); - } - } - /** * {@link DataDigester} that updates multiple {@link MessageDigest}s whenever data is feeded. */ diff --git a/core/java/android/util/apk/ApkSignatureVerifier.java b/core/java/android/util/apk/ApkSignatureVerifier.java new file mode 100644 index 000000000000..73a9478509e6 --- /dev/null +++ b/core/java/android/util/apk/ApkSignatureVerifier.java @@ -0,0 +1,263 @@ +/* + * 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.util.apk; + +import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST; +import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING; +import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES; +import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFICATES; +import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION; +import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; + +import android.content.pm.PackageParser; +import android.content.pm.PackageParser.PackageParserException; +import android.content.pm.Signature; +import android.os.Trace; +import android.util.jar.StrictJarFile; + +import com.android.internal.util.ArrayUtils; + +import libcore.io.IoUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.security.GeneralSecurityException; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.zip.ZipEntry; + +/** + * Facade class that takes care of the details of APK verification on + * behalf of PackageParser. + * + * @hide for internal use only. + */ +public class ApkSignatureVerifier { + + public static final int VERSION_JAR_SIGNATURE_SCHEME = 1; + public static final int VERSION_APK_SIGNATURE_SCHEME_V2 = 2; + + private static final AtomicReference<byte[]> sBuffer = new AtomicReference<>(); + + /** + * Verifies the provided APK and returns the certificates associated with each signer. Also + * ensures that the provided APK contains an AndroidManifest.xml file. + * + * @param systemDir systemDir apk contents are already trusted, so we don't need to enforce + * v2 stripping rollback protection, or verify integrity of the APK. + * + * @throws PackageParserException if the APK's signature failed to verify. + * @throws SignatureNotFoundException if a signature corresponding to minLevel or greater + * is not found, except in the case of no JAR signature. + */ + public static Result verify(String apkPath, int minSignatureSchemeVersion, boolean systemDir) + throws PackageParserException, SignatureNotFoundException { + boolean verified = false; + Certificate[][] signerCerts; + int level = VERSION_APK_SIGNATURE_SCHEME_V2; + + // first try v2 + Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "verifyV2"); + try { + signerCerts = ApkSignatureSchemeV2Verifier.verify(apkPath); + Signature[] signerSigs = convertToSignatures(signerCerts); + + // sanity check - must have an AndroidManifest file + StrictJarFile jarFile = null; + try { + jarFile = new StrictJarFile(apkPath, false, false); + final ZipEntry manifestEntry = + jarFile.findEntry(PackageParser.ANDROID_MANIFEST_FILENAME); + if (manifestEntry == null) { + throw new PackageParserException(INSTALL_PARSE_FAILED_BAD_MANIFEST, + "Package " + apkPath + " has no manifest"); + } + } finally { + closeQuietly(jarFile); + } + return new Result(signerCerts, signerSigs); + } catch (SignatureNotFoundException e) { + // not signed with v2, try older if allowed + if (minSignatureSchemeVersion >= VERSION_APK_SIGNATURE_SCHEME_V2) { + throw new SignatureNotFoundException( + "No APK Signature Scheme v2 signature found for " + apkPath, e); + } + } catch (PackageParserException e) { + // preserve any new exceptions explicitly thrown here + throw e; + } catch (Exception e) { + // APK Signature Scheme v2 signature found but did not verify + throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, + "Failed to collect certificates from " + apkPath + + " using APK Signature Scheme v2", e); + } finally { + Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); + } + + // v2 didn't work, try jarsigner + return verifyV1Signature(apkPath, systemDir); + } + + private static Result verifyV1Signature(String apkPath, boolean systemDir) + throws PackageParserException { + StrictJarFile jarFile = null; + + try { + final Certificate[][] lastCerts; + final Signature[] lastSigs; + + Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "strictJarFileCtor"); + jarFile = new StrictJarFile(apkPath, true, !systemDir); + final List<ZipEntry> toVerify = new ArrayList<>(); + + // Always verify manifest, regardless of source + final ZipEntry manifestEntry = jarFile.findEntry( + PackageParser.ANDROID_MANIFEST_FILENAME); + if (manifestEntry == null) { + throw new PackageParserException(INSTALL_PARSE_FAILED_BAD_MANIFEST, + "Package " + apkPath + " has no manifest"); + } + lastCerts = loadCertificates(jarFile, manifestEntry); + if (ArrayUtils.isEmpty(lastCerts)) { + throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, "Package " + + apkPath + " has no certificates at entry " + + PackageParser.ANDROID_MANIFEST_FILENAME); + } + lastSigs = convertToSignatures(lastCerts); + + // don't waste time on already-trusted packages + if (!systemDir) { + final Iterator<ZipEntry> i = jarFile.iterator(); + while (i.hasNext()) { + final ZipEntry entry = i.next(); + if (entry.isDirectory()) continue; + + final String entryName = entry.getName(); + if (entryName.startsWith("META-INF/")) continue; + if (entryName.equals(PackageParser.ANDROID_MANIFEST_FILENAME)) continue; + + toVerify.add(entry); + } + + // Verify that entries are signed consistently with the first entry + // we encountered. Note that for splits, certificates may have + // already been populated during an earlier parse of a base APK.; + for (ZipEntry entry : toVerify) { + final Certificate[][] entryCerts = loadCertificates(jarFile, entry); + if (ArrayUtils.isEmpty(entryCerts)) { + throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, + "Package " + apkPath + " has no certificates at entry " + + entry.getName()); + } + + // make sure all entries use the same signing certs + final Signature[] entrySigs = convertToSignatures(entryCerts); + if (!Signature.areExactMatch(lastSigs, entrySigs)) { + throw new PackageParserException( + INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES, + "Package " + apkPath + " has mismatched certificates at entry " + + entry.getName()); + } + } + } + return new Result(lastCerts, lastSigs); + } catch (GeneralSecurityException e) { + throw new PackageParserException(INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING, + "Failed to collect certificates from " + apkPath, e); + } catch (IOException | RuntimeException e) { + throw new PackageParserException(INSTALL_PARSE_FAILED_NO_CERTIFICATES, + "Failed to collect certificates from " + apkPath, e); + } finally { + Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); + closeQuietly(jarFile); + } + } + + private static Certificate[][] loadCertificates(StrictJarFile jarFile, ZipEntry entry) + throws PackageParserException { + InputStream is = null; + try { + // We must read the stream for the JarEntry to retrieve + // its certificates. + is = jarFile.getInputStream(entry); + readFullyIgnoringContents(is); + return jarFile.getCertificateChains(entry); + } catch (IOException | RuntimeException e) { + throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION, + "Failed reading " + entry.getName() + " in " + jarFile, e); + } finally { + IoUtils.closeQuietly(is); + } + } + + private static void readFullyIgnoringContents(InputStream in) throws IOException { + byte[] buffer = sBuffer.getAndSet(null); + if (buffer == null) { + buffer = new byte[4096]; + } + + int n = 0; + int count = 0; + while ((n = in.read(buffer, 0, buffer.length)) != -1) { + count += n; + } + + sBuffer.set(buffer); + return; + } + + /** + * Converts an array of certificate chains into the {@code Signature} equivalent used by the + * PackageManager. + * + * @throws CertificateEncodingException if it is unable to create a Signature object. + */ + public static Signature[] convertToSignatures(Certificate[][] certs) + throws CertificateEncodingException { + final Signature[] res = new Signature[certs.length]; + for (int i = 0; i < certs.length; i++) { + res[i] = new Signature(certs[i]); + } + return res; + } + + private static void closeQuietly(StrictJarFile jarFile) { + if (jarFile != null) { + try { + jarFile.close(); + } catch (Exception ignored) { + } + } + } + + /** + * Result of a successful APK verification operation. + */ + public static class Result { + public final Certificate[][] certs; + public final Signature[] sigs; + + public Result(Certificate[][] certs, Signature[] sigs) { + this.certs = certs; + this.sigs = sigs; + } + } +} diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationTestCase.java b/core/java/android/util/apk/SignatureNotFoundException.java index 1ee34122f65a..9c7c7600cf73 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationTestCase.java +++ b/core/java/android/util/apk/SignatureNotFoundException.java @@ -13,21 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.server.notification; -import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.testing.TestableContext; - -import org.junit.Rule; +package android.util.apk; +/** + * Indicates that the APK is missing a signature. + * + * @hide + */ +public class SignatureNotFoundException extends Exception { + private static final long serialVersionUID = 1L; -public class NotificationTestCase { - @Rule - public final TestableContext mContext = - new TestableContext(InstrumentationRegistry.getContext(), null); + public SignatureNotFoundException(String message) { + super(message); + } - protected TestableContext getContext() { - return mContext; + public SignatureNotFoundException(String message, Throwable cause) { + super(message, cause); } } diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 9673be01d7fb..5bd7446d08b6 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -1323,10 +1323,10 @@ public final class Display { public static final int HDR_TYPE_HLG = 3; /** @hide */ - @IntDef({ - HDR_TYPE_DOLBY_VISION, - HDR_TYPE_HDR10, - HDR_TYPE_HLG, + @IntDef(prefix = { "HDR_TYPE_" }, value = { + HDR_TYPE_DOLBY_VISION, + HDR_TYPE_HDR10, + HDR_TYPE_HLG, }) @Retention(RetentionPolicy.SOURCE) public @interface HdrType {} diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java index 52e53b074165..bc2953e0c0fe 100644 --- a/core/java/android/view/GestureDetector.java +++ b/core/java/android/view/GestureDetector.java @@ -520,162 +520,163 @@ public class GestureDetector { boolean handled = false; switch (action & MotionEvent.ACTION_MASK) { - case MotionEvent.ACTION_POINTER_DOWN: - mDownFocusX = mLastFocusX = focusX; - mDownFocusY = mLastFocusY = focusY; - // Cancel long press and taps - cancelTaps(); - break; - - case MotionEvent.ACTION_POINTER_UP: - mDownFocusX = mLastFocusX = focusX; - mDownFocusY = mLastFocusY = focusY; - - // Check the dot product of current velocities. - // If the pointer that left was opposing another velocity vector, clear. - mVelocityTracker.computeCurrentVelocity(1000, mMaximumFlingVelocity); - final int upIndex = ev.getActionIndex(); - final int id1 = ev.getPointerId(upIndex); - final float x1 = mVelocityTracker.getXVelocity(id1); - final float y1 = mVelocityTracker.getYVelocity(id1); - for (int i = 0; i < count; i++) { - if (i == upIndex) continue; - - final int id2 = ev.getPointerId(i); - final float x = x1 * mVelocityTracker.getXVelocity(id2); - final float y = y1 * mVelocityTracker.getYVelocity(id2); - - final float dot = x + y; - if (dot < 0) { - mVelocityTracker.clear(); - break; + case MotionEvent.ACTION_POINTER_DOWN: + mDownFocusX = mLastFocusX = focusX; + mDownFocusY = mLastFocusY = focusY; + // Cancel long press and taps + cancelTaps(); + break; + + case MotionEvent.ACTION_POINTER_UP: + mDownFocusX = mLastFocusX = focusX; + mDownFocusY = mLastFocusY = focusY; + + // Check the dot product of current velocities. + // If the pointer that left was opposing another velocity vector, clear. + mVelocityTracker.computeCurrentVelocity(1000, mMaximumFlingVelocity); + final int upIndex = ev.getActionIndex(); + final int id1 = ev.getPointerId(upIndex); + final float x1 = mVelocityTracker.getXVelocity(id1); + final float y1 = mVelocityTracker.getYVelocity(id1); + for (int i = 0; i < count; i++) { + if (i == upIndex) continue; + + final int id2 = ev.getPointerId(i); + final float x = x1 * mVelocityTracker.getXVelocity(id2); + final float y = y1 * mVelocityTracker.getYVelocity(id2); + + final float dot = x + y; + if (dot < 0) { + mVelocityTracker.clear(); + break; + } } - } - break; - - case MotionEvent.ACTION_DOWN: - if (mDoubleTapListener != null) { - boolean hadTapMessage = mHandler.hasMessages(TAP); - if (hadTapMessage) mHandler.removeMessages(TAP); - if ((mCurrentDownEvent != null) && (mPreviousUpEvent != null) && hadTapMessage && - isConsideredDoubleTap(mCurrentDownEvent, mPreviousUpEvent, ev)) { - // This is a second tap - mIsDoubleTapping = true; - // Give a callback with the first tap of the double-tap - handled |= mDoubleTapListener.onDoubleTap(mCurrentDownEvent); - // Give a callback with down event of the double-tap - handled |= mDoubleTapListener.onDoubleTapEvent(ev); - } else { - // This is a first tap - mHandler.sendEmptyMessageDelayed(TAP, DOUBLE_TAP_TIMEOUT); + break; + + case MotionEvent.ACTION_DOWN: + if (mDoubleTapListener != null) { + boolean hadTapMessage = mHandler.hasMessages(TAP); + if (hadTapMessage) mHandler.removeMessages(TAP); + if ((mCurrentDownEvent != null) && (mPreviousUpEvent != null) + && hadTapMessage + && isConsideredDoubleTap(mCurrentDownEvent, mPreviousUpEvent, ev)) { + // This is a second tap + mIsDoubleTapping = true; + // Give a callback with the first tap of the double-tap + handled |= mDoubleTapListener.onDoubleTap(mCurrentDownEvent); + // Give a callback with down event of the double-tap + handled |= mDoubleTapListener.onDoubleTapEvent(ev); + } else { + // This is a first tap + mHandler.sendEmptyMessageDelayed(TAP, DOUBLE_TAP_TIMEOUT); + } } - } - mDownFocusX = mLastFocusX = focusX; - mDownFocusY = mLastFocusY = focusY; - if (mCurrentDownEvent != null) { - mCurrentDownEvent.recycle(); - } - mCurrentDownEvent = MotionEvent.obtain(ev); - mAlwaysInTapRegion = true; - mAlwaysInBiggerTapRegion = true; - mStillDown = true; - mInLongPress = false; - mDeferConfirmSingleTap = false; - - if (mIsLongpressEnabled) { - mHandler.removeMessages(LONG_PRESS); - mHandler.sendEmptyMessageAtTime(LONG_PRESS, - mCurrentDownEvent.getDownTime() + LONGPRESS_TIMEOUT); - } - mHandler.sendEmptyMessageAtTime(SHOW_PRESS, - mCurrentDownEvent.getDownTime() + TAP_TIMEOUT); - handled |= mListener.onDown(ev); - break; + mDownFocusX = mLastFocusX = focusX; + mDownFocusY = mLastFocusY = focusY; + if (mCurrentDownEvent != null) { + mCurrentDownEvent.recycle(); + } + mCurrentDownEvent = MotionEvent.obtain(ev); + mAlwaysInTapRegion = true; + mAlwaysInBiggerTapRegion = true; + mStillDown = true; + mInLongPress = false; + mDeferConfirmSingleTap = false; - case MotionEvent.ACTION_MOVE: - if (mInLongPress || mInContextClick) { + if (mIsLongpressEnabled) { + mHandler.removeMessages(LONG_PRESS); + mHandler.sendEmptyMessageAtTime(LONG_PRESS, + mCurrentDownEvent.getDownTime() + LONGPRESS_TIMEOUT); + } + mHandler.sendEmptyMessageAtTime(SHOW_PRESS, + mCurrentDownEvent.getDownTime() + TAP_TIMEOUT); + handled |= mListener.onDown(ev); break; - } - final float scrollX = mLastFocusX - focusX; - final float scrollY = mLastFocusY - focusY; - if (mIsDoubleTapping) { - // Give the move events of the double-tap - handled |= mDoubleTapListener.onDoubleTapEvent(ev); - } else if (mAlwaysInTapRegion) { - final int deltaX = (int) (focusX - mDownFocusX); - final int deltaY = (int) (focusY - mDownFocusY); - int distance = (deltaX * deltaX) + (deltaY * deltaY); - int slopSquare = isGeneratedGesture ? 0 : mTouchSlopSquare; - if (distance > slopSquare) { + + case MotionEvent.ACTION_MOVE: + if (mInLongPress || mInContextClick) { + break; + } + final float scrollX = mLastFocusX - focusX; + final float scrollY = mLastFocusY - focusY; + if (mIsDoubleTapping) { + // Give the move events of the double-tap + handled |= mDoubleTapListener.onDoubleTapEvent(ev); + } else if (mAlwaysInTapRegion) { + final int deltaX = (int) (focusX - mDownFocusX); + final int deltaY = (int) (focusY - mDownFocusY); + int distance = (deltaX * deltaX) + (deltaY * deltaY); + int slopSquare = isGeneratedGesture ? 0 : mTouchSlopSquare; + if (distance > slopSquare) { + handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY); + mLastFocusX = focusX; + mLastFocusY = focusY; + mAlwaysInTapRegion = false; + mHandler.removeMessages(TAP); + mHandler.removeMessages(SHOW_PRESS); + mHandler.removeMessages(LONG_PRESS); + } + int doubleTapSlopSquare = isGeneratedGesture ? 0 : mDoubleTapTouchSlopSquare; + if (distance > doubleTapSlopSquare) { + mAlwaysInBiggerTapRegion = false; + } + } else if ((Math.abs(scrollX) >= 1) || (Math.abs(scrollY) >= 1)) { handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY); mLastFocusX = focusX; mLastFocusY = focusY; - mAlwaysInTapRegion = false; - mHandler.removeMessages(TAP); - mHandler.removeMessages(SHOW_PRESS); - mHandler.removeMessages(LONG_PRESS); } - int doubleTapSlopSquare = isGeneratedGesture ? 0 : mDoubleTapTouchSlopSquare; - if (distance > doubleTapSlopSquare) { - mAlwaysInBiggerTapRegion = false; + break; + + case MotionEvent.ACTION_UP: + mStillDown = false; + MotionEvent currentUpEvent = MotionEvent.obtain(ev); + if (mIsDoubleTapping) { + // Finally, give the up event of the double-tap + handled |= mDoubleTapListener.onDoubleTapEvent(ev); + } else if (mInLongPress) { + mHandler.removeMessages(TAP); + mInLongPress = false; + } else if (mAlwaysInTapRegion && !mIgnoreNextUpEvent) { + handled = mListener.onSingleTapUp(ev); + if (mDeferConfirmSingleTap && mDoubleTapListener != null) { + mDoubleTapListener.onSingleTapConfirmed(ev); + } + } else if (!mIgnoreNextUpEvent) { + + // A fling must travel the minimum tap distance + final VelocityTracker velocityTracker = mVelocityTracker; + final int pointerId = ev.getPointerId(0); + velocityTracker.computeCurrentVelocity(1000, mMaximumFlingVelocity); + final float velocityY = velocityTracker.getYVelocity(pointerId); + final float velocityX = velocityTracker.getXVelocity(pointerId); + + if ((Math.abs(velocityY) > mMinimumFlingVelocity) + || (Math.abs(velocityX) > mMinimumFlingVelocity)) { + handled = mListener.onFling(mCurrentDownEvent, ev, velocityX, velocityY); + } } - } else if ((Math.abs(scrollX) >= 1) || (Math.abs(scrollY) >= 1)) { - handled = mListener.onScroll(mCurrentDownEvent, ev, scrollX, scrollY); - mLastFocusX = focusX; - mLastFocusY = focusY; - } - break; - - case MotionEvent.ACTION_UP: - mStillDown = false; - MotionEvent currentUpEvent = MotionEvent.obtain(ev); - if (mIsDoubleTapping) { - // Finally, give the up event of the double-tap - handled |= mDoubleTapListener.onDoubleTapEvent(ev); - } else if (mInLongPress) { - mHandler.removeMessages(TAP); - mInLongPress = false; - } else if (mAlwaysInTapRegion && !mIgnoreNextUpEvent) { - handled = mListener.onSingleTapUp(ev); - if (mDeferConfirmSingleTap && mDoubleTapListener != null) { - mDoubleTapListener.onSingleTapConfirmed(ev); + if (mPreviousUpEvent != null) { + mPreviousUpEvent.recycle(); } - } else if (!mIgnoreNextUpEvent) { - - // A fling must travel the minimum tap distance - final VelocityTracker velocityTracker = mVelocityTracker; - final int pointerId = ev.getPointerId(0); - velocityTracker.computeCurrentVelocity(1000, mMaximumFlingVelocity); - final float velocityY = velocityTracker.getYVelocity(pointerId); - final float velocityX = velocityTracker.getXVelocity(pointerId); - - if ((Math.abs(velocityY) > mMinimumFlingVelocity) - || (Math.abs(velocityX) > mMinimumFlingVelocity)){ - handled = mListener.onFling(mCurrentDownEvent, ev, velocityX, velocityY); + // Hold the event we obtained above - listeners may have changed the original. + mPreviousUpEvent = currentUpEvent; + if (mVelocityTracker != null) { + // This may have been cleared when we called out to the + // application above. + mVelocityTracker.recycle(); + mVelocityTracker = null; } - } - if (mPreviousUpEvent != null) { - mPreviousUpEvent.recycle(); - } - // Hold the event we obtained above - listeners may have changed the original. - mPreviousUpEvent = currentUpEvent; - if (mVelocityTracker != null) { - // This may have been cleared when we called out to the - // application above. - mVelocityTracker.recycle(); - mVelocityTracker = null; - } - mIsDoubleTapping = false; - mDeferConfirmSingleTap = false; - mIgnoreNextUpEvent = false; - mHandler.removeMessages(SHOW_PRESS); - mHandler.removeMessages(LONG_PRESS); - break; - - case MotionEvent.ACTION_CANCEL: - cancel(); - break; + mIsDoubleTapping = false; + mDeferConfirmSingleTap = false; + mIgnoreNextUpEvent = false; + mHandler.removeMessages(SHOW_PRESS); + mHandler.removeMessages(LONG_PRESS); + break; + + case MotionEvent.ACTION_CANCEL: + cancel(); + break; } if (!handled && mInputEventConsistencyVerifier != null) { diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index ddced6cdd83f..a417a4a04e2f 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -121,8 +121,12 @@ public class Surface implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SCALING_MODE_FREEZE, SCALING_MODE_SCALE_TO_WINDOW, - SCALING_MODE_SCALE_CROP, SCALING_MODE_NO_SCALE_CROP}) + @IntDef(prefix = { "SCALING_MODE_" }, value = { + SCALING_MODE_FREEZE, + SCALING_MODE_SCALE_TO_WINDOW, + SCALING_MODE_SCALE_CROP, + SCALING_MODE_NO_SCALE_CROP + }) public @interface ScalingMode {} // From system/window.h /** @hide */ @@ -135,7 +139,12 @@ public class Surface implements Parcelable { public static final int SCALING_MODE_NO_SCALE_CROP = 3; /** @hide */ - @IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270}) + @IntDef(prefix = { "ROTATION_" }, value = { + ROTATION_0, + ROTATION_90, + ROTATION_180, + ROTATION_270 + }) @Retention(RetentionPolicy.SOURCE) public @interface Rotation {} diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 357b8d9d039b..268e460d2b9f 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -30,6 +30,7 @@ import android.graphics.Bitmap; import android.graphics.GraphicBuffer; import android.graphics.PixelFormat; import android.graphics.Matrix; +import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; import android.os.IBinder; @@ -37,8 +38,12 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.Process; import android.os.UserHandle; +import android.util.ArrayMap; import android.util.Log; import android.view.Surface.OutOfResourcesException; + +import com.android.internal.annotations.GuardedBy; + import dalvik.system.CloseGuard; import libcore.util.NativeAllocationRegistry; @@ -153,6 +158,13 @@ public class SurfaceControl implements Parcelable { private final String mName; long mNativeObject; // package visibility only for Surface.java access + // TODO: Move this to native. + private final Object mSizeLock = new Object(); + @GuardedBy("mSizeLock") + private int mWidth; + @GuardedBy("mSizeLock") + private int mHeight; + static Transaction sGlobalTransaction; static long sTransactionNestCount = 0; @@ -567,6 +579,8 @@ public class SurfaceControl implements Parcelable { } mName = name; + mWidth = w; + mHeight = h; mNativeObject = nativeCreate(session, name, w, h, format, flags, parent != null ? parent.mNativeObject : 0, windowType, ownerUid); if (mNativeObject == 0) { @@ -582,6 +596,8 @@ public class SurfaceControl implements Parcelable { // event logging. public SurfaceControl(SurfaceControl other) { mName = other.mName; + mWidth = other.mWidth; + mHeight = other.mHeight; mNativeObject = other.mNativeObject; other.mCloseGuard.close(); other.mNativeObject = 0; @@ -590,6 +606,8 @@ public class SurfaceControl implements Parcelable { private SurfaceControl(Parcel in) { mName = in.readString(); + mWidth = in.readInt(); + mHeight = in.readInt(); mNativeObject = nativeReadFromParcel(in); if (mNativeObject == 0) { throw new IllegalArgumentException("Couldn't read SurfaceControl from parcel=" + in); @@ -605,6 +623,8 @@ public class SurfaceControl implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(mName); + dest.writeInt(mWidth); + dest.writeInt(mHeight); nativeWriteToParcel(mNativeObject, dest); } @@ -922,6 +942,18 @@ public class SurfaceControl implements Parcelable { } } + public int getWidth() { + synchronized (mSizeLock) { + return mWidth; + } + } + + public int getHeight() { + synchronized (mSizeLock) { + return mHeight; + } + } + @Override public String toString() { return "Surface(name=" + mName + ")/@0x" + @@ -1282,6 +1314,7 @@ public class SurfaceControl implements Parcelable { nativeGetNativeTransactionFinalizer(), 512); private long mNativeObject; + private final ArrayMap<SurfaceControl, Point> mResizedSurfaces = new ArrayMap<>(); Runnable mFreeNativeResources; public Transaction() { @@ -1312,9 +1345,22 @@ public class SurfaceControl implements Parcelable { * Jankier version of apply. Avoid use (b/28068298). */ public void apply(boolean sync) { + applyResizedSurfaces(); nativeApplyTransaction(mNativeObject, sync); } + private void applyResizedSurfaces() { + for (int i = mResizedSurfaces.size() - 1; i >= 0; i--) { + final Point size = mResizedSurfaces.valueAt(i); + final SurfaceControl surfaceControl = mResizedSurfaces.keyAt(i); + synchronized (surfaceControl.mSizeLock) { + surfaceControl.mWidth = size.x; + surfaceControl.mHeight = size.y; + } + } + mResizedSurfaces.clear(); + } + public Transaction show(SurfaceControl sc) { sc.checkNotReleased(); nativeSetFlags(mNativeObject, sc.mNativeObject, 0, SURFACE_HIDDEN); @@ -1335,6 +1381,7 @@ public class SurfaceControl implements Parcelable { public Transaction setSize(SurfaceControl sc, int w, int h) { sc.checkNotReleased(); + mResizedSurfaces.put(sc, new Point(w, h)); nativeSetSize(mNativeObject, sc.mNativeObject, w, h); return this; } @@ -1567,6 +1614,8 @@ public class SurfaceControl implements Parcelable { * other transaction as if it had been applied. */ public Transaction merge(Transaction other) { + mResizedSurfaces.putAll(other.mResizedSurfaces); + other.mResizedSurfaces.clear(); nativeMergeTransaction(mNativeObject, other.mNativeObject); return this; } diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 0a69772c3606..6a8f8b120ef1 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -344,8 +344,10 @@ public final class ThreadedRenderer { private static final int FLAG_DUMP_FRAMESTATS = 1 << 0; private static final int FLAG_DUMP_RESET = 1 << 1; - @IntDef(flag = true, value = { - FLAG_DUMP_FRAMESTATS, FLAG_DUMP_RESET }) + @IntDef(flag = true, prefix = { "FLAG_DUMP_" }, value = { + FLAG_DUMP_FRAMESTATS, + FLAG_DUMP_RESET + }) @Retention(RetentionPolicy.SOURCE) public @interface DumpFlags {} diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 623759e178d8..02beee05811b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -1178,7 +1178,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private AutofillId mAutofillId; /** @hide */ - @IntDef({ + @IntDef(prefix = { "AUTOFILL_TYPE_" }, value = { AUTOFILL_TYPE_NONE, AUTOFILL_TYPE_TEXT, AUTOFILL_TYPE_TOGGLE, @@ -1249,7 +1249,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int AUTOFILL_TYPE_DATE = 4; /** @hide */ - @IntDef({ + @IntDef(prefix = { "IMPORTANT_FOR_AUTOFILL_" }, value = { IMPORTANT_FOR_AUTOFILL_AUTO, IMPORTANT_FOR_AUTOFILL_YES, IMPORTANT_FOR_AUTOFILL_NO, @@ -1300,9 +1300,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS = 0x8; /** @hide */ - @IntDef( - flag = true, - value = {AUTOFILL_FLAG_INCLUDE_NOT_IMPORTANT_VIEWS}) + @IntDef(flag = true, prefix = { "AUTOFILL_FLAG_" }, value = { + AUTOFILL_FLAG_INCLUDE_NOT_IMPORTANT_VIEWS + }) @Retention(RetentionPolicy.SOURCE) public @interface AutofillFlags {} @@ -1452,7 +1452,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({DRAWING_CACHE_QUALITY_LOW, DRAWING_CACHE_QUALITY_HIGH, DRAWING_CACHE_QUALITY_AUTO}) + @IntDef(prefix = { "DRAWING_CACHE_QUALITY_" }, value = { + DRAWING_CACHE_QUALITY_LOW, + DRAWING_CACHE_QUALITY_HIGH, + DRAWING_CACHE_QUALITY_AUTO + }) public @interface DrawingCacheQuality {} /** @@ -1551,13 +1555,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ static final int CONTEXT_CLICKABLE = 0x00800000; - /** @hide */ - @IntDef({ - SCROLLBARS_INSIDE_OVERLAY, - SCROLLBARS_INSIDE_INSET, - SCROLLBARS_OUTSIDE_OVERLAY, - SCROLLBARS_OUTSIDE_INSET + @IntDef(prefix = { "SCROLLBARS_" }, value = { + SCROLLBARS_INSIDE_OVERLAY, + SCROLLBARS_INSIDE_INSET, + SCROLLBARS_OUTSIDE_OVERLAY, + SCROLLBARS_OUTSIDE_INSET }) @Retention(RetentionPolicy.SOURCE) public @interface ScrollBarStyle {} @@ -1651,11 +1654,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, static final int TOOLTIP = 0x40000000; /** @hide */ - @IntDef(flag = true, - value = { - FOCUSABLES_ALL, - FOCUSABLES_TOUCH_MODE - }) + @IntDef(flag = true, prefix = { "FOCUSABLES_" }, value = { + FOCUSABLES_ALL, + FOCUSABLES_TOUCH_MODE + }) @Retention(RetentionPolicy.SOURCE) public @interface FocusableMode {} @@ -1672,7 +1674,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int FOCUSABLES_TOUCH_MODE = 0x00000001; /** @hide */ - @IntDef({ + @IntDef(prefix = { "FOCUS_" }, value = { FOCUS_BACKWARD, FOCUS_FORWARD, FOCUS_LEFT, @@ -1684,7 +1686,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public @interface FocusDirection {} /** @hide */ - @IntDef({ + @IntDef(prefix = { "FOCUS_" }, value = { FOCUS_LEFT, FOCUS_UP, FOCUS_RIGHT, @@ -2426,20 +2428,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback, static final int PFLAG2_DRAG_HOVERED = 0x00000002; /** @hide */ - @IntDef({ - LAYOUT_DIRECTION_LTR, - LAYOUT_DIRECTION_RTL, - LAYOUT_DIRECTION_INHERIT, - LAYOUT_DIRECTION_LOCALE + @IntDef(prefix = { "LAYOUT_DIRECTION_" }, value = { + LAYOUT_DIRECTION_LTR, + LAYOUT_DIRECTION_RTL, + LAYOUT_DIRECTION_INHERIT, + LAYOUT_DIRECTION_LOCALE }) @Retention(RetentionPolicy.SOURCE) // Not called LayoutDirection to avoid conflict with android.util.LayoutDirection public @interface LayoutDir {} /** @hide */ - @IntDef({ - LAYOUT_DIRECTION_LTR, - LAYOUT_DIRECTION_RTL + @IntDef(prefix = { "LAYOUT_DIRECTION_" }, value = { + LAYOUT_DIRECTION_LTR, + LAYOUT_DIRECTION_RTL }) @Retention(RetentionPolicy.SOURCE) public @interface ResolvedLayoutDir {} @@ -2645,14 +2647,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, TEXT_DIRECTION_RESOLVED_DEFAULT << PFLAG2_TEXT_DIRECTION_RESOLVED_MASK_SHIFT; /** @hide */ - @IntDef({ - TEXT_ALIGNMENT_INHERIT, - TEXT_ALIGNMENT_GRAVITY, - TEXT_ALIGNMENT_CENTER, - TEXT_ALIGNMENT_TEXT_START, - TEXT_ALIGNMENT_TEXT_END, - TEXT_ALIGNMENT_VIEW_START, - TEXT_ALIGNMENT_VIEW_END + @IntDef(prefix = { "TEXT_ALIGNMENT_" }, value = { + TEXT_ALIGNMENT_INHERIT, + TEXT_ALIGNMENT_GRAVITY, + TEXT_ALIGNMENT_CENTER, + TEXT_ALIGNMENT_TEXT_START, + TEXT_ALIGNMENT_TEXT_END, + TEXT_ALIGNMENT_VIEW_START, + TEXT_ALIGNMENT_VIEW_END }) @Retention(RetentionPolicy.SOURCE) public @interface TextAlignment {} @@ -3049,15 +3051,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - SCROLL_INDICATOR_TOP, - SCROLL_INDICATOR_BOTTOM, - SCROLL_INDICATOR_LEFT, - SCROLL_INDICATOR_RIGHT, - SCROLL_INDICATOR_START, - SCROLL_INDICATOR_END, - }) + @IntDef(flag = true, prefix = { "SCROLL_INDICATOR_" }, value = { + SCROLL_INDICATOR_TOP, + SCROLL_INDICATOR_BOTTOM, + SCROLL_INDICATOR_LEFT, + SCROLL_INDICATOR_RIGHT, + SCROLL_INDICATOR_START, + SCROLL_INDICATOR_END, + }) public @interface ScrollIndicators {} /** @@ -3683,8 +3684,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; /** @hide */ - @IntDef(flag = true, - value = { FIND_VIEWS_WITH_TEXT, FIND_VIEWS_WITH_CONTENT_DESCRIPTION }) + @IntDef(flag = true, prefix = { "FIND_VIEWS_" }, value = { + FIND_VIEWS_WITH_TEXT, + FIND_VIEWS_WITH_CONTENT_DESCRIPTION + }) @Retention(RetentionPolicy.SOURCE) public @interface FindViewFlags {} @@ -4296,6 +4299,38 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ Runnable mShowTooltipRunnable; Runnable mHideTooltipRunnable; + + /** + * Hover move is ignored if it is within this distance in pixels from the previous one. + */ + int mHoverSlop; + + /** + * Update the anchor position if it significantly (that is by at least mHoverSlop) + * different from the previously stored position. Ignoring insignificant changes + * filters out the jitter which is typical for such input sources as stylus. + * + * @return True if the position has been updated. + */ + private boolean updateAnchorPos(MotionEvent event) { + final int newAnchorX = (int) event.getX(); + final int newAnchorY = (int) event.getY(); + if (Math.abs(newAnchorX - mAnchorX) <= mHoverSlop + && Math.abs(newAnchorY - mAnchorY) <= mHoverSlop) { + return false; + } + mAnchorX = newAnchorX; + mAnchorY = newAnchorY; + return true; + } + + /** + * Clear the anchor position to ensure that the next change is considered significant. + */ + private void clearAnchorPos() { + mAnchorX = Integer.MAX_VALUE; + mAnchorY = Integer.MAX_VALUE; + } } TooltipInfo mTooltipInfo; @@ -26813,6 +26848,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mTooltipInfo = new TooltipInfo(); mTooltipInfo.mShowTooltipRunnable = this::showHoverTooltip; mTooltipInfo.mHideTooltipRunnable = this::hideTooltip; + mTooltipInfo.mHoverSlop = ViewConfiguration.get(mContext).getScaledHoverSlop(); + mTooltipInfo.clearAnchorPos(); } mTooltipInfo.mTooltipText = tooltipText; } @@ -26879,6 +26916,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mTooltipInfo.mTooltipPopup.hide(); mTooltipInfo.mTooltipPopup = null; mTooltipInfo.mTooltipFromLongClick = false; + mTooltipInfo.clearAnchorPos(); if (mAttachInfo != null) { mAttachInfo.mTooltipHost = null; } @@ -26903,11 +26941,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if ((mViewFlags & TOOLTIP) != TOOLTIP || (mViewFlags & ENABLED_MASK) != ENABLED) { break; } - if (!mTooltipInfo.mTooltipFromLongClick) { + if (!mTooltipInfo.mTooltipFromLongClick && mTooltipInfo.updateAnchorPos(event)) { if (mTooltipInfo.mTooltipPopup == null) { // Schedule showing the tooltip after a timeout. - mTooltipInfo.mAnchorX = (int) event.getX(); - mTooltipInfo.mAnchorY = (int) event.getY(); removeCallbacks(mTooltipInfo.mShowTooltipRunnable); postDelayed(mTooltipInfo.mShowTooltipRunnable, ViewConfiguration.getHoverTooltipShowTimeout()); @@ -26929,6 +26965,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, return true; case MotionEvent.ACTION_HOVER_EXIT: + mTooltipInfo.clearAnchorPos(); if (!mTooltipInfo.mTooltipFromLongClick) { hideTooltip(); } diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index c44c8dda83a9..c5a94daaba53 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -290,6 +290,7 @@ public class ViewConfiguration { private final int mMaximumFlingVelocity; private final int mScrollbarSize; private final int mTouchSlop; + private final int mHoverSlop; private final int mMinScrollbarTouchTarget; private final int mDoubleTapTouchSlop; private final int mPagingTouchSlop; @@ -320,6 +321,7 @@ public class ViewConfiguration { mMaximumFlingVelocity = MAXIMUM_FLING_VELOCITY; mScrollbarSize = SCROLL_BAR_SIZE; mTouchSlop = TOUCH_SLOP; + mHoverSlop = TOUCH_SLOP / 2; mMinScrollbarTouchTarget = MIN_SCROLLBAR_TOUCH_TARGET; mDoubleTapTouchSlop = DOUBLE_TAP_TOUCH_SLOP; mPagingTouchSlop = PAGING_TOUCH_SLOP; @@ -407,6 +409,8 @@ public class ViewConfiguration { com.android.internal.R.bool.config_ui_enableFadingMarquee); mTouchSlop = res.getDimensionPixelSize( com.android.internal.R.dimen.config_viewConfigurationTouchSlop); + mHoverSlop = res.getDimensionPixelSize( + com.android.internal.R.dimen.config_viewConfigurationHoverSlop); mMinScrollbarTouchTarget = res.getDimensionPixelSize( com.android.internal.R.dimen.config_minScrollbarTouchTarget); mPagingTouchSlop = mTouchSlop * 2; @@ -640,6 +644,14 @@ public class ViewConfiguration { } /** + * @return Distance in pixels a hover can wander while it is still considered "stationary". + * + */ + public int getScaledHoverSlop() { + return mHoverSlop; + } + + /** * @return Distance in pixels the first touch can wander before we do not consider this a * potential double tap event * @hide diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 500701de7f23..012e86406579 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1672,12 +1672,20 @@ public interface WindowManager extends ViewManager { * Visibility state for {@link #softInputMode}: please show the soft * input area when normally appropriate (when the user is navigating * forward to your window). + * + * <p>Applications that target {@link android.os.Build.VERSION_CODES#P} and later, this flag + * is ignored unless there is a focused view that returns {@code true} from + * {@link View#isInEditMode()} when the window is focused.</p> */ public static final int SOFT_INPUT_STATE_VISIBLE = 4; /** * Visibility state for {@link #softInputMode}: please always make the * soft input area visible when this window receives input focus. + * + * <p>Applications that target {@link android.os.Build.VERSION_CODES#P} and later, this flag + * is ignored unless there is a focused view that returns {@code true} from + * {@link View#isInEditMode()} when the window is focused.</p> */ public static final int SOFT_INPUT_STATE_ALWAYS_VISIBLE = 5; @@ -1738,7 +1746,7 @@ public interface WindowManager extends ViewManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "SOFT_INPUT_" }, value = { SOFT_INPUT_STATE_UNSPECIFIED, SOFT_INPUT_STATE_UNCHANGED, SOFT_INPUT_STATE_HIDDEN, diff --git a/core/java/android/view/accessibility/AccessibilityRequestPreparer.java b/core/java/android/view/accessibility/AccessibilityRequestPreparer.java index 889feb983be4..25f830a5e55b 100644 --- a/core/java/android/view/accessibility/AccessibilityRequestPreparer.java +++ b/core/java/android/view/accessibility/AccessibilityRequestPreparer.java @@ -44,10 +44,9 @@ public abstract class AccessibilityRequestPreparer { public static final int REQUEST_TYPE_EXTRA_DATA = 0x00000001; /** @hide */ - @IntDef(flag = true, - value = { - REQUEST_TYPE_EXTRA_DATA - }) + @IntDef(flag = true, prefix = { "REQUEST_TYPE_" }, value = { + REQUEST_TYPE_EXTRA_DATA + }) @Retention(RetentionPolicy.SOURCE) public @interface RequestTypes {} diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 419aeb3507a6..6d84aa009c75 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -1987,7 +1987,11 @@ public final class AutofillManager { public abstract static class AutofillCallback { /** @hide */ - @IntDef({EVENT_INPUT_SHOWN, EVENT_INPUT_HIDDEN, EVENT_INPUT_UNAVAILABLE}) + @IntDef(prefix = { "EVENT_INPUT_" }, value = { + EVENT_INPUT_SHOWN, + EVENT_INPUT_HIDDEN, + EVENT_INPUT_UNAVAILABLE + }) @Retention(RetentionPolicy.SOURCE) public @interface AutofillEventType {} diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 3cd8d4a2417d..9f033d72167f 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -1333,7 +1333,8 @@ public final class InputMethodManager { + Integer.toHexString(controlFlags)); final InputBindResult res = mService.startInputOrWindowGainedFocus( startInputReason, mClient, windowGainingFocus, controlFlags, softInputMode, - windowFlags, tba, servedContext, missingMethodFlags); + windowFlags, tba, servedContext, missingMethodFlags, + view.getContext().getApplicationInfo().targetSdkVersion); if (DEBUG) Log.v(TAG, "Starting input: Bind result=" + res); if (res != null) { if (res.id != null) { @@ -1588,7 +1589,8 @@ public final class InputMethodManager { mService.startInputOrWindowGainedFocus( InputMethodClient.START_INPUT_REASON_WINDOW_FOCUS_GAIN_REPORT_ONLY, mClient, rootView.getWindowToken(), controlFlags, softInputMode, windowFlags, null, - null, 0 /* missingMethodFlags */); + null, 0 /* missingMethodFlags */, + rootView.getContext().getApplicationInfo().targetSdkVersion); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/webkit/TracingConfig.java b/core/java/android/webkit/TracingConfig.java new file mode 100644 index 000000000000..75e2bf7026c5 --- /dev/null +++ b/core/java/android/webkit/TracingConfig.java @@ -0,0 +1,203 @@ +/* + * 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.webkit; + +import android.annotation.IntDef; +import android.annotation.NonNull; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Holds tracing configuration information and predefined settings. + */ +public class TracingConfig { + + private final String mCustomCategoryPattern; + private final @PresetCategories int mPresetCategories; + private @TracingMode int mTracingMode; + + /** @hide */ + @IntDef({CATEGORIES_NONE, CATEGORIES_WEB_DEVELOPER, CATEGORIES_INPUT_LATENCY, + CATEGORIES_RENDERING, CATEGORIES_JAVASCRIPT_AND_RENDERING, CATEGORIES_FRAME_VIEWER}) + @Retention(RetentionPolicy.SOURCE) + public @interface PresetCategories {} + + /** + * Indicates that there are no preset categories. + */ + public static final int CATEGORIES_NONE = -1; + + /** + * Predefined categories typically useful for web developers. + * Typically includes blink, compositor, renderer.scheduler and v8 categories. + */ + public static final int CATEGORIES_WEB_DEVELOPER = 0; + + /** + * Predefined categories for analyzing input latency issues. + * Typically includes input, renderer.scheduler categories. + */ + public static final int CATEGORIES_INPUT_LATENCY = 1; + + /** + * Predefined categories for analyzing rendering issues. + * Typically includes blink, compositor and gpu categories. + */ + public static final int CATEGORIES_RENDERING = 2; + + /** + * Predefined categories for analyzing javascript and rendering issues. + * Typically includes blink, compositor, gpu, renderer.schduler and v8 categories. + */ + public static final int CATEGORIES_JAVASCRIPT_AND_RENDERING = 3; + + /** + * Predefined categories for studying difficult rendering performance problems. + * Typically includes blink, compositor, gpu, renderer.scheduler, v8 and + * some other compositor categories which are disabled by default. + */ + public static final int CATEGORIES_FRAME_VIEWER = 4; + + /** @hide */ + @IntDef({RECORD_UNTIL_FULL, RECORD_CONTINUOUSLY, RECORD_UNTIL_FULL_LARGE_BUFFER, + RECORD_TO_CONSOLE}) + @Retention(RetentionPolicy.SOURCE) + public @interface TracingMode {} + + /** + * Record trace events until the internal tracing buffer is full. Default tracing mode. + * Typically the buffer memory usage is between {@link #RECORD_CONTINUOUSLY} and the + * {@link #RECORD_UNTIL_FULL_LARGE_BUFFER}. Depending on the implementation typically allows + * up to 256k events to be stored. + */ + public static final int RECORD_UNTIL_FULL = 0; + + /** + * Record trace events continuously using an internal ring buffer. Overwrites + * old events if they exceed buffer capacity. Uses less memory than both + * {@link #RECORD_UNTIL_FULL} and {@link #RECORD_UNTIL_FULL_LARGE_BUFFER} modes. + * Depending on the implementation typically allows up to 64k events to be stored. + */ + public static final int RECORD_CONTINUOUSLY = 1; + + /** + * Record trace events using a larger internal tracing buffer until it is full. + * Uses more memory than the other modes and may not be suitable on devices + * with smaller RAM. Depending on the implementation typically allows up to + * 512 million events to be stored. + */ + public static final int RECORD_UNTIL_FULL_LARGE_BUFFER = 2; + + /** + * Record trace events to console (logcat). The events are discarded and nothing + * is sent back to the caller. Uses the least memory as compared to the other modes. + */ + public static final int RECORD_TO_CONSOLE = 3; + + /** + * Create config with the preset categories. + * <p> + * Example: + * TracingConfig(CATEGORIES_WEB_DEVELOPER) -- records trace events from the "web developer" + * preset categories. + * + * @param presetCategories preset categories to use, one of {@link #CATEGORIES_WEB_DEVELOPER}, + * {@link #CATEGORIES_INPUT_LATENCY}, {@link #CATEGORIES_RENDERING}, + * {@link #CATEGORIES_JAVASCRIPT_AND_RENDERING} or + * {@link #CATEGORIES_FRAME_VIEWER}. + * + * Note: for specifying custom categories without presets use + * {@link #TracingConfig(int, String, int)}. + * + */ + public TracingConfig(@PresetCategories int presetCategories) { + this(presetCategories, "", RECORD_UNTIL_FULL); + } + + /** + * Create a configuration with both preset categories and custom categories. + * Also allows to specify the tracing mode. + * + * Note that the categories are defined by the currently-in-use version of WebView. They live + * in chromium code and are not part of the Android API. See + * See <a href="https://www.chromium.org/developers/how-tos/trace-event-profiling-tool"> + * chromium documentation on tracing</a> for more details. + * + * <p> + * Examples: + * + * Preset category with a specified trace mode: + * TracingConfig(CATEGORIES_WEB_DEVELOPER, "", RECORD_UNTIL_FULL_LARGE_BUFFER); + * Custom categories: + * TracingConfig(CATEGORIES_NONE, "browser", RECORD_UNTIL_FULL) + * -- records only the trace events from the "browser" category. + * TraceConfig(CATEGORIES_NONE, "-input,-gpu", RECORD_UNTIL_FULL) + * -- records all trace events excluding the events from the "input" and 'gpu' categories. + * TracingConfig(CATEGORIES_NONE, "blink*,devtools*", RECORD_UNTIL_FULL) + * -- records only the trace events matching the "blink*" and "devtools*" patterns + * (e.g. "blink_gc" and "devtools.timeline" categories). + * + * Combination of preset and additional custom categories: + * TracingConfig(CATEGORIES_WEB_DEVELOPER, "memory-infra", RECORD_CONTINUOUSLY) + * -- records events from the "web developer" categories and events from the "memory-infra" + * category to understand where memory is being used. + * + * @param presetCategories preset categories to use, one of {@link #CATEGORIES_WEB_DEVELOPER}, + * {@link #CATEGORIES_INPUT_LATENCY}, {@link #CATEGORIES_RENDERING}, + * {@link #CATEGORIES_JAVASCRIPT_AND_RENDERING} or + * {@link #CATEGORIES_FRAME_VIEWER}. + * @param customCategories a comma-delimited list of category wildcards. A category can + * have an optional '-' prefix to make it an excluded category. + * @param tracingMode tracing mode to use, one of {@link #RECORD_UNTIL_FULL}, + * {@link #RECORD_CONTINUOUSLY}, {@link #RECORD_UNTIL_FULL_LARGE_BUFFER} + * or {@link #RECORD_TO_CONSOLE}. + */ + public TracingConfig(@PresetCategories int presetCategories, + @NonNull String customCategories, @TracingMode int tracingMode) { + mPresetCategories = presetCategories; + mCustomCategoryPattern = customCategories; + mTracingMode = RECORD_UNTIL_FULL; + } + + /** + * Returns the custom category pattern for this configuration. + * + * @return empty string if no custom category pattern is specified. + */ + @NonNull + public String getCustomCategoryPattern() { + return mCustomCategoryPattern; + } + + /** + * Returns the preset categories value of this configuration. + */ + @PresetCategories + public int getPresetCategories() { + return mPresetCategories; + } + + /** + * Returns the tracing mode of this configuration. + */ + @TracingMode + public int getTracingMode() { + return mTracingMode; + } + +} diff --git a/core/java/android/webkit/TracingController.java b/core/java/android/webkit/TracingController.java new file mode 100644 index 000000000000..cadb8a184072 --- /dev/null +++ b/core/java/android/webkit/TracingController.java @@ -0,0 +1,126 @@ +/* + * 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.webkit; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.Handler; + +/** + * Manages tracing of WebViews. In particular provides functionality for the app + * to enable/disable tracing of parts of code and to collect tracing data. + * This is useful for profiling performance issues, debugging and memory usage + * analysis in production and real life scenarios. + * <p> + * The resulting trace data is sent back as a byte sequence in json format. This + * file can be loaded in "chrome://tracing" for further analysis. + * <p> + * Note: All methods in this class must be called on the UI thread. All callbacks + * are also called on the UI thread. + * <p> + * Example usage: + * <pre class="prettyprint"> + * TracingController tracingController = TracingController.getInstance(); + * tracingController.start(new TraceConfig(CATEGORIES_WEB_DEVELOPER)); + * [..] + * tracingController.stopAndFlush(new TraceFileOutput("trace.json"), null); + * </pre></p> + */ +public abstract class TracingController { + + /** + * Interface for capturing tracing data. + */ + public interface TracingOutputStream { + /** + * Will be called to return tracing data in chunks. + * Tracing data is returned in json format an array of bytes. + */ + void write(byte[] chunk); + + /** + * Called when tracing is finished and the data collection is over. + * There will be no calls to #write after #complete is called. + */ + void complete(); + } + + /** + * Returns the default TracingController instance. At present there is + * only one TracingController instance for all WebView instances, + * however this restriction may be relaxed in the future. + * + * @return the default TracingController instance + */ + @NonNull + public static TracingController getInstance() { + return WebViewFactory.getProvider().getTracingController(); + } + + /** + * Starts tracing all webviews. Depeding on the trace mode in traceConfig + * specifies how the trace events are recorded. + * + * For tracing modes {@link TracingConfig#RECORD_UNTIL_FULL}, + * {@link TracingConfig#RECORD_CONTINUOUSLY} and + * {@link TracingConfig#RECORD_UNTIL_FULL_LARGE_BUFFER} the events are recorded + * using an internal buffer and flushed to the outputStream when + * {@link #stopAndFlush(TracingOutputStream, Handler)} is called. + * + * @param tracingConfig configuration options to use for tracing + * @return false if the system is already tracing, true otherwise. + */ + public abstract boolean start(TracingConfig tracingConfig); + + /** + * Stops tracing and discards all tracing data. + * + * This method is particularly useful in conjunction with the + * {@link TracingConfig#RECORD_TO_CONSOLE} tracing mode because tracing data is logged to + * console and not sent to an outputStream as with + * {@link #stopAndFlush(TracingOutputStream, Handler)}. + * + * @return false if the system was not tracing at the time of the call, true + * otherwise. + */ + public abstract boolean stop(); + + /** + * Stops tracing and flushes tracing data to the specifid outputStream. + * + * Note that if the {@link TracingConfig#RECORD_TO_CONSOLE} tracing mode is used + * nothing will be sent to the outputStream and no TracingOuputStream methods will be + * called. In that case it is more convenient to just use {@link #stop()} instead. + * + * @param outputStream the output steam the tracing data will be sent to. + * @param handler the {@link android.os.Handler} on which the outputStream callbacks + * will be invoked. If the handler is null the current thread's Looper + * will be used. + * @return false if the system was not tracing at the time of the call, true + * otherwise. + */ + public abstract boolean stopAndFlush(TracingOutputStream outputStream, + @Nullable Handler handler); + + /** True if the system is tracing */ + public abstract boolean isTracing(); + + // TODO: consider adding getTraceBufferUsage, percentage and approx event count. + // TODO: consider adding String getCategories(), for obtaining the actual list + // of categories used (given that presets are ints). + +} diff --git a/core/java/android/webkit/TracingFileOutputStream.java b/core/java/android/webkit/TracingFileOutputStream.java new file mode 100644 index 000000000000..8a5fa36c2d99 --- /dev/null +++ b/core/java/android/webkit/TracingFileOutputStream.java @@ -0,0 +1,63 @@ +/* + * 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.webkit; + +import android.annotation.NonNull; + +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * Simple TracingOutputStream implementation which writes the trace data from + * {@link TracingController} to a new file. + * + */ +public class TracingFileOutputStream implements TracingController.TracingOutputStream { + + private FileOutputStream mFileOutput; + + public TracingFileOutputStream(@NonNull String filename) throws FileNotFoundException { + mFileOutput = new FileOutputStream(filename); + } + + /** + * Writes bytes chunk to the file. + */ + public void write(byte[] chunk) { + try { + mFileOutput.write(chunk); + } catch (IOException e) { + onIOException(e); + } + } + + /** + * Closes the file. + */ + public void complete() { + try { + mFileOutput.close(); + } catch (IOException e) { + onIOException(e); + } + } + + private void onIOException(IOException e) { + throw new RuntimeException(e); + } +} diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index e49373923ec9..90cc481483ed 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -122,7 +122,13 @@ public abstract class WebSettings { } /** @hide */ - @IntDef({LOAD_DEFAULT, LOAD_NORMAL, LOAD_CACHE_ELSE_NETWORK, LOAD_NO_CACHE, LOAD_CACHE_ONLY}) + @IntDef(prefix = { "LOAD_" }, value = { + LOAD_DEFAULT, + LOAD_NORMAL, + LOAD_CACHE_ELSE_NETWORK, + LOAD_NO_CACHE, + LOAD_CACHE_ONLY + }) @Retention(RetentionPolicy.SOURCE) public @interface CacheMode {} @@ -1415,13 +1421,12 @@ public abstract class WebSettings { /** * @hide */ - @IntDef(flag = true, - value = { - MENU_ITEM_NONE, - MENU_ITEM_SHARE, - MENU_ITEM_WEB_SEARCH, - MENU_ITEM_PROCESS_TEXT - }) + @IntDef(flag = true, prefix = { "MENU_ITEM_" }, value = { + MENU_ITEM_NONE, + MENU_ITEM_SHARE, + MENU_ITEM_WEB_SEARCH, + MENU_ITEM_PROCESS_TEXT + }) @Retention(RetentionPolicy.SOURCE) @Target({ElementType.PARAMETER, ElementType.METHOD}) private @interface MenuItemFlags {} diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 6f9925480a22..e9859239fdd6 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -997,6 +997,10 @@ public class WebView extends AbsoluteLayout * hex encoding of URLs for octets outside that range. For example, '#', * '%', '\', '?' should be replaced by %23, %25, %27, %3f respectively. * <p> + * The {@code mimeType} parameter specifies the format of the data. + * If WebView can't handle the specified MIME type, it will download the data. + * If {@code null}, defaults to 'text/html'. + * <p> * The 'data' scheme URL formed by this method uses the default US-ASCII * charset. If you need need to set a different charset, you should form a * 'data' scheme URL which explicitly specifies a charset parameter in the @@ -1005,8 +1009,7 @@ public class WebView extends AbsoluteLayout * always overrides that specified in the HTML or XML document itself. * * @param data a String of data in the given encoding - * @param mimeType the MIMEType of the data, e.g. 'text/html'. If {@code null}, - * defaults to 'text/html'. + * @param mimeType the MIME type of the data, e.g. 'text/html'. * @param encoding the encoding of the data */ public void loadData(String data, @Nullable String mimeType, @Nullable String encoding) { @@ -1020,6 +1023,10 @@ public class WebView extends AbsoluteLayout * applying JavaScript's same origin policy. The historyUrl is used for the * history entry. * <p> + * The {@code mimeType} parameter specifies the format of the data. + * If WebView can't handle the specified MIME type, it will download the data. + * If {@code null}, defaults to 'text/html'. + * <p> * Note that content specified in this way can access local device files * (via 'file' scheme URLs) only if baseUrl specifies a scheme other than * 'http', 'https', 'ftp', 'ftps', 'about' or 'javascript'. @@ -1037,8 +1044,7 @@ public class WebView extends AbsoluteLayout * @param baseUrl the URL to use as the page's base URL. If {@code null} defaults to * 'about:blank'. * @param data a String of data in the given encoding - * @param mimeType the MIMEType of the data, e.g. 'text/html'. If {@code null}, - * defaults to 'text/html'. + * @param mimeType the MIME type of the data, e.g. 'text/html'. * @param encoding the encoding of the data * @param historyUrl the URL to use as the history entry. If {@code null} defaults * to 'about:blank'. If non-null, this must be a valid URL. @@ -2249,10 +2255,10 @@ public class WebView extends AbsoluteLayout } /** @hide */ - @IntDef({ - RENDERER_PRIORITY_WAIVED, - RENDERER_PRIORITY_BOUND, - RENDERER_PRIORITY_IMPORTANT + @IntDef(prefix = { "RENDERER_PRIORITY_" }, value = { + RENDERER_PRIORITY_WAIVED, + RENDERER_PRIORITY_BOUND, + RENDERER_PRIORITY_IMPORTANT }) @Retention(RetentionPolicy.SOURCE) public @interface RendererPriority {} diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 46c39834060b..d0f9eee39a03 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -256,11 +256,11 @@ public class WebViewClient { public static final int ERROR_UNSAFE_RESOURCE = -16; /** @hide */ - @IntDef({ - SAFE_BROWSING_THREAT_UNKNOWN, - SAFE_BROWSING_THREAT_MALWARE, - SAFE_BROWSING_THREAT_PHISHING, - SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE + @IntDef(prefix = { "SAFE_BROWSING_THREAT_" }, value = { + SAFE_BROWSING_THREAT_UNKNOWN, + SAFE_BROWSING_THREAT_MALWARE, + SAFE_BROWSING_THREAT_PHISHING, + SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE }) @Retention(RetentionPolicy.SOURCE) public @interface SafeBrowsingThreat {} diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java index 4c47abc65a65..3ced6a5f7769 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -134,6 +134,14 @@ public interface WebViewFactoryProvider { TokenBindingService getTokenBindingService(); /** + * Gets the TracingController instance for this WebView implementation. The + * implementation must return the same instance on subsequent calls. + * + * @return the TracingController instance + */ + TracingController getTracingController(); + + /** * Gets the ServiceWorkerController instance for this WebView implementation. The * implementation must return the same instance on subsequent calls. * diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index dfb36423ea94..b2b93faf6656 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -107,7 +107,10 @@ public class DatePicker extends FrameLayout { public static final int MODE_CALENDAR = 2; /** @hide */ - @IntDef({MODE_SPINNER, MODE_CALENDAR}) + @IntDef(prefix = { "MODE_" }, value = { + MODE_SPINNER, + MODE_CALENDAR + }) @Retention(RetentionPolicy.SOURCE) public @interface DatePickerMode {} diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index e065dc119880..a4403984475f 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -4924,7 +4924,10 @@ public class Editor { } @Retention(RetentionPolicy.SOURCE) - @IntDef({HANDLE_TYPE_SELECTION_START, HANDLE_TYPE_SELECTION_END}) + @IntDef(prefix = { "HANDLE_TYPE_" }, value = { + HANDLE_TYPE_SELECTION_START, + HANDLE_TYPE_SELECTION_END + }) public @interface HandleType {} public static final int HANDLE_TYPE_SELECTION_START = 0; public static final int HANDLE_TYPE_SELECTION_END = 1; @@ -6129,7 +6132,11 @@ public class Editor { } @Retention(RetentionPolicy.SOURCE) - @IntDef({MERGE_EDIT_MODE_FORCE_MERGE, MERGE_EDIT_MODE_NEVER_MERGE, MERGE_EDIT_MODE_NORMAL}) + @IntDef(prefix = { "MERGE_EDIT_MODE_" }, value = { + MERGE_EDIT_MODE_FORCE_MERGE, + MERGE_EDIT_MODE_NEVER_MERGE, + MERGE_EDIT_MODE_NORMAL + }) private @interface MergeMode {} private static final int MERGE_EDIT_MODE_FORCE_MERGE = 0; private static final int MERGE_EDIT_MODE_NEVER_MERGE = 1; diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index cbd1e0ad0998..012b918ff34e 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -172,7 +172,10 @@ public class GridLayout extends ViewGroup { // Public constants /** @hide */ - @IntDef({HORIZONTAL, VERTICAL}) + @IntDef(prefix = { "HORIZONTAL", "VERTICAL" }, value = { + HORIZONTAL, + VERTICAL + }) @Retention(RetentionPolicy.SOURCE) public @interface Orientation {} @@ -198,7 +201,10 @@ public class GridLayout extends ViewGroup { public static final int UNDEFINED = Integer.MIN_VALUE; /** @hide */ - @IntDef({ALIGN_BOUNDS, ALIGN_MARGINS}) + @IntDef(prefix = { "ALIGN_" }, value = { + ALIGN_BOUNDS, + ALIGN_MARGINS + }) @Retention(RetentionPolicy.SOURCE) public @interface AlignmentMode {} diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index fcb44af672d5..1ec9b2f043b5 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -65,7 +65,12 @@ import java.lang.annotation.RetentionPolicy; @RemoteView public class GridView extends AbsListView { /** @hide */ - @IntDef({NO_STRETCH, STRETCH_SPACING, STRETCH_COLUMN_WIDTH, STRETCH_SPACING_UNIFORM}) + @IntDef(prefix = { "NO_STRETCH", "STRETCH_" }, value = { + NO_STRETCH, + STRETCH_SPACING, + STRETCH_COLUMN_WIDTH, + STRETCH_SPACING_UNIFORM + }) @Retention(RetentionPolicy.SOURCE) public @interface StretchMode {} diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 380bf7add239..7ea1f1edadf5 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -95,13 +95,12 @@ public class LinearLayout extends ViewGroup { public static final int VERTICAL = 1; /** @hide */ - @IntDef(flag = true, - value = { - SHOW_DIVIDER_NONE, - SHOW_DIVIDER_BEGINNING, - SHOW_DIVIDER_MIDDLE, - SHOW_DIVIDER_END - }) + @IntDef(flag = true, prefix = { "SHOW_DIVIDER_" }, value = { + SHOW_DIVIDER_NONE, + SHOW_DIVIDER_BEGINNING, + SHOW_DIVIDER_MIDDLE, + SHOW_DIVIDER_END + }) @Retention(RetentionPolicy.SOURCE) public @interface DividerMode {} diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 4d3189efa64e..d98b865debc6 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -510,7 +510,11 @@ public class NumberPicker extends LinearLayout { */ public interface OnScrollListener { /** @hide */ - @IntDef({SCROLL_STATE_IDLE, SCROLL_STATE_TOUCH_SCROLL, SCROLL_STATE_FLING}) + @IntDef(prefix = { "SCROLL_STATE_" }, value = { + SCROLL_STATE_IDLE, + SCROLL_STATE_TOUCH_SCROLL, + SCROLL_STATE_FLING + }) @Retention(RetentionPolicy.SOURCE) public @interface ScrollState {} diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index f8083babef29..903d3cafcef8 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -751,7 +751,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public static final int AUTO_SIZE_TEXT_TYPE_UNIFORM = 1; /** @hide */ - @IntDef({AUTO_SIZE_TEXT_TYPE_NONE, AUTO_SIZE_TEXT_TYPE_UNIFORM}) + @IntDef(prefix = { "AUTO_SIZE_TEXT_TYPE_" }, value = { + AUTO_SIZE_TEXT_TYPE_NONE, + AUTO_SIZE_TEXT_TYPE_UNIFORM + }) @Retention(RetentionPolicy.SOURCE) public @interface AutoSizeTextType {} // Default minimum size for auto-sizing text in scaled pixels. diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java index ae6881e4e28c..cfec3f2f603a 100644 --- a/core/java/android/widget/TimePicker.java +++ b/core/java/android/widget/TimePicker.java @@ -77,7 +77,10 @@ public class TimePicker extends FrameLayout { public static final int MODE_CLOCK = 2; /** @hide */ - @IntDef({MODE_SPINNER, MODE_CLOCK}) + @IntDef(prefix = { "MODE_" }, value = { + MODE_SPINNER, + MODE_CLOCK + }) @Retention(RetentionPolicy.SOURCE) public @interface TimePickerMode {} diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java index d80712006a53..edcf209bdf81 100644 --- a/core/java/android/widget/Toast.java +++ b/core/java/android/widget/Toast.java @@ -71,7 +71,10 @@ public class Toast { static final boolean localLOGV = false; /** @hide */ - @IntDef({LENGTH_SHORT, LENGTH_LONG}) + @IntDef(prefix = { "LENGTH_" }, value = { + LENGTH_SHORT, + LENGTH_LONG + }) @Retention(RetentionPolicy.SOURCE) public @interface Duration {} diff --git a/core/java/com/android/internal/inputmethod/InputMethodUtils.java b/core/java/com/android/internal/inputmethod/InputMethodUtils.java index 57efae61a9c6..d3b4dbf1bd82 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodUtils.java +++ b/core/java/com/android/internal/inputmethod/InputMethodUtils.java @@ -16,6 +16,9 @@ package com.android.internal.inputmethod; +import static android.view.inputmethod.InputMethodManager.CONTROL_WINDOW_IS_TEXT_EDITOR; +import static android.view.inputmethod.InputMethodManager.CONTROL_WINDOW_VIEW_HAS_FOCUS; + import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; @@ -26,6 +29,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.os.Build; import android.os.LocaleList; import android.os.RemoteException; import android.provider.Settings; @@ -33,6 +37,7 @@ import android.text.TextUtils; import android.text.TextUtils.SimpleStringSplitter; import android.util.ArrayMap; import android.util.ArraySet; +import android.util.Log; import android.util.Pair; import android.util.Printer; import android.util.Slog; @@ -1510,4 +1515,20 @@ public class InputMethodUtils { } return locales; } + + public static boolean isSoftInputModeStateVisibleAllowed( + int targetSdkVersion, int controlFlags) { + if (targetSdkVersion < Build.VERSION_CODES.P) { + // for compatibility. + return true; + } + if ((controlFlags & CONTROL_WINDOW_VIEW_HAS_FOCUS) == 0) { + return false; + } + if ((controlFlags & CONTROL_WINDOW_IS_TEXT_EDITOR) == 0) { + return false; + } + return true; + } + } diff --git a/core/java/com/android/internal/net/OWNERS b/core/java/com/android/internal/net/OWNERS index e2064a8099ae..10d44bdecb83 100644 --- a/core/java/com/android/internal/net/OWNERS +++ b/core/java/com/android/internal/net/OWNERS @@ -2,5 +2,7 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com jsharkey@android.com lorenzo@google.com +satk@google.com diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index a050a3ce0cf2..5d6d5bcaa6bc 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -11228,7 +11228,9 @@ public class BatteryStatsImpl extends BatteryStats { reportChangesToStatsLog(mHaveBatteryLevel ? mHistoryCur : null, status, plugType, level, temp); - final boolean onBattery = plugType == BATTERY_PLUGGED_NONE; + final boolean onBattery = + plugType == BATTERY_PLUGGED_NONE && + status != BatteryManager.BATTERY_STATUS_UNKNOWN; final long uptime = mClocks.uptimeMillis(); final long elapsedRealtime = mClocks.elapsedRealtime(); if (!mHaveBatteryLevel) { @@ -11262,7 +11264,8 @@ public class BatteryStatsImpl extends BatteryStats { mRecordingHistory = true; startRecordingHistory(elapsedRealtime, uptime, true); } - } else if (level < 96) { + } else if (level < 96 && + status != BatteryManager.BATTERY_STATUS_UNKNOWN) { if (!mRecordingHistory) { mRecordingHistory = true; startRecordingHistory(elapsedRealtime, uptime, true); @@ -11400,9 +11403,12 @@ public class BatteryStatsImpl extends BatteryStats { addHistoryRecordLocked(elapsedRealtime, uptime); } } - if (!onBattery && status == BatteryManager.BATTERY_STATUS_FULL) { - // We don't record history while we are plugged in and fully charged. - // The next time we are unplugged, history will be cleared. + if (!onBattery && + (status == BatteryManager.BATTERY_STATUS_FULL || + status == BatteryManager.BATTERY_STATUS_UNKNOWN)) { + // We don't record history while we are plugged in and fully charged + // (or when battery is not present). The next time we are + // unplugged, history will be cleared. mRecordingHistory = DEBUG; } diff --git a/core/java/com/android/internal/util/Preconditions.java b/core/java/com/android/internal/util/Preconditions.java index e5d571672ce2..91c76afdf5b2 100644 --- a/core/java/com/android/internal/util/Preconditions.java +++ b/core/java/com/android/internal/util/Preconditions.java @@ -494,4 +494,38 @@ public class Preconditions { return value; } + + /** + * Ensures that all elements in the argument integer array are within the inclusive range + * + * @param value an integer array of values + * @param lower the lower endpoint of the inclusive range + * @param upper the upper endpoint of the inclusive range + * @param valueName the name of the argument to use if the check fails + * + * @return the validated integer array + * + * @throws IllegalArgumentException if any of the elements in {@code value} were out of range + * @throws NullPointerException if the {@code value} was {@code null} + */ + public static int[] checkArrayElementsInRange(int[] value, int lower, int upper, + String valueName) { + checkNotNull(value, valueName + " must not be null"); + + for (int i = 0; i < value.length; ++i) { + int v = value[i]; + + if (v < lower) { + throw new IllegalArgumentException( + String.format("%s[%d] is out of range of [%d, %d] (too low)", + valueName, i, lower, upper)); + } else if (v > upper) { + throw new IllegalArgumentException( + String.format("%s[%d] is out of range of [%d, %d] (too high)", + valueName, i, lower, upper)); + } + } + + return value; + } } diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 1fd5564773b1..ac03d74632fa 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -61,7 +61,8 @@ interface IInputMethodManager { in IInputMethodClient client, in IBinder windowToken, int controlFlags, /* @android.view.WindowManager.LayoutParams.SoftInputModeFlags */ int softInputMode, int windowFlags, in EditorInfo attribute, IInputContext inputContext, - /* @InputConnectionInspector.MissingMethodFlags */ int missingMethodFlags); + /* @InputConnectionInspector.MissingMethodFlags */ int missingMethodFlags, + int unverifiedTargetSdkVersion); void showInputMethodPickerFromClient(in IInputMethodClient client, int auxiliarySubtypeMode); diff --git a/core/java/com/android/server/net/OWNERS b/core/java/com/android/server/net/OWNERS index 74f39a18ec2b..6f77e04da3c0 100644 --- a/core/java/com/android/server/net/OWNERS +++ b/core/java/com/android/server/net/OWNERS @@ -2,4 +2,6 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/core/proto/android/app/activitymanager.proto b/core/proto/android/app/activitymanager.proto index e87499ed2b83..73850509dfa8 100644 --- a/core/proto/android/app/activitymanager.proto +++ b/core/proto/android/app/activitymanager.proto @@ -20,61 +20,59 @@ package android.app; option java_multiple_files = true; -message ActivityManagerProto { +// ActivityManager.java PROCESS_STATEs +enum ProcessState { + // Order matters for process states, so values have been spaced to provide + // room for future additions. - // ActivityManager.java PROCESS_STATEs - enum ProcessState { - // Order matters for process states, so values have been spaced to provide - // room for future additions. - - // Not a real process state. - PROCESS_STATE_UNKNOWN = -100; - // Process is a persistent system process. - PROCESS_STATE_PERSISTENT = 0; - // Process is a persistent system process and is doing UI. - PROCESS_STATE_PERSISTENT_UI = 100; - // Process is hosting the current top activities. Note that this covers - // all activities that are visible to the user. - PROCESS_STATE_TOP = 200; - // Process is hosting a foreground service due to a system binding. - PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 300; - // Process is hosting a foreground service. - PROCESS_STATE_FOREGROUND_SERVICE = 400; - // Same as PROCESS_STATE_TOP but while device is sleeping. - PROCESS_STATE_TOP_SLEEPING = 500; - // Process is important to the user, and something they are aware of. - PROCESS_STATE_IMPORTANT_FOREGROUND = 600; - // Process is important to the user, but not something they are aware of. - PROCESS_STATE_IMPORTANT_BACKGROUND = 700; - // Process is in the background transient so we will try to keep running. - PROCESS_STATE_TRANSIENT_BACKGROUND = 800; - // Process is in the background running a backup/restore operation. - PROCESS_STATE_BACKUP = 900; - // Process is in the background, but it can't restore its state so we want - // to try to avoid killing it. - PROCESS_STATE_HEAVY_WEIGHT = 1000; - // Process is in the background running a service. Unlike oom_adj, this - // level is used for both the normal running in background state and the - // executing operations state. - PROCESS_STATE_SERVICE = 1100; - // Process is in the background running a receiver. Note that from the - // perspective of oom_adj, receivers run at a higher foreground level, but - // for our prioritization here that is not necessary and putting them - // below services means many fewer changes in some process states as they - // receive broadcasts. - PROCESS_STATE_RECEIVER = 1200; - // Process is in the background but hosts the home activity. - PROCESS_STATE_HOME = 1300; - // Process is in the background but hosts the last shown activity. - PROCESS_STATE_LAST_ACTIVITY = 1400; - // Process is being cached for later use and contains activities. - PROCESS_STATE_CACHED_ACTIVITY = 1500; - // Process is being cached for later use and is a client of another cached - // process that contains activities. - PROCESS_STATE_CACHED_ACTIVITY_CLIENT = 1600; - // Process is being cached for later use and is empty. - PROCESS_STATE_CACHED_EMPTY = 1700; - // Process does not exist. - PROCESS_STATE_NONEXISTENT = 1800; - } + // Not a real process state. + PROCESS_STATE_UNKNOWN = -100; + // Process is a persistent system process. + PROCESS_STATE_PERSISTENT = 0; + // Process is a persistent system process and is doing UI. + PROCESS_STATE_PERSISTENT_UI = 100; + // Process is hosting the current top activities. Note that this covers + // all activities that are visible to the user. + PROCESS_STATE_TOP = 200; + // Process is hosting a foreground service due to a system binding. + PROCESS_STATE_BOUND_FOREGROUND_SERVICE = 300; + // Process is hosting a foreground service. + PROCESS_STATE_FOREGROUND_SERVICE = 400; + // Same as PROCESS_STATE_TOP but while device is sleeping. + PROCESS_STATE_TOP_SLEEPING = 500; + // Process is important to the user, and something they are aware of. + PROCESS_STATE_IMPORTANT_FOREGROUND = 600; + // Process is important to the user, but not something they are aware of. + PROCESS_STATE_IMPORTANT_BACKGROUND = 700; + // Process is in the background transient so we will try to keep running. + PROCESS_STATE_TRANSIENT_BACKGROUND = 800; + // Process is in the background running a backup/restore operation. + PROCESS_STATE_BACKUP = 900; + // Process is in the background, but it can't restore its state so we want + // to try to avoid killing it. + PROCESS_STATE_HEAVY_WEIGHT = 1000; + // Process is in the background running a service. Unlike oom_adj, this + // level is used for both the normal running in background state and the + // executing operations state. + PROCESS_STATE_SERVICE = 1100; + // Process is in the background running a receiver. Note that from the + // perspective of oom_adj, receivers run at a higher foreground level, but + // for our prioritization here that is not necessary and putting them + // below services means many fewer changes in some process states as they + // receive broadcasts. + PROCESS_STATE_RECEIVER = 1200; + // Process is in the background but hosts the home activity. + PROCESS_STATE_HOME = 1300; + // Process is in the background but hosts the last shown activity. + PROCESS_STATE_LAST_ACTIVITY = 1400; + // Process is being cached for later use and contains activities. + PROCESS_STATE_CACHED_ACTIVITY = 1500; + // Process is being cached for later use and is a client of another cached + // process that contains activities. + PROCESS_STATE_CACHED_ACTIVITY_CLIENT = 1600; + // Process is being cached for later use and is empty. + PROCESS_STATE_CACHED_EMPTY = 1700; + // Process does not exist. + PROCESS_STATE_NONEXISTENT = 1800; } + diff --git a/core/proto/android/os/system_properties.proto b/core/proto/android/os/system_properties.proto index 7ffdc9628cc6..76a108b1ac08 100644 --- a/core/proto/android/os/system_properties.proto +++ b/core/proto/android/os/system_properties.proto @@ -26,7 +26,7 @@ package android.os; // Android Platform Exported System Properties // TODO: This is not the completed list, new properties need to be whitelisted. message SystemPropertiesProto { - option (stream_proto.stream_msg).enable_fields_mapping = true; + option (stream_proto.stream_msg).enable_fields_mapping_recursively = true; // Properties that are not specified below would be appended here. // These values stay on device only. @@ -38,15 +38,16 @@ message SystemPropertiesProto { } repeated Property extra_properties = 1; - optional int32 aac_drc_boost = 2; - optional int32 aac_drc_cut = 3; - optional int32 aac_drc_enc_target_level = 4; - optional int32 aac_drc_heavy = 5; - optional int32 aac_drc_reference_level = 6; + message AacDrc { + optional int32 boost = 1; + optional int32 cut = 2; + optional int32 enc_target_level = 3; + optional int32 heavy = 4; + optional int32 reference_level = 5; + } + optional AacDrc aac_drc = 2; message Aaudio { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional int32 hw_burst_min_usec = 1; optional int32 minimum_sleep_usec = 2; optional int32 mixer_bursts = 3; @@ -56,23 +57,19 @@ message SystemPropertiesProto { // Next Tag: 7 } - optional Aaudio aaudio = 7; + optional Aaudio aaudio = 3; - optional int32 af_fast_track_multiplier = 8; + optional int32 af_fast_track_multiplier = 4; message Camera { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional bool disable_zsl_mode = 1; optional int32 fifo_disable = 2; // Next Tag: 3 } - optional Camera camera = 9; + optional Camera camera = 5; message DalvikVm { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string appimageformat = 1; optional string backgroundgctype = 2; optional bool checkjni = 3; @@ -130,17 +127,15 @@ message SystemPropertiesProto { // Next Tag: 55 } - optional DalvikVm dalvik_vm = 10; + optional DalvikVm dalvik_vm = 6; - optional bool drm_64bit_enabled = 11; - optional bool drm_service_enabled = 12; - optional bool dumpstate_dry_run = 13; - optional string gsm_sim_operator_numeric = 14; - optional bool hal_instrumentation_enable = 15; + optional bool drm_64bit_enabled = 7; + optional bool drm_service_enabled = 8; + optional bool dumpstate_dry_run = 9; + optional string gsm_sim_operator_numeric = 10; + optional bool hal_instrumentation_enable = 11; message InitSvc { - option (stream_proto.stream_msg).enable_fields_mapping = true; - enum Status { STATUS_UNKNOWN = 0; STATUS_RUNNING = 1; @@ -190,28 +185,24 @@ message SystemPropertiesProto { // Next Tag: 42 } - optional InitSvc init_svc = 16; + optional InitSvc init_svc = 12; - optional bool keyguard_no_require_sim = 17; - optional string libc_debug_malloc_options = 18; - optional string libc_debug_malloc_program = 19; + optional bool keyguard_no_require_sim = 13; + optional string libc_debug_malloc_options = 14; + optional string libc_debug_malloc_program = 15; message Log { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string tag_WifiHAL = 1; optional string tag_stats_log = 2; // Next Tag: 3 } - optional Log log = 20; + optional Log log = 16; - optional bool media_mediadrmservice_enable = 21; - optional bool media_recorder_show_manufacturer_and_model = 22; + optional bool media_mediadrmservice_enable = 17; + optional bool media_recorder_show_manufacturer_and_model = 18; message Persist { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string config_calibration_fac = 1; optional int32 dbg_volte_avail_ovr = 2; optional int32 dbg_vt_avail_ovr = 3; @@ -226,11 +217,9 @@ message SystemPropertiesProto { // Next Tag: 12 } - optional Persist persist = 23; + optional Persist persist = 19; message PmDexopt { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string ab_ota = 1; optional string bg_dexopt = 2; optional string boot = 3; @@ -239,11 +228,9 @@ message SystemPropertiesProto { // Next Tag: 6 } - optional PmDexopt pm_dexopt = 24; + optional PmDexopt pm_dexopt = 20; message Ro { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional int32 adb_secure = 1; optional string arch = 2; optional bool audio_ignore_effects = 3; @@ -252,8 +239,6 @@ message SystemPropertiesProto { optional string board_platform = 6; message Boot { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string avb_version = 1; optional string baseband = 2; optional string bootdevice = 3; @@ -280,8 +265,6 @@ message SystemPropertiesProto { optional Boot boot = 7; message BootImage { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string build_date = 1; optional int32 build_date_utc = 2; optional string build_fingerprint = 3; @@ -294,8 +277,6 @@ message SystemPropertiesProto { optional string bootmode = 10; message Build { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string date = 1; optional int32 date_utc = 2; optional string description = 3; @@ -309,15 +290,13 @@ message SystemPropertiesProto { optional string user = 11; message Version { - option (stream_proto.stream_msg).enable_fields_mapping = true; - - optional string version_base_os = 1; - optional string version_codename = 2; - optional string version_incremental = 3; - optional int32 version_preview_sdk = 4; - optional string version_release = 5; - optional int32 version_sdk = 6; - optional string version_security_patch = 7; + optional string base_os = 1; + optional string codename = 2; + optional string incremental = 3; + optional int32 preview_sdk = 4; + optional string release = 5; + optional int32 sdk = 6; + optional string security_patch = 7; // Next Tag: 8 } @@ -334,8 +313,6 @@ message SystemPropertiesProto { optional string com_google_clientidbase = 16; message Config { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string alarm_alert = 1; optional int32 media_vol_steps = 2; optional string notification_sound = 3; @@ -357,8 +334,6 @@ message SystemPropertiesProto { optional string gfx_driver_0 = 26; message Hardware { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string value = 1; // value of ro.hardware itself optional string activity_recognition = 2; @@ -410,26 +385,28 @@ message SystemPropertiesProto { optional int32 opengles_version = 31; message Product { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string board = 1; optional string brand = 2; optional string cpu_abi = 3; - optional string cpu_abilist = 4; - optional string cpu_abilist32 = 5; - optional string cpu_abilist64 = 6; + repeated string cpu_abilist = 4; + repeated string cpu_abilist32 = 5; + repeated string cpu_abilist64 = 6; optional string device = 7; optional int32 first_api_level = 8; optional string manufacturer = 9; optional string model = 10; optional string name = 11; - optional string vendor_brand = 12; - optional string vendor_device = 13; - optional string vendor_manufacturer = 14; - optional string vendor_model = 15; - optional string vendor_name = 16; - // Next Tag: 17 + message Vendor { + optional string brand = 1; + optional string device = 2; + optional string manufacturer = 3; + optional string model = 4; + optional string name = 5; + } + optional Vendor vendor = 12; + + // Next Tag: 13 } optional Product product = 32; @@ -452,22 +429,18 @@ message SystemPropertiesProto { // Next Tag: 49 } - optional Ro ro = 25; + optional Ro ro = 21; - optional string sendbug_preferred_domain = 26; - optional int32 service_bootanim_exit = 27; + optional string sendbug_preferred_domain = 22; + optional int32 service_bootanim_exit = 23; message Sys { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional int32 boot_completed = 1; optional int32 boot_from_charger_mode = 2; optional int32 retaildemo_enabled = 3; optional string shutdown_requested = 4; message Usb { - option (stream_proto.stream_msg).enable_fields_mapping = true; - optional string config = 1; optional int32 configfs = 2; optional string controller = 3; @@ -484,16 +457,16 @@ message SystemPropertiesProto { // Next Tag: 6 } - optional Sys sys = 28; + optional Sys sys = 24; - optional int32 telephony_lteOnCdmaDevice = 29; - optional int32 tombstoned_max_tombstone_count = 30; - optional string vold_decrypt = 31; - optional int32 vold_post_fs_data_done = 32; - optional int32 vts_native_server_on = 33; - optional string wifi_direct_interface = 34; - optional string wifi_interface = 35; + optional int32 telephony_lteOnCdmaDevice = 25; + optional int32 tombstoned_max_tombstone_count = 26; + optional string vold_decrypt = 27; + optional int32 vold_post_fs_data_done = 28; + optional int32 vts_native_server_on = 29; + optional string wifi_direct_interface = 30; + optional string wifi_interface = 31; - // Next Tag: 36 + // Next Tag: 32 } diff --git a/core/proto/android/providers/settings.proto b/core/proto/android/providers/settings.proto index 8d091ab65cff..fb0ebed1545d 100644 --- a/core/proto/android/providers/settings.proto +++ b/core/proto/android/providers/settings.proto @@ -387,8 +387,9 @@ message GlobalSettingsProto { optional SettingProto enable_cache_quota_calculation = 339; optional SettingProto enable_deletion_helper_no_threshold_toggle = 340; optional SettingProto notification_snooze_options = 341; + optional SettingProto enable_gnss_raw_meas_full_tracking = 346; - // Next tag = 346; + // Next tag = 347; } message SecureSettingsProto { diff --git a/core/proto/android/server/powermanagerservice.proto b/core/proto/android/server/powermanagerservice.proto index d3b2cde01397..c1bd69218d64 100644 --- a/core/proto/android/server/powermanagerservice.proto +++ b/core/proto/android/server/powermanagerservice.proto @@ -57,7 +57,7 @@ message PowerManagerServiceDumpProto { optional bool is_active = 3; optional int32 num_wake_locks = 4; optional bool is_process_state_unknown = 5; - optional .android.app.ActivityManagerProto.ProcessState process_state = 6; + optional .android.app.ProcessState process_state = 6; } optional ConstantsProto constants = 1; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ab7b07ec96ba..15e439ed3586 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2924,6 +2924,11 @@ <permission android:name="android.permission.BRIGHTNESS_SLIDER_USAGE" android:protectionLevel="signature|privileged" /> + <!-- Allows an application to modify the display brightness configuration + @hide --> + <permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" + android:protectionLevel="signature|privileged|development" /> + <!-- @SystemApi Allows an application to control VPN. <p>Not for use by third-party applications.</p> @hide --> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 66e4c098f2a9..16460734a8d2 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Sit af"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Noodgeval"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Foutverslag"</string> + <string name="global_action_logout" msgid="935179188218826050">"Beëindig sessie"</string> <string name="bugreport_title" msgid="2667494803742548533">"Neem foutverslag"</string> <string name="bugreport_message" msgid="398447048750350456">"Dit sal inligting oor die huidige toestand van jou toestel insamel om as \'n e-posboodskap te stuur. Dit sal \'n tydjie neem vandat die foutverslag begin is totdat dit reg is om gestuur te word; wees asseblief geduldig."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiewe verslag"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Wanneer die kortpad aan is, sal \'n toeganklikheidkenmerk begin word as albei volumeknoppies 3 sekondes lank gedruk word.\n\n Bestaande toeganklikheidkenmerk:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Jy kan die kenmerk in Instellings > Toeganklikheid verander."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Skakel kortpad af"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Gebruik kortpad"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Kleuromkering"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Kleurkorreksie"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Toeganklikheidskortpad het <xliff:g id="SERVICE_NAME">%1$s</xliff:g> aangeskakel"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Toeganklikheidskortpad het <xliff:g id="SERVICE_NAME">%1$s</xliff:g> afgeskakel"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Kies \'n kenmerk om te gebruik wanneer jy op die Toeganklikheid-knoppie tik:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Weeksaand"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Naweek"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Geleentheid"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Slaap"</string> <string name="muted_by" msgid="6147073845094180001">"Gedemp deur <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Daar is \'n interne probleem met jou toestel en dit sal dalk onstabiel wees totdat jy \'n fabriekterugstelling doen."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Daar is \'n interne probleem met jou toestel. Kontak jou vervaardiger vir besonderhede."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-versoek is gewysig tot DIAL-versoek."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-versoek is gewysig tot SS-versoek."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-versoek is gewysig tot nuwe USSD-versoek."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-versoek is gewysig tot Video DIAL-versoek."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-versoek is gewysig tot DIAL-versoek."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-versoek is gewysig tot Video DIAL-versoek."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-versoek is gewysig tot USSD-versoek."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-versoek is gewysig tot nuwe SS-versoek."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Werkprofiel"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 318fe81c6aa3..868b0658e721 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"ኃይል አጥፋ"</string> <string name="global_action_emergency" msgid="7112311161137421166">"ድንገተኛ አደጋ"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"የሳንካ ሪፖርት"</string> + <string name="global_action_logout" msgid="935179188218826050">"ክፍለ-ጊዜን አብቃ"</string> <string name="bugreport_title" msgid="2667494803742548533">"የሳንካ ሪፖርት ውሰድ"</string> <string name="bugreport_message" msgid="398447048750350456">"ይሄ እንደ የኢሜይል መልዕክት አድርጎ የሚልከውን ስለመሣሪያዎ የአሁኑ ሁኔታ መረጃ ይሰበስባል። የሳንካ ሪፖርቱን ከመጀመር ጀምሮ እስኪላክ ድረስ ትንሽ ጊዜ ይወስዳል፤ እባክዎ ይታገሱ።"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"መስተጋብራዊ ሪፖርት"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"አቋራጩን አጥፋ"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"አቋራጭ ይጠቀሙ"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"ተቃራኒ ቀለም"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"የቀለም ማስተካከያ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"የተደራሽነት አቋራጭ <xliff:g id="SERVICE_NAME">%1$s</xliff:g>ን አብርቶታል"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"የተደራሽነት አቋራጭ <xliff:g id="SERVICE_NAME">%1$s</xliff:g>ን አጥፍቶታል"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"የተደራሽነት አዝራርን መታ በሚያደርጉበት ጊዜ ጥቅም ላይ የሚውለውን ባህሪ ይምረጡ፦"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"የሳምንት ለሊት"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"የሳምንት እረፍት ቀናት"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ክስተት"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"መተኛት"</string> <string name="muted_by" msgid="6147073845094180001">"ድምጽ በ<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ተዘግቷል"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"መሣሪያዎ ላይ የውስጣዊ ችግር አለ፣ የፋብሪካ ውሂብ ዳግም እስኪያስጀምሩት ድረስ ላይረጋጋ ይችላል።"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"መሣሪያዎ ላይ የውስጣዊ ችግር አለ። ዝርዝሮችን ለማግኘት አምራችዎን ያነጋግሩ።"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD ጥያቄ ወደ ደውል ጥያቄ ተሻሽሎዋል።"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD ጥያቄ ወደ SS ጥያቄ ተሻሽሎዋል።"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD ጥያቄ ወደ አዲስ USSD ጥያቄ ተሻሽሎዋል።"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"የUSSD ጥያቄ ወደ የቪድዪኦ ደውል ጥያቄ ተቀይሯል።"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS ጥያቄ ወደ ደውል ጥያቄ ተሻሽሎዋል።"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"የSS ጥያቄ ወደ የቪዲዮ ደውል ጥያቄ ተቀይሯል።"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ጥያቄ ወደ USSD ጥያቄ ተሻሽሎዋል።"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ጥያቄ ወደ አዲስ SS ጥያቄ ተሻሽሎዋል።"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"የስራ መገለጫ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 02345e26f16c..c9611e49da62 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -220,6 +220,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"إيقاف التشغيل"</string> <string name="global_action_emergency" msgid="7112311161137421166">"الطوارئ"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"تقرير الأخطاء"</string> + <string name="global_action_logout" msgid="935179188218826050">"إنهاء الجلسة"</string> <string name="bugreport_title" msgid="2667494803742548533">"إعداد تقرير بالأخطاء"</string> <string name="bugreport_message" msgid="398447048750350456">"سيجمع هذا معلومات حول حالة جهازك الحالي لإرسالها كرسالة إلكترونية، ولكنه سيستغرق وقتًا قليلاً من بدء عرض تقرير بالأخطاء. وحتى يكون جاهزًا للإرسال، يُرجى الانتظار."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"تقرير تفاعلي"</string> @@ -1594,6 +1595,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"إيقاف الاختصار"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"استخدام الاختصار"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"عكس الألوان"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"تصحيح الألوان"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"شغَّل اختصار إمكانية الوصول خدمة <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"أوقف اختصار إمكانية الوصول خدمة <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"يمكنك اختيار إحدى الميزات لاستخدامها عند النقر على زر إمكانية الوصول:"</string> @@ -1816,13 +1819,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ليلة يوم من أيام الأسبوع"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"نهاية الأسبوع"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"حدث"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"النوم"</string> <string name="muted_by" msgid="6147073845094180001">"تم كتم الصوت بواسطة <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"حدثت مشكلة داخلية في جهازك، وقد لا يستقر وضعه حتى إجراء إعادة الضبط بحسب بيانات المصنع."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"حدثت مشكلة داخلية في جهازك. يمكنك الاتصال بالمصنِّع للحصول على تفاصيل."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"يتم تعديل طلب USSD لطلب الاتصال."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"يتم تعديل طلب USSD إلى طلب SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"يتم تعديل طلب USSD إلى طلب USSD الجديد."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"تم تعديل طلب USSD إلى طلب Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"يتم تعديل الطلب SS لطلب الاتصال."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"تم تعديل طلب SS إلى طلب Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"يتم تعديل طلب SS إلى طلب USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"يتم تعديل طلب SS إلى طلب SS الجديد."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"الملف الشخصي للعمل"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 6041eeb07d13..a90ef03720ba 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Söndür"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Təcili"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Baq hesabatı"</string> + <string name="global_action_logout" msgid="935179188218826050">"Sessiyanı sonlandırın"</string> <string name="bugreport_title" msgid="2667494803742548533">"Baqı xəbər verin"</string> <string name="bugreport_message" msgid="398447048750350456">"Bu, sizin hazırkı cihaz durumu haqqında məlumat toplayacaq ki, elektron məktub şəklində göndərsin. Baq raportuna başlamaq üçün bir az vaxt lazım ola bilər, bir az səbr edin."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"İnteraktiv hesabat"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Qısayol aktiv olduqda hər iki səs düyməsinə 3 saniyə basıb saxlamaqla əlçatımlılıq funksiyası işə başlayacaq.\n\n Cari əlçatımlılıq funksiyası:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funksiyanı Ayarlar və Əçatımlılıq bölməsində dəyişə bilərsiniz."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Qısayolu Deaktiv edin"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Qısayol İstifadə edin"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Rəng İnversiyası"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Rəng korreksiyası"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Əlçatımlıq Qısayolu <xliff:g id="SERVICE_NAME">%1$s</xliff:g> xidmətini aktiv etdi"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Əlçatımlıq Qısayolu <xliff:g id="SERVICE_NAME">%1$s</xliff:g> xidmətini deaktiv etdi"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Əlçatımlılıq düyməsinə kliklədikdə istifadə etmək üçün funksiya seçin:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Həftəiçi gecəsi"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Həftə sonu"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Tədbir"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Yuxu"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tərəfindən susdurulub"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Cihazınızın daxili problemi var və istehsalçı sıfırlanması olmayana qədər qeyri-stabil ola bilər."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Cihazınızın daxili problemi var. Əlavə məlumat üçün istehsalçı ilə əlaqə saxlayın."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD sorğusu DIAL sorğusuna dəyişdirildi."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD sorğusu SS sorğusuna dəyişdirildi."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD sorğusu yeni USSD sorğusuna dəyişdirildi."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD sorğusu Video DIAL sorğusuna dəyişdirildi."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS sorğusu DIAL sorğusuna dəyişdirildi."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS sorğusu Video DIAL sorğusuna dəyişdirildi."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS sorğusu USSD sorğusuna dəyişdirildi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS sorğusu yeni SS sorğusuna dəyişdirildi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"İş profili"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 055bccbad730..6725865b3fc4 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -214,6 +214,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Isključi"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Hitni poziv"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Izveštaj o grešci"</string> + <string name="global_action_logout" msgid="935179188218826050">"Završi sesiju"</string> <string name="bugreport_title" msgid="2667494803742548533">"Napravi izveštaj o grešci"</string> <string name="bugreport_message" msgid="398447048750350456">"Ovim će se prikupiti informacije o trenutnom stanju uređaja kako bi bile poslate u poruci e-pošte. Od započinjanja izveštaja o grešci do trenutka za njegovo slanje proći će neko vreme; budite strpljivi."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiv. izveštaj"</string> @@ -1522,6 +1523,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kada je prečica uključena, pritisnite oba dugmeta za jačinu zvuka da biste pokrenuli funkciju pristupačnosti.\n\n Aktuelna funkcija pristupačnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Možete da promenite funkciju u odeljku Podešavanja > Pristupačnost."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Isključi prečicu"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Koristi prečicu"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inverzija boja"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Korekcija boja"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Prečica za pristupačnost je uključila uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Prečica za pristupačnost je isključila uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Izaberite funkciju koja će se koristiti kada dodirnete dugme za pristupačnost:"</string> @@ -1717,13 +1720,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Radni dan uveče"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Događaj"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Spavanje"</string> <string name="muted_by" msgid="6147073845094180001">"Zvuk je isključio/la <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Došlo je do internog problema u vezi sa uređajem i možda će biti nestabilan dok ne obavite resetovanje na fabrička podešavanja."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Došlo je do internog problema u vezi sa uređajem. Potražite detalje od proizvođača."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD zahtev je promenjen u DIAL zahtev."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD zahtev je promenjen u SS zahtev."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD zahtev je promenjen u novi USSD zahtev."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD zahtev je promenjen u Video DIAL zahtev."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS zahtev je promenjen u DIAL zahtev."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS zahtev je promenjen u Video DIAL zahtev."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS zahtev je promenjen u USSD zahtev."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS zahtev je promenjen u novi SS zahtev."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil za Work"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 9f07c7eaedbe..ca75fac72297 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Выключыць"</string> <string name="global_action_emergency" msgid="7112311161137421166">"SOS-выклік"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Справаздача пра памылкі"</string> + <string name="global_action_logout" msgid="935179188218826050">"Скончыць сеанс"</string> <string name="bugreport_title" msgid="2667494803742548533">"Справаздача пра памылку"</string> <string name="bugreport_message" msgid="398447048750350456">"Будзе збiрацца iнфармацыя пра бягучы стан прылады, якая будзе адпраўляцца на электронную пошту. Стварэнне справаздачы пра памылкi зойме некаторы час."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Інтэрактыўная справаздача"</string> @@ -1546,6 +1547,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Дэактываваць камбінацыю хуткага доступу"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Выкарыстоўваць камбінацыю хуткага доступу"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Інверсія колеру"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Карэкцыя колеру"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> быў уключаны з дапамогай камбінацыі хуткага доступу для спецыяльных магчымасцей"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> быў адключаны з дапамогай камбінацыі хуткага доступу для спецыяльных магчымасцей"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Выберыце функцыю для выкарыстання пры націску кнопкі \"Спецыяльныя магчымасці\":"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Будні вечар"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Выхадныя"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Падзея"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Рэжым сну"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> адключыў(-ла) гук"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"На вашай прыладзе ўзнікла ўнутраная праблема, і яна можа працаваць нестабільна, пакуль вы не зробіце скід да заводскіх налад."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"На вашай прыладзе ўзнікла ўнутраная праблема. Для атрымання дадатковай інфармацыі звярніцеся да вытворцы."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Запыт USSD зменены на запыт DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Запыт USSD зменены на запыт SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Запыт USSD зменены на новы запыт USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Запыт USSD зменены на запыт Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Запыт SS зменены на запыт DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Запыт SS зменены на запыт Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Запыт SS зменены на запыт USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Запыт SS зменены на новы запыт SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Працоўны профіль"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index ba6459bde41c..44f183f411e0 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Изключване"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Спешно обаждане"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Сигнал за програмна грешка"</string> + <string name="global_action_logout" msgid="935179188218826050">"Прекратяване на сесията"</string> <string name="bugreport_title" msgid="2667494803742548533">"Сигнал за програмна грешка"</string> <string name="bugreport_message" msgid="398447048750350456">"По този начин ще се събере информация за текущото състояние на устройството ви, която да се изпрати като имейл съобщение. След стартирането на процеса ще мине известно време, докато сигналът за програмна грешка бъде готов за подаване. Моля, имайте търпение."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактивен сигнал"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Изключване на прекия път"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Използване на пряк път"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Инвертиране на цветовете"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Коригиране на цветовете"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Прекият път за достъпност включи <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Прекият път за достъпност изключи <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Изберете функция, която да използвате, когато докоснете бутона за достъпност:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Делнична нощ"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Събота и неделя"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Събитие"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Време за сън"</string> <string name="muted_by" msgid="6147073845094180001">"Заглушено от <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Възникна вътрешен проблем с устройството ви. То може да е нестабилно, докато не възстановите фабричните настройки."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Възникна вътрешен проблем с устройството ви. За подробности се свържете с производителя."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD заявката е променена на DIAL заявка."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD заявката е променена на SS заявка."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD заявката е променена на нова USSD заявка."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD заявката е променена на DIAL заявка за видеообаждане."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS заявката е променена на DIAL заявка."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS заявката е променена на DIAL заявка за видеообаждане."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS заявката е променена на USSD заявка."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS заявката е променена на нова SS заявка."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Служебен потребителски профил"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 440b26904cb2..073fa1218039 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -212,8 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"পাওয়ার বন্ধ করুন"</string> <string name="global_action_emergency" msgid="7112311161137421166">"জরুরী"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ত্রুটির প্রতিবেদন"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"সেশন শেষ করুন"</string> <string name="bugreport_title" msgid="2667494803742548533">"ত্রুটির অভিযোগ করুন"</string> <string name="bugreport_message" msgid="398447048750350456">"এটি একটি ই-মেল মেসেজ পাঠানোর জন্য আপনার ডিভাইসের বর্তমান অবস্থা সম্পর্কে তথ্য সংগ্রহ করবে৷ ত্রুটির প্রতিবেদন শুরুর সময় থেকে এটি পাঠানোর জন্য প্রস্তুত হতে কিছুটা সময় নেবে; অনুগ্রহ করে ধৈর্য রাখুন৷"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ইন্টারেক্টিভ প্রতিবেদন"</string> @@ -1501,10 +1500,8 @@ <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> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"রঙ উল্টানো"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"রঙ সংশোধন"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"অ্যাক্সেসযোগ্যতা শর্টকাট <xliff:g id="SERVICE_NAME">%1$s</xliff:g> কে চালু করেছে"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"অ্যাক্সেসযোগ্যতা শর্টকাট <xliff:g id="SERVICE_NAME">%1$s</xliff:g> কে বন্ধ করেছে"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"অ্যাক্সেসযোগ্যতা বোতামের সাহায্যে যে বৈশিষ্ট্যটি নিয়ন্ত্রণ করতে চান, সেটি বেছে নিন:"</string> @@ -1691,15 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"সপ্তাহান্তের রাত্রি"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"সপ্তাহান্ত"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ইভেন্ট"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"ঘুমানোর সময়"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> দ্বারা নিঃশব্দ করা হয়েছে"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"আপনার ডিভাইসে একটি অভ্যন্তরীন সমস্যা হয়েছে, এবং আপনি যতক্ষণ না পর্যন্ত এটিকে ফ্যাক্টরি ডেটা রিসেট করছেন ততক্ষণ এটি ঠিকভাবে কাজ নাও করতে পারে৷"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"আপনার ডিভাইসে একটি অভ্যন্তরীন সমস্যা হয়েছে৷ বিস্তারিত জানার জন্য প্রস্তুতকারকের সাথে যোগাযোগ করুন৷"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD অনুরোধটিকে ডায়াল অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD অনুরোধটিকে SS অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD অনুরোধটিকে নতুন USSD অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS অনুরোধটিকে ডায়াল অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS অনুরোধটিকে নতুন USSD অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS অনুরোধটিকে নতুন SS অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"কর্মস্থলের প্রোফাইল"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index c9c98eb8ee68..c93a0e9f0fee 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -214,8 +214,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Isključi telefon"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Hitno"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Izvještaj o greškama"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"Završi sesiju"</string> <string name="bugreport_title" msgid="2667494803742548533">"Kreirajte izvještaj o greškama"</string> <string name="bugreport_message" msgid="398447048750350456">"Ovim će se prikupljati informacije o trenutnom stanju uređaja, koji će biti poslani kao e-poruka. Može malo potrajati dok se izvještaj o greškama ne kreira i bude spreman za slanje. Budite strpljivi."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktivni izvještaj"</string> @@ -1526,10 +1525,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kada je prečica uključena, pritiskom na oba dugmeta za podešavanje jačine zvuka u trajanju od 3 sekunde pokrenut će se funkcija za pristupačnost.\n\n Trenutna funkcija za pristupačnost je:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkciju možete promijeniti ako odete u Postavke > Pristupačnost."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Isključi prečicu"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Koristi prečicu"</string> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inverzija boja"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Ispravka boja"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Prečica za pristupačnost je uključila uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Prečica za pristupačnost je isključila uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Odaberite funkciju koja će se koristiti kada dodirnete dugme Pristupačnost:"</string> @@ -1725,15 +1722,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Radni dan uvečer"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Događaj"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Spavanje"</string> <string name="muted_by" msgid="6147073845094180001">"Ton isključila aplikacija <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Postoji problem u vašem uređaju i može biti nestabilan dok ga ne vratite na fabričke postavke."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Postoji problem u vašem uređaju. Za više informacija obratite se proizvođaču."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD zahtjev je izmijenjen u DIAL zahtjev."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD zahtjev je izmijenjen u SS zahtjev."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD zahtjev je izmijenjen u novi USSD zahtjev."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD zahtjev je izmijenjen u Video DIAL zahtjev."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS zahtjev je izmijenjen u DIAL zahtjev."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS zahtjev je izmijenjen u Video DIAL zahtjev."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS zahtjev je izmijenjen u USSD zahtjev."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS zahtjev je izmijenjen u novi SS zahtjev."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil za posao"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 179906909bb0..64d0ccdea070 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Apaga"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergències"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Informe d\'error"</string> + <string name="global_action_logout" msgid="935179188218826050">"Finalitza la sessió"</string> <string name="bugreport_title" msgid="2667494803742548533">"Crea informe d\'errors"</string> <string name="bugreport_message" msgid="398447048750350456">"Es recopilarà informació sobre l\'estat actual del dispositiu i se t\'enviarà per correu electrònic. Passaran uns quants minuts des de l\'inici de l\'informe d\'errors fins al seu enviament, per la qual cosa et recomanem que tinguis paciència."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Informe interactiu"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Si la drecera està activada, prem els dos botons de volum durant 3 segons, per iniciar una funció d\'accessibilitat.\n\n Funció d\'accessibilitat actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Pots canviar la funció a Configuració > Accessibilitat."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desactiva la drecera"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utilitza la drecera"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversió de color"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correcció del color"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"La drecera d\'accessibilitat ha activat <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"La drecera d\'accessibilitat ha desactivat <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Tria la funció que s\'utilitzarà quan toquis el botó Accessibilitat:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Nit entre setmana"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Cap de setmana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Esdeveniment"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Mentre dormo"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciat per <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"S\'ha produït un error intern al dispositiu i és possible que funcioni de manera inestable fins que restableixis les dades de fàbrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"S\'ha produït un error intern al dispositiu. Contacta amb el fabricant del dispositiu per obtenir més informació."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"La sol·licitud USSD s\'ha transformat en una sol·licitud DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"La sol·licitud USSD s\'ha transformat en una sol·licitud SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"La sol·licitud USSD s\'ha transformat en una sol·licitud USSD nova."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"La sol·licitud USSD s\'ha transformat en una sol·licitud DIAL de vídeo."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"La sol·licitud SS s\'ha transformat en una sol·licitud DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"La sol·licitud SS s\'ha transformat en una sol·licitud DIAL de vídeo."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La sol·licitud SS s\'ha transformat en una sol·licitud USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La sol·licitud SS s\'ha transformat en una sol·licitud SS nova."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil professional"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index ee47b4333184..0f24965d597f 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Vypnout"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Stav nouze"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Hlášení chyb"</string> + <string name="global_action_logout" msgid="935179188218826050">"Ukončit relaci"</string> <string name="bugreport_title" msgid="2667494803742548533">"Vytvořit chybové hlášení"</string> <string name="bugreport_message" msgid="398447048750350456">"Shromažďuje informace o aktuálním stavu zařízení. Tyto informace je následně možné poslat v e-mailové zprávě, chvíli však potrvá, než bude hlášení o chybě připraveno k odeslání. Buďte prosím trpěliví."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktivní přehled"</string> @@ -1546,6 +1547,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Když je tato zkratka zapnutá, můžete funkci přístupnosti spustit tím, že na tři sekundy podržíte obě tlačítka hlasitosti.\n\n Aktuální funkce přístupnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkci můžete změnit v Nastavení > Přístupnost."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Vypnout zkratku"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Použít zkratku"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Převrácení barev"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Oprava barev"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Zkratka přístupnosti zapnula službu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Zkratka přístupnosti vypnula službu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Určete, jakou funkci aktivujete klepnutím na tlačítko Přístupnost:"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Večer v pracovním týdnu"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Víkend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Událost"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Spánek"</string> <string name="muted_by" msgid="6147073845094180001">"Ignorováno stranou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"V zařízení došlo k internímu problému. Dokud neprovedete obnovení továrních dat, může být nestabilní."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"V zařízení došlo k internímu problému. Další informace vám sdělí výrobce."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Požadavek USSD byl změněn na požadavek DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Požadavek USSD byl změněn na požadavek SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Požadavek USSD byl změněn na nový požadavek USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Požadavek USSD byl změněn na požadavek Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Požadavek SS byl změněn na požadavek DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Požadavek SS byl změněn na požadavek Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Požadavek SS byl změněn na požadavek USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Požadavek SS byl změněn na nový požadavek SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Pracovní profil"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 0a3892f01cca..05817422a0e0 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Sluk"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Nødopkald"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Fejlrapport"</string> + <string name="global_action_logout" msgid="935179188218826050">"Afslut sessionen"</string> <string name="bugreport_title" msgid="2667494803742548533">"Lav fejlrapport"</string> <string name="bugreport_message" msgid="398447048750350456">"Der indsamles oplysninger om din enheds aktuelle status, der efterfølgende sendes i en e-mail. Der går lidt tid, fra fejlrapporten påbegyndes, til den er klar til at blive sendt. Tak for tålmodigheden."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiv rapport"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Når genvejen er slået til, kan du starte en hjælpefunktion ved at trykke på begge lydstyrkeknapper i tre sekunder.\n\n Nuværende hjælpefunktion:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kan skifte funktion i Indstillinger > Hjælpefunktioner."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Deaktiver genvej"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Brug genvej"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Ombytning af farver"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Korriger farve"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Genvejen til hjælpefunktioner aktiverede <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Genvejen til hjælpefunktioner deaktiverede <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Vælg, hvilken funktion du vil bruge, når du trykker på knappen Hjælpefunktioner:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Hverdagsaften"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Begivenhed"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sover"</string> <string name="muted_by" msgid="6147073845094180001">"Lyden blev afbrudt af <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Der er et internt problem med enheden, og den vil muligvis være ustabil, indtil du gendanner fabriksdataene."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Der er et internt problem med enheden. Kontakt producenten for at få yderligere oplysninger."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-anmodningen er ændret til en DIAL-anmodning."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-anmodningen er ændret til en SS-anmodning."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-anmodningen er ændret til en ny USSD-anmodning."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-anmodningen er ændret til en Video DIAL-anmodning."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-anmodningen er ændret til en DIAL-anmodning."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-anmodningen er ændret til en Vidieo DIAL-anmodning."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-anmodningen er ændret til en USSD-anmodning."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-anmodningen er ændret til en ny SS-anmodning."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Arbejdsprofil"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index c85c268bcaa3..f69406448ded 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Ausschalten"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Notfall"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Fehlerbericht"</string> + <string name="global_action_logout" msgid="935179188218826050">"Sitzung beenden"</string> <string name="bugreport_title" msgid="2667494803742548533">"Fehlerbericht abrufen"</string> <string name="bugreport_message" msgid="398447048750350456">"Bei diesem Fehlerbericht werden Daten zum aktuellen Status deines Geräts erfasst und als E-Mail versandt. Vom Start des Berichts bis zu seinem Versand kann es eine Weile dauern. Bitte habe etwas Geduld."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiver Bericht"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Wenn die Verknüpfung aktiviert ist, kannst du die beiden Lautstärketasten drei Sekunden lang gedrückt halten, um eine Bedienungshilfe zu starten.\n\n Aktuelle Bedienungshilfe:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kannst die Bedienungshilfe unter \"Einstellungen\" > \"Bedienungshilfen\" ändern."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Verknüpfung deaktivieren"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Verknüpfung verwenden"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Farbumkehr"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Farbkorrektur"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> wurde durch die Bedienungshilfenverknüpfung aktiviert"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> wurde durch die Bedienungshilfenverknüpfung deaktiviert"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Wähle eine Funktion aus, die verwendet wird, wenn du auf die Schaltfläche für die Bedienungshilfen tippst:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Abends unter der Woche"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Wochenende"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Termin"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Beim Schlafen"</string> <string name="muted_by" msgid="6147073845094180001">"Stummgeschaltet durch <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Es liegt ein internes Problem mit deinem Gerät vor. Möglicherweise verhält es sich instabil, bis du es auf die Werkseinstellungen zurücksetzt."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Es liegt ein internes Problem mit deinem Gerät vor. Bitte wende dich diesbezüglich an den Hersteller."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-Anfrage wird in DIAL-Anfrage geändert."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-Anfrage wird in SS-Anfrage geändert."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-Anfrage wird in neue USSD-Anfrage geändert."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-Anfrage wird in Video-DIAL-Anfrage geändert."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-Anfrage wird in DIAL-Anfrage geändert."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-Anfrage wird in Video-DIAL-Anfrage geändert."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-Anfrage wird in USSD-Anfrage geändert."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-Anfrage wird in neue SS-Anfrage geändert."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Arbeitsprofil"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 1fcaf973d5eb..c20a03fddb0d 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Απενεργοποίηση"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Κλήση έκτακτης ανάγκης"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Αναφορά σφαλμάτων"</string> + <string name="global_action_logout" msgid="935179188218826050">"Λήξη περιόδου σύνδεσης"</string> <string name="bugreport_title" msgid="2667494803742548533">"Λήψη αναφοράς σφάλματος"</string> <string name="bugreport_message" msgid="398447048750350456">"Θα συλλέξει πληροφορίες σχετικά με την τρέχουσα κατάσταση της συσκευής σας και θα τις στείλει μέσω μηνύματος ηλεκτρονικού ταχυδρομείου. Απαιτείται λίγος χρόνος για τη σύνταξη της αναφοράς σφάλματος και την αποστολή της. Κάντε λίγη υπομονή."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Διαδραστική αναφορά"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Απενεργοποίηση συντόμευσης"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Χρήση συντόμευσης"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Αντιστροφή χρωμάτων"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Διόρθωση χρωμάτων"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Η συντόμευση προσβασιμότητας ενεργοποίησε την υπηρεσία <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Η συντόμευση προσβασιμότητας απενεργοποίησε την υπηρεσία <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Επιλέξτε μια λειτουργία που θα χρησιμοποιείται κατά το πάτημα του κουμπιού \"Προσβασιμότητα\"."</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Νύχτα καθημερινής"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Σαββατοκύριακο"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Συμβάν"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Ύπνος"</string> <string name="muted_by" msgid="6147073845094180001">"Σίγαση από <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Υπάρχει ένα εσωτερικό πρόβλημα με τη συσκευή σας και ενδέχεται να είναι ασταθής μέχρι την επαναφορά των εργοστασιακών ρυθμίσεων."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Υπάρχει ένα εσωτερικό πρόβλημα με τη συσκευή σας. Επικοινωνήστε με τον κατασκευαστή σας για λεπτομέρειες."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Το αίτημα USSD τροποποιήθηκε σε αίτημα DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Το αίτημα USSD τροποποιήθηκε σε αίτημα SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Το αίτημα USSD τροποποιήθηκε σε νέο αίτημα USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Το αίτημα USSD τροποποιήθηκε σε αίτημα Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Το αίτημα SS τροποποιήθηκε σε αίτημα DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Το αίτημα SS τροποποιήθηκε σε αίτημα Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Το αίτημα SS τροποποιήθηκε σε αίτημα USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Το αίτημα SS τροποποιήθηκε σε νέο αίτημα SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Προφίλ εργασίας"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 22fe10de6d5a..58268eb846c9 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Apagar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergencias"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Informe de errores"</string> + <string name="global_action_logout" msgid="935179188218826050">"Finalizar sesión"</string> <string name="bugreport_title" msgid="2667494803742548533">"Iniciar informe de errores"</string> <string name="bugreport_message" msgid="398447048750350456">"Se recopilará información sobre el estado actual de tu dispositivo, que se enviará por correo. Pasarán unos minutos desde que se inicie el informe de errores hasta que se envíe, por lo que te recomendamos que tengas paciencia."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Informe interactivo"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Cuando el acceso directo está activado, puedes presionar los botones de volumen durante 3 segundos para iniciar una función de accesibilidad.\n\n Función de accesibilidad actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puedes cambiar la función en Configuración > Accesibilidad."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desactivar acceso directo"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Usar acceso directo"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversión de color"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Corrección de color"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"El acceso directo de accesibilidad activó <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"El acceso directo de accesibilidad desactivó <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Elige una función para usar cuando presionas el botón Accesibilidad:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noche, en la semana"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fin de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Dormir"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciados por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Existe un problema interno con el dispositivo, de modo que el dispositivo puede estar inestable hasta que restablezcas la configuración de fábrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Existe un problema interno con el dispositivo. Comunícate con el fabricante para obtener más información."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"La solicitud USSD cambió por una solicitud DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"La solicitud USSD cambió por una solicitud SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"La solicitud USSD cambió por una nueva solicitud USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Se cambió la solicitud USSD por una solicitud DIAL de video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"La solicitud SS cambió por una solicitud DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Se cambió la solicitud SS por una solicitud DIAL de video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La solicitud SS cambió por una solicitud USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La solicitud SS cambió por una nueva solicitud SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabajo"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index d9e39203153d..d03498c31c47 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Apagar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergencia"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Informe de error"</string> + <string name="global_action_logout" msgid="935179188218826050">"Finalizar sesión"</string> <string name="bugreport_title" msgid="2667494803742548533">"Crear informe de errores"</string> <string name="bugreport_message" msgid="398447048750350456">"Se recopilará información sobre el estado actual de tu dispositivo y se enviará por correo electrónico. Pasarán unos minutos desde que empiece a generarse el informe de errores hasta que se envíe."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Informe interactivo"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Si el acceso directo está activado, pulsa los dos botones de volumen durante tres segundos para iniciar una función de accesibilidad.\n\n Función de accesibilidad actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puedes cambiar la función en Ajustes > Accesibilidad."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desactivar acceso directo"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utilizar acceso directo"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversión de color"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Corrección de color"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"El acceso directo a accesibilidad ha activado <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"El acceso directo a accesibilidad ha desactivado <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Selecciona la función que se utilizará cuando toques el botón Accesibilidad:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noche de entre semana"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fin de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Dormir"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Se ha producido un problema interno en el dispositivo y es posible que este no sea estable hasta que restablezcas el estado de fábrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Se ha producido un problema interno en el dispositivo. Ponte en contacto con el fabricante para obtener más información."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"La solicitud USSD se ha modificado para la solicitud DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"La solicitud USSD se ha modificado para la solicitud SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"La solicitud USSD se ha modificado para la nueva solicitud USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"La solicitud USSD se ha modificado para la solicitud DIAL de vídeo."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"La solicitud SS se ha modificado para la solicitud DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"La solicitud SS se ha modificado para la solicitud DIAL de vídeo."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La solicitud SS se ha modificado para la solicitud USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La solicitud SS se ha modificado para la nueva solicitud SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabajo"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 7de0c3b5c4c8..754cdb305579 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Lülita välja"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Hädaabi"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Veaaruanne"</string> + <string name="global_action_logout" msgid="935179188218826050">"Seansi lõpp"</string> <string name="bugreport_title" msgid="2667494803742548533">"Veaaruande võtmine"</string> <string name="bugreport_message" msgid="398447048750350456">"Nii kogutakse teavet teie seadme praeguse oleku kohta, et saata see meilisõnumina. Enne kui saate veaaruande ära saata, võtab selle loomine natuke aega; varuge kannatust."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interakt. aruanne"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kui otsetee on sisse lülitatud, käivitab mõlema helitugevuse nupu kolm sekundit all hoidmine juurdepääsetavuse funktsiooni.\n\n Praegune juurdepääsetavuse funktsioon:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Saate seda funktsiooni muuta valikutega Seaded > Juurdepääsetavus."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Lülita otsetee välja"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Kasuta otseteed"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Värvide ümberpööramine"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Värviparandus"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Juurdepääsetavuse otsetee lülitas teenuse <xliff:g id="SERVICE_NAME">%1$s</xliff:g> sisse"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Juurdepääsetavuse otsetee lülitas teenuse <xliff:g id="SERVICE_NAME">%1$s</xliff:g> välja"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Valige, millist funktsiooni kasutada, kui vajutate nuppu Juurdepääsetavus:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Argiõhtu"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Nädalavahetus"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Sündmus"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Magamine"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vaigistas"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Seadmes ilmnes sisemine probleem ja seade võib olla ebastabiilne seni, kuni lähtestate seadme tehase andmetele."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Seadmes ilmnes sisemine probleem. Üksikasjaliku teabe saamiseks võtke ühendust tootjaga."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-päring muudeti DIAL-päringuks."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-päring muudeti SS-päringuks."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-päring muudeti uueks USSD-päringuks."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-taotlus muudeti video DIAL-taotluseks."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-päring muudeti DIAL-päringuks."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-taotlus muudeti video DIAL-taotluseks."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-päring muudeti USSD-päringuks."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-päring muudeti uueks SS-päringuks."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Tööprofiil"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index e62a7f621ec3..2e10fa2e78c8 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Itzali"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Larrialdi-deiak"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Akatsen txostena"</string> + <string name="global_action_logout" msgid="935179188218826050">"Amaitu saioa"</string> <string name="bugreport_title" msgid="2667494803742548533">"Sortu akatsen txostena"</string> <string name="bugreport_message" msgid="398447048750350456">"Gailuaren uneko egoerari buruzko informazioa bilduko da, mezu elektroniko gisa bidaltzeko. Minutu batzuk igaroko dira akatsen txostena sortzen hasten denetik bidaltzeko prest egon arte. Itxaron, mesedez."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Txosten dinamikoa"</string> @@ -1499,6 +1500,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Lasterbidea aktibatuta dagoenean, bi bolumen-botoiak hiru segundoz sakatuta abiaraziko da erabilerraztasun-eginbidea.\n\n Uneko erabilerraztasun-eginbidea:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Eginbidea aldatzeko, joan Ezarpenak > Erabilerraztasuna atalera."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desaktibatu lasterbidea"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Erabili lasterbidea"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Koloreak alderantzikatzeko aukera"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Kolorearen zuzenketa"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Erabilerraztasun-lasterbideak <xliff:g id="SERVICE_NAME">%1$s</xliff:g> aktibatu du"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Erabilerraztasun-lasterbideak <xliff:g id="SERVICE_NAME">%1$s</xliff:g> desaktibatu du"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Aukeratu zein eginbide erabili nahi duzun Erabilerraztasuna botoia sakatzean:"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Lanegunetako gaua"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Asteburua"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Gertaera"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Lo egin bitartean"</string> <string name="muted_by" msgid="6147073845094180001">"Audioa desaktibatu da (<xliff:g id="THIRD_PARTY">%1$s</xliff:g>)"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Barneko arazo bat dago zure gailuan eta agian ezegonkor egongo da jatorrizko datuak berrezartzen dituzun arte."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Barneko arazo bat dago zure gailuan. Xehetasunak jakiteko, jarri fabrikatzailearekin harremanetan."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD eskaera DIAL eskaerara aldatu da."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD eskaera SS eskaerara aldatu da."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD eskaera USSD eskaera berrira aldatu da."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD eskaera Video DIAL eskaerara aldatu da."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS eskaera DIAL eskaerara aldatu da."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS eskaera Video DIAL eskaerara aldatu da."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS eskaera USSD eskaerara aldatu da."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS eskaera SS eskaera berrira aldatu da."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profila"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index e1b4e0d2d6b9..dfa350bbc91c 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -212,8 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"خاموش کردن"</string> <string name="global_action_emergency" msgid="7112311161137421166">"اضطراری"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"گزارش اشکال"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"پایان جلسه"</string> <string name="bugreport_title" msgid="2667494803742548533">"گرفتن گزارش اشکال"</string> <string name="bugreport_message" msgid="398447048750350456">"این گزارش اطلاعات مربوط به وضعیت دستگاه کنونی شما را جمعآوری میکند تا به صورت یک پیام رایانامه ارسال شود. از زمان شروع گزارش اشکال تا آماده شدن برای ارسال اندکی زمان میبرد؛ لطفاً شکیبا باشید."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"گزارش تعاملی"</string> @@ -1500,10 +1499,8 @@ <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> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"وارونگی رنگ"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"تصحیح رنگ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"«میانبر دسترسپذیری» <xliff:g id="SERVICE_NAME">%1$s</xliff:g> را روشن کرد"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"«میانبر دسترسپذیری» <xliff:g id="SERVICE_NAME">%1$s</xliff:g> را خاموش کرد"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"قابلیتی را انتخاب کنید که هنگام ضربه زدن روی دکمه «دسترسپذیری» استفاده میشود:"</string> @@ -1690,15 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"شب آخر هفته"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"آخر هفته"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"رویداد"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"خوابیدن"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> آن را بیصدا کرد"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"دستگاهتان یک مشکل داخلی دارد، و ممکن است تا زمانی که بازنشانی دادههای کارخانه انجام نگیرد، بیثبات بماند."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"دستگاهتان یک مشکل داخلی دارد. برای جزئیات آن با سازندهتان تماس بگیرید."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"درخواست USSD به درخواست DIAL اصلاح میشود."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"درخواست USSD به درخواست SS اصلاح میشود."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"درخواست USSD به درخواست USSD جدید اصلاح میشود."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"درخواست USSD به درخواست Video DIAL تغییر کرد."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"درخواست SS به درخواست DIAL اصلاح میشود."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"درخواست SS به درخواست Video DIAL تغییر کرد."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"درخواست SS به درخواست USSD اصلاح میشود."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"درخواست SS به درخواست SS جدید اصلاح میشود."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"نمایه کاری"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 68b29df7c377..5696b5a9e2db 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Katkaise virta"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Hätäpuhelu"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Virheraportti"</string> + <string name="global_action_logout" msgid="935179188218826050">"Lopeta käyttökerta"</string> <string name="bugreport_title" msgid="2667494803742548533">"Luo virheraportti"</string> <string name="bugreport_message" msgid="398447048750350456">"Toiminto kerää tietoja laitteen tilasta ja lähettää ne sähköpostitse. Virheraportti on valmis lähetettäväksi hetken kuluttua - kiitos kärsivällisyydestäsi."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiivinen"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kun pikanäppäin on käytössä, voit käynnistää esteettömyystoiminnon pitämällä molempia äänenvoimakkuuspainikkeita painettuna kolmen sekunnin ajan.\n\n Tällä hetkellä valittu esteettömyystoiminto:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Voit vaihtaa toimintoa valitsemalla Asetukset > Esteettömyys."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Poista pikanäppäin käytöstä"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Käytä pikanäppäintä"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Käänteiset värit"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Värinkorjaus"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> otettiin käyttöön esteettömyystilan pikanäppäimellä."</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> poistettiin käytöstä esteettömyystilan pikanäppäimellä."</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Valitse toiminto, jonka Esteettömyys-painike aktivoi:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Arki-iltaisin"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Viikonloppuna"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Tapahtuma"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Nukkuminen"</string> <string name="muted_by" msgid="6147073845094180001">"Mykistänyt <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Laitteellasi on sisäinen ongelma, joka aiheuttaa epävakautta. Voit korjata tilanteen palauttamalla tehdasasetukset."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Laitteesi yhdistäminen ei onnistu sisäisen virheen takia. Saat lisätietoja valmistajalta."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-pyyntö muutettiin DIAL-pyynnöksi."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-pyyntö muutettiin SS-pyynnöksi."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-pyyntö muutettiin uudeksi USSD-pyynnöksi."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-pyyntö muutettiin Video DIAL ‑pyynnöksi."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-pyyntö muutettiin DIAL-pyynnöksi."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-pyyntö muutettiin Video DIAL ‑pyynnöksi."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-pyyntö muutettiin USSD-pyynnöksi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-pyyntö muutettiin uudeksi SS-pyynnöksi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Työprofiili"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index a4c0a0f5f616..6e9784475fd8 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Éteindre"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Urgence"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Rapport de bogue"</string> + <string name="global_action_logout" msgid="935179188218826050">"Fermer la session"</string> <string name="bugreport_title" msgid="2667494803742548533">"Créer un rapport de bogue"</string> <string name="bugreport_message" msgid="398447048750350456">"Cela permet de recueillir des informations concernant l\'état actuel de votre appareil. Ces informations sont ensuite envoyées sous forme de courriel. Merci de patienter pendant la préparation du rapport de bogue. Cette opération peut prendre quelques instants."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Rapport interactif"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quand le raccourci est activé, appuyez sur les deux boutons de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité.\n\n Fonctionnalité d\'accessibilité utilisée actuellement :\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Vous pouvez changer de fonctionnalité sous Paramètres > Accessibilité."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Désactiver le raccourci"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utiliser le raccourci"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversion des couleurs"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correction des couleurs"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Le raccourci d\'accessibilité a activé la fonction <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Le raccourci d\'accessibilité a désactivé la fonction <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Choisissez une fonctionnalité à utiliser lorsque vous touchez le bouton d\'accessibilité :"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Soirs de semaine"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fin de semaine"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Événement"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Dormir"</string> <string name="muted_by" msgid="6147073845094180001">"Mis en sourdine par <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Un problème interne est survenu avec votre appareil. Il se peut qu\'il soit instable jusqu\'à ce que vous le réinitialisiez à sa configuration d\'usine."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Un problème interne est survenu avec votre appareil. Communiquez avec le fabricant pour obtenir plus de détails."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"La demande USSD a été modifiée et est maintenant une demande DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"La demande USSD a été modifiée et est maintenant une demande SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"La demande USSD a été modifiée et est maintenant une nouvelle demande USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"La demande USSD a été modifiée et est maintenant une demande Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"La demande SS a été modifiée et est maintenant une demande DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"La demande SS a été modifiée et est maintenant une demande Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La demande SS a été modifiée et est maintenant une demande USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La demande SS a été modifiée et est maintenant une nouvelle demande SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil professionnel"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index c57684ccf27e..7dc33c4a5a19 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Éteindre"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Urgences"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Rapport de bug"</string> + <string name="global_action_logout" msgid="935179188218826050">"Fermer la session"</string> <string name="bugreport_title" msgid="2667494803742548533">"Créer un rapport de bug"</string> <string name="bugreport_message" msgid="398447048750350456">"Cela permet de recueillir des informations concernant l\'état actuel de votre appareil. Ces informations sont ensuite envoyées sous forme d\'e-mail. Merci de patienter pendant la préparation du rapport de bug. Cette opération peut prendre quelques instants."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Rapport interactif"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quand le raccourci est activé, appuyez sur les deux boutons de volume pendant trois secondes pour lancer une fonctionnalité d\'accessibilité.\n\n Fonctionnalité d\'accessibilité utilisée actuellement :\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Vous pouvez changer de fonctionnalité dans Paramètres > Accessibilité."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Désactiver le raccourci"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utiliser le raccourci"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversion des couleurs"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correction des couleurs"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Le raccourci d\'accessibilité a activé <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Le raccourci d\'accessibilité a désactivé <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Choisissez une fonctionnalité à utiliser lorsque vous appuyez sur le bouton d\'accessibilité :"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Soirée de semaine"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Week-end"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Événement"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sommeil"</string> <string name="muted_by" msgid="6147073845094180001">"Son coupé par : <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Un problème interne lié à votre appareil est survenu. Ce dernier risque d\'être instable jusqu\'à ce que vous rétablissiez la configuration d\'usine."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Un problème interne lié à votre appareil est survenu. Veuillez contacter le fabricant pour en savoir plus."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"La requête USSD a été remplacée par une requête DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"La requête USSD a été remplacée par une requête SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"La requête USSD a été remplacée par une autre requête USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"La requête SS a été remplacée par une requête vidéo DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"La requête SS a été remplacée par une requête DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"La requête SS a été remplacée par une requête vidéo DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La requête SS a été remplacée par une requête USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La requête SS a été remplacée par une autre requête SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil professionnel"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index 684b909745c2..b5aab394d323 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Apagar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Urxencias"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Informe de erros"</string> + <string name="global_action_logout" msgid="935179188218826050">"Finalizar a sesión"</string> <string name="bugreport_title" msgid="2667494803742548533">"Crear informe de erros"</string> <string name="bugreport_message" msgid="398447048750350456">"Este informe recompilará información acerca do estado actual do teu dispositivo para enviala en forma de mensaxe de correo electrónico. O informe de erros tardará un pouco en completarse desde o seu inicio ata que estea preparado para enviarse, polo que che recomendamos que teñas paciencia."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Informe interactivo"</string> @@ -1499,6 +1500,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Cando o atallo está activado, podes premer os dous botóns de volume durante 3 segundos para iniciar unha función de accesibilidade.\n\n Función de accesibilidade actual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Podes cambiar a función en Configuración > Accesibilidade."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desactivar atallo"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utilizar atallo"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversión de cor"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Corrección de cor"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"O atallo de accesibilidade activou <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"O atallo de accesibilidade desactivou <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Escolle que función queres utilizar cando toques o botón Accesibilidade:"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noite da semana"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fin de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Durmindo"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Produciuse un erro interno no teu dispositivo e quizais funcione de maneira inestable ata o restablecemento dos datos de fábrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Produciuse un erro interno co teu dispositivo. Contacta co teu fabricante para obter máis información."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"A solicitude USSD transformouse nunha solicitude DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"A solicitude USSD transformouse nunha solicitude SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"A solicitude USSD transformouse nunha nova solicitude USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"A solicitude USSD transformouse nunha solicitude DIAL de vídeo."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"A solicitude SS transformouse nunha solicitude DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"A solicitude SS transformouse nunha solicitude DIAL de vídeo."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"A solicitude SS transformouse nunha solicitude USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"A solicitude SS transformouse nunha nova solicitude SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de traballo"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index a6343ec4f1df..cff1a8500f21 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"પાવર બંધ"</string> <string name="global_action_emergency" msgid="7112311161137421166">"કટોકટી"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"બગ રિપોર્ટ"</string> + <string name="global_action_logout" msgid="935179188218826050">"સત્ર સમાપ્ત કરો"</string> <string name="bugreport_title" msgid="2667494803742548533">"બગ રિપોર્ટ લો"</string> <string name="bugreport_message" msgid="398447048750350456">"આ, એક ઇ-મેઇલ સંદેશ તરીકે મોકલવા માટે, તમારા વર્તમાન ઉપકરણ સ્થિતિ વિશેની માહિતી એકત્રિત કરશે. એક બગ રિપોર્ટ પ્રારંભ કરીને તે મોકલવા માટે તૈયાર ન થઈ જાય ત્યાં સુધી તેમાં થોડો સમય લાગશે; કૃપા કરીને ધીરજ રાખો."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ક્રિયાપ્રતિક્રિયાત્મક રિપોર્ટ"</string> @@ -1051,8 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"આને સિસ્ટમ સેટિંગ્સ > ઍપ્લિકેશનો > ડાઉનલોડ કરેલમાં ફરીથી સક્ષમ કરો."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> વર્તમાન પ્રદર્શન કદની સેટિંગનું સમર્થન કરતું નથી અને અનપેક્ષિત રીતે વર્તી શકે છે."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"હંમેશાં બતાવો"</string> - <!-- no translation found for unsupported_compile_sdk_message (4253168368781441759) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g>ને Android OSના અસંગત વર્ઝન માટે બનાવવામાં આવ્યું હતું અને તે અનપેક્ષિત રીતે કાર્ય કરી શકે છે. ઍપનું અપડેટ કરેલ વર્ઝન ઉપલબ્ધ હોઈ શકે છે."</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"હંમેશાં બતાવો"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"અપડેટ માટે તપાસો"</string> <string name="smv_application" msgid="3307209192155442829">"<xliff:g id="APPLICATION">%1$s</xliff:g> ઍપ્લિકેશન (<xliff:g id="PROCESS">%2$s</xliff:g> પ્રક્રિયા)એ તેની સ્વ-લાગુ કરેલ StrictMode નીતિનું ઉલ્લંઘન કર્યું છે."</string> @@ -1500,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"શૉર્ટકટ બંધ કરો"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"શૉર્ટકટનો ઉપયોગ કરો"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"રંગનો વ્યુત્ક્રમ"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"રંગ સુધારણા"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ઍક્સેસિબિલિટી શૉર્ટકટે <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ચાલુ કરી"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ઍક્સેસિબિલિટી શૉર્ટકટે <xliff:g id="SERVICE_NAME">%1$s</xliff:g> બંધ કરી"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"જ્યારે તમે ઍક્સેસિબિલિટી બટન પર ટૅપ કરો, ત્યારે ઉપયોગ કરવાની સુવિધા પસંદ કરો:"</string> @@ -1639,8 +1641,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> - <!-- no translation found for battery_saver_description (5394663545060026162) --> - <skip /> + <string name="battery_saver_description" msgid="5394663545060026162">"બૅટરી આવરદા વધુ સારી કરવામાં સહાય કરવા માટે, બૅટરી સેવર તમારા ઉપકરણના કાર્યપ્રદર્શનને ઘટાડે છે અને વાઇબ્રેશન, સ્થાન સેવાઓ અને મોટાભાગના બૅકગ્રાઉન્ડ ડેટાને સીમિત કરે છે. ઇમેઇલ, મેસેજિંગ અને અન્ય ઍપ જે સિંક થવા પર આધાર રાખે છે, તેમને કદાચ તમે ખોલશો નહીં ત્યાં સુધી અપડેટ થઈ શકશે નહીં.\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> @@ -1687,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"સપ્તાહાંત રાત્રિ"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"સપ્તાહાંત"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ઇવેન્ટ"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"નિષ્ક્રિય"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> દ્વારા મ્યૂટ કરાયું"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"તમારા ઉપકરણમાં આંતરિક સમસ્યા છે અને જ્યાં સુધી તમે ફેક્ટરી ડેટા ફરીથી સેટ કરશો નહીં ત્યાં સુધી તે અસ્થિર રહી શકે છે."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"તમારા ઉપકરણમાં આંતરિક સમસ્યા છે. વિગતો માટે તમારા નિર્માતાનો સંપર્ક કરો."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD વિનંતીને DIAL વિનંતી પર સંશોધિત કરી."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD વિનંતીને SS વિનંતી પર સંશોધિત કરી."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD વિનંતીને નવી USSD વિનંતી પર સંશોધિત કરી."</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS વિનંતીને DIAL વિનંતી પર સંશોધિત કરી."</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS વિનંતીને USSD વિનંતી પર સંશોધિત કરી."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS વિનંતીને નવી SS વિનંતી પર સંશોધિત કરી."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"કાર્યાલયની પ્રોફાઇલ"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 6f8fe0fc5528..f9e8a033b68f 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"पावर बंद"</string> <string name="global_action_emergency" msgid="7112311161137421166">"आपातकाल"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"गड़बड़ी की रिपोर्ट"</string> + <string name="global_action_logout" msgid="935179188218826050">"सत्र खत्म करें"</string> <string name="bugreport_title" msgid="2667494803742548533">"गड़बड़ी की रिपोर्ट लें"</string> <string name="bugreport_message" msgid="398447048750350456">"इससे ईमेल भेजने के लिए, आपके डिवाइस की मौजूदा स्थिति से जुड़ी जानकारी इकट्ठा की जाएगी. गड़बड़ी की रिपोर्ट बनना शुरू होने से लेकर भेजने के लिए तैयार होने तक कुछ समय लगेगा; कृपया इंतज़ार करें."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"सहभागी रिपोर्ट"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"शॉर्टकट बंद करें"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"शॉर्टकट का उपयोग करें"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"रंग बदलने की सुविधा"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"रंग में सुधार करने की सुविधा"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"सुलभता शॉर्टकट ने <xliff:g id="SERVICE_NAME">%1$s</xliff:g> को चालू किया"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"सुलभता शॉर्टकट ने <xliff:g id="SERVICE_NAME">%1$s</xliff:g> को बंद किया"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"सुलभता बटन पर टैप करते समय इस्तेमाल की जाने वाली सुविधा चुनें:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"सप्ताह की रात"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"सप्ताहांत"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"इवेंट"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"सोते समय"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा म्यूट किया गया"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"आपके डिवाइस में कोई अंदरूनी समस्या है और यह तब तक ठीक नहीं होगी जब तक आप फ़ैक्टरी डेटा रीसेट नहीं करते."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"आपके डिवाइस के साथ कोई आंतरिक गड़बड़ी हुई. विवरणों के लिए अपने निर्माता से संपर्क करें."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD अनुरोध को DIAL अनुरोध में बदल दिया गया है."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD अनुरोध को SS अनुरोध में बदल दिया गया है."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD अनुरोध को नए USSD अनुरोध में बदल दिया गया है."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD अनुरोध को वीडियो DIAL अनुरोध में बदल दिया गया है."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS अनुरोध को DIAL अनुरोध में बदल दिया गया है."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS अनुरोध को वीडियो DIAL अनुरोध में बदल दिया गया है."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS अनुरोध को USSD अनुरोध में बदल दिया गया है."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS अनुरोध को नए SS अनुरोध में बदल दिया गया है."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"कार्य प्रोफ़ाइल"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 1be072e190a5..7e53209c9ebf 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -214,6 +214,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Isključi"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Hitno"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Izvješće o bugovima"</string> + <string name="global_action_logout" msgid="935179188218826050">"Završi sesiju"</string> <string name="bugreport_title" msgid="2667494803742548533">"Izvješće o programskoj pogrešci"</string> <string name="bugreport_message" msgid="398447048750350456">"Time će se prikupiti podaci o trenutačnom stanju vašeg uređaja koje ćete nam poslati u e-poruci. Za pripremu izvješća o programskoj pogrešci potrebno je nešto vremena pa vas molimo za strpljenje."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktivno izvješće"</string> @@ -1522,6 +1523,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kada je taj prečac uključen, pritiskom na obje tipke za glasnoću na 3 sekunde pokrenut će se značajka pristupačnosti.\n\n Trenutačna značajka pristupačnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Značajku možete promijeniti u Postavkama > Pristupačnost."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Isključi prečac"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Upotrijebi prečac"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inverzija boja"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Korekcija boje"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Prečac pristupačnosti uključio je uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Prečac pristupačnosti isključio je uslugu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Odaberite značajku koju ćete upotrebljavati kada dodirnete gumb Pristupačnost:"</string> @@ -1717,13 +1720,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noć radnog dana"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Vikend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Događaj"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Spavanje"</string> <string name="muted_by" msgid="6147073845094180001">"Zvuk je isklj. treća strana <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Na vašem uređaju postoji interni problem i možda neće biti stabilan dok ga ne vratite na tvorničko stanje."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Na vašem uređaju postoji interni problem. Obratite se proizvođaču za više pojedinosti."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD zahtjev izmijenjen je u DIAL zahtjev."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD zahtjev izmijenjen je u SS zahtjev."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD zahtjev izmijenjen je u novi USSD zahtjev."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD zahtjev izmijenjen je u Video DIAL zahtjev."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS zahtjev izmijenjen je u DIAL zahtjev."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS zahtjev izmijenjen je u Video DIAL zahtjev."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS zahtjev izmijenjen je u USSD zahtjev."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS zahtjev izmijenjen je u novi SS zahtjev."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Radni profil"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index d9b4f61cf58b..b815035e1a79 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Kikapcsolás"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Segélyhívás"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Programhiba bejelentése"</string> + <string name="global_action_logout" msgid="935179188218826050">"Munkamenet befejezése"</string> <string name="bugreport_title" msgid="2667494803742548533">"Hibajelentés készítése"</string> <string name="bugreport_message" msgid="398447048750350456">"Ezzel információt fog gyűjteni az eszköz jelenlegi állapotáról, amelyet a rendszer e-mailben fog elküldeni. Kérjük, legyen türelemmel, amíg a hibajelentés elkészül, és küldhető állapotba kerül."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktív jelentés"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Ha be van kapcsolva a billentyűparancs, a két hangerőgomb 3 másodpercig tartó lenyomásával elindíthatja a kisegítő lehetőségek egyik funkcióját.\n\n A kisegítő lehetőségek jelenleg beállított funkciója:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n A funkciót a Beállítások > Kisegítő lehetőségek menüpontban módosíthatja."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Billentyűparancs kikapcsolása"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Billentyűparancs használata"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Színek invertálása"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Színkorrekció"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"A Kisegítő lehetőségek gyorsparancsa bekapcsolta a következő szolgáltatást: <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"A Kisegítő lehetőségek gyorsparancsa kikapcsolta a következő szolgáltatást: <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Válassza ki a Kisegítő lehetőségek gombra koppintáskor használni kívánt funkciót:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Hétköznap éjszaka"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Hétvége"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Esemény"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Alvás"</string> <string name="muted_by" msgid="6147073845094180001">"A(z) <xliff:g id="THIRD_PARTY">%1$s</xliff:g> elnémította"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Belső probléma van az eszközzel, és instabil lehet, amíg vissza nem állítja a gyári adatokat."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Belső probléma van az eszközzel. A részletekért vegye fel a kapcsolatot a gyártóval."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Az USSD-kérés módosítva DIAL-kérésre."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Az USSD-kérés módosítva SS-kérésre."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Az USSD-kérés módosítva új USSD-kérésre."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-kérés módosítva Video DIAL-kérésre."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Az SS-kérés módosítva DIAL-kérésre."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-kérés módosítva Video DIAL-kérésre."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Az SS-kérés módosítva USSD-kérésre."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Az SS-kérés módosítva új SS-kérésre."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Munkaprofil"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 094becd5f65a..ff615c50c523 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Անջատել"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Շտապ կանչ"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Վրիպակի զեկույց"</string> + <string name="global_action_logout" msgid="935179188218826050">"Ավարտել աշխատաշրջանը"</string> <string name="bugreport_title" msgid="2667494803742548533">"Գրել սխալի զեկույց"</string> <string name="bugreport_message" msgid="398447048750350456">"Սա տեղեկություններ կհավաքագրի ձեր սարքի առկա կարգավիճակի մասին և կուղարկի այն էլեկտրոնային նամակով: Որոշակի ժամանակ կպահանջվի վրիպակի մասին զեկուցելու պահից սկսած մինչ ուղարկելը: Խնդրում ենք փոքր-ինչ համբերատար լինել:"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Ինտերակտիվ զեկույց"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Անջատել դյուրանցումը"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Օգտագործել դյուրանցումը"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Գունաշրջում"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Գունաշտկում"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Մատչելիության դյուրանցումն միացրել է <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ծառայությունը"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Մատչելիության դյուրանցումն անջատել է <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ծառայությունը"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Ընտրեք որևէ գործառույթ, որը կօգտագործվի Մատչելիություն կոճակին հպելու դեպքում՝"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Աշխատանքային օր"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Շաբաթ-կիրակի"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Միջոցառում"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Քնելիս"</string> <string name="muted_by" msgid="6147073845094180001">"Համրեցվել է <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ի կողմից"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Սարքում ներքին խնդիր է առաջացել և այն կարող է կրկնվել, մինչև չվերականգնեք գործարանային կարգավորումները:"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Սարքում ներքին խնդիր է առաջացել: Մանրամասների համար կապվեք արտադրողի հետ:"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD հարցումը փոխվել է DIAL հարցման:"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD հարցումը փոխվել է SS հարցման:"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD հարցումը փոխվել է նոր USSD հարցման:"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD հարցումը փոխվել է Video DIAL հարցման:"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS հարցումը փոխվել է DIAL հարցման:"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS հարցումը փոխվել է Video DIAL հարցման:"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS հարցումը փոխվել է USSD հարցման:"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS հարցումը փոխվել է նոր SS հարցման:"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Աշխատանքային պրոֆիլ"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index c499ea726d07..b8b76a0398fa 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -212,8 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Matikan perangkat"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Darurat"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Laporan bug"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"Akhiri sesi"</string> <string name="bugreport_title" msgid="2667494803742548533">"Ambil laporan bug"</string> <string name="bugreport_message" msgid="398447048750350456">"Ini akan mengumpulkan informasi status perangkat Anda saat ini, untuk dikirimkan sebagai pesan email. Harap bersabar, mungkin perlu waktu untuk memulai laporan bug hingga siap dikirim."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Laporan interaktif"</string> @@ -1500,10 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Saat pintasan aktif, menekan kedua tombol volume selama 3 detik akan memulai fitur aksesibilitas.\n\n Fitur aksesibilitas saat ini:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Anda dapat mengubah fitur di Setelan > Aksesibilitas."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Nonaktifkan Pintasan"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Gunakan Pintasan"</string> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversi Warna"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Koreksi Warna"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Pintasan Aksesibilitas mengaktifkan <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Pintasan Aksesibilitas menonaktifkan <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Pilih fitur yang akan digunakan saat menge-tap tombol Aksesibilitas:"</string> @@ -1690,15 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Malam hari kerja"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Akhir pekan"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Acara"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Tidur"</string> <string name="muted_by" msgid="6147073845094180001">"Dinonaktifkan oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Ada masalah dengan perangkat. Hal ini mungkin membuat perangkat jadi tidak stabil dan perlu dikembalikan ke setelan pabrik."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Ada masalah dengan perangkat. Hubungi produsen perangkat untuk informasi selengkapnya."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Permintaan USSD diubah menjadi permintaan DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Permintaan USSD diubah menjadi permintaan SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Permintaan USSD diubah menjadi permintaan USSD baru."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Permintaan USSD diubah menjadi permintaan DIAL Video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Permintaan SS diubah menjadi permintaan DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Permintaan SS diubah menjadi permintaan DIAL Video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Permintaan SS diubah menjadi permintaan USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Permintaan SS diubah menjadi permintaan SS baru."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil kerja"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index 4fcf2d878915..76286e1fbb26 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Slökkva"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Neyðarsímtal"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Villutilkynning"</string> + <string name="global_action_logout" msgid="935179188218826050">"Ljúka lotu"</string> <string name="bugreport_title" msgid="2667494803742548533">"Útbúa villutilkynningu"</string> <string name="bugreport_message" msgid="398447048750350456">"Þetta safnar upplýsingum um núverandi stöðu tækisins til að senda með tölvupósti. Það tekur smástund frá því villutilkynningin er ræst og þar til hún er tilbúin til sendingar – sýndu biðlund."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Gagnvirk skýrsla"</string> @@ -1499,6 +1500,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Þegar flýtileiðin er virk er kveikt á aðgengiseiginleikanum með því að halda báðum hljóðstyrkshnöppunum inni í þrjár sekúndur.\n\n Virkur aðgengiseiginleiki:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Hægt er að skipta um eiginleika í Stillingar > Aðgengi."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Slökkva á flýtileið"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Nota flýtileið"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Umsnúningur lita"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Litaleiðrétting"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Flýtileið aðgengisstillingar kveikti á <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Flýtileið aðgengisstillingar slökkti á <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Veldu eiginleika sem á að nota þegar ýtt er á aðgengishnappinn:"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Virkt kvöld"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Helgi"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Viðburður"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Svefn"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tók hljóðið af"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Innra vandamál kom upp í tækinu og það kann að vera óstöðugt þangað til þú núllstillir það."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Innra vandamál kom upp í tækinu. Hafðu samband við framleiðanda til að fá nánari upplýsingar."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-beiðni er breytt í DIAL-beiðni."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-beiðni er breytt í SS-beiðni."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-beiðni er breytt í nýja USSD-beiðni."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-beiðni var breytt í Video DIAL-beiðni."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-beiðni er breytt í DIAL-beiðni."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-beiðni var breytt í Video DIAL-beiðni."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-beiðni er breytt í USSD-beiðni."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-beiðni er breytt í nýja SS-beiðni."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Vinnusnið"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 5f85317497e3..2116542f4756 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Spegni"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergenza"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Segnalazione di bug"</string> + <string name="global_action_logout" msgid="935179188218826050">"Termina sessione"</string> <string name="bugreport_title" msgid="2667494803742548533">"Apri segnalazione bug"</string> <string name="bugreport_message" msgid="398447048750350456">"Verranno raccolte informazioni sullo stato corrente del dispositivo che saranno inviate sotto forma di messaggio email. Passerà un po\' di tempo prima che la segnalazione di bug aperta sia pronta per essere inviata; ti preghiamo di avere pazienza."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Rapporto interattivo"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quando la scorciatoia è attiva, puoi premere entrambi i pulsanti del volume per tre secondi per avviare una funzione di accessibilità.\n\n Funzione di accessibilità corrente:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puoi cambiare la funzione in Impostazioni > Accessibilità."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Disattiva scorciatoia"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Usa scorciatoia"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversione colori"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correzione colore"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"La scorciatoia Accessibilità ha attivato <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"La scorciatoia Accessibilità ha disattivato <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Scegli una funzione da usare quando tocchi il pulsante Accessibilità:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Notte di un giorno feriale"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fine settimana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sleeping (Notte)"</string> <string name="muted_by" msgid="6147073845094180001">"Audio disattivato da <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Si è verificato un problema interno con il dispositivo, che potrebbe essere instabile fino al ripristino dei dati di fabbrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Si è verificato un problema interno con il dispositivo. Per informazioni dettagliate, contatta il produttore."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"La richiesta USSD è stata modificata in richiesta DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"La richiesta USSD è stata modificata in richiesta SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"La richiesta USSD è stata modificata in nuova richiesta USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"La richiesta USSD è stata modificata in richiesta DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"La richiesta SS è stata modificata in richiesta DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"La richiesta SS è stata modificata in richiesta Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La richiesta SS è stata modificata in richiesta USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La richiesta SS è stata modificata in nuova richiesta SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profilo di lavoro"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 3ae28576a9b0..87e20c03a435 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"כיבוי"</string> <string name="global_action_emergency" msgid="7112311161137421166">"חירום"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"דיווח על באג"</string> + <string name="global_action_logout" msgid="935179188218826050">"סיום הפעלה"</string> <string name="bugreport_title" msgid="2667494803742548533">"שלח דיווח על באג"</string> <string name="bugreport_message" msgid="398447048750350456">"פעולה זו תאסוף מידע על מצב המכשיר הנוכחי שלך על מנת לשלוח אותו כהודעת אימייל. היא תימשך זמן קצר מרגע פתיחת דיווח הבאג ועד לשליחת ההודעה בפועל. אנא המתן בסבלנות."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"דוח אינטראקטיבי"</string> @@ -1546,6 +1547,8 @@ <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="color_inversion_feature_name" msgid="4231186527799958644">"היפוך צבעים"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"תיקון צבעים"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> הופעל על-ידי קיצור הדרך לנגישות"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> הושבת על-ידי קיצור הדרך לנגישות"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"בחר תכונה שתופעל כשתלחץ על הלחצן \'נגישות\':"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ערב ביום חול"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"סוף השבוע"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"אירוע"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"שינה"</string> <string name="muted_by" msgid="6147073845094180001">"הושתק על ידי <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"קיימת בעיה פנימית במכשיר שלך, וייתכן שהתפקוד שלו לא יהיה יציב עד שתבצע איפוס לנתוני היצרן."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"קיימת בעיה פנימית במכשיר שלך. לקבלת פרטים, צור קשר עם היצרן."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"בקשת USSD שונתה לבקשת DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"בקשת USSD שונתה לבקשת SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"בקשת USSD שונתה לבקשת USSD חדשה."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"בקשת USSD שונתה לבקשת Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"בקשת SS שונתה לבקשת DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"בקשת SS שונתה לבקשת Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"בקשת SS שונתה לבקשת USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"בקשת SS שונתה לבקשת SS חדשה."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"פרופיל עבודה"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 11b4a0f0518e..c2cc15491633 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"電源を切る"</string> <string name="global_action_emergency" msgid="7112311161137421166">"緊急通報"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"バグレポート"</string> + <string name="global_action_logout" msgid="935179188218826050">"セッションを終了"</string> <string name="bugreport_title" msgid="2667494803742548533">"バグレポートを取得"</string> <string name="bugreport_message" msgid="398447048750350456">"現在の端末の状態に関する情報が収集され、その内容がメールで送信されます。バグレポートが開始してから送信可能な状態となるまでには多少の時間がかかりますのでご了承ください。"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"対話型レポート"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"ショートカットが ON の場合、両方の音量ボタンを 3 秒間押し続けるとユーザー補助機能が起動します。\n\n現在のユーザー補助機能:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nユーザー補助機能は [設定] > [ユーザー補助] で変更できます。"</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"ショートカットを OFF にする"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"ショートカットを使用"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"色反転"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"色補正"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ユーザー補助機能のショートカットにより <xliff:g id="SERVICE_NAME">%1$s</xliff:g> は ON になっています"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ユーザー補助機能のショートカットにより <xliff:g id="SERVICE_NAME">%1$s</xliff:g> は OFF になっています"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"[ユーザー補助] ボタンをタップした場合に使用する機能を選択してください。"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"平日の夜"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"週末"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"予定"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"睡眠中"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>によりミュートになっています"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"端末で内部的な問題が発生しました。データが初期化されるまで不安定になる可能性があります。"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"端末で内部的な問題が発生しました。詳しくはメーカーにお問い合わせください。"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSDリクエストはDIALリクエストに変更されました。"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSDリクエストはSSリクエストに変更されました。"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSDリクエストは新しいUSSDリクエストに変更されました。"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD リクエストは Video DIAL リクエストに変更されました。"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SSリクエストはDIALリクエストに変更されました。"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS リクエストは Video DIAL リクエストに変更されました。"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SSリクエストはUSSDリクエストに変更されました。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SSリクエストは新しいSSリクエストに変更されました。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"仕事用プロファイル"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index ce07805f2836..ae4fb6fba212 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -212,8 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"კვების გამორთვა"</string> <string name="global_action_emergency" msgid="7112311161137421166">"საგანგებო სამსახურები"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ხარვეზის შესახებ ანგარიში"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"სესიის დასრულება"</string> <string name="bugreport_title" msgid="2667494803742548533">"შექმენით შეცდომის ანგარიში"</string> <string name="bugreport_message" msgid="398447048750350456">"იგი შეაგროვებს ინფორმაციას თქვენი მოწყობილობის ამჟამინდელი მდგომარეობის შესახებ, რათა ის ელფოსტის შეტყობინების სახით გააგზავნოს. ხარვეზის ანგარიშის მომზადებასა და შეტყობინების გაგზავნას გარკვეული დრო სჭირდება. გთხოვთ, მოითმინოთ."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ინტერაქტიული ანგარიში"</string> @@ -1500,10 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"მალსახმობის გამორთვა"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"მალსახმობის გამოყენება"</string> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"ფერთა ინვერსია"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"ფერთა კორექცია"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"მარტივი წვდომის მალსახმობმა ჩართო <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"მარტივი წვდომის მალსახმობმა გამორთო <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"აირჩიეთ მარტივი წვდომის ღილაკზე შეხებისას გამოსაყენებელი ფუნქცია:"</string> @@ -1690,15 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"სამუშაო კვირის ღამე"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"შაბათ-კვირა"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"მოვლენა"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"ძილისას"</string> <string name="muted_by" msgid="6147073845094180001">"დადუმებულია <xliff:g id="THIRD_PARTY">%1$s</xliff:g>-ის მიერ"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"ფიქსირდება თქვენი მ ოწყობილობის შიდა პრობლემა და შეიძლება არასტაბილური იყოს, სანამ ქარხნულ მონაცემების არ განაახლებთ."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"ფიქსირდება თქვენი მოწყობილობის შიდა პრობლემა. დეტალებისათვის, მიმართეთ თქვენს მწარმოებელს."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD მოთხოვნა შეიცვლალა DIAL მოთხოვნით."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD მოთხოვნა შეიცვალა SS მოთხოვნით."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD მოთხოვნა შეიცვალა ახალი USSD მოთხოვნით."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD მოთხოვნა შეიცვალა Video DIAL მოთხოვნით."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS მოთხოვნა შეიცვალა DIAL მოთხოვნით."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS მოთხოვნა შეიცვალა Video DIAL მოთხოვნით."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS მოთხოვნა შეიცვალა USSD მოთხოვნით."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS მოთხოვნა შეიცვალა ახალი SS მოთხოვნით."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"სამსახურის პროფილი"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index 0c5de0d25379..d56e6df3cedc 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Өшіру"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Төтенше жағдай"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Вирус туралы хабарлау"</string> + <string name="global_action_logout" msgid="935179188218826050">"Сеансты аяқтау"</string> <string name="bugreport_title" msgid="2667494803742548533">"Қате туралы есеп құру"</string> <string name="bugreport_message" msgid="398447048750350456">"Құрылғының қазіргі күйі туралы ақпаратты жинап, электрондық хабармен жібереді. Есеп әзір болғанша біраз уақыт кетеді, шыдай тұрыңыз."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактивті есеп"</string> @@ -1499,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Төте жолды өшіру"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Төте жолды пайдалану"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Түстер инверсиясы"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Түс жөндеу"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Арнайы мүмкіндіктер таңбашасы <xliff:g id="SERVICE_NAME">%1$s</xliff:g> қызметін қосты"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Арнайы мүмкіндіктер таңбашасы <xliff:g id="SERVICE_NAME">%1$s</xliff:g> қызметін өшірді"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"\"Арнайы мүмкіндіктер\" түймесін түрткенде пайдаланатын мүмкіндікті таңдаңыз:"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Жұмыс күндері кешке"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Демалыс күндері"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Оқиға"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Ұйқы режимі"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> үнін өшірген"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"There\'s an internal problem with your device. Contact your manufacturer for details."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD сұрауы DIAL сұрауына өзгертілді."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD сұрауы SS сұрауына өзгертілді."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD сұрауы жаңа USSD сұрауына өзгертілді."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD сұрауы бейне DIAL сұрауына өзгертілді."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS сұрауы DIAL сұрауына өзгертілді."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS сұрауы бейне DIAL сұрауына өзгертілді."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS сұрауы USSD сұрауына өзгертілді."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS сұрауы жаңа SS сұрауына өзгертілді."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Жұмыс профилі"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index edf3441a5388..b2778a1e179c 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"បិទ"</string> <string name="global_action_emergency" msgid="7112311161137421166">"អាសន្ន"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"របាយការណ៍កំហុស"</string> + <string name="global_action_logout" msgid="935179188218826050">"បញ្ចប់សម័យ"</string> <string name="bugreport_title" msgid="2667494803742548533">"យករបាយការណ៍កំហុស"</string> <string name="bugreport_message" msgid="398447048750350456">"វានឹងប្រមូលព័ត៌មានអំពីស្ថានភាពឧបករណ៍របស់អ្នក ដើម្បីផ្ញើជាសារអ៊ីមែល។ វានឹងចំណាយពេលតិចពីពេលចាប់ផ្ដើមរបាយការណ៍រហូតដល់ពេលវារួចរាល់ដើម្បីផ្ញើ សូមអត់ធ្មត់។"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"របាយការណ៍អន្តរកម្ម"</string> @@ -1500,6 +1501,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"បិទផ្លូវកាត់"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"ប្រើប្រាស់ផ្លូវកាត់"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"បញ្ច្រាសពណ៌"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"ការកែពណ៌"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ផ្លូវកាត់ភាពងាយស្រួលបានបើក <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ផ្លូវកាត់ភាពងាយស្រួលបានបិទ <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"ជ្រើសរើសមុខងារដែលត្រូវប្រើ នៅពេលដែលអ្នកចុចប៊ូតុងភាពងាយស្រួល៖"</string> @@ -1686,13 +1689,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"យប់ថ្ងៃធម្មតា"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"ចុងសប្ដាហ៍"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ព្រឹត្តិការណ៍"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"កំពុងដេក"</string> <string name="muted_by" msgid="6147073845094180001">"បានបិទសំឡេងដោយ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"មានបញ្ហាខាងក្នុងឧបករណ៍របស់អ្នក ហើយវាអ្នកមិនមានស្ថេរភាព រហូតទាល់តែអ្នកកំណត់ដូចដើមវិញទាំងស្រុង។"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"មានបញ្ហាខាងក្នុងឧបករណ៍របស់អ្នក ទំនាក់ទំនងក្រុមហ៊ុនផលិតឧបករណ៍របស់អ្នកសម្រាប់ព័ត៌មានបន្ថែម។"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"សំណើរ USSD ត្រូវបានកែសម្រួលទៅតាមសំណើរការហៅទូរស័ព្ទ។"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"សំណើរ USSD ត្រូវបានកែសម្រួលទៅតាមសំណើរ SS។"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"សំណើរ USSD ត្រូវបានកែសម្រួលទៅតាមសំណើរ USSD ថ្មី។្"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"សំណើ USSD ត្រូវបានកែសម្រួលទៅជាសំណើ Video DIAL ។"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"សំណើរ SS ត្រូវបានកែសម្រួលទៅតាមសំណើរការហៅទូរស័ព្ទ។"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"សំណើ SS ត្រូវបានកែសម្រួលទៅជាសំណើ Video DIAL ។"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"សំណើរ SS ត្រូវបានកែសម្រួលទៅតាមសំណើរ USSD។"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"សំណើរ SS ត្រូវបានកែសម្រួលទៅតាមសំណើរ SS ថ្មី។"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ប្រវត្តិរូបការងារ"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index ede8ebb82483..4485561754eb 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"ಪವರ್ ಆಫ್ ಮಾಡು"</string> <string name="global_action_emergency" msgid="7112311161137421166">"ತುರ್ತು"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ದೋಷದ ವರದಿ"</string> + <string name="global_action_logout" msgid="935179188218826050">"ಸೆಷನ್ ಅಂತ್ಯಗೊಳಿಸಿ"</string> <string name="bugreport_title" msgid="2667494803742548533">"ದೋಷ ವರದಿ ರಚಿಸಿ"</string> <string name="bugreport_message" msgid="398447048750350456">"ನಿಮ್ಮ ಸಾಧನದ ಪ್ರಸ್ತುತ ಸ್ಥಿತಿಯ ಕುರಿತು ಮಾಹಿತಿಯನ್ನು ಸಂಗ್ರಹಿಸಿಕೊಳ್ಳುವುದರ ಜೊತೆ ಇ-ಮೇಲ್ ರೂಪದಲ್ಲಿ ನಿಮಗೆ ರವಾನಿಸುತ್ತದೆ. ಇದು ದೋಷ ವರದಿಯನ್ನು ಪ್ರಾರಂಭಿಸಿದ ಸಮಯದಿಂದ ಅದನ್ನು ಕಳುಹಿಸುವವರೆಗೆ ಸ್ವಲ್ಪ ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ; ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದಿರಿ."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ಪರಸ್ಪರ ಸಂವಹನ ವರದಿ"</string> @@ -1499,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"ಶಾರ್ಟ್ಕಟ್ ಆಫ್ ಮಾಡಿ"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"ಶಾರ್ಟ್ಕಟ್ ಬಳಸಿ"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"ಬಣ್ಣ ವಿಲೋಮ"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"ಬಣ್ಣ ತಿದ್ದುಪಡಿ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್, <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಿದೆ"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ಪ್ರವೇಶಿಸುವಿಕೆ ಶಾರ್ಟ್ಕಟ್, <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡಿದೆ"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"ನೀವು ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ಬಳಸುವುದಕ್ಕಾಗಿ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆರಿಸಿ:"</string> @@ -1685,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ವಾರದ ರಾತ್ರಿ"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"ವಾರಾಂತ್ಯ"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ಈವೆಂಟ್"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"ಮಲಗುತ್ತಿದ್ದಾರೆ"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ಅವರಿಂದ ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ ಹಾಗೂ ನೀವು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾವನ್ನು ಮರುಹೊಂದಿಸುವರೆಗೂ ಅದು ಅಸ್ಥಿರವಾಗಬಹುದು."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಆಂತರಿಕ ಸಮಸ್ಯೆಯಿದೆ. ವಿವರಗಳಿಗಾಗಿ ನಿಮ್ಮ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD ವಿನಂತಿಯನ್ನು DIAL ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD ವಿನಂತಿಯನ್ನು SS ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD ವಿನಂತಿಯನ್ನು ಹೊಸ USSD ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS ವಿನಂತಿಯನ್ನು DIAL ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ವಿನಂತಿಯನ್ನು USSD ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ವಿನಂತಿಯನ್ನು ಹೊಸ SS ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 679ca7548a62..650d98050979 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"종료"</string> <string name="global_action_emergency" msgid="7112311161137421166">"긴급 전화"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"버그 신고"</string> + <string name="global_action_logout" msgid="935179188218826050">"세션 끝내기"</string> <string name="bugreport_title" msgid="2667494803742548533">"버그 신고"</string> <string name="bugreport_message" msgid="398447048750350456">"현재 기기 상태에 대한 정보를 수집하여 이메일 메시지로 전송합니다. 버그 신고를 시작하여 전송할 준비가 되려면 약간 시간이 걸립니다."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"대화형 보고서"</string> @@ -867,7 +868,7 @@ <item quantity="other">지난 <xliff:g id="COUNT_1">%d</xliff:g>일</item> <item quantity="one">지난 <xliff:g id="COUNT_0">%d</xliff:g>일</item> </plurals> - <string name="last_month" msgid="3959346739979055432">"지난 달"</string> + <string name="last_month" msgid="3959346739979055432">"지난달"</string> <string name="older" msgid="5211975022815554840">"이전"</string> <string name="preposition_for_date" msgid="9093949757757445117">"<xliff:g id="DATE">%s</xliff:g>"</string> <string name="preposition_for_time" msgid="5506831244263083793">"<xliff:g id="TIME">%s</xliff:g>"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"단축키 사용 중지"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"단축키 사용"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"색상 반전"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"색상 보정"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"접근성 단축키로 인해 <xliff:g id="SERVICE_NAME">%1$s</xliff:g>이(가) 사용 설정되었습니다."</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"접근성 단축키로 인해 <xliff:g id="SERVICE_NAME">%1$s</xliff:g>이(가) 사용 중지되었습니다."</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"접근성 버튼을 탭할 때 사용할 기능을 선택하세요."</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"평일 밤"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"주말"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"일정"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"수면 중"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>에서 알림음 음소거"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"사용 중인 기기 내부에 문제가 발생했습니다. 초기화할 때까지 불안정할 수 있습니다."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"사용 중인 기기 내부에 문제가 발생했습니다. 자세한 내용은 제조업체에 문의하세요."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD 요청이 DIAL 요청으로 수정됩니다."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD 요청이 SS 요청으로 수정됩니다."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD 요청이 새로운 USSD 요청으로 수정됩니다."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD 요청이 동영상 DIAL 요청으로 수정됩니다."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS 요청이 DIAL 요청으로 수정됩니다."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS 요청이 동영상 DIAL 요청으로 수정됩니다."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 요청이 USSD 요청으로 수정됩니다."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 요청이 새로운 SS 요청으로 수정됩니다."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"직장 프로필"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index daa824c5c764..e580a59a96b0 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Кубатын өчүрүү"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Тез жардам"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Ката тууралуу билдирүү"</string> + <string name="global_action_logout" msgid="935179188218826050">"Сессияны аяктоо"</string> <string name="bugreport_title" msgid="2667494803742548533">"Ката тууралуу билдирүү түзүү"</string> <string name="bugreport_message" msgid="398447048750350456">"Ушуну менен түзмөгүңүздүн учурдагы абалы тууралуу маалымат топтолуп, электрондук почта аркылуу жөнөтүлөт. Отчет даяр болгуча бир аз күтө туруңуз."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактивдүү кабар"</string> @@ -1500,6 +1501,8 @@ <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="color_inversion_feature_name" msgid="4231186527799958644">"Түстү инверсиялоо"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Түстү түзөтүү"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Атайын мүмкүнчүлүктөр кыска жолу <xliff:g id="SERVICE_NAME">%1$s</xliff:g> кызматын күйгүздү"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Атайын мүмкүнчүлүктөр кыска жолу <xliff:g id="SERVICE_NAME">%1$s</xliff:g> кызматын өчүрдү"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Атайын мүмкүнчүлүктөр баскычын таптаганыңызда иштетиле турган функцияны тандаңыз:"</string> @@ -1686,13 +1689,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Иш күндөрүнүн кечтери"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Дем алыш"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Иш-чара"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Уйку режими"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> тарабынан үнсүздөлдү"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Түзмөгүңүздө ички көйгөй бар жана ал баштапкы абалга кайтарылмайынча туруктуу иштебей коюшу мүмкүн."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Түзмөгүңүздө ички көйгөй бар. Анын чоо-жайын билүү үчүн өндүрүүчүңүзгө кайрылыңыз."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD сурамы DIAL сурамына өзгөртүлдү."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD сурамы SS сурамына өзгөртүлдү."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD сурамы жаңы USSD сурамына өзгөртүлдү."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD сурамы Видео DIAL сурамына өзгөртүлдү."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS сурамы DIAL сурамына өзгөртүлдү."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS сурамы Видео DIAL сурамына өзгөртүлдү."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS сурамы USSD сурамына өзгөртүлдү."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS сурамы жаңы SS сурамына өзгөртүлдү."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Жумуш профили"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 3cf1d1ed9a4b..feedbf30e35a 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"ປິດ"</string> <string name="global_action_emergency" msgid="7112311161137421166">"ສຸກເສີນ"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ລາຍງານຂໍ້ຜິດພາດ"</string> + <string name="global_action_logout" msgid="935179188218826050">"ສິ້ນສຸດເຊດຊັນ"</string> <string name="bugreport_title" msgid="2667494803742548533">"ໃຊ້ລາຍງານຂໍ້ບົກພ່ອງ"</string> <string name="bugreport_message" msgid="398447048750350456">"ນີ້ຈະເປັນການເກັບກຳຂໍ້ມູນກ່ຽວກັບ ສະຖານະປັດຈຸບັນຂອງອຸປະກອນທ່ານ ເພື່ອສົ່ງເປັນຂໍ້ຄວາມທາງອີເມວ. ມັນຈະໃຊ້ເວລາໜ້ອຍນຶ່ງ ໃນການເລີ່ມຕົ້ນການລາຍງານຂໍ້ຜິດພາດ ຈົນກວ່າຈະພ້ອມທີ່ຈະສົ່ງໄດ້, ກະລຸນາລໍຖ້າ."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ລາຍງານແບບໂຕ້ຕອບ"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"ປິດປຸ່ມລັດ"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"ໃຊ້ປຸ່ມລັດ"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"ການປີ້ນສີ"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"ການແກ້ໄຂຄ່າສີ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Accessibility Shortcut turned <xliff:g id="SERVICE_NAME">%1$s</xliff:g> on"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Accessibility Shortcut turned <xliff:g id="SERVICE_NAME">%1$s</xliff:g> off"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"ເລືອກຄຸນສົມບັດທີ່ຈະໃຊ້ເມື່ອທ່ານແຕະປຸ່ມການຊ່ວຍເຂົ້າເຖິງ:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ຄ່ຳຄືນໃນອາທິດ"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"ທ້າຍອາທິດ"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ການນັດໝາຍ"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"ການນອນ"</string> <string name="muted_by" msgid="6147073845094180001">"ຖືກປິດສຽງໂດຍ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"ມີບັນຫາພາຍໃນກັບອຸປະກອນຂອງທ່ານ, ແລະມັນອາດຈະບໍ່ສະຖຽນຈົນກວ່າທ່ານຕັ້ງເປັນຂໍ້ມູນໂຮງງານຄືນແລ້ວ."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"ມີບັນຫາພາຍໃນກັບອຸປະກອນຂອງທ່ານ. ຕິດຕໍ່ຜູ້ຜະລິດຂອງທ່ານສຳລັບລາຍລະອຽດຕ່າງໆ."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"ການຂໍ USSD ຖືກດັດແປງເປັນການຂໍ DIAL ແລ້ວ."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"ການຂໍ USSD ຖືກດັດແປງເປັນການຂໍ SS ແລ້ວ."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"ການຂໍ USSD ຖືກດັດແປງເປັນການຂໍ USSD ໃໝ່ແລ້ວ."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"ການຂໍ USSD ຖືກດັດແປງເປັນການຂໍ DIAL ວິດີໂອແລ້ວ."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"ການຂໍ SS ຖືກດັດແປງເປັນການຂໍ DIAL ແລ້ວ."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"ການຂໍ SS ຖືກດັດແປງເປັນການຂໍ DIAL ວິດີໂອແລ້ວ."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"ການຂໍ SS ຖືກດັດແປງເປັນການຂໍ USSD ແລ້ວ."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"ການຂໍ SS ຖືກດັດແປງເປັນການຂໍ SS ໃໝ່ແລ້ວ."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index e0d9771ed636..95e4862d3be9 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Išjungiamas maitinimas"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Skambutis pagalbos numeriu"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Pranešimas apie riktą"</string> + <string name="global_action_logout" msgid="935179188218826050">"Baigti seansą"</string> <string name="bugreport_title" msgid="2667494803742548533">"Pranešti apie riktą"</string> <string name="bugreport_message" msgid="398447048750350456">"Bus surinkta informacija apie dabartinę įrenginio būseną ir išsiųsta el. pašto pranešimu. Šiek tiek užtruks, kol pranešimas apie riktą bus paruoštas siųsti; būkite kantrūs."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interakt. ataskaita"</string> @@ -1546,6 +1547,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kai spartusis klavišas įjungtas, spaudžiant abu garsumo mygtukus 3 sekundes bus paleista pritaikymo neįgaliesiems funkcija.\n\n Dabartinė pritaikymo neįgaliesiems funkcija:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>„\n“\n Funkciją galite pakeisti skiltyje „Nustatymai“ > „Pritaikymas neįgaliesiems“."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Išjungti spartųjį klavišą"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Naudoti spartųjį klavišą"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Spalvų inversija"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Spalvų taisymas"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Pritaikymo neįgaliesiems sparčiuoju klavišu buvo įjungta „<xliff:g id="SERVICE_NAME">%1$s</xliff:g>“"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Pritaikymo neįgaliesiems sparčiuoju klavišu buvo išjungta „<xliff:g id="SERVICE_NAME">%1$s</xliff:g>“"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Pasirinkite funkciją, kuri bus naudojama, kai paliesite pritaikymo neįgaliesiems mygtuką:"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Darbo dienos vakarą"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Savaitgalį"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Įvykis"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Miegas"</string> <string name="muted_by" msgid="6147073845094180001">"Nutildė <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Iškilo vidinė su jūsų įrenginiu susijusi problema, todėl įrenginys gali veikti nestabiliai, kol neatkursite gamyklinių duomenų."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Iškilo vidinė su jūsų įrenginiu susijusi problema. Jei reikia išsamios informacijos, susisiekite su gamintoju."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD užklausa pakeista į DIAL užklausą."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD užklausa pakeista į SS užklausą."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD užklausa pakeista į naują USSD užklausą."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD užklausa pakeista į „Video DIAL“ užklausą."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS užklausa pakeista į DIAL užklausą."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS užklausa pakeista į „Video DIAL“ užklausą."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS užklausa pakeista į USSD užklausą."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS užklausa pakeista į naują SS užklausą."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Darbo profilis"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 573baf3d9fd8..12bb04b36a04 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -214,6 +214,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Strāvas padeve ir izslēgta."</string> <string name="global_action_emergency" msgid="7112311161137421166">"Ārkārtas"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Kļūdu ziņojums"</string> + <string name="global_action_logout" msgid="935179188218826050">"Beigt sesiju"</string> <string name="bugreport_title" msgid="2667494803742548533">"Kļūdu ziņojuma sagatavošana"</string> <string name="bugreport_message" msgid="398447048750350456">"Veicot šo darbību, tiks apkopota informācija par jūsu ierīces pašreizējo stāvokli un nosūtīta e-pasta ziņojuma veidā. Kļūdu ziņojuma pabeigšanai un nosūtīšanai var būt nepieciešams laiks. Lūdzu, esiet pacietīgs."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktīvs pārskats"</string> @@ -1522,6 +1523,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Ja saīsne ir iespējota, vienlaikus nospiežot abas skaļuma regulēšanas pogas un trīs sekundes turot tās, tiks palaista pieejamības funkcija.\n\n Pašreiz iestatītā pieejamības funkcija:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Šo funkciju var mainīt sadaļā Iestatījumi > Pieejamība."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Izslēgt saīsni"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Izmantot saīsni"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Krāsu inversija"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Krāsu korekcija"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Pieejamības saīsne aktivizēja lietotni <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Pieejamības saīsne deaktivizēja lietotni <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Izvēlieties funkciju, ko izmantot, kad pieskaraties pogai Pieejamība."</string> @@ -1717,13 +1720,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Darbadienas vakarā"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Nedēļas nogalē"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Pasākums"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Gulēšana"</string> <string name="muted_by" msgid="6147073845094180001">"Skaņu izslēdza <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Jūsu ierīcē ir radusies iekšēja problēma, un ierīce var darboties nestabili. Lai to labotu, veiciet rūpnīcas datu atiestatīšanu."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Jūsu ierīcē ir radusies iekšēja problēma. Lai iegūtu plašāku informāciju, lūdzu, sazinieties ar ražotāju."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD pieprasījums ir mainīts uz DIAL pieprasījumu."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD pieprasījums ir mainīts uz SS pieprasījumu."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD pieprasījums ir mainīts uz jaunu USSD pieprasījumu."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD pieprasījums ir mainīts uz Video DIAL pieprasījumu."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS pieprasījums ir mainīts uz DIAL pieprasījumu."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS pieprasījums ir mainīts uz Video DIAL pieprasījumu."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS pieprasījums ir mainīts uz USSD pieprasījumu."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS pieprasījums ir mainīts uz jaunu SS pieprasījumu."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Darba profils"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index d3fa3d1f066d..c5773f84f928 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Исклучи"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Итен случај"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Извештај за грешка"</string> + <string name="global_action_logout" msgid="935179188218826050">"Завршете ја сесијата"</string> <string name="bugreport_title" msgid="2667494803742548533">"Земи извештај за грешки"</string> <string name="bugreport_message" msgid="398447048750350456">"Ова ќе собира информации за моменталната состојба на вашиот уред, за да ги испрати како порака по е-пошта. Тоа ќе одземе малку време почнувајќи од извештајот за грешки додека не се подготви за праќање; бидете трпеливи."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактивен извештај"</string> @@ -1501,6 +1502,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Исклучи ја кратенката"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Користи кратенка"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Инверзија на бои"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Корекција на бои"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Кратенката за пристапност ја вклучи <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Кратенката за пристапност ја исклучи <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Изберете функција за користење кога ќе го допрете копчето за „Пристапност“."</string> @@ -1687,13 +1690,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Вечер од седмицата"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Викенд"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Настан"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Спиење"</string> <string name="muted_by" msgid="6147073845094180001">"Звукот го исклучи <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Настана внатрешен проблем со уредот и може да биде нестабилен сè додека не ресетирате на фабричките податоци."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Настана внатрешен проблем со уредот. Контактирајте го производителот за детали."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Барањето USSD е изменето во барање DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Барањето USSD е изменето во барање SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Барањето USSD е изменето во ново барање USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Барањето USSD е изменето во барање видео DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Барањето SS е изменето во барање DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Барањето SS е изменето во барање видео DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Барањето SS е изменето во барање USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Барањето SS е изменето во ново барање SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Работен профил"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 5f9f137b955d..2595f948bf6c 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"പവർ ഓഫാക്കുക"</string> <string name="global_action_emergency" msgid="7112311161137421166">"അടിയന്തിരാവശ്യം"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ബഗ് റിപ്പോർട്ട്"</string> + <string name="global_action_logout" msgid="935179188218826050">"സെഷൻ അവസാനിപ്പിക്കുക"</string> <string name="bugreport_title" msgid="2667494803742548533">"ബഗ് റിപ്പോർട്ട് എടുക്കുക"</string> <string name="bugreport_message" msgid="398447048750350456">"ഒരു ഇമെയിൽ സന്ദേശമായി അയയ്ക്കുന്നതിന്, ഇത് നിങ്ങളുടെ നിലവിലെ ഉപകരണ നിലയെക്കുറിച്ചുള്ള വിവരങ്ങൾ ശേഖരിക്കും. ബഗ് റിപ്പോർട്ട് ആരംഭിക്കുന്നതിൽ നിന്ന് ഇത് അയയ്ക്കാനായി തയ്യാറാകുന്നതുവരെ അൽപ്പസമയമെടുക്കും; ക്ഷമയോടെ കാത്തിരിക്കുക."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ഇന്റരാക്റ്റീവ് റിപ്പോർട്ട്"</string> @@ -1499,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"കുറുക്കുവഴി ഓഫാക്കുക"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"കുറുക്കുവഴി ഉപയോഗിക്കുക"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"വർണ്ണ വിപര്യയം"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"വർണ്ണം ക്രമീകരിക്കൽ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ഉപയോഗസഹായിക്കുള്ള കുറുക്കുവഴി <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ഓൺ ചെയ്തിരിക്കുന്നു"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ഉപയോഗസഹായിക്കുള്ള കുറുക്കുവഴി <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ഓഫ് ചെയ്തിരിക്കുന്നു"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"നിങ്ങൾ ഉപയോഗസഹായി ബട്ടൺ ടാപ്പുചെയ്യുമ്പോൾ ഉപയോഗിക്കുന്നതിന് ഒരു ഫീച്ചർ തിരഞ്ഞെടുക്കുക:"</string> @@ -1685,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"പ്രവൃത്തിദിനരാവ്"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"വാരാന്ത്യം"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ഇവന്റ്"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"ഉറക്കം"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>, മ്യൂട്ടുചെയ്തു"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഒരു ആന്തരിക പ്രശ്നമുണ്ട്, ഫാക്ടറി വിവര പുനഃസജ്ജീകരണം ചെയ്യുന്നതുവരെ ഇതു അസ്ഥിരമായിരിക്കാനിടയുണ്ട്."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"നിങ്ങളുടെ ഉപകരണത്തിൽ ഒരു ആന്തരിക പ്രശ്നമുണ്ട്. വിശദാംശങ്ങൾക്കായി നിർമ്മാതാവിനെ ബന്ധപ്പെടുക."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD അഭ്യർത്ഥന, DIAL അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD അഭ്യർത്ഥന, SS അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD അഭ്യർത്ഥന, പുതിയ USSD അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS അഭ്യർത്ഥന, DIAL അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS അഭ്യർത്ഥന, USSD അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS അഭ്യർത്ഥന, പുതിയ SS അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index 16681dc0ba2a..9f26a3b3eba8 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Унтраах"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Яаралтай тусламж"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Алдаа мэдээлэх"</string> + <string name="global_action_logout" msgid="935179188218826050">"Гаргах харилцан үйлдэл"</string> <string name="bugreport_title" msgid="2667494803742548533">"Согог репорт авах"</string> <string name="bugreport_message" msgid="398447048750350456">"Энэ таны төхөөрөмжийн одоогийн статусын талаарх мэдээллийг цуглуулах ба имэйл мессеж болгон илгээнэ. Алдааны мэдэгдлээс эхэлж илгээхэд бэлэн болоход хэсэг хугацаа зарцуулагдана тэвчээртэй байна уу."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактив тайлан"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Товчлолыг унтраах"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Товчлол ашиглах"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Өнгө хувиргалт"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Өнгөний засвар"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Хүртээмжийн товчлол <xliff:g id="SERVICE_NAME">%1$s</xliff:g>-г асаасан"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Хүртээмжийн товчлол <xliff:g id="SERVICE_NAME">%1$s</xliff:g>-г унтраасан"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Хүртээмжийн товчлуурыг товших үедээ ашиглах онцлогийг сонгоно уу:"</string> @@ -1682,13 +1685,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Ажлын өдрийн шөнө"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Амралтын өдөр"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Үйл явдал"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Идэвхгүй"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>-с хаасан"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Таны төхөөрөмжид дотоод алдаа байна.Та төхөөрөмжөө үйлдвэрээс гарсан төлөвт шилжүүлэх хүртэл таны төхөөрөмж чинь тогтворгүй байж болох юм."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Таны төхөөрөмжид дотоод алдаа байна. Дэлгэрэнгүй мэдээлэл авахыг хүсвэл үйлдвэрлэгчтэйгээ холбоо барина уу."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD хүсэлтийг DIAL хүсэлт болгон өөрчилсөн байна."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD хүсэлтийг SS хүсэлт болгон өөрчилсөн байна."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD хүсэлтийг шинэ USSD хүсэлт болгон өөрчилсөн байна."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD хүсэлтийг Видео DIAL хүсэлт болгон өөрчилсөн байна."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS хүсэлтийг DIAL хүсэлт болгон өөрчилсөн байна"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS хүсэлтийг Видео DIAL хүсэлт болгон өөрчилсөн байна."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS хүсэлтийг USSD хүсэлт болгон өөрчилсөн байна."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS хүсэлтийг шинэ SS хүсэлт болгон өөрчилсөн байна."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Ажлын профайл"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index bd00d46b6739..a75784988183 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -144,7 +144,7 @@ <string name="httpErrorAuth" msgid="1435065629438044534">"प्रमाणीकृत करू शकलो नाही."</string> <string name="httpErrorProxyAuth" msgid="1788207010559081331">"प्रॉक्सी सर्व्हरद्वारे प्रमाणीकरण यशस्वी झाले."</string> <string name="httpErrorConnect" msgid="8714273236364640549">"सर्व्हरशी कनेक्ट करू शकलो नाही."</string> - <string name="httpErrorIO" msgid="2340558197489302188">"या सर्व्हरशी संप्रेषण करू शकलो नाही. नंतर पुन्हा प्रयत्न करा."</string> + <string name="httpErrorIO" msgid="2340558197489302188">"या सर्व्हरशी संवाद प्रस्थापित करू शकलो नाही. नंतर पुन्हा प्रयत्न करा."</string> <string name="httpErrorTimeout" msgid="4743403703762883954">"सर्व्हरवरील कनेक्शन टाइमआउट झाले."</string> <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"पृष्ठामध्ये बरीच सर्व्हर पुनर्निर्देशने आहेत."</string> <string name="httpErrorUnsupportedScheme" msgid="5015730812906192208">"प्रोटोकॉल समर्थित नाही."</string> @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"बंद"</string> <string name="global_action_emergency" msgid="7112311161137421166">"आणीबाणी"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"बग रीपोर्ट"</string> + <string name="global_action_logout" msgid="935179188218826050">"सेशन समाप्त करा"</string> <string name="bugreport_title" msgid="2667494803742548533">"बग रीपोर्ट घ्या"</string> <string name="bugreport_message" msgid="398447048750350456">"ई-मेल संदेश म्हणून पाठविण्यासाठी, हे तुमच्या सद्य डिव्हाइस स्थितीविषयी माहिती संकलित करेल. बग रीपोर्ट सुरू करण्यापासून तो पाठविण्यापर्यंत थोडा वेळ लागेल; कृपया धीर धरा."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"परस्परसंवादी अहवाल"</string> @@ -361,13 +362,13 @@ <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"रोचक प्रसारणे पाठविण्यास अॅपला अनुमती देते, जे प्रसारण समाप्त झाल्यानंतर तसेच रहाते. अतिरिक्त वापर टीव्ही धीमा किंवा यासाठी बरीच मेमरी वापरली जात असल्यामुळे तो अस्थिर करू शकतो."</string> <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"रोचक प्रसारणे पाठविण्यासाठी अॅप ला अनुमती देते, जे प्रसारण समाप्त झाल्यानंतर देखील तसेच राहते. अत्याधिक वापरामुळे बरीच मेमरी वापरली जाऊन तो फोनला धीमा किंवा अस्थिर करू शकतो."</string> <string name="permlab_readContacts" msgid="8348481131899886131">"आपले संपर्क वाचा"</string> - <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"आपण कॉल केलेल्या, ईमेल केलेल्या किंवा विशिष्ट लोकांशी अन्य मार्गांनी संप्रेषण केलेल्या लोकांच्या फ्रिक्वेन्सीसह, आपल्या टॅब्लेटवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा वाचण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपला संपर्क डेटा जतन करण्याची अॅप्स ला अनुमती देते आणि दुर्भावनापूर्ण अॅप्स आपल्या माहितीशिवाय संपर्क डेटा सामायिक करू शकतात."</string> + <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"आपण कॉल केलेल्या, ईमेल केलेल्या किंवा विशिष्ट लोकांशी अन्य मार्गांनी संवाद प्रस्थापित केलेल्या लोकांच्या फ्रिक्वेन्सीसह, आपल्या टॅब्लेटवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा वाचण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपला संपर्क डेटा जतन करण्याची अॅप्स ला अनुमती देते आणि दुर्भावनापूर्ण अॅप्स आपल्या माहितीशिवाय संपर्क डेटा सामायिक करू शकतात."</string> <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"आपण विशिष्ट लोकांना इतर मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संप्रेषित केलेल्या फ्रिक्वेन्सीसह, आपल्या टीव्हीवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा वाचण्यासाठी अॅप्सला अनुमती देतात. ही परवागनी अॅप्सला आपला संपर्क डेटा जतन करण्यासाठी अनुमती देते आणि दुर्भावनापूर्ण अॅप्स आपल्याला न कळविता संपर्क डेटा सामायिक करू शकतात."</string> - <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"आपण कॉल केलेल्या, ईमेल केलेल्या किंवा विशिष्ट लोकांशी अन्य मार्गांनी संप्रेषण केलेल्या लोकांच्या फ्रिक्वेन्सीसह, आपल्या फोनवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा वाचण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपला संपर्क डेटा जतन करण्याची अॅप्स ला अनुमती देते आणि दुर्भावनापूर्ण अॅप्स आपल्या माहितीशिवाय संपर्क डेटा सामायिक करू शकतात."</string> + <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"आपण कॉल केलेल्या, ईमेल केलेल्या किंवा विशिष्ट लोकांशी अन्य मार्गांनी संवाद प्रस्थापित केलेल्या लोकांच्या फ्रिक्वेन्सीसह, आपल्या फोनवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा वाचण्यासाठी अॅप ला अनुमती देते. ही परवानगी आपला संपर्क डेटा जतन करण्याची अॅप्स ला अनुमती देते आणि दुर्भावनापूर्ण अॅप्स आपल्या माहितीशिवाय संपर्क डेटा सामायिक करू शकतात."</string> <string name="permlab_writeContacts" msgid="5107492086416793544">"आपले संपर्क सुधारित करा"</string> - <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संप्रेषण केलेल्या फ्रिक्वेन्सीसह, आपल्या टॅब्लेटवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅप ला अनुमती देते."</string> - <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संप्रेषण केलेल्या फ्रिक्वेन्सीसह, आपल्या टीव्हीवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅपला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅपला अनुमती देते."</string> - <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संप्रेषण केलेल्या फ्रिक्वेन्सीसह, आपल्या फोनवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संवाद प्रस्थापित केलेल्या फ्रिक्वेन्सीसह, आपल्या टॅब्लेटवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅप ला अनुमती देते."</string> + <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संवाद प्रस्थापित केलेल्या फ्रिक्वेन्सीसह, आपल्या टीव्हीवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅपला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅपला अनुमती देते."</string> + <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"आपण विशिष्ट संपर्कांशी अन्य मार्गांनी कॉल केलेल्या, ईमेल केलेल्या किंवा संवाद प्रस्थापित केलेल्या फ्रिक्वेन्सीसह, आपल्या फोनवर संचयित केलेल्या आपल्या संपर्कांविषयीचा डेटा सुधारित करण्यासाठी अॅप ला अनुमती देते. ही परवानगी संपर्क डेटा हटविण्यासाठी अॅप ला अनुमती देते."</string> <string name="permlab_readCallLog" msgid="3478133184624102739">"कॉल लॉग वाचा"</string> <string name="permdesc_readCallLog" msgid="3204122446463552146">"हा अॅप आपला कॉल इतिहास वाचू शकता."</string> <string name="permlab_writeCallLog" msgid="8552045664743499354">"कॉल लॉग लिहा"</string> @@ -1051,8 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"सिस्टम सेटिंग्ज > Apps > डाउनलोड केलेले मध्ये हे पुन्हा-सक्षम करा."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> वर्तमान डिस्प्ले आकार सेटिंगला समर्थन देत नाही आणि अनपेक्षित वर्तन करू शकते."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"नेहमी दर्शवा"</string> - <!-- no translation found for unsupported_compile_sdk_message (4253168368781441759) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> हे Android OS च्या विसंगत आवृत्तीसाठी तयार केले होते आणि ते अनपेक्षित पद्धतीने काम करू शकते. अॅपची अपडेट केलेली आवृत्ती उपलब्ध असू शकते."</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"नेहमी दर्शवा"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"अपडेट आहे का ते तपासा"</string> <string name="smv_application" msgid="3307209192155442829">"अॅप <xliff:g id="APPLICATION">%1$s</xliff:g> (प्रक्रिया <xliff:g id="PROCESS">%2$s</xliff:g>) ने तिच्या स्वयं-लागू केलेल्या StrictMode धोरणाचे उल्लंघन केले आहे."</string> @@ -1500,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"शॉर्टकट बंद करा"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"शॉर्टकट वापरा"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"रंगांची उलटापालट"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"रंग सुधारणा"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"प्रवेशयोग्यता शॉर्टकटने <xliff:g id="SERVICE_NAME">%1$s</xliff:g> चालू केली"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"प्रवेशयोग्यता शॉर्टकटने <xliff:g id="SERVICE_NAME">%1$s</xliff:g> बंद केली"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"आपण प्रवेशयोग्यता बटण दाबल्यावर वापरण्यासाठी वैशिष्ट्य निवडा:"</string> @@ -1639,8 +1641,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> - <!-- no translation found for battery_saver_description (5394663545060026162) --> - <skip /> + <string name="battery_saver_description" msgid="5394663545060026162">"बॅटरी लाइफ सुधारण्यासाठी, बॅटरी सेव्हर तुमच्या डिव्हाइस ची कामगिरी कमी करतो आणि कंपन, स्थान सेवा आणि बराचसा पार्श्वभूमी डेटा मर्यादित करतो. सिंकवर अवलंबून असणारे ईमेल, मेसेजिंग आणि इतर अॅप्स तुम्ही उघडल्याशिवाय अपडेट होऊ शकत नाहीत.\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> @@ -1687,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"आठवड्याची शेवटची रात्र"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"आठवड्याच्या शेवटी"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"इव्हेंट"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"झोपलेले आहे"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारे नि:शब्द केले"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"आपल्या डिव्हाइसमध्ये अंतर्गत समस्या आहे आणि आपला फॅक्टरी डेटा रीसेट होईपर्यंत ती अस्थिर असू शकते."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"आपल्या डिव्हाइसमध्ये अंतर्गत समस्या आहे. तपशीलांसाठी आपल्या निर्मात्याशी संपर्क साधा."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD विनंती डायल विनंतीवर सुधारित केली आहे."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD विनंती SS विनंतीवर सुधारित केली आहे."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD विनंती नवीन USSD विनंतीवर सुधारित केली आहे."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD विनंतीमध्ये बदल करून ती व्हिडिओ डायल विनंतीमध्ये बदलली आहे."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS विनंती डायल विनंतीवर सुधारित केली आहे."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS विनंतीमध्ये बदल करून ती व्हिडिओ डायल विनंतीमध्ये बदलली आहे."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS विनंती USSD विनंतीवर सुधारित केली आहे."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS विनंती नवीन SS विनंतीवर सुधारित केली आहे."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"कार्य प्रोफाईल"</string> @@ -1749,7 +1753,7 @@ <string name="app_category_audio" msgid="1659853108734301647">"संगीत आणि ऑडिओ"</string> <string name="app_category_video" msgid="2728726078629384196">"चित्रपट आणि व्हिडिओ"</string> <string name="app_category_image" msgid="4867854544519846048">"फोटो आणि इमेज"</string> - <string name="app_category_social" msgid="5842783057834965912">"सामाजिक आणि संप्रेषण"</string> + <string name="app_category_social" msgid="5842783057834965912">"सामाजिक आणि संवाद प्रस्थापित"</string> <string name="app_category_news" msgid="7496506240743986873">"बातम्या आणि मासिके"</string> <string name="app_category_maps" msgid="5878491404538024367">"नकाशे आणि नेव्हिगेशन"</string> <string name="app_category_productivity" msgid="3742083261781538852">"उत्पादनक्षमता"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 26837b3ff15e..aee2000e7498 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Matikan kuasa"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Kecemasan"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Laporan pepijat"</string> + <string name="global_action_logout" msgid="935179188218826050">"Tamatkan sesi"</string> <string name="bugreport_title" msgid="2667494803742548533">"Ambil laporan pepijat"</string> <string name="bugreport_message" msgid="398447048750350456">"Ini akan mengumpul maklumat tentang keadaan peranti semasa anda untuk dihantarkan sebagai mesej e-mel. Harap bersabar, mungkin perlu sedikit masa untuk memulakan laporan sehingga siap untuk dihantar."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Laporan interaktif"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Apabila pintasan dihidupkan, tindakan menekan kedua-dua butang kelantangan selama 3 saat akan memulakan ciri kebolehaksesan.\n\n Ciri kebolehaksesan semasa:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Anda boleh menukar ciri itu dalam Tetapan > Kebolehaksesan."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Matikan pintasan"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Gunakan Pintasan"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Penyongsangan Warna"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Pembetulan Warna"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Pintasan kebolehaksesan menghidupkan <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Pintasan Kebolehaksesan mematikan <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Pilih ciri yang hendak digunakan apabila anda mengetik butang Kebolehaksesan:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Malam selain hujung minggu"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Hujung minggu"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Acara"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Tidur"</string> <string name="muted_by" msgid="6147073845094180001">"Diredam oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Terdapat masalah dalaman dengan peranti anda. Peranti mungkin tidak stabil sehingga anda membuat tetapan semula data kilang."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Terdapat masalah dalaman dengan peranti anda. Hubungi pengilang untuk mengetahui butirannya."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Permintaan USSD diubah kepada permintaan DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Permintaan USSD diubah kepada permintaan SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Permintaan USSD diubah kepada permintaan USSD baharu."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Permintaan USSD diubah suai kepada permintaan DAIL Video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Permintaan SS diubah kepada permintaan DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Permintaan SS diubah suai kepada permintaan DAIL Video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Permintaan SS diubah kepada permintaan USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Permintaan SS diubah kepada permintaan SS baharu."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil kerja"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 0a2118ea1f19..fec37abed6a4 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"ပါဝါပိတ်ရန်"</string> <string name="global_action_emergency" msgid="7112311161137421166">"အရေးပေါ်"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"အမှားရှာဖွေပြင်ဆင်မှုမှတ်တမ်း"</string> + <string name="global_action_logout" msgid="935179188218826050">"သတ်မှတ်ပေးထားသည့်အချိန် ပြီးဆုံးပြီ"</string> <string name="bugreport_title" msgid="2667494803742548533">"အမှားရှာဖွေပြင်ဆင်မှုမှတ်တမ်းအား ယူရန်"</string> <string name="bugreport_message" msgid="398447048750350456">"သင့်ရဲ့ လက်ရှိ စက်အခြေအနေ အချက်အလက်များကို အီးမေးလ် အနေဖြင့် ပေးပို့ရန် စုဆောင်းပါမည်။ အမှားရှာဖွေပြင်ဆင်မှုမှတ်တမ်းမှ ပေးပို့ရန် အသင့်ဖြစ်သည်အထိ အချိန် အနည်းငယ်ကြာမြင့်မှာ ဖြစ်သဖြင့် သည်းခံပြီး စောင့်ပါရန်"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"လက်ငင်းတုံ့ပြန်နိုင်သည့် အစီရင်ခံချက်"</string> @@ -1499,6 +1500,8 @@ <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="color_inversion_feature_name" msgid="4231186527799958644">"အရောင် ပြောင်းပြန်လှန်ခြင်း"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"အရောင်ပြင်ဆင်ခြင်း"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်းလင့်ခ်သည် <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ကို ဖွင့်လိုက်ပါသည်"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်းလင့်ခ်သည် <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ကို ပိတ်လိုက်ပါသည်"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"အများသုံးစွဲနိုင်မှု ခလုတ်ကို တို့သည့်အခါ အသုံးပြုမည့် ဝန်ဆောင်မှုကို ရွေးချယ်ပါ−"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ကြားရက်ည"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"စနေ၊ တနင်္ဂနွေ"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ဖြစ်ရပ်"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"အိပ်နေချိန်"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> အသံပိတ်သည်"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"သင့်ကိရိယာအတွင်းပိုင်းတွင် ပြဿနာရှိနေပြီး၊ မူလစက်ရုံထုတ်အခြေအနေအဖြစ် ပြန်လည်ရယူနိုင်သည်အထိ အခြေအနေမတည်ငြိမ်နိုင်ပါ။"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"သင့်ကိရိယာအတွင်းပိုင်းတွင် ပြဿနာရှိနေ၏။ အသေးစိတ်သိရန်အတွက် ပစ္စည်းထုတ်လုပ်သူအား ဆက်သွယ်ပါ။"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"DIAL တောင်းဆိုချက်အရ USSD တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"SS တောင်းဆိုချက် အရ USSD တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD တောင်းဆိုချက် အသစ်အရ USSD တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD တောင်းဆိုချက်အား Video DIAL တောင်းဆိုချက်သို့ ပြုပြင်ထားသည်။"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"DIAL တောင်းဆိုချက်အရ SS တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS တောင်းဆိုချက်အား Video DIAL တောင်းဆိုချက်သို့ ပြုပြင်ထားသည်။"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"USSD တောင်းဆိုချက်အရ SS တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS တောင်းဆိုချက်အရ SS တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"အလုပ်ကိုယ်ရေးအချက်အလက်"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 98535c5bba5b..915701c55743 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Slå av"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Nødsituasjon"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Feilrapport"</string> + <string name="global_action_logout" msgid="935179188218826050">"Avslutt økten"</string> <string name="bugreport_title" msgid="2667494803742548533">"Utfør feilrapport"</string> <string name="bugreport_message" msgid="398447048750350456">"Informasjon om tilstanden til enheten din samles inn og sendes som en e-post. Det tar litt tid fra du starter feilrapporten til e-posten er klar, så vær tålmodig."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiv rapport"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Når snarveien er på, starter en tilgjengelighetsfunksjon når du trykker inn begge volumknappene i tre sekunder.\n\n Nåværende tilgjengelighetsfunksjon:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kan endre funksjonen i Innstillinger > Tilgjengelighet."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Slå av snarveien"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Bruk snarveien"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Fargeinvertering"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Fargekorrigering"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Snarveien for tilgjengelighet slo på <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Snarveien for tilgjengelighet slo av <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Velg en funksjon du vil bruke når du trykker på Tilgjengelighet-knappen:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Hverdagskveld"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Helg"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Aktivitet"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sover"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har kuttet lyden"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Det har oppstått et internt problem på enheten din, og den kan være ustabil til du tilbakestiller den til fabrikkdata."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Det har oppstått et internt problem på enheten din. Ta kontakt med produsenten for mer informasjon."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-forespørselen er endret til en RINGE-forespørsel."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-forespørselen er endret til en SS-forespørsel."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-forespørsel er endret til en ny USSD-forespørsel."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-forespørselen er endret til en RINGE-forespørsel med video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-forespørselen er endret til en RINGE-forespørsel."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-forespørselen er endret til en RINGE-forespørsel med video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-forespørselen er endret til en USSD-forespørsel."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-forespørselen er endret til en ny SS-forespørsel."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Arbeidsprofil"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index f9016de880e3..9223c7686fde 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"बन्द गर्नुहोस्"</string> <string name="global_action_emergency" msgid="7112311161137421166">"आपतकालीन"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"बग रिपोर्ट"</string> + <string name="global_action_logout" msgid="935179188218826050">"सत्रको अन्त्य गर्नुहोस्"</string> <string name="bugreport_title" msgid="2667494803742548533">"बग रिपोर्ट लिनुहोस्"</string> <string name="bugreport_message" msgid="398447048750350456">"एउटा इमेल सन्देशको रूपमा पठाउनलाई यसले तपाईँको हालैको उपकरणको अवस्थाको बारेमा सूचना जम्मा गर्ने छ। बग रिपोर्ट सुरु गरेदेखि पठाउन तयार नभएसम्म यसले केही समय लिन्छ; कृपया धैर्य गर्नुहोस्।"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"अन्तरक्रियामूलक रिपोर्ट"</string> @@ -1504,6 +1505,8 @@ <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="color_inversion_feature_name" msgid="4231186527799958644">"रङ्ग उल्टाउने सुविधा"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"रङ सच्याउने सुविधा"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"पहुँचको सर्टकटले <xliff:g id="SERVICE_NAME">%1$s</xliff:g> लाई सक्रिय पार्यो"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"पहुँचको सर्टकटले <xliff:g id="SERVICE_NAME">%1$s</xliff:g> लाई निष्क्रिय पार्यो"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"तपाईंले पहुँच सम्बन्धी बटनलाई ट्याप गर्दा प्रयोग गर्नुपर्ने सुविधा रोज्नुहोस्:"</string> @@ -1690,13 +1693,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"हरेक हप्तादिनको राति"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"शनिबार"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"घटना"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"शयन अवस्था"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा मौन गरिएको"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"तपाईंको यन्त्रसँग आन्तरिक समस्या छ, र तपाईंले फ्याक्ट्री डाटा रिसेट नगर्दासम्म यो अस्थिर रहन्छ।"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"तपाईंको यन्त्रसँग आन्तरिक समस्या छ। विवरणहरूको लागि आफ्नो निर्मातासँग सम्पर्क गर्नुहोस्।"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD अनुरोध DIAL अनुरोधमा परिमार्जन गरिएको छ।"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD अनुरोध SS अनुरोधमा परिमार्जन गरिएको छ।"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD अनुरोध नयाँ USSD अनुरोधमा परिमार्जन गरिएको छ।"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD अनुरोधलाई भिडियो DIAL अनुरोधमा परिमार्जन गरियो।"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS अनुरोध DIAL अनुरोधमा परिमार्जन गरिएको छ।"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS अनुरोधलाई भिडियो DIAL अनुरोधमा परिमार्जन गरियो।"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS अनुरोध USSD अनुरोधमा परिमार्जन गरिएको छ।"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS अनुरोध नयाँ SS अनुरोधमा परिमार्जन गरिएको छ।"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"कार्य प्रोफाइल"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index b06728a187fe..5ae838e13fa4 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Uitschakelen"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Noodgeval"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Bugrapport"</string> + <string name="global_action_logout" msgid="935179188218826050">"Sessie beëindigen"</string> <string name="bugreport_title" msgid="2667494803742548533">"Bugrapport genereren"</string> <string name="bugreport_message" msgid="398447048750350456">"Hiermee worden gegevens over de huidige status van je apparaat verzameld en als e-mail verzonden. Wanneer u een bugrapport start, duurt het even voordat het kan worden verzonden. Even geduld alstublieft."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interactief rapport"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Wanneer de snelkoppeling is ingeschakeld, kun je drie seconden op beide volumeknoppen drukken om een toegankelijkheidsfunctie te starten.\n\n Huidige toegankelijkheidsfunctie:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Je kunt de functie wijzigen in Instellingen > Toegankelijkheid."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Sneltoets uitschakelen"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Sneltoets gebruiken"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Kleurinversie"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Kleurcorrectie"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"\'Snelle link voor toegankelijkheid\' heeft <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ingeschakeld"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"\'Snelle link voor toegankelijkheid\' heeft <xliff:g id="SERVICE_NAME">%1$s</xliff:g> uitgeschakeld"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Kies een functie om te gebruiken wanneer je op de knop Toegankelijkheid tikt:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Doordeweekse avond"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evenement"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Slapen"</string> <string name="muted_by" msgid="6147073845094180001">"Gedempt door <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Er is een intern probleem met je apparaat. Het apparaat kan instabiel zijn totdat u het apparaat terugzet naar de fabrieksinstellingen."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Er is een intern probleem met je apparaat. Neem contact op met de fabrikant voor meer informatie."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-verzoek is gewijzigd in DIAL-verzoek."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-verzoek is gewijzigd in SS-verzoek."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-verzoek is gewijzigd in nieuw USSD-verzoek."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-verzoek is gewijzigd in Video DIAL-verzoek."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-verzoek is gewijzigd in DIAL-verzoek."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-verzoek is gewijzigd in Video DIAL-verzoek."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-verzoek is gewijzigd in USSD-verzoek."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-verzoek is gewijzigd in nieuw SS-verzoek."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Werkprofiel"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index b5811ace65f7..283701e4ef53 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"ਪਾਵਰ ਬੰਦ"</string> <string name="global_action_emergency" msgid="7112311161137421166">"ਸੰਕਟਕਾਲ"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ਬਗ ਰਿਪੋਰਟ"</string> + <string name="global_action_logout" msgid="935179188218826050">"ਸੈਸ਼ਨ ਸਮਾਪਤ ਕਰੋ"</string> <string name="bugreport_title" msgid="2667494803742548533">"ਬਗ ਰਿਪੋਰਟ ਲਓ"</string> <string name="bugreport_message" msgid="398447048750350456">"ਇਹ ਇੱਕ ਈਮੇਲ ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ, ਤੁਹਾਡੇ ਵਰਤਮਾਨ ਡੀਵਾਈਸ ਬਾਰੇ ਜਾਣਕਾਰੀ ਇਕੱਠੀ ਕਰੇਗਾ। ਬੱਗ ਰਿਪੋਰਟ ਸ਼ੁਰੂ ਕਰਨ ਵਿੱਚ ਥੋੜ੍ਹਾ ਸਮਾਂ ਲੱਗੇਗਾ ਜਦੋਂ ਤੱਕ ਇਹ ਭੇਜੇ ਜਾਣ ਲਈ ਤਿਆਰ ਨਾ ਹੋਵੇ, ਕਿਰਪਾ ਕਰਕੇ ਧੀਰਜ ਰੱਖੋ।"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ਅੰਤਰਕਿਰਿਆਤਮਕ ਰਿਪੋਰਟ"</string> @@ -1051,8 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ > ਐਪਾਂ > ਡਾਊਨਲੋਡ ਕੀਤਿਆਂ ਵਿੱਚ ਇਸਨੂੰ ਮੁੜ-ਸਮਰੱਥ ਬਣਾਓ।"</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵਰਤਮਾਨ ਡਿਸਪਲੇ ਆਕਾਰ ਸੈਟਿੰਗ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ ਹੈ ਅਤੇ ਅਣਕਿਆਸੇ ਤੌਰ \'ਤੇ ਵਿਹਾਰ ਕਰ ਸਕਦੀ ਹੈ।"</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"ਹਮੇਸ਼ਾ ਦਿਖਾਓ"</string> - <!-- no translation found for unsupported_compile_sdk_message (4253168368781441759) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ Android OS ਦਾ ਇੱਕ ਗੈਰ-ਅਨੁਕੂਲ ਵਰਜਨ ਬਣਾਇਆ ਗਿਆ ਸੀ ਅਤੇ ਅਣਕਿਆਸੇ ਤੌਰ \'ਤੇ ਵਿਹਾਰ ਕਰ ਸਕਦੀ ਹੈ। ਐਪ ਦਾ ਇੱਕ ਅੱਪਡੇਟ ਕੀਤਾ ਹੋਇਆ ਵਰਜਨ ਉਪਲਬਧ ਹੋ ਸਕਦਾ ਹੈ।"</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"ਹਮੇਸਾਂ ਦਿਖਾਓ"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"ਅੱਪਡੇਟ ਦੀ ਜਾਂਚ ਕਰੋ"</string> <string name="smv_application" msgid="3307209192155442829">"ਐਪ <xliff:g id="APPLICATION">%1$s</xliff:g> (ਪ੍ਰਕਿਰਿਆ <xliff:g id="PROCESS">%2$s</xliff:g>) ਨੇ ਆਪਣੀ ਖੁਦ-ਲਾਗੂ ਕੀਤੀ ਸਟ੍ਰਿਕਟਮੋਡ ਨੀਤੀ ਦੀ ਉਲੰਘਣਾ ਕੀਤੀ ਹੈ।"</string> @@ -1500,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"ਸ਼ਾਰਟਕੱਟ ਬੰਦ ਕਰੋ"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"ਸ਼ਾਰਟਕੱਟ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"ਰੰਗ ਦੀ ਉਲਟੀ ਤਰਤੀਬ"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"ਰੰਗ ਸੁਧਾਈ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ ਨੇ <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ ਨੇ <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕੀਤਾ"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਟੈਪ ਕੀਤੇ ਜਾਣ \'ਤੇ ਵਰਤਣ ਲਈ ਕੋਈ ਵਿਸ਼ੇਸ਼ਤਾ ਚੁਣੋ:"</string> @@ -1639,8 +1641,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> - <!-- no translation found for battery_saver_description (5394663545060026162) --> - <skip /> + <string name="battery_saver_description" msgid="5394663545060026162">"ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਨ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਦਰਸ਼ਨ ਘਟਾਉਂਦਾ ਹੈ ਅਤੇ ਥਰਥਰਾਹਟ, ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਅਤੇ ਜ਼ਿਆਦਾਤਰ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟੇ ਨੂੰ ਸੀਮਤ ਕਰਦਾ ਹੈ। ਈਮੇਲ, ਸੁਨੇਹਾ ਭੇਜਣ ਅਤੇ ਹੋਰ ਐਪਾਂ, ਜੋ ਸਮਕਾਲੀਕਰਨ \'ਤੇ ਨਿਰਭਰ ਹਨ, ਉਹ ਉਦੋਂ ਤੱਕ ਅੱਪਡੇਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਖੋਲ੍ਹਦੇ ਨਹੀਂ।\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> @@ -1687,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ਵੀਕਨਾਈਟ"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"ਹਫ਼ਤੇ ਦਾ ਅੰਤਲਾ ਦਿਨ"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ਇਵੈਂਟ"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"ਸੌਣ ਵੇਲੇ"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ਵੱਲੋਂ ਮਿਊਟ ਕੀਤਾ ਗਿਆ"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨਾਲ ਇੱਕ ਅੰਦਰੂਨੀ ਸਮੱਸਿਆ ਹੈ ਅਤੇ ਇਹ ਅਸਥਿਰ ਹੋ ਸਕਦੀ ਹੈ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਨਹੀਂ ਕਰਦੇ।"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨਾਲ ਇੱਕ ਅੰਦਰੂਨੀ ਸਮੱਸਿਆ ਸੀ। ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਨਿਰਮਾਤਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD ਬੇਨਤੀ DIAL ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD ਬੇਨਤੀ SS ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD ਬੇਨਤੀ ਨਵੀਂ USSD ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS ਬੇਨਤੀ DIAL ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ਬੇਨਤੀ USSD ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ਬੇਨਤੀ ਨਵੀਂ SS ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 9e8fb3c71fe1..77d706ae2996 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Wyłącz"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Alarmowy"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Zgłoszenie błędu"</string> + <string name="global_action_logout" msgid="935179188218826050">"Zakończ sesję"</string> <string name="bugreport_title" msgid="2667494803742548533">"Zgłoś błąd"</string> <string name="bugreport_message" msgid="398447048750350456">"Informacje o bieżącym stanie urządzenia zostaną zebrane i wysłane e-mailem. Przygotowanie zgłoszenia błędu do wysłania chwilę potrwa, więc zachowaj cierpliwość."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Raport interaktywny"</string> @@ -1546,6 +1547,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Gdy skrót jest włączony, jednoczesne naciśnięcie przez trzy sekundy obu klawiszy sterowania głośnością uruchomi funkcję ułatwień dostępu.\n\nBieżąca funkcja ułatwień dostępu:\n<xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\nFunkcję możesz zmienić, wybierając Ustawienia > Ułatwienia dostępu."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Wyłącz skrót"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Użyj skrótu"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inwersja kolorów"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Korekcja kolorów"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Skrót ułatwień dostępu wyłączył usługę <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Skrót ułatwień dostępu wyłączył usługę <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Wybierz funkcję używaną po kliknięciu przycisku ułatwień dostępu."</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noc poza weekendem"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Wydarzenie"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sen"</string> <string name="muted_by" msgid="6147073845094180001">"Ściszone przez: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"W Twoim urządzeniu wystąpił problem wewnętrzny. Może być ono niestabilne, dopóki nie przywrócisz danych fabrycznych."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"W Twoim urządzeniu wystąpił problem wewnętrzny. Skontaktuj się z jego producentem, by otrzymać szczegółowe informacje."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Żądanie USSD zostało zmienione na żądanie DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Żądanie USSD zostało zmienione na żądanie SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Żądanie USSD zostało zmienione na nowe żądanie USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Żądanie USSD zostało zmienione na żądanie Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Żądanie SS zostało zmienione na żądanie DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Żądanie SS zostało zmienione na żądanie Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Żądanie SS zostało zmienione na żądanie USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Żądanie SS zostało zmienione na nowe żądanie SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil do pracy"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index a6b389e139e4..cce4bf0bcdc3 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Desligar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergência"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Relatório de bugs"</string> + <string name="global_action_logout" msgid="935179188218826050">"Finalizar sessão"</string> <string name="bugreport_title" msgid="2667494803742548533">"Obter relatório de bugs"</string> <string name="bugreport_message" msgid="398447048750350456">"Isto coletará informações sobre o estado atual do dispositivo para enviá-las em uma mensagem de e-mail. Após iniciar o relatório de bugs, será necessário aguardar algum tempo até que esteja pronto para ser enviado."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Relatório interativo"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quando o atalho está ativado, pressione os dois botões de volume por três segundos para iniciar um recurso de acessibilidade.\n\n Recurso de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n É possível alterar o recurso em Configurações > Acessibilidade."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desativar atalho"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Usar atalho"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversão de cores"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correção de cor"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"O atalho de acessibilidade ativou o <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"O atalho de acessibilidade desativou o <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Escolha um recurso a ser usado ao tocar no botão Acessibilidade:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Durante a semana à noite"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Dormindo"</string> <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Há um problema interno com seu dispositivo. Ele pode ficar instável até que você faça a redefinição para configuração original."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Há um problema interno com seu dispositivo. Entre em contato com o fabricante para saber mais detalhes."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"A solicitação USSD foi modificada para a solicitação DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"A solicitação USSD foi modificada para a solicitação SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"A solicitação USSD foi modificada para a nova solicitação USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"A solicitação USSD foi modificada para a solicitação DIAL de vídeo."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"A solicitação SS foi modificada para a solicitação DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"A solicitação SS foi modificada para a solicitação DIAL de vídeo."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"A solicitação SS foi modificada para a solicitação USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"A solicitação SS foi modificada para a nova solicitação SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabalho"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 3329961c4e26..434b50b99800 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -212,8 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Desligar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergência"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Relatório de erros"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"Terminar sessão"</string> <string name="bugreport_title" msgid="2667494803742548533">"Criar relatório de erros"</string> <string name="bugreport_message" msgid="398447048750350456">"Será recolhida informação sobre o estado atual do seu dispositivo a enviar através de uma mensagem de email. Demorará algum tempo até que o relatório de erro esteja pronto para ser enviado. Aguarde um pouco."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Relatório interativo"</string> @@ -1500,10 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quando o atalho está ativado, premir ambos os botões de volume durante 3 segundos inicia uma funcionalidade de acessibilidade.\n\n Funcionalidade de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Pode alterar a funcionalidade em Definições > Acessibilidade."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desativar atalho"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utilizar atalho"</string> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversão de cores"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correção da cor"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"O Atalho de acessibilidade ativou o serviço <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"O Atalho de acessibilidade desativou o serviço <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Escolha uma funcionalidade para utilizar quando tocar no botão Acessibilidade:"</string> @@ -1690,15 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Dias da semana à noite"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"A dormir"</string> <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Existe um problema interno no seu dispositivo e pode ficar instável até efetuar uma reposição de dados de fábrica."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Existe um problema interno no seu dispositivo. Contacte o fabricante para obter mais informações."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"O pedido USSD foi modificado para um pedido DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"O pedido USSD foi modificado para um pedido SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"O pedido USSD foi modificado para um novo pedido USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"O pedido USSD foi modificado para um pedido Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"O pedido SS foi modificado para um pedido DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"O pedido SS foi modificado para um pedido Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"O pedido SS foi modificado para um pedido USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"O pedido SS foi modificado para um novo pedido SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabalho"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index a6b389e139e4..cce4bf0bcdc3 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Desligar"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergência"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Relatório de bugs"</string> + <string name="global_action_logout" msgid="935179188218826050">"Finalizar sessão"</string> <string name="bugreport_title" msgid="2667494803742548533">"Obter relatório de bugs"</string> <string name="bugreport_message" msgid="398447048750350456">"Isto coletará informações sobre o estado atual do dispositivo para enviá-las em uma mensagem de e-mail. Após iniciar o relatório de bugs, será necessário aguardar algum tempo até que esteja pronto para ser enviado."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Relatório interativo"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Quando o atalho está ativado, pressione os dois botões de volume por três segundos para iniciar um recurso de acessibilidade.\n\n Recurso de acessibilidade atual:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n É possível alterar o recurso em Configurações > Acessibilidade."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Desativar atalho"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Usar atalho"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversão de cores"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Correção de cor"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"O atalho de acessibilidade ativou o <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"O atalho de acessibilidade desativou o <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Escolha um recurso a ser usado ao tocar no botão Acessibilidade:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Durante a semana à noite"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fim de semana"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Evento"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Dormindo"</string> <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Há um problema interno com seu dispositivo. Ele pode ficar instável até que você faça a redefinição para configuração original."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Há um problema interno com seu dispositivo. Entre em contato com o fabricante para saber mais detalhes."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"A solicitação USSD foi modificada para a solicitação DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"A solicitação USSD foi modificada para a solicitação SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"A solicitação USSD foi modificada para a nova solicitação USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"A solicitação USSD foi modificada para a solicitação DIAL de vídeo."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"A solicitação SS foi modificada para a solicitação DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"A solicitação SS foi modificada para a solicitação DIAL de vídeo."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"A solicitação SS foi modificada para a solicitação USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"A solicitação SS foi modificada para a nova solicitação SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabalho"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 8e3726bb8882..eece63e0d5a2 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -214,6 +214,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Opriți alimentarea"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Urgență"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Raport despre erori"</string> + <string name="global_action_logout" msgid="935179188218826050">"Încheiați sesiunea"</string> <string name="bugreport_title" msgid="2667494803742548533">"Executați un raport despre erori"</string> <string name="bugreport_message" msgid="398447048750350456">"Acest raport va colecta informații despre starea actuală a dispozitivului, pentru a le trimite într-un e-mail. Aveți răbdare după pornirea raportului despre erori până când va fi gata de trimis."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Raport interactiv"</string> @@ -1522,6 +1523,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Când comanda rapidă este activată, dacă apăsați ambele butoane de volum timp de 3 secunde, veți lansa o funcție de accesibilitate.\n\n Funcția actuală de accesibilitate:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Puteți schimba funcția în Setări > Accesibilitate."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Dezactivați comanda rapidă"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Utilizați comanda rapidă"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inversarea culorilor"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Corecția culorii"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Comanda rapidă de accesibilitate a activat <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Comanda rapidă de accesibilitate a dezactivat <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Alegeți o funcție pe care să o folosiți când atingeți butonul Accesibilitate:"</string> @@ -1717,13 +1720,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Nopțile din zilele lucrătoare"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Eveniment"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Somn"</string> <string name="muted_by" msgid="6147073845094180001">"Dezactivate de <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"A apărut o problemă internă pe dispozitiv, iar acesta poate fi instabil până la revenirea la setările din fabrică."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"A apărut o problemă internă pe dispozitiv. Pentru detalii, contactați producătorul."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Solicitarea USSD este modificată într-o solicitare DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Solicitarea USSD este modificată într-o solicitare SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Solicitarea USSD este modificată într-o nouă solicitare USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Solicitarea USSD este modificată într-o solicitare DIAL video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Solicitarea SS este modificată într-o solicitare DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Solicitarea SS este modificată într-o solicitare DIAL video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Solicitarea SS este modificată într-o solicitare USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Solicitarea SS este modificată într-o nouă solicitare SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil de serviciu"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index f8ebf0d14a21..53930c1ceba7 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Выключить"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Экстренный вызов"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Отчет об ошибке"</string> + <string name="global_action_logout" msgid="935179188218826050">"Закончить сеанс"</string> <string name="bugreport_title" msgid="2667494803742548533">"Отчет об ошибке"</string> <string name="bugreport_message" msgid="398447048750350456">"Информация о текущем состоянии вашего устройства будет собрана и отправлена по электронной почте. Подготовка отчета займет некоторое время."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактивный отчет"</string> @@ -1546,6 +1547,8 @@ <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="color_inversion_feature_name" msgid="4231186527799958644">"Инверсия цветов"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Коррекция цвета"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Сервис <xliff:g id="SERVICE_NAME">%1$s</xliff:g> включен"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Сервис <xliff:g id="SERVICE_NAME">%1$s</xliff:g> отключен"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Выберите функцию, которая запускается при нажатии кнопки специальных возможностей:"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Будний вечер"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Выходные"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Мероприятие"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Время сна"</string> <string name="muted_by" msgid="6147073845094180001">"Звук отключен приложением \"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>\""</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Произошла внутренняя ошибка, и устройство может работать нестабильно, пока вы не выполните сброс настроек."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Произошла внутренняя ошибка. Обратитесь к производителю устройства за подробными сведениями."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-запрос преобразован в DIAL-запрос"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-запрос преобразован в SS-запрос."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-запрос преобразован в новый USSD-запрос."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-запрос преобразован в запрос Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-запрос преобразован в DIAL-запрос."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-запрос преобразован в запрос Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-запрос преобразован в USSD-запрос."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-запрос преобразован в новый SS-запрос."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Рабочий профиль"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index af1f8baa046f..2a1d63524df8 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"බල රහිත කරන්න"</string> <string name="global_action_emergency" msgid="7112311161137421166">"හදිසි"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"දෝෂ වර්තාව"</string> + <string name="global_action_logout" msgid="935179188218826050">"සැසිය අවසන් කරන්න"</string> <string name="bugreport_title" msgid="2667494803742548533">"දෝෂ වාර්තාවක් ගන්න"</string> <string name="bugreport_message" msgid="398447048750350456">"ඊ-තැපැල් පණිවිඩයක් ලෙස යැවීමට මෙය ඔබගේ වත්මන් උපාංග තත්වය ගැන තොරතුරු එකතු කරනු ඇත. දෝෂ වාර්තාව ආරම්භ කර එය යැවීමට සූදානම් කරන තෙක් එයට කිසියම් කාලයක් ගතවනු ඇත; කරුණාකර ඉවසන්න."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"අන්තර්ක්රියා වාර්."</string> @@ -1500,6 +1501,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"කෙටිමඟ ක්රියාවිරහිත කරන්න"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"කෙටිමඟ භාවිතා කරන්න"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"වර්ණ අපවර්තනය"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"වර්ණ නිවැරදි කිරීම"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ප්රවේශ්යතා කෙටි මග <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ක්රියාත්මක කරන ලදී"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ප්රවේශ්යතා කෙටි මග <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ක්රියාවිරහිත කරන ලදී"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"ඔබ ප්රවේශ්යතා බොත්තම තට්ටු කරන විට භාවිතා කිරීමට අංගයක් තෝරාගන්න:"</string> @@ -1686,13 +1689,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Weeknight"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"සති අන්තය"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"සිදුවීම"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"නිදා ගනිමින්"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> විසින් නිශ්ශබ්ද කරන ලදි"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"ඔබේ උපාංගය සමගින් ගැටලුවක් ඇති අතර, ඔබේ කර්මාන්තශාලා දත්ත යළි සකසන තෙක් එය අස්ථායි විය හැකිය."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"ඔබේ උපාංගය සමගින් අභ්යන්තර ගැටලුවක් ඇත. විස්තර සඳහා ඔබේ නිෂ්පාදක අමතන්න."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD ඉල්ලීම DIAL ඉල්ලීම වෙත විකරණය කරන ලදී."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD ඉල්ලීම SS ඉල්ලීම වෙත විකරණය කරන ලදී."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD ඉල්ලීම නව USSD ඉල්ලීම වෙත විකරණය කරන ලදී."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD ඉල්ලීම Video DIAL ඉල්ලීම ලෙස වෙනස් කර ඇත."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS ඉල්ලීම DIAL ඉල්ලීම වෙත විකරණය කරන ලදී."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS ඉල්ලීම Video DIAL ඉල්ලීම ලෙස වෙනස් කර ඇත."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ඉල්ලීම USSD ඉල්ලීම වෙත විකරණය කරන ලදී."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ඉල්ලීම නව DIAL ඉල්ලීම වෙත විකරණය කරන ලදී."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"කාර්යාල පැතිකඩ"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 40979f9fe328..a0de5eb11c03 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Vypnúť"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Tiesňové volanie"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Hlásenie o chybách"</string> + <string name="global_action_logout" msgid="935179188218826050">"Ukončiť reláciu"</string> <string name="bugreport_title" msgid="2667494803742548533">"Vytvoriť hlásenie chyby"</string> <string name="bugreport_message" msgid="398447048750350456">"Týmto zhromaždíte informácie o aktuálnom stave zariadenia. Informácie je potom možné odoslať e-mailom, chvíľu však potrvá, kým bude hlásenie chyby pripravené na odoslanie. Prosíme vás preto o trpezlivosť."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktívne nahlásenie"</string> @@ -1546,6 +1547,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Keď je skratka zapnutá, stlačením obidvoch tlačidiel hlasitosti na tri sekundy spustíte funkciu dostupnosti.\n\n Aktuálna funkcia dostupnosti:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkciu môžete zmeniť v časti Nastavenia > Dostupnosť."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Vypnúť skratku"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Použiť skratku"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inverzia farieb"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Úprava farieb"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Skratka dostupnosti zapla službu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Skratka dostupnosti vypla službu <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Klepnutím na tlačidlo dostupnosti vyberte požadovanú funkciu:"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noc pracovného dňa"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Víkend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Udalosť"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Spánok"</string> <string name="muted_by" msgid="6147073845094180001">"Stlmené aplikáciou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Vo vašom zariadení došlo k internému problému. Môže byť nestabilné, kým neobnovíte jeho výrobné nastavenia."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Vo vašom zariadení došlo k internému problému. Ak chcete získať podrobné informácie, obráťte sa na jeho výrobcu."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Žiadosť USSD bola upravená na žiadosť DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Žiadosť USSD bola upravená na žiadosť SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Žiadosť USSD bola upravená na novú žiadosť USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Žiadosť USSD bola upravená na žiadosť Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Žiadosť SS bola upravená na žiadosť DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Žiadosť SS bola upravená na žiadosť Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Žiadosť SS bola upravená na žiadosť USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Žiadosť SS bola upravená na novú žiadosť SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Pracovný profil"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index d8b274509345..fb96279ecde7 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -216,6 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Izklopi"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Klic v sili"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Poročilo o napakah"</string> + <string name="global_action_logout" msgid="935179188218826050">"Končaj sejo"</string> <string name="bugreport_title" msgid="2667494803742548533">"Ustvari poročilo o napakah"</string> <string name="bugreport_message" msgid="398447048750350456">"S tem bodo zbrani podatki o trenutnem stanju naprave, ki bodo poslani v e-poštnem sporočilu. Izvedba poročila o napakah in priprava trajata nekaj časa, zato bodite potrpežljivi."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktivno poročilo"</string> @@ -1546,6 +1547,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Ko je bližnjica vklopljena, pritisnite gumba za glasnost in ju pridržite tri sekunde, če želite zagnati funkcijo za ljudi s posebnimi potrebami.\n\n Trenutna funkcija za ljudi s posebnimi potrebami:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Funkcijo lahko spremenite v »Nastavitve > Funkcije za ljudi s posebnimi potrebami«."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Izklopi bližnjico"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Uporabi bližnjico"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inverzija barv"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Popravljanje barv"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Bližnjica funkcij za ljudi s posebnimi potrebami je vklopila <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Bližnjica funkcij za ljudi s posebnimi potrebami je izklopila <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Izberite funkcijo, ki jo želite uporabljati, ko se dotaknete gumba »Dostopnost«:"</string> @@ -1750,13 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Noč med tednom"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Konec tedna"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Dogodek"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Spanje"</string> <string name="muted_by" msgid="6147073845094180001">"Izklop zvoka: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Vaša naprava ima notranjo napako in bo morda nestabilna, dokler je ne ponastavite na tovarniške nastavitve."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Vaša naprava ima notranjo napako. Če želite več informacij, se obrnite na proizvajalca."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Zahteva USSD je spremenjena v zahtevo DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Zahteva USSD je spremenjena v zahtevo SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Zahteva USSD je spremenjena v novo zahtevo USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Zahteva USSD je spremenjena v zahtevo Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Zahteva SS je spremenjena v zahtevo DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Zahteva SS je spremenjena v zahtevo Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Zahteva SS je spremenjena v zahtevo USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Zahteva SS je spremenjena v novo zahtevo SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Delovni profil"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 8bf34dd69cb2..4aee9bcb9b0d 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Fik"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Urgjenca"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Raporti i defekteve në kod"</string> + <string name="global_action_logout" msgid="935179188218826050">"Jepi fund sesionit"</string> <string name="bugreport_title" msgid="2667494803742548533">"Merr raportin e defekteve në kod"</string> <string name="bugreport_message" msgid="398447048750350456">"Ky funksion mundëson mbledhjen e informacioneve mbi gjendjen aktuale të pajisjes për ta dërguar si mesazh mail-i. Do të duhet pak kohë nga nisja e raportit të defekteve në kod. Faleminderit për durimin."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Raport interaktiv"</string> @@ -1499,6 +1500,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kur shkurtorja është e aktivizuar, shtypja e të dy butonave për 3 sekonda do të nisë një funksion qasshmërie.\n\n Funksioni aktual i qasshmërisë:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Mund ta ndryshosh funksionin te Cilësimet > Qasshmëria."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Çaktivizo shkurtoren"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Përdor shkurtoren"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Kthimi i ngjyrës"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Korrigjimi i ngjyrës"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Shkurtorja e qasshmërisë e aktivizoi <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Shkurtorja e qasshmërisë e çaktivizoi <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Zgjidh një funksion për ta përdorur kur troket butonin e \"Qasshmërisë\":"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Netët e javës"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Fundjava"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Ngjarje"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Në gjumë"</string> <string name="muted_by" msgid="6147073845094180001">"Lënë në heshtje nga <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Ka një problem të brendshëm me pajisjen tënde. Ajo mund të jetë e paqëndrueshme derisa të rivendosësh të dhënat në gjendje fabrike."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Ka një problem të brendshëm me pajisjen tënde. Kontakto prodhuesin tënd për detaje."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Kërkesa USSD është modifikuar në kërkesën DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Kërkesa USSD është modifikuar në kërkesën SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Kërkesa USSD është modifikuar në kërkesën e re USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Kërkesa USSD është modifikuar në kërkesën Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Kërkesa SS është e modifikuar në kërkesën DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Kërkesa SS është e modifikuar në kërkesën Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Kërkesa SS është modifikuar në kërkesën USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Kërkesa SS është e modifikuar në kërkesën e re SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profili i punës"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 7c6460beb13e..146f8b3cf190 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -214,6 +214,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Искључи"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Хитни позив"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Извештај о грешци"</string> + <string name="global_action_logout" msgid="935179188218826050">"Заврши сесију"</string> <string name="bugreport_title" msgid="2667494803742548533">"Направи извештај о грешци"</string> <string name="bugreport_message" msgid="398447048750350456">"Овим ће се прикупити информације о тренутном стању уређаја како би биле послате у поруци е-поште. Од започињања извештаја о грешци до тренутка за његово слање проћи ће неко време; будите стрпљиви."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Интерактив. извештај"</string> @@ -1522,6 +1523,8 @@ <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="color_inversion_feature_name" msgid="4231186527799958644">"Инверзија боја"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Корекција боја"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Пречица за приступачност је укључила услугу <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Пречица за приступачност је искључила услугу <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Изаберите функцију која ће се користити када додирнете дугме за приступачност:"</string> @@ -1717,13 +1720,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Радни дан увече"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Викенд"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Догађај"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Спавање"</string> <string name="muted_by" msgid="6147073845094180001">"Звук је искључио/ла <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Дошло је до интерног проблема у вези са уређајем и можда ће бити нестабилан док не обавите ресетовање на фабричка подешавања."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Дошло је до интерног проблема у вези са уређајем. Потражите детаље од произвођача."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD захтев је промењен у DIAL захтев."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD захтев је промењен у SS захтев."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD захтев је промењен у нови USSD захтев."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD захтев је промењен у Video DIAL захтев."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS захтев је промењен у DIAL захтев."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS захтев је промењен у Video DIAL захтев."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS захтев је промењен у USSD захтев."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS захтев је промењен у нови SS захтев."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Профил за Work"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index b894c83267bd..27053262d63f 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Stäng av"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Nödsituation"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Felrapport"</string> + <string name="global_action_logout" msgid="935179188218826050">"Avsluta session"</string> <string name="bugreport_title" msgid="2667494803742548533">"Skapa felrapport"</string> <string name="bugreport_message" msgid="398447048750350456">"Nu hämtas information om aktuell status för enheten, som sedan skickas i ett e-postmeddelade. Det tar en liten stund innan felrapporten är färdig och kan skickas, så vi ber dig ha tålamod."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiv rapport"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"När kortkommandot har aktiverats startar du en tillgänglighetsfunktion genom att trycka ned båda volymknapparna i tre sekunder.\n\n Aktuell tillgänglighetsfunktion:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Du kan ändra funktionen i Inställningar > Tillgänglighet."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Inaktivera kortkommandot"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Använd kortkommandot"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Inverterade färger"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Färgkorrigering"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> aktiverades av Aktivera tillgänglighet snabbt"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> inaktiverades av Aktivera tillgänglighet snabbt"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Välj en funktion som ska användas när du trycker på tillgänglighetsknappen:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Vardagskväll"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"I helgen"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Händelse"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"När jag sover"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har stängt av ljudet"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Ett internt problem har uppstått i enheten, och det kan hända att problemet kvarstår tills du återställer standardinställningarna."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Ett internt problem har uppstått i enheten. Kontakta tillverkaren om du vill veta mer."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD-begäran har ändrats till en DIAL-begäran."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD-begäran har ändrats till en SS-begäran."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD-begäran har ändrats till en ny USSD-begäran."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD-begäran har ändrats till en Video DIAL-begäran."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS-begäran har ändrats till en DIAL-begäran."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS-begäran har ändrats till en Video DIAL-begäran."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-begäran har ändrats till en USSD-begäran."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-begäran har ändrats till en ny SS-begäran."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Jobbprofil"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index bdf304a17bdf..a8ab410b41c4 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -210,6 +210,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Zima"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Dharura"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Ripoti ya hitilafu"</string> + <string name="global_action_logout" msgid="935179188218826050">"Maliza kipindi"</string> <string name="bugreport_title" msgid="2667494803742548533">"Chukua ripoti ya hitilafu"</string> <string name="bugreport_message" msgid="398447048750350456">"Hii itakusanya maelezo kuhusu hali ya kifaa chako kwa sasa, na itume kama barua pepe. Itachukua muda mfupi tangu ripoti ya hitilafu ianze kuzalishwa hadi iwe tayari kutumwa; vumilia."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Ripoti ya kushirikiana"</string> @@ -1496,6 +1497,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Unapowasha kipengele cha njia ya mkato, hatua ya kubonyeza vitufe vyote viwili vya sauti kwa dakika 3 itafungua kipengele cha zana za walio na matatizo ya kuona au kusikia.\n\n Kipengele kilichopo cha zana za walio na matatizo ya kuona au kusikia:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Unaweza kubadilisha kipengele hiki katika Mipangilio > Zana za walio na matatizo ya kuona au kusikia."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Zima kipengele cha Njia ya Mkato"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Tumia Njia ya Mkato"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Ugeuzaji wa Rangi"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Usahihishaji wa rangi"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Njia ya mkato ya zana za walio na matatizo ya kuona au kusikia imewasha <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Njia ya mkato ya zana za walio na matatizo ya kuona au kusikia imezima <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Chagua kipengele utakachotumia, ukigonga Kitufe cha zana za walio na matatizo ya kuona au kusikia."</string> @@ -1682,13 +1685,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Usiku wa wiki"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Wikendi"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Tukio"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Kulala"</string> <string name="muted_by" msgid="6147073845094180001">"Sauti imezimwa na <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Kuna hitilafu ya ndani ya kifaa chako, na huenda kisiwe thabiti mpaka urejeshe mipangilio ya kiwandani."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Kuna hitilafu ya ndani ya kifaa chako. Wasiliana na mtengenezaji wa kifaa chako kwa maelezo."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Ombi la USSD limerekebishwa na kuwa ombi la DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Ombi la USSD limerekebishwa na kuwa ombi la SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Ombi la USSD limerekebishwa na kuwa ombi jipya la USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Ombi la USSD limebadilishwa kuwa ombi la DIAL la Video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Ombi la SS limerekebishwa na kuwa ombi la DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Ombi la SS limebadilishwa kuwa ombi la DIAL la Video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Ombi la SS limerekebishwa na kuwa ombi la USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Ombi la SS limerekebishwa na kuwa ombi jipya la SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Wasifu wa kazini"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 9b77ec0f814f..c1526f3fef53 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"முடக்கு"</string> <string name="global_action_emergency" msgid="7112311161137421166">"அவசர அழைப்பு"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"பிழை அறிக்கை"</string> + <string name="global_action_logout" msgid="935179188218826050">"அமர்வை முடிக்கிறது"</string> <string name="bugreport_title" msgid="2667494803742548533">"பிழை அறிக்கையை எடு"</string> <string name="bugreport_message" msgid="398447048750350456">"உங்கள் நடப்புச் சாதன நிலையை மின்னஞ்சல் செய்தியாக அனுப்ப, அது குறித்த தகவலை இது சேகரிக்கும். பிழை அறிக்கையைத் தொடங்குவதில் இருந்து, அது அனுப்புவதற்குத் தயாராகும் வரை, இதற்குச் சிறிது நேரம் ஆகும்; பொறுமையாகக் காத்திருக்கவும்."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ஊடாடத்தக்க அறிக்கை"</string> @@ -1051,8 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"சிஸ்டம் அமைப்பு > பயன்பாடுகள் > பதிவிறக்கம் என்பதில் இதை மீண்டும் இயக்கவும்."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"தற்போதைய திரை அளவு அமைப்பை <xliff:g id="APP_NAME">%1$s</xliff:g> ஆதரிக்காததால், அது வழக்கத்திற்கு மாறாகச் செயல்படக்கூடும்."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"எப்போதும் காட்டு"</string> - <!-- no translation found for unsupported_compile_sdk_message (4253168368781441759) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> பயன்பாடானது, இந்தச் சாதனத்தின் Android OSக்கு இணக்கமற்ற பதிப்பிற்காக உருவாக்கப்பட்டதால், இதில் சரியாகச் செயல்படாது. இந்தப் பயன்பாட்டின் புதுப்பிக்கப்பட்ட பதிப்பானது தற்போது கிடைக்கக்கூடும்."</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"எப்போதும் காட்டு"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"புதுப்பிப்பு உள்ளதா எனப் பார்"</string> <string name="smv_application" msgid="3307209192155442829">"<xliff:g id="APPLICATION">%1$s</xliff:g> பயன்பாடு (செயல்முறை <xliff:g id="PROCESS">%2$s</xliff:g>), தனது சுய-செயலாக்க StrictMode கொள்கையை மீறியது."</string> @@ -1500,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"குறுக்குவழியை முடக்கு"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"குறுக்குவழியைப் பயன்படுத்து"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"வண்ணத்தை நேர் எதிராக மாற்றுதல்"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"வண்ணத் திருத்தம்"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"அணுகல்தன்மைக் குறுக்குவழியானது <xliff:g id="SERVICE_NAME">%1$s</xliff:g>ஐ இயக்கியது"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"அணுகல்தன்மைக் குறுக்குவழியானது <xliff:g id="SERVICE_NAME">%1$s</xliff:g>ஐ முடக்கியது"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"அணுகல்தன்மைப் பொத்தானைத் தட்டி, பயன்படுத்துவதற்கான அம்சத்தைத் தேர்ந்தெடுக்கவும்:"</string> @@ -1639,8 +1641,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> - <!-- no translation found for battery_saver_description (5394663545060026162) --> - <skip /> + <string name="battery_saver_description" msgid="5394663545060026162">"சாதனத்தின் பேட்டரி ஆயுளை அதிகரிப்பதற்காக, பேட்டரி சேமிப்பான் உங்கள் சாதனத்தின் செயல்திறனைச் சற்றே குறைத்து, அதிர்வு, இருப்பிடச் சேவைகள் மற்றும் பெரும்பாலான பின்புலத் தரவு போன்றவற்றைக் கட்டுப்படுத்துகிறது. ஒத்திசைவைச் சார்ந்திருக்கும் மின்னஞ்சல், செய்தியிடல் மற்றும் பிற ஆப்ஸ் ஆகியவற்றை நீங்கள் திறக்காதவரை, அவை ஒத்திசைக்கப்படாமல் இருக்கும்.\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> @@ -1687,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"வார இரவு"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"வார இறுதி"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"நிகழ்வு"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"உறக்கத்தில்"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ஒலியடக்கினார்"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"சாதனத்தில் அகச் சிக்கல் இருக்கிறது, அதனை ஆரம்பநிலைக்கு மீட்டமைக்கும் வரை நிலையற்று இயங்கலாம்."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"சாதனத்தில் அகச் சிக்கல் இருக்கிறது. விவரங்களுக்கு சாதன தயாரிப்பாளரைத் தொடர்புகொள்ளவும்."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD கோரிக்கையானது DIAL கோரிக்கைக்கு மாற்றப்பட்டது."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD கோரிக்கையானது SS கோரிக்கைக்கு மாற்றப்பட்டது."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD கோரிக்கையானது புதிய USSD கோரிக்கைக்கு மாற்றப்பட்டது."</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS கோரிக்கையானது DIAL கோரிக்கைக்கு மாற்றப்பட்டது."</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS கோரிக்கையானது USSD கோரிக்கைக்கு மாற்றப்பட்டது."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS கோரிக்கையானது புதிய SS கோரிக்கைக்கு மாற்றப்பட்டது."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"பணி சுயவிவரம்"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 8658ae93cc8c..a96bcaf1aeec 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"పవర్ ఆఫ్ చేయి"</string> <string name="global_action_emergency" msgid="7112311161137421166">"అత్యవసరం"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"బగ్ నివేదిక"</string> + <string name="global_action_logout" msgid="935179188218826050">"సెషన్ను ముగించు"</string> <string name="bugreport_title" msgid="2667494803742548533">"బగ్ నివేదికను సిద్ధం చేయి"</string> <string name="bugreport_message" msgid="398447048750350456">"ఇది ఇ-మెయిల్ సందేశం రూపంలో పంపడానికి మీ ప్రస్తుత పరికర స్థితి గురించి సమాచారాన్ని సేకరిస్తుంది. బగ్ నివేదికను ప్రారంభించడం మొదలుకొని పంపడానికి సిద్ధం చేసే వరకు ఇందుకు కొంత సమయం పడుతుంది; దయచేసి ఓపిక పట్టండి."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"ప్రభావశీల నివేదిక"</string> @@ -1051,8 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"సిస్టమ్ సెట్టింగ్లు > అనువర్తనాలు > డౌన్లోడ్ చేసినవిలో దీన్ని పునఃప్రారంభించండి."</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> ప్రస్తుత ప్రదర్శన పరిమాణ సెట్టింగ్కు మద్దతు ఇవ్వదు, దీని వలన ఊహించని సమస్యలు తలెత్తవచ్చు."</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"ఎల్లప్పుడూ చూపు"</string> - <!-- no translation found for unsupported_compile_sdk_message (4253168368781441759) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"Android OS యొక్క అననుకూల వెర్షన్ కోసం <xliff:g id="APP_NAME">%1$s</xliff:g> రూపొందించబడింది మరియు ఊహించని సమస్యలు తలెత్తవచ్చు. యాప్ యొక్క అప్డేట్ చేసిన వెర్షన్ అందుబాటులో ఉండవచ్చు."</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"ఎల్లప్పుడూ చూపు"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"అప్డేట్ కోసం తనిఖీ చేయి"</string> <string name="smv_application" msgid="3307209192155442829">"<xliff:g id="APPLICATION">%1$s</xliff:g> యాప్ (<xliff:g id="PROCESS">%2$s</xliff:g> ప్రాసెస్) అది స్వయంగా అమలు చేసే ఖచ్చితమైన మోడ్ విధానాన్ని ఉల్లంఘించింది."</string> @@ -1500,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"సత్వరమార్గాన్ని ఆఫ్ చేయి"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"సత్వరమార్గాన్ని ఉపయోగించు"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"వర్ణ విలోమం"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"రంగు సవరణ"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"యాక్సెస్ సామర్థ్య షార్ట్కట్ ద్వారా <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ఆన్ చేయబడింది"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"యాక్సెస్ సామర్థ్య షార్ట్కట్ ద్వారా <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ఆఫ్ చేయబడింది"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"యాక్సెస్ సామర్థ్య బటన్ను మీరు నొక్కినప్పుడు ఉపయోగించాల్సిన ఒక ఫీచర్ను ఎంచుకోండి:"</string> @@ -1639,8 +1641,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> - <!-- no translation found for battery_saver_description (5394663545060026162) --> - <skip /> + <string name="battery_saver_description" msgid="5394663545060026162">"బ్యాటరీ జీవితకాలాన్ని మెరుగుపరచడంలో సహాయపడటానికి, బ్యాటరీ సేవర్ మీ పరికరం పనితీరును తగ్గిస్తుంది మరియు వైబ్రేషన్ను, స్థాన సేవలను మరియు అత్యధిక నేపథ్య డేటాను పరిమితం చేస్తుంది. ఇమెయిల్, మెసేజింగ్ మరియు సమకాలీకరణపై ఆధారపడే ఇతర యాప్లు మీరు వాటిని తెరిస్తే మినహా అప్డేట్ చేయబడవు.\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> @@ -1687,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"వారపు రోజుల్లో రాత్రి"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"వారాంతం"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ఈవెంట్"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"నిద్రావస్థ"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ద్వారా మ్యూట్ చేయబడింది"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"మీ పరికరంతో అంతర్గత సమస్య ఏర్పడింది మరియు మీరు ఫ్యాక్టరీ డేటా రీసెట్ చేసే వరకు అస్థిరంగా ఉంటుంది."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"మీ పరికరంతో అంతర్గత సమస్య ఏర్పడింది. వివరాల కోసం మీ తయారీదారుని సంప్రదించండి."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD అభ్యర్థన డయల్ అభ్యర్థనగా సవరించబడింది."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD అభ్యర్థన SS అభ్యర్థనగా సవరించబడింది."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD అభ్యర్థన కొత్త USSD అభ్యర్థనగా సవరించబడింది."</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS అభ్యర్థన డయల్ అభ్యర్థనగా సవరించబడింది."</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS అభ్యర్థన USSD అభ్యర్థనగా సవరించబడింది."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS అభ్యర్థన కొత్త SS అభ్యర్థనగా సవరించబడింది."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"కార్యాలయ ప్రొఫైల్"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 026611fe056a..2515241c19f9 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"ปิดเครื่อง"</string> <string name="global_action_emergency" msgid="7112311161137421166">"เหตุฉุกเฉิน"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"รายงานข้อบกพร่อง"</string> + <string name="global_action_logout" msgid="935179188218826050">"จบเซสชัน"</string> <string name="bugreport_title" msgid="2667494803742548533">"ใช้รายงานข้อบกพร่อง"</string> <string name="bugreport_message" msgid="398447048750350456">"การดำเนินการนี้จะรวบรวมข้อมูลเกี่ยวกับสถานะปัจจุบันของอุปกรณ์ของคุณ โดยจะส่งไปในรูปแบบข้อความอีเมล อาจใช้เวลาสักครู่ตั้งแต่เริ่มการสร้างรายงานข้อบกพร่องจนกระทั่งเสร็จสมบูรณ์ โปรดอดทนรอ"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"รายงานแบบอินเทอร์แอกทีฟ"</string> @@ -1051,7 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"เปิดใช้งานอีกครั้งในการตั้งค่าระบบ > แอปพลิเคชัน > ดาวน์โหลด"</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> ไม่สนับสนุนการตั้งค่าขนาดการแสดงผลปัจจุบันและอาจแสดงผลผิดปกติ"</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"แสดงเสมอ"</string> - <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> สร้างมาสำหรับระบบปฏิบัติการ Android เวอร์ชันที่ใช้ร่วมกันไม่ได้ และอาจแสดงผลผิดปกติ ทั้งนี้ แอปเวอร์ชันอัปเดตอาจพร้อมใช้งานแล้ว"</string> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> ไม่ได้สร้างมาเพื่อใช้งานกับระบบปฏิบัติการ Android เวอร์ชันนี้ จึงอาจแสดงผลผิดปกติ ทั้งนี้ แอปเวอร์ชันอัปเดตอาจพร้อมใช้งานแล้ว"</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"แสดงเสมอ"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"ตรวจสอบอัปเดต"</string> <string name="smv_application" msgid="3307209192155442829">"แอปพลิเคชัน <xliff:g id="APPLICATION">%1$s</xliff:g> (กระบวนการ <xliff:g id="PROCESS">%2$s</xliff:g>) ละเมิดนโยบาย StrictMode ที่บังคับใช้ด้วยตัวเอง"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"เมื่อทางลัดเปิดอยู่ การกดปุ่มปรับระดับเสียงทั้ง 2 ปุ่มเป็นเวลา 3 วินาทีจะเริ่มฟีเจอร์การเข้าถึงพิเศษ\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="color_inversion_feature_name" msgid="4231186527799958644">"การกลับสี"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"การปรับแก้สี"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ทางลัดการเข้าถึงเปิด <xliff:g id="SERVICE_NAME">%1$s</xliff:g> แล้ว"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ทางลัดการเข้าถึงปิด <xliff:g id="SERVICE_NAME">%1$s</xliff:g> แล้ว"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"เลือกฟีเจอร์ที่จะใช้เมื่อคุณแตะปุ่ม \"การเข้าถึงพิเศษ\":"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"คืนวันธรรมดา"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"สุดสัปดาห์"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"กิจกรรม"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"นอนหลับ"</string> <string name="muted_by" msgid="6147073845094180001">"ปิดเสียงโดย <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"อุปกรณ์ของคุณเกิดปัญหาภายในเครื่อง อุปกรณ์อาจทำงานไม่เสถียรจนกว่าคุณจะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"อุปกรณ์ของคุณเกิดปัญหาภายในเครื่อง โปรดติดต่อผู้ผลิตเพื่อขอรายละเอียดเพิ่มเติม"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"คำขอ USSD ได้รับการแก้ไขให้เป็นคำขอ DIAL"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"คำขอ USSD ได้รับการแก้ไขให้เป็นคำขอ SS"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"คำขอ USSD ได้รับการแก้ไขให้เป็นคำขอ USSD ใหม่"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"คำขอ USSD ได้รับการแก้ไขให้เป็นคำขอ Video DIAL"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"คำขอ SS ได้รับการแก้ไขให้เป็นคำขอ DIAL"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"คำขอ SS ได้รับการแก้ไขให้เป็นคำขอ Video DIAL"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"คำขอ SS ได้รับการแก้ไขให้เป็นคำขอ USSD"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"คำขอ SS ได้รับการแก้ไขให้เป็นคำขอ SS ใหม่"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"โปรไฟล์งาน"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 7f4063a22e2e..d30267bd43ac 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"I-off"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Emergency"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Ulat sa bug"</string> + <string name="global_action_logout" msgid="935179188218826050">"Tapusin ang session"</string> <string name="bugreport_title" msgid="2667494803742548533">"Kunin ang ulat sa bug"</string> <string name="bugreport_message" msgid="398447048750350456">"Mangongolekta ito ng impormasyon tungkol sa kasalukuyang katayuan ng iyong device, na ipapadala bilang mensaheng e-mail. Gugugol ito ng kaunting oras mula sa pagsisimula ng ulat sa bug hanggang sa handa na itong maipadala; mangyaring magpasensya."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interactive na ulat"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kapag naka-on ang shortcut, magsisimula ang isang feature ng pagiging naa-access kapag pinindot ang parehong button ng volume sa loob ng 3 segundo.\n\n Kasalukuyang feature ng pagiging naa-access:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Maaari mong baguhin ang feature sa Mga Setting > Pagiging Naa-access."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"I-off ang Shortcut"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Gamitin ang Shortcut"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Pag-invert ng Kulay"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Pagwawasto ng Kulay"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Na-on ng Shortcut sa Accessibility ang <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Na-off ng Shortcut sa Accessibility ang <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Pumili ng feature na gagamitin kapag na-tap mo ang button ng Pagiging Naa-access:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Weeknight"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Kaganapan"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Pag-sleep"</string> <string name="muted_by" msgid="6147073845094180001">"Na-mute ng <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"May internal na problema sa iyong device, at maaaring hindi ito maging stable hanggang sa i-reset mo ang factory data."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"May internal na problema sa iyong device. Makipag-ugnayan sa iyong manufacturer upang malaman ang mga detalye."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Ginawang DIAL request ang USSD request."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Ginawang SS request ang USSD request."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Ginawang bagong USSD request ang USSD request."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Ginawang kahilingan sa Video DIAL ang kahilingan sa USSD."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Ginawang DIAL request ang SS request."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Ginawang kahilingan sa Video DIAL ang kahilingan sa SS."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Ginawang USSD request ang SS request."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Ginawang bagong SS request ang SS request."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profile sa trabaho"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 47792b49735d..e6646c47b5f5 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Kapat"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Acil durum"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Hata raporu"</string> + <string name="global_action_logout" msgid="935179188218826050">"Oturumu sonlandır"</string> <string name="bugreport_title" msgid="2667494803742548533">"Hata raporu al"</string> <string name="bugreport_message" msgid="398447048750350456">"Bu rapor, e-posta iletisi olarak göndermek üzere cihazınızın şu anki durumuyla ilgili bilgi toplar. Hata raporu başlatıldıktan sonra hazır olması biraz zaman alabilir, lütfen sabırlı olun."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Etkileşimli rapor"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Kısayol açık olduğunda, ses düğmelerinin ikisini birden 3 saniyeliğine basılı tutmanız bir erişilebilirlik özelliğini başlatır.\n\n Geçerli erişilebilirlik özelliği:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Özelliği, Ayarlar > Erişilebilirlik seçeneğinden değiştirebilirsiniz."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Kısayolu Kapat"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Kısayolu Kullan"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Rengi Ters Çevirme"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Renk Düzeltme"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Erişilebilirlik Kısayolu <xliff:g id="SERVICE_NAME">%1$s</xliff:g> hizmetini açtı"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Erişilebilirlik Kısayolu <xliff:g id="SERVICE_NAME">%1$s</xliff:g> hizmetini kapattı"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Erişilebilirlik düğmesine dokunduğunuzda kullanmak üzere bir özellik seçin:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Hafta içi gece"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Hafta sonu"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Etkinlik"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Uyku"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tarafından kapatıldı"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Cihazınızla ilgili dahili bir sorun oluştu ve fabrika verilerine sıfırlama işlemi gerçekleştirilene kadar kararsız çalışabilir."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Cihazınızla ilgili dahili bir sorun oluştu. Ayrıntılı bilgi için üreticinizle iletişim kurun."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD isteği DIAL isteği olarak değiştirildi."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD isteği SS isteği olarak değiştirildi."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD isteği yeni USSD isteği olarak değiştirildi."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD isteği Video DIAL isteği olarak değiştirildi."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS isteği DIAL isteği olarak değiştirildi."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS isteği, Video DIAL isteği olarak değiştirildi."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS isteği USSD isteği olarak değiştirildi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS isteği yeni SS isteği olarak değiştirildi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"İş profili"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index ad6c6bce6800..bfbe902eee3c 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -216,8 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Вимкнути"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Екстрений виклик"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Звіт про помилки"</string> - <!-- no translation found for global_action_logout (935179188218826050) --> - <skip /> + <string name="global_action_logout" msgid="935179188218826050">"Завершити сеанс"</string> <string name="bugreport_title" msgid="2667494803742548533">"Звіт про помилку"</string> <string name="bugreport_message" msgid="398447048750350456">"Інформація про поточний стан вашого пристрою буде зібрана й надіслана електронною поштою. Підготовка звіту триватиме певний час."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Інтерактивний звіт"</string> @@ -1548,10 +1547,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"Вимкнути ярлик"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Використовувати ярлик"</string> - <!-- no translation found for color_inversion_feature_name (4231186527799958644) --> - <skip /> - <!-- no translation found for color_correction_feature_name (6779391426096954933) --> - <skip /> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Інверсія кольорів"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Корекція кольорів"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Ярлик спеціальних можливостей увімкнув <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Ярлик спеціальних можливостей вимкнув <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Виберіть функцію для кнопки спеціальних можливостей:"</string> @@ -1756,15 +1753,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Увечері в будні"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"На вихідних"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Подія"</string> - <!-- no translation found for zen_mode_default_every_night_name (3012363838882944175) --> - <skip /> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Під час сну"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> вимикає звук"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Через внутрішню помилку ваш пристрій може працювати нестабільно. Відновіть заводські налаштування."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"На пристрої сталася внутрішня помилка. Зв’яжіться з виробником пристрою, щоб дізнатися більше."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Запит USSD перетворено на запит DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Запит USSD перетворено на запит SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Запит USSD перетворено на новий запит USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Запит USSD перетворено на запит Video DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Запит SS перетворено на запит DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Запит SS перетворено на запит Video DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Запит SS перетворено на запит USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Запит SS перетворено на новий запит SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Робочий профіль"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index 677475456cf5..2155b34482c6 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"پاور آف"</string> <string name="global_action_emergency" msgid="7112311161137421166">"ایمرجنسی"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"بگ کی اطلاع"</string> + <string name="global_action_logout" msgid="935179188218826050">"سیشن ختم کریں"</string> <string name="bugreport_title" msgid="2667494803742548533">"بگ کی اطلاع لیں"</string> <string name="bugreport_message" msgid="398447048750350456">"ایک ای میل پیغام کے بطور بھیجنے کیلئے، یہ آپ کے موجودہ آلہ کی حالت کے بارے میں معلومات جمع کرے گا۔ بگ کی اطلاع شروع کرنے سے لے کر بھیجنے کیلئے تیار ہونے تک اس میں تھوڑا وقت لگے گا؛ براہ کرم تحمل سے کام لیں۔"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"متعامل رپورٹ"</string> @@ -1051,8 +1052,7 @@ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"سسٹم ترتیبات > ایپس > ڈاؤن لوڈ کردہ میں اسے دوبارہ فعال کریں۔"</string> <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> میں موجودہ ڈسپلے سائز ترتیبات کی معاونت نہیں ہے اور ہو سکتا ہے غیر متوقع طریقے سے کام کرے۔"</string> <string name="unsupported_display_size_show" msgid="7969129195360353041">"ہمیشہ دکھائیں"</string> - <!-- no translation found for unsupported_compile_sdk_message (4253168368781441759) --> - <skip /> + <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> کو Android OS کے غیر مطابقت پذیر ورژن کیلئے بنایا گیا اور یہ غیر متوقع برتاؤ کر سکتی ہے۔ ممکن ہے ایپ کا اپ ڈیٹ کردہ ورژن دستیاب ہو۔"</string> <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"ہمیشہ دکھائیں"</string> <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"اپ ڈیٹ چیک کریں"</string> <string name="smv_application" msgid="3307209192155442829">"ایپ <xliff:g id="APPLICATION">%1$s</xliff:g> (کارروائی <xliff:g id="PROCESS">%2$s</xliff:g>) نے خود نافذ کی گئی StrictMode پالیسی کی خلاف ورزی کی ہے۔"</string> @@ -1500,6 +1500,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"شارٹ کٹ آف کریں"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"شارٹ کٹ استعمال کریں"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"رنگ میں تبدیلی"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"رنگ کی تصحیح"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"ایکسیسبیلٹی شارٹ کٹ نے <xliff:g id="SERVICE_NAME">%1$s</xliff:g> کو آن کر دیا"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"ایکسیسبیلٹی شارٹ کٹ نے <xliff:g id="SERVICE_NAME">%1$s</xliff:g> کو آف کر دیا"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"ایکسیسبیلٹی بٹن پر تھپتھپانے وقت استعمال کرنے کیلئے ایک خصوصیت چنیں:"</string> @@ -1639,8 +1641,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> - <!-- no translation found for battery_saver_description (5394663545060026162) --> - <skip /> + <string name="battery_saver_description" msgid="5394663545060026162">"بیٹری کی میعاد بہتر بنانے میں مدد کرنے کیلئے، بیٹری سیور آپ کے آلہ کی کارکردگی کم کر دیتی ہے اور وائبریشن، مقام کی سروسز اور پس منظر کا بیشتر ڈیٹا محدود کر دیتی ہے۔ ای میل، پیغام رسانی اور مطابقت پذیری پر منحصر دیگر ایپس ممکن ہے اس وقت تک اپ ڈیٹ نہ ہوں جب تک آپ انہیں نہ کھولیں۔\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> @@ -1687,13 +1688,18 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ویک نائٹ"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"ویک اینڈ"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"ایونٹ"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"سونا"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> کے ذریعے خاموش کردہ"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"آپ کے آلہ میں ایک داخلی مسئلہ ہے اور جب تک آپ فیکٹری ڈیٹا کو دوبارہ ترتیب نہیں دے دیتے ہیں، ہوسکتا ہے کہ یہ غیر مستحکم رہے۔"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"آپ کے آلہ میں ایک داخلی مسئلہ ہے۔ تفصیلات کیلئے اپنے مینوفیکچرر سے رابطہ کریں۔"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD درخواست میں ترمیم کر کے DIAL درخواست بنا دی گئی ہے۔"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD درخواست میں ترمیم کر کے SS درخواست بنا دی گئی ہے۔"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD درخواست میں ترمیم کر کے نئی USSD درخواست بنا دی گئی ہے۔"</string> + <!-- no translation found for stk_cc_ussd_to_dial_video (585340552561515305) --> + <skip /> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS درخواست میں ترمیم کر کے DIAL درخواست بنا دی گئی ہے۔"</string> + <!-- no translation found for stk_cc_ss_to_dial_video (4306210904450719045) --> + <skip /> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS درخواست میں ترمیم کر کے USSD درخواست بنا دی گئی ہے۔"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS درخواست میں ترمیم کر کے نئی SS درخواست بنا دی گئی ہے۔"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"دفتری پروفائل"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 52f46df700f7..c488473a8537 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"O‘chirish"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Favqulodda chaqiruv"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Nosozlik haqida ma’lumot berish"</string> + <string name="global_action_logout" msgid="935179188218826050">"Seansni yakunlash"</string> <string name="bugreport_title" msgid="2667494803742548533">"Xatoliklar hisoboti"</string> <string name="bugreport_message" msgid="398447048750350456">"Qurilmangiz holati haqidagi ma’lumotlar to‘planib, e-pochta orqali yuboriladi. Hisobotni tayyorlash biroz vaqt olishi mumkin."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interaktiv hisobot"</string> @@ -1416,7 +1417,7 @@ <string name="fingerprints" msgid="4516019619850763049">"Barmoq izlari:"</string> <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 barmoq izi:"</string> <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 barmoq izi:"</string> - <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Barchasini ko‘rish"</string> + <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Hammasi"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Harakat turini tanlang"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"Ulashish"</string> <string name="sending" msgid="3245653681008218030">"Jo‘natilmoqda…"</string> @@ -1499,6 +1500,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Maxsus imkoniyatlar funksiyasidan foydalanish uchun u yoniqligida ikkala ovoz balandligini boshqarish tugmasini 3 soniya bosib turing.\n\n Joriy maxsus imkoniyatlar funksiyasi:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Bu funksiyani Sozlamalar > Maxsus imkoniyatlar orqali o‘zgartirish mumkin."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Tezkor ishga tushirishni o‘chirib qo‘yish"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Tezkor ishga tushirishdan foydalanish"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Ranglarni akslantirish"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Rangni tuzatish"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> xizmati yoqildi"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"<xliff:g id="SERVICE_NAME">%1$s</xliff:g> xizmati o‘chirib qo‘yildi"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Maxsus imkoniyatlar tugmasi bosilganda ishga tushadigan funksiyani tanlang:"</string> @@ -1685,13 +1688,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Ish kunlari kechqurun"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Dam olish kunlari"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Tadbir"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Uyquda"</string> <string name="muted_by" msgid="6147073845094180001">"“<xliff:g id="THIRD_PARTY">%1$s</xliff:g>” tomonidan ovozsiz qilingan"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Qurilmangiz bilan bog‘liq ichki muammo mavjud. U zavod sozlamalari tiklanmaguncha barqaror ishlamasligi mumkin."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Qurilmangiz bilan bog‘liq ichki muammo mavjud. Tafsilotlar uchun qurilmangiz ishlab chiqaruvchisiga murojaat qiling."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD so‘rovi DIAL so‘roviga o‘zgartirildi."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD so‘rovi SS so‘roviga o‘zgartirildi."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD so‘rovi yangi USSD so‘roviga o‘zgartirildi."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD so‘rovi Video DIAL so‘roviga o‘zgartirildi."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS so‘rovi DIAL so‘roviga o‘zgartirildi."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS so‘rovi Video DIAL so‘roviga o‘zgartirildi."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS so‘rovi USSD so‘roviga o‘zgartirildi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS so‘rovi yangi SS so‘roviga o‘zgartirildi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Ishchi profil"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 0ffbe0072105..5f728342f1c7 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Tắt nguồn"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Khẩn cấp"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Báo cáo lỗi"</string> + <string name="global_action_logout" msgid="935179188218826050">"Kết thúc phiên"</string> <string name="bugreport_title" msgid="2667494803742548533">"Nhận báo cáo lỗi"</string> <string name="bugreport_message" msgid="398447048750350456">"Báo cáo này sẽ thu thập thông tin về tình trạng thiết bị hiện tại của bạn, để gửi dưới dạng thông báo qua email. Sẽ mất một chút thời gian kể từ khi bắt đầu báo cáo lỗi cho tới khi báo cáo sẵn sàng để gửi; xin vui lòng kiên nhẫn."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Báo cáo tương tác"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Khi phím tắt được bật, nhấn cả hai nút âm lượng trong 3 giây sẽ bắt đầu một tính năng trợ năng.\n\n Tính năng trợ năng hiện tại:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Bạn có thể thay đổi tính năng trong Cài đặt > Trợ năng."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Tắt phím tắt"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Sử dụng phím tắt"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Đảo màu"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Sửa màu"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Đã bật phím tắt trợ năng <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Đã tắt phím tắt trợ năng <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Chọn tính năng sẽ sử dụng khi bạn nhấn nút Trợ năng:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Đêm trong tuần"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Cuối tuần"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Sự kiện"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Khi đang ngủ"</string> <string name="muted_by" msgid="6147073845094180001">"Do <xliff:g id="THIRD_PARTY">%1$s</xliff:g> tắt tiếng"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Đã xảy ra sự cố nội bộ với thiết bị của bạn và thiết bị có thể sẽ không ổn định cho tới khi bạn thiết lập lại dữ liệu ban đầu."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Đã xảy ra sự cố nội bộ với thiết bị. Hãy liên hệ với nhà sản xuất của bạn để biết chi tiết."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Yêu cầu USSD được sửa đổi thành yêu cầu DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Yêu cầu USSD được sửa đổi thành yêu cầu SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Yêu cầu USSD được sửa đổi thành yêu cầu USSD mới."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Yêu cầu USSD được sửa đổi thành yêu cầu DIAL video."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Yêu cầu SS được sửa đổi thành yêu cầu DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Yêu cầu SS được sửa đổi thành yêu cầu DIAL video."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Yêu cầu SS được sửa đổi thành yêu cầu USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Yêu cầu SS được sửa đổi thành yêu cầu SS mới."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Hồ sơ công việc"</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 1765a7e97e62..028c08285651 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"关机"</string> <string name="global_action_emergency" msgid="7112311161137421166">"紧急呼救"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"错误报告"</string> + <string name="global_action_logout" msgid="935179188218826050">"结束会话"</string> <string name="bugreport_title" msgid="2667494803742548533">"提交错误报告"</string> <string name="bugreport_message" msgid="398447048750350456">"这会收集有关当前设备状态的信息，并以电子邮件的形式进行发送。从开始生成错误报告到准备好发送需要一点时间，请耐心等待。"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"互动式报告"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"关闭快捷方式"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"使用快捷方式"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"颜色反转"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"色彩校正"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"无障碍快捷方式已开启<xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"无障碍快捷方式已关闭<xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"选择按下“无障碍”按钮时要使用的功能："</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"周一至周五夜间"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"周末"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"活动"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"睡眠"</string> <string name="muted_by" msgid="6147073845094180001">"已被<xliff:g id="THIRD_PARTY">%1$s</xliff:g>设为静音"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"您的设备内部出现了问题。如果不将设备恢复出厂设置，设备运行可能会不稳定。"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"您的设备内部出现了问题。请联系您的设备制造商了解详情。"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD 请求已修改为 DIAL 请求。"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD 请求已修改为 SS 请求。"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD 请求已修改为新的 USSD 请求。"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD 请求已修改为视频 DIAL 请求。"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS 请求已修改为 DIAL 请求。"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS 请求已修改为视频 DIAL 请求。"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 请求已修改为 USSD 请求。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 请求已修改为新的 SS 请求。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"工作资料"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 47bf16b8f9ed..2da0d4a5c62c 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"關閉"</string> <string name="global_action_emergency" msgid="7112311161137421166">"緊急"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"錯誤報告"</string> + <string name="global_action_logout" msgid="935179188218826050">"結束工作階段"</string> <string name="bugreport_title" msgid="2667494803742548533">"取得錯誤報告"</string> <string name="bugreport_message" msgid="398447048750350456">"這會收集您目前裝置狀態的相關資訊，並以電郵傳送給您。從開始建立錯誤報告到準備傳送需要一段時間，請耐心等候。"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"互動報告"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"關閉快速鍵"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"使用快速鍵"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"色彩反轉"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"色彩校正"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"無障礙功能快速鍵已啟用 <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"無障礙功能快速鍵已停用 <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"請選擇輕按「無障礙功能」按鈕時使用的功能："</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"平日夜間"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"週末"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"活動"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"睡眠"</string> <string name="muted_by" msgid="6147073845094180001">"靜音設定者：<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"您裝置的系統發生問題，回復原廠設定後即可解決該問題。"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"您裝置的系統發生問題，請聯絡您的製造商瞭解詳情。"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD 要求已修改為 DIAL 要求。"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD 要求已修改為 SS 要求。"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD 要求已修改為新的 USSD 要求。"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD 要求已修改為影片 DIAL 要求。"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS 要求已修改為 DIAL 要求。"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS 要求已修改為影片 DIAL 要求。"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 要求已修改為 USSD 要求。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 要求已修改為新的 SS 要求。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"工作設定檔"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index f050dfe673ca..4f2492f2d337 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"關機"</string> <string name="global_action_emergency" msgid="7112311161137421166">"緊急電話"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"錯誤報告"</string> + <string name="global_action_logout" msgid="935179188218826050">"結束"</string> <string name="bugreport_title" msgid="2667494803742548533">"取得錯誤報告"</string> <string name="bugreport_message" msgid="398447048750350456">"這會收集你目前裝置狀態的相關資訊，以便透過電子郵件傳送。從錯誤報告開始建立到準備傳送的這段過程可能需要一點時間，敬請耐心等候。"</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"互動式報告"</string> @@ -1498,6 +1499,8 @@ <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="disable_accessibility_shortcut" msgid="627625354248453445">"停用捷徑"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"使用捷徑"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"色彩反轉"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"色彩校正"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"協助工具捷徑啟用了「<xliff:g id="SERVICE_NAME">%1$s</xliff:g>」"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"協助工具捷徑停用了「<xliff:g id="SERVICE_NAME">%1$s</xliff:g>」"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"輕觸 [協助工具] 按鈕後，選擇你想使用的功能："</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"週間晚上"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"週末"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"活動"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"睡眠"</string> <string name="muted_by" msgid="6147073845094180001">"由 <xliff:g id="THIRD_PARTY">%1$s</xliff:g> 設為靜音"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"你的裝置發生內部問題，必須將裝置恢復原廠設定才能解除不穩定狀態。"</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"你的裝置發生內部問題，詳情請洽裝置製造商。"</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"USSD 要求已改為 DIAL 要求。"</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"USSD 要求已改為 SS 要求。"</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"USSD 要求已改為新的 USSD 要求。"</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"USSD 要求已改為影片 DIAL 要求。"</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"SS 要求已改為 DIAL 要求。"</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"SS 要求已改為影片 DIAL 要求。"</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 要求已改為 USSD 要求。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 要求已改為新的 SS 要求。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work 設定檔"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 3311d79ab27c..2977a85c7a3d 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -212,6 +212,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Vala amandla"</string> <string name="global_action_emergency" msgid="7112311161137421166">"Isimo esiphuthumayo"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Umbiko wephutha"</string> + <string name="global_action_logout" msgid="935179188218826050">"Phothula isikhathi"</string> <string name="bugreport_title" msgid="2667494803742548533">"Thatha umbiko wesiphazamiso"</string> <string name="bugreport_message" msgid="398447048750350456">"Lokhu kuzoqoqa ulwazi mayelana nesimo samanje sedivayisi yakho, ukuthumela imilayezo ye-imeyili. Kuzothatha isikhathi esincane kusuka ekuqaleni umbiko wesiphazamiso uze ulungele ukuthunyelwa; sicela ubekezele."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Umbiko obandakanyayo"</string> @@ -1498,6 +1499,8 @@ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"Uma kuvulwe isinqamuleli, ukucindezela zombili izinkinobho zevolumu amasekhondi angu-3 kuzoqala isici sokufinyelela.\n\n Isici samanje sokufinyelela:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n Ungashintsha isici kuzilungiselelo > Ukufinyelela."</string> <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Vala isinqamuleli"</string> <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Sebenzisa isinqamuleli"</string> + <string name="color_inversion_feature_name" msgid="4231186527799958644">"Ukuguqulwa kombala"</string> + <string name="color_correction_feature_name" msgid="6779391426096954933">"Ukulungiswa kombala"</string> <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Isinqamuleli sokufinyelela sivule i-<xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Isinqamuleli sokufinyelela sivale i-<xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string> <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Khetha isici ozosisebenzisa uma uthepha inkinobho yokufinyelela:"</string> @@ -1684,13 +1687,16 @@ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Ubusuku beviki"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Ngempelasonto"</string> <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Umcimbi"</string> + <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Ulele"</string> <string name="muted_by" msgid="6147073845094180001">"Ithuliswe ngu-<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> <string name="system_error_wipe_data" msgid="6608165524785354962">"Kukhona inkinga yangaphakathi ngedivayisi yakho, futhi ingase ibe engazinzile kuze kube yilapho usetha kabusha yonke idatha."</string> <string name="system_error_manufacturer" msgid="8086872414744210668">"Kukhona inkinga yangaphakathi ngedivayisi yakho. Xhumana nomkhiqizi wakho ukuze uthole imininingwane."</string> <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Isicelo se-USSD siguqulelwe kusicelo se-DIAL."</string> <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Isicelo se-USSD siguqulelwe kusicelo se-SS."</string> <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Isicelo se-USSD siguqulelwe kusicelo esisha se-USSD."</string> + <string name="stk_cc_ussd_to_dial_video" msgid="585340552561515305">"Isicelo se-USSD siguqulelwe kusicelo se-DIAL."</string> <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Isicelo se-SS siguqulelwe kusicelo se-DIAL."</string> + <string name="stk_cc_ss_to_dial_video" msgid="4306210904450719045">"Isicelo se-SS siguqulelwe kusicelo se-DIAL."</string> <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Isicelo se-SS siguqulelwe kusicelo se-USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Isicelo se-SS siguqulelwe kusicelo esisha se-SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Iphrofayela yomsebenzi"</string> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index e87b9d80a58e..efbe9c2566fe 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1375,6 +1375,13 @@ {@link android.os.Build.VERSION#CODENAME Build.VERSION.CODENAME}. --> <attr name="compileSdkVersionCodename" format="string" /> + <!-- The (optional) fully-qualified name for a subclass of + {@link android.app.AppComponentFactory} that the system uses to instantiate + every other manifest defined class. Most applications + don't need this attribute. If it's not specified, the system + instantiates items without it.--> + <attr name="appComponentFactory" format="string" /> + <!-- The <code>manifest</code> tag is the root of an <code>AndroidManifest.xml</code> file, describing the contents of an Android package (.apk) file. One @@ -1546,6 +1553,8 @@ <!-- Declares the kind of classloader this application's classes must be loaded with --> <attr name="classLoader" /> + <attr name="appComponentFactory" /> + </declare-styleable> <!-- The <code>permission</code> tag declares a security permission that can be used to control access from other packages to specific components or diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 9a26229d5946..dc791cf68b6b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1295,6 +1295,22 @@ <integer-array name="config_autoBrightnessLcdBacklightValues"> </integer-array> + <!-- Array of desired screen brightness in nits corresponding to the lux values + in the config_autoBrightnessLevels array. As with config_screenBrightnessMinimumNits and + config_screenBrightnessMaximumNits, the display brightness is defined as the measured + brightness of an all-white image. + + If this is defined then: + - config_autoBrightnessLcdBacklightValues should not be defined + - config_screenBrightnessMinimumNits must be defined + - config_screenBrightnessMaximumNits must be defined + + This array should have size one greater than the size of the config_autoBrightnessLevels + array. The brightness values must be non-negative and non-decreasing. This must be + overridden in platform specific overlays --> + <array name="config_autoBrightnessDisplayValuesNits"> + </array> + <!-- Array of output values for button backlight corresponding to the LUX values in the config_autoBrightnessLevels array. This array should have size one greater than the size of the config_autoBrightnessLevels array. @@ -1331,6 +1347,29 @@ <item>200</item> </integer-array> + <!-- The minimum brightness of the display in nits. On OLED displays this should be measured + with an all white image while the display is fully on and the backlight is set to + config_screenBrightnessSettingMinimum or config_screenBrightnessSettingDark, whichever + is darker. + + If this and config_screenBrightnessMinimumNits are set, then the display's brightness + range is assumed to be linear between + (config_screenBrightnessSettingMinimum, config_screenBrightnessMinimumNits) and + (config_screenBrightnessSettingMaximum, config_screenBrightnessMaximumNits). --> + <item name="config_screenBrightnessMinimumNits" format="float" type="dimen">-1.0</item> + + <!-- The maximum brightness of the display in nits. On OLED displays this should be measured + with an all white image while the display is fully on and the "backlight" is set to + config_screenBrightnessSettingMaximum. Note that this value should *not* reflect the + maximum brightness value for any high brightness modes but only the maximum brightness + value obtainable in a sustainable manner. + + If this and config_screenBrightnessMinimumNits are set to something non-negative, then the + display's brightness range is assumed to be linear between + (config_screenBrightnessSettingMinimum, config_screenBrightnessMaximumNits) and + (config_screenBrightnessSettingMaximum, config_screenBrightnessMaximumNits). --> + <item name="config_screenBrightnessMaximumNits" format="float" type="dimen">-1.0</item> + <!-- Array of ambient lux threshold values. This is used for determining hysteresis constraint values by calculating the index to use for lookup and then setting the constraint value to the corresponding value of the array. The new brightening hysteresis constraint value @@ -2058,6 +2097,10 @@ movement threshold where scrolling should begin. --> <dimen name="config_viewConfigurationTouchSlop">8dp</dimen> + <!-- Base "hover slop" value used by ViewConfiguration as a + movement threshold under which hover is considered "stationary". --> + <dimen name="config_viewConfigurationHoverSlop">4dp</dimen> + <!-- Minimum velocity to initiate a fling, as measured in dips per second. --> <dimen name="config_viewMinFlingVelocity">50dp</dimen> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 373a65664695..8540ff1182ff 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2859,6 +2859,7 @@ <!-- @hide @SystemApi --> <public name="isVrOnly"/> <public name="widgetFeatures" /> + <public name="appComponentFactory" /> </public-group> <public-group type="style" first-id="0x010302e0"> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 69d27fc7059f..4b2424ffd213 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -470,6 +470,7 @@ <java-symbol type="dimen" name="config_minScrollbarTouchTarget" /> <java-symbol type="dimen" name="config_prefDialogWidth" /> <java-symbol type="dimen" name="config_viewConfigurationTouchSlop" /> + <java-symbol type="dimen" name="config_viewConfigurationHoverSlop" /> <java-symbol type="dimen" name="config_viewMinFlingVelocity" /> <java-symbol type="dimen" name="config_viewMaxFlingVelocity" /> <java-symbol type="dimen" name="config_scrollbarSize" /> @@ -3185,4 +3186,8 @@ <java-symbol type="string" name="global_action_logout" /> <java-symbol type="drawable" name="ic_logout" /> + + <java-symbol type="dimen" name="config_screenBrightnessMinimumNits" /> + <java-symbol type="dimen" name="config_screenBrightnessMaximumNits" /> + <java-symbol type="array" name="config_autoBrightnessDisplayValuesNits" /> </resources> diff --git a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java index aefc47e95512..c19a343957c0 100644 --- a/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java +++ b/core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java @@ -42,7 +42,8 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest -@Presubmit +// TODO: b/70616950 +//@Presubmit public class ObjectPoolTests { // 1. Check if two obtained objects from pool are not the same. diff --git a/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java new file mode 100644 index 000000000000..bad0d258a54c --- /dev/null +++ b/core/tests/coretests/src/android/hardware/display/BrightnessConfigurationTest.java @@ -0,0 +1,187 @@ +/* + * 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.hardware.display; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import android.os.Parcel; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.util.Pair; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.Arrays; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class BrightnessConfigurationTest { + private static final float[] LUX_LEVELS = { + 0f, + 10f, + 100f, + }; + + private static final float[] NITS_LEVELS = { + 0.5f, + 90f, + 100f, + }; + + @Test + public void testSetCurveIsUnmodified() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(LUX_LEVELS, NITS_LEVELS); + BrightnessConfiguration config = builder.build(); + Pair<float[], float[]> curve = config.getCurve(); + assertArrayEquals(LUX_LEVELS, curve.first, "lux"); + assertArrayEquals(NITS_LEVELS, curve.second, "nits"); + } + + @Test(expected = IllegalArgumentException.class) + public void testCurveMustHaveZeroLuxPoint() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + float[] lux = Arrays.copyOf(LUX_LEVELS, LUX_LEVELS.length); + lux[0] = 1f; + builder.setCurve(lux, NITS_LEVELS); + } + + @Test(expected = IllegalStateException.class) + public void testCurveMustBeSet() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.build(); + } + + @Test(expected = NullPointerException.class) + public void testCurveMustNotHaveNullArrays() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(null, null); + } + + @Test(expected = IllegalArgumentException.class) + public void testCurveMustNotHaveEmptyArrays() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(new float[0], new float[0]); + } + + @Test + public void testCurveMustNotHaveArraysOfDifferentLengths() { + assertThrows(IllegalArgumentException.class, () -> { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + float[] lux = Arrays.copyOf(LUX_LEVELS, LUX_LEVELS.length + 1); + lux[lux.length - 1] = lux[lux.length - 2] + 1; + boolean exceptionThrown = false; + builder.setCurve(lux, NITS_LEVELS); + }); + + assertThrows(IllegalArgumentException.class, () -> { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + float[] nits = Arrays.copyOf(NITS_LEVELS, NITS_LEVELS.length + 1); + nits[nits.length - 1] = nits[nits.length - 2] + 1; + builder.setCurve(LUX_LEVELS, nits); + }); + } + + @Test + public void testCurvesMustNotContainNaN() { + assertThrows(IllegalArgumentException.class, () -> { + float[] lux = Arrays.copyOf(LUX_LEVELS, LUX_LEVELS.length); + lux[lux.length - 1] = Float.NaN; + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(lux, NITS_LEVELS); + }); + + assertThrows(IllegalArgumentException.class, () -> { + float[] nits = Arrays.copyOf(NITS_LEVELS, NITS_LEVELS.length); + nits[nits.length - 1] = Float.NaN; + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(LUX_LEVELS, nits); + }); + } + + + @Test + public void testParceledConfigIsEquivalent() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(LUX_LEVELS, NITS_LEVELS); + BrightnessConfiguration config = builder.build(); + Parcel p = Parcel.obtain(); + p.writeParcelable(config, 0 /*flags*/); + p.setDataPosition(0); + BrightnessConfiguration newConfig = + p.readParcelable(BrightnessConfiguration.class.getClassLoader()); + assertEquals(config, newConfig); + } + + @Test + public void testEquals() { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(LUX_LEVELS, NITS_LEVELS); + BrightnessConfiguration baseConfig = builder.build(); + + builder = new BrightnessConfiguration.Builder(); + builder.setCurve(LUX_LEVELS, NITS_LEVELS); + BrightnessConfiguration identicalConfig = builder.build(); + assertEquals(baseConfig, identicalConfig); + assertEquals("hashCodes must be equal for identical configs", + baseConfig.hashCode(), identicalConfig.hashCode()); + + float[] lux = Arrays.copyOf(LUX_LEVELS, LUX_LEVELS.length); + lux[lux.length - 1] = lux[lux.length - 1] * 2; + builder = new BrightnessConfiguration.Builder(); + builder.setCurve(lux, NITS_LEVELS); + BrightnessConfiguration luxDifferConfig = builder.build(); + assertNotEquals(baseConfig, luxDifferConfig); + + float[] nits = Arrays.copyOf(NITS_LEVELS, NITS_LEVELS.length); + nits[nits.length - 1] = nits[nits.length - 1] * 2; + builder = new BrightnessConfiguration.Builder(); + builder.setCurve(LUX_LEVELS, nits); + BrightnessConfiguration nitsDifferConfig = builder.build(); + assertNotEquals(baseConfig, nitsDifferConfig); + } + + private static void assertArrayEquals(float[] expected, float[] actual, String name) { + assertEquals("Expected " + name + " arrays to be the same length!", + expected.length, actual.length); + for (int i = 0; i < expected.length; i++) { + assertEquals("Expected " + name + " arrays to be equivalent when value " + i + + "differs", expected[i], actual[i], 0.01 /*tolerance*/); + } + } + + private interface ExceptionRunnable { + void run() throws Exception; + } + + private static void assertThrows(Class<? extends Throwable> exceptionClass, + ExceptionRunnable r) { + try { + r.run(); + } catch (Throwable e) { + assertTrue("Expected exception type " + exceptionClass.getName() + " but got " + + e.getClass().getName(), exceptionClass.isAssignableFrom(e.getClass())); + return; + } + fail("Expected exception type " + exceptionClass.getName() + + ", but no exception was thrown"); + } +} diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 0982a4b58c99..b03f0540064f 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -367,6 +367,7 @@ public class SettingsBackupTest { Settings.Global.ENABLE_GPU_DEBUG_LAYERS, Settings.Global.GPU_DEBUG_APP, Settings.Global.GPU_DEBUG_LAYERS, + Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.NETWORK_ACCESS_TIMEOUT_MS, Settings.Global.WARNING_TEMPERATURE, Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY, diff --git a/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java index 33cd328a6d80..e6ac68294564 100644 --- a/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java +++ b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java @@ -16,6 +16,9 @@ package com.android.internal.inputmethod; +import static android.view.inputmethod.InputMethodManager.CONTROL_WINDOW_IS_TEXT_EDITOR; +import static android.view.inputmethod.InputMethodManager.CONTROL_WINDOW_VIEW_HAS_FOCUS; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.in; import static org.hamcrest.Matchers.not; @@ -31,6 +34,7 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.res.Configuration; import android.content.res.Resources; +import android.os.Build; import android.os.LocaleList; import android.os.Parcel; import android.support.test.InstrumentationRegistry; @@ -1410,4 +1414,29 @@ public class InputMethodUtilsTest { assertEquals(new Locale("a b c"), InputMethodUtils.constructLocaleFromString("a b c")); assertEquals(new Locale("en-US"), InputMethodUtils.constructLocaleFromString("en-US")); } + + @Test + public void testIsSoftInputModeStateVisibleAllowed() { + // On pre-P devices, SOFT_INPUT_STATE_VISIBLE/SOFT_INPUT_STATE_ALWAYS_VISIBLE are always + // allowed, regardless of the focused view state. + assertTrue(InputMethodUtils.isSoftInputModeStateVisibleAllowed( + Build.VERSION_CODES.O_MR1, 0)); + assertTrue(InputMethodUtils.isSoftInputModeStateVisibleAllowed( + Build.VERSION_CODES.O_MR1, CONTROL_WINDOW_VIEW_HAS_FOCUS)); + assertTrue(InputMethodUtils.isSoftInputModeStateVisibleAllowed( + Build.VERSION_CODES.O_MR1, + CONTROL_WINDOW_VIEW_HAS_FOCUS | CONTROL_WINDOW_IS_TEXT_EDITOR)); + + // On P+ devices, SOFT_INPUT_STATE_VISIBLE/SOFT_INPUT_STATE_ALWAYS_VISIBLE are allowed only + // when there is a focused View and its View#onCheckIsTextEditor() returns true. + assertFalse(InputMethodUtils.isSoftInputModeStateVisibleAllowed( + Build.VERSION_CODES.P, 0)); + assertFalse(InputMethodUtils.isSoftInputModeStateVisibleAllowed( + Build.VERSION_CODES.P, CONTROL_WINDOW_VIEW_HAS_FOCUS)); + assertTrue(InputMethodUtils.isSoftInputModeStateVisibleAllowed( + Build.VERSION_CODES.P, + CONTROL_WINDOW_VIEW_HAS_FOCUS | CONTROL_WINDOW_IS_TEXT_EDITOR)); + + } + } diff --git a/keystore/java/android/security/IKeyChainService.aidl b/keystore/java/android/security/IKeyChainService.aidl index b4331b21cf13..eca52cc3e8b6 100644 --- a/keystore/java/android/security/IKeyChainService.aidl +++ b/keystore/java/android/security/IKeyChainService.aidl @@ -16,6 +16,7 @@ package android.security; import android.content.pm.StringParceledListSlice; +import android.security.keymaster.KeymasterCertificateChain; import android.security.keystore.ParcelableKeyGenParameterSpec; /** @@ -33,6 +34,7 @@ interface IKeyChainService { void setUserSelectable(String alias, boolean isUserSelectable); boolean generateKeyPair(in String algorithm, in ParcelableKeyGenParameterSpec spec); + boolean attestKey(in String alias, in byte[] challenge, out KeymasterCertificateChain chain); // APIs used by CertInstaller and DevicePolicyManager String installCaCertificate(in byte[] caCertificate); diff --git a/keystore/java/android/security/keystore/AttestationUtils.java b/keystore/java/android/security/keystore/AttestationUtils.java index cf4347d14d6d..0811100f74c7 100644 --- a/keystore/java/android/security/keystore/AttestationUtils.java +++ b/keystore/java/android/security/keystore/AttestationUtils.java @@ -73,6 +73,33 @@ public abstract class AttestationUtils { public static final int ID_TYPE_MEID = 3; /** + * Creates an array of X509Certificates from the provided KeymasterCertificateChain. + * + * @hide Only called by the DevicePolicyManager. + */ + @NonNull public static X509Certificate[] parseCertificateChain( + final KeymasterCertificateChain kmChain) throws + KeyAttestationException { + // Extract certificate chain. + final Collection<byte[]> rawChain = kmChain.getCertificates(); + if (rawChain.size() < 2) { + throw new KeyAttestationException("Attestation certificate chain contained " + + rawChain.size() + " entries. At least two are required."); + } + final ByteArrayOutputStream concatenatedRawChain = new ByteArrayOutputStream(); + try { + for (final byte[] cert : rawChain) { + concatenatedRawChain.write(cert); + } + return CertificateFactory.getInstance("X.509").generateCertificates( + new ByteArrayInputStream(concatenatedRawChain.toByteArray())) + .toArray(new X509Certificate[0]); + } catch (Exception e) { + throw new KeyAttestationException("Unable to construct certificate chain", e); + } + } + + /** * Performs attestation of the device's identifiers. This method returns a certificate chain * whose first element contains the requested device identifiers in an extension. The device's * manufacturer, model, brand, device and product are always also included in the attestation. @@ -173,22 +200,18 @@ public abstract class AttestationUtils { KeyStore.getKeyStoreException(errorCode)); } - // Extract certificate chain. - final Collection<byte[]> rawChain = outChain.getCertificates(); - if (rawChain.size() < 2) { - throw new DeviceIdAttestationException("Attestation certificate chain contained " - + rawChain.size() + " entries. At least two are required."); - } - final ByteArrayOutputStream concatenatedRawChain = new ByteArrayOutputStream(); try { - for (final byte[] cert : rawChain) { - concatenatedRawChain.write(cert); - } - return CertificateFactory.getInstance("X.509").generateCertificates( - new ByteArrayInputStream(concatenatedRawChain.toByteArray())) - .toArray(new X509Certificate[0]); - } catch (Exception e) { - throw new DeviceIdAttestationException("Unable to construct certificate chain", e); + return parseCertificateChain(outChain); + } catch (KeyAttestationException e) { + throw new DeviceIdAttestationException(e.getMessage(), e); } } + + /** + * Returns true if the attestation chain provided is a valid key attestation chain. + * @hide + */ + public static boolean isChainValid(KeymasterCertificateChain chain) { + return chain != null && chain.getCertificates().size() >= 2; + } } diff --git a/keystore/java/android/security/keystore/KeyAttestationException.java b/keystore/java/android/security/keystore/KeyAttestationException.java new file mode 100644 index 000000000000..6cf5fb2ff8ef --- /dev/null +++ b/keystore/java/android/security/keystore/KeyAttestationException.java @@ -0,0 +1,46 @@ +/* + * 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.security.keystore; + +/** + * Thrown when {@link AttestationUtils} is unable to attest the given key or handle + * the resulting attestation record. + * + * @hide + */ +public class KeyAttestationException extends Exception { + /** + * Constructs a new {@code KeyAttestationException} with the current stack trace and the + * specified detail message. + * + * @param detailMessage the detail message for this exception. + */ + public KeyAttestationException(String detailMessage) { + super(detailMessage); + } + + /** + * Constructs a new {@code KeyAttestationException} with the current stack trace, the + * specified detail message and the specified cause. + * + * @param message the detail message for this exception. + * @param cause the cause of this exception, may be {@code null}. + */ + public KeyAttestationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java index 87677d479471..1238d8774e58 100644 --- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java +++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java @@ -680,6 +680,40 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec { } /** + * A Builder constructor taking in an already-built KeyGenParameterSpec, useful for + * changing values of the KeyGenParameterSpec quickly. + * @hide Should be used internally only. + */ + public Builder(@NonNull KeyGenParameterSpec sourceSpec) { + this(sourceSpec.getKeystoreAlias(), sourceSpec.getPurposes()); + mUid = sourceSpec.getUid(); + mKeySize = sourceSpec.getKeySize(); + mSpec = sourceSpec.getAlgorithmParameterSpec(); + mCertificateSubject = sourceSpec.getCertificateSubject(); + mCertificateSerialNumber = sourceSpec.getCertificateSerialNumber(); + mCertificateNotBefore = sourceSpec.getCertificateNotBefore(); + mCertificateNotAfter = sourceSpec.getCertificateNotAfter(); + mKeyValidityStart = sourceSpec.getKeyValidityStart(); + mKeyValidityForOriginationEnd = sourceSpec.getKeyValidityForOriginationEnd(); + mKeyValidityForConsumptionEnd = sourceSpec.getKeyValidityForConsumptionEnd(); + mPurposes = sourceSpec.getPurposes(); + if (sourceSpec.isDigestsSpecified()) { + mDigests = sourceSpec.getDigests(); + } + mEncryptionPaddings = sourceSpec.getEncryptionPaddings(); + mSignaturePaddings = sourceSpec.getSignaturePaddings(); + mBlockModes = sourceSpec.getBlockModes(); + mRandomizedEncryptionRequired = sourceSpec.isRandomizedEncryptionRequired(); + mUserAuthenticationRequired = sourceSpec.isUserAuthenticationRequired(); + mUserAuthenticationValidityDurationSeconds = + sourceSpec.getUserAuthenticationValidityDurationSeconds(); + mAttestationChallenge = sourceSpec.getAttestationChallenge(); + mUniqueIdIncluded = sourceSpec.isUniqueIdIncluded(); + mUserAuthenticationValidWhileOnBody = sourceSpec.isUserAuthenticationValidWhileOnBody(); + mInvalidatedByBiometricEnrollment = sourceSpec.isInvalidatedByBiometricEnrollment(); + } + + /** * Sets the UID which will own the key. * * @param uid UID or {@code -1} for the UID of the current process. diff --git a/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java b/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java index 73b489f98e1d..254b6be77ea8 100644 --- a/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java +++ b/keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java @@ -55,7 +55,7 @@ public final class ParcelableKeyGenParameterSpecTest { static final int USER_AUTHENTICATION_DURATION = 300; static final byte[] ATTESTATION_CHALLENGE = new byte[] {'c', 'h'}; - KeyGenParameterSpec configureDefaultSpec() { + public static KeyGenParameterSpec configureDefaultSpec() { return new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES) .setUid(UID) .setKeySize(KEYSIZE) @@ -80,7 +80,7 @@ public final class ParcelableKeyGenParameterSpecTest { .build(); } - void validateSpecValues(KeyGenParameterSpec spec, int uid, String alias) { + public static void validateSpecValues(KeyGenParameterSpec spec, int uid, String alias) { assertThat(spec.getKeystoreAlias(), is(alias)); assertThat(spec.getPurposes(), is(KEY_PURPOSES)); assertThat(spec.getUid(), is(uid)); diff --git a/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java b/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java new file mode 100644 index 000000000000..865cad472eb5 --- /dev/null +++ b/keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java @@ -0,0 +1,64 @@ +/* + * 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.security.keystore; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +import android.security.keystore.KeyGenParameterSpec; +import android.security.keystore.KeyProperties; +import android.security.ParcelableKeyGenParameterSpecTest; +import android.support.test.runner.AndroidJUnit4; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** Unit tests for {@link KeyGenParameterSpec}. */ +@RunWith(AndroidJUnit4.class) +public final class KeyGenParameterSpecTest { + static final String ALIAS = "keystore-alias"; + static final int KEY_PURPOSES = KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY; + + @Test + public void testBuilderCopyingValues() { + KeyGenParameterSpec spec = ParcelableKeyGenParameterSpecTest.configureDefaultSpec(); + KeyGenParameterSpec copiedSpec = + new KeyGenParameterSpec.Builder(spec).build(); + ParcelableKeyGenParameterSpecTest.validateSpecValues( + copiedSpec, spec.getUid(), spec.getKeystoreAlias()); + } + + @Test + public void testBuilderCopyingEmptyValues() { + KeyGenParameterSpec spec = new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES).build(); + KeyGenParameterSpec copiedSpec = new KeyGenParameterSpec.Builder(spec).build(); + + assertThat(copiedSpec.getKeystoreAlias(), is(ALIAS)); + assertThat(copiedSpec.getPurposes(), is(KEY_PURPOSES)); + } + + @Test + public void testCanModifyValuesInCopiedBuilder() { + KeyGenParameterSpec spec = ParcelableKeyGenParameterSpecTest.configureDefaultSpec(); + KeyGenParameterSpec copiedSpec = + new KeyGenParameterSpec.Builder(spec) + .setAttestationChallenge(null) + .build(); + + assertEquals(copiedSpec.getAttestationChallenge(), null); + } +} diff --git a/libs/hwui/ProfileDataContainer.cpp b/libs/hwui/ProfileDataContainer.cpp index 8e0b4e2eef5b..38e0f0aa8d83 100644 --- a/libs/hwui/ProfileDataContainer.cpp +++ b/libs/hwui/ProfileDataContainer.cpp @@ -21,6 +21,7 @@ #include <cutils/ashmem.h> #include <log/log.h> +#include <errno.h> #include <sys/mman.h> namespace android { diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index 4ba368f35bfd..9db39d954e4c 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -22,8 +22,6 @@ #include <SkOverdrawColorFilter.h> #include <SkPicture.h> #include <SkPictureRecorder.h> -#include <SkPixelSerializer.h> -#include <SkStream.h> #include "VectorDrawable.h" #include "utils/TraceUtils.h" @@ -207,19 +205,6 @@ void SkiaPipeline::prepareToDraw(const RenderThread& thread, Bitmap* bitmap) { } } -// Encodes to PNG, unless there is already encoded data, in which case that gets -// used. -class PngPixelSerializer : public SkPixelSerializer { -public: - bool onUseEncodedData(const void*, size_t) override { return true; } - SkData* onEncode(const SkPixmap& pixmap) override { - SkDynamicMemoryWStream buf; - return SkEncodeImage(&buf, pixmap, SkEncodedImageFormat::kPNG, 100) - ? buf.detachAsData().release() - : nullptr; - } -}; - void SkiaPipeline::renderVectorDrawableCache() { if (!mVectorDrawables.empty()) { sp<VectorDrawableAtlas> atlas = mRenderThread.cacheManager().acquireVectorDrawableAtlas(); @@ -296,9 +281,7 @@ void SkiaPipeline::endCapture(SkSurface* surface) { sk_sp<SkPicture> picture = mRecorder->finishRecordingAsPicture(); surface->getCanvas()->drawPicture(picture); if (picture->approximateOpCount() > 0) { - SkDynamicMemoryWStream stream; - PngPixelSerializer serializer; - picture->serialize(&stream, &serializer); + auto data = picture->serialize(); // offload saving to file in a different thread if (!mSavePictureProcessor.get()) { @@ -307,10 +290,10 @@ void SkiaPipeline::endCapture(SkSurface* surface) { taskManager->canRunTasks() ? taskManager : nullptr); } if (1 == mCaptureSequence) { - mSavePictureProcessor->savePicture(stream.detachAsData(), mCapturedFile); + mSavePictureProcessor->savePicture(data, mCapturedFile); } else { mSavePictureProcessor->savePicture( - stream.detachAsData(), + data, mCapturedFile + "_" + std::to_string(mCaptureSequence)); } mCaptureSequence--; diff --git a/libs/incident/Android.mk b/libs/incident/Android.mk index 439e86deba5d..8aa4b107c25e 100644 --- a/libs/incident/Android.mk +++ b/libs/incident/Android.mk @@ -36,6 +36,7 @@ LOCAL_SRC_FILES := \ src/IncidentReportArgs.cpp LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include +LOCAL_PROTO_OPTIMIZE_TYPE := lite include $(BUILD_SHARED_LIBRARY) diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java index d66fd9c48b88..072a7fefb665 100644 --- a/location/java/android/location/GnssMeasurementsEvent.java +++ b/location/java/android/location/GnssMeasurementsEvent.java @@ -49,7 +49,7 @@ public final class GnssMeasurementsEvent implements Parcelable { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_LOCATION_DISABLED}) + @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_LOCATION_DISABLED, STATUS_NOT_ALLOWED}) public @interface GnssMeasurementsStatus {} /** @@ -72,6 +72,12 @@ public final class GnssMeasurementsEvent implements Parcelable { public static final int STATUS_LOCATION_DISABLED = 2; /** + * The client is not allowed to register for GNSS Measurements in general or in the + * requested mode. + */ + public static final int STATUS_NOT_ALLOWED = 3; + + /** * Reports the latest collected GNSS Measurements. */ public void onGnssMeasurementsReceived(GnssMeasurementsEvent eventArgs) {} diff --git a/location/java/android/location/LocalListenerHelper.java b/location/java/android/location/LocalListenerHelper.java index d7d2c5131606..592d01d2fed6 100644 --- a/location/java/android/location/LocalListenerHelper.java +++ b/location/java/android/location/LocalListenerHelper.java @@ -16,14 +16,14 @@ package android.location; -import com.android.internal.util.Preconditions; - import android.annotation.NonNull; import android.content.Context; import android.os.Handler; import android.os.RemoteException; import android.util.Log; +import com.android.internal.util.Preconditions; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -46,6 +46,11 @@ abstract class LocalListenerHelper<TListener> { mTag = name; } + /** + * Adds a {@param listener} to the list of listeners on which callbacks will be executed. The + * execution will happen on the {@param handler} thread or alternatively in the callback thread + * if a {@code null} handler value is passed. + */ public boolean add(@NonNull TListener listener, Handler handler) { Preconditions.checkNotNull(listener); synchronized (mListeners) { diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index 65e7cedff4af..6abba9543218 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -143,7 +143,7 @@ public final class LocationRequest implements Parcelable { private int mQuality = POWER_LOW; private long mInterval = 60 * 60 * 1000; // 60 minutes - private long mFastestInterval = (long)(mInterval / FASTEST_INTERVAL_FACTOR); // 10 minutes + private long mFastestInterval = (long) (mInterval / FASTEST_INTERVAL_FACTOR); // 10 minutes private boolean mExplicitFastestInterval = false; private long mExpireAt = Long.MAX_VALUE; // no expiry private int mNumUpdates = Integer.MAX_VALUE; // no expiry @@ -151,7 +151,11 @@ public final class LocationRequest implements Parcelable { private WorkSource mWorkSource = null; private boolean mHideFromAppOps = false; // True if this request shouldn't be counted by AppOps - private String mProvider = LocationManager.FUSED_PROVIDER; // for deprecated APIs that explicitly request a provider + private String mProvider = LocationManager.FUSED_PROVIDER; + // for deprecated APIs that explicitly request a provider + + /** If true, GNSS chipset will make strong tradeoffs to substantially restrict power use */ + private boolean mLowPowerMode = false; /** * Create a location request with default parameters. @@ -184,11 +188,11 @@ public final class LocationRequest implements Parcelable { } LocationRequest request = new LocationRequest() - .setProvider(provider) - .setQuality(quality) - .setInterval(minTime) - .setFastestInterval(minTime) - .setSmallestDisplacement(minDistance); + .setProvider(provider) + .setQuality(quality) + .setInterval(minTime) + .setFastestInterval(minTime) + .setSmallestDisplacement(minDistance); if (singleShot) request.setNumUpdates(1); return request; } @@ -220,16 +224,17 @@ public final class LocationRequest implements Parcelable { } LocationRequest request = new LocationRequest() - .setQuality(quality) - .setInterval(minTime) - .setFastestInterval(minTime) - .setSmallestDisplacement(minDistance); + .setQuality(quality) + .setInterval(minTime) + .setFastestInterval(minTime) + .setSmallestDisplacement(minDistance); if (singleShot) request.setNumUpdates(1); return request; } /** @hide */ - public LocationRequest() { } + public LocationRequest() { + } /** @hide */ public LocationRequest(LocationRequest src) { @@ -243,6 +248,7 @@ public final class LocationRequest implements Parcelable { mProvider = src.mProvider; mWorkSource = src.mWorkSource; mHideFromAppOps = src.mHideFromAppOps; + mLowPowerMode = src.mLowPowerMode; } /** @@ -263,8 +269,8 @@ public final class LocationRequest implements Parcelable { * on a location request. * * @param quality an accuracy or power constant - * @throws InvalidArgumentException if the quality constant is not valid * @return the same object, so that setters can be chained + * @throws InvalidArgumentException if the quality constant is not valid */ public LocationRequest setQuality(int quality) { checkQuality(quality); @@ -306,14 +312,14 @@ public final class LocationRequest implements Parcelable { * on a location request. * * @param millis desired interval in millisecond, inexact - * @throws InvalidArgumentException if the interval is less than zero * @return the same object, so that setters can be chained + * @throws InvalidArgumentException if the interval is less than zero */ public LocationRequest setInterval(long millis) { checkInterval(millis); mInterval = millis; if (!mExplicitFastestInterval) { - mFastestInterval = (long)(mInterval / FASTEST_INTERVAL_FACTOR); + mFastestInterval = (long) (mInterval / FASTEST_INTERVAL_FACTOR); } return this; } @@ -327,6 +333,34 @@ public final class LocationRequest implements Parcelable { return mInterval; } + + /** + * Requests the GNSS chipset to run in a low power mode and make strong tradeoffs to + * substantially restrict power. + * + * <p>In this mode, the GNSS chipset will not, on average, run power hungry operations like RF & + * signal searches for more than one second per interval {@link #mInterval} + * + * @param enabled Enable or disable low power mode + * @return the same object, so that setters can be chained + * @hide + */ + @SystemApi + public LocationRequest setLowPowerMode(boolean enabled) { + mLowPowerMode = enabled; + return this; + } + + /** + * Returns true if low power mode is enabled. + * + * @hide + */ + @SystemApi + public boolean isLowPowerMode() { + return mLowPowerMode; + } + /** * Explicitly set the fastest interval for location updates, in * milliseconds. @@ -353,8 +387,8 @@ public final class LocationRequest implements Parcelable { * then your effective fastest interval is {@link #setInterval}. * * @param millis fastest interval for updates in milliseconds, exact - * @throws InvalidArgumentException if the interval is less than zero * @return the same object, so that setters can be chained + * @throws InvalidArgumentException if the interval is less than zero */ public LocationRequest setFastestInterval(long millis) { checkInterval(millis); @@ -397,9 +431,9 @@ public final class LocationRequest implements Parcelable { // Check for > Long.MAX_VALUE overflow (elapsedRealtime > 0): if (millis > Long.MAX_VALUE - elapsedRealtime) { - mExpireAt = Long.MAX_VALUE; + mExpireAt = Long.MAX_VALUE; } else { - mExpireAt = millis + elapsedRealtime; + mExpireAt = millis + elapsedRealtime; } if (mExpireAt < 0) mExpireAt = 0; @@ -448,11 +482,14 @@ public final class LocationRequest implements Parcelable { * to the location manager. * * @param numUpdates the number of location updates requested - * @throws InvalidArgumentException if numUpdates is 0 or less * @return the same object, so that setters can be chained + * @throws InvalidArgumentException if numUpdates is 0 or less */ public LocationRequest setNumUpdates(int numUpdates) { - if (numUpdates <= 0) throw new IllegalArgumentException("invalid numUpdates: " + numUpdates); + if (numUpdates <= 0) { + throw new IllegalArgumentException( + "invalid numUpdates: " + numUpdates); + } mNumUpdates = numUpdates; return this; } @@ -462,6 +499,7 @@ public final class LocationRequest implements Parcelable { * * <p>By default this is {@link Integer#MAX_VALUE}, which indicates that * locations are updated until the request is explicitly removed. + * * @return number of updates */ public int getNumUpdates() { @@ -539,8 +577,8 @@ public final class LocationRequest implements Parcelable { * doesn't have the {@link android.Manifest.permission#UPDATE_APP_OPS_STATS} permission. * * @param hideFromAppOps If true AppOps won't keep track of this location request. - * @see android.app.AppOpsManager * @hide + * @see android.app.AppOpsManager */ @SystemApi public void setHideFromAppOps(boolean hideFromAppOps) { @@ -587,27 +625,29 @@ public final class LocationRequest implements Parcelable { public static final Parcelable.Creator<LocationRequest> CREATOR = new Parcelable.Creator<LocationRequest>() { - @Override - public LocationRequest createFromParcel(Parcel in) { - LocationRequest request = new LocationRequest(); - request.setQuality(in.readInt()); - request.setFastestInterval(in.readLong()); - request.setInterval(in.readLong()); - request.setExpireAt(in.readLong()); - request.setNumUpdates(in.readInt()); - request.setSmallestDisplacement(in.readFloat()); - request.setHideFromAppOps(in.readInt() != 0); - String provider = in.readString(); - if (provider != null) request.setProvider(provider); - WorkSource workSource = in.readParcelable(null); - if (workSource != null) request.setWorkSource(workSource); - return request; - } - @Override - public LocationRequest[] newArray(int size) { - return new LocationRequest[size]; - } - }; + @Override + public LocationRequest createFromParcel(Parcel in) { + LocationRequest request = new LocationRequest(); + request.setQuality(in.readInt()); + request.setFastestInterval(in.readLong()); + request.setInterval(in.readLong()); + request.setExpireAt(in.readLong()); + request.setNumUpdates(in.readInt()); + request.setSmallestDisplacement(in.readFloat()); + request.setHideFromAppOps(in.readInt() != 0); + request.setLowPowerMode(in.readInt() != 0); + String provider = in.readString(); + if (provider != null) request.setProvider(provider); + WorkSource workSource = in.readParcelable(null); + if (workSource != null) request.setWorkSource(workSource); + return request; + } + + @Override + public LocationRequest[] newArray(int size) { + return new LocationRequest[size]; + } + }; @Override public int describeContents() { @@ -623,6 +663,7 @@ public final class LocationRequest implements Parcelable { parcel.writeInt(mNumUpdates); parcel.writeFloat(mSmallestDisplacement); parcel.writeInt(mHideFromAppOps ? 1 : 0); + parcel.writeInt(mLowPowerMode ? 1 : 0); parcel.writeString(mProvider); parcel.writeParcelable(mWorkSource, 0); } @@ -663,9 +704,10 @@ public final class LocationRequest implements Parcelable { s.append(" expireIn="); TimeUtils.formatDuration(expireIn, s); } - if (mNumUpdates != Integer.MAX_VALUE){ + if (mNumUpdates != Integer.MAX_VALUE) { s.append(" num=").append(mNumUpdates); } + s.append(" lowPowerMode=").append(mLowPowerMode); s.append(']'); return s.toString(); } diff --git a/location/java/com/android/internal/location/ProviderRequest.java b/location/java/com/android/internal/location/ProviderRequest.java index 26243e78eb01..45fdb76f1e93 100644 --- a/location/java/com/android/internal/location/ProviderRequest.java +++ b/location/java/com/android/internal/location/ProviderRequest.java @@ -33,6 +33,12 @@ public final class ProviderRequest implements Parcelable { public long interval = Long.MAX_VALUE; /** + * Whether provider shall make stronger than normal tradeoffs to substantially restrict power + * use. + */ + public boolean lowPowerMode = false; + + /** * A more detailed set of requests. * <p>Location Providers can optionally use this to * fine tune location updates, for example when there @@ -41,26 +47,29 @@ public final class ProviderRequest implements Parcelable { */ public List<LocationRequest> locationRequests = new ArrayList<LocationRequest>(); - public ProviderRequest() { } + public ProviderRequest() { + } public static final Parcelable.Creator<ProviderRequest> CREATOR = new Parcelable.Creator<ProviderRequest>() { - @Override - public ProviderRequest createFromParcel(Parcel in) { - ProviderRequest request = new ProviderRequest(); - request.reportLocation = in.readInt() == 1; - request.interval = in.readLong(); - int count = in.readInt(); - for (int i = 0; i < count; i++) { - request.locationRequests.add(LocationRequest.CREATOR.createFromParcel(in)); - } - return request; - } - @Override - public ProviderRequest[] newArray(int size) { - return new ProviderRequest[size]; - } - }; + @Override + public ProviderRequest createFromParcel(Parcel in) { + ProviderRequest request = new ProviderRequest(); + request.reportLocation = in.readInt() == 1; + request.interval = in.readLong(); + request.lowPowerMode = in.readBoolean(); + int count = in.readInt(); + for (int i = 0; i < count; i++) { + request.locationRequests.add(LocationRequest.CREATOR.createFromParcel(in)); + } + return request; + } + + @Override + public ProviderRequest[] newArray(int size) { + return new ProviderRequest[size]; + } + }; @Override public int describeContents() { @@ -71,6 +80,7 @@ public final class ProviderRequest implements Parcelable { public void writeToParcel(Parcel parcel, int flags) { parcel.writeInt(reportLocation ? 1 : 0); parcel.writeLong(interval); + parcel.writeBoolean(lowPowerMode); parcel.writeInt(locationRequests.size()); for (LocationRequest request : locationRequests) { request.writeToParcel(parcel, flags); @@ -85,6 +95,7 @@ public final class ProviderRequest implements Parcelable { s.append("ON"); s.append(" interval="); TimeUtils.formatDuration(interval, s); + s.append(" lowPowerMode=" + lowPowerMode); } else { s.append("OFF"); } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index e628b6825208..fadb76d80fe5 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -16,10 +16,18 @@ package com.android.mediaframeworktest.integration; +import static android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW; + +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.argThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; + import android.graphics.ImageFormat; import android.graphics.SurfaceTexture; import android.hardware.ICameraService; -import android.hardware.camera2.CameraMetadata; import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CaptureRequest; @@ -41,13 +49,10 @@ import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; import android.view.Surface; -import static android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW; - import com.android.mediaframeworktest.MediaFrameworkIntegrationTestRunner; import org.mockito.ArgumentCaptor; -import org.mockito.compat.ArgumentMatcher; -import static org.mockito.Mockito.*; +import org.mockito.ArgumentMatcher; public class CameraDeviceBinderTest extends AndroidTestCase { private static String TAG = "CameraDeviceBinderTest"; @@ -166,10 +171,10 @@ public class CameraDeviceBinderTest extends AndroidTestCase { } } - class IsMetadataNotEmpty extends ArgumentMatcher<CameraMetadataNative> { + class IsMetadataNotEmpty implements ArgumentMatcher<CameraMetadataNative> { @Override - public boolean matchesObject(Object obj) { - return !((CameraMetadataNative) obj).isEmpty(); + public boolean matches(CameraMetadataNative obj) { + return !obj.isEmpty(); } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java index 712039decc83..74bf1a20304a 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java @@ -16,13 +16,13 @@ package com.android.mediaframeworktest.unit; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import android.content.ContentProviderClient; import android.content.ContentValues; @@ -36,10 +36,9 @@ import android.provider.MediaStore.Video; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; -import org.hamcrest.Description; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.compat.ArgumentMatcher; public class MediaInserterTest extends InstrumentationTestCase { @@ -59,7 +58,7 @@ public class MediaInserterTest extends InstrumentationTestCase { private static final Uri sImagesUri = Images.Media.getContentUri(sVolumeName); private static final Uri sFilesUri = Files.getContentUri(sVolumeName); - private static class MediaUriMatcher extends ArgumentMatcher<Uri> { + private static class MediaUriMatcher implements ArgumentMatcher<Uri> { private final Uri mUri; private MediaUriMatcher(Uri uri) { @@ -67,15 +66,8 @@ public class MediaInserterTest extends InstrumentationTestCase { } @Override - public boolean matchesObject(Object argument) { - if (!(argument instanceof Uri)) { - return false; - } - - Uri actualUri = (Uri) argument; - if (actualUri == mUri) - return true; - return false; + public boolean matches(Uri actualUri) { + return actualUri == mUri; } @Override diff --git a/packages/CaptivePortalLogin/OWNERS b/packages/CaptivePortalLogin/OWNERS index 2d71c2013093..6f77e04da3c0 100644 --- a/packages/CaptivePortalLogin/OWNERS +++ b/packages/CaptivePortalLogin/OWNERS @@ -1,10 +1,7 @@ set noparent -per-file Android.mk = build.master@android.com -per-file Android.mk = ek@google.com -per-file Android.mk = hugobenichi@google.com -per-file Android.mk = lorenzo@google.com - ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/packages/InputDevices/res/values-af/strings.xml b/packages/InputDevices/res/values-af/strings.xml index 43010192e454..badeb6d771fa 100644 --- a/packages/InputDevices/res/values-af/strings.xml +++ b/packages/InputDevices/res/values-af/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spaans (Latyn)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letties"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persies"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Aserbeidjaans"</string> </resources> diff --git a/packages/InputDevices/res/values-am/strings.xml b/packages/InputDevices/res/values-am/strings.xml index ce3659ab38a5..2375bd487494 100644 --- a/packages/InputDevices/res/values-am/strings.xml +++ b/packages/InputDevices/res/values-am/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ስፓኒሽ (ላቲን)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ላትቪያኛ"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ፋርስኛ"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"አዘርባይጃንኛ"</string> </resources> diff --git a/packages/InputDevices/res/values-ar/strings.xml b/packages/InputDevices/res/values-ar/strings.xml index 2b0a6f99b03e..0263a683a3bd 100644 --- a/packages/InputDevices/res/values-ar/strings.xml +++ b/packages/InputDevices/res/values-ar/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"الإسبانية (اللاتينية)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"اللاتفية"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"الفارسية"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"الأذربيجانية"</string> </resources> diff --git a/packages/InputDevices/res/values-az/strings.xml b/packages/InputDevices/res/values-az/strings.xml index a1f7c1c95b34..e0286eee07d1 100644 --- a/packages/InputDevices/res/values-az/strings.xml +++ b/packages/InputDevices/res/values-az/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"İspan (Latın)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latış"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Fars Dili"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azəri"</string> </resources> diff --git a/packages/InputDevices/res/values-b+sr+Latn/strings.xml b/packages/InputDevices/res/values-b+sr+Latn/strings.xml index c60b59e34e0f..bc9330d13f0a 100644 --- a/packages/InputDevices/res/values-b+sr+Latn/strings.xml +++ b/packages/InputDevices/res/values-b+sr+Latn/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"španski (Latinska Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"letonski"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"persijska"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azerbejdžanska"</string> </resources> diff --git a/packages/InputDevices/res/values-be/strings.xml b/packages/InputDevices/res/values-be/strings.xml index e93d03a72abe..cfe078ed84ea 100644 --- a/packages/InputDevices/res/values-be/strings.xml +++ b/packages/InputDevices/res/values-be/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Іспанская (Лацінская Амерыка)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латышская"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Персідская"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Азербайджанская"</string> </resources> diff --git a/packages/InputDevices/res/values-bg/strings.xml b/packages/InputDevices/res/values-bg/strings.xml index ee5cfa890610..a520a80c8184 100644 --- a/packages/InputDevices/res/values-bg/strings.xml +++ b/packages/InputDevices/res/values-bg/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Исп. клав. подредба (Лат. Америка)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"латвийски"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"персийски"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"азербайджански"</string> </resources> diff --git a/packages/InputDevices/res/values-bn/strings.xml b/packages/InputDevices/res/values-bn/strings.xml index 945c89138e54..5f8877afa6c3 100644 --- a/packages/InputDevices/res/values-bn/strings.xml +++ b/packages/InputDevices/res/values-bn/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"স্প্যানিশ (ল্যাটিন)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"লাটভিও"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ফার্সী"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-bs/strings.xml b/packages/InputDevices/res/values-bs/strings.xml index ca1b8ff67d5e..c16b266dd64d 100644 --- a/packages/InputDevices/res/values-bs/strings.xml +++ b/packages/InputDevices/res/values-bs/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"španski (Latinska Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"latvijski"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"perzijski"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azerbejdžanski"</string> </resources> diff --git a/packages/InputDevices/res/values-ca/strings.xml b/packages/InputDevices/res/values-ca/strings.xml index 3c6ea158a2a3..fe8e8095e92c 100644 --- a/packages/InputDevices/res/values-ca/strings.xml +++ b/packages/InputDevices/res/values-ca/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espanyol (llatí)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letó"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Àzeri"</string> </resources> diff --git a/packages/InputDevices/res/values-cs/strings.xml b/packages/InputDevices/res/values-cs/strings.xml index a78663b4ab36..a571f942a1f3 100644 --- a/packages/InputDevices/res/values-cs/strings.xml +++ b/packages/InputDevices/res/values-cs/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"španělština (Latinská Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lotyšská klávesnice"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"perština"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"ázerbájdžánština"</string> </resources> diff --git a/packages/InputDevices/res/values-da/strings.xml b/packages/InputDevices/res/values-da/strings.xml index 08ff4ca40ce2..1943d3574042 100644 --- a/packages/InputDevices/res/values-da/strings.xml +++ b/packages/InputDevices/res/values-da/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spansk (latinamerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lettisk"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persisk"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Aserbajdsjansk"</string> </resources> diff --git a/packages/InputDevices/res/values-de/strings.xml b/packages/InputDevices/res/values-de/strings.xml index 1543ef2d3726..418a3f06e61e 100644 --- a/packages/InputDevices/res/values-de/strings.xml +++ b/packages/InputDevices/res/values-de/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spanisch (Lateinisch)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lettisch"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persisch"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Aserbaidschanisch"</string> </resources> diff --git a/packages/InputDevices/res/values-el/strings.xml b/packages/InputDevices/res/values-el/strings.xml index e5d14090acb4..460d0f8470dd 100644 --- a/packages/InputDevices/res/values-el/strings.xml +++ b/packages/InputDevices/res/values-el/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Ισπανικά (Λατινικής Αμερικής)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Λετονικά"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Περσικά"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Αζερμπαϊτζανικά"</string> </resources> diff --git a/packages/InputDevices/res/values-es-rUS/strings.xml b/packages/InputDevices/res/values-es-rUS/strings.xml index 68fcfd7d6035..e6c12a709442 100644 --- a/packages/InputDevices/res/values-es-rUS/strings.xml +++ b/packages/InputDevices/res/values-es-rUS/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Español (latino)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letón"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerí"</string> </resources> diff --git a/packages/InputDevices/res/values-es/strings.xml b/packages/InputDevices/res/values-es/strings.xml index 86c82ed75ab4..7f779c05cbef 100644 --- a/packages/InputDevices/res/values-es/strings.xml +++ b/packages/InputDevices/res/values-es/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Español (Latinoamérica)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letón"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerí"</string> </resources> diff --git a/packages/InputDevices/res/values-et/strings.xml b/packages/InputDevices/res/values-et/strings.xml index 8bc5c2535ab5..a5d8cf9398df 100644 --- a/packages/InputDevices/res/values-et/strings.xml +++ b/packages/InputDevices/res/values-et/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Hispaania (Ladina-Ameerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"läti keel"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"pärsia"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"aserbaidžaani"</string> </resources> diff --git a/packages/InputDevices/res/values-eu/strings.xml b/packages/InputDevices/res/values-eu/strings.xml index 4fadb97329d2..8d62b346a265 100644 --- a/packages/InputDevices/res/values-eu/strings.xml +++ b/packages/InputDevices/res/values-eu/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espainiera (Latinoamerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letoniera"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Pertsiera"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijanera"</string> </resources> diff --git a/packages/InputDevices/res/values-fa/strings.xml b/packages/InputDevices/res/values-fa/strings.xml index 037e04473f9f..6effa2775c77 100644 --- a/packages/InputDevices/res/values-fa/strings.xml +++ b/packages/InputDevices/res/values-fa/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"اسپانیایی (لاتین)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"لتونیایی"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"فارسی"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"آذربایجانی"</string> </resources> diff --git a/packages/InputDevices/res/values-fi/strings.xml b/packages/InputDevices/res/values-fi/strings.xml index 65bd8d3cc491..9530df65ce23 100644 --- a/packages/InputDevices/res/values-fi/strings.xml +++ b/packages/InputDevices/res/values-fi/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"espanja (Latinalainen Amerikka)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"latvialainen"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"persia"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azeri"</string> </resources> diff --git a/packages/InputDevices/res/values-fr-rCA/strings.xml b/packages/InputDevices/res/values-fr-rCA/strings.xml index 8b132fa90fba..afb61fd7524b 100644 --- a/packages/InputDevices/res/values-fr-rCA/strings.xml +++ b/packages/InputDevices/res/values-fr-rCA/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espagnol (latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letton"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persan"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaïdjanais"</string> </resources> diff --git a/packages/InputDevices/res/values-fr/strings.xml b/packages/InputDevices/res/values-fr/strings.xml index baf749db9652..fadc6a231cbb 100644 --- a/packages/InputDevices/res/values-fr/strings.xml +++ b/packages/InputDevices/res/values-fr/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espagnol (latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letton"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persan"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azéri"</string> </resources> diff --git a/packages/InputDevices/res/values-gl/strings.xml b/packages/InputDevices/res/values-gl/strings.xml index c5bddc5fab70..de7adf12e7fa 100644 --- a/packages/InputDevices/res/values-gl/strings.xml +++ b/packages/InputDevices/res/values-gl/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Español (América Latina)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letón"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Acerbaixano"</string> </resources> diff --git a/packages/InputDevices/res/values-gu/strings.xml b/packages/InputDevices/res/values-gu/strings.xml index 0f8c7520d243..d11df01988a7 100644 --- a/packages/InputDevices/res/values-gu/strings.xml +++ b/packages/InputDevices/res/values-gu/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"સ્પેનિશ (લેટિન)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"લાતવિયન"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"પર્શિયન"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-hi/strings.xml b/packages/InputDevices/res/values-hi/strings.xml index c1bbd9d059a9..0abcf87e5fd9 100644 --- a/packages/InputDevices/res/values-hi/strings.xml +++ b/packages/InputDevices/res/values-hi/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"स्पेनिश (लैटिन)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"लातवियाई"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"फ़ारसी"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"अज़रबैजानी"</string> </resources> diff --git a/packages/InputDevices/res/values-hr/strings.xml b/packages/InputDevices/res/values-hr/strings.xml index ec029349b6de..7b27449b2c74 100644 --- a/packages/InputDevices/res/values-hr/strings.xml +++ b/packages/InputDevices/res/values-hr/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"španjolski (Latinska Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"latvijska"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"perzijski"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azerbajdžanski"</string> </resources> diff --git a/packages/InputDevices/res/values-hu/strings.xml b/packages/InputDevices/res/values-hu/strings.xml index a5412d4e1d8b..20a0a4f51a0f 100644 --- a/packages/InputDevices/res/values-hu/strings.xml +++ b/packages/InputDevices/res/values-hu/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"spanyol (latin-amerikai)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"lett"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"perzsa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azeri"</string> </resources> diff --git a/packages/InputDevices/res/values-hy/strings.xml b/packages/InputDevices/res/values-hy/strings.xml index b152b0f1e8f9..e2c485c09219 100644 --- a/packages/InputDevices/res/values-hy/strings.xml +++ b/packages/InputDevices/res/values-hy/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Իսպաներեն (Լատինական)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"լատիշերեն"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"պարսկերեն"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"ադրբեջաներեն"</string> </resources> diff --git a/packages/InputDevices/res/values-in/strings.xml b/packages/InputDevices/res/values-in/strings.xml index f2409d4345dd..5e45207ee922 100644 --- a/packages/InputDevices/res/values-in/strings.xml +++ b/packages/InputDevices/res/values-in/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spanyol (Latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latvi"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persia"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijan"</string> </resources> diff --git a/packages/InputDevices/res/values-is/strings.xml b/packages/InputDevices/res/values-is/strings.xml index 0e80bd4243b6..25eeea31352f 100644 --- a/packages/InputDevices/res/values-is/strings.xml +++ b/packages/InputDevices/res/values-is/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spænskt (latneskt)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lettneska"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persneska"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"aserska"</string> </resources> diff --git a/packages/InputDevices/res/values-it/strings.xml b/packages/InputDevices/res/values-it/strings.xml index 5da935b32dbf..4380d48c3ed9 100644 --- a/packages/InputDevices/res/values-it/strings.xml +++ b/packages/InputDevices/res/values-it/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spagnolo (America Latina)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lettone"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persiano"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azero"</string> </resources> diff --git a/packages/InputDevices/res/values-iw/strings.xml b/packages/InputDevices/res/values-iw/strings.xml index 5cbc4f4c9c62..27f161192233 100644 --- a/packages/InputDevices/res/values-iw/strings.xml +++ b/packages/InputDevices/res/values-iw/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ספרדית (לטינית)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"לטבית"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"פרסית"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"אזרית"</string> </resources> diff --git a/packages/InputDevices/res/values-ja/strings.xml b/packages/InputDevices/res/values-ja/strings.xml index aa77ddc3b6f8..c0c6915d4867 100644 --- a/packages/InputDevices/res/values-ja/strings.xml +++ b/packages/InputDevices/res/values-ja/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"スペイン語（中南米）"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ラトビア語"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ペルシャ語"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"アゼルバイジャン語"</string> </resources> diff --git a/packages/InputDevices/res/values-ka/strings.xml b/packages/InputDevices/res/values-ka/strings.xml index 0b899c7489d0..471d808cf147 100644 --- a/packages/InputDevices/res/values-ka/strings.xml +++ b/packages/InputDevices/res/values-ka/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ესპანური (ლათინური)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ლატვიური"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"სპარსული"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"აზერბაიჯანული"</string> </resources> diff --git a/packages/InputDevices/res/values-kk/strings.xml b/packages/InputDevices/res/values-kk/strings.xml index 659f5717be30..4688ebcacdaf 100644 --- a/packages/InputDevices/res/values-kk/strings.xml +++ b/packages/InputDevices/res/values-kk/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Испан (латын)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латыш"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Парсы"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"әзiрбайжан"</string> </resources> diff --git a/packages/InputDevices/res/values-km/strings.xml b/packages/InputDevices/res/values-km/strings.xml index a3a789c63a85..fca373756af5 100644 --- a/packages/InputDevices/res/values-km/strings.xml +++ b/packages/InputDevices/res/values-km/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"អេស្ប៉ាញ (ឡាតាំង)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ឡាតវីយ៉ា"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ពីស៊ាន"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"អាហ្សឺបៃហ្សង់"</string> </resources> diff --git a/packages/InputDevices/res/values-kn/strings.xml b/packages/InputDevices/res/values-kn/strings.xml index f07b439bdf72..2e6f89258124 100644 --- a/packages/InputDevices/res/values-kn/strings.xml +++ b/packages/InputDevices/res/values-kn/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ಸ್ಪ್ಯಾನಿಶ್ (ಲ್ಯಾಟಿನ್)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ಲ್ಯಾಟ್ವಿಯನ್"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ಪರ್ಶಿಯನ್"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-ko/strings.xml b/packages/InputDevices/res/values-ko/strings.xml index 28dde4557551..f712332a6bba 100644 --- a/packages/InputDevices/res/values-ko/strings.xml +++ b/packages/InputDevices/res/values-ko/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"스페인어(라틴)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"라트비아어"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"페르시아어"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"아제르바이잔어"</string> </resources> diff --git a/packages/InputDevices/res/values-ky/strings.xml b/packages/InputDevices/res/values-ky/strings.xml index e12b69fe158b..5b3e98683d18 100644 --- a/packages/InputDevices/res/values-ky/strings.xml +++ b/packages/InputDevices/res/values-ky/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Испанча (Латын)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латвияча"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Фарсиче"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Азербайжанча"</string> </resources> diff --git a/packages/InputDevices/res/values-lo/strings.xml b/packages/InputDevices/res/values-lo/strings.xml index 8c040be3081c..e64d83d79e20 100644 --- a/packages/InputDevices/res/values-lo/strings.xml +++ b/packages/InputDevices/res/values-lo/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ສະແປນນິດ (ລາຕິນ)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ລັດວຽນ"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ເປີຊຽນ"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"ອາເຊີໄບຈານີ"</string> </resources> diff --git a/packages/InputDevices/res/values-lt/strings.xml b/packages/InputDevices/res/values-lt/strings.xml index 0cd696f6f188..a92ddafa4b4d 100644 --- a/packages/InputDevices/res/values-lt/strings.xml +++ b/packages/InputDevices/res/values-lt/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Ispanų (Lotynų Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latvių k."</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persų"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaidžaniečių"</string> </resources> diff --git a/packages/InputDevices/res/values-lv/strings.xml b/packages/InputDevices/res/values-lv/strings.xml index 52a0751697ba..881adadfa240 100644 --- a/packages/InputDevices/res/values-lv/strings.xml +++ b/packages/InputDevices/res/values-lv/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spāņu (latīņu)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latviešu"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persiešu"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaidžāņu"</string> </resources> diff --git a/packages/InputDevices/res/values-mk/strings.xml b/packages/InputDevices/res/values-mk/strings.xml index 2f9befe2c678..49d3d4254f26 100644 --- a/packages/InputDevices/res/values-mk/strings.xml +++ b/packages/InputDevices/res/values-mk/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"шпански (латиница)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"латвиски"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"персиски"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"азербејџански"</string> </resources> diff --git a/packages/InputDevices/res/values-ml/strings.xml b/packages/InputDevices/res/values-ml/strings.xml index 6b5ed06dc3c3..dfd9754f0991 100644 --- a/packages/InputDevices/res/values-ml/strings.xml +++ b/packages/InputDevices/res/values-ml/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"സ്പാനിഷ് (ലാറ്റിൻ)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ലാറ്റ്വിയന്"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"പേര്ഷ്യന്"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-mn/strings.xml b/packages/InputDevices/res/values-mn/strings.xml index 82e664e4f5c0..e244722e3c6a 100644 --- a/packages/InputDevices/res/values-mn/strings.xml +++ b/packages/InputDevices/res/values-mn/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Испани (Латин)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латви"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Перс"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Азербайжан"</string> </resources> diff --git a/packages/InputDevices/res/values-mr/strings.xml b/packages/InputDevices/res/values-mr/strings.xml index e8575a85cf73..7189197fba9b 100644 --- a/packages/InputDevices/res/values-mr/strings.xml +++ b/packages/InputDevices/res/values-mr/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"स्पॅनिश (लॅटिन)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"लाट्वियन"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"पर्शियन"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"अझरबैजानी"</string> </resources> diff --git a/packages/InputDevices/res/values-ms/strings.xml b/packages/InputDevices/res/values-ms/strings.xml index 0f402e7b850d..4deafa32a49a 100644 --- a/packages/InputDevices/res/values-ms/strings.xml +++ b/packages/InputDevices/res/values-ms/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Bahasa Sepanyol (Latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Bahasa Latvia"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Bahasa Parsi"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Bahasa Azerbaijan"</string> </resources> diff --git a/packages/InputDevices/res/values-my/strings.xml b/packages/InputDevices/res/values-my/strings.xml index 246735375ef5..b97b6f138b1d 100644 --- a/packages/InputDevices/res/values-my/strings.xml +++ b/packages/InputDevices/res/values-my/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"စပိန် (လက်တင်)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"လာတ်ဗီယံ"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ပါရှန်"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"အဇာဘိုင်ဂျန်"</string> </resources> diff --git a/packages/InputDevices/res/values-nb/strings.xml b/packages/InputDevices/res/values-nb/strings.xml index bd2879ec7f23..328effa6a1bc 100644 --- a/packages/InputDevices/res/values-nb/strings.xml +++ b/packages/InputDevices/res/values-nb/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spansk (latinsk)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latvisk"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persisk"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Aserbajdsjansk"</string> </resources> diff --git a/packages/InputDevices/res/values-ne/strings.xml b/packages/InputDevices/res/values-ne/strings.xml index 55969c9e0565..d33cd327bd67 100644 --- a/packages/InputDevices/res/values-ne/strings.xml +++ b/packages/InputDevices/res/values-ne/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"स्पेनेली(ल्याटिन)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"लातभियन"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"फारसी"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"अजरबैजानी"</string> </resources> diff --git a/packages/InputDevices/res/values-nl/strings.xml b/packages/InputDevices/res/values-nl/strings.xml index e40248f271c1..45a3e5248c7e 100644 --- a/packages/InputDevices/res/values-nl/strings.xml +++ b/packages/InputDevices/res/values-nl/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spaans (Latijns-Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lets"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Perzisch"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbeidzjaans"</string> </resources> diff --git a/packages/InputDevices/res/values-pa/strings.xml b/packages/InputDevices/res/values-pa/strings.xml index 951adc8c6e80..1cf6a2ee065f 100644 --- a/packages/InputDevices/res/values-pa/strings.xml +++ b/packages/InputDevices/res/values-pa/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ਸਪੇਨੀ (ਲਾਤੀਨੀ)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ਲਾਤਵੀਅਨ"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"ਫ਼ਾਰਸੀ"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-pl/strings.xml b/packages/InputDevices/res/values-pl/strings.xml index a307940f232d..0d4a65b2e1e6 100644 --- a/packages/InputDevices/res/values-pl/strings.xml +++ b/packages/InputDevices/res/values-pl/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"hiszpański (Ameryka Łacińska)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"łotewski"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Perski"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerski"</string> </resources> diff --git a/packages/InputDevices/res/values-pt-rBR/strings.xml b/packages/InputDevices/res/values-pt-rBR/strings.xml index ad2abe1ca9de..9c01cf0a802a 100644 --- a/packages/InputDevices/res/values-pt-rBR/strings.xml +++ b/packages/InputDevices/res/values-pt-rBR/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espanhol (América Latina)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letão"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijano"</string> </resources> diff --git a/packages/InputDevices/res/values-pt-rPT/strings.xml b/packages/InputDevices/res/values-pt-rPT/strings.xml index a5beee46123f..ddc62620dfa4 100644 --- a/packages/InputDevices/res/values-pt-rPT/strings.xml +++ b/packages/InputDevices/res/values-pt-rPT/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espanhol (América Latina)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letão"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azeri"</string> </resources> diff --git a/packages/InputDevices/res/values-pt/strings.xml b/packages/InputDevices/res/values-pt/strings.xml index ad2abe1ca9de..9c01cf0a802a 100644 --- a/packages/InputDevices/res/values-pt/strings.xml +++ b/packages/InputDevices/res/values-pt/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espanhol (América Latina)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letão"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persa"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijano"</string> </resources> diff --git a/packages/InputDevices/res/values-ro/strings.xml b/packages/InputDevices/res/values-ro/strings.xml index a933a7094b35..64edffa6dea4 100644 --- a/packages/InputDevices/res/values-ro/strings.xml +++ b/packages/InputDevices/res/values-ro/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spaniolă (America Latină)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letonă"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persană"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azeră"</string> </resources> diff --git a/packages/InputDevices/res/values-ru/strings.xml b/packages/InputDevices/res/values-ru/strings.xml index 127a84dad8b0..6e147ebc7d06 100644 --- a/packages/InputDevices/res/values-ru/strings.xml +++ b/packages/InputDevices/res/values-ru/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Испанский (Латинская Америка)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"латышский"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Персидский"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Азербайджанский"</string> </resources> diff --git a/packages/InputDevices/res/values-si/strings.xml b/packages/InputDevices/res/values-si/strings.xml index 8192c18e751a..eda2d977476d 100644 --- a/packages/InputDevices/res/values-si/strings.xml +++ b/packages/InputDevices/res/values-si/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ස්පාඤ්ඤය (ලතින්)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ලැට්වියානු"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"පර්සියානු"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"අසර්බයිජාන"</string> </resources> diff --git a/packages/InputDevices/res/values-sk/strings.xml b/packages/InputDevices/res/values-sk/strings.xml index c631095aa982..101ffffb0283 100644 --- a/packages/InputDevices/res/values-sk/strings.xml +++ b/packages/InputDevices/res/values-sk/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Španielčina (Latinská Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Lotyština"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Perzština"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbajdžančina"</string> </resources> diff --git a/packages/InputDevices/res/values-sl/strings.xml b/packages/InputDevices/res/values-sl/strings.xml index c5a19be9ef02..4242291be15d 100644 --- a/packages/InputDevices/res/values-sl/strings.xml +++ b/packages/InputDevices/res/values-sl/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"španščina (Latinska Amerika)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"latvijščina"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"perzijščina"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azerbajdžanščina"</string> </resources> diff --git a/packages/InputDevices/res/values-sq/strings.xml b/packages/InputDevices/res/values-sq/strings.xml index dbc5b4d6286f..5dcfc540c9f7 100644 --- a/packages/InputDevices/res/values-sq/strings.xml +++ b/packages/InputDevices/res/values-sq/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"spanjisht (latine)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"letonisht"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persisht"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbajxhanisht"</string> </resources> diff --git a/packages/InputDevices/res/values-sr/strings.xml b/packages/InputDevices/res/values-sr/strings.xml index 29eea72b9f2f..abb796fc4d3a 100644 --- a/packages/InputDevices/res/values-sr/strings.xml +++ b/packages/InputDevices/res/values-sr/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"шпански (Латинска Америка)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"летонски"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"персијска"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"азербејџанска"</string> </resources> diff --git a/packages/InputDevices/res/values-sv/strings.xml b/packages/InputDevices/res/values-sv/strings.xml index 9954a2b74661..29614255b981 100644 --- a/packages/InputDevices/res/values-sv/strings.xml +++ b/packages/InputDevices/res/values-sv/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spanska (latinamerikansk)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"lettiska"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"persiska"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"azerbajdzjanska"</string> </resources> diff --git a/packages/InputDevices/res/values-sw/strings.xml b/packages/InputDevices/res/values-sw/strings.xml index 13b3954d21d3..4366204bc6f0 100644 --- a/packages/InputDevices/res/values-sw/strings.xml +++ b/packages/InputDevices/res/values-sw/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Kihispania (Kilatini)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Kilatvia"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Kiajemi"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Kiazabaijani"</string> </resources> diff --git a/packages/InputDevices/res/values-ta/strings.xml b/packages/InputDevices/res/values-ta/strings.xml index fec9d8c00b99..ebee5c1425f4 100644 --- a/packages/InputDevices/res/values-ta/strings.xml +++ b/packages/InputDevices/res/values-ta/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ஸ்பானிஷ் (லத்தீன்)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"லத்வியன்"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"பெர்சியன்"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-te/strings.xml b/packages/InputDevices/res/values-te/strings.xml index 922868dbaec8..141bb9528198 100644 --- a/packages/InputDevices/res/values-te/strings.xml +++ b/packages/InputDevices/res/values-te/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"స్పానిష్ (లాటిన్)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"లాత్వియన్"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"పర్షియన్"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-th/strings.xml b/packages/InputDevices/res/values-th/strings.xml index 69d9ddf6065c..65085dc6a20f 100644 --- a/packages/InputDevices/res/values-th/strings.xml +++ b/packages/InputDevices/res/values-th/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"สเปน (ละติน)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"ลัตเวีย"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"เปอร์เซีย"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"อาเซอร์ไบจาน"</string> </resources> diff --git a/packages/InputDevices/res/values-tl/strings.xml b/packages/InputDevices/res/values-tl/strings.xml index 44821287906e..c9fc26dfa8c3 100644 --- a/packages/InputDevices/res/values-tl/strings.xml +++ b/packages/InputDevices/res/values-tl/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spanish (Latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latvian"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persian"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijani"</string> </resources> diff --git a/packages/InputDevices/res/values-tr/strings.xml b/packages/InputDevices/res/values-tr/strings.xml index 08e5e3e6e5cd..98e6b512ffad 100644 --- a/packages/InputDevices/res/values-tr/strings.xml +++ b/packages/InputDevices/res/values-tr/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"İspanyolca (Latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letonca"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Farsça"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerice"</string> </resources> diff --git a/packages/InputDevices/res/values-uk/strings.xml b/packages/InputDevices/res/values-uk/strings.xml index b81f6726d209..c49ee9e6e833 100644 --- a/packages/InputDevices/res/values-uk/strings.xml +++ b/packages/InputDevices/res/values-uk/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Іспанська (латиниця)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латвійська"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Перська"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"азербайджанська"</string> </resources> diff --git a/packages/InputDevices/res/values-ur/strings.xml b/packages/InputDevices/res/values-ur/strings.xml index 2508d5d30748..71ce1ccb02d3 100644 --- a/packages/InputDevices/res/values-ur/strings.xml +++ b/packages/InputDevices/res/values-ur/strings.xml @@ -42,4 +42,6 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"ہسپانوی (لاطینی)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"لاتویائی"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"فارسی"</string> + <!-- no translation found for keyboard_layout_azerbaijani (7315895417176467567) --> + <skip /> </resources> diff --git a/packages/InputDevices/res/values-uz/strings.xml b/packages/InputDevices/res/values-uz/strings.xml index 4b9d08b66052..e82046966c62 100644 --- a/packages/InputDevices/res/values-uz/strings.xml +++ b/packages/InputDevices/res/values-uz/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Ispan (lotin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latish"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Fors"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"ozarbayjon"</string> </resources> diff --git a/packages/InputDevices/res/values-vi/strings.xml b/packages/InputDevices/res/values-vi/strings.xml index 35c596056fbb..e92d8fc662ac 100644 --- a/packages/InputDevices/res/values-vi/strings.xml +++ b/packages/InputDevices/res/values-vi/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Tiếng Tây Ban Nha (La tinh)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Tiếng Latvia"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Tiếng Ba Tư"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Tiếng Azerbaijan"</string> </resources> diff --git a/packages/InputDevices/res/values-zh-rCN/strings.xml b/packages/InputDevices/res/values-zh-rCN/strings.xml index 5f1fc17a9d00..61c6bc9f1559 100644 --- a/packages/InputDevices/res/values-zh-rCN/strings.xml +++ b/packages/InputDevices/res/values-zh-rCN/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"西班牙语（拉丁美洲）"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"拉脱维亚语"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"波斯语"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"阿塞拜疆语"</string> </resources> diff --git a/packages/InputDevices/res/values-zh-rHK/strings.xml b/packages/InputDevices/res/values-zh-rHK/strings.xml index 086f9664bff0..bf0e2b718bec 100644 --- a/packages/InputDevices/res/values-zh-rHK/strings.xml +++ b/packages/InputDevices/res/values-zh-rHK/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"西班牙文 (拉丁美洲)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"拉脫維亞文"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"波斯文"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"亞塞拜疆文"</string> </resources> diff --git a/packages/InputDevices/res/values-zh-rTW/strings.xml b/packages/InputDevices/res/values-zh-rTW/strings.xml index 5e2890f7bc79..785cc3d3d400 100644 --- a/packages/InputDevices/res/values-zh-rTW/strings.xml +++ b/packages/InputDevices/res/values-zh-rTW/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"西班牙文 (拉丁美洲)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"拉脫維亞文"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"波斯文"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"亞塞拜然文"</string> </resources> diff --git a/packages/InputDevices/res/values-zu/strings.xml b/packages/InputDevices/res/values-zu/strings.xml index 18d26a25f524..1643f01dfab1 100644 --- a/packages/InputDevices/res/values-zu/strings.xml +++ b/packages/InputDevices/res/values-zu/strings.xml @@ -42,4 +42,5 @@ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Isi-Spanish (Latin)"</string> <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Isi-Latvian"</string> <string name="keyboard_layout_persian" msgid="3920643161015888527">"Isi-Persian"</string> + <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Isi-Azebhayijani"</string> </resources> diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java index 85b04c8fdf15..e840a4be8b80 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java @@ -45,9 +45,9 @@ import android.test.suitebuilder.annotation.SmallTest; import android.view.inputmethod.InputMethodInfo; import com.android.settingslib.BaseTest; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.compat.ArgumentMatcher; import java.util.ArrayList; import java.util.List; @@ -241,7 +241,7 @@ public class AppRestrictionsHelperTest extends BaseTest { return ri; } - private class IntentMatcher extends ArgumentMatcher<Intent> { + private class IntentMatcher implements ArgumentMatcher<Intent> { private final Intent mIntent; IntentMatcher(Intent intent) { @@ -249,11 +249,8 @@ public class AppRestrictionsHelperTest extends BaseTest { } @Override - public boolean matchesObject(Object argument) { - if (argument instanceof Intent) { - return ((Intent) argument).filterEquals(mIntent); - } - return false; + public boolean matches(Intent argument) { + return argument != null && argument.filterEquals(mIntent); } @Override diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java index 4a1d3929604e..6615b8c02297 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java @@ -723,9 +723,9 @@ public class WifiTrackerTest { CountDownLatch latch = new CountDownLatch(1); // Once the new info has been fetched, we need to wait for the access points to be copied + mAccessPointsChangedLatch = new CountDownLatch(1); doAnswer(invocation -> { latch.countDown(); - mAccessPointsChangedLatch = new CountDownLatch(1); return info; }).when(mockWifiManager).getConnectionInfo(); @@ -767,10 +767,12 @@ public class WifiTrackerTest { WifiTracker tracker = createMockedWifiTracker(); startTracking(tracker); + CountDownLatch ready = new CountDownLatch(1); CountDownLatch latch = new CountDownLatch(1); CountDownLatch lock = new CountDownLatch(1); tracker.mMainHandler.post(() -> { try { + ready.countDown(); lock.await(); latch.countDown(); } catch (InterruptedException e) { @@ -786,6 +788,9 @@ public class WifiTrackerTest { tracker.mMainHandler.sendEmptyMessage( WifiTracker.MainHandler.MSG_WIFI_STATE_CHANGED); + try { + ready.await(); // Make sure we have entered the first message handler + } catch (InterruptedException e) {} tracker.onStop(); verify(mockWifiListener, atMost(1)).onAccessPointsChanged(); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index fabdbd466efb..1d3f26eec56d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -881,6 +881,9 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Global.GPU_DEBUG_LAYERS, GlobalSettingsProto.GPU_DEBUG_LAYERS); + dumpSetting(s, p, + Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, + GlobalSettingsProto.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING); // Settings.Global.SHOW_PROCESSES intentionally excluded since it's deprecated. dumpSetting(s, p, Settings.Global.LOW_POWER_MODE, diff --git a/packages/SystemUI/res/layout/output_chooser.xml b/packages/SystemUI/res/layout/output_chooser.xml new file mode 100644 index 000000000000..22c3bcf6b9d7 --- /dev/null +++ b/packages/SystemUI/res/layout/output_chooser.xml @@ -0,0 +1,55 @@ +<?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. +--> +<!-- extends FrameLayout --> +<com.android.systemui.volume.OutputChooserLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:sysui="http://schemas.android.com/apk/res-auto" + android:id="@+id/output_chooser" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="20dp" > + + <com.android.systemui.qs.AutoSizingList + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + sysui:itemHeight="@dimen/qs_detail_item_height" + style="@style/AutoSizingList"/> + + <LinearLayout + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:orientation="vertical"> + + <ImageView + android:id="@android:id/icon" + android:layout_width="56dp" + android:layout_height="56dp" + android:tint="?android:attr/textColorSecondary" /> + + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:textAppearance="@style/TextAppearance.QS.DetailEmpty"/> + </LinearLayout> +</com.android.systemui.volume.OutputChooserLayout> diff --git a/packages/SystemUI/res/layout/output_chooser_item.xml b/packages/SystemUI/res/layout/output_chooser_item.xml new file mode 100644 index 000000000000..ed7df4b7f58a --- /dev/null +++ b/packages/SystemUI/res/layout/output_chooser_item.xml @@ -0,0 +1,71 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/qs_detail_item_height" + android:background="@drawable/btn_borderless_rect" + android:clickable="true" + android:focusable="true" + android:gravity="center_vertical" + android:orientation="horizontal" > + + <ImageView + android:id="@android:id/icon" + android:layout_width="@dimen/qs_detail_item_icon_width" + android:layout_height="@dimen/qs_detail_item_icon_size" + android:layout_marginStart="@dimen/qs_detail_item_icon_marginStart" + android:layout_marginEnd="@dimen/qs_detail_item_icon_marginEnd" + android:tint="?android:attr/textColorPrimary"/> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="12dp" + android:layout_weight="1" + android:orientation="vertical" > + + <TextView + android:id="@android:id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textDirection="locale" + android:ellipsize="end" + android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" /> + + <TextView + android:id="@android:id/summary" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textDirection="locale" + android:layout_marginTop="2dp" + android:textAppearance="@style/TextAppearance.QS.DetailItemSecondary" /> + </LinearLayout> + + <ImageView + android:id="@android:id/icon2" + style="@style/QSBorderlessButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginStart="30dp" + android:clickable="true" + android:focusable="true" + android:scaleType="center" + android:contentDescription="@*android:string/media_route_controller_disconnect" + android:tint="?android:attr/textColorPrimary" /> + +</LinearLayout> diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index bab1e5e4698f..f0d23469a49a 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -70,58 +70,77 @@ android:layout_height="@dimen/volume_button_size" android:clickable="true" android:soundEffectsEnabled="false" - android:src="@drawable/ic_volume_collapse_animation" + android:src="@drawable/ic_volume_expand_animation" android:background="@drawable/ripple_drawable" tools:ignore="RtlHardcoded" /> </LinearLayout> - <!-- special row for ringer mode --> <RelativeLayout - android:id="@+id/ringer_mode" + android:id="@+id/footer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/rounded_bg_full" android:clipChildren="false" android:clipToPadding="false" android:layout_below="@id/volume_dialog_content" android:layout_margin="10dp"> + <!-- special row for ringer mode --> + <RelativeLayout + android:id="@+id/ringer_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/rounded_bg_full" + android:clipChildren="false" + android:clipToPadding="false" + android:layout_toStartOf="@id/output_chooser" + android:layout_margin="10dp"> + + <com.android.keyguard.AlphaOptimizedImageButton + android:id="@+id/ringer_icon" + style="@style/VolumeButtons" + android:background="?android:selectableItemBackgroundBorderless" + android:layout_width="@dimen/volume_button_size" + android:layout_height="@dimen/volume_button_size" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:soundEffectsEnabled="false" /> + <TextView + android:id="@+id/ringer_title" + android:text="@string/ring_toggle_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="1" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_toEndOf="@+id/ringer_icon" + android:layout_marginStart="64dp" + android:textColor="?android:attr/colorControlNormal" + android:textAppearance="?android:attr/textAppearanceSmall" + android:paddingStart="@dimen/volume_row_header_padding_start" /> + + <TextView + android:id="@+id/ringer_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_marginEnd="14dp" + android:maxLines="1" + android:textColor="?android:attr/colorControlNormal" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </RelativeLayout> <com.android.keyguard.AlphaOptimizedImageButton - android:id="@+id/ringer_icon" + android:id="@+id/output_chooser" style="@style/VolumeButtons" android:background="?android:selectableItemBackgroundBorderless" android:layout_width="@dimen/volume_button_size" android:layout_height="@dimen/volume_button_size" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:soundEffectsEnabled="false" /> - - <TextView - android:id="@+id/ringer_title" - android:text="@string/stream_ring" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLines="1" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:layout_toEndOf="@+id/ringer_icon" - android:layout_marginStart="64dp" - android:textColor="?android:attr/colorControlNormal" - android:textAppearance="?android:attr/textAppearanceSmall" - android:paddingStart="@dimen/volume_row_header_padding_start" /> - - <TextView - android:id="@+id/ringer_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_marginEnd="14dp" - android:maxLines="1" - android:textColor="?android:attr/colorControlNormal" - android:textAppearance="?android:attr/textAppearanceSmall" /> - + android:src="@drawable/ic_settings_bluetooth" + android:soundEffectsEnabled="false" /> </RelativeLayout> </RelativeLayout> </com.android.systemui.volume.VolumeUiLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 5e7f9c6a40e5..e313e868022d 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -301,6 +301,9 @@ <!-- Enable the default volume dialog --> <bool name="enable_volume_ui">true</bool> + <!-- Enable the default volume level warning dialog --> + <bool name="enable_safety_warning">true</bool> + <!-- Whether to show operator name in the status bar --> <bool name="config_showOperatorNameInStatusBar">false</bool> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 62ab74d50713..78e621e4b559 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1248,6 +1248,7 @@ <string name="stream_tts" translatable="false">Transmitted Through Speaker</string> <!-- STREAM_TTS --> <string name="stream_accessibility">Accessibility</string> <!-- STREAM_ACCESSIBILITY --> + <string name="ring_toggle_title">Calls</string> <string name="volume_ringer_status_normal">Ring</string> <string name="volume_ringer_status_vibrate">Vibrate</string> <string name="volume_ringer_status_silent">Mute</string> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 27bc599f7f52..9f393215c9bd 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -49,6 +49,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe private boolean mIsVerifyUnlockOnly; private SecurityMode mCurrentSecuritySelection = SecurityMode.Invalid; private SecurityCallback mSecurityCallback; + private AlertDialog mAlertDialog; private final KeyguardUpdateMonitor mUpdateMonitor; @@ -95,6 +96,10 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe @Override public void onPause() { + if (mAlertDialog != null) { + mAlertDialog.dismiss(); + mAlertDialog = null; + } if (mCurrentSecuritySelection != SecurityMode.None) { getSecurityView(mCurrentSecuritySelection).onPause(); } @@ -174,16 +179,20 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe } private void showDialog(String title, String message) { - final AlertDialog dialog = new AlertDialog.Builder(mContext) + if (mAlertDialog != null) { + mAlertDialog.dismiss(); + } + + mAlertDialog = new AlertDialog.Builder(mContext) .setTitle(title) .setMessage(message) .setCancelable(false) .setNeutralButton(R.string.ok, null) .create(); if (!(mContext instanceof Activity)) { - dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); + mAlertDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG); } - dialog.show(); + mAlertDialog.show(); } private void showTimeoutDialog(int userId, int timeoutMs) { diff --git a/packages/SystemUI/src/com/android/systemui/volume/Events.java b/packages/SystemUI/src/com/android/systemui/volume/Events.java index 49a12f401c90..e1376cad192a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/Events.java +++ b/packages/SystemUI/src/com/android/systemui/volume/Events.java @@ -80,6 +80,7 @@ public class Events { public static final int DISMISS_REASON_SETTINGS_CLICKED = 5; public static final int DISMISS_REASON_DONE_CLICKED = 6; public static final int DISMISS_STREAM_GONE = 7; + public static final int DISMISS_REASON_OUTPUT_CHOOSER = 8; public static final String[] DISMISS_REASONS = { "unknown", "touch_outside", @@ -88,7 +89,8 @@ public class Events { "screen_off", "settings_clicked", "done_clicked", - "a11y_stream_changed" + "a11y_stream_changed", + "output_chooser" }; public static final int SHOW_REASON_UNKNOWN = 0; diff --git a/packages/SystemUI/src/com/android/systemui/volume/OutputChooserDialog.java b/packages/SystemUI/src/com/android/systemui/volume/OutputChooserDialog.java new file mode 100644 index 000000000000..fa82e3364b1f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/OutputChooserDialog.java @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2015 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.volume; + +import static com.android.settingslib.bluetooth.Utils.getBtClassDrawableWithDescription; + +import android.bluetooth.BluetoothClass; +import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.util.Log; +import android.util.Pair; + +import com.android.settingslib.Utils; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.systemui.Dependency; +import com.android.systemui.R; +import com.android.systemui.statusbar.phone.SystemUIDialog; +import com.android.systemui.statusbar.policy.BluetoothController; + +import java.util.ArrayList; +import java.util.Collection; + +public class OutputChooserDialog extends SystemUIDialog + implements DialogInterface.OnDismissListener, OutputChooserLayout.Callback { + + private static final String TAG = Util.logTag(OutputChooserDialog.class); + private static final int MAX_DEVICES = 10; + + private final Context mContext; + private final BluetoothController mController; + private OutputChooserLayout mView; + + + public OutputChooserDialog(Context context) { + super(context); + mContext = context; + mController = Dependency.get(BluetoothController.class); + + final IntentFilter filter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS); + context.registerReceiver(mReceiver, filter); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.output_chooser); + setCanceledOnTouchOutside(true); + setOnDismissListener(this::onDismiss); + mView = findViewById(R.id.output_chooser); + mView.setCallback(this); + updateItems(); + mController.addCallback(mCallback); + } + + protected void cleanUp() {} + + + @Override + protected void onStart() { + super.onStart(); + } + + @Override + public void onDismiss(DialogInterface unused) { + mContext.unregisterReceiver(mReceiver); + mController.removeCallback(mCallback); + cleanUp(); + } + + @Override + public void onDetailItemClick(OutputChooserLayout.Item item) { + if (item == null || item.tag == null) return; + final CachedBluetoothDevice device = (CachedBluetoothDevice) item.tag; + if (device != null && device.getMaxConnectionState() + == BluetoothProfile.STATE_DISCONNECTED) { + mController.connect(device); + } + } + + @Override + public void onDetailItemDisconnect(OutputChooserLayout.Item item) { + if (item == null || item.tag == null) return; + final CachedBluetoothDevice device = (CachedBluetoothDevice) item.tag; + if (device != null) { + mController.disconnect(device); + } + } + + private void updateItems() { + if (mView == null) return; + if (mController.isBluetoothEnabled()) { + mView.setEmptyState(R.drawable.ic_qs_bluetooth_detail_empty, + R.string.quick_settings_bluetooth_detail_empty_text); + mView.setItemsVisible(true); + } else { + mView.setEmptyState(R.drawable.ic_qs_bluetooth_detail_empty, + R.string.bt_is_off); + mView.setItemsVisible(false); + } + ArrayList<OutputChooserLayout.Item> items = new ArrayList<>(); + final Collection<CachedBluetoothDevice> devices = mController.getDevices(); + if (devices != null) { + int connectedDevices = 0; + int count = 0; + for (CachedBluetoothDevice device : devices) { + if (mController.getBondState(device) == BluetoothDevice.BOND_NONE) continue; + final int majorClass = device.getBtClass().getMajorDeviceClass(); + if (majorClass != BluetoothClass.Device.Major.AUDIO_VIDEO + && majorClass != BluetoothClass.Device.Major.UNCATEGORIZED) { + continue; + } + final OutputChooserLayout.Item item = new OutputChooserLayout.Item(); + item.iconResId = R.drawable.ic_qs_bluetooth_on; + item.line1 = device.getName(); + item.tag = device; + int state = device.getMaxConnectionState(); + if (state == BluetoothProfile.STATE_CONNECTED) { + item.iconResId = R.drawable.ic_qs_bluetooth_connected; + int batteryLevel = device.getBatteryLevel(); + if (batteryLevel != BluetoothDevice.BATTERY_LEVEL_UNKNOWN) { + Pair<Drawable, String> pair = + getBtClassDrawableWithDescription(getContext(), device); + item.icon = pair.first; + item.line2 = mContext.getString( + R.string.quick_settings_connected_battery_level, + Utils.formatPercentage(batteryLevel)); + } else { + item.line2 = mContext.getString(R.string.quick_settings_connected); + } + item.canDisconnect = true; + items.add(connectedDevices, item); + connectedDevices++; + } else if (state == BluetoothProfile.STATE_CONNECTING) { + item.iconResId = R.drawable.ic_qs_bluetooth_connecting; + item.line2 = mContext.getString(R.string.quick_settings_connecting); + items.add(connectedDevices, item); + } else { + items.add(item); + } + if (++count == MAX_DEVICES) { + break; + } + } + } + mView.setItems(items.toArray(new OutputChooserLayout.Item[items.size()])); + } + + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { + if (D.BUG) Log.d(TAG, "Received ACTION_CLOSE_SYSTEM_DIALOGS"); + cancel(); + cleanUp(); + } + } + }; + + private final BluetoothController.Callback mCallback = new BluetoothController.Callback() { + @Override + public void onBluetoothStateChange(boolean enabled) { + updateItems(); + } + + @Override + public void onBluetoothDevicesChanged() { + updateItems(); + } + }; +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/volume/OutputChooserLayout.java b/packages/SystemUI/src/com/android/systemui/volume/OutputChooserLayout.java new file mode 100644 index 000000000000..e8be4fd553a1 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/OutputChooserLayout.java @@ -0,0 +1,258 @@ +/* + * 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.volume; + +import android.content.Context; +import android.content.res.Configuration; +import android.graphics.drawable.Drawable; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.widget.TextView; + +import com.android.systemui.FontSizeUtils; +import com.android.systemui.R; +import com.android.systemui.qs.AutoSizingList; + +/** + * Limited height list of devices. + */ +public class OutputChooserLayout extends FrameLayout { + private static final String TAG = "OutputChooserLayout"; + private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + + private final int mQsDetailIconOverlaySize; + private final Context mContext; + private final H mHandler = new H(); + private final Adapter mAdapter = new Adapter(); + + private String mTag; + private Callback mCallback; + private boolean mItemsVisible = true; + private AutoSizingList mItemList; + private View mEmpty; + private TextView mEmptyText; + private ImageView mEmptyIcon; + + private Item[] mItems; + + public OutputChooserLayout(Context context, AttributeSet attrs) { + super(context, attrs); + mContext = context; + mTag = TAG; + mQsDetailIconOverlaySize = (int) getResources().getDimension( + R.dimen.qs_detail_icon_overlay_size); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mItemList = findViewById(android.R.id.list); + mItemList.setVisibility(GONE); + mItemList.setAdapter(mAdapter); + mEmpty = findViewById(android.R.id.empty); + mEmpty.setVisibility(GONE); + mEmptyText = mEmpty.findViewById(android.R.id.title); + mEmptyIcon = mEmpty.findViewById(android.R.id.icon); + } + + @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + FontSizeUtils.updateFontSize(mEmptyText, R.dimen.qs_detail_empty_text_size); + int count = mItemList.getChildCount(); + for (int i = 0; i < count; i++) { + View item = mItemList.getChildAt(i); + FontSizeUtils.updateFontSize(item, android.R.id.title, + R.dimen.qs_detail_item_primary_text_size); + FontSizeUtils.updateFontSize(item, android.R.id.summary, + R.dimen.qs_detail_item_secondary_text_size); + } + } + + public void setEmptyState(int icon, int text) { + mEmpty.post(() -> { + mEmptyIcon.setImageResource(icon); + mEmptyText.setText(text); + }); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + if (DEBUG) Log.d(mTag, "onAttachedToWindow"); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + if (DEBUG) Log.d(mTag, "onDetachedFromWindow"); + mCallback = null; + } + + public void setCallback(Callback callback) { + mHandler.removeMessages(H.SET_CALLBACK); + mHandler.obtainMessage(H.SET_CALLBACK, callback).sendToTarget(); + } + + public void setItems(Item[] items) { + mHandler.removeMessages(H.SET_ITEMS); + mHandler.obtainMessage(H.SET_ITEMS, items).sendToTarget(); + } + + public void setItemsVisible(boolean visible) { + mHandler.removeMessages(H.SET_ITEMS_VISIBLE); + mHandler.obtainMessage(H.SET_ITEMS_VISIBLE, visible ? 1 : 0, 0).sendToTarget(); + } + + private void handleSetCallback(Callback callback) { + mCallback = callback; + } + + private void handleSetItems(Item[] items) { + final int itemCount = items != null ? items.length : 0; + mEmpty.setVisibility(itemCount == 0 ? VISIBLE : GONE); + mItemList.setVisibility(itemCount == 0 ? GONE : VISIBLE); + mItems = items; + mAdapter.notifyDataSetChanged(); + } + + private void handleSetItemsVisible(boolean visible) { + if (mItemsVisible == visible) return; + mItemsVisible = visible; + for (int i = 0; i < mItemList.getChildCount(); i++) { + mItemList.getChildAt(i).setVisibility(mItemsVisible ? VISIBLE : INVISIBLE); + } + } + + private class Adapter extends BaseAdapter { + + @Override + public int getCount() { + return mItems != null ? mItems.length : 0; + } + + @Override + public Object getItem(int position) { + return mItems[position]; + } + + @Override + public long getItemId(int position) { + return 0; + } + + @Override + public View getView(int position, View view, ViewGroup parent) { + final Item item = mItems[position]; + if (view == null) { + view = LayoutInflater.from(mContext).inflate(R.layout.output_chooser_item, parent, + false); + } + view.setVisibility(mItemsVisible ? VISIBLE : INVISIBLE); + final ImageView iv = view.findViewById(android.R.id.icon); + if (item.icon != null) { + iv.setImageDrawable(item.icon); + } else { + iv.setImageResource(item.iconResId); + } + iv.getOverlay().clear(); + if (item.overlay != null) { + item.overlay.setBounds(0, 0, mQsDetailIconOverlaySize, mQsDetailIconOverlaySize); + iv.getOverlay().add(item.overlay); + } + final TextView title = view.findViewById(android.R.id.title); + title.setText(item.line1); + final TextView summary = view.findViewById(android.R.id.summary); + final boolean twoLines = !TextUtils.isEmpty(item.line2); + title.setMaxLines(twoLines ? 1 : 2); + summary.setVisibility(twoLines ? VISIBLE : GONE); + summary.setText(twoLines ? item.line2 : null); + view.setOnClickListener(v -> { + if (mCallback != null) { + mCallback.onDetailItemClick(item); + } + }); + + final ImageView icon2 = view.findViewById(android.R.id.icon2); + if (item.canDisconnect) { + icon2.setImageResource(R.drawable.ic_qs_cancel); + icon2.setVisibility(VISIBLE); + icon2.setClickable(true); + icon2.setOnClickListener(v -> { + if (mCallback != null) { + mCallback.onDetailItemDisconnect(item); + } + }); + } else if (item.icon2 != -1) { + icon2.setVisibility(VISIBLE); + icon2.setImageResource(item.icon2); + icon2.setClickable(false); + } else { + icon2.setVisibility(GONE); + } + + return view; + } + }; + + private class H extends Handler { + private static final int SET_ITEMS = 1; + private static final int SET_CALLBACK = 2; + private static final int SET_ITEMS_VISIBLE = 3; + + public H() { + super(Looper.getMainLooper()); + } + + @Override + public void handleMessage(Message msg) { + if (msg.what == SET_ITEMS) { + handleSetItems((Item[]) msg.obj); + } else if (msg.what == SET_CALLBACK) { + handleSetCallback((OutputChooserLayout.Callback) msg.obj); + } else if (msg.what == SET_ITEMS_VISIBLE) { + handleSetItemsVisible(msg.arg1 != 0); + } + } + } + + public static class Item { + public int iconResId; + public Drawable icon; + public Drawable overlay; + public CharSequence line1; + public CharSequence line2; + public Object tag; + public boolean canDisconnect; + public int icon2 = -1; + } + + public interface Callback { + void onDetailItemClick(Item item); + void onDetailItemDisconnect(Item item); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java index 4dff9bd5c782..bc98140f5af5 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java @@ -134,6 +134,10 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna mController.setVolumePolicy(mVolumePolicy); } + void setEnableDialogs(boolean volumeUi, boolean safetyWarning) { + mController.setEnableDialogs(volumeUi, safetyWarning); + } + @Override public void onUserActivity() { final KeyguardViewMediator kvm = mSysui.getComponent(KeyguardViewMediator.class); diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java index 275402651079..212979004c89 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java @@ -103,6 +103,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa private final Vibrator mVibrator; private final boolean mHasVibrator; private boolean mShowA11yStream; + private boolean mShowVolumeDialog; + private boolean mShowSafetyWarning; private boolean mDestroyed; private VolumePolicy mVolumePolicy; @@ -282,6 +284,11 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa mWorker.obtainMessage(W.SET_ACTIVE_STREAM, stream, 0).sendToTarget(); } + public void setEnableDialogs(boolean volumeUi, boolean safetyWarning) { + mShowVolumeDialog = volumeUi; + mShowSafetyWarning = safetyWarning; + } + public void vibrate() { if (mHasVibrator) { mVibrator.vibrate(VIBRATE_HINT_DURATION); @@ -311,7 +318,9 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa } private void onShowSafetyWarningW(int flags) { - mCallbacks.onShowSafetyWarning(flags); + if (mShowSafetyWarning) { + mCallbacks.onShowSafetyWarning(flags); + } } private void onAccessibilityModeChanged(Boolean showA11yStream) { @@ -343,7 +352,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa && mStatusBar.getWakefulnessState() != WakefulnessLifecycle.WAKEFULNESS_ASLEEP && mStatusBar.getWakefulnessState() != WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP && mStatusBar.isDeviceInteractive() - && (flags & AudioManager.FLAG_SHOW_UI) != 0; + && (flags & AudioManager.FLAG_SHOW_UI) != 0 + && mShowVolumeDialog; } boolean onVolumeChangedW(int stream, int flags) { diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index 7959b72ce7b3..d7c80101b287 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -19,6 +19,7 @@ package com.android.systemui.volume; import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL_MASK; import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_GENERIC; +import static com.android.systemui.volume.Events.DISMISS_REASON_OUTPUT_CHOOSER; import static com.android.systemui.volume.Events.DISMISS_REASON_TOUCH_OUTSIDE; import android.accessibilityservice.AccessibilityServiceInfo; @@ -37,7 +38,6 @@ import android.graphics.Rect; import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.graphics.drawable.TransitionDrawable; import android.media.AudioManager; import android.media.AudioSystem; import android.os.Debug; @@ -106,6 +106,7 @@ public class VolumeDialogImpl implements VolumeDialog { private ViewGroup mDialogRowsView; private ImageButton mExpandButton; private ImageButton mRingerIcon; + private ImageButton mOutputChooser; private TextView mRingerStatus; private final List<VolumeRow> mRows = new ArrayList<>(); private ConfigurableTexts mConfigurableTexts; @@ -113,6 +114,7 @@ public class VolumeDialogImpl implements VolumeDialog { private final KeyguardManager mKeyguard; private final AccessibilityManager mAccessibilityMgr; private final Object mSafetyWarningLock = new Object(); + private final Object mOutputChooserLock = new Object(); private final Accessibility mAccessibility = new Accessibility(); private final ColorStateList mActiveSliderTint; private final ColorStateList mInactiveSliderTint; @@ -128,6 +130,7 @@ public class VolumeDialogImpl implements VolumeDialog { private boolean mSilentMode = VolumePrefs.DEFAULT_ENABLE_SILENT_MODE; private State mState; private SafetyWarningDialog mSafetyWarning; + private OutputChooserDialog mOutputChooserDialog; private boolean mHovering = false; public VolumeDialogImpl(Context context) { @@ -213,6 +216,9 @@ public class VolumeDialogImpl implements VolumeDialog { mExpandButton.setVisibility( AudioSystem.isSingleVolume(mContext) ? View.GONE : View.VISIBLE); + mOutputChooser = mDialogView.findViewById(R.id.output_chooser); + mOutputChooser.setOnClickListener(mClickOutputChooser); + if (mRows.isEmpty()) { addRow(AudioManager.STREAM_MUSIC, R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, true, true); @@ -913,6 +919,23 @@ public class VolumeDialogImpl implements VolumeDialog { rescheduleTimeoutH(); } + private void showOutputChooserH() { + synchronized (mOutputChooserLock) { + if (mOutputChooserDialog != null) { + return; + } + mOutputChooserDialog = new OutputChooserDialog(mContext) { + @Override + protected void cleanUp() { + synchronized (mOutputChooserLock) { + mOutputChooserDialog = null; + } + } + }; + mOutputChooserDialog.show(); + } + } + private String getStreamLabelH(StreamState ss) { if (ss.remoteLabel != null) { return ss.remoteLabel; @@ -935,6 +958,15 @@ public class VolumeDialogImpl implements VolumeDialog { } }; + private final OnClickListener mClickOutputChooser = new OnClickListener() { + @Override + public void onClick(View v) { + // TODO: log + dismissH(DISMISS_REASON_OUTPUT_CHOOSER); + showOutputChooserH(); + } + }; + private final VolumeDialogController.Callbacks mControllerCallbackH = new VolumeDialogController.Callbacks() { @Override diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java index 02969e483e97..6f65b081afc4 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java @@ -40,9 +40,13 @@ public class VolumeUI extends SystemUI { @Override public void start() { - mEnabled = mContext.getResources().getBoolean(R.bool.enable_volume_ui); + boolean enableVolumeUi = mContext.getResources().getBoolean(R.bool.enable_volume_ui); + boolean enableSafetyWarning = + mContext.getResources().getBoolean(R.bool.enable_safety_warning); + mEnabled = enableVolumeUi || enableSafetyWarning; if (!mEnabled) return; mVolumeComponent = new VolumeDialogComponent(this, mContext, null); + mVolumeComponent.setEnableDialogs(enableVolumeUi, enableSafetyWarning); putComponent(VolumeComponent.class, getVolumeComponent()); setDefaultVolumeController(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java index 06568f70f16c..401fd6857e76 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java @@ -45,6 +45,7 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { mCallback = mock(VolumeDialogControllerImpl.C.class); mStatusBar = mock(StatusBar.class); mVolumeController = new TestableVolumeDialogControllerImpl(mContext, mCallback, mStatusBar); + mVolumeController.setEnableDialogs(true, true); } @Test diff --git a/services/Android.bp b/services/Android.bp index 5e75c371d171..d125adc5fa7d 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -14,7 +14,7 @@ java_library { // The convention is to name each service module 'services.$(module_name)' static_libs: [ - "services.core.priorityboosted", + "services.core", "services.accessibility", "services.appwidget", "services.autofill", diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index ac0cdd7cf99c..972a426dd8c5 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -28,6 +28,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManagerInternal; import android.app.AlertDialog; +import android.app.AppOpsManager; import android.app.PendingIntent; import android.appwidget.AppWidgetManagerInternal; import android.content.BroadcastReceiver; @@ -193,6 +194,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private final SecurityPolicy mSecurityPolicy; + private final AppOpsManager mAppOpsManager; + private final MainHandler mMainHandler; private final GlobalActionPerformer mGlobalActionPerformer; @@ -261,6 +264,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub mWindowManagerService = LocalServices.getService(WindowManagerInternal.class); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mSecurityPolicy = new SecurityPolicy(); + mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); mMainHandler = new MainHandler(mContext.getMainLooper()); mGlobalActionPerformer = new GlobalActionPerformer(mContext, mWindowManagerService); @@ -1223,14 +1227,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub for (int i = 0, count = installedServices.size(); i < count; i++) { ResolveInfo resolveInfo = installedServices.get(i); ServiceInfo serviceInfo = resolveInfo.serviceInfo; - if (!android.Manifest.permission.BIND_ACCESSIBILITY_SERVICE.equals( - serviceInfo.permission)) { - Slog.w(LOG_TAG, "Skipping accessibilty service " + new ComponentName( - serviceInfo.packageName, serviceInfo.name).flattenToShortString() - + ": it does not require the permission " - + android.Manifest.permission.BIND_ACCESSIBILITY_SERVICE); + + if (!canRegisterService(serviceInfo)) { continue; } + AccessibilityServiceInfo accessibilityServiceInfo; try { accessibilityServiceInfo = new AccessibilityServiceInfo(resolveInfo, mContext); @@ -1251,6 +1252,28 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub return false; } + private boolean canRegisterService(ServiceInfo serviceInfo) { + if (!android.Manifest.permission.BIND_ACCESSIBILITY_SERVICE.equals( + serviceInfo.permission)) { + Slog.w(LOG_TAG, "Skipping accessibility service " + new ComponentName( + serviceInfo.packageName, serviceInfo.name).flattenToShortString() + + ": it does not require the permission " + + android.Manifest.permission.BIND_ACCESSIBILITY_SERVICE); + return false; + } + + int servicePackageUid = serviceInfo.applicationInfo.uid; + if (mAppOpsManager.noteOpNoThrow(AppOpsManager.OP_BIND_ACCESSIBILITY_SERVICE, + servicePackageUid, serviceInfo.packageName) != AppOpsManager.MODE_ALLOWED) { + Slog.w(LOG_TAG, "Skipping accessibility service " + new ComponentName( + serviceInfo.packageName, serviceInfo.name).flattenToShortString() + + ": disallowed by AppOps"); + return false; + } + + return true; + } + private boolean readEnabledAccessibilityServicesLocked(UserState userState) { mTempComponentNameSet.clear(); readComponentNamesFromSettingLocked(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, @@ -2962,11 +2985,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub } private boolean isValidPackageForUid(String packageName, int uid) { + final long token = Binder.clearCallingIdentity(); try { return uid == mPackageManager.getPackageUidAsUser( packageName, UserHandle.getUserId(uid)); } catch (PackageManager.NameNotFoundException e) { return false; + } finally { + Binder.restoreCallingIdentity(token); } } diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index 1dba0529eaf4..4adcb99f5628 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -3242,10 +3242,10 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter skip = true; } - // Do we have a transport to fetch data for us? - IBackupTransport transport = mTransportManager.getCurrentTransportBinder(); - if (transport == null) { - if (DEBUG) Slog.w(TAG, "No transport"); + TransportClient transportClient = + mTransportManager.getCurrentTransportClient("BMS.restoreAtInstall()"); + if (transportClient == null) { + if (DEBUG) Slog.w(TAG, "No transport client"); skip = true; } @@ -3262,16 +3262,26 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // The eventual message back into the Package Manager to run the post-install // steps for 'token' will be issued from the restore handling code. - // This can throw and so *must* happen before the wakelock is acquired - String dirName = transport.transportDirName(); - mWakelock.acquire(); + + OnTaskFinishedListener listener = caller -> { + mTransportManager.disposeOfTransportClient(transportClient, caller); + mWakelock.release(); + }; + if (MORE_DEBUG) { Slog.d(TAG, "Restore at install of " + packageName); } Message msg = mBackupHandler.obtainMessage(MSG_RUN_RESTORE); - msg.obj = new RestoreParams(transport, dirName, null, null, - restoreSet, packageName, token); + msg.obj = + RestoreParams.createForRestoreAtInstall( + transportClient, + /* observer */ null, + /* monitor */ null, + restoreSet, + packageName, + token, + listener); mBackupHandler.sendMessage(msg); } catch (Exception e) { // Calling into the transport broke; back off and proceed with the installation. @@ -3281,8 +3291,14 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter } if (skip) { - // Auto-restore disabled or no way to attempt a restore; just tell the Package - // Manager to proceed with the post-install handling for this package. + // Auto-restore disabled or no way to attempt a restore + + if (transportClient != null) { + mTransportManager.disposeOfTransportClient( + transportClient, "BMS.restoreAtInstall()"); + } + + // Tell the PackageManager to proceed with the post-install handling for this package. if (DEBUG) Slog.v(TAG, "Finishing install immediately"); try { mPackageManagerBinder.finishPackageInstall(token, false); diff --git a/services/backup/java/com/android/server/backup/TransportManager.java b/services/backup/java/com/android/server/backup/TransportManager.java index f8f1448531fa..1f3ebf936ceb 100644 --- a/services/backup/java/com/android/server/backup/TransportManager.java +++ b/services/backup/java/com/android/server/backup/TransportManager.java @@ -308,6 +308,12 @@ public class TransportManager { } } + public boolean isTransportRegistered(String transportName) { + synchronized (mTransportLock) { + return getRegisteredTransportEntryLocked(transportName) != null; + } + } + /** * Returns a {@link TransportClient} for the current transport or null if not found. * diff --git a/services/backup/java/com/android/server/backup/internal/BackupHandler.java b/services/backup/java/com/android/server/backup/internal/BackupHandler.java index 477724de2c4d..4c7834825054 100644 --- a/services/backup/java/com/android/server/backup/internal/BackupHandler.java +++ b/services/backup/java/com/android/server/backup/internal/BackupHandler.java @@ -189,7 +189,7 @@ public class BackupHandler extends Handler { } task.execute(); } catch (ClassCastException e) { - Slog.e(TAG, "Invalid backup task in flight, obj=" + msg.obj); + Slog.e(TAG, "Invalid backup/restore task in flight, obj=" + msg.obj); } break; } @@ -229,10 +229,18 @@ public class BackupHandler extends Handler { RestoreParams params = (RestoreParams) msg.obj; Slog.d(TAG, "MSG_RUN_RESTORE observer=" + params.observer); - PerformUnifiedRestoreTask task = new PerformUnifiedRestoreTask(backupManagerService, - params.transport, - params.observer, params.monitor, params.token, params.pkgInfo, - params.pmToken, params.isSystemRestore, params.filterSet); + PerformUnifiedRestoreTask task = + new PerformUnifiedRestoreTask( + backupManagerService, + params.transportClient, + params.observer, + params.monitor, + params.token, + params.packageInfo, + params.pmToken, + params.isSystemRestore, + params.filterSet, + params.listener); synchronized (backupManagerService.getPendingRestores()) { if (backupManagerService.isRestoreInProgress()) { @@ -299,8 +307,11 @@ public class BackupHandler extends Handler { // Like other async operations, this is entered with the wakelock held RestoreSet[] sets = null; RestoreGetSetsParams params = (RestoreGetSetsParams) msg.obj; + String callerLogString = "BH/MSG_RUN_GET_RESTORE_SETS"; try { - sets = params.transport.getAvailableRestoreSets(); + IBackupTransport transport = + params.transportClient.connectOrThrow(callerLogString); + sets = transport.getAvailableRestoreSets(); // cache the result in the active session synchronized (params.session) { params.session.mRestoreSets = sets; @@ -325,7 +336,7 @@ public class BackupHandler extends Handler { removeMessages(MSG_RESTORE_SESSION_TIMEOUT); sendEmptyMessageDelayed(MSG_RESTORE_SESSION_TIMEOUT, TIMEOUT_RESTORE_INTERVAL); - backupManagerService.getWakelock().release(); + params.listener.onFinished(callerLogString); } break; } diff --git a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java index e65eb2849ac2..a002334dac3b 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java @@ -907,7 +907,7 @@ public class PerformBackupTask implements BackupRestoreTask { mStatus = BackupTransport.TRANSPORT_OK; long size = 0; try { - TransportUtils.checkTransport(transport); + TransportUtils.checkTransportNotNull(transport); size = mBackupDataName.length(); if (size > 0) { if (mStatus == BackupTransport.TRANSPORT_OK) { @@ -997,7 +997,7 @@ public class PerformBackupTask implements BackupRestoreTask { } if (mAgentBinder != null) { try { - TransportUtils.checkTransport(transport); + TransportUtils.checkTransportNotNull(transport); long quota = transport.getBackupQuota(mCurrentPackage.packageName, false); mAgentBinder.doQuotaExceeded(size, quota); } catch (Exception e) { diff --git a/services/backup/java/com/android/server/backup/params/RestoreGetSetsParams.java b/services/backup/java/com/android/server/backup/params/RestoreGetSetsParams.java index bff476be9152..914e9ea7f57c 100644 --- a/services/backup/java/com/android/server/backup/params/RestoreGetSetsParams.java +++ b/services/backup/java/com/android/server/backup/params/RestoreGetSetsParams.java @@ -20,20 +20,24 @@ import android.app.backup.IBackupManagerMonitor; import android.app.backup.IRestoreObserver; import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.restore.ActiveRestoreSession; +import com.android.server.backup.transport.TransportClient; public class RestoreGetSetsParams { + public final TransportClient transportClient; + public final ActiveRestoreSession session; + public final IRestoreObserver observer; + public final IBackupManagerMonitor monitor; + public final OnTaskFinishedListener listener; - public IBackupTransport transport; - public ActiveRestoreSession session; - public IRestoreObserver observer; - public IBackupManagerMonitor monitor; - - public RestoreGetSetsParams(IBackupTransport _transport, ActiveRestoreSession _session, - IRestoreObserver _observer, IBackupManagerMonitor _monitor) { - transport = _transport; + public RestoreGetSetsParams(TransportClient _transportClient, ActiveRestoreSession _session, + IRestoreObserver _observer, IBackupManagerMonitor _monitor, + OnTaskFinishedListener _listener) { + transportClient = _transportClient; session = _session; observer = _observer; monitor = _monitor; + listener = _listener; } } diff --git a/services/backup/java/com/android/server/backup/params/RestoreParams.java b/services/backup/java/com/android/server/backup/params/RestoreParams.java index 93ce00d8f973..e500d6e1b5ca 100644 --- a/services/backup/java/com/android/server/backup/params/RestoreParams.java +++ b/services/backup/java/com/android/server/backup/params/RestoreParams.java @@ -20,84 +20,128 @@ import android.app.backup.IBackupManagerMonitor; import android.app.backup.IRestoreObserver; import android.content.pm.PackageInfo; -import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.internal.OnTaskFinishedListener; +import com.android.server.backup.transport.TransportClient; public class RestoreParams { - - public IBackupTransport transport; - public String dirName; - public IRestoreObserver observer; - public IBackupManagerMonitor monitor; - public long token; - public PackageInfo pkgInfo; - public int pmToken; // in post-install restore, the PM's token for this transaction - public boolean isSystemRestore; - public String[] filterSet; + public final TransportClient transportClient; + public final IRestoreObserver observer; + public final IBackupManagerMonitor monitor; + public final long token; + public final PackageInfo packageInfo; + public final int pmToken; // in post-install restore, the PM's token for this transaction + public final boolean isSystemRestore; + public final String[] filterSet; + public final OnTaskFinishedListener listener; /** - * Restore a single package; no kill after restore + * No kill after restore. */ - public RestoreParams(IBackupTransport _transport, String _dirName, IRestoreObserver _obs, - IBackupManagerMonitor _monitor, long _token, PackageInfo _pkg) { - transport = _transport; - dirName = _dirName; - observer = _obs; - monitor = _monitor; - token = _token; - pkgInfo = _pkg; - pmToken = 0; - isSystemRestore = false; - filterSet = null; + public static RestoreParams createForSinglePackage( + TransportClient transportClient, + IRestoreObserver observer, + IBackupManagerMonitor monitor, + long token, + PackageInfo packageInfo, + OnTaskFinishedListener listener) { + return new RestoreParams( + transportClient, + observer, + monitor, + token, + packageInfo, + /* pmToken */ 0, + /* isSystemRestore */ false, + /* filterSet */ null, + listener); } /** - * Restore at install: PM token needed, kill after restore + * Kill after restore. */ - public RestoreParams(IBackupTransport _transport, String _dirName, IRestoreObserver _obs, - IBackupManagerMonitor _monitor, long _token, String _pkgName, int _pmToken) { - transport = _transport; - dirName = _dirName; - observer = _obs; - monitor = _monitor; - token = _token; - pkgInfo = null; - pmToken = _pmToken; - isSystemRestore = false; - filterSet = new String[]{_pkgName}; + public static RestoreParams createForRestoreAtInstall( + TransportClient transportClient, + IRestoreObserver observer, + IBackupManagerMonitor monitor, + long token, + String packageName, + int pmToken, + OnTaskFinishedListener listener) { + String[] filterSet = {packageName}; + return new RestoreParams( + transportClient, + observer, + monitor, + token, + /* packageInfo */ null, + pmToken, + /* isSystemRestore */ false, + filterSet, + listener); } /** - * Restore everything possible. This is the form that Setup Wizard or similar - * restore UXes use. + * This is the form that Setup Wizard or similar restore UXes use. */ - public RestoreParams(IBackupTransport _transport, String _dirName, IRestoreObserver _obs, - IBackupManagerMonitor _monitor, long _token) { - transport = _transport; - dirName = _dirName; - observer = _obs; - monitor = _monitor; - token = _token; - pkgInfo = null; - pmToken = 0; - isSystemRestore = true; - filterSet = null; + public static RestoreParams createForRestoreAll( + TransportClient transportClient, + IRestoreObserver observer, + IBackupManagerMonitor monitor, + long token, + OnTaskFinishedListener listener) { + return new RestoreParams( + transportClient, + observer, + monitor, + token, + /* packageInfo */ null, + /* pmToken */ 0, + /* isSystemRestore */ true, + /* filterSet */ null, + listener); } /** - * Restore some set of packages. Leave this one up to the caller to specify - * whether it's to be considered a system-level restore. + * Caller specifies whether is considered a system-level restore. */ - public RestoreParams(IBackupTransport _transport, String _dirName, IRestoreObserver _obs, - IBackupManagerMonitor _monitor, long _token, - String[] _filterSet, boolean _isSystemRestore) { - transport = _transport; - dirName = _dirName; - observer = _obs; - monitor = _monitor; - token = _token; - pkgInfo = null; - pmToken = 0; - isSystemRestore = _isSystemRestore; - filterSet = _filterSet; + public static RestoreParams createForRestoreSome( + TransportClient transportClient, + IRestoreObserver observer, + IBackupManagerMonitor monitor, + long token, + String[] filterSet, + boolean isSystemRestore, + OnTaskFinishedListener listener) { + return new RestoreParams( + transportClient, + observer, + monitor, + token, + /* packageInfo */ null, + /* pmToken */ 0, + isSystemRestore, + filterSet, + listener); + } + + private RestoreParams( + TransportClient transportClient, + IRestoreObserver observer, + IBackupManagerMonitor monitor, + long token, + PackageInfo packageInfo, + int pmToken, + boolean isSystemRestore, + String[] filterSet, + OnTaskFinishedListener listener) { + this.transportClient = transportClient; + this.observer = observer; + this.monitor = monitor; + this.token = token; + this.packageInfo = packageInfo; + this.pmToken = pmToken; + this.isSystemRestore = isSystemRestore; + this.filterSet = filterSet; + this.listener = listener; } } diff --git a/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java b/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java index a08c19e95914..7ae5b4389fd4 100644 --- a/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java +++ b/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java @@ -31,33 +31,39 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Binder; import android.os.Message; +import android.os.PowerManager; import android.util.Slog; -import com.android.internal.backup.IBackupTransport; import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.TransportManager; +import com.android.server.backup.internal.BackupHandler; +import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.params.RestoreGetSetsParams; import com.android.server.backup.params.RestoreParams; +import com.android.server.backup.transport.TransportClient; + +import java.util.function.BiFunction; /** * Restore session. */ public class ActiveRestoreSession extends IRestoreSession.Stub { - private static final String TAG = "RestoreSession"; - private RefactoredBackupManagerService backupManagerService; - private String mPackageName; - private IBackupTransport mRestoreTransport = null; + private final TransportManager mTransportManager; + private final String mTransportName; + private final RefactoredBackupManagerService mBackupManagerService; + private final String mPackageName; public RestoreSet[] mRestoreSets = null; boolean mEnded = false; boolean mTimedOut = false; public ActiveRestoreSession(RefactoredBackupManagerService backupManagerService, - String packageName, String transport) { - this.backupManagerService = backupManagerService; + String packageName, String transportName) { + mBackupManagerService = backupManagerService; mPackageName = packageName; - mRestoreTransport = backupManagerService.getTransportManager().getTransportBinder( - transport); + mTransportManager = backupManagerService.getTransportManager(); + mTransportName = transportName; } public void markTimedOut() { @@ -67,7 +73,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { // --- Binder interface --- public synchronized int getAvailableRestoreSets(IRestoreObserver observer, IBackupManagerMonitor monitor) { - backupManagerService.getContext().enforceCallingOrSelfPermission( + mBackupManagerService.getContext().enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "getAvailableRestoreSets"); if (observer == null) { @@ -85,23 +91,32 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { long oldId = Binder.clearCallingIdentity(); try { - if (mRestoreTransport == null) { - Slog.w(TAG, "Null transport getting restore sets"); + TransportClient transportClient = + mTransportManager.getTransportClient( + mTransportName, "RestoreSession.getAvailableRestoreSets()"); + if (transportClient == null) { + Slog.w(TAG, "Null transport client getting restore sets"); return -1; } // We know we're doing legit work now, so halt the timeout // until we're done. It gets started again when the result // comes in. - backupManagerService.getBackupHandler().removeMessages(MSG_RESTORE_SESSION_TIMEOUT); - - // spin off the transport request to our service thread - backupManagerService.getWakelock().acquire(); - Message msg = backupManagerService.getBackupHandler().obtainMessage( + mBackupManagerService.getBackupHandler().removeMessages(MSG_RESTORE_SESSION_TIMEOUT); + + PowerManager.WakeLock wakelock = mBackupManagerService.getWakelock(); + wakelock.acquire(); + + // Prevent lambda from leaking 'this' + TransportManager transportManager = mTransportManager; + OnTaskFinishedListener listener = caller -> { + transportManager.disposeOfTransportClient(transportClient, caller); + wakelock.release(); + }; + Message msg = mBackupManagerService.getBackupHandler().obtainMessage( MSG_RUN_GET_RESTORE_SETS, - new RestoreGetSetsParams(mRestoreTransport, this, observer, - monitor)); - backupManagerService.getBackupHandler().sendMessage(msg); + new RestoreGetSetsParams(transportClient, this, observer, monitor, listener)); + mBackupManagerService.getBackupHandler().sendMessage(msg); return 0; } catch (Exception e) { Slog.e(TAG, "Error in getAvailableRestoreSets", e); @@ -113,7 +128,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { public synchronized int restoreAll(long token, IRestoreObserver observer, IBackupManagerMonitor monitor) { - backupManagerService.getContext().enforceCallingOrSelfPermission( + mBackupManagerService.getContext().enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "performRestore"); @@ -131,7 +146,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { return -1; } - if (mRestoreTransport == null || mRestoreSets == null) { + if (mRestoreSets == null) { Slog.e(TAG, "Ignoring restoreAll() with no restore set"); return -1; } @@ -141,37 +156,28 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { return -1; } - String dirName; - try { - dirName = mRestoreTransport.transportDirName(); - } catch (Exception e) { - // Transport went AWOL; fail. - Slog.e(TAG, "Unable to get transport dir for restore: " + e.getMessage()); + if (!mTransportManager.isTransportRegistered(mTransportName)) { + Slog.e(TAG, "Transport " + mTransportName + " not registered"); return -1; } - synchronized (backupManagerService.getQueueLock()) { + synchronized (mBackupManagerService.getQueueLock()) { for (int i = 0; i < mRestoreSets.length; i++) { if (token == mRestoreSets[i].token) { - // Real work, so stop the session timeout until we finalize the restore - backupManagerService.getBackupHandler().removeMessages( - MSG_RESTORE_SESSION_TIMEOUT); - long oldId = Binder.clearCallingIdentity(); try { - backupManagerService.getWakelock().acquire(); - if (MORE_DEBUG) { - Slog.d(TAG, "restoreAll() kicking off"); - } - Message msg = backupManagerService.getBackupHandler().obtainMessage( - MSG_RUN_RESTORE); - msg.obj = new RestoreParams(mRestoreTransport, dirName, - observer, monitor, token); - backupManagerService.getBackupHandler().sendMessage(msg); + return sendRestoreToHandlerLocked( + (transportClient, listener) -> + RestoreParams.createForRestoreAll( + transportClient, + observer, + monitor, + token, + listener), + "RestoreSession.restoreAll()"); } finally { Binder.restoreCallingIdentity(oldId); } - return 0; } } } @@ -183,7 +189,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { // Restores of more than a single package are treated as 'system' restores public synchronized int restoreSome(long token, IRestoreObserver observer, IBackupManagerMonitor monitor, String[] packages) { - backupManagerService.getContext().enforceCallingOrSelfPermission( + mBackupManagerService.getContext().enforceCallingOrSelfPermission( android.Manifest.permission.BACKUP, "performRestore"); @@ -227,7 +233,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { return -1; } - if (mRestoreTransport == null || mRestoreSets == null) { + if (mRestoreSets == null) { Slog.e(TAG, "Ignoring restoreAll() with no restore set"); return -1; } @@ -237,34 +243,30 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { return -1; } - String dirName; - try { - dirName = mRestoreTransport.transportDirName(); - } catch (Exception e) { - // Transport went AWOL; fail. - Slog.e(TAG, "Unable to get transport name for restoreSome: " + e.getMessage()); + if (!mTransportManager.isTransportRegistered(mTransportName)) { + Slog.e(TAG, "Transport " + mTransportName + " not registered"); return -1; } - synchronized (backupManagerService.getQueueLock()) { + synchronized (mBackupManagerService.getQueueLock()) { for (int i = 0; i < mRestoreSets.length; i++) { if (token == mRestoreSets[i].token) { - // Stop the session timeout until we finalize the restore - backupManagerService.getBackupHandler().removeMessages( - MSG_RESTORE_SESSION_TIMEOUT); - long oldId = Binder.clearCallingIdentity(); - backupManagerService.getWakelock().acquire(); - if (MORE_DEBUG) { - Slog.d(TAG, "restoreSome() of " + packages.length + " packages"); + try { + return sendRestoreToHandlerLocked( + (transportClient, listener) -> + RestoreParams.createForRestoreSome( + transportClient, + observer, + monitor, + token, + packages, + /* isSystemRestore */ packages.length > 1, + listener), + "RestoreSession.restoreSome(" + packages.length + " packages)"); + } finally { + Binder.restoreCallingIdentity(oldId); } - Message msg = backupManagerService.getBackupHandler().obtainMessage( - MSG_RUN_RESTORE); - msg.obj = new RestoreParams(mRestoreTransport, dirName, observer, monitor, - token, packages, packages.length > 1); - backupManagerService.getBackupHandler().sendMessage(msg); - Binder.restoreCallingIdentity(oldId); - return 0; } } } @@ -297,9 +299,9 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { } } - PackageInfo app = null; + final PackageInfo app; try { - app = backupManagerService.getPackageManager().getPackageInfo(packageName, 0); + app = mBackupManagerService.getPackageManager().getPackageInfo(packageName, 0); } catch (NameNotFoundException nnf) { Slog.w(TAG, "Asked to restore nonexistent pkg " + packageName); return -1; @@ -307,7 +309,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { // If the caller is not privileged and is not coming from the target // app's uid, throw a permission exception back to the caller. - int perm = backupManagerService.getContext().checkPermission( + int perm = mBackupManagerService.getContext().checkPermission( android.Manifest.permission.BACKUP, Binder.getCallingPid(), Binder.getCallingUid()); if ((perm == PackageManager.PERMISSION_DENIED) && @@ -317,12 +319,17 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { throw new SecurityException("No permission to restore other packages"); } + if (!mTransportManager.isTransportRegistered(mTransportName)) { + Slog.e(TAG, "Transport " + mTransportName + " not registered"); + return -1; + } + // So far so good; we're allowed to try to restore this package. long oldId = Binder.clearCallingIdentity(); try { // Check whether there is data for it in the current dataset, falling back // to the ancestral dataset if not. - long token = backupManagerService.getAvailableRestoreToken(packageName); + long token = mBackupManagerService.getAvailableRestoreToken(packageName); if (DEBUG) { Slog.v(TAG, "restorePackage pkg=" + packageName + " token=" + Long.toHexString(token)); @@ -338,30 +345,53 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { return -1; } - String dirName; - try { - dirName = mRestoreTransport.transportDirName(); - } catch (Exception e) { - // Transport went AWOL; fail. - Slog.e(TAG, "Unable to get transport dir for restorePackage: " + e.getMessage()); - return -1; - } - - // Stop the session timeout until we finalize the restore - backupManagerService.getBackupHandler().removeMessages(MSG_RESTORE_SESSION_TIMEOUT); - - // Ready to go: enqueue the restore request and claim success - backupManagerService.getWakelock().acquire(); - if (MORE_DEBUG) { - Slog.d(TAG, "restorePackage() : " + packageName); - } - Message msg = backupManagerService.getBackupHandler().obtainMessage(MSG_RUN_RESTORE); - msg.obj = new RestoreParams(mRestoreTransport, dirName, observer, monitor, - token, app); - backupManagerService.getBackupHandler().sendMessage(msg); + return sendRestoreToHandlerLocked( + (transportClient, listener) -> + RestoreParams.createForSinglePackage( + transportClient, + observer, + monitor, + token, + app, + listener), + "RestoreSession.restorePackage(" + packageName + ")"); } finally { Binder.restoreCallingIdentity(oldId); } + } + + /** + * Returns 0 if operation sent or -1 otherwise. + */ + private int sendRestoreToHandlerLocked( + BiFunction<TransportClient, OnTaskFinishedListener, RestoreParams> restoreParamsBuilder, + String callerLogString) { + TransportClient transportClient = + mTransportManager.getTransportClient(mTransportName, callerLogString); + if (transportClient == null) { + Slog.e(TAG, "Transport " + mTransportName + " got unregistered"); + return -1; + } + + // Stop the session timeout until we finalize the restore + BackupHandler backupHandler = mBackupManagerService.getBackupHandler(); + backupHandler.removeMessages(MSG_RESTORE_SESSION_TIMEOUT); + + PowerManager.WakeLock wakelock = mBackupManagerService.getWakelock(); + wakelock.acquire(); + if (MORE_DEBUG) { + Slog.d(TAG, callerLogString); + } + + // Prevent lambda from leaking 'this' + TransportManager transportManager = mTransportManager; + OnTaskFinishedListener listener = caller -> { + transportManager.disposeOfTransportClient(transportClient, caller); + wakelock.release(); + }; + Message msg = backupHandler.obtainMessage(MSG_RUN_RESTORE); + msg.obj = restoreParamsBuilder.apply(transportClient, listener); + backupHandler.sendMessage(msg); return 0; } @@ -380,7 +410,6 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { public void run() { // clean up the session's bookkeeping synchronized (mSession) { - mSession.mRestoreTransport = null; mSession.mEnded = true; } @@ -404,7 +433,7 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { throw new IllegalStateException("Restore session already ended"); } - backupManagerService.getBackupHandler().post( - new EndRestoreRunnable(backupManagerService, this)); + mBackupManagerService.getBackupHandler().post( + new EndRestoreRunnable(mBackupManagerService, this)); } } diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index 2db743020237..86866dca2fa2 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -61,6 +61,8 @@ import com.android.server.backup.BackupUtils; import com.android.server.backup.PackageManagerBackupAgent; import com.android.server.backup.PackageManagerBackupAgent.Metadata; import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.internal.OnTaskFinishedListener; +import com.android.server.backup.transport.TransportClient; import com.android.server.backup.utils.AppBackupUtils; import com.android.server.backup.utils.BackupManagerMonitorUtils; @@ -76,8 +78,8 @@ import java.util.List; public class PerformUnifiedRestoreTask implements BackupRestoreTask { private RefactoredBackupManagerService backupManagerService; - // Transport we're working with to do the restore - private IBackupTransport mTransport; + // Transport client we're working with to do the restore + private final TransportClient mTransportClient; // Where per-transport saved state goes File mStateDir; @@ -141,6 +143,9 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // Done? private boolean mFinished; + // When finished call listener + private final OnTaskFinishedListener mListener; + // Key/value: bookkeeping about staged data and files for agent access private File mBackupDataName; private File mStageName; @@ -154,15 +159,16 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // Invariant: mWakelock is already held, and this task is responsible for // releasing it at the end of the restore operation. public PerformUnifiedRestoreTask(RefactoredBackupManagerService backupManagerService, - IBackupTransport transport, IRestoreObserver observer, + TransportClient transportClient, IRestoreObserver observer, IBackupManagerMonitor monitor, long restoreSetToken, PackageInfo targetPackage, - int pmToken, boolean isFullSystemRestore, String[] filterSet) { + int pmToken, boolean isFullSystemRestore, String[] filterSet, + OnTaskFinishedListener listener) { this.backupManagerService = backupManagerService; mEphemeralOpToken = backupManagerService.generateRandomIntegerToken(); mState = UnifiedRestoreState.INITIAL; mStartRealtime = SystemClock.elapsedRealtime(); - mTransport = transport; + mTransportClient = transportClient; mObserver = observer; mMonitor = monitor; mToken = restoreSetToken; @@ -171,6 +177,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { mIsSystemRestore = isFullSystemRestore; mFinished = false; mDidLaunch = false; + mListener = listener; if (targetPackage != null) { // Single package restore @@ -342,7 +349,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { } try { - String transportDir = mTransport.transportDirName(); + String transportDir = mTransportClient.getTransportDirName(); mStateDir = new File(backupManagerService.getBaseStateDir(), transportDir); // Fetch the current metadata from the dataset first @@ -351,7 +358,11 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { mAcceptSet.add(0, pmPackage); PackageInfo[] packages = mAcceptSet.toArray(new PackageInfo[0]); - mStatus = mTransport.startRestore(mToken, packages); + + IBackupTransport transport = + mTransportClient.connectOrThrow("PerformUnifiedRestoreTask.startRestore()"); + + mStatus = transport.startRestore(mToken, packages); if (mStatus != BackupTransport.TRANSPORT_OK) { Slog.e(TAG, "Transport error " + mStatus + "; no restore possible"); mStatus = BackupTransport.TRANSPORT_ERROR; @@ -359,7 +370,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { return; } - RestoreDescription desc = mTransport.nextRestorePackage(); + RestoreDescription desc = transport.nextRestorePackage(); if (desc == null) { Slog.e(TAG, "No restore metadata available; halting"); mMonitor = BackupManagerMonitorUtils.monitorEvent(mMonitor, @@ -444,7 +455,10 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { private void dispatchNextRestore() { UnifiedRestoreState nextState = UnifiedRestoreState.FINAL; try { - mRestoreDescription = mTransport.nextRestorePackage(); + IBackupTransport transport = + mTransportClient.connectOrThrow( + "PerformUnifiedRestoreTask.dispatchNextRestore()"); + mRestoreDescription = transport.nextRestorePackage(); final String pkgName = (mRestoreDescription != null) ? mRestoreDescription.getPackageName() : null; if (pkgName == null) { @@ -657,13 +671,17 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { File downloadFile = (staging) ? mStageName : mBackupDataName; try { + IBackupTransport transport = + mTransportClient.connectOrThrow( + "PerformUnifiedRestoreTask.initiateOneRestore()"); + // Run the transport's restore pass stage = ParcelFileDescriptor.open(downloadFile, ParcelFileDescriptor.MODE_READ_WRITE | ParcelFileDescriptor.MODE_CREATE | ParcelFileDescriptor.MODE_TRUNCATE); - if (mTransport.getRestoreData(stage) != BackupTransport.TRANSPORT_OK) { + if (transport.getRestoreData(stage) != BackupTransport.TRANSPORT_OK) { // Transport-level failure, so we wind everything up and // terminate the restore operation. Slog.e(TAG, "Error getting restore data for " + packageName); @@ -750,7 +768,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // None of this can run on the work looper here, so we spin asynchronous // work like this: // - // StreamFeederThread: read data from mTransport.getNextFullRestoreDataChunk() + // StreamFeederThread: read data from transport.getNextFullRestoreDataChunk() // write it into the pipe to the engine // EngineThread: FullRestoreEngine thread communicating with the target app // @@ -844,10 +862,12 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // spin up the engine and start moving data to it new Thread(mEngineThread, "unified-restore-engine").start(); + String callerLogString = "PerformUnifiedRestoreTask$StreamFeederThread.run()"; try { + IBackupTransport transport = mTransportClient.connectOrThrow(callerLogString); while (status == BackupTransport.TRANSPORT_OK) { // have the transport write some of the restoring data to us - int result = mTransport.getNextFullRestoreDataChunk(tWriteEnd); + int result = transport.getNextFullRestoreDataChunk(tWriteEnd); if (result > 0) { // The transport wrote this many bytes of restore data to the // pipe, so pass it along to the engine. @@ -936,7 +956,9 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // Something went wrong somewhere. Whether it was at the transport // level is immaterial; we need to tell the transport to bail try { - mTransport.abortFullRestore(); + IBackupTransport transport = + mTransportClient.connectOrThrow(callerLogString); + transport.abortFullRestore(); } catch (Exception e) { // transport itself is dead; make sure we handle this as a // fatal error @@ -1039,8 +1061,11 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { Slog.d(TAG, "finishing restore mObserver=" + mObserver); } + String callerLogString = "PerformUnifiedRestoreTask.finalizeRestore()"; try { - mTransport.finishRestore(); + IBackupTransport transport = + mTransportClient.connectOrThrow(callerLogString); + transport.finishRestore(); } catch (Exception e) { Slog.e(TAG, "Error finishing restore", e); } @@ -1087,9 +1112,6 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { backupManagerService.writeRestoreTokens(); } - // done; we can finally release the wakelock and be legitimately done. - Slog.i(TAG, "Restore complete."); - synchronized (backupManagerService.getPendingRestores()) { if (backupManagerService.getPendingRestores().size() > 0) { if (DEBUG) { @@ -1108,7 +1130,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { } } - backupManagerService.getWakelock().release(); + Slog.i(TAG, "Restore complete."); + mListener.onFinished(callerLogString); } void keyValueAgentErrorCleanup() { @@ -1301,13 +1324,11 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { void sendOnRestorePackage(String name) { if (mObserver != null) { - if (mObserver != null) { - try { - mObserver.onUpdate(mCount, name); - } catch (RemoteException e) { - Slog.d(TAG, "Restore observer died in onUpdate"); - mObserver = null; - } + try { + mObserver.onUpdate(mCount, name); + } catch (RemoteException e) { + Slog.d(TAG, "Restore observer died in onUpdate"); + mObserver = null; } } } diff --git a/services/backup/java/com/android/server/backup/restore/RestoreEngine.java b/services/backup/java/com/android/server/backup/restore/RestoreEngine.java index b2fdbb8677ba..9d3ae8646af6 100644 --- a/services/backup/java/com/android/server/backup/restore/RestoreEngine.java +++ b/services/backup/java/com/android/server/backup/restore/RestoreEngine.java @@ -30,8 +30,8 @@ public abstract class RestoreEngine { public static final int TARGET_FAILURE = -2; public static final int TRANSPORT_FAILURE = -3; - private AtomicBoolean mRunning = new AtomicBoolean(false); - private AtomicInteger mResult = new AtomicInteger(SUCCESS); + private final AtomicBoolean mRunning = new AtomicBoolean(false); + private final AtomicInteger mResult = new AtomicInteger(SUCCESS); public boolean isRunning() { return mRunning.get(); diff --git a/services/backup/java/com/android/server/backup/transport/TransportUtils.java b/services/backup/java/com/android/server/backup/transport/TransportUtils.java index 85599b782562..92bba9bf06f0 100644 --- a/services/backup/java/com/android/server/backup/transport/TransportUtils.java +++ b/services/backup/java/com/android/server/backup/transport/TransportUtils.java @@ -31,7 +31,7 @@ public class TransportUtils { * Throws {@link TransportNotAvailableException} if {@param transport} is null. The semantics is * similar to a {@link DeadObjectException} coming from a dead transport binder. */ - public static IBackupTransport checkTransport(@Nullable IBackupTransport transport) + public static IBackupTransport checkTransportNotNull(@Nullable IBackupTransport transport) throws TransportNotAvailableException { if (transport == null) { log(Log.ERROR, TAG, "Transport not available"); diff --git a/services/core/Android.bp b/services/core/Android.bp index 446c2a52be22..9fb26819dae0 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -1,5 +1,5 @@ java_library_static { - name: "services.core", + name: "services.core.unboosted", aidl: { include_dirs: [ @@ -31,6 +31,7 @@ java_library_static { static_libs: [ "time_zone_distro", "time_zone_distro_installer", + "android.hardware.broadcastradio-V2.0-java", "android.hardware.health-V1.0-java", "android.hardware.health-V2.0-java", "android.hardware.weaver-V1.0-java", @@ -45,7 +46,7 @@ java_library_static { java_genrule { name: "services.core.priorityboosted", - srcs: [":services.core"], + srcs: [":services.core.unboosted"], tools: ["lockedregioncodeinjection"], cmd: "$(location lockedregioncodeinjection) " + " --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " + @@ -55,3 +56,8 @@ java_genrule { " -i $(in)", out: ["services.core.priorityboosted.jar"], } + +java_library { + name: "services.core", + static_libs: ["services.core.priorityboosted"], +} diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index 924e736bab07..04d292fa1ae4 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -421,7 +421,9 @@ public final class BatteryService extends SystemService { boolean logOutlier = false; long dischargeDuration = 0; - mBatteryLevelCritical = (mHealthInfo.batteryLevel <= mCriticalBatteryLevel); + mBatteryLevelCritical = + mHealthInfo.batteryStatus != BatteryManager.BATTERY_STATUS_UNKNOWN + && mHealthInfo.batteryLevel <= mCriticalBatteryLevel; if (mHealthInfo.chargerAcOnline) { mPlugType = BatteryManager.BATTERY_PLUGGED_AC; } else if (mHealthInfo.chargerUsbOnline) { @@ -509,6 +511,8 @@ public final class BatteryService extends SystemService { if (!mBatteryLevelLow) { // Should we now switch in to low battery mode? if (mPlugType == BATTERY_PLUGGED_NONE + && mHealthInfo.batteryStatus != + BatteryManager.BATTERY_STATUS_UNKNOWN && mHealthInfo.batteryLevel <= mLowBatteryWarningLevel) { mBatteryLevelLow = true; } diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index 4f1e335a2d50..6f697c46098b 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -2828,7 +2828,7 @@ public class DeviceIdleController extends SystemService becomeInactiveIfAppropriateLocked(); int curLightState = mLightState; while (curLightState != LIGHT_STATE_IDLE) { - stepIdleStateLocked("s:shell"); + stepLightIdleStateLocked("s:shell"); if (curLightState == mLightState) { pw.print("Unable to go light idle; stopped at "); pw.println(lightStateToString(mLightState)); diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 5fed93b1b0b1..25c3fe42f795 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -93,6 +93,7 @@ import android.hardware.input.InputManagerInternal; import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.Binder; +import android.os.Build; import android.os.Bundle; import android.os.Debug; import android.os.Environment; @@ -2723,10 +2724,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub /* @InputMethodClient.StartInputReason */ final int startInputReason, IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode, int windowFlags, @Nullable EditorInfo attribute, IInputContext inputContext, - /* @InputConnectionInspector.missingMethods */ final int missingMethods) { + /* @InputConnectionInspector.missingMethods */ final int missingMethods, + int unverifiedTargetSdkVersion) { if (windowToken != null) { return windowGainedFocus(startInputReason, client, windowToken, controlFlags, - softInputMode, windowFlags, attribute, inputContext, missingMethods); + softInputMode, windowFlags, attribute, inputContext, missingMethods, + unverifiedTargetSdkVersion); } else { return startInput(startInputReason, client, inputContext, missingMethods, attribute, controlFlags); @@ -2738,7 +2741,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub IInputMethodClient client, IBinder windowToken, int controlFlags, /* @android.view.WindowManager.LayoutParams.SoftInputModeFlags */ int softInputMode, int windowFlags, EditorInfo attribute, IInputContext inputContext, - /* @InputConnectionInspector.missingMethods */ final int missingMethods) { + /* @InputConnectionInspector.missingMethods */ final int missingMethods, + int unverifiedTargetSdkVersion) { // Needs to check the validity before clearing calling identity final boolean calledFromValidUser = calledFromValidUser(); InputBindResult res = null; @@ -2754,7 +2758,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub + " attribute=" + attribute + " controlFlags=#" + Integer.toHexString(controlFlags) + " softInputMode=" + InputMethodClient.softInputModeToString(softInputMode) - + " windowFlags=#" + Integer.toHexString(windowFlags)); + + " windowFlags=#" + Integer.toHexString(windowFlags) + + " unverifiedTargetSdkVersion=" + unverifiedTargetSdkVersion); ClientState cs = mClients.get(client.asBinder()); if (cs == null) { @@ -2868,22 +2873,37 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if ((softInputMode & WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION) != 0) { if (DEBUG) Slog.v(TAG, "Window asks to show input going forward"); - if (attribute != null) { - res = startInputUncheckedLocked(cs, inputContext, - missingMethods, attribute, controlFlags, startInputReason); - didStart = true; + if (InputMethodUtils.isSoftInputModeStateVisibleAllowed( + unverifiedTargetSdkVersion, controlFlags)) { + if (attribute != null) { + res = startInputUncheckedLocked(cs, inputContext, + missingMethods, attribute, controlFlags, + startInputReason); + didStart = true; + } + showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); + } else { + Slog.e(TAG, "SOFT_INPUT_STATE_VISIBLE is ignored because" + + " there is no focused view that also returns true from" + + " View#onCheckIsTextEditor()"); } - showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); } break; case WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE: if (DEBUG) Slog.v(TAG, "Window asks to always show input"); - if (attribute != null) { - res = startInputUncheckedLocked(cs, inputContext, missingMethods, - attribute, controlFlags, startInputReason); - didStart = true; + if (InputMethodUtils.isSoftInputModeStateVisibleAllowed( + unverifiedTargetSdkVersion, controlFlags)) { + if (attribute != null) { + res = startInputUncheckedLocked(cs, inputContext, missingMethods, + attribute, controlFlags, startInputReason); + didStart = true; + } + showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); + } else { + Slog.e(TAG, "SOFT_INPUT_STATE_ALWAYS_VISIBLE is ignored because" + + " there is no focused view that also returns true from" + + " View#onCheckIsTextEditor()"); } - showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); break; } diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java index 1154fbe60973..e9eb3b3c469d 100644 --- a/services/core/java/com/android/server/IpSecService.java +++ b/services/core/java/com/android/server/IpSecService.java @@ -57,11 +57,23 @@ import java.io.PrintWriter; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import libcore.io.IoUtils; -/** @hide */ +/** + * A service to manage multiple clients that want to access the IpSec API. The service is + * responsible for maintaining a list of clients and managing the resources (and related quotas) + * that each of them own. + * + * <p>Synchronization in IpSecService is done on all entrypoints due to potential race conditions at + * the kernel/xfrm level. Further, this allows the simplifying assumption to be made that only one + * thread is ever running at a time. + * + * @hide + */ public class IpSecService extends IIpSecService.Stub { private static final String TAG = "IpSecService"; private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG); @@ -91,17 +103,6 @@ public class IpSecService extends IIpSecService.Stub { /** Should be a never-repeating global ID for resources */ private static AtomicInteger mNextResourceId = new AtomicInteger(0x00FADED0); - @GuardedBy("this") - private final ManagedResourceArray<SpiRecord> mSpiRecords = new ManagedResourceArray<>(); - - @GuardedBy("this") - private final ManagedResourceArray<TransformRecord> mTransformRecords = - new ManagedResourceArray<>(); - - @GuardedBy("this") - private final ManagedResourceArray<UdpSocketRecord> mUdpSocketRecords = - new ManagedResourceArray<>(); - interface IpSecServiceConfiguration { INetd getNetdInstance() throws RemoteException; @@ -120,8 +121,176 @@ public class IpSecService extends IIpSecService.Stub { private final IpSecServiceConfiguration mSrvConfig; + /** + * Interface for user-reference and kernel-resource cleanup. + * + * <p>This interface must be implemented for a resource to be reference counted. + */ + @VisibleForTesting + public interface IResource { + /** + * Invalidates a IResource object, ensuring it is invalid for the purposes of allocating new + * objects dependent on it. + * + * <p>Implementations of this method are expected to remove references to the IResource + * object from the IpSecService's tracking arrays. The removal from the arrays ensures that + * the resource is considered invalid for user access or allocation or use in other + * resources. + * + * <p>References to the IResource object may be held by other RefcountedResource objects, + * and as such, the kernel resources and quota may not be cleaned up. + */ + void invalidate() throws RemoteException; + + /** + * Releases underlying resources and related quotas. + * + * <p>Implementations of this method are expected to remove all system resources that are + * tracked by the IResource object. Due to other RefcountedResource objects potentially + * having references to the IResource object, freeUnderlyingResources may not always be + * called from releaseIfUnreferencedRecursively(). + */ + void freeUnderlyingResources() throws RemoteException; + } + + /** + * RefcountedResource manages references and dependencies in an exclusively acyclic graph. + * + * <p>RefcountedResource implements both explicit and implicit resource management. Creating a + * RefcountedResource object creates an explicit reference that must be freed by calling + * userRelease(). Additionally, adding this object as a child of another RefcountedResource + * object will add an implicit reference. + * + * <p>Resources are cleaned up when all references, both implicit and explicit, are released + * (ie, when userRelease() is called and when all parents have called releaseReference() on this + * object.) + */ + @VisibleForTesting + public class RefcountedResource<T extends IResource> implements IBinder.DeathRecipient { + private final T mResource; + private final List<RefcountedResource> mChildren; + int mRefCount = 1; // starts at 1 for user's reference. + IBinder mBinder; + + RefcountedResource(T resource, IBinder binder, RefcountedResource... children) { + synchronized (IpSecService.this) { + this.mResource = resource; + this.mChildren = new ArrayList<>(children.length); + this.mBinder = binder; + + for (RefcountedResource child : children) { + mChildren.add(child); + child.mRefCount++; + } + + try { + mBinder.linkToDeath(this, 0); + } catch (RemoteException e) { + binderDied(); + } + } + } + + /** + * If the Binder object dies, this function is called to free the system resources that are + * being tracked by this record and to subsequently release this record for garbage + * collection + */ + @Override + public void binderDied() { + synchronized (IpSecService.this) { + try { + userRelease(); + } catch (Exception e) { + Log.e(TAG, "Failed to release resource: " + e); + } + } + } + + public T getResource() { + return mResource; + } + + /** + * Unlinks from binder and performs IpSecService resource cleanup (removes from resource + * arrays) + * + * <p>If this method has been previously called, the RefcountedResource's binder field will + * be null, and the method will return without performing the cleanup a second time. + * + * <p>Note that calling this function does not imply that kernel resources will be freed at + * this time, or that the related quota will be returned. Such actions will only be + * performed upon the reference count reaching zero. + */ + @GuardedBy("IpSecService.this") + public void userRelease() throws RemoteException { + // Prevent users from putting reference counts into a bad state by calling + // userRelease() multiple times. + if (mBinder == null) { + return; + } + + mBinder.unlinkToDeath(this, 0); + mBinder = null; + + mResource.invalidate(); + + releaseReference(); + } + + /** + * Removes a reference to this resource. If the resultant reference count is zero, the + * underlying resources are freed, and references to all child resources are also dropped + * recursively (resulting in them freeing their resources and children, etcetera) + * + * <p>This method also sets the reference count to an invalid value (-1) to signify that it + * has been fully released. Any subsequent calls to this method will result in an + * IllegalStateException being thrown due to resource already having been previously + * released + */ + @VisibleForTesting + @GuardedBy("IpSecService.this") + public void releaseReference() throws RemoteException { + mRefCount--; + + if (mRefCount > 0) { + return; + } else if (mRefCount < 0) { + throw new IllegalStateException( + "Invalid operation - resource has already been released."); + } + + // Cleanup own resources + mResource.freeUnderlyingResources(); + + // Cleanup child resources as needed + for (RefcountedResource<? extends IResource> child : mChildren) { + child.releaseReference(); + } + + // Enforce that resource cleanup can only be called once + // By decrementing the refcount (from 0 to -1), the next call will throw an + // IllegalStateException - it has already been released fully. + mRefCount--; + } + + @Override + public String toString() { + return new StringBuilder() + .append("{mResource=") + .append(mResource) + .append(", mRefCount=") + .append(mRefCount) + .append(", mChildren=") + .append(mChildren) + .append("}") + .toString(); + } + } + /* Very simple counting class that looks much like a counting semaphore */ - public static class ResourceTracker { + @VisibleForTesting + static class ResourceTracker { private final int mMax; int mCurrent; @@ -130,18 +299,18 @@ public class IpSecService extends IIpSecService.Stub { mCurrent = 0; } - synchronized boolean isAvailable() { + boolean isAvailable() { return (mCurrent < mMax); } - synchronized void take() { + void take() { if (!isAvailable()) { Log.wtf(TAG, "Too many resources allocated!"); } mCurrent++; } - synchronized void give() { + void give() { if (mCurrent <= 0) { Log.wtf(TAG, "We've released this resource too many times"); } @@ -160,40 +329,70 @@ public class IpSecService extends IIpSecService.Stub { } } - private static final class UserQuotaTracker { - /* Maximum number of UDP Encap Sockets that a single UID may possess */ - public static final int MAX_NUM_ENCAP_SOCKETS = 2; + @VisibleForTesting + static final class UserRecord { + /* Type names */ + public static final String TYPENAME_SPI = "SecurityParameterIndex"; + public static final String TYPENAME_TRANSFORM = "IpSecTransform"; + public static final String TYPENAME_ENCAP_SOCKET = "UdpEncapSocket"; - /* Maximum number of IPsec Transforms that a single UID may possess */ + /* Maximum number of each type of resource that a single UID may possess */ + public static final int MAX_NUM_ENCAP_SOCKETS = 2; public static final int MAX_NUM_TRANSFORMS = 4; - - /* Maximum number of IPsec Transforms that a single UID may possess */ public static final int MAX_NUM_SPIS = 8; - /* Record for one users's IpSecService-managed objects */ - public static class UserRecord { - public final ResourceTracker socket = new ResourceTracker(MAX_NUM_ENCAP_SOCKETS); - public final ResourceTracker transform = new ResourceTracker(MAX_NUM_TRANSFORMS); - public final ResourceTracker spi = new ResourceTracker(MAX_NUM_SPIS); + final RefcountedResourceArray<SpiRecord> mSpiRecords = + new RefcountedResourceArray<>(TYPENAME_SPI); + final ResourceTracker mSpiQuotaTracker = new ResourceTracker(MAX_NUM_SPIS); - @Override - public String toString() { - return new StringBuilder() - .append("{socket=") - .append(socket) - .append(", transform=") - .append(transform) - .append(", spi=") - .append(spi) - .append("}") - .toString(); - } + final RefcountedResourceArray<TransformRecord> mTransformRecords = + new RefcountedResourceArray<>(TYPENAME_TRANSFORM); + final ResourceTracker mTransformQuotaTracker = new ResourceTracker(MAX_NUM_TRANSFORMS); + + final RefcountedResourceArray<EncapSocketRecord> mEncapSocketRecords = + new RefcountedResourceArray<>(TYPENAME_ENCAP_SOCKET); + final ResourceTracker mSocketQuotaTracker = new ResourceTracker(MAX_NUM_ENCAP_SOCKETS); + + void removeSpiRecord(int resourceId) { + mSpiRecords.remove(resourceId); + } + + void removeTransformRecord(int resourceId) { + mTransformRecords.remove(resourceId); + } + + void removeEncapSocketRecord(int resourceId) { + mEncapSocketRecords.remove(resourceId); } + @Override + public String toString() { + return new StringBuilder() + .append("{mSpiQuotaTracker=") + .append(mSpiQuotaTracker) + .append(", mTransformQuotaTracker=") + .append(mTransformQuotaTracker) + .append(", mSocketQuotaTracker=") + .append(mSocketQuotaTracker) + .append(", mSpiRecords=") + .append(mSpiRecords) + .append(", mTransformRecords=") + .append(mTransformRecords) + .append(", mEncapSocketRecords=") + .append(mEncapSocketRecords) + .append("}") + .toString(); + } + } + + @VisibleForTesting + static final class UserResourceTracker { private final SparseArray<UserRecord> mUserRecords = new SparseArray<>(); - /* a never-fail getter so that we can populate the list of UIDs as-needed */ - public synchronized UserRecord getUserRecord(int uid) { + /** Never-fail getter that populates the list of UIDs as-needed */ + public UserRecord getUserRecord(int uid) { + checkCallerUid(uid); + UserRecord r = mUserRecords.get(uid); if (r == null) { r = new UserRecord(); @@ -202,122 +401,56 @@ public class IpSecService extends IIpSecService.Stub { return r; } + /** Safety method; guards against access of other user's UserRecords */ + private void checkCallerUid(int uid) { + if (uid != Binder.getCallingUid() + && android.os.Process.SYSTEM_UID != Binder.getCallingUid()) { + throw new SecurityException("Attempted access of unowned resources"); + } + } + @Override public String toString() { return mUserRecords.toString(); } } - private final UserQuotaTracker mUserQuotaTracker = new UserQuotaTracker(); + @VisibleForTesting final UserResourceTracker mUserResourceTracker = new UserResourceTracker(); /** - * The ManagedResource class provides a facility to cleanly and reliably release system - * resources. It relies on two things: an IBinder that allows ManagedResource to automatically - * clean up in the event that the Binder dies and a user-provided resourceId that should - * uniquely identify the managed resource. To use this class, the user should implement the - * releaseResources() method that is responsible for releasing system resources when invoked. + * The KernelResourceRecord class provides a facility to cleanly and reliably track system + * resources. It relies on a provided resourceId that should uniquely identify the kernel + * resource. To use this class, the user should implement the invalidate() and + * freeUnderlyingResources() methods that are responsible for cleaning up IpSecService resource + * tracking arrays and kernel resources, respectively */ - private abstract class ManagedResource implements IBinder.DeathRecipient { + private abstract class KernelResourceRecord implements IResource { final int pid; final int uid; - private IBinder mBinder; - protected int mResourceId; + protected final int mResourceId; - private AtomicInteger mReferenceCount = new AtomicInteger(0); - - ManagedResource(int resourceId, IBinder binder) { + KernelResourceRecord(int resourceId) { super(); if (resourceId == INVALID_RESOURCE_ID) { throw new IllegalArgumentException("Resource ID must not be INVALID_RESOURCE_ID"); } - mBinder = binder; mResourceId = resourceId; pid = Binder.getCallingPid(); uid = Binder.getCallingUid(); getResourceTracker().take(); - try { - mBinder.linkToDeath(this, 0); - } catch (RemoteException e) { - binderDied(); - } - } - - public void addReference() { - mReferenceCount.incrementAndGet(); - } - - public void removeReference() { - if (mReferenceCount.decrementAndGet() < 0) { - Log.wtf(TAG, "Programming error: negative reference count"); - } } - public boolean isReferenced() { - return (mReferenceCount.get() > 0); - } - - /** - * Ensures that the caller is either the owner of this resource or has the system UID and - * throws a SecurityException otherwise. - */ - public void checkOwnerOrSystem() { - if (uid != Binder.getCallingUid() - && android.os.Process.SYSTEM_UID != Binder.getCallingUid()) { - throw new SecurityException("Only the owner may access managed resources!"); - } - } - - /** - * When this record is no longer needed for managing system resources this function should - * clean up all system resources and nullify the record. This function shall perform all - * necessary cleanup of the resources managed by this record. - * - * <p>NOTE: this function verifies ownership before allowing resources to be freed. - */ - public final void release() throws RemoteException { - synchronized (IpSecService.this) { - if (isReferenced()) { - throw new IllegalStateException( - "Cannot release a resource that has active references!"); - } - - if (mResourceId == INVALID_RESOURCE_ID) { - return; - } - - releaseResources(); - getResourceTracker().give(); - if (mBinder != null) { - mBinder.unlinkToDeath(this, 0); - } - mBinder = null; + @Override + public abstract void invalidate() throws RemoteException; - mResourceId = INVALID_RESOURCE_ID; - } + /** Convenience method; retrieves the user resource record for the stored UID. */ + protected UserRecord getUserRecord() { + return mUserResourceTracker.getUserRecord(uid); } - /** - * If the Binder object dies, this function is called to free the system resources that are - * being managed by this record and to subsequently release this record for garbage - * collection - */ - public final void binderDied() { - try { - release(); - } catch (Exception e) { - Log.e(TAG, "Failed to release resource: " + e); - } - } - - /** - * Implement this method to release all system resources that are being protected by this - * record. Once the resources are released, the record should be invalidated and no longer - * used by calling release(). This should NEVER be called directly. - * - * <p>Calls to this are always guarded by IpSecService#this - */ - protected abstract void releaseResources() throws RemoteException; + @Override + public abstract void freeUnderlyingResources() throws RemoteException; /** Get the resource tracker for this resource */ protected abstract ResourceTracker getResourceTracker(); @@ -331,30 +464,52 @@ public class IpSecService extends IIpSecService.Stub { .append(pid) .append(", uid=") .append(uid) - .append(", mReferenceCount=") - .append(mReferenceCount.get()) .append("}") .toString(); } }; + // TODO: Move this to right after RefcountedResource. With this here, Gerrit was showing many + // more things as changed. /** - * Minimal wrapper around SparseArray that performs ownership validation on element accesses. + * Thin wrapper over SparseArray to ensure resources exist, and simplify generic typing. + * + * <p>RefcountedResourceArray prevents null insertions, and throws an IllegalArgumentException + * if a key is not found during a retrieval process. */ - private class ManagedResourceArray<T extends ManagedResource> { - SparseArray<T> mArray = new SparseArray<>(); - - T getAndCheckOwner(int key) { - T val = mArray.get(key); - // The value should never be null unless the resource doesn't exist - // (since we do not allow null resources to be added). - if (val != null) { - val.checkOwnerOrSystem(); + static class RefcountedResourceArray<T extends IResource> { + SparseArray<RefcountedResource<T>> mArray = new SparseArray<>(); + private final String mTypeName; + + public RefcountedResourceArray(String typeName) { + this.mTypeName = typeName; + } + + /** + * Accessor method to get inner resource object. + * + * @throws IllegalArgumentException if no resource with provided key is found. + */ + T getResourceOrThrow(int key) { + return getRefcountedResourceOrThrow(key).getResource(); + } + + /** + * Accessor method to get reference counting wrapper. + * + * @throws IllegalArgumentException if no resource with provided key is found. + */ + RefcountedResource<T> getRefcountedResourceOrThrow(int key) { + RefcountedResource<T> resource = mArray.get(key); + if (resource == null) { + throw new IllegalArgumentException( + String.format("No such %s found for given id: %d", mTypeName, key)); } - return val; + + return resource; } - void put(int key, T obj) { + void put(int key, RefcountedResource<T> obj) { checkNotNull(obj, "Null resources cannot be added"); mArray.put(key, obj); } @@ -369,30 +524,17 @@ public class IpSecService extends IIpSecService.Stub { } } - private final class TransformRecord extends ManagedResource { + private final class TransformRecord extends KernelResourceRecord { private final IpSecConfig mConfig; private final SpiRecord[] mSpis; - private final UdpSocketRecord mSocket; + private final EncapSocketRecord mSocket; TransformRecord( - int resourceId, - IBinder binder, - IpSecConfig config, - SpiRecord[] spis, - UdpSocketRecord socket) { - super(resourceId, binder); + int resourceId, IpSecConfig config, SpiRecord[] spis, EncapSocketRecord socket) { + super(resourceId); mConfig = config; mSpis = spis; mSocket = socket; - - for (int direction : DIRECTIONS) { - mSpis[direction].addReference(); - mSpis[direction].setOwnedByTransform(); - } - - if (mSocket != null) { - mSocket.addReference(); - } } public IpSecConfig getConfig() { @@ -405,7 +547,7 @@ public class IpSecService extends IIpSecService.Stub { /** always guarded by IpSecService#this */ @Override - protected void releaseResources() { + public void freeUnderlyingResources() { for (int direction : DIRECTIONS) { int spi = mSpis[direction].getSpi(); try { @@ -424,17 +566,17 @@ public class IpSecService extends IIpSecService.Stub { } } - for (int direction : DIRECTIONS) { - mSpis[direction].removeReference(); - } + getResourceTracker().give(); + } - if (mSocket != null) { - mSocket.removeReference(); - } + @Override + public void invalidate() throws RemoteException { + getUserRecord().removeTransformRecord(mResourceId); } + @Override protected ResourceTracker getResourceTracker() { - return mUserQuotaTracker.getUserRecord(this.uid).transform; + return getUserRecord().mTransformQuotaTracker; } @Override @@ -456,7 +598,7 @@ public class IpSecService extends IIpSecService.Stub { } } - private final class SpiRecord extends ManagedResource { + private final class SpiRecord extends KernelResourceRecord { private final int mDirection; private final String mLocalAddress; private final String mRemoteAddress; @@ -466,12 +608,11 @@ public class IpSecService extends IIpSecService.Stub { SpiRecord( int resourceId, - IBinder binder, int direction, String localAddress, String remoteAddress, int spi) { - super(resourceId, binder); + super(resourceId); mDirection = direction; mLocalAddress = localAddress; mRemoteAddress = remoteAddress; @@ -480,7 +621,7 @@ public class IpSecService extends IIpSecService.Stub { /** always guarded by IpSecService#this */ @Override - protected void releaseResources() { + public void freeUnderlyingResources() { if (mOwnedByTransform) { Log.d(TAG, "Cannot release Spi " + mSpi + ": Currently locked by a Transform"); // Because SPIs are "handed off" to transform, objects, they should never be @@ -503,11 +644,8 @@ public class IpSecService extends IIpSecService.Stub { } mSpi = IpSecManager.INVALID_SECURITY_PARAMETER_INDEX; - } - @Override - protected ResourceTracker getResourceTracker() { - return mUserQuotaTracker.getUserRecord(this.uid).spi; + getResourceTracker().give(); } public int getSpi() { @@ -524,6 +662,16 @@ public class IpSecService extends IIpSecService.Stub { } @Override + public void invalidate() throws RemoteException { + getUserRecord().removeSpiRecord(mResourceId); + } + + @Override + protected ResourceTracker getResourceTracker() { + return getUserRecord().mSpiQuotaTracker; + } + + @Override public String toString() { StringBuilder strBuilder = new StringBuilder(); strBuilder @@ -544,27 +692,24 @@ public class IpSecService extends IIpSecService.Stub { } } - private final class UdpSocketRecord extends ManagedResource { + private final class EncapSocketRecord extends KernelResourceRecord { private FileDescriptor mSocket; private final int mPort; - UdpSocketRecord(int resourceId, IBinder binder, FileDescriptor socket, int port) { - super(resourceId, binder); + EncapSocketRecord(int resourceId, FileDescriptor socket, int port) { + super(resourceId); mSocket = socket; mPort = port; } /** always guarded by IpSecService#this */ @Override - protected void releaseResources() { + public void freeUnderlyingResources() { Log.d(TAG, "Closing port " + mPort); IoUtils.closeQuietly(mSocket); mSocket = null; - } - @Override - protected ResourceTracker getResourceTracker() { - return mUserQuotaTracker.getUserRecord(this.uid).socket; + getResourceTracker().give(); } public int getPort() { @@ -576,6 +721,16 @@ public class IpSecService extends IIpSecService.Stub { } @Override + protected ResourceTracker getResourceTracker() { + return getUserRecord().mSocketQuotaTracker; + } + + @Override + public void invalidate() { + getUserRecord().removeEncapSocketRecord(mResourceId); + } + + @Override public String toString() { return new StringBuilder() .append("{super=") @@ -672,23 +827,24 @@ public class IpSecService extends IIpSecService.Stub { throw new IllegalArgumentException("Invalid Direction: " + direction); } - @Override /** Get a new SPI and maintain the reservation in the system server */ - public synchronized IpSecSpiResponse reserveSecurityParameterIndex( + @Override + public synchronized IpSecSpiResponse allocateSecurityParameterIndex( int direction, String remoteAddress, int requestedSpi, IBinder binder) throws RemoteException { checkDirection(direction); checkInetAddress(remoteAddress); /* requestedSpi can be anything in the int range, so no check is needed. */ - checkNotNull(binder, "Null Binder passed to reserveSecurityParameterIndex"); + checkNotNull(binder, "Null Binder passed to allocateSecurityParameterIndex"); + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); int resourceId = mNextResourceId.getAndIncrement(); int spi = IpSecManager.INVALID_SECURITY_PARAMETER_INDEX; String localAddress = ""; try { - if (!mUserQuotaTracker.getUserRecord(Binder.getCallingUid()).spi.isAvailable()) { + if (!userRecord.mSpiQuotaTracker.isAvailable()) { return new IpSecSpiResponse( IpSecManager.Status.RESOURCE_UNAVAILABLE, INVALID_RESOURCE_ID, spi); } @@ -702,9 +858,11 @@ public class IpSecService extends IIpSecService.Stub { remoteAddress, requestedSpi); Log.d(TAG, "Allocated SPI " + spi); - mSpiRecords.put( + userRecord.mSpiRecords.put( resourceId, - new SpiRecord(resourceId, binder, direction, localAddress, remoteAddress, spi)); + new RefcountedResource<SpiRecord>( + new SpiRecord(resourceId, direction, localAddress, remoteAddress, spi), + binder)); } catch (ServiceSpecificException e) { // TODO: Add appropriate checks when other ServiceSpecificException types are supported return new IpSecSpiResponse( @@ -718,26 +876,17 @@ public class IpSecService extends IIpSecService.Stub { /* This method should only be called from Binder threads. Do not call this from * within the system server as it will crash the system on failure. */ - private synchronized <T extends ManagedResource> void releaseManagedResource( - ManagedResourceArray<T> resArray, int resourceId, String typeName) + private void releaseResource(RefcountedResourceArray resArray, int resourceId) throws RemoteException { - // We want to non-destructively get so that we can check credentials before removing - // this from the records. - T record = resArray.getAndCheckOwner(resourceId); - - if (record == null) { - throw new IllegalArgumentException( - typeName + " " + resourceId + " is not available to be deleted"); - } - record.release(); - resArray.remove(resourceId); + resArray.getRefcountedResourceOrThrow(resourceId).userRelease(); } /** Release a previously allocated SPI that has been registered with the system server */ @Override - public void releaseSecurityParameterIndex(int resourceId) throws RemoteException { - releaseManagedResource(mSpiRecords, resourceId, "SecurityParameterIndex"); + public synchronized void releaseSecurityParameterIndex(int resourceId) throws RemoteException { + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); + releaseResource(userRecord.mSpiRecords, resourceId); } /** @@ -790,10 +939,11 @@ public class IpSecService extends IIpSecService.Stub { } checkNotNull(binder, "Null Binder passed to openUdpEncapsulationSocket"); + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); int resourceId = mNextResourceId.getAndIncrement(); FileDescriptor sockFd = null; try { - if (!mUserQuotaTracker.getUserRecord(Binder.getCallingUid()).socket.isAvailable()) { + if (!userRecord.mSocketQuotaTracker.isAvailable()) { return new IpSecUdpEncapResponse(IpSecManager.Status.RESOURCE_UNAVAILABLE); } @@ -812,8 +962,10 @@ public class IpSecService extends IIpSecService.Stub { OsConstants.UDP_ENCAP, OsConstants.UDP_ENCAP_ESPINUDP); - mUdpSocketRecords.put( - resourceId, new UdpSocketRecord(resourceId, binder, sockFd, port)); + userRecord.mEncapSocketRecords.put( + resourceId, + new RefcountedResource<EncapSocketRecord>( + new EncapSocketRecord(resourceId, sockFd, port), binder)); return new IpSecUdpEncapResponse(IpSecManager.Status.OK, resourceId, port, sockFd); } catch (IOException | ErrnoException e) { IoUtils.closeQuietly(sockFd); @@ -825,9 +977,9 @@ public class IpSecService extends IIpSecService.Stub { /** close a socket that has been been allocated by and registered with the system server */ @Override - public void closeUdpEncapsulationSocket(int resourceId) throws RemoteException { - - releaseManagedResource(mUdpSocketRecords, resourceId, "UdpEncapsulationSocket"); + public synchronized void closeUdpEncapsulationSocket(int resourceId) throws RemoteException { + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); + releaseResource(userRecord.mEncapSocketRecords, resourceId); } /** @@ -835,6 +987,8 @@ public class IpSecService extends IIpSecService.Stub { * IllegalArgumentException if they are not. */ private void checkIpSecConfig(IpSecConfig config) { + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); + if (config.getLocalAddress() == null) { throw new IllegalArgumentException("Invalid null Local InetAddress"); } @@ -863,12 +1017,9 @@ public class IpSecService extends IIpSecService.Stub { break; case IpSecTransform.ENCAP_ESPINUDP: case IpSecTransform.ENCAP_ESPINUDP_NON_IKE: - if (mUdpSocketRecords.getAndCheckOwner( - config.getEncapSocketResourceId()) == null) { - throw new IllegalStateException( - "No Encapsulation socket for Resource Id: " - + config.getEncapSocketResourceId()); - } + // Retrieve encap socket record; will throw IllegalArgumentException if not found + userRecord.mEncapSocketRecords.getResourceOrThrow( + config.getEncapSocketResourceId()); int port = config.getEncapRemotePort(); if (port <= 0 || port > 0xFFFF) { @@ -892,9 +1043,8 @@ public class IpSecService extends IIpSecService.Stub { + " exclusive with other Authentication or Encryption algorithms"); } - if (mSpiRecords.getAndCheckOwner(config.getSpiResourceId(direction)) == null) { - throw new IllegalStateException("No SPI for specified Resource Id"); - } + // Retrieve SPI record; will throw IllegalArgumentException if not found + userRecord.mSpiRecords.getResourceOrThrow(config.getSpiResourceId(direction)); } } @@ -911,16 +1061,27 @@ public class IpSecService extends IIpSecService.Stub { checkIpSecConfig(c); checkNotNull(binder, "Null Binder passed to createTransportModeTransform"); int resourceId = mNextResourceId.getAndIncrement(); - if (!mUserQuotaTracker.getUserRecord(Binder.getCallingUid()).transform.isAvailable()) { + + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); + + // Avoid resizing by creating a dependency array of min-size 3 (1 UDP encap + 2 SPIs) + List<RefcountedResource> dependencies = new ArrayList<>(3); + + if (!userRecord.mTransformQuotaTracker.isAvailable()) { return new IpSecTransformResponse(IpSecManager.Status.RESOURCE_UNAVAILABLE); } SpiRecord[] spis = new SpiRecord[DIRECTIONS.length]; int encapType, encapLocalPort = 0, encapRemotePort = 0; - UdpSocketRecord socketRecord = null; + EncapSocketRecord socketRecord = null; encapType = c.getEncapType(); if (encapType != IpSecTransform.ENCAP_NONE) { - socketRecord = mUdpSocketRecords.getAndCheckOwner(c.getEncapSocketResourceId()); + RefcountedResource<EncapSocketRecord> refcountedSocketRecord = + userRecord.mEncapSocketRecords.getRefcountedResourceOrThrow( + c.getEncapSocketResourceId()); + dependencies.add(refcountedSocketRecord); + + socketRecord = refcountedSocketRecord.getResource(); encapLocalPort = socketRecord.getPort(); encapRemotePort = c.getEncapRemotePort(); } @@ -930,7 +1091,12 @@ public class IpSecService extends IIpSecService.Stub { IpSecAlgorithm crypt = c.getEncryption(direction); IpSecAlgorithm authCrypt = c.getAuthenticatedEncryption(direction); - spis[direction] = mSpiRecords.getAndCheckOwner(c.getSpiResourceId(direction)); + RefcountedResource<SpiRecord> refcountedSpiRecord = + userRecord.mSpiRecords.getRefcountedResourceOrThrow( + c.getSpiResourceId(direction)); + dependencies.add(refcountedSpiRecord); + + spis[direction] = refcountedSpiRecord.getResource(); int spi = spis[direction].getSpi(); try { mSrvConfig @@ -961,8 +1127,12 @@ public class IpSecService extends IIpSecService.Stub { } } // Both SAs were created successfully, time to construct a record and lock it away - mTransformRecords.put( - resourceId, new TransformRecord(resourceId, binder, c, spis, socketRecord)); + userRecord.mTransformRecords.put( + resourceId, + new RefcountedResource<TransformRecord>( + new TransformRecord(resourceId, c, spis, socketRecord), + binder, + dependencies.toArray(new RefcountedResource[dependencies.size()]))); return new IpSecTransformResponse(IpSecManager.Status.OK, resourceId); } @@ -973,8 +1143,9 @@ public class IpSecService extends IIpSecService.Stub { * other reasons. */ @Override - public void deleteTransportModeTransform(int resourceId) throws RemoteException { - releaseManagedResource(mTransformRecords, resourceId, "IpSecTransform"); + public synchronized void deleteTransportModeTransform(int resourceId) throws RemoteException { + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); + releaseResource(userRecord.mTransformRecords, resourceId); } /** @@ -984,14 +1155,10 @@ public class IpSecService extends IIpSecService.Stub { @Override public synchronized void applyTransportModeTransform( ParcelFileDescriptor socket, int resourceId) throws RemoteException { - // Synchronize liberally here because we are using ManagedResources in this block - TransformRecord info; - // FIXME: this code should be factored out into a security check + getter - info = mTransformRecords.getAndCheckOwner(resourceId); + UserRecord userRecord = mUserResourceTracker.getUserRecord(Binder.getCallingUid()); - if (info == null) { - throw new IllegalArgumentException("Transform " + resourceId + " is not active"); - } + // Get transform record; if no transform is found, will throw IllegalArgumentException + TransformRecord info = userRecord.mTransformRecords.getResourceOrThrow(resourceId); // TODO: make this a function. if (info.pid != getCallingPid() || info.uid != getCallingUid()) { @@ -1023,7 +1190,7 @@ public class IpSecService extends IIpSecService.Stub { * used: reserved for future improved input validation. */ @Override - public void removeTransportModeTransform(ParcelFileDescriptor socket, int resourceId) + public synchronized void removeTransportModeTransform(ParcelFileDescriptor socket, int resourceId) throws RemoteException { try { mSrvConfig @@ -1042,13 +1209,7 @@ public class IpSecService extends IIpSecService.Stub { pw.println("NetdNativeService Connection: " + (isNetdAlive() ? "alive" : "dead")); pw.println(); - pw.println("mUserQuotaTracker:"); - pw.println(mUserQuotaTracker); - pw.println("mTransformRecords:"); - pw.println(mTransformRecords); - pw.println("mUdpSocketRecords:"); - pw.println(mUdpSocketRecords); - pw.println("mSpiRecords:"); - pw.println(mSpiRecords); + pw.println("mUserResourceTracker:"); + pw.println(mUserResourceTracker); } } diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index bdfccd6e9d93..0a862812e027 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.annotation.NonNull; import android.util.ArrayMap; import android.util.ArraySet; + import com.android.internal.content.PackageMonitor; import com.android.internal.location.ProviderProperties; import com.android.internal.location.ProviderRequest; @@ -147,7 +148,7 @@ public class LocationManagerService extends ILocationManager.Stub { private static final long HIGH_POWER_INTERVAL_MS = 5 * 60 * 1000; private static final int FOREGROUND_IMPORTANCE_CUTOFF - = ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE; + = ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE; // default background throttling interval if not overriden in settings private static final long DEFAULT_BACKGROUND_THROTTLE_INTERVAL_MS = 30 * 60 * 1000; @@ -239,7 +240,7 @@ public class LocationManagerService extends ILocationManager.Stub { // current active user on the device - other users are denied location data private int mCurrentUserId = UserHandle.USER_SYSTEM; - private int[] mCurrentUserProfiles = new int[] { UserHandle.USER_SYSTEM }; + private int[] mCurrentUserProfiles = new int[]{UserHandle.USER_SYSTEM}; private GnssLocationProvider.GnssSystemInfoProvider mGnssSystemInfoProvider; @@ -253,7 +254,7 @@ public class LocationManagerService extends ILocationManager.Stub { public LocationManagerService(Context context) { super(); mContext = context; - mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE); + mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); // Let the package manager query which are the default location // providers as they get certain permissions granted by default. @@ -370,18 +371,18 @@ public class LocationManagerService extends ILocationManager.Stub { } }, UserHandle.USER_ALL); mContext.getContentResolver().registerContentObserver( - Settings.Global.getUriFor( - Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST), - true, - new ContentObserver(mLocationHandler) { - @Override - public void onChange(boolean selfChange) { - synchronized (mLock) { - updateBackgroundThrottlingWhitelistLocked(); - updateProvidersLocked(); + Settings.Global.getUriFor( + Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST), + true, + new ContentObserver(mLocationHandler) { + @Override + public void onChange(boolean selfChange) { + synchronized (mLock) { + updateBackgroundThrottlingWhitelistLocked(); + updateProvidersLocked(); + } } - } - }, UserHandle.USER_ALL); + }, UserHandle.USER_ALL); mPackageMonitor.register(mContext, mLocationHandler.getLooper(), true); // listen for user change @@ -402,7 +403,7 @@ public class LocationManagerService extends ILocationManager.Stub { updateUserProfiles(mCurrentUserId); } else if (Intent.ACTION_SHUTDOWN.equals(action)) { // shutdown only if UserId indicates whole system, not just one user - if(D) Log.d(TAG, "Shutdown received with UserId: " + getSendingUserId()); + if (D) Log.d(TAG, "Shutdown received with UserId: " + getSendingUserId()); if (getSendingUserId() == UserHandle.USER_ALL) { shutdownComponents(); } @@ -416,13 +417,15 @@ public class LocationManagerService extends ILocationManager.Stub { HashSet<String> affectedProviders = new HashSet<>(mRecordsByProvider.size()); synchronized (mLock) { for (Entry<String, ArrayList<UpdateRecord>> entry - : mRecordsByProvider.entrySet()) { + : mRecordsByProvider.entrySet()) { String provider = entry.getKey(); for (UpdateRecord record : entry.getValue()) { if (record.mReceiver.mIdentity.mUid == uid - && record.mIsForegroundUid != foreground) { - if (D) Log.d(TAG, "request from uid " + uid + " is now " - + (foreground ? "foreground" : "background)")); + && record.mIsForegroundUid != foreground) { + if (D) { + Log.d(TAG, "request from uid " + uid + " is now " + + (foreground ? "foreground" : "background)")); + } record.mIsForegroundUid = foreground; if (!isThrottlingExemptLocked(record.mReceiver.mIdentity)) { @@ -436,10 +439,12 @@ public class LocationManagerService extends ILocationManager.Stub { } for (Entry<IGnssMeasurementsListener, Identity> entry - : mGnssMeasurementsListeners.entrySet()) { + : mGnssMeasurementsListeners.entrySet()) { if (entry.getValue().mUid == uid) { - if (D) Log.d(TAG, "gnss measurements listener from uid " + uid - + " is now " + (foreground ? "foreground" : "background)")); + if (D) { + Log.d(TAG, "gnss measurements listener from uid " + uid + + " is now " + (foreground ? "foreground" : "background)")); + } if (foreground || isThrottlingExemptLocked(entry.getValue())) { mGnssMeasurementsProvider.addListener(entry.getKey()); } else { @@ -449,11 +454,13 @@ public class LocationManagerService extends ILocationManager.Stub { } for (Entry<IGnssNavigationMessageListener, Identity> entry - : mGnssNavigationMessageListeners.entrySet()) { + : mGnssNavigationMessageListeners.entrySet()) { if (entry.getValue().mUid == uid) { - if (D) Log.d(TAG, "gnss navigation message listener from uid " - + uid + " is now " - + (foreground ? "foreground" : "background)")); + if (D) { + Log.d(TAG, "gnss navigation message listener from uid " + + uid + " is now " + + (foreground ? "foreground" : "background)")); + } if (foreground || isThrottlingExemptLocked(entry.getValue())) { mGnssNavigationMessageProvider.addListener(entry.getKey()); } else { @@ -477,7 +484,7 @@ public class LocationManagerService extends ILocationManager.Stub { * support for components that do not wish to handle such event. */ private void shutdownComponents() { - if(D) Log.d(TAG, "Shutting down components..."); + if (D) Log.d(TAG, "Shutting down components..."); LocationProviderInterface gpsProvider = mProvidersByName.get(LocationManager.GPS_PROVIDER); if (gpsProvider != null && gpsProvider.isEnabled()) { @@ -563,8 +570,10 @@ public class LocationManagerService extends ILocationManager.Stub { // as a proxy for coreApp="true" if (pm.checkSignatures(systemPackageName, packageName) != PackageManager.SIGNATURE_MATCH) { - if (D) Log.d(TAG, "Fallback candidate not signed the same as system: " - + packageName); + if (D) { + Log.d(TAG, "Fallback candidate not signed the same as system: " + + packageName); + } continue; } @@ -622,8 +631,10 @@ public class LocationManagerService extends ILocationManager.Stub { ArrayList<String> providerPackageNames = new ArrayList<>(); String[] pkgs = resources.getStringArray( com.android.internal.R.array.config_locationProviderPackageNames); - if (D) Log.d(TAG, "certificates for location providers pulled from: " + - Arrays.toString(pkgs)); + if (D) { + Log.d(TAG, "certificates for location providers pulled from: " + + Arrays.toString(pkgs)); + } if (pkgs != null) providerPackageNames.addAll(Arrays.asList(pkgs)); ensureFallbackFusedProviderPresentLocked(providerPackageNames); @@ -642,7 +653,7 @@ public class LocationManagerService extends ILocationManager.Stub { mProxyProviders.add(networkProvider); addProviderLocked(networkProvider); } else { - Slog.w(TAG, "no network location provider found"); + Slog.w(TAG, "no network location provider found"); } // bind to fused provider @@ -671,7 +682,7 @@ public class LocationManagerService extends ILocationManager.Stub { com.android.internal.R.array.config_locationProviderPackageNames, mLocationHandler); if (mGeocodeProvider == null) { - Slog.e(TAG, "no geocoder provider found"); + Slog.e(TAG, "no geocoder provider found"); } // bind to fused hardware provider if supported @@ -697,14 +708,14 @@ public class LocationManagerService extends ILocationManager.Stub { // bind to geofence provider GeofenceProxy provider = GeofenceProxy.createAndBind( - mContext,com.android.internal.R.bool.config_enableGeofenceOverlay, + mContext, com.android.internal.R.bool.config_enableGeofenceOverlay, com.android.internal.R.string.config_geofenceProviderPackageName, com.android.internal.R.array.config_locationProviderPackageNames, mLocationHandler, mGpsGeofenceProxy, flpHardwareProvider != null ? flpHardwareProvider.getGeofenceHardware() : null); if (provider == null) { - Slog.d(TAG, "Unable to bind FLP Geofence proxy."); + Slog.d(TAG, "Unable to bind FLP Geofence proxy."); } // bind to hardware activity recognition @@ -751,6 +762,7 @@ public class LocationManagerService extends ILocationManager.Stub { /** * Called when the device's active user changes. + * * @param userId the new active user's UserId */ private void switchUser(int userId) { @@ -797,7 +809,7 @@ public class LocationManagerService extends ILocationManager.Stub { final boolean mHideFromAppOps; // True if AppOps should not monitor this receiver. final Object mKey; - final HashMap<String,UpdateRecord> mUpdateRecords = new HashMap<>(); + final HashMap<String, UpdateRecord> mUpdateRecords = new HashMap<>(); // True if app ops has started monitoring this receiver for locations. boolean mOpMonitoring; @@ -914,9 +926,9 @@ public class LocationManagerService extends ILocationManager.Stub { /** * Update AppOps monitoring for a single location request and op type. * - * @param allowMonitoring True if monitoring is allowed for this request/op. + * @param allowMonitoring True if monitoring is allowed for this request/op. * @param currentlyMonitoring True if AppOps is currently monitoring this request/op. - * @param op AppOps code for the op to update. + * @param op AppOps code for the op to update. * @return True if monitoring is on for this request/op after updating. */ private boolean updateMonitoring(boolean allowMonitoring, boolean currentlyMonitoring, @@ -1004,7 +1016,8 @@ public class LocationManagerService extends ILocationManager.Stub { } } else { Intent locationChanged = new Intent(); - locationChanged.putExtra(LocationManager.KEY_LOCATION_CHANGED, new Location(location)); + locationChanged.putExtra(LocationManager.KEY_LOCATION_CHANGED, + new Location(location)); try { synchronized (this) { // synchronize to ensure incrementPendingBroadcastsLocked() @@ -1286,7 +1299,7 @@ public class LocationManagerService extends ILocationManager.Stub { } if (mGnssBatchingProvider != null) { - mGnssBatchingProvider.flush(); + mGnssBatchingProvider.flush(); } } @@ -1301,7 +1314,7 @@ public class LocationManagerService extends ILocationManager.Stub { if (mGnssBatchingProvider != null) { mGnssBatchingInProgress = false; return mGnssBatchingProvider.stop(); - } else { + } else { return false; } } @@ -1363,7 +1376,7 @@ public class LocationManagerService extends ILocationManager.Stub { * processes belonging to background users. * * @param provider the name of the location provider - * @param uid the requestor's UID + * @param uid the requestor's UID */ private boolean isAllowedByUserSettingsLocked(String provider, int uid) { if (!isCurrentProfile(UserHandle.getUserId(uid)) && !isUidALocationProvider(uid)) { @@ -1467,7 +1480,7 @@ public class LocationManagerService extends ILocationManager.Stub { * location provider. * * @param allowedResolutionLevel resolution level allowed to caller - * @param providerName the name of the location provider + * @param providerName the name of the location provider */ private void checkResolutionLevelIsSufficientForProviderUse(int allowedResolutionLevel, String providerName) { @@ -1718,7 +1731,9 @@ public class LocationManagerService extends ILocationManager.Stub { resolver, Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS, DEFAULT_BACKGROUND_THROTTLE_INTERVAL_MS); + // initialize the low power mode to true and set to false if any of the records requires + providerRequest.lowPowerMode = true; if (records != null) { for (UpdateRecord record : records) { if (isCurrentProfile(UserHandle.getUserId(record.mReceiver.mIdentity.mUid))) { @@ -1742,6 +1757,9 @@ public class LocationManagerService extends ILocationManager.Stub { record.mRequest = locationRequest; providerRequest.locationRequests.add(locationRequest); + if (!locationRequest.isLowPowerMode()) { + providerRequest.lowPowerMode = false; + } if (interval < providerRequest.interval) { providerRequest.reportLocation = true; providerRequest.interval = interval; @@ -1794,23 +1812,23 @@ public class LocationManagerService extends ILocationManager.Stub { public String[] getBackgroundThrottlingWhitelist() { synchronized (mLock) { return mBackgroundThrottlePackageWhitelist.toArray( - new String[mBackgroundThrottlePackageWhitelist.size()]); + new String[mBackgroundThrottlePackageWhitelist.size()]); } } private void updateBackgroundThrottlingWhitelistLocked() { String setting = Settings.Global.getString( - mContext.getContentResolver(), - Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST); + mContext.getContentResolver(), + Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST); if (setting == null) { setting = ""; } mBackgroundThrottlePackageWhitelist.clear(); mBackgroundThrottlePackageWhitelist.addAll( - SystemConfig.getInstance().getAllowUnthrottledLocation()); + SystemConfig.getInstance().getAllowUnthrottledLocation()); mBackgroundThrottlePackageWhitelist.addAll( - Arrays.asList(setting.split(","))); + Arrays.asList(setting.split(","))); } private boolean isThrottlingExemptLocked(Identity identity) { @@ -1894,7 +1912,8 @@ public class LocationManagerService extends ILocationManager.Stub { @Override public String toString() { return "UpdateRecord[" + mProvider + " " + mReceiver.mIdentity.mPackageName - + "(" + mReceiver.mIdentity.mUid + (mIsForegroundUid ? " foreground" : " background") + + "(" + mReceiver.mIdentity.mUid + (mIsForegroundUid ? " foreground" + : " background") + ")" + " " + mRealRequest + "]"; } } @@ -1936,8 +1955,13 @@ public class LocationManagerService extends ILocationManager.Stub { * @return a version of request that meets the given resolution and consistency requirements * @hide */ - private LocationRequest createSanitizedRequest(LocationRequest request, int resolutionLevel) { + private LocationRequest createSanitizedRequest(LocationRequest request, int resolutionLevel, + boolean callerHasLocationHardwarePermission) { LocationRequest sanitizedRequest = new LocationRequest(request); + if (!callerHasLocationHardwarePermission) { + // allow setting low power mode only for callers with location hardware permission + sanitizedRequest.setLowPowerMode(false); + } if (resolutionLevel < RESOLUTION_LEVEL_FINE) { switch (sanitizedRequest.getQuality()) { case LocationRequest.ACCURACY_FINE: @@ -2013,7 +2037,11 @@ public class LocationManagerService extends ILocationManager.Stub { if (hideFromAppOps) { checkUpdateAppOpsAllowed(); } - LocationRequest sanitizedRequest = createSanitizedRequest(request, allowedResolutionLevel); + boolean callerHasLocationHardwarePermission = + mContext.checkCallingPermission(android.Manifest.permission.LOCATION_HARDWARE) + == PackageManager.PERMISSION_GRANTED; + LocationRequest sanitizedRequest = createSanitizedRequest(request, allowedResolutionLevel, + callerHasLocationHardwarePermission); final int pid = Binder.getCallingPid(); final int uid = Binder.getCallingUid(); @@ -2050,11 +2078,13 @@ public class LocationManagerService extends ILocationManager.Stub { } UpdateRecord record = new UpdateRecord(name, request, receiver); - if (D) Log.d(TAG, "request " + Integer.toHexString(System.identityHashCode(receiver)) - + " " + name + " " + request + " from " + packageName + "(" + uid + " " - + (record.mIsForegroundUid ? "foreground" : "background") - + (isThrottlingExemptLocked(receiver.mIdentity) + if (D) { + Log.d(TAG, "request " + Integer.toHexString(System.identityHashCode(receiver)) + + " " + name + " " + request + " from " + packageName + "(" + uid + " " + + (record.mIsForegroundUid ? "foreground" : "background") + + (isThrottlingExemptLocked(receiver.mIdentity) ? " [whitelisted]" : "") + ")"); + } UpdateRecord oldRecord = receiver.mUpdateRecords.put(name, record); if (oldRecord != null) { @@ -2159,14 +2189,18 @@ public class LocationManagerService extends ILocationManager.Stub { final long identity = Binder.clearCallingIdentity(); try { if (mBlacklist.isBlacklisted(packageName)) { - if (D) Log.d(TAG, "not returning last loc for blacklisted app: " + - packageName); + if (D) { + Log.d(TAG, "not returning last loc for blacklisted app: " + + packageName); + } return null; } if (!reportLocationAccessNoThrow(pid, uid, packageName, allowedResolutionLevel)) { - if (D) Log.d(TAG, "not returning last loc for no op app: " + - packageName); + if (D) { + Log.d(TAG, "not returning last loc for no op app: " + + packageName); + } return null; } @@ -2192,7 +2226,8 @@ public class LocationManagerService extends ILocationManager.Stub { return null; } if (allowedResolutionLevel < RESOLUTION_LEVEL_FINE) { - Location noGPSLocation = location.getExtraLocation(Location.EXTRA_NO_GPS_LOCATION); + Location noGPSLocation = location.getExtraLocation( + Location.EXTRA_NO_GPS_LOCATION); if (noGPSLocation != null) { return new Location(mLocationFudger.getOrCreate(noGPSLocation)); } @@ -2216,7 +2251,12 @@ public class LocationManagerService extends ILocationManager.Stub { checkPackageName(packageName); checkResolutionLevelIsSufficientForProviderUse(allowedResolutionLevel, request.getProvider()); - LocationRequest sanitizedRequest = createSanitizedRequest(request, allowedResolutionLevel); + // Require that caller can manage given document + boolean callerHasLocationHardwarePermission = + mContext.checkCallingPermission(android.Manifest.permission.LOCATION_HARDWARE) + == PackageManager.PERMISSION_GRANTED; + LocationRequest sanitizedRequest = createSanitizedRequest(request, allowedResolutionLevel, + callerHasLocationHardwarePermission); if (D) Log.d(TAG, "requestGeofence: " + sanitizedRequest + " " + geofence + " " + intent); @@ -2282,8 +2322,7 @@ public class LocationManagerService extends ILocationManager.Stub { @Override public boolean addGnssMeasurementsListener( - IGnssMeasurementsListener listener, - String packageName) { + IGnssMeasurementsListener listener, String packageName) { if (!hasGnssPermissions(packageName) || mGnssMeasurementsProvider == null) { return false; } @@ -2296,7 +2335,7 @@ public class LocationManagerService extends ILocationManager.Stub { try { if (isThrottlingExemptLocked(callerIdentity) || isImportanceForeground( - mActivityManager.getPackageImportance(packageName))) { + mActivityManager.getPackageImportance(packageName))) { return mGnssMeasurementsProvider.addListener(listener); } } finally { @@ -2327,13 +2366,13 @@ public class LocationManagerService extends ILocationManager.Stub { synchronized (mLock) { Identity callerIdentity - = new Identity(Binder.getCallingUid(), Binder.getCallingPid(), packageName); + = new Identity(Binder.getCallingUid(), Binder.getCallingPid(), packageName); mGnssNavigationMessageListeners.put(listener, callerIdentity); long identity = Binder.clearCallingIdentity(); try { if (isThrottlingExemptLocked(callerIdentity) || isImportanceForeground( - mActivityManager.getPackageImportance(packageName))) { + mActivityManager.getPackageImportance(packageName))) { return mGnssNavigationMessageProvider.addListener(listener); } } finally { @@ -2394,7 +2433,7 @@ public class LocationManagerService extends ILocationManager.Stub { /** * @return null if the provider does not exist * @throws SecurityException if the provider is not allowed to be - * accessed by the caller + * accessed by the caller */ @Override public ProviderProperties getProviderProperties(String provider) { @@ -2417,7 +2456,7 @@ public class LocationManagerService extends ILocationManager.Stub { /** * @return null if the provider does not exist * @throws SecurityException if the provider is not allowed to be - * accessed by the caller + * accessed by the caller */ @Override public String getNetworkProviderPackage() { @@ -2641,8 +2680,10 @@ public class LocationManagerService extends ILocationManager.Stub { } if (mBlacklist.isBlacklisted(receiver.mIdentity.mPackageName)) { - if (D) Log.d(TAG, "skipping loc update for blacklisted app: " + - receiver.mIdentity.mPackageName); + if (D) { + Log.d(TAG, "skipping loc update for blacklisted app: " + + receiver.mIdentity.mPackageName); + } continue; } @@ -2651,8 +2692,10 @@ public class LocationManagerService extends ILocationManager.Stub { receiver.mIdentity.mUid, receiver.mIdentity.mPackageName, receiver.mAllowedResolutionLevel)) { - if (D) Log.d(TAG, "skipping loc update for no op app: " + - receiver.mIdentity.mPackageName); + if (D) { + Log.d(TAG, "skipping loc update for no op app: " + + receiver.mIdentity.mPackageName); + } continue; } @@ -3114,12 +3157,12 @@ public class LocationManagerService extends ILocationManager.Stub { } pw.append(" fudger: "); - mLocationFudger.dump(fd, pw, args); + mLocationFudger.dump(fd, pw, args); if (args.length > 0 && "short".equals(args[0])) { return; } - for (LocationProviderInterface provider: mProviders) { + for (LocationProviderInterface provider : mProviders) { pw.print(provider.getName() + " Internal State"); if (provider instanceof LocationProviderProxy) { LocationProviderProxy proxy = (LocationProviderProxy) provider; diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index 296fb3210118..a2c0506e34bc 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -1,13 +1,19 @@ # Connectivity / Networking per-file ConnectivityService.java=ek@google.com per-file ConnectivityService.java=hugobenichi@google.com +per-file ConnectivityService.java=jchalard@google.com per-file ConnectivityService.java=lorenzo@google.com +per-file ConnectivityService.java=satk@google.com per-file NetworkManagementService.java=ek@google.com per-file NetworkManagementService.java=hugobenichi@google.com +per-file NetworkManagementService.java=jchalard@google.com per-file NetworkManagementService.java=lorenzo@google.com +per-file NetworkManagementService.java=satk@google.com per-file NsdService.java=ek@google.com per-file NsdService.java=hugobenichi@google.com +per-file NsdService.java=jchalard@google.com per-file NsdService.java=lorenzo@google.com +per-file NsdService.java=satk@google.com # Vibrator per-file VibratorService.java=michaelwr@google.com diff --git a/services/core/java/com/android/server/am/ActivityDisplay.java b/services/core/java/com/android/server/am/ActivityDisplay.java index 9bfdd0c5009c..af5cf1ee4202 100644 --- a/services/core/java/com/android/server/am/ActivityDisplay.java +++ b/services/core/java/com/android/server/am/ActivityDisplay.java @@ -409,15 +409,16 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { otherStack.setWindowingMode(WINDOWING_MODE_FULLSCREEN); } } finally { - if (mHomeStack != null && !isTopStack(mHomeStack)) { + final ActivityStack topFullscreenStack = + getStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); + if (topFullscreenStack != null && mHomeStack != null && !isTopStack(mHomeStack)) { // Whenever split-screen is dismissed we want the home stack directly behind the - // currently top stack so it shows up when the top stack is finished. - final ActivityStack topStack = getTopStack(); + // current top fullscreen stack so it shows up when the top stack is finished. // TODO: Would be better to use ActivityDisplay.positionChildAt() for this, however // ActivityDisplay doesn't have a direct controller to WM side yet. We can switch // once we have that. mHomeStack.moveToFront("onSplitScreenModeDismissed"); - topStack.moveToFront("onSplitScreenModeDismissed"); + topFullscreenStack.moveToFront("onSplitScreenModeDismissed"); } mSupervisor.mWindowManager.continueSurfaceLayout(); } @@ -435,7 +436,7 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { } otherStack.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, false /* animate */, false /* showRecents */, - false /* sendNonResizeableNotification */); + true /* enteringSplitScreenMode */); } } finally { mSupervisor.mWindowManager.continueSurfaceLayout(); @@ -555,6 +556,16 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> { return stack == getTopStack(); } + boolean isTopFullscreenStack(ActivityStack stack) { + for (int i = mStacks.size() - 1; i >= 0; --i) { + final ActivityStack current = mStacks.get(i); + if (current.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) { + return current == stack; + } + } + return false; + } + int getIndexOf(ActivityStack stack) { return mStacks.indexOf(stack); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 6760c862dbb6..9366f6e348a3 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -250,7 +250,6 @@ import android.app.assist.AssistStructure; import android.app.backup.IBackupManager; import android.app.servertransaction.ConfigurationChangeItem; import android.app.usage.UsageEvents; -import android.app.usage.UsageStats; import android.app.usage.UsageStatsManagerInternal; import android.appwidget.AppWidgetManager; import android.content.ActivityNotFoundException; @@ -630,7 +629,13 @@ public class ActivityManagerService extends IActivityManager.Stub /** All system services */ SystemServiceManager mSystemServiceManager; - AssistUtils mAssistUtils; + + // Wrapper around VoiceInteractionServiceManager + private AssistUtils mAssistUtils; + + // Keeps track of the active voice interaction service component, notified from + // VoiceInteractionManagerService + ComponentName mActiveVoiceInteractionServiceComponent; private Installer mInstaller; @@ -10586,7 +10591,7 @@ public class ActivityManagerService extends IActivityManager.Stub stack.moveToFront("setTaskWindowingModeSplitScreenPrimary", task); } stack.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, animate, showRecents, - true /* sendNonResizeableNotification */); + false /* enteringSplitScreenMode */); return windowingMode != task.getWindowingMode(); } finally { Binder.restoreCallingIdentity(ident); @@ -24407,6 +24412,13 @@ public class ActivityManagerService extends IActivityManager.Stub } } + @Override + public void notifyActiveVoiceInteractionServiceChanged(ComponentName component) { + synchronized (ActivityManagerService.this) { + mActiveVoiceInteractionServiceComponent = component; + } + } + /** * Called after virtual display Id is updated by * {@link com.android.server.vr.Vr2dDisplay} with a specific diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 60a623677825..69f6d5eef275 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -1050,11 +1050,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo * @return whether the given package name can launch an assist activity. */ private boolean canLaunchAssistActivity(String packageName) { - if (service.mAssistUtils == null) { - return false; - } - - final ComponentName assistComponent = service.mAssistUtils.getActiveServiceComponentName(); + final ComponentName assistComponent = service.mActiveVoiceInteractionServiceComponent; if (assistComponent != null) { return assistComponent.getPackageName().equals(packageName); } @@ -2735,7 +2731,8 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo * {@link #mShowWhenLocked}. */ boolean canShowWhenLocked() { - return mShowWhenLocked || service.mWindowManager.containsShowWhenLockedWindow(appToken); + return !inMultiWindowMode() && (mShowWhenLocked + || service.mWindowManager.containsShowWhenLockedWindow(appToken)); } void setTurnScreenOn(boolean turnScreenOn) { diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index cf40be53e70d..10c801da7c03 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -484,20 +484,24 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai @Override public void setWindowingMode(int windowingMode) { setWindowingMode(windowingMode, false /* animate */, true /* showRecents */, - true /* sendNonResizeableNotification */); + false /* enteringSplitScreenMode */); } void setWindowingMode(int preferredWindowingMode, boolean animate, boolean showRecents, - boolean sendNonResizeableNotification) { + boolean enteringSplitScreenMode) { + final boolean creating = mWindowContainerController == null; final int currentMode = getWindowingMode(); final ActivityDisplay display = getDisplay(); final TaskRecord topTask = topTask(); final ActivityStack splitScreenStack = display.getSplitScreenPrimaryStack(); mTmpOptions.setLaunchWindowingMode(preferredWindowingMode); - // Need to make sure windowing mode is supported. - int windowingMode = display.resolveWindowingMode( - null /* ActivityRecord */, mTmpOptions, topTask, getActivityType()); + // Need to make sure windowing mode is supported. If we in the process of creating the stack + // no need to resolve the windowing mode again as it is already resolved to the right mode. + int windowingMode = creating + ? preferredWindowingMode + : display.resolveWindowingMode( + null /* ActivityRecord */, mTmpOptions, topTask, getActivityType()); if (splitScreenStack == this && windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) { // Resolution to split-screen secondary for the primary split-screen stack means we want // to go fullscreen. @@ -506,14 +510,19 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai final boolean alreadyInSplitScreenMode = display.hasSplitScreenPrimaryStack(); + // Don't send non-resizeable notifications if the windowing mode changed was a side effect + // of us entering split-screen mode. + final boolean sendNonResizeableNotification = !enteringSplitScreenMode; // Take any required action due to us not supporting the preferred windowing mode. - if (sendNonResizeableNotification - && windowingMode != preferredWindowingMode && isActivityTypeStandardOrUndefined()) { - if (alreadyInSplitScreenMode - && (preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY - || preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY)) { - // Looks like we can't launch in split screen mode, go ahead an dismiss split-screen - // and display a warning toast about it. + if (alreadyInSplitScreenMode && windowingMode == WINDOWING_MODE_FULLSCREEN + && sendNonResizeableNotification && isActivityTypeStandardOrUndefined()) { + final boolean preferredSplitScreen = + preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY + || preferredWindowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; + if (preferredSplitScreen || creating) { + // Looks like we can't launch in split screen mode or the stack we are launching + // doesn't support split-screen mode, go ahead an dismiss split-screen and display a + // warning toast about it. mService.mTaskChangeNotificationController.notifyActivityDismissingDockedStack(); display.getSplitScreenPrimaryStack().setWindowingMode(WINDOWING_MODE_FULLSCREEN); } @@ -544,7 +553,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai } super.setWindowingMode(windowingMode); - if (mWindowContainerController == null) { + if (creating) { // Nothing else to do if we don't have a window container yet. E.g. call from ctor. return; } @@ -594,16 +603,22 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai // the one where the home stack is visible since recents isn't visible yet, but the // divider will be off. I think we should just make the initial bounds that of home // so that the divider matches and remove this logic. - display.getOrCreateStack(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, - ACTIVITY_TYPE_RECENTS, true /* onTop */); + final ActivityStack recentStack = display.getOrCreateStack( + WINDOWING_MODE_SPLIT_SCREEN_SECONDARY, ACTIVITY_TYPE_RECENTS, + true /* onTop */); + recentStack.moveToFront("setWindowingMode"); // If task moved to docked stack - show recents if needed. mService.mWindowManager.showRecentApps(false /* fromHome */); } wm.continueSurfaceLayout(); } - mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, PRESERVE_WINDOWS); - mStackSupervisor.resumeFocusedStackTopActivityLocked(); + // Don't ensure visible activities if the windowing mode change was a side effect of us + // entering split-screen mode. + if (!enteringSplitScreenMode) { + mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, PRESERVE_WINDOWS); + mStackSupervisor.resumeFocusedStackTopActivityLocked(); + } } @Override @@ -1668,7 +1683,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai continue; } - if (!r.visible && r != starting) { + if (!r.visibleIgnoringKeyguard && r != starting) { // Also ignore invisible activities that are not the currently starting // activity (about to be visible). continue; @@ -1796,6 +1811,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai boolean behindFullscreenActivity = !stackShouldBeVisible; boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this) && (isInStackLocked(starting) == null); + final boolean isTopFullscreenStack = getDisplay().isTopFullscreenStack(this); for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { final TaskRecord task = mTaskHistory.get(taskNdx); final ArrayList<ActivityRecord> activities = task.mActivities; @@ -1817,7 +1833,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai // Now check whether it's really visible depending on Keyguard state. final boolean reallyVisible = checkKeyguardVisibility(r, - visibleIgnoringKeyguard, isTop); + visibleIgnoringKeyguard, isTop && isTopFullscreenStack); if (visibleIgnoringKeyguard) { behindFullscreenActivity = updateBehindFullscreen(!stackShouldBeVisible, behindFullscreenActivity, r); @@ -1943,13 +1959,11 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai * * @return true if {@param r} is visible taken Keyguard state into account, false otherwise */ - boolean checkKeyguardVisibility(ActivityRecord r, boolean shouldBeVisible, - boolean isTop) { - final boolean isInPinnedStack = r.inPinnedWindowingMode(); + boolean checkKeyguardVisibility(ActivityRecord r, boolean shouldBeVisible, boolean isTop) { final boolean keyguardShowing = mStackSupervisor.getKeyguardController().isKeyguardShowing( mDisplayId != INVALID_DISPLAY ? mDisplayId : DEFAULT_DISPLAY); final boolean keyguardLocked = mStackSupervisor.getKeyguardController().isKeyguardLocked(); - final boolean showWhenLocked = r.canShowWhenLocked() && !isInPinnedStack; + final boolean showWhenLocked = r.canShowWhenLocked(); final boolean dismissKeyguard = r.hasDismissKeyguardWindows(); if (shouldBeVisible) { if (dismissKeyguard && mTopDismissingKeyguardActivity == null) { diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index edaa51112867..0a42aa9cce63 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2312,7 +2312,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D if (displayId == INVALID_DISPLAY) { displayId = candidateDisplayId; } - if (displayId != INVALID_DISPLAY) { + if (displayId != INVALID_DISPLAY && canLaunchOnDisplay(r, displayId)) { if (r != null) { // TODO: This should also take in the windowing mode and activity type into account. stack = (T) getValidLaunchStackOnDisplay(displayId, r); @@ -2341,7 +2341,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D } if (stack != null) { display = stack.getDisplay(); - if (display != null) { + if (display != null && canLaunchOnDisplay(r, display.mDisplayId)) { final int windowingMode = display.resolveWindowingMode(r, options, candidateTask, activityType); if (stack.isCompatible(windowingMode, activityType)) { @@ -2351,6 +2351,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D } if (display == null + || !canLaunchOnDisplay(r, display.mDisplayId) // TODO: Can be removed once we figure-out how non-standard types should launch // outside the default display. || (activityType != ACTIVITY_TYPE_STANDARD @@ -2361,6 +2362,14 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D return display.getOrCreateStack(r, options, candidateTask, activityType, onTop); } + /** @return true if activity record is null or can be launched on provided display. */ + private boolean canLaunchOnDisplay(ActivityRecord r, int displayId) { + if (r == null) { + return true; + } + return r.canBeLaunchedOnDisplay(displayId); + } + /** * Get a topmost stack on the display, that is a valid launch stack for specified activity. * If there is no such stack, new dynamic stack can be created. @@ -4248,22 +4257,15 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D // Handle incorrect launch/move to secondary display if needed. if (isSecondaryDisplayPreferred) { - final boolean launchOnSecondaryDisplayFailed; final int actualDisplayId = task.getStack().mDisplayId; if (!task.canBeLaunchedOnDisplay(actualDisplayId)) { - // The task landed on an inappropriate display somehow, move it to the default - // display. - // TODO(multi-display): Find proper stack for the task on the default display. - mService.setTaskWindowingMode(task.taskId, - WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY, true /* toTop */); - launchOnSecondaryDisplayFailed = true; - } else { - // The task might have landed on a display different from requested. - launchOnSecondaryDisplayFailed = actualDisplayId == DEFAULT_DISPLAY - || (preferredDisplayId != INVALID_DISPLAY - && preferredDisplayId != actualDisplayId); + throw new IllegalStateException("Task resolved to incompatible display"); } - if (launchOnSecondaryDisplayFailed) { + // The task might have landed on a display different from requested. + // TODO(multi-display): Find proper stack for the task on the default display. + mService.setTaskWindowingMode(task.taskId, + WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY, true /* toTop */); + if (preferredDisplayId != actualDisplayId) { // Display a warning toast that we tried to put a non-resizeable task on a secondary // display with config different from global config. mService.mTaskChangeNotificationController diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 69cc3c7aacbc..abdbfadf8d99 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1812,6 +1812,9 @@ class ActivityStarter { } } } + // Need to update mTargetStack because if task was moved out of it, the original stack may + // be destroyed. + mTargetStack = intentActivity.getStack(); if (!mMovedToFront && mDoResume) { if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Bring to front target: " + mTargetStack + " from " + intentActivity); diff --git a/services/core/java/com/android/server/am/ClientLifecycleManager.java b/services/core/java/com/android/server/am/ClientLifecycleManager.java index cc70f18dc747..014f7086efa3 100644 --- a/services/core/java/com/android/server/am/ClientLifecycleManager.java +++ b/services/core/java/com/android/server/am/ClientLifecycleManager.java @@ -43,7 +43,8 @@ class ClientLifecycleManager { */ void scheduleTransaction(ClientTransaction transaction) throws RemoteException { transaction.schedule(); - transaction.recycle(); + // TODO: b/70616950 + //transaction.recycle(); } /** diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java index abb296e9c8c3..2de84ab265ff 100644 --- a/services/core/java/com/android/server/am/RecentTasks.java +++ b/services/core/java/com/android/server/am/RecentTasks.java @@ -662,7 +662,7 @@ class RecentTasks { * task to be trimmed as a result of that add. */ private boolean canAddTaskWithoutTrim(TaskRecord task) { - return findTrimIndexForAddTask(task) == -1; + return findRemoveIndexForAddTask(task) == -1; } /** @@ -896,7 +896,7 @@ class RecentTasks { } if (DEBUG_RECENTS) Slog.d(TAG_RECENTS, "addRecent: trimming tasks for " + task); - trimForAddTask(task); + removeForAddTask(task); task.inRecents = true; if (!isAffiliated || needAffiliationFix) { @@ -1175,8 +1175,8 @@ class RecentTasks { * If needed, remove oldest existing entries in recents that are for the same kind * of task as the given one. */ - private void trimForAddTask(TaskRecord task) { - final int removeIndex = findTrimIndexForAddTask(task); + private void removeForAddTask(TaskRecord task) { + final int removeIndex = findRemoveIndexForAddTask(task); if (removeIndex == -1) { // Nothing to trim return; @@ -1187,7 +1187,7 @@ class RecentTasks { // callbacks here. final TaskRecord removedTask = mTasks.remove(removeIndex); if (removedTask != task) { - notifyTaskRemoved(removedTask, TRIMMED); + notifyTaskRemoved(removedTask, !TRIMMED); if (DEBUG_RECENTS_TRIM_TASKS) Slog.d(TAG, "Trimming task=" + removedTask + " for addition of task=" + task); } @@ -1198,7 +1198,7 @@ class RecentTasks { * Find the task that would be removed if the given {@param task} is added to the recent tasks * list (if any). */ - private int findTrimIndexForAddTask(TaskRecord task) { + private int findRemoveIndexForAddTask(TaskRecord task) { int recentsCount = mTasks.size(); final Intent intent = task.intent; final boolean document = intent != null && intent.isDocument(); @@ -1241,7 +1241,6 @@ class RecentTasks { // don't need to trim it. continue; } else if (maxRecents > 0) { - // Otherwise only trim if we are over our max recents for this task --maxRecents; if (!sameIntent || multiTasksAllowed) { // We don't want to trim if we are not over the max allowed entries and diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 4a648fc9264f..91b3315e4c0d 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -623,6 +623,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi if (toStack == sourceStack) { return false; } + if (!canBeLaunchedOnDisplay(toStack.mDisplayId)) { + return false; + } final int toStackWindowingMode = toStack.getWindowingMode(); final ActivityRecord topActivity = getTopActivity(); diff --git a/services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java b/services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java index 8fdbcf6c657b..3064144072ae 100644 --- a/services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java +++ b/services/core/java/com/android/server/broadcastradio/BroadcastRadioService.java @@ -16,6 +16,7 @@ package com.android.server.broadcastradio; +import android.annotation.NonNull; import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; @@ -28,14 +29,16 @@ import android.os.ParcelableException; import com.android.server.SystemService; import java.util.List; +import java.util.Objects; +import java.util.OptionalInt; public class BroadcastRadioService extends SystemService { private final ServiceImpl mServiceImpl = new ServiceImpl(); - /** - * This field is used by native code, do not access or modify. - */ - private final long mNativeContext = nativeInit(); + private final com.android.server.broadcastradio.hal1.BroadcastRadioService mHal1 = + new com.android.server.broadcastradio.hal1.BroadcastRadioService(); + private final com.android.server.broadcastradio.hal2.BroadcastRadioService mHal2 = + new com.android.server.broadcastradio.hal2.BroadcastRadioService(); private final Object mLock = new Object(); private List<RadioManager.ModuleProperties> mModules = null; @@ -45,22 +48,18 @@ public class BroadcastRadioService extends SystemService { } @Override - protected void finalize() throws Throwable { - nativeFinalize(mNativeContext); - super.finalize(); - } - - private native long nativeInit(); - private native void nativeFinalize(long nativeContext); - private native List<RadioManager.ModuleProperties> nativeLoadModules(long nativeContext); - private native Tuner nativeOpenTuner(long nativeContext, int moduleId, - RadioManager.BandConfig config, boolean withAudio, ITunerCallback callback); - - @Override public void onStart() { publishBinderService(Context.RADIO_SERVICE, mServiceImpl); } + /** + * Finds next available index for newly loaded modules. + */ + private static int getNextId(@NonNull List<RadioManager.ModuleProperties> modules) { + OptionalInt max = modules.stream().mapToInt(RadioManager.ModuleProperties::getId).max(); + return max.isPresent() ? max.getAsInt() + 1 : 0; + } + private class ServiceImpl extends IRadioService.Stub { private void enforcePolicyAccess() { if (PackageManager.PERMISSION_GRANTED != getContext().checkCallingPermission( @@ -75,11 +74,8 @@ public class BroadcastRadioService extends SystemService { synchronized (mLock) { if (mModules != null) return mModules; - mModules = nativeLoadModules(mNativeContext); - if (mModules == null) { - throw new ParcelableException(new NullPointerException( - "couldn't load radio modules")); - } + mModules = mHal1.loadModules(); + mModules.addAll(mHal2.loadModules(getNextId(mModules))); return mModules; } @@ -93,7 +89,11 @@ public class BroadcastRadioService extends SystemService { throw new IllegalArgumentException("Callback must not be empty"); } synchronized (mLock) { - return nativeOpenTuner(mNativeContext, moduleId, bandConfig, withAudio, callback); + if (mHal2.hasModule(moduleId)) { + throw new RuntimeException("Not implemented"); + } else { + return mHal1.openTuner(moduleId, bandConfig, withAudio, callback); + } } } } diff --git a/services/core/java/com/android/server/broadcastradio/hal1/BroadcastRadioService.java b/services/core/java/com/android/server/broadcastradio/hal1/BroadcastRadioService.java new file mode 100644 index 000000000000..e8ac5477469b --- /dev/null +++ b/services/core/java/com/android/server/broadcastradio/hal1/BroadcastRadioService.java @@ -0,0 +1,66 @@ +/** + * 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.server.broadcastradio.hal1; + +import android.annotation.NonNull; +import android.Manifest; +import android.content.Context; +import android.content.pm.PackageManager; +import android.hardware.radio.IRadioService; +import android.hardware.radio.ITuner; +import android.hardware.radio.ITunerCallback; +import android.hardware.radio.RadioManager; +import android.os.ParcelableException; + +import com.android.server.SystemService; + +import java.util.List; +import java.util.Objects; + +public class BroadcastRadioService { + /** + * This field is used by native code, do not access or modify. + */ + private final long mNativeContext = nativeInit(); + + private final Object mLock = new Object(); + + @Override + protected void finalize() throws Throwable { + nativeFinalize(mNativeContext); + super.finalize(); + } + + private native long nativeInit(); + private native void nativeFinalize(long nativeContext); + private native List<RadioManager.ModuleProperties> nativeLoadModules(long nativeContext); + private native Tuner nativeOpenTuner(long nativeContext, int moduleId, + RadioManager.BandConfig config, boolean withAudio, ITunerCallback callback); + + public @NonNull List<RadioManager.ModuleProperties> loadModules() { + synchronized (mLock) { + return Objects.requireNonNull(nativeLoadModules(mNativeContext)); + } + } + + public ITuner openTuner(int moduleId, RadioManager.BandConfig bandConfig, + boolean withAudio, @NonNull ITunerCallback callback) { + synchronized (mLock) { + return nativeOpenTuner(mNativeContext, moduleId, bandConfig, withAudio, callback); + } + } +} diff --git a/services/core/java/com/android/server/broadcastradio/Convert.java b/services/core/java/com/android/server/broadcastradio/hal1/Convert.java index 125554fc3025..80c776254d98 100644 --- a/services/core/java/com/android/server/broadcastradio/Convert.java +++ b/services/core/java/com/android/server/broadcastradio/hal1/Convert.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.broadcastradio; +package com.android.server.broadcastradio.hal1; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/services/core/java/com/android/server/broadcastradio/Tuner.java b/services/core/java/com/android/server/broadcastradio/hal1/Tuner.java index 2ea4271864f2..cce534d3bdb1 100644 --- a/services/core/java/com/android/server/broadcastradio/Tuner.java +++ b/services/core/java/com/android/server/broadcastradio/hal1/Tuner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.broadcastradio; +package com.android.server.broadcastradio.hal1; import android.annotation.NonNull; import android.graphics.Bitmap; diff --git a/services/core/java/com/android/server/broadcastradio/TunerCallback.java b/services/core/java/com/android/server/broadcastradio/hal1/TunerCallback.java index 2460c67a64a2..673ff88d5c98 100644 --- a/services/core/java/com/android/server/broadcastradio/TunerCallback.java +++ b/services/core/java/com/android/server/broadcastradio/hal1/TunerCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server.broadcastradio; +package com.android.server.broadcastradio.hal1; import android.annotation.NonNull; import android.hardware.radio.ITuner; diff --git a/services/core/java/com/android/server/broadcastradio/hal2/BroadcastRadioService.java b/services/core/java/com/android/server/broadcastradio/hal2/BroadcastRadioService.java new file mode 100644 index 000000000000..7629477438e4 --- /dev/null +++ b/services/core/java/com/android/server/broadcastradio/hal2/BroadcastRadioService.java @@ -0,0 +1,79 @@ +/** + * 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.server.broadcastradio.hal2; + +import android.annotation.NonNull; +import android.hardware.radio.RadioManager; +import android.hardware.broadcastradio.V2_0.IBroadcastRadio; +import android.hidl.manager.V1_0.IServiceManager; +import android.os.RemoteException; +import android.util.Slog; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class BroadcastRadioService { + private static final String TAG = "BcRadio2Srv"; + + private final Map<Integer, RadioModule> mModules = new HashMap<>(); + + private static @NonNull List<String> listByInterface(@NonNull String fqName) { + try { + IServiceManager manager = IServiceManager.getService(); + if (manager == null) { + Slog.e(TAG, "Failed to get HIDL Service Manager"); + return Collections.emptyList(); + } + + List<String> list = manager.listByInterface(fqName); + if (list == null) { + Slog.e(TAG, "Didn't get interface list from HIDL Service Manager"); + return Collections.emptyList(); + } + return list; + } catch (RemoteException ex) { + Slog.e(TAG, "Failed fetching interface list", ex); + return Collections.emptyList(); + } + } + + public @NonNull Collection<RadioManager.ModuleProperties> loadModules(int idx) { + Slog.v(TAG, "loadModules(" + idx + ")"); + + for (String serviceName : listByInterface(IBroadcastRadio.kInterfaceName)) { + Slog.v(TAG, "checking service: " + serviceName); + + RadioModule module = RadioModule.tryLoadingModule(idx, serviceName); + if (module != null) { + Slog.i(TAG, "loaded broadcast radio module " + idx + ": " + + serviceName + " (HAL 2.0)"); + mModules.put(idx++, module); + } + } + + return mModules.values().stream().map(module -> module.mProperties). + collect(Collectors.toList()); + } + + public boolean hasModule(int id) { + return mModules.containsKey(id); + } +} diff --git a/services/core/java/com/android/server/broadcastradio/hal2/Convert.java b/services/core/java/com/android/server/broadcastradio/hal2/Convert.java new file mode 100644 index 000000000000..c3394e9e0df5 --- /dev/null +++ b/services/core/java/com/android/server/broadcastradio/hal2/Convert.java @@ -0,0 +1,132 @@ +/** + * 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.server.broadcastradio.hal2; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.hardware.broadcastradio.V2_0.Properties; +import android.hardware.broadcastradio.V2_0.VendorKeyValue; +import android.hardware.radio.ProgramSelector; +import android.hardware.radio.RadioManager; +import android.util.Slog; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +class Convert { + private static final String TAG = "BcRadio2Srv.convert"; + + private static @NonNull Map<String, String> + vendorInfoFromHal(@Nullable List<VendorKeyValue> info) { + if (info == null) return Collections.emptyMap(); + + Map<String, String> map = new HashMap<>(); + for (VendorKeyValue kvp : info) { + if (kvp.key == null || kvp.value == null) { + Slog.w(TAG, "VendorKeyValue contains null pointers"); + continue; + } + map.put(kvp.key, kvp.value); + } + + return map; + } + + private static @NonNull int[] + identifierTypesToProgramTypes(@NonNull int[] idTypes) { + Set<Integer> pTypes = new HashSet<>(); + + for (int idType : idTypes) { + switch (idType) { + case ProgramSelector.IDENTIFIER_TYPE_AMFM_FREQUENCY: + case ProgramSelector.IDENTIFIER_TYPE_RDS_PI: + // TODO(b/69958423): verify AM/FM with region info + pTypes.add(ProgramSelector.PROGRAM_TYPE_AM); + pTypes.add(ProgramSelector.PROGRAM_TYPE_FM); + break; + case ProgramSelector.IDENTIFIER_TYPE_HD_STATION_ID_EXT: + // TODO(b/69958423): verify AM/FM with region info + pTypes.add(ProgramSelector.PROGRAM_TYPE_AM_HD); + pTypes.add(ProgramSelector.PROGRAM_TYPE_FM_HD); + break; + case ProgramSelector.IDENTIFIER_TYPE_DAB_SIDECC: + case ProgramSelector.IDENTIFIER_TYPE_DAB_ENSEMBLE: + case ProgramSelector.IDENTIFIER_TYPE_DAB_SCID: + case ProgramSelector.IDENTIFIER_TYPE_DAB_FREQUENCY: + pTypes.add(ProgramSelector.PROGRAM_TYPE_DAB); + break; + case ProgramSelector.IDENTIFIER_TYPE_DRMO_SERVICE_ID: + case ProgramSelector.IDENTIFIER_TYPE_DRMO_FREQUENCY: + pTypes.add(ProgramSelector.PROGRAM_TYPE_DRMO); + break; + case ProgramSelector.IDENTIFIER_TYPE_SXM_SERVICE_ID: + case ProgramSelector.IDENTIFIER_TYPE_SXM_CHANNEL: + pTypes.add(ProgramSelector.PROGRAM_TYPE_SXM); + break; + default: + break; + } + if (idType >= ProgramSelector.IDENTIFIER_TYPE_VENDOR_PRIMARY_START + && idType <= ProgramSelector.IDENTIFIER_TYPE_VENDOR_PRIMARY_END) { + pTypes.add(idType); + } + } + + return pTypes.stream().mapToInt(Integer::intValue).toArray(); + } + + static @NonNull RadioManager.ModuleProperties + propertiesFromHal(int id, @NonNull String serviceName, Properties prop) { + Objects.requireNonNull(prop); + + // TODO(b/69958423): implement region info + RadioManager.BandDescriptor[] bands = new RadioManager.BandDescriptor[0]; + + int[] supportedIdentifierTypes = prop.supportedIdentifierTypes.stream(). + mapToInt(Integer::intValue).toArray(); + int[] supportedProgramTypes = identifierTypesToProgramTypes(supportedIdentifierTypes); + + return new RadioManager.ModuleProperties( + id, + serviceName, + + // There is no Class concept in HAL 2.0. + RadioManager.CLASS_AM_FM, + + prop.maker, + prop.product, + prop.version, + prop.serial, + + /* HAL 2.0 only supports single tuner and audio source per + * HAL implementation instance. */ + 1, // numTuners + 1, // numAudioSources + false, // isCaptureSupported + + bands, + true, // isBgScanSupported is deprecated + supportedProgramTypes, + supportedIdentifierTypes, + vendorInfoFromHal(prop.vendorInfo)); + } +} diff --git a/services/core/java/com/android/server/broadcastradio/hal2/RadioModule.java b/services/core/java/com/android/server/broadcastradio/hal2/RadioModule.java new file mode 100644 index 000000000000..34c1b0ce7d93 --- /dev/null +++ b/services/core/java/com/android/server/broadcastradio/hal2/RadioModule.java @@ -0,0 +1,54 @@ +/** + * 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.server.broadcastradio.hal2; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.hardware.radio.RadioManager; +import android.hardware.broadcastradio.V2_0.IBroadcastRadio; +import android.os.RemoteException; +import android.util.Slog; + +import java.util.Objects; + +class RadioModule { + private static final String TAG = "BcRadio2Srv.module"; + + @NonNull private final IBroadcastRadio mService; + @NonNull public final RadioManager.ModuleProperties mProperties; + + private RadioModule(@NonNull IBroadcastRadio service, + @NonNull RadioManager.ModuleProperties properties) { + mProperties = Objects.requireNonNull(properties); + mService = Objects.requireNonNull(service); + } + + public static @Nullable RadioModule tryLoadingModule(int idx, @NonNull String fqName) { + try { + IBroadcastRadio service = IBroadcastRadio.getService(); + if (service == null) return null; + + RadioManager.ModuleProperties prop = + Convert.propertiesFromHal(idx, fqName, service.getProperties()); + + return new RadioModule(service, prop); + } catch (RemoteException ex) { + Slog.e(TAG, "failed to load module " + fqName, ex); + return null; + } + } +} diff --git a/services/core/java/com/android/server/connectivity/OWNERS b/services/core/java/com/android/server/connectivity/OWNERS index 74f39a18ec2b..6f77e04da3c0 100644 --- a/services/core/java/com/android/server/connectivity/OWNERS +++ b/services/core/java/com/android/server/connectivity/OWNERS @@ -2,4 +2,6 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/services/core/java/com/android/server/content/SyncJobService.java b/services/core/java/com/android/server/content/SyncJobService.java index 07f04b1b11a3..29b322eaff10 100644 --- a/services/core/java/com/android/server/content/SyncJobService.java +++ b/services/core/java/com/android/server/content/SyncJobService.java @@ -120,6 +120,7 @@ public class SyncJobService extends JobService { synchronized (jobParamsMap) { JobParameters params = jobParamsMap.get(jobId); mLogger.log("callJobFinished()", + " jobid=", jobId, " needsReschedule=", needsReschedule, " ", mLogger.jobParametersToString(params), " why=", why); diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java index 9a6e609445a5..6c5bfc793330 100644 --- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java +++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java @@ -24,6 +24,7 @@ import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.hardware.display.BrightnessConfiguration; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -34,7 +35,6 @@ import android.text.format.DateUtils; import android.util.EventLog; import android.util.MathUtils; import android.util.Slog; -import android.util.Spline; import android.util.TimeUtils; import java.io.PrintWriter; @@ -76,9 +76,8 @@ class AutomaticBrightnessController { // The light sensor, or null if not available or needed. private final Sensor mLightSensor; - // The auto-brightness spline adjustment. - // The brightness values have been scaled to a range of 0..1. - private final Spline mScreenAutoBrightnessSpline; + // The mapper to translate ambient lux to screen brightness in the range [0, 1.0]. + private final BrightnessMappingStrategy mBrightnessMapper; // The minimum and maximum screen brightnesses. private final int mScreenBrightnessRangeMinimum; @@ -186,7 +185,7 @@ class AutomaticBrightnessController { private float mBrightnessAdjustmentSampleOldGamma; public AutomaticBrightnessController(Callbacks callbacks, Looper looper, - SensorManager sensorManager, Spline autoBrightnessSpline, int lightSensorWarmUpTime, + SensorManager sensorManager, BrightnessMappingStrategy mapper, int lightSensorWarmUpTime, int brightnessMin, int brightnessMax, float dozeScaleFactor, int lightSensorRate, int initialLightSensorRate, long brighteningLightDebounceConfig, long darkeningLightDebounceConfig, boolean resetAmbientLuxAfterWarmUpConfig, @@ -194,7 +193,7 @@ class AutomaticBrightnessController { HysteresisLevels dynamicHysteresis) { mCallbacks = callbacks; mSensorManager = sensorManager; - mScreenAutoBrightnessSpline = autoBrightnessSpline; + mBrightnessMapper = mapper; mScreenBrightnessRangeMinimum = brightnessMin; mScreenBrightnessRangeMaximum = brightnessMax; mLightSensorWarmUpTimeConfig = lightSensorWarmUpTime; @@ -228,15 +227,16 @@ class AutomaticBrightnessController { return mScreenAutoBrightness; } - public void configure(boolean enable, float adjustment, boolean dozing, - boolean userInitiatedChange) { + public void configure(boolean enable, @Nullable BrightnessConfiguration configuration, + float adjustment, boolean dozing, boolean userInitiatedChange) { // While dozing, the application processor may be suspended which will prevent us from // receiving new information from the light sensor. On some devices, we may be able to // switch to a wake-up light sensor instead but for now we will simply disable the sensor // and hold onto the last computed screen auto brightness. We save the dozing flag for // debugging purposes. mDozing = dozing; - boolean changed = setLightSensorEnabled(enable && !dozing); + boolean changed = setBrightnessConfiguration(configuration); + changed |= setLightSensorEnabled(enable && !dozing); if (enable && !dozing && userInitiatedChange) { prepareBrightnessAdjustmentSample(); } @@ -246,10 +246,13 @@ class AutomaticBrightnessController { } } + public boolean setBrightnessConfiguration(BrightnessConfiguration configuration) { + return mBrightnessMapper.setBrightnessConfiguration(configuration); + } + public void dump(PrintWriter pw) { pw.println(); pw.println("Automatic Brightness Controller Configuration:"); - pw.println(" mScreenAutoBrightnessSpline=" + mScreenAutoBrightnessSpline); pw.println(" mScreenBrightnessRangeMinimum=" + mScreenBrightnessRangeMinimum); pw.println(" mScreenBrightnessRangeMaximum=" + mScreenBrightnessRangeMaximum); pw.println(" mLightSensorWarmUpTimeConfig=" + mLightSensorWarmUpTimeConfig); @@ -274,9 +277,13 @@ class AutomaticBrightnessController { mInitialHorizonAmbientLightRingBuffer); pw.println(" mScreenAutoBrightness=" + mScreenAutoBrightness); pw.println(" mScreenAutoBrightnessAdjustment=" + mScreenAutoBrightnessAdjustment); - pw.println(" mScreenAutoBrightnessAdjustmentMaxGamma=" + mScreenAutoBrightnessAdjustmentMaxGamma); + pw.println(" mScreenAutoBrightnessAdjustmentMaxGamma=" + + mScreenAutoBrightnessAdjustmentMaxGamma); pw.println(" mLastScreenAutoBrightnessGamma=" + mLastScreenAutoBrightnessGamma); pw.println(" mDozing=" + mDozing); + + pw.println(); + mBrightnessMapper.dump(pw); } private boolean setLightSensorEnabled(boolean enable) { @@ -533,7 +540,7 @@ class AutomaticBrightnessController { return; } - float value = mScreenAutoBrightnessSpline.interpolate(mAmbientLux); + float value = mBrightnessMapper.getBrightness(mAmbientLux); float gamma = 1.0f; if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT diff --git a/services/core/java/com/android/server/display/BrightnessMappingStrategy.java b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java new file mode 100644 index 000000000000..3b9d40fa0825 --- /dev/null +++ b/services/core/java/com/android/server/display/BrightnessMappingStrategy.java @@ -0,0 +1,289 @@ +/* + * 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.server.display; + +import android.annotation.Nullable; +import android.hardware.display.BrightnessConfiguration; +import android.os.PowerManager; +import android.util.MathUtils; +import android.util.Pair; +import android.util.Slog; +import android.util.Spline; + +import com.android.internal.util.Preconditions; +import com.android.internal.annotations.VisibleForTesting; + +import java.io.PrintWriter; + +/** + * A utility to map from an ambient brightness to a display's "backlight" brightness based on the + * available display information and brightness configuration. + * + * Note that without a mapping from the nits to a display backlight level, any + * {@link BrightnessConfiguration}s that are set are just ignored. + */ +public abstract class BrightnessMappingStrategy { + private static final String TAG = "BrightnessMappingStrategy"; + private static final boolean DEBUG = false; + + @Nullable + public static BrightnessMappingStrategy create( + float[] luxLevels, int[] brightnessLevelsBacklight, float[] brightnessLevelsNits, + float[] nitsRange, int[] backlightRange) { + if (isValidMapping(nitsRange, backlightRange) + && isValidMapping(luxLevels, brightnessLevelsNits)) { + BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + builder.setCurve(luxLevels, brightnessLevelsNits); + return new PhysicalMappingStrategy(builder.build(), nitsRange, backlightRange); + } else if (isValidMapping(luxLevels, brightnessLevelsBacklight)) { + return new SimpleMappingStrategy(luxLevels, brightnessLevelsBacklight); + } else { + return null; + } + } + + private static boolean isValidMapping(float[] x, float[] y) { + if (x == null || y == null || x.length == 0 || y.length == 0) { + return false; + } + if (x.length != y.length) { + return false; + } + final int N = x.length; + float prevX = x[0]; + float prevY = y[0]; + if (prevX < 0 || prevY < 0 || Float.isNaN(prevX) || Float.isNaN(prevY)) { + return false; + } + for (int i = 1; i < N; i++) { + if (prevX >= x[i] || prevY > y[i]) { + return false; + } + if (Float.isNaN(x[i]) || Float.isNaN(y[i])) { + return false; + } + prevX = x[i]; + prevY = y[i]; + } + return true; + } + + private static boolean isValidMapping(float[] x, int[] y) { + if (x == null || y == null || x.length == 0 || y.length == 0) { + return false; + } + if (x.length != y.length) { + return false; + } + final int N = x.length; + float prevX = x[0]; + int prevY = y[0]; + if (prevX < 0 || prevY < 0 || Float.isNaN(prevX)) { + return false; + } + for (int i = 1; i < N; i++) { + if (prevX >= x[i] || prevY > y[i]) { + return false; + } + if (Float.isNaN(x[i])) { + return false; + } + prevX = x[i]; + prevY = y[i]; + } + return true; + } + + /** + * Sets the {@link BrightnessConfiguration}. + * + * @param config The new configuration. If {@code null} is passed, the default configuration is + * used. + * @return Whether the brightness configuration has changed. + */ + public abstract boolean setBrightnessConfiguration(@Nullable BrightnessConfiguration config); + + /** + * Returns the desired brightness of the display based on the current ambient lux. + * + * The returned brightness will be in the range [0, 1.0], where 1.0 is the display at max + * brightness and 0 is the display at minimum brightness. + * + * @param lux The current ambient brightness in lux. + * @return The desired brightness of the display compressed to the range [0, 1.0]. + */ + public abstract float getBrightness(float lux); + + public abstract void dump(PrintWriter pw); + + private static float normalizeAbsoluteBrightness(int brightness) { + brightness = MathUtils.constrain(brightness, + PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON); + return (float) brightness / PowerManager.BRIGHTNESS_ON; + } + + + /** + * A {@link BrightnessMappingStrategy} that maps from ambient room brightness directly to the + * backlight of the display. + * + * Since we don't have information about the display's physical brightness, any brightness + * configurations that are set are just ignored. + */ + private static class SimpleMappingStrategy extends BrightnessMappingStrategy { + private final Spline mSpline; + + public SimpleMappingStrategy(float[] lux, int[] brightness) { + Preconditions.checkArgument(lux.length != 0 && brightness.length != 0, + "Lux and brightness arrays must not be empty!"); + Preconditions.checkArgument(lux.length == brightness.length, + "Lux and brightness arrays must be the same length!"); + Preconditions.checkArrayElementsInRange(lux, 0, Float.MAX_VALUE, "lux"); + Preconditions.checkArrayElementsInRange(brightness, + 0, Integer.MAX_VALUE, "brightness"); + + final int N = brightness.length; + float[] x = new float[N]; + float[] y = new float[N]; + for (int i = 0; i < N; i++) { + x[i] = lux[i]; + y[i] = normalizeAbsoluteBrightness(brightness[i]); + } + + mSpline = Spline.createSpline(x, y); + if (DEBUG) { + Slog.d(TAG, "Auto-brightness spline: " + mSpline); + for (float v = 1f; v < lux[lux.length - 1] * 1.25f; v *= 1.25f) { + Slog.d(TAG, String.format(" %7.1f: %7.1f", v, mSpline.interpolate(v))); + } + } + } + + @Override + public boolean setBrightnessConfiguration(@Nullable BrightnessConfiguration config) { + Slog.e(TAG, + "setBrightnessConfiguration called on device without display information."); + return false; + } + + @Override + public float getBrightness(float lux) { + return mSpline.interpolate(lux); + } + + @Override + public void dump(PrintWriter pw) { + pw.println("SimpleMappingStrategy"); + pw.println(" mSpline=" + mSpline); + } + } + + /** A {@link BrightnessMappingStrategy} that maps from ambient room brightness to the physical + * range of the display, rather than to the range of the backlight control (typically 0-255). + * + * By mapping through the physical brightness, the curve becomes portable across devices and + * gives us more resolution in the resulting mapping. + */ + @VisibleForTesting + static class PhysicalMappingStrategy extends BrightnessMappingStrategy { + // The current brightness configuration. + private BrightnessConfiguration mConfig; + + // A spline mapping from the current ambient light in lux to the desired display brightness + // in nits. + private Spline mBrightnessSpline; + + // A spline mapping from nits to the corresponding backlight value, normalized to the range + // [0, 1.0]. + private final Spline mBacklightSpline; + + // The default brightness configuration. + private final BrightnessConfiguration mDefaultConfig; + + public PhysicalMappingStrategy(BrightnessConfiguration config, + float[] nits, int[] backlight) { + Preconditions.checkArgument(nits.length != 0 && backlight.length != 0, + "Nits and backlight arrays must not be empty!"); + Preconditions.checkArgument(nits.length == backlight.length, + "Nits and backlight arrays must be the same length!"); + Preconditions.checkNotNull(config); + Preconditions.checkArrayElementsInRange(nits, 0, Float.MAX_VALUE, "nits"); + Preconditions.checkArrayElementsInRange(backlight, + PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON, "backlight"); + + // Setup the backlight spline + final int N = nits.length; + float[] x = new float[N]; + float[] y = new float[N]; + for (int i = 0; i < N; i++) { + x[i] = nits[i]; + y[i] = normalizeAbsoluteBrightness(backlight[i]); + } + + mBacklightSpline = Spline.createSpline(x, y); + if (DEBUG) { + Slog.d(TAG, "Backlight spline: " + mBacklightSpline); + for (float v = 1f; v < nits[nits.length - 1] * 1.25f; v *= 1.25f) { + Slog.d(TAG, String.format( + " %7.1f: %7.1f", v, mBacklightSpline.interpolate(v))); + } + } + + mDefaultConfig = config; + setBrightnessConfiguration(config); + } + + @Override + public boolean setBrightnessConfiguration(@Nullable BrightnessConfiguration config) { + if (config == null) { + config = mDefaultConfig; + } + if (config.equals(mConfig)) { + if (DEBUG) { + Slog.d(TAG, "Tried to set an identical brightness config, ignoring"); + } + return false; + } + + Pair<float[], float[]> curve = config.getCurve(); + mBrightnessSpline = Spline.createSpline(curve.first /*lux*/, curve.second /*nits*/); + if (DEBUG) { + Slog.d(TAG, "Brightness spline: " + mBrightnessSpline); + final float[] lux = curve.first; + for (float v = 1f; v < lux[lux.length - 1] * 1.25f; v *= 1.25f) { + Slog.d(TAG, String.format( + " %7.1f: %7.1f", v, mBrightnessSpline.interpolate(v))); + } + } + mConfig = config; + return true; + } + + @Override + public float getBrightness(float lux) { + return mBacklightSpline.interpolate(mBrightnessSpline.interpolate(lux)); + } + + @Override + public void dump(PrintWriter pw) { + pw.println("PhysicalMappingStrategy"); + pw.println(" mConfig=" + mConfig); + pw.println(" mBrightnessSpline=" + mBrightnessSpline); + pw.println(" mBacklightSpline=" + mBacklightSpline); + } + } +} diff --git a/services/core/java/com/android/server/display/ColorDisplayService.java b/services/core/java/com/android/server/display/ColorDisplayService.java index 75f30562d13e..b3d309dda25b 100644 --- a/services/core/java/com/android/server/display/ColorDisplayService.java +++ b/services/core/java/com/android/server/display/ColorDisplayService.java @@ -189,7 +189,7 @@ public final class ColorDisplayService extends SystemService mController = new ColorDisplayController(getContext(), mCurrentUser); mController.setListener(this); - setCoefficientMatrix(getContext()); + setCoefficientMatrix(getContext(), DisplayTransformManager.isNativeModeEnabled()); // Prepare color transformation matrix. setMatrix(mController.getColorTemperature(), mMatrixNight); @@ -287,17 +287,24 @@ public final class ColorDisplayService extends SystemService } @Override - public void onDisplayColorModeChanged(int colorMode) { - final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class); - dtm.setColorMode(colorMode); + public void onDisplayColorModeChanged(int mode) { + // Cancel the night display tint animator if it's running. + if (mColorMatrixAnimator != null) { + mColorMatrixAnimator.cancel(); + } - setCoefficientMatrix(getContext()); + setCoefficientMatrix(getContext(), mode == ColorDisplayController.COLOR_MODE_SATURATED); setMatrix(mController.getColorTemperature(), mMatrixNight); - applyTint(true); + + final DisplayTransformManager dtm = getLocalService(DisplayTransformManager.class); + dtm.setColorMode(mode, mIsActivated ? mMatrixNight : MATRIX_IDENTITY); } - private void setCoefficientMatrix(Context context) { - final boolean isNative = DisplayTransformManager.isNativeModeEnabled(); + /** + * Set coefficients based on native mode. Use DisplayTransformManager#isNativeModeEnabled while + * setting is stable; when setting is changing, pass native mode selection directly. + */ + private void setCoefficientMatrix(Context context, boolean isNative) { final String[] coefficients = context.getResources().getStringArray(isNative ? R.array.config_nightDisplayColorTemperatureCoefficientsNative : R.array.config_nightDisplayColorTemperatureCoefficients); diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index c1bfa478ee89..9b97934cfc3b 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -29,6 +29,7 @@ import com.android.internal.util.IndentingPrintWriter; import android.Manifest; import android.annotation.NonNull; +import android.annotation.UserIdInt; import android.app.AppOpsManager; import android.content.Context; import android.content.pm.PackageManager; @@ -37,6 +38,7 @@ import android.content.res.Resources; import android.graphics.Point; import android.hardware.SensorManager; import android.hardware.display.BrightnessChangeEvent; +import android.hardware.display.BrightnessConfiguration; import android.hardware.display.DisplayManagerGlobal; import android.hardware.display.DisplayManagerInternal; import android.hardware.display.DisplayViewport; @@ -62,6 +64,7 @@ import android.os.SystemClock; import android.os.SystemProperties; import android.os.Trace; import android.os.UserHandle; +import android.os.UserManager; import android.text.TextUtils; import android.util.IntArray; import android.util.Slog; @@ -70,6 +73,7 @@ import android.view.Display; import android.view.DisplayInfo; import android.view.Surface; +import com.android.internal.util.Preconditions; import com.android.server.AnimationThread; import com.android.server.DisplayThread; import com.android.server.LocalServices; @@ -145,6 +149,7 @@ public final class DisplayManagerService extends SystemService { private static final int MSG_REQUEST_TRAVERSAL = 4; private static final int MSG_UPDATE_VIEWPORT = 5; private static final int MSG_REGISTER_BRIGHTNESS_TRACKER = 6; + private static final int MSG_LOAD_BRIGHTNESS_CONFIGURATION = 7; private final Context mContext; private final DisplayManagerHandler mHandler; @@ -219,6 +224,9 @@ public final class DisplayManagerService extends SystemService { // The virtual display adapter, or null if not registered. private VirtualDisplayAdapter mVirtualDisplayAdapter; + // The User ID of the current user + private @UserIdInt int mCurrentUserId; + // The stable device screen height and width. These are not tied to a specific display, even // the default display, because they need to be stable over the course of the device's entire // life, even if the default display changes (e.g. a new monitor is plugged into a PC-like @@ -278,17 +286,18 @@ public final class DisplayManagerService extends SystemService { mDisplayAdapterListener = new DisplayAdapterListener(); mSingleDisplayDemoMode = SystemProperties.getBoolean("persist.demo.singledisplay", false); mDefaultDisplayDefaultColorMode = mContext.getResources().getInteger( - com.android.internal.R.integer.config_defaultDisplayDefaultColorMode); + com.android.internal.R.integer.config_defaultDisplayDefaultColorMode); PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); mGlobalDisplayBrightness = pm.getDefaultScreenBrightnessSetting(); mBrightnessTracker = new BrightnessTracker(context, null); + mCurrentUserId = UserHandle.USER_SYSTEM; } public void setupSchedulerPolicies() { // android.display and android.anim is critical to user experience and we should make sure - // it is not in the default foregroup groups, add it to top-app to make sure it uses all the - // cores and scheduling settings for top-app when it runs. + // it is not in the default foregroup groups, add it to top-app to make sure it uses all + // the cores and scheduling settings for top-app when it runs. Process.setThreadGroupAndCpuset(DisplayThread.get().getThreadId(), Process.THREAD_GROUP_TOP_APP); Process.setThreadGroupAndCpuset(AnimationThread.get().getThreadId(), @@ -342,6 +351,19 @@ public final class DisplayManagerService extends SystemService { } } + @Override + public void onSwitchUser(@UserIdInt int newUserId) { + final int userSerial = getUserManager().getUserSerialNumber(newUserId); + synchronized (mSyncRoot) { + if (mCurrentUserId != newUserId) { + mCurrentUserId = newUserId; + BrightnessConfiguration config = + mPersistentDataStore.getBrightnessConfiguration(userSerial); + mDisplayPowerController.setBrightnessConfiguration(config); + } + } + } + // TODO: Use dependencies or a boot phase public void windowManagerAndInputReady() { synchronized (mSyncRoot) { @@ -985,6 +1007,30 @@ public final class DisplayManagerService extends SystemService { } } + private void setBrightnessConfigurationForUserInternal( + @NonNull BrightnessConfiguration c, @UserIdInt int userId) { + final int userSerial = getUserManager().getUserSerialNumber(userId); + synchronized (mSyncRoot) { + try { + mPersistentDataStore.setBrightnessConfigurationForUser(c, userSerial); + } finally { + mPersistentDataStore.saveIfNeeded(); + } + if (userId == mCurrentUserId) { + mDisplayPowerController.setBrightnessConfiguration(c); + } + } + } + + private void loadBrightnessConfiguration() { + synchronized (mSyncRoot) { + final int userSerial = getUserManager().getUserSerialNumber(mCurrentUserId); + BrightnessConfiguration config = + mPersistentDataStore.getBrightnessConfiguration(userSerial); + mDisplayPowerController.setBrightnessConfiguration(config); + } + } + // Updates all existing logical displays given the current set of display devices. // Removes invalid logical displays. // Sends notifications if needed. @@ -1229,6 +1275,10 @@ public final class DisplayManagerService extends SystemService { return mProjectionService; } + private UserManager getUserManager() { + return mContext.getSystemService(UserManager.class); + } + private void dumpInternal(PrintWriter pw) { pw.println("DISPLAY MANAGER (dumpsys display)"); @@ -1371,6 +1421,10 @@ public final class DisplayManagerService extends SystemService { case MSG_REGISTER_BRIGHTNESS_TRACKER: mBrightnessTracker.start(); break; + + case MSG_LOAD_BRIGHTNESS_CONFIGURATION: + loadBrightnessConfiguration(); + break; } } } @@ -1800,6 +1854,27 @@ public final class DisplayManagerService extends SystemService { } } + @Override // Binder call + public void setBrightnessConfigurationForUser( + BrightnessConfiguration c, @UserIdInt int userId) { + mContext.enforceCallingOrSelfPermission( + Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS, + "Permission required to change the display's brightness configuration"); + if (userId != UserHandle.getCallingUserId()) { + mContext.enforceCallingOrSelfPermission( + Manifest.permission.INTERACT_ACROSS_USERS, + "Permission required to change the display brightness" + + " configuration of another user"); + } + Preconditions.checkNotNull(c); + final long token = Binder.clearCallingIdentity(); + try { + setBrightnessConfigurationForUserInternal(c, userId); + } finally { + Binder.restoreCallingIdentity(token); + } + } + private boolean validatePackageName(int uid, String packageName) { if (packageName != null) { String[] packageNames = mContext.getPackageManager().getPackagesForUid(uid); @@ -1871,18 +1946,24 @@ public final class DisplayManagerService extends SystemService { mDisplayPowerController = new DisplayPowerController( mContext, callbacks, handler, sensorManager, blanker); } + + mHandler.sendEmptyMessage(MSG_LOAD_BRIGHTNESS_CONFIGURATION); } @Override public boolean requestPowerState(DisplayPowerRequest request, boolean waitForNegativeProximity) { - return mDisplayPowerController.requestPowerState(request, - waitForNegativeProximity); + synchronized (mSyncRoot) { + return mDisplayPowerController.requestPowerState(request, + waitForNegativeProximity); + } } @Override public boolean isProximitySensorAvailable() { - return mDisplayPowerController.isProximitySensorAvailable(); + synchronized (mSyncRoot) { + return mDisplayPowerController.isProximitySensorAvailable(); + } } @Override diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 29a007a36d41..a2d954822e64 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -26,10 +26,12 @@ import android.animation.Animator; import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; +import android.content.res.TypedArray; import android.hardware.Sensor; import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; +import android.hardware.display.BrightnessConfiguration; import android.hardware.display.DisplayManagerInternal.DisplayPowerCallbacks; import android.hardware.display.DisplayManagerInternal.DisplayPowerRequest; import android.os.Handler; @@ -93,6 +95,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call private static final int MSG_PROXIMITY_SENSOR_DEBOUNCED = 2; private static final int MSG_SCREEN_ON_UNBLOCKED = 3; private static final int MSG_SCREEN_OFF_UNBLOCKED = 4; + private static final int MSG_CONFIGURE_BRIGHTNESS = 5; + private static final int MSG_USER_SWITCH = 6; private static final int PROXIMITY_UNKNOWN = -1; private static final int PROXIMITY_NEGATIVE = 0; @@ -285,6 +289,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // The controller for the automatic brightness level. private AutomaticBrightnessController mAutomaticBrightnessController; + // The default brightness configuration. Used for whenever we don't have a valid brightness + // configuration set. This is typically seen with users that don't have a brightness + // configuration that's different from the default. + private BrightnessConfiguration mDefaultBrightnessConfiguration; + + // The current brightness configuration. + private BrightnessConfiguration mBrightnessConfiguration; + // Animators. private ObjectAnimator mColorFadeOnAnimator; private ObjectAnimator mColorFadeOffAnimator; @@ -333,7 +345,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call screenBrightnessSettingMinimum, mScreenBrightnessDimConfig), mScreenBrightnessDarkConfig); - mScreenBrightnessRangeMaximum = PowerManager.BRIGHTNESS_ON; + mScreenBrightnessRangeMaximum = clampAbsoluteBrightness(resources.getInteger( + com.android.internal.R.integer.config_screenBrightnessSettingMaximum)); mUseSoftwareAutoBrightnessConfig = resources.getBoolean( com.android.internal.R.bool.config_automatic_brightness_available); @@ -348,60 +361,60 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mSkipScreenOnBrightnessRamp = resources.getBoolean( com.android.internal.R.bool.config_skipScreenOnBrightnessRamp); - int lightSensorRate = resources.getInteger( - com.android.internal.R.integer.config_autoBrightnessLightSensorRate); - int initialLightSensorRate = resources.getInteger( - com.android.internal.R.integer.config_autoBrightnessInitialLightSensorRate); - if (initialLightSensorRate == -1) { - initialLightSensorRate = lightSensorRate; - } else if (initialLightSensorRate > lightSensorRate) { - Slog.w(TAG, "Expected config_autoBrightnessInitialLightSensorRate (" - + initialLightSensorRate + ") to be less than or equal to " - + "config_autoBrightnessLightSensorRate (" + lightSensorRate + ")."); - } - long brighteningLightDebounce = resources.getInteger( - com.android.internal.R.integer.config_autoBrightnessBrighteningLightDebounce); - long darkeningLightDebounce = resources.getInteger( - com.android.internal.R.integer.config_autoBrightnessDarkeningLightDebounce); - boolean autoBrightnessResetAmbientLuxAfterWarmUp = resources.getBoolean( - com.android.internal.R.bool.config_autoBrightnessResetAmbientLuxAfterWarmUp); - int ambientLightHorizon = resources.getInteger( - com.android.internal.R.integer.config_autoBrightnessAmbientLightHorizon); - float autoBrightnessAdjustmentMaxGamma = resources.getFraction( - com.android.internal.R.fraction.config_autoBrightnessAdjustmentMaxGamma, - 1, 1); - - int[] brightLevels = resources.getIntArray( - com.android.internal.R.array.config_dynamicHysteresisBrightLevels); - int[] darkLevels = resources.getIntArray( - com.android.internal.R.array.config_dynamicHysteresisDarkLevels); - int[] luxLevels = resources.getIntArray( - com.android.internal.R.array.config_dynamicHysteresisLuxLevels); - HysteresisLevels dynamicHysteresis = new HysteresisLevels( - brightLevels, darkLevels, luxLevels); - if (mUseSoftwareAutoBrightnessConfig) { - int[] lux = resources.getIntArray( - com.android.internal.R.array.config_autoBrightnessLevels); - int[] screenBrightness = resources.getIntArray( + float[] luxLevels = getLuxLevels(resources.getIntArray( + com.android.internal.R.array.config_autoBrightnessLevels)); + int[] backlightValues = resources.getIntArray( com.android.internal.R.array.config_autoBrightnessLcdBacklightValues); - int lightSensorWarmUpTimeConfig = resources.getInteger( - com.android.internal.R.integer.config_lightSensorWarmupTime); + float[] brightnessValuesNits = getFloatArray(resources.obtainTypedArray( + com.android.internal.R.array.config_autoBrightnessDisplayValuesNits)); + + final float screenMinimumNits = resources.getFloat( + com.android.internal.R.dimen.config_screenBrightnessMinimumNits); + final float screenMaximumNits = resources.getFloat( + com.android.internal.R.dimen.config_screenBrightnessMaximumNits); + final float dozeScaleFactor = resources.getFraction( com.android.internal.R.fraction.config_screenAutoBrightnessDozeScaleFactor, 1, 1); - Spline screenAutoBrightnessSpline = createAutoBrightnessSpline(lux, screenBrightness); - if (screenAutoBrightnessSpline == null) { - Slog.e(TAG, "Error in config.xml. config_autoBrightnessLcdBacklightValues " - + "(size " + screenBrightness.length + ") " - + "must be monotic and have exactly one more entry than " - + "config_autoBrightnessLevels (size " + lux.length + ") " - + "which must be strictly increasing. " - + "Auto-brightness will be disabled."); - mUseSoftwareAutoBrightnessConfig = false; - } else { - int bottom = clampAbsoluteBrightness(screenBrightness[0]); + int[] brightLevels = resources.getIntArray( + com.android.internal.R.array.config_dynamicHysteresisBrightLevels); + int[] darkLevels = resources.getIntArray( + com.android.internal.R.array.config_dynamicHysteresisDarkLevels); + int[] luxHysteresisLevels = resources.getIntArray( + com.android.internal.R.array.config_dynamicHysteresisLuxLevels); + HysteresisLevels dynamicHysteresis = new HysteresisLevels( + brightLevels, darkLevels, luxHysteresisLevels); + + long brighteningLightDebounce = resources.getInteger( + com.android.internal.R.integer.config_autoBrightnessBrighteningLightDebounce); + long darkeningLightDebounce = resources.getInteger( + com.android.internal.R.integer.config_autoBrightnessDarkeningLightDebounce); + boolean autoBrightnessResetAmbientLuxAfterWarmUp = resources.getBoolean( + com.android.internal.R.bool.config_autoBrightnessResetAmbientLuxAfterWarmUp); + int ambientLightHorizon = resources.getInteger( + com.android.internal.R.integer.config_autoBrightnessAmbientLightHorizon); + float autoBrightnessAdjustmentMaxGamma = resources.getFraction( + com.android.internal.R.fraction.config_autoBrightnessAdjustmentMaxGamma, + 1, 1); + + int lightSensorWarmUpTimeConfig = resources.getInteger( + com.android.internal.R.integer.config_lightSensorWarmupTime); + int lightSensorRate = resources.getInteger( + com.android.internal.R.integer.config_autoBrightnessLightSensorRate); + int initialLightSensorRate = resources.getInteger( + com.android.internal.R.integer.config_autoBrightnessInitialLightSensorRate); + if (initialLightSensorRate == -1) { + initialLightSensorRate = lightSensorRate; + } else if (initialLightSensorRate > lightSensorRate) { + Slog.w(TAG, "Expected config_autoBrightnessInitialLightSensorRate (" + + initialLightSensorRate + ") to be less than or equal to " + + "config_autoBrightnessLightSensorRate (" + lightSensorRate + ")."); + } + + if (backlightValues != null && backlightValues.length > 0) { + final int bottom = backlightValues[0]; if (mScreenBrightnessDarkConfig > bottom) { Slog.w(TAG, "config_screenBrightnessDark (" + mScreenBrightnessDarkConfig + ") should be less than or equal to the first value of " @@ -411,13 +424,24 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (bottom < screenBrightnessRangeMinimum) { screenBrightnessRangeMinimum = bottom; } + } + + float[] nitsRange = { screenMinimumNits, screenMaximumNits }; + int[] backlightRange = { screenBrightnessRangeMinimum, mScreenBrightnessRangeMaximum }; + + BrightnessMappingStrategy mapper = BrightnessMappingStrategy.create( + luxLevels, backlightValues, brightnessValuesNits, + nitsRange, backlightRange); + if (mapper != null) { mAutomaticBrightnessController = new AutomaticBrightnessController(this, - handler.getLooper(), sensorManager, screenAutoBrightnessSpline, - lightSensorWarmUpTimeConfig, screenBrightnessRangeMinimum, - mScreenBrightnessRangeMaximum, dozeScaleFactor, lightSensorRate, - initialLightSensorRate, brighteningLightDebounce, darkeningLightDebounce, + handler.getLooper(), sensorManager, mapper, lightSensorWarmUpTimeConfig, + screenBrightnessRangeMinimum, mScreenBrightnessRangeMaximum, + dozeScaleFactor, lightSensorRate, initialLightSensorRate, + brighteningLightDebounce, darkeningLightDebounce, autoBrightnessResetAmbientLuxAfterWarmUp, ambientLightHorizon, autoBrightnessAdjustmentMaxGamma, dynamicHysteresis); + } else { + mUseSoftwareAutoBrightnessConfig = false; } } @@ -444,6 +468,25 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } + private static float[] getLuxLevels(int[] lux) { + // The first control point is implicit and always at 0 lux. + float[] levels = new float[lux.length + 1]; + for (int i = 0; i < lux.length; i++) { + levels[i + 1] = (float) lux[i]; + } + return levels; + } + + private static float[] getFloatArray(TypedArray array) { + final int N = array.length(); + float[] vals = new float[N]; + for (int i = 0; i < N; i++) { + vals[i] = array.getFloat(i, -1.0f); + } + array.recycle(); + return vals; + } + /** * Returns true if the proximity sensor screen-off function is available. */ @@ -512,7 +555,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (!mPendingUpdatePowerStateLocked) { mPendingUpdatePowerStateLocked = true; Message msg = mHandler.obtainMessage(MSG_UPDATE_POWER_STATE); - msg.setAsynchronous(true); mHandler.sendMessage(msg); } } @@ -691,8 +733,8 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call final boolean userInitiatedChange = autoBrightnessAdjustmentChanged && mPowerRequest.brightnessSetByUser; mAutomaticBrightnessController.configure(autoBrightnessEnabled, - mPowerRequest.screenAutoBrightnessAdjustment, state != Display.STATE_ON, - userInitiatedChange); + mBrightnessConfiguration, mPowerRequest.screenAutoBrightnessAdjustment, + state != Display.STATE_ON, userInitiatedChange); } // Apply brightness boost. @@ -874,6 +916,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call sendUpdatePowerState(); } + public void setBrightnessConfiguration(BrightnessConfiguration c) { + Message msg = mHandler.obtainMessage(MSG_CONFIGURE_BRIGHTNESS, c); + msg.sendToTarget(); + } + private void blockScreenOn() { if (mPendingScreenOnUnblocker == null) { Trace.asyncTraceBegin(Trace.TRACE_TAG_POWER, SCREEN_ON_BLOCKED_TRACE_NAME, 0); @@ -1241,7 +1288,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // Need to wait a little longer. // Debounce again later. We continue holding a wake lock while waiting. Message msg = mHandler.obtainMessage(MSG_PROXIMITY_SENSOR_DEBOUNCED); - msg.setAsynchronous(true); mHandler.sendMessageAtTime(msg, mPendingProximityDebounceTime); } } @@ -1402,39 +1448,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } } - private static Spline createAutoBrightnessSpline(int[] lux, int[] brightness) { - if (lux == null || lux.length == 0 || brightness == null || brightness.length == 0) { - Slog.e(TAG, "Could not create auto-brightness spline."); - return null; - } - try { - final int n = brightness.length; - float[] x = new float[n]; - float[] y = new float[n]; - y[0] = normalizeAbsoluteBrightness(brightness[0]); - for (int i = 1; i < n; i++) { - x[i] = lux[i - 1]; - y[i] = normalizeAbsoluteBrightness(brightness[i]); - } - - Spline spline = Spline.createSpline(x, y); - if (DEBUG) { - Slog.d(TAG, "Auto-brightness spline: " + spline); - for (float v = 1f; v < lux[lux.length - 1] * 1.25f; v *= 1.25f) { - Slog.d(TAG, String.format(" %7.1f: %7.1f", v, spline.interpolate(v))); - } - } - return spline; - } catch (IllegalArgumentException ex) { - Slog.e(TAG, "Could not create auto-brightness spline.", ex); - return null; - } - } - - private static float normalizeAbsoluteBrightness(int value) { - return (float)clampAbsoluteBrightness(value) / PowerManager.BRIGHTNESS_ON; - } - private static int clampAbsoluteBrightness(int value) { return MathUtils.constrain(value, PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON); } @@ -1467,6 +1480,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call updatePowerState(); } break; + case MSG_CONFIGURE_BRIGHTNESS: + BrightnessConfiguration c = (BrightnessConfiguration) msg.obj; + mBrightnessConfiguration = c != null ? c : mDefaultBrightnessConfiguration; + updatePowerState(); + break; } } } @@ -1492,17 +1510,14 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call @Override public void onScreenOn() { Message msg = mHandler.obtainMessage(MSG_SCREEN_ON_UNBLOCKED, this); - msg.setAsynchronous(true); mHandler.sendMessage(msg); } } private final class ScreenOffUnblocker implements WindowManagerPolicy.ScreenOffListener { - @Override public void onScreenOff() { Message msg = mHandler.obtainMessage(MSG_SCREEN_OFF_UNBLOCKED, this); - msg.setAsynchronous(true); mHandler.sendMessage(msg); } } diff --git a/services/core/java/com/android/server/display/DisplayTransformManager.java b/services/core/java/com/android/server/display/DisplayTransformManager.java index 338e3311fe3b..000fcf3e992b 100644 --- a/services/core/java/com/android/server/display/DisplayTransformManager.java +++ b/services/core/java/com/android/server/display/DisplayTransformManager.java @@ -222,7 +222,7 @@ public class DisplayTransformManager { return SystemProperties.getBoolean(PERSISTENT_PROPERTY_NATIVE_MODE, false); } - public boolean setColorMode(int colorMode) { + public boolean setColorMode(int colorMode, float[] nightDisplayMatrix) { if (colorMode == ColorDisplayController.COLOR_MODE_NATURAL) { applySaturation(COLOR_SATURATION_NATURAL); setNativeMode(false); @@ -233,6 +233,7 @@ public class DisplayTransformManager { applySaturation(COLOR_SATURATION_NATURAL); setNativeMode(true); } + setColorMatrix(LEVEL_COLOR_MATRIX_NIGHT_DISPLAY, nightDisplayMatrix); updateConfiguration(); diff --git a/services/core/java/com/android/server/display/PersistentDataStore.java b/services/core/java/com/android/server/display/PersistentDataStore.java index 34c8e22a9f1e..49b4465efac7 100644 --- a/services/core/java/com/android/server/display/PersistentDataStore.java +++ b/services/core/java/com/android/server/display/PersistentDataStore.java @@ -24,12 +24,17 @@ import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import android.graphics.Point; +import android.hardware.display.BrightnessConfiguration; import android.hardware.display.WifiDisplay; import android.util.AtomicFile; import android.util.Slog; +import android.util.SparseArray; +import android.util.Pair; import android.util.Xml; import android.view.Display; +import com.android.internal.annotations.VisibleForTesting; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -37,10 +42,12 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import libcore.io.IoUtils; @@ -57,14 +64,22 @@ import libcore.util.Objects; * <wifi-display deviceAddress="00:00:00:00:00:00" deviceName="XXXX" deviceAlias="YYYY" /> * <remembered-wifi-displays> * <display-states> - * <display> + * <display unique-id="XXXXXXX"> * <color-mode>0</color-mode> * </display> * </display-states> * <stable-device-values> - * <stable-display-height>1920<stable-display-height> - * <stable-display-width>1080<stable-display-width> + * <stable-display-height>1920</stable-display-height> + * <stable-display-width>1080</stable-display-width> * </stable-device-values> + * <brightness-configurations> + * <brightness-configuration user-id="0"> + * <brightness-curve> + * <brightness-point lux="0" nits="13.25"/> + * <brightness-point lux="20" nits="35.94"/> + * </brightness-curve> + * </brightness-configuration> + * </brightness-configurations> * </display-manager-state> * </code> * @@ -73,6 +88,31 @@ import libcore.util.Objects; final class PersistentDataStore { static final String TAG = "DisplayManager"; + private static final String TAG_DISPLAY_MANAGER_STATE = "display-manager-state"; + + private static final String TAG_REMEMBERED_WIFI_DISPLAYS = "remembered-wifi-displays"; + private static final String TAG_WIFI_DISPLAY = "wifi-display"; + private static final String ATTR_DEVICE_ADDRESS = "deviceAddress"; + private static final String ATTR_DEVICE_NAME = "deviceName"; + private static final String ATTR_DEVICE_ALIAS = "deviceAlias"; + + private static final String TAG_DISPLAY_STATES = "display-states"; + private static final String TAG_DISPLAY = "display"; + private static final String TAG_COLOR_MODE = "color-mode"; + private static final String ATTR_UNIQUE_ID = "unique-id"; + + private static final String TAG_STABLE_DEVICE_VALUES = "stable-device-values"; + private static final String TAG_STABLE_DISPLAY_HEIGHT = "stable-display-height"; + private static final String TAG_STABLE_DISPLAY_WIDTH = "stable-display-width"; + + private static final String TAG_BRIGHTNESS_CONFIGURATIONS = "brightness-configurations"; + private static final String TAG_BRIGHTNESS_CONFIGURATION = "brightness-configuration"; + private static final String TAG_BRIGHTNESS_CURVE = "brightness-curve"; + private static final String TAG_BRIGHTNESS_POINT = "brightness-point"; + private static final String ATTR_USER_SERIAL = "user-serial"; + private static final String ATTR_LUX = "lux"; + private static final String ATTR_NITS = "nits"; + // Remembered Wifi display devices. private ArrayList<WifiDisplay> mRememberedWifiDisplays = new ArrayList<WifiDisplay>(); @@ -83,8 +123,8 @@ final class PersistentDataStore { // Display values which should be stable across the device's lifetime. private final StableDeviceValues mStableDeviceValues = new StableDeviceValues(); - // The atomic file used to safely read or write the file. - private final AtomicFile mAtomicFile; + // Brightness configuration by user + private BrightnessConfigurations mBrightnessConfigurations = new BrightnessConfigurations(); // True if the data has been loaded. private boolean mLoaded; @@ -92,8 +132,16 @@ final class PersistentDataStore { // True if there are changes to be saved. private boolean mDirty; + // The interface for methods which should be replaced by the test harness. + private Injector mInjector; + public PersistentDataStore() { - mAtomicFile = new AtomicFile(new File("/data/system/display-manager-state.xml")); + this(new Injector()); + } + + @VisibleForTesting + PersistentDataStore(Injector injector) { + mInjector = injector; } public void saveIfNeeded() { @@ -225,6 +273,18 @@ final class PersistentDataStore { } } + public void setBrightnessConfigurationForUser(BrightnessConfiguration c, int userSerial) { + loadIfNeeded(); + if (mBrightnessConfigurations.setBrightnessConfigurationForUser(c, userSerial)) { + setDirty(); + } + } + + public BrightnessConfiguration getBrightnessConfiguration(int userSerial) { + loadIfNeeded(); + return mBrightnessConfigurations.getBrightnessConfiguration(userSerial); + } + private DisplayState getDisplayState(String uniqueId, boolean createIfAbsent) { loadIfNeeded(); DisplayState state = mDisplayStates.get(uniqueId); @@ -256,7 +316,7 @@ final class PersistentDataStore { final InputStream is; try { - is = mAtomicFile.openRead(); + is = mInjector.openRead(); } catch (FileNotFoundException ex) { return; } @@ -278,9 +338,9 @@ final class PersistentDataStore { } private void save() { - final FileOutputStream os; + final OutputStream os; try { - os = mAtomicFile.startWrite(); + os = mInjector.startWrite(); boolean success = false; try { XmlSerializer serializer = new FastXmlSerializer(); @@ -289,11 +349,7 @@ final class PersistentDataStore { serializer.flush(); success = true; } finally { - if (success) { - mAtomicFile.finishWrite(os); - } else { - mAtomicFile.failWrite(os); - } + mInjector.finishWrite(os, success); } } catch (IOException ex) { Slog.w(TAG, "Failed to save display manager persistent store data.", ex); @@ -302,18 +358,21 @@ final class PersistentDataStore { private void loadFromXml(XmlPullParser parser) throws IOException, XmlPullParserException { - XmlUtils.beginDocument(parser, "display-manager-state"); + XmlUtils.beginDocument(parser, TAG_DISPLAY_MANAGER_STATE); final int outerDepth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, outerDepth)) { - if (parser.getName().equals("remembered-wifi-displays")) { + if (parser.getName().equals(TAG_REMEMBERED_WIFI_DISPLAYS)) { loadRememberedWifiDisplaysFromXml(parser); } - if (parser.getName().equals("display-states")) { + if (parser.getName().equals(TAG_DISPLAY_STATES)) { loadDisplaysFromXml(parser); } - if (parser.getName().equals("stable-device-values")) { + if (parser.getName().equals(TAG_STABLE_DEVICE_VALUES)) { mStableDeviceValues.loadFromXml(parser); } + if (parser.getName().equals(TAG_BRIGHTNESS_CONFIGURATIONS)) { + mBrightnessConfigurations.loadFromXml(parser); + } } } @@ -321,10 +380,10 @@ final class PersistentDataStore { throws IOException, XmlPullParserException { final int outerDepth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, outerDepth)) { - if (parser.getName().equals("wifi-display")) { - String deviceAddress = parser.getAttributeValue(null, "deviceAddress"); - String deviceName = parser.getAttributeValue(null, "deviceName"); - String deviceAlias = parser.getAttributeValue(null, "deviceAlias"); + if (parser.getName().equals(TAG_WIFI_DISPLAY)) { + String deviceAddress = parser.getAttributeValue(null, ATTR_DEVICE_ADDRESS); + String deviceName = parser.getAttributeValue(null, ATTR_DEVICE_NAME); + String deviceAlias = parser.getAttributeValue(null, ATTR_DEVICE_ALIAS); if (deviceAddress == null || deviceName == null) { throw new XmlPullParserException( "Missing deviceAddress or deviceName attribute on wifi-display."); @@ -345,8 +404,8 @@ final class PersistentDataStore { throws IOException, XmlPullParserException { final int outerDepth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, outerDepth)) { - if (parser.getName().equals("display")) { - String uniqueId = parser.getAttributeValue(null, "unique-id"); + if (parser.getName().equals(TAG_DISPLAY)) { + String uniqueId = parser.getAttributeValue(null, ATTR_UNIQUE_ID); if (uniqueId == null) { throw new XmlPullParserException( "Missing unique-id attribute on display."); @@ -365,32 +424,35 @@ final class PersistentDataStore { private void saveToXml(XmlSerializer serializer) throws IOException { serializer.startDocument(null, true); serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); - serializer.startTag(null, "display-manager-state"); - serializer.startTag(null, "remembered-wifi-displays"); + serializer.startTag(null, TAG_DISPLAY_MANAGER_STATE); + serializer.startTag(null, TAG_REMEMBERED_WIFI_DISPLAYS); for (WifiDisplay display : mRememberedWifiDisplays) { - serializer.startTag(null, "wifi-display"); - serializer.attribute(null, "deviceAddress", display.getDeviceAddress()); - serializer.attribute(null, "deviceName", display.getDeviceName()); + serializer.startTag(null, TAG_WIFI_DISPLAY); + serializer.attribute(null, ATTR_DEVICE_ADDRESS, display.getDeviceAddress()); + serializer.attribute(null, ATTR_DEVICE_NAME, display.getDeviceName()); if (display.getDeviceAlias() != null) { - serializer.attribute(null, "deviceAlias", display.getDeviceAlias()); + serializer.attribute(null, ATTR_DEVICE_ALIAS, display.getDeviceAlias()); } - serializer.endTag(null, "wifi-display"); + serializer.endTag(null, TAG_WIFI_DISPLAY); } - serializer.endTag(null, "remembered-wifi-displays"); - serializer.startTag(null, "display-states"); + serializer.endTag(null, TAG_REMEMBERED_WIFI_DISPLAYS); + serializer.startTag(null, TAG_DISPLAY_STATES); for (Map.Entry<String, DisplayState> entry : mDisplayStates.entrySet()) { final String uniqueId = entry.getKey(); final DisplayState state = entry.getValue(); - serializer.startTag(null, "display"); - serializer.attribute(null, "unique-id", uniqueId); + serializer.startTag(null, TAG_DISPLAY); + serializer.attribute(null, ATTR_UNIQUE_ID, uniqueId); state.saveToXml(serializer); - serializer.endTag(null, "display"); + serializer.endTag(null, TAG_DISPLAY); } - serializer.endTag(null, "display-states"); - serializer.startTag(null, "stable-device-values"); + serializer.endTag(null, TAG_DISPLAY_STATES); + serializer.startTag(null, TAG_STABLE_DEVICE_VALUES); mStableDeviceValues.saveToXml(serializer); - serializer.endTag(null, "stable-device-values"); - serializer.endTag(null, "display-manager-state"); + serializer.endTag(null, TAG_STABLE_DEVICE_VALUES); + serializer.startTag(null, TAG_BRIGHTNESS_CONFIGURATIONS); + mBrightnessConfigurations.saveToXml(serializer); + serializer.endTag(null, TAG_BRIGHTNESS_CONFIGURATIONS); + serializer.endTag(null, TAG_DISPLAY_MANAGER_STATE); serializer.endDocument(); } @@ -411,6 +473,8 @@ final class PersistentDataStore { } pw.println(" StableDeviceValues:"); mStableDeviceValues.dump(pw, " "); + pw.println(" BrightnessConfigurations:"); + mBrightnessConfigurations.dump(pw, " "); } private static final class DisplayState { @@ -433,7 +497,7 @@ final class PersistentDataStore { final int outerDepth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, outerDepth)) { - if (parser.getName().equals("color-mode")) { + if (parser.getName().equals(TAG_COLOR_MODE)) { String value = parser.nextText(); mColorMode = Integer.parseInt(value); } @@ -441,9 +505,9 @@ final class PersistentDataStore { } public void saveToXml(XmlSerializer serializer) throws IOException { - serializer.startTag(null, "color-mode"); + serializer.startTag(null, TAG_COLOR_MODE); serializer.text(Integer.toString(mColorMode)); - serializer.endTag(null, "color-mode"); + serializer.endTag(null, TAG_COLOR_MODE); } public void dump(final PrintWriter pw, final String prefix) { @@ -472,10 +536,10 @@ final class PersistentDataStore { final int outerDepth = parser.getDepth(); while (XmlUtils.nextElementWithin(parser, outerDepth)) { switch (parser.getName()) { - case "stable-display-width": + case TAG_STABLE_DISPLAY_WIDTH: mWidth = loadIntValue(parser); break; - case "stable-display-height": + case TAG_STABLE_DISPLAY_HEIGHT: mHeight = loadIntValue(parser); break; } @@ -494,12 +558,12 @@ final class PersistentDataStore { public void saveToXml(XmlSerializer serializer) throws IOException { if (mWidth > 0 && mHeight > 0) { - serializer.startTag(null, "stable-display-width"); + serializer.startTag(null, TAG_STABLE_DISPLAY_WIDTH); serializer.text(Integer.toString(mWidth)); - serializer.endTag(null, "stable-display-width"); - serializer.startTag(null, "stable-display-height"); + serializer.endTag(null, TAG_STABLE_DISPLAY_WIDTH); + serializer.startTag(null, TAG_STABLE_DISPLAY_HEIGHT); serializer.text(Integer.toString(mHeight)); - serializer.endTag(null, "stable-display-height"); + serializer.endTag(null, TAG_STABLE_DISPLAY_HEIGHT); } } @@ -508,4 +572,158 @@ final class PersistentDataStore { pw.println(prefix + "StableDisplayHeight=" + mHeight); } } + + private static final class BrightnessConfigurations { + // Maps from a user ID to the users' given brightness configuration + private SparseArray<BrightnessConfiguration> mConfigurations; + + public BrightnessConfigurations() { + mConfigurations = new SparseArray<>(); + } + + private boolean setBrightnessConfigurationForUser(BrightnessConfiguration c, + int userSerial) { + BrightnessConfiguration currentConfig = mConfigurations.get(userSerial); + if (currentConfig == null || !currentConfig.equals(c)) { + mConfigurations.put(userSerial, c); + return true; + } + return false; + } + + public BrightnessConfiguration getBrightnessConfiguration(int userSerial) { + return mConfigurations.get(userSerial); + } + + public void loadFromXml(XmlPullParser parser) throws IOException, XmlPullParserException { + final int outerDepth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + if (TAG_BRIGHTNESS_CONFIGURATION.equals(parser.getName())) { + int userSerial; + try { + userSerial = Integer.parseInt( + parser.getAttributeValue(null, ATTR_USER_SERIAL)); + } catch (NumberFormatException nfe) { + userSerial= -1; + Slog.e(TAG, "Failed to read in brightness configuration", nfe); + } + + try { + BrightnessConfiguration config = loadConfigurationFromXml(parser); + if (userSerial>= 0 && config != null) { + mConfigurations.put(userSerial, config); + } + } catch (IllegalArgumentException iae) { + Slog.e(TAG, "Failed to load brightness configuration!", iae); + } + } + } + } + + private static BrightnessConfiguration loadConfigurationFromXml(XmlPullParser parser) + throws IOException, XmlPullParserException { + final int outerDepth = parser.getDepth(); + final BrightnessConfiguration.Builder builder = new BrightnessConfiguration.Builder(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + if (TAG_BRIGHTNESS_CURVE.equals(parser.getName())) { + Pair<float[], float[]> curve = loadCurveFromXml(parser, builder); + builder.setCurve(curve.first /*lux*/, curve.second /*nits*/); + } + } + return builder.build(); + } + + private static Pair<float[], float[]> loadCurveFromXml(XmlPullParser parser, + BrightnessConfiguration.Builder builder) + throws IOException, XmlPullParserException { + final int outerDepth = parser.getDepth(); + List<Float> luxLevels = new ArrayList<>(); + List<Float> nitLevels = new ArrayList<>(); + while (XmlUtils.nextElementWithin(parser, outerDepth)) { + if (TAG_BRIGHTNESS_POINT.equals(parser.getName())) { + luxLevels.add(loadFloat(parser.getAttributeValue(null, ATTR_LUX))); + nitLevels.add(loadFloat(parser.getAttributeValue(null, ATTR_NITS))); + } + } + final int N = luxLevels.size(); + float[] lux = new float[N]; + float[] nits = new float[N]; + for (int i = 0; i < N; i++) { + lux[i] = luxLevels.get(i); + nits[i] = nitLevels.get(i); + } + return Pair.create(lux, nits); + } + + private static float loadFloat(String val) { + try { + return Float.parseFloat(val); + } catch (NullPointerException | NumberFormatException e) { + Slog.e(TAG, "Failed to parse float loading brightness config", e); + return Float.NEGATIVE_INFINITY; + } + } + + public void saveToXml(XmlSerializer serializer) throws IOException { + for (int i = 0; i < mConfigurations.size(); i++) { + final int userSerial= mConfigurations.keyAt(i); + final BrightnessConfiguration config = mConfigurations.valueAt(i); + + serializer.startTag(null, TAG_BRIGHTNESS_CONFIGURATION); + serializer.attribute(null, ATTR_USER_SERIAL, Integer.toString(userSerial)); + saveConfigurationToXml(serializer, config); + serializer.endTag(null, TAG_BRIGHTNESS_CONFIGURATION); + } + } + + private static void saveConfigurationToXml(XmlSerializer serializer, + BrightnessConfiguration config) throws IOException { + serializer.startTag(null, TAG_BRIGHTNESS_CURVE); + final Pair<float[], float[]> curve = config.getCurve(); + for (int i = 0; i < curve.first.length; i++) { + serializer.startTag(null, TAG_BRIGHTNESS_POINT); + serializer.attribute(null, ATTR_LUX, Float.toString(curve.first[i])); + serializer.attribute(null, ATTR_NITS, Float.toString(curve.second[i])); + serializer.endTag(null, TAG_BRIGHTNESS_POINT); + } + serializer.endTag(null, TAG_BRIGHTNESS_CURVE); + } + + public void dump(final PrintWriter pw, final String prefix) { + for (int i = 0; i < mConfigurations.size(); i++) { + final int userSerial= mConfigurations.keyAt(i); + pw.println(prefix + "User " + userSerial + ":"); + pw.println(prefix + " " + mConfigurations.valueAt(i)); + } + } + } + + @VisibleForTesting + static class Injector { + private final AtomicFile mAtomicFile; + + public Injector() { + mAtomicFile = new AtomicFile(new File("/data/system/display-manager-state.xml")); + } + + public InputStream openRead() throws FileNotFoundException { + return mAtomicFile.openRead(); + } + + public OutputStream startWrite() throws IOException { + return mAtomicFile.startWrite(); + } + + public void finishWrite(OutputStream os, boolean success) { + if (!(os instanceof FileOutputStream)) { + throw new IllegalArgumentException("Unexpected OutputStream as argument: " + os); + } + FileOutputStream fos = (FileOutputStream) os; + if (success) { + mAtomicFile.finishWrite(fos); + } else { + mAtomicFile.failWrite(fos); + } + } + } } diff --git a/services/core/java/com/android/server/dreams/OWNERS b/services/core/java/com/android/server/dreams/OWNERS new file mode 100644 index 000000000000..3c9bbf8797ea --- /dev/null +++ b/services/core/java/com/android/server/dreams/OWNERS @@ -0,0 +1,3 @@ +dsandler@google.com +michaelwr@google.com +roosa@google.com diff --git a/services/core/java/com/android/server/location/ContextHubService.java b/services/core/java/com/android/server/location/ContextHubService.java index cd4bb14ee91f..90c912a5aee4 100644 --- a/services/core/java/com/android/server/location/ContextHubService.java +++ b/services/core/java/com/android/server/location/ContextHubService.java @@ -55,7 +55,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import java.util.concurrent.ConcurrentHashMap; /** * @hide @@ -76,25 +75,10 @@ public class ContextHubService extends IContextHubService.Stub { public static final int MSG_QUERY_MEMORY = 6; public static final int MSG_HUB_RESET = 7; - private static final String PRE_LOADED_GENERIC_UNKNOWN = "Preloaded app, unknown"; - private static final String PRE_LOADED_APP_NAME = PRE_LOADED_GENERIC_UNKNOWN; - private static final String PRE_LOADED_APP_PUBLISHER = PRE_LOADED_GENERIC_UNKNOWN; - private static final int PRE_LOADED_APP_MEM_REQ = 0; - private static final int OS_APP_INSTANCE = -1; private final Context mContext; - // TODO(b/69270990): Remove once old ContextHubManager API is deprecated - // Service cache maintaining of instance ID to nanoapp infos - private final ConcurrentHashMap<Integer, NanoAppInstanceInfo> mNanoAppHash = - new ConcurrentHashMap<>(); - // The next available instance ID (managed by the service) to assign to a nanoapp - private int mNextAvailableInstanceId = 0; - // A map of the long nanoapp ID to instance ID managed by the service - private final ConcurrentHashMap<Long, Integer> mNanoAppIdToInstanceMap = - new ConcurrentHashMap<>(); - private final ContextHubInfo[] mContextHubInfo; private final RemoteCallbackList<IContextHubCallback> mCallbacksList = new RemoteCallbackList<>(); @@ -111,6 +95,9 @@ public class ContextHubService extends IContextHubService.Stub { // The default client for old API clients private final Map<Integer, IContextHubClient> mDefaultClientMap; + // The manager for the internal nanoapp state cache + private final NanoAppStateManager mNanoAppStateManager = new NanoAppStateManager(); + /** * Class extending the callback to register with a Context Hub. */ @@ -160,7 +147,8 @@ public class ContextHubService extends IContextHubService.Stub { } mClientManager = new ContextHubClientManager(mContext, mContextHubProxy); - mTransactionManager = new ContextHubTransactionManager(mContextHubProxy, mClientManager); + mTransactionManager = new ContextHubTransactionManager( + mContextHubProxy, mClientManager, mNanoAppStateManager); List<ContextHub> hubList; try { @@ -214,12 +202,11 @@ public class ContextHubService extends IContextHubService.Stub { return new IContextHubClientCallback.Stub() { @Override public void onMessageFromNanoApp(NanoAppMessage message) { - int nanoAppInstanceId = - mNanoAppIdToInstanceMap.containsKey(message.getNanoAppId()) ? - mNanoAppIdToInstanceMap.get(message.getNanoAppId()) : -1; + int nanoAppHandle = mNanoAppStateManager.getNanoAppHandle( + contextHubId, message.getNanoAppId()); onMessageReceiptOldApi( - message.getMessageType(), contextHubId, nanoAppInstanceId, + message.getMessageType(), contextHubId, nanoAppHandle, message.getMessageBody()); } @@ -328,15 +315,13 @@ public class ContextHubService extends IContextHubService.Stub { * Creates an internal unload transaction callback to be used for old API clients * * @param contextHubId the ID of the hub to unload the nanoapp - * @param nanoAppId the ID of the nanoapp to unload * @return the callback interface */ - private IContextHubTransactionCallback createUnloadTransactionCallback( - int contextHubId, long nanoAppId) { + private IContextHubTransactionCallback createUnloadTransactionCallback(int contextHubId) { return new IContextHubTransactionCallback.Stub() { @Override public void onTransactionComplete(int result) { - handleUnloadResponseOldApi(contextHubId, result, nanoAppId); + handleUnloadResponseOldApi(contextHubId, result); } @Override @@ -365,24 +350,6 @@ public class ContextHubService extends IContextHubService.Stub { }; } - /** - * Adds a new transaction to the transaction manager queue - * - * @param transaction the transaction to add - * @return the result of adding the transaction - */ - private int addTransaction(ContextHubServiceTransaction transaction) { - int result = Result.OK; - try { - mTransactionManager.addTransaction(transaction); - } catch (IllegalStateException e) { - Log.e(TAG, e.getMessage()); - result = Result.TRANSACTION_PENDING; /* failed */ - } - - return result; - } - @Override public int loadNanoApp(int contextHubId, NanoApp app) throws RemoteException { checkPermissions(); @@ -407,70 +374,50 @@ public class ContextHubService extends IContextHubService.Stub { ContextHubServiceTransaction transaction = mTransactionManager.createLoadTransaction( contextHubId, nanoAppBinary, onCompleteCallback); - int result = addTransaction(transaction); - if (result != Result.OK) { - Log.e(TAG, "Failed to load nanoapp with error code " + result); - return -1; - } - - // Do not add an entry to mNanoAppInstance Hash yet. The HAL may reject the app + mTransactionManager.addTransaction(transaction); return 0; } @Override - public int unloadNanoApp(int nanoAppInstanceHandle) throws RemoteException { + public int unloadNanoApp(int nanoAppHandle) throws RemoteException { checkPermissions(); if (mContextHubProxy == null) { return -1; } - NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppInstanceHandle); + NanoAppInstanceInfo info = + mNanoAppStateManager.getNanoAppInstanceInfo(nanoAppHandle); if (info == null) { - Log.e(TAG, "Cannot find app with handle " + nanoAppInstanceHandle); - return -1; //means failed + Log.e(TAG, "Cannot find nanoapp with handle " + nanoAppHandle); + return -1; } int contextHubId = info.getContexthubId(); long nanoAppId = info.getAppId(); IContextHubTransactionCallback onCompleteCallback = - createUnloadTransactionCallback(contextHubId, nanoAppId); + createUnloadTransactionCallback(contextHubId); ContextHubServiceTransaction transaction = mTransactionManager.createUnloadTransaction( contextHubId, nanoAppId, onCompleteCallback); - int result = addTransaction(transaction); - if (result != Result.OK) { - Log.e(TAG, "Failed to unload nanoapp with error code " + result); - return -1; - } - - // Do not add an entry to mNanoAppInstance Hash yet. The HAL may reject the app + mTransactionManager.addTransaction(transaction); return 0; } @Override - public NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppInstanceHandle) - throws RemoteException { + public NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppHandle) throws RemoteException { checkPermissions(); - // This assumes that all the nanoAppInfo is current. This is reasonable - // for the use cases for tightly controlled nanoApps. - if (mNanoAppHash.containsKey(nanoAppInstanceHandle)) { - return mNanoAppHash.get(nanoAppInstanceHandle); - } else { - Log.e(TAG, "Could not find nanoApp with handle " + nanoAppInstanceHandle); - return null; - } + + return mNanoAppStateManager.getNanoAppInstanceInfo(nanoAppHandle); } @Override public int[] findNanoAppOnHub(int hubHandle, NanoAppFilter filter) throws RemoteException { checkPermissions(); - ArrayList<Integer> foundInstances = new ArrayList<Integer>(); - - for (Integer nanoAppInstance : mNanoAppHash.keySet()) { - NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppInstance); + ArrayList<Integer> foundInstances = new ArrayList<>(); + for (NanoAppInstanceInfo info : mNanoAppStateManager.getNanoAppInstanceInfoCollection()) { if (filter.testMatch(info)) { - foundInstances.add(nanoAppInstance); + foundInstances.add(info.getHandle()); } } @@ -495,6 +442,8 @@ public class ContextHubService extends IContextHubService.Stub { * * @param contextHubId the ID of the hub to do the query * @return the result of the query + * + * @throws IllegalStateException if the transaction queue is full */ private int queryNanoAppsInternal(int contextHubId) { if (mContextHubProxy == null) { @@ -506,7 +455,8 @@ public class ContextHubService extends IContextHubService.Stub { ContextHubServiceTransaction transaction = mTransactionManager.createQueryTransaction( contextHubId, onCompleteCallback); - return addTransaction(transaction); + mTransactionManager.addTransaction(transaction); + return Result.OK; } @Override @@ -546,7 +496,7 @@ public class ContextHubService extends IContextHubService.Stub { success = (client.sendMessageToNanoApp(message) == ContextHubTransaction.TRANSACTION_SUCCESS); } else { - Log.e(TAG, "Failed to send nanoapp message - nanoapp with instance ID " + Log.e(TAG, "Failed to send nanoapp message - nanoapp with handle " + nanoAppHandle + " does not exist."); } } @@ -576,26 +526,11 @@ public class ContextHubService extends IContextHubService.Stub { return; } - // NOTE: The legacy JNI code used to do a query right after a load success - // to synchronize the service cache. Instead store the binary that was requested to - // load to update the cache later without doing a query. - int instanceId = 0; - long nanoAppId = nanoAppBinary.getNanoAppId(); - int nanoAppVersion = nanoAppBinary.getNanoAppVersion(); - if (result == TransactionResult.SUCCESS) { - if (mNanoAppIdToInstanceMap.containsKey(nanoAppId)) { - instanceId = mNanoAppIdToInstanceMap.get(nanoAppId); - } else { - instanceId = mNextAvailableInstanceId++; - mNanoAppIdToInstanceMap.put(nanoAppId, instanceId); - } - - addAppInstance(contextHubId, instanceId, nanoAppId, nanoAppVersion); - } - byte[] data = new byte[5]; data[0] = (byte) result; - ByteBuffer.wrap(data, 1, 4).order(ByteOrder.nativeOrder()).putInt(instanceId); + int nanoAppHandle = mNanoAppStateManager.getNanoAppHandle( + contextHubId, nanoAppBinary.getNanoAppId()); + ByteBuffer.wrap(data, 1, 4).order(ByteOrder.nativeOrder()).putInt(nanoAppHandle); onMessageReceiptOldApi(MSG_LOAD_NANO_APP, contextHubId, OS_APP_INSTANCE, data); } @@ -605,14 +540,7 @@ public class ContextHubService extends IContextHubService.Stub { * * TODO(b/69270990): Remove this once the old APIs are obsolete. */ - private void handleUnloadResponseOldApi( - int contextHubId, int result, long nanoAppId) { - if (result == TransactionResult.SUCCESS) { - int instanceId = mNanoAppIdToInstanceMap.get(nanoAppId); - deleteAppInstance(instanceId); - mNanoAppIdToInstanceMap.remove(nanoAppId); - } - + private void handleUnloadResponseOldApi(int contextHubId, int result) { byte[] data = new byte[1]; data[0] = (byte) result; onMessageReceiptOldApi(MSG_UNLOAD_NANO_APP, contextHubId, OS_APP_INSTANCE, data); @@ -668,42 +596,11 @@ public class ContextHubService extends IContextHubService.Stub { List<NanoAppState> nanoAppStateList = ContextHubServiceUtil.createNanoAppStateList(nanoAppInfoList); - updateServiceCache(contextHubId, nanoAppInfoList); + mNanoAppStateManager.updateCache(contextHubId, nanoAppInfoList); mTransactionManager.onQueryResponse(nanoAppStateList); } /** - * Updates the service's cache of the list of loaded nanoapps using a nanoapp list response. - * - * TODO(b/69270990): Remove this when the old API functionality is removed. - * - * @param contextHubId the ID of the hub the response came from - * @param nanoAppInfoList the list of loaded nanoapps - */ - private void updateServiceCache(int contextHubId, List<HubAppInfo> nanoAppInfoList) { - synchronized (mNanoAppHash) { - for (int instanceId : mNanoAppHash.keySet()) { - if (mNanoAppHash.get(instanceId).getContexthubId() == contextHubId) { - deleteAppInstance(instanceId); - } - } - - for (HubAppInfo appInfo : nanoAppInfoList) { - int instanceId; - long nanoAppId = appInfo.appId; - if (mNanoAppIdToInstanceMap.containsKey(nanoAppId)) { - instanceId = mNanoAppIdToInstanceMap.get(nanoAppId); - } else { - instanceId = mNextAvailableInstanceId++; - mNanoAppIdToInstanceMap.put(nanoAppId, instanceId); - } - - addAppInstance(contextHubId, instanceId, nanoAppId, appInfo.version); - } - } - } - - /** * @param contextHubId the hub ID to validate * @return {@code true} if the ID represents that of an available hub, {@code false} otherwise */ @@ -750,6 +647,7 @@ public class ContextHubService extends IContextHubService.Stub { * @param nanoAppBinary the binary to load * * @throws RemoteException + * @throws IllegalStateException if the transaction queue is full */ @Override public void loadNanoAppOnHub( @@ -769,7 +667,7 @@ public class ContextHubService extends IContextHubService.Stub { ContextHubServiceTransaction transaction = mTransactionManager.createLoadTransaction( contextHubId, nanoAppBinary, transactionCallback); - addTransaction(transaction); + mTransactionManager.addTransaction(transaction); } /** @@ -780,6 +678,7 @@ public class ContextHubService extends IContextHubService.Stub { * @param nanoAppId the ID of the nanoapp to unload * * @throws RemoteException + * @throws IllegalStateException if the transaction queue is full */ @Override public void unloadNanoAppFromHub( @@ -793,7 +692,7 @@ public class ContextHubService extends IContextHubService.Stub { ContextHubServiceTransaction transaction = mTransactionManager.createUnloadTransaction( contextHubId, nanoAppId, transactionCallback); - addTransaction(transaction); + mTransactionManager.addTransaction(transaction); } /** @@ -803,6 +702,7 @@ public class ContextHubService extends IContextHubService.Stub { * @param transactionCallback the client-facing transaction callback interface * * @throws RemoteException + * @throws IllegalStateException if the transaction queue is full */ @Override public void queryNanoApps(int contextHubId, IContextHubTransactionCallback transactionCallback) @@ -815,7 +715,7 @@ public class ContextHubService extends IContextHubService.Stub { ContextHubServiceTransaction transaction = mTransactionManager.createQueryTransaction(contextHubId, transactionCallback); - addTransaction(transaction); + mTransactionManager.addTransaction(transaction); } @Override @@ -833,8 +733,8 @@ public class ContextHubService extends IContextHubService.Stub { pw.println(""); pw.println("=================== NANOAPPS ===================="); // Dump nanoAppHash - for (Integer nanoAppInstance : mNanoAppHash.keySet()) { - pw.println(nanoAppInstance + " : " + mNanoAppHash.get(nanoAppInstance).toString()); + for (NanoAppInstanceInfo info : mNanoAppStateManager.getNanoAppInstanceInfoCollection()) { + pw.println(info); } // dump eventLog @@ -908,40 +808,4 @@ public class ContextHubService extends IContextHubService.Stub { return true; } - - private int addAppInstance(int hubHandle, int appInstanceHandle, long appId, int appVersion) { - // App Id encodes vendor & version - NanoAppInstanceInfo appInfo = new NanoAppInstanceInfo(); - - appInfo.setAppId(appId); - appInfo.setAppVersion(appVersion); - appInfo.setName(PRE_LOADED_APP_NAME); - appInfo.setContexthubId(hubHandle); - appInfo.setHandle(appInstanceHandle); - appInfo.setPublisher(PRE_LOADED_APP_PUBLISHER); - appInfo.setNeededExecMemBytes(PRE_LOADED_APP_MEM_REQ); - appInfo.setNeededReadMemBytes(PRE_LOADED_APP_MEM_REQ); - appInfo.setNeededWriteMemBytes(PRE_LOADED_APP_MEM_REQ); - - String action; - if (mNanoAppHash.containsKey(appInstanceHandle)) { - action = "Updated"; - } else { - action = "Added"; - } - - mNanoAppHash.put(appInstanceHandle, appInfo); - Log.d(TAG, action + " app instance " + appInstanceHandle + " with id 0x" - + Long.toHexString(appId) + " version 0x" + Integer.toHexString(appVersion)); - - return 0; - } - - private int deleteAppInstance(int appInstanceHandle) { - if (mNanoAppHash.remove(appInstanceHandle) == null) { - return -1; - } - - return 0; - } } diff --git a/services/core/java/com/android/server/location/ContextHubServiceTransaction.java b/services/core/java/com/android/server/location/ContextHubServiceTransaction.java index ce92f722e2d2..c1fc98248e08 100644 --- a/services/core/java/com/android/server/location/ContextHubServiceTransaction.java +++ b/services/core/java/com/android/server/location/ContextHubServiceTransaction.java @@ -61,7 +61,7 @@ import java.util.concurrent.TimeUnit; * * @param result the result of the transaction */ - /* package */ void onTransactionComplete(int result) { + /* package */ void onTransactionComplete(@ContextHubTransaction.Result int result) { } /** @@ -72,7 +72,8 @@ import java.util.concurrent.TimeUnit; * @param result the result of the query * @param nanoAppStateList the list of nanoapps given by the query response */ - /* package */ void onQueryResponse(int result, List<NanoAppState> nanoAppStateList) { + /* package */ void onQueryResponse( + @ContextHubTransaction.Result int result, List<NanoAppState> nanoAppStateList) { } /** diff --git a/services/core/java/com/android/server/location/ContextHubTransactionManager.java b/services/core/java/com/android/server/location/ContextHubTransactionManager.java index 3fcc682cf143..00252bc75bbf 100644 --- a/services/core/java/com/android/server/location/ContextHubTransactionManager.java +++ b/services/core/java/com/android/server/location/ContextHubTransactionManager.java @@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger; /* * Maximum number of transaction requests that can be pending at a time */ - private static final int MAX_PENDING_REQUESTS = 10; + private static final int MAX_PENDING_REQUESTS = 10000; /* * The proxy to talk to the Context Hub @@ -63,6 +63,11 @@ import java.util.concurrent.atomic.AtomicInteger; private final ContextHubClientManager mClientManager; /* + * The nanoapp state manager for the service + */ + private final NanoAppStateManager mNanoAppStateManager; + + /* * A queue containing the current transactions */ private final ArrayDeque<ContextHubServiceTransaction> mTransactionQueue = new ArrayDeque<>(); @@ -79,9 +84,11 @@ import java.util.concurrent.atomic.AtomicInteger; private ScheduledFuture<?> mTimeoutFuture = null; /* package */ ContextHubTransactionManager( - IContexthub contextHubProxy, ContextHubClientManager clientManager) { + IContexthub contextHubProxy, ContextHubClientManager clientManager, + NanoAppStateManager nanoAppStateManager) { mContextHubProxy = contextHubProxy; mClientManager = clientManager; + mNanoAppStateManager = nanoAppStateManager; } /** @@ -112,10 +119,18 @@ import java.util.concurrent.atomic.AtomicInteger; } @Override - /* package */ void onTransactionComplete(int result) { + /* package */ void onTransactionComplete(@ContextHubTransaction.Result int result) { + if (result == ContextHubTransaction.TRANSACTION_SUCCESS) { + // NOTE: The legacy JNI code used to do a query right after a load success + // to synchronize the service cache. Instead store the binary that was + // requested to load to update the cache later without doing a query. + mNanoAppStateManager.addNanoAppInstance( + contextHubId, nanoAppBinary.getNanoAppId(), + nanoAppBinary.getNanoAppVersion()); + } try { onCompleteCallback.onTransactionComplete(result); - if (result == Result.OK) { + if (result == ContextHubTransaction.TRANSACTION_SUCCESS) { mClientManager.onNanoAppLoaded(contextHubId, nanoAppBinary.getNanoAppId()); } } catch (RemoteException e) { @@ -150,10 +165,13 @@ import java.util.concurrent.atomic.AtomicInteger; } @Override - /* package */ void onTransactionComplete(int result) { + /* package */ void onTransactionComplete(@ContextHubTransaction.Result int result) { + if (result == ContextHubTransaction.TRANSACTION_SUCCESS) { + mNanoAppStateManager.removeNanoAppInstance(contextHubId, nanoAppId); + } try { onCompleteCallback.onTransactionComplete(result); - if (result == Result.OK) { + if (result == ContextHubTransaction.TRANSACTION_SUCCESS) { mClientManager.onNanoAppUnloaded(contextHubId, nanoAppId); } } catch (RemoteException e) { @@ -185,12 +203,13 @@ import java.util.concurrent.atomic.AtomicInteger; } @Override - /* package */ void onTransactionComplete(int result) { + /* package */ void onTransactionComplete(@ContextHubTransaction.Result int result) { onQueryResponse(result, Collections.emptyList()); } @Override - /* package */ void onQueryResponse(int result, List<NanoAppState> nanoAppStateList) { + /* package */ void onQueryResponse( + @ContextHubTransaction.Result int result, List<NanoAppState> nanoAppStateList) { try { onCompleteCallback.onQueryResponse(result, nanoAppStateList); } catch (RemoteException e) { @@ -204,7 +223,8 @@ import java.util.concurrent.atomic.AtomicInteger; * Adds a new transaction to the queue. * * If there was no pending transaction at the time, the transaction that was added will be - * started in this method. + * started in this method. If there were too many transactions in the queue, an exception will + * be thrown. * * @param transaction the transaction to add * @throws IllegalStateException if the queue is full @@ -213,7 +233,7 @@ import java.util.concurrent.atomic.AtomicInteger; synchronized void addTransaction( ContextHubServiceTransaction transaction) throws IllegalStateException { if (mTransactionQueue.size() == MAX_PENDING_REQUESTS) { - throw new IllegalStateException("Transaction transaction queue is full (capacity = " + throw new IllegalStateException("Transaction queue is full (capacity = " + MAX_PENDING_REQUESTS + ")"); } mTransactionQueue.add(transaction); @@ -227,7 +247,7 @@ import java.util.concurrent.atomic.AtomicInteger; * Handles a transaction response from a Context Hub. * * @param transactionId the transaction ID of the response - * @param result the result of the transaction + * @param result the result of the transaction as defined by the HAL TransactionResult */ /* package */ synchronized void onTransactionResponse(int transactionId, int result) { @@ -242,7 +262,10 @@ import java.util.concurrent.atomic.AtomicInteger; return; } - transaction.onTransactionComplete(result); + transaction.onTransactionComplete( + (result == TransactionResult.SUCCESS) ? + ContextHubTransaction.TRANSACTION_SUCCESS : + ContextHubTransaction.TRANSACTION_FAILED_AT_HUB); removeTransactionAndStartNext(); } @@ -263,7 +286,7 @@ import java.util.concurrent.atomic.AtomicInteger; return; } - transaction.onQueryResponse(TransactionResult.SUCCESS, nanoAppStateList); + transaction.onQueryResponse(ContextHubTransaction.TRANSACTION_SUCCESS, nanoAppStateList); removeTransactionAndStartNext(); } diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 0b511f235265..b324002e589c 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -233,13 +233,13 @@ public class GnssLocationProvider implements LocationProviderInterface { private static final int AGPS_SETID_TYPE_IMSI = 1; private static final int AGPS_SETID_TYPE_MSISDN = 2; - private static final int GPS_GEOFENCE_UNAVAILABLE = 1<<0L; - private static final int GPS_GEOFENCE_AVAILABLE = 1<<1L; + private static final int GPS_GEOFENCE_UNAVAILABLE = 1 << 0L; + private static final int GPS_GEOFENCE_AVAILABLE = 1 << 1L; // GPS Geofence errors. Should match GeofenceStatus enum in IGnssGeofenceCallback.hal. private static final int GPS_GEOFENCE_OPERATION_SUCCESS = 0; private static final int GPS_GEOFENCE_ERROR_TOO_MANY_GEOFENCES = 100; - private static final int GPS_GEOFENCE_ERROR_ID_EXISTS = -101; + private static final int GPS_GEOFENCE_ERROR_ID_EXISTS = -101; private static final int GPS_GEOFENCE_ERROR_ID_UNKNOWN = -102; private static final int GPS_GEOFENCE_ERROR_INVALID_TRANSITION = -103; private static final int GPS_GEOFENCE_ERROR_GENERIC = -149; @@ -253,6 +253,7 @@ public class GnssLocationProvider implements LocationProviderInterface { private static class GpsRequest { public ProviderRequest request; public WorkSource source; + public GpsRequest(ProviderRequest request, WorkSource source) { this.request = request; this.source = source; @@ -280,15 +281,15 @@ public class GnssLocationProvider implements LocationProviderInterface { // how often to request NTP time, in milliseconds // current setting 24 hours - private static final long NTP_INTERVAL = 24*60*60*1000; + private static final long NTP_INTERVAL = 24 * 60 * 60 * 1000; // how long to wait if we have a network error in NTP or XTRA downloading // the initial value of the exponential backoff // current setting - 5 minutes - private static final long RETRY_INTERVAL = 5*60*1000; + private static final long RETRY_INTERVAL = 5 * 60 * 1000; // how long to wait if we have a network error in NTP or XTRA downloading // the max value of the exponential backoff // current setting - 4 hours - private static final long MAX_RETRY_INTERVAL = 4*60*60*1000; + private static final long MAX_RETRY_INTERVAL = 4 * 60 * 60 * 1000; // Timeout when holding wakelocks for downloading XTRA data. private static final long DOWNLOAD_XTRA_DATA_TIMEOUT_MS = 60 * 1000; @@ -321,6 +322,9 @@ public class GnssLocationProvider implements LocationProviderInterface { // requested frequency of fixes, in milliseconds private int mFixInterval = 1000; + // true if low power mode for the GNSS chipset is part of the latest request. + private boolean mLowPowerMode = false; + // true if we started navigation private boolean mStarted; @@ -398,7 +402,6 @@ public class GnssLocationProvider implements LocationProviderInterface { private final static String LPP_PROFILE = "persist.sys.gps.lpp"; - private final PowerManager mPowerManager; private final AlarmManager mAlarmManager; private final PendingIntent mWakeupIntent; @@ -459,26 +462,27 @@ public class GnssLocationProvider implements LocationProviderInterface { */ private final ConnectivityManager.NetworkCallback mNetworkConnectivityCallback = new ConnectivityManager.NetworkCallback() { - @Override - public void onAvailable(Network network) { - if (mInjectNtpTimePending == STATE_PENDING_NETWORK) { - requestUtcTime(); - } - if (mDownloadXtraDataPending == STATE_PENDING_NETWORK) { - if (mSupportsXtra) { - // Download only if supported, (prevents an unneccesary on-boot download) - xtraDownloadRequest(); + @Override + public void onAvailable(Network network) { + if (mInjectNtpTimePending == STATE_PENDING_NETWORK) { + requestUtcTime(); + } + if (mDownloadXtraDataPending == STATE_PENDING_NETWORK) { + if (mSupportsXtra) { + // Download only if supported, (prevents an unneccesary on-boot + // download) + xtraDownloadRequest(); + } + } + // Always on, notify HAL so it can get data it needs + sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network); } - } - // Always on, notify HAL so it can get data it needs - sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network); - } - @Override - public void onLost(Network network) { - sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network); - } - }; + @Override + public void onLost(Network network) { + sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network); + } + }; /** * Callback used to listen for availability of a requested SUPL connection. @@ -487,20 +491,21 @@ public class GnssLocationProvider implements LocationProviderInterface { */ private final ConnectivityManager.NetworkCallback mSuplConnectivityCallback = new ConnectivityManager.NetworkCallback() { - @Override - public void onAvailable(Network network) { - // Specific to a change to a SUPL enabled network becoming ready - sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network); - } + @Override + public void onAvailable(Network network) { + // Specific to a change to a SUPL enabled network becoming ready + sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network); + } - @Override - public void onLost(Network network) { - releaseSuplConnection(GPS_RELEASE_AGPS_DATA_CONN); - } - }; + @Override + public void onLost(Network network) { + releaseSuplConnection(GPS_RELEASE_AGPS_DATA_CONN); + } + }; private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { - @Override public void onReceive(Context context, Intent intent) { + @Override + public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if (DEBUG) Log.d(TAG, "receive broadcast intent, action: " + action); if (action == null) { @@ -524,11 +529,11 @@ public class GnssLocationProvider implements LocationProviderInterface { private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener = new OnSubscriptionsChangedListener() { - @Override - public void onSubscriptionsChanged() { - sendMessage(SUBSCRIPTION_OR_SIM_CHANGED, 0, null); - } - }; + @Override + public void onSubscriptionsChanged() { + sendMessage(SUBSCRIPTION_OR_SIM_CHANGED, 0, null); + } + }; private void subscriptionOrSimChanged(Context context) { if (DEBUG) Log.d(TAG, "received SIM related action: "); @@ -599,8 +604,8 @@ public class GnssLocationProvider implements LocationProviderInterface { String lpp_prof = SystemProperties.get(LPP_PROFILE); if (!TextUtils.isEmpty(lpp_prof)) { - // override default value of this if lpp_prof is not empty - properties.setProperty("LPP_PROFILE", lpp_prof); + // override default value of this if lpp_prof is not empty + properties.setProperty("LPP_PROFILE", lpp_prof); } /* * Overlay carrier properties from a debug configuration file. @@ -608,7 +613,7 @@ public class GnssLocationProvider implements LocationProviderInterface { loadPropertiesFromFile(DEBUG_PROPERTIES_FILE, properties); // TODO: we should get rid of C2K specific setting. setSuplHostPort(properties.getProperty("SUPL_HOST"), - properties.getProperty("SUPL_PORT")); + properties.getProperty("SUPL_PORT")); mC2KServerHost = properties.getProperty("C2K_HOST"); String portString = properties.getProperty("C2K_PORT"); if (mC2KServerHost != null && portString != null) { @@ -625,24 +630,26 @@ public class GnssLocationProvider implements LocationProviderInterface { put("SUPL_MODE", (val) -> native_set_supl_mode(val)); put("SUPL_ES", (val) -> native_set_supl_es(val)); put("LPP_PROFILE", (val) -> native_set_lpp_profile(val)); - put("A_GLONASS_POS_PROTOCOL_SELECT", (val) -> native_set_gnss_pos_protocol_select(val)); - put("USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL", (val) -> native_set_emergency_supl_pdn(val)); + put("A_GLONASS_POS_PROTOCOL_SELECT", + (val) -> native_set_gnss_pos_protocol_select(val)); + put("USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL", + (val) -> native_set_emergency_supl_pdn(val)); put("GPS_LOCK", (val) -> native_set_gps_lock(val)); } }; - for(Entry<String, SetCarrierProperty> entry : map.entrySet()) { + for (Entry<String, SetCarrierProperty> entry : map.entrySet()) { String propertyName = entry.getKey(); String propertyValueString = properties.getProperty(propertyName); if (propertyValueString != null) { try { - int propertyValueInt = Integer.decode(propertyValueString); - boolean result = entry.getValue().set(propertyValueInt); - if (result == false) { - Log.e(TAG, "Unable to set " + propertyName); - } + int propertyValueInt = Integer.decode(propertyValueString); + boolean result = entry.getValue().set(propertyValueInt); + if (result == false) { + Log.e(TAG, "Unable to set " + propertyName); + } } catch (NumberFormatException e) { - Log.e(TAG, "unable to parse propertyName: " + propertyValueString); + Log.e(TAG, "unable to parse propertyName: " + propertyValueString); } } } @@ -663,7 +670,7 @@ public class GnssLocationProvider implements LocationProviderInterface { } private void loadPropertiesFromResource(Context context, - Properties properties) { + Properties properties) { String[] configValues = context.getResources().getStringArray( com.android.internal.R.array.config_gpsParameters); for (String item : configValues) { @@ -681,7 +688,7 @@ public class GnssLocationProvider implements LocationProviderInterface { } private boolean loadPropertiesFromFile(String filename, - Properties properties) { + Properties properties) { try { File file = new File(filename); FileInputStream stream = null; @@ -717,11 +724,11 @@ public class GnssLocationProvider implements LocationProviderInterface { PowerManager.PARTIAL_WAKE_LOCK, DOWNLOAD_EXTRA_WAKELOCK_KEY); mDownloadXtraWakeLock.setReferenceCounted(true); - mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE); + mAlarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE); mWakeupIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(ALARM_WAKEUP), 0); mTimeoutIntent = PendingIntent.getBroadcast(mContext, 0, new Intent(ALARM_TIMEOUT), 0); - mConnMgr = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE); + mConnMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); // App ops service to keep track of who is accessing the GPS mAppOpsService = IAppOpsService.Stub.asInterface(ServiceManager.getService( @@ -744,8 +751,8 @@ public class GnssLocationProvider implements LocationProviderInterface { // Create a GPS net-initiated handler. mNIHandler = new GpsNetInitiatedHandler(context, - mNetInitiatedListener, - mSuplEsEnabled); + mNetInitiatedListener, + mSuplEsEnabled); mListenerHelper = new GnssStatusListenerHelper(mHandler) { @Override @@ -766,8 +773,23 @@ public class GnssLocationProvider implements LocationProviderInterface { } @Override - protected boolean registerWithService() { - return native_start_measurement_collection(); + protected int registerWithService() { + int devOptions = Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Global.DEVELOPMENT_SETTINGS_ENABLED , 0); + int fullTrackingToggled = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING , 0); + boolean result = false; + if (devOptions == 1 /* Developer Mode enabled */ + && fullTrackingToggled == 1 /* Raw Measurements Full Tracking enabled */) { + result = native_start_measurement_collection(true /* enableFullTracking */); + } else { + result = native_start_measurement_collection(false /* enableFullTracking */); + } + if (result) { + return RemoteListenerHelper.RESULT_SUCCESS; + } else { + return RemoteListenerHelper.RESULT_INTERNAL_ERROR; + } } @Override @@ -788,8 +810,13 @@ public class GnssLocationProvider implements LocationProviderInterface { } @Override - protected boolean registerWithService() { - return native_start_navigation_message_collection(); + protected int registerWithService() { + boolean result = native_start_navigation_message_collection(); + if (result) { + return RemoteListenerHelper.RESULT_SUCCESS; + } else { + return RemoteListenerHelper.RESULT_INTERNAL_ERROR; + } } @Override @@ -1116,9 +1143,9 @@ public class GnssLocationProvider implements LocationProviderInterface { * Checks what SUPL mode to use, according to the AGPS mode as well as the * allowed mode from properties. * - * @param properties GPS properties + * @param properties GPS properties * @param agpsEnabled whether AGPS is enabled by settings value - * @param singleShot whether "singleshot" is needed + * @param singleShot whether "singleshot" is needed * @return SUPL mode (MSA vs MSB vs STANDALONE) */ private int getSuplMode(Properties properties, boolean agpsEnabled, boolean singleShot) { @@ -1222,7 +1249,7 @@ public class GnssLocationProvider implements LocationProviderInterface { } private void updateStatus(int status, int svCount, int meanCn0, int maxCn0) { - if (status != mStatus || svCount != mSvCount || meanCn0 != mMeanCn0 || maxCn0 != mMaxCn0 ) { + if (status != mStatus || svCount != mSvCount || meanCn0 != mMeanCn0 || maxCn0 != mMaxCn0) { mStatus = status; mSvCount = svCount; mMeanCn0 = meanCn0; @@ -1284,7 +1311,7 @@ public class GnssLocationProvider implements LocationProviderInterface { updateClientUids(mWorkSource); mFixInterval = (int) mProviderRequest.interval; - + mLowPowerMode = (boolean) mProviderRequest.lowPowerMode; // check for overflow if (mFixInterval != mProviderRequest.interval) { Log.w(TAG, "interval overflow: " + mProviderRequest.interval); @@ -1293,10 +1320,10 @@ public class GnssLocationProvider implements LocationProviderInterface { // apply request to GPS engine if (mStarted && hasCapability(GPS_CAPABILITY_SCHEDULING)) { - // change period + // change period and/or lowPowerMode if (!native_set_position_mode(mPositionMode, GPS_POSITION_RECURRENCE_PERIODIC, - mFixInterval, 0, 0)) { - Log.e(TAG, "set_position_mode failed in setMinTime()"); + mFixInterval, 0, 0, mLowPowerMode)) { + Log.e(TAG, "set_position_mode failed in updateRequirements"); } } else if (!mStarted) { // start GPS @@ -1323,7 +1350,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // Update sources that were not previously tracked. if (newWork != null) { int lastuid = -1; - for (int i=0; i<newWork.size(); i++) { + for (int i = 0; i < newWork.size(); i++) { try { int uid = newWork.get(i); mAppOpsService.startOperation(AppOpsManager.getToken(mAppOpsService), @@ -1341,7 +1368,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // Update sources that are no longer tracked. if (goneWork != null) { int lastuid = -1; - for (int i=0; i<goneWork.size(); i++) { + for (int i = 0; i < goneWork.size(); i++) { try { int uid = goneWork.get(i); mAppOpsService.finishOperation(AppOpsManager.getToken(mAppOpsService), @@ -1455,13 +1482,13 @@ public class GnssLocationProvider implements LocationProviderInterface { boolean agpsEnabled = (Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.ASSISTED_GPS_ENABLED, 1) != 0); + Settings.Global.ASSISTED_GPS_ENABLED, 1) != 0); mPositionMode = getSuplMode(mProperties, agpsEnabled, singleShot); if (DEBUG) { String mode; - switch(mPositionMode) { + switch (mPositionMode) { case GPS_POSITION_MODE_STANDALONE: mode = "standalone"; break; @@ -1479,8 +1506,9 @@ public class GnssLocationProvider implements LocationProviderInterface { } int interval = (hasCapability(GPS_CAPABILITY_SCHEDULING) ? mFixInterval : 1000); + mLowPowerMode = (boolean) mProviderRequest.lowPowerMode; if (!native_set_position_mode(mPositionMode, GPS_POSITION_RECURRENCE_PERIODIC, - interval, 0, 0)) { + interval, 0, 0, mLowPowerMode)) { mStarted = false; Log.e(TAG, "set_position_mode failed in startNavigating()"); return; @@ -1578,7 +1606,7 @@ public class GnssLocationProvider implements LocationProviderInterface { mLastFixTime = SystemClock.elapsedRealtime(); // report time to first fix if (mTimeToFirstFix == 0 && hasLatLong) { - mTimeToFirstFix = (int)(mLastFixTime - mFixRequestTime); + mTimeToFirstFix = (int) (mLastFixTime - mFixRequestTime); if (DEBUG) Log.d(TAG, "TTFF: " + mTimeToFirstFix); mGnssMetrics.logTimeToFirstFixMilliSecs(mTimeToFirstFix); @@ -1604,12 +1632,12 @@ public class GnssLocationProvider implements LocationProviderInterface { updateStatus(LocationProvider.AVAILABLE, mSvCount, mMeanCn0, mMaxCn0); } - if (!hasCapability(GPS_CAPABILITY_SCHEDULING) && mStarted && - mFixInterval > GPS_POLLING_THRESHOLD_INTERVAL) { + if (!hasCapability(GPS_CAPABILITY_SCHEDULING) && mStarted && + mFixInterval > GPS_POLLING_THRESHOLD_INTERVAL) { if (DEBUG) Log.d(TAG, "got fix, hibernating"); hibernate(); } - } + } /** * called from native code to update our status @@ -1650,10 +1678,10 @@ public class GnssLocationProvider implements LocationProviderInterface { */ private void reportSvStatus() { int svCount = native_read_sv_status(mSvidWithFlags, - mCn0s, - mSvElevations, - mSvAzimuths, - mSvCarrierFreqs); + mCn0s, + mSvElevations, + mSvAzimuths, + mSvCarrierFreqs); mListenerHelper.onSvStatusChanged( svCount, mSvidWithFlags, @@ -1676,7 +1704,7 @@ public class GnssLocationProvider implements LocationProviderInterface { if ((mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) != 0) { ++usedInFixCount; if (mCn0s[i] > maxCn0) { - maxCn0 = (int)mCn0s[i]; + maxCn0 = (int) mCn0s[i]; } meanCn0 += mCn0s[i]; } @@ -1693,7 +1721,7 @@ public class GnssLocationProvider implements LocationProviderInterface { ((mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_USED_IN_FIX) == 0 ? "" : "U") + ((mSvidWithFlags[i] & GnssStatus.GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY) == 0 - ? "" : "F")); + ? "" : "F")); } } if (usedInFixCount > 0) { @@ -1703,7 +1731,7 @@ public class GnssLocationProvider implements LocationProviderInterface { updateStatus(mStatus, usedInFixCount, meanCn0, maxCn0); if (mNavigating && mStatus == LocationProvider.AVAILABLE && mLastFixTime > 0 && - SystemClock.elapsedRealtime() - mLastFixTime > RECENT_FIX_TIMEOUT) { + SystemClock.elapsedRealtime() - mLastFixTime > RECENT_FIX_TIMEOUT) { // send an intent to notify that the GPS is no longer receiving fixes. Intent intent = new Intent(LocationManager.GPS_FIX_CHANGE_ACTION); intent.putExtra(LocationManager.EXTRA_GPS_ENABLED, false); @@ -1843,14 +1871,17 @@ public class GnssLocationProvider implements LocationProviderInterface { * Returns the GNSS batching size */ int getSize(); + /** * Starts the hardware batching operation */ boolean start(long periodNanos, boolean wakeOnFifoFull); + /** * Forces a flush of existing locations from the hardware batching */ void flush(); + /** * Stops the batching operation */ @@ -1866,6 +1897,7 @@ public class GnssLocationProvider implements LocationProviderInterface { public int getSize() { return native_get_batch_size(); } + @Override public boolean start(long periodNanos, boolean wakeOnFifoFull) { if (periodNanos <= 0) { @@ -1875,10 +1907,12 @@ public class GnssLocationProvider implements LocationProviderInterface { } return native_start_batch(periodNanos, wakeOnFifoFull); } + @Override public void flush() { native_flush_batch(); } + @Override public boolean stop() { return native_stop_batch(); @@ -1911,7 +1945,7 @@ public class GnssLocationProvider implements LocationProviderInterface { private void enableBatching() { if (!native_init_batching()) { Log.e(TAG, "Failed to initialize GNSS batching"); - }; + } } /** @@ -1927,7 +1961,9 @@ public class GnssLocationProvider implements LocationProviderInterface { */ private void reportLocationBatch(Location[] locationArray) { List<Location> locations = new ArrayList<>(Arrays.asList(locationArray)); - if(DEBUG) { Log.d(TAG, "Location batch of size " + locationArray.length + "reported"); } + if (DEBUG) { + Log.d(TAG, "Location batch of size " + locationArray.length + " reported"); + } try { mILocationManager.reportLocationBatch(locations); } catch (RemoteException e) { @@ -1947,7 +1983,7 @@ public class GnssLocationProvider implements LocationProviderInterface { * Converts the GPS HAL status to the internal Geofence Hardware status. */ private int getGeofenceStatus(int status) { - switch(status) { + switch (status) { case GPS_GEOFENCE_OPERATION_SUCCESS: return GeofenceHardware.GEOFENCE_SUCCESS; case GPS_GEOFENCE_ERROR_GENERIC: @@ -1970,7 +2006,7 @@ public class GnssLocationProvider implements LocationProviderInterface { * All geofence callbacks are called on the same thread */ private void reportGeofenceTransition(int geofenceId, Location location, int transition, - long transitionTimestamp) { + long transitionTimestamp) { if (mGeofenceHardwareImpl == null) { mGeofenceHardwareImpl = GeofenceHardwareImpl.getInstance(mContext); } @@ -1992,7 +2028,7 @@ public class GnssLocationProvider implements LocationProviderInterface { mGeofenceHardwareImpl = GeofenceHardwareImpl.getInstance(mContext); } int monitorStatus = GeofenceHardware.MONITOR_CURRENTLY_UNAVAILABLE; - if(status == GPS_GEOFENCE_AVAILABLE) { + if (status == GPS_GEOFENCE_AVAILABLE) { monitorStatus = GeofenceHardware.MONITOR_CURRENTLY_AVAILABLE; } mGeofenceHardwareImpl.reportGeofenceMonitorStatus( @@ -2048,12 +2084,13 @@ public class GnssLocationProvider implements LocationProviderInterface { private final INetInitiatedListener mNetInitiatedListener = new INetInitiatedListener.Stub() { // Sends a response for an NI request to HAL. @Override - public boolean sendNiResponse(int notificationId, int userResponse) - { + public boolean sendNiResponse(int notificationId, int userResponse) { // TODO Add Permission check - if (DEBUG) Log.d(TAG, "sendNiResponse, notifId: " + notificationId + - ", response: " + userResponse); + if (DEBUG) { + Log.d(TAG, "sendNiResponse, notifId: " + notificationId + + ", response: " + userResponse); + } native_send_ni_response(notificationId, userResponse); return true; } @@ -2074,8 +2111,7 @@ public class GnssLocationProvider implements LocationProviderInterface { String text, int requestorIdEncoding, int textEncoding - ) - { + ) { Log.i(TAG, "reportNiNotification: entered"); Log.i(TAG, "notificationId: " + notificationId + ", niType: " + niType + @@ -2094,7 +2130,8 @@ public class GnssLocationProvider implements LocationProviderInterface { notification.niType = niType; notification.needNotify = (notifyFlags & GpsNetInitiatedHandler.GPS_NI_NEED_NOTIFY) != 0; notification.needVerify = (notifyFlags & GpsNetInitiatedHandler.GPS_NI_NEED_VERIFY) != 0; - notification.privacyOverride = (notifyFlags & GpsNetInitiatedHandler.GPS_NI_PRIVACY_OVERRIDE) != 0; + notification.privacyOverride = + (notifyFlags & GpsNetInitiatedHandler.GPS_NI_PRIVACY_OVERRIDE) != 0; notification.timeout = timeout; notification.defaultResponse = defaultResponse; notification.requestorId = requestorId; @@ -2126,8 +2163,7 @@ public class GnssLocationProvider implements LocationProviderInterface { data = data_temp; type = AGPS_SETID_TYPE_IMSI; } - } - else if ((flags & AGPS_RIL_REQUEST_SETID_MSISDN) == AGPS_RIL_REQUEST_SETID_MSISDN) { + } else if ((flags & AGPS_RIL_REQUEST_SETID_MSISDN) == AGPS_RIL_REQUEST_SETID_MSISDN) { String data_temp = phone.getLine1Number(); if (data_temp == null) { // This means the framework does not have the SIM card ready. @@ -2161,14 +2197,14 @@ public class GnssLocationProvider implements LocationProviderInterface { if ((gsm_cell != null) && (phone.getNetworkOperator() != null) && (phone.getNetworkOperator().length() > 3)) { int type; - int mcc = Integer.parseInt(phone.getNetworkOperator().substring(0,3)); + int mcc = Integer.parseInt(phone.getNetworkOperator().substring(0, 3)); int mnc = Integer.parseInt(phone.getNetworkOperator().substring(3)); int networkType = phone.getNetworkType(); if (networkType == TelephonyManager.NETWORK_TYPE_UMTS - || networkType == TelephonyManager.NETWORK_TYPE_HSDPA - || networkType == TelephonyManager.NETWORK_TYPE_HSUPA - || networkType == TelephonyManager.NETWORK_TYPE_HSPA - || networkType == TelephonyManager.NETWORK_TYPE_HSPAP) { + || networkType == TelephonyManager.NETWORK_TYPE_HSDPA + || networkType == TelephonyManager.NETWORK_TYPE_HSUPA + || networkType == TelephonyManager.NETWORK_TYPE_HSPA + || networkType == TelephonyManager.NETWORK_TYPE_HSPAP) { type = AGPS_REF_LOCATION_TYPE_UMTS_CELLID; } else { type = AGPS_REF_LOCATION_TYPE_GSM_CELLID; @@ -2176,7 +2212,7 @@ public class GnssLocationProvider implements LocationProviderInterface { native_agps_set_ref_location_cellid(type, mcc, mnc, gsm_cell.getLac(), gsm_cell.getCid()); } else { - Log.e(TAG,"Error getting cell location info."); + Log.e(TAG, "Error getting cell location info."); } } else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) { Log.e(TAG, "CDMA not supported."); @@ -2269,7 +2305,7 @@ public class GnssLocationProvider implements LocationProviderInterface { * restart. */ boolean isInitialized = native_init(); - if(!isInitialized) { + if (!isInitialized) { Log.w(TAG, "Native initialization failed at bootup"); } else { native_cleanup(); @@ -2280,7 +2316,8 @@ public class GnssLocationProvider implements LocationProviderInterface { reloadGpsProperties(mContext, mProperties); // TODO: When this object "finishes" we should unregister by invoking - // SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener); + // SubscriptionManager.getInstance(mContext).unregister + // (mOnSubscriptionsChangedListener); // This is not strictly necessary because it will be unregistered if the // notification fails but it is good form. @@ -2359,12 +2396,18 @@ public class GnssLocationProvider implements LocationProviderInterface { handleUpdateLocation(location); } } + @Override - public void onStatusChanged(String provider, int status, Bundle extras) { } + public void onStatusChanged(String provider, int status, Bundle extras) { + } + @Override - public void onProviderEnabled(String provider) { } + public void onProviderEnabled(String provider) { + } + @Override - public void onProviderDisabled(String provider) { } + public void onProviderDisabled(String provider) { + } } private String getSelectedApn() { @@ -2373,7 +2416,7 @@ public class GnssLocationProvider implements LocationProviderInterface { try { cursor = mContext.getContentResolver().query( uri, - new String[] { "apn" }, + new String[]{"apn"}, null /* selection */, null /* selectionArgs */, Carriers.DEFAULT_SORT_ORDER); @@ -2404,7 +2447,7 @@ public class GnssLocationProvider implements LocationProviderInterface { try { cursor = mContext.getContentResolver().query( Carriers.CONTENT_URI, - new String[] { Carriers.PROTOCOL }, + new String[]{Carriers.PROTOCOL}, selection, null, Carriers.DEFAULT_SORT_ORDER); @@ -2461,7 +2504,7 @@ public class GnssLocationProvider implements LocationProviderInterface { /** * @return {@code true} if there is a data network available for outgoing connections, - * {@code false} otherwise. + * {@code false} otherwise. */ private boolean isDataNetworkConnected() { NetworkInfo activeNetworkInfo = mConnMgr.getActiveNetworkInfo(); @@ -2482,7 +2525,7 @@ public class GnssLocationProvider implements LocationProviderInterface { * @return A string representing the current state stored in {@link #mAGpsDataConnectionState}. */ private String agpsDataConnStateAsString() { - switch(mAGpsDataConnectionState) { + switch (mAGpsDataConnectionState) { case AGPS_DATA_CONNECTION_CLOSED: return "CLOSED"; case AGPS_DATA_CONNECTION_OPEN: @@ -2549,12 +2592,12 @@ public class GnssLocationProvider implements LocationProviderInterface { } - @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { StringBuilder s = new StringBuilder(); s.append(" mStarted=").append(mStarted).append('\n'); s.append(" mFixInterval=").append(mFixInterval).append('\n'); + s.append(" mLowPowerMode=").append(mLowPowerMode).append('\n'); s.append(" mDisableGps (battery saver mode)=").append(mDisableGps).append('\n'); s.append(" mEngineCapabilities=0x").append(Integer.toHexString(mEngineCapabilities)); s.append(" ( "); @@ -2618,29 +2661,45 @@ public class GnssLocationProvider implements LocationProviderInterface { // preallocated to avoid memory allocation in reportNmea() private byte[] mNmeaBuffer = new byte[120]; - static { class_init_native(); } + static { + class_init_native(); + } + private static native void class_init_native(); + private static native boolean native_is_supported(); + private static native boolean native_is_agps_ril_supported(); + private static native boolean native_is_gnss_configuration_supported(); private native boolean native_init(); + private native void native_cleanup(); + private native boolean native_set_position_mode(int mode, int recurrence, int min_interval, - int preferred_accuracy, int preferred_time); + int preferred_accuracy, int preferred_time, boolean lowPowerMode); + private native boolean native_start(); + private native boolean native_stop(); + private native void native_delete_aiding_data(int flags); + // returns number of SVs // mask[0] is ephemeris mask and mask[1] is almanac mask private native int native_read_sv_status(int[] prnWithFlags, float[] cn0s, float[] elevations, float[] azimuths, float[] carrierFrequencies); + private native int native_read_nmea(byte[] buffer, int bufferSize); + private native void native_inject_location(double latitude, double longitude, float accuracy); // XTRA Support private native void native_inject_time(long time, long timeReference, int uncertainty); + private native boolean native_supports_xtra(); + private native void native_inject_xtra_data(byte[] data, int length); // DEBUG Support @@ -2648,9 +2707,13 @@ public class GnssLocationProvider implements LocationProviderInterface { // AGPS Support private native void native_agps_data_conn_open(String apn, int apnIpType); + private native void native_agps_data_conn_closed(); + private native void native_agps_data_conn_failed(); - private native void native_agps_ni_message(byte [] msg, int length); + + private native void native_agps_ni_message(byte[] msg, int length); + private native void native_set_agps_server(int type, String hostname, int port); // Network-initiated (NI) Support @@ -2659,6 +2722,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // AGPS ril suport private native void native_agps_set_ref_location_cellid(int type, int mcc, int mnc, int lac, int cid); + private native void native_agps_set_id(int type, String setid); private native void native_update_network_state(boolean connected, int type, @@ -2666,38 +2730,57 @@ public class GnssLocationProvider implements LocationProviderInterface { // Hardware Geofence support. private static native boolean native_is_geofence_supported(); + private static native boolean native_add_geofence(int geofenceId, double latitude, - double longitude, double radius, int lastTransition,int monitorTransitions, + double longitude, double radius, int lastTransition, int monitorTransitions, int notificationResponsivenes, int unknownTimer); + private static native boolean native_remove_geofence(int geofenceId); + private static native boolean native_resume_geofence(int geofenceId, int transitions); + private static native boolean native_pause_geofence(int geofenceId); // Gps Hal measurements support. private static native boolean native_is_measurement_supported(); - private native boolean native_start_measurement_collection(); + + private native boolean native_start_measurement_collection(boolean enableFullTracking); + private native boolean native_stop_measurement_collection(); // Gps Navigation message support. private static native boolean native_is_navigation_message_supported(); + private native boolean native_start_navigation_message_collection(); + private native boolean native_stop_navigation_message_collection(); // GNSS Configuration private static native boolean native_set_supl_version(int version); + private static native boolean native_set_supl_mode(int mode); + private static native boolean native_set_supl_es(int es); + private static native boolean native_set_lpp_profile(int lppProfile); + private static native boolean native_set_gnss_pos_protocol_select(int gnssPosProtocolSelect); + private static native boolean native_set_gps_lock(int gpsLock); + private static native boolean native_set_emergency_supl_pdn(int emergencySuplPdn); // GNSS Batching private static native int native_get_batch_size(); + private static native boolean native_start_batch(long periodNanos, boolean wakeOnFifoFull); + private static native void native_flush_batch(); + private static native boolean native_stop_batch(); + private static native boolean native_init_batching(); + private static native void native_cleanup_batching(); } diff --git a/services/core/java/com/android/server/location/GnssMeasurementsProvider.java b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java index 924520b5a0f1..477dae65c651 100644 --- a/services/core/java/com/android/server/location/GnssMeasurementsProvider.java +++ b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java @@ -40,11 +40,11 @@ public abstract class GnssMeasurementsProvider public void onMeasurementsAvailable(final GnssMeasurementsEvent event) { ListenerOperation<IGnssMeasurementsListener> operation = new ListenerOperation<IGnssMeasurementsListener>() { - @Override - public void execute(IGnssMeasurementsListener listener) throws RemoteException { - listener.onGnssMeasurementsReceived(event); - } - }; + @Override + public void execute(IGnssMeasurementsListener listener) throws RemoteException { + listener.onGnssMeasurementsReceived(event); + } + }; foreach(operation); } @@ -70,6 +70,9 @@ public abstract class GnssMeasurementsProvider case RESULT_INTERNAL_ERROR: status = GnssMeasurementsEvent.Callback.STATUS_NOT_SUPPORTED; break; + case RESULT_NOT_ALLOWED: + status = GnssMeasurementsEvent.Callback.STATUS_NOT_ALLOWED; + break; case RESULT_GPS_LOCATION_DISABLED: status = GnssMeasurementsEvent.Callback.STATUS_LOCATION_DISABLED; break; diff --git a/services/core/java/com/android/server/location/GnssStatusListenerHelper.java b/services/core/java/com/android/server/location/GnssStatusListenerHelper.java index fe2bb38d7c98..124220f17f1f 100644 --- a/services/core/java/com/android/server/location/GnssStatusListenerHelper.java +++ b/services/core/java/com/android/server/location/GnssStatusListenerHelper.java @@ -30,8 +30,8 @@ abstract class GnssStatusListenerHelper extends RemoteListenerHelper<IGnssStatus } @Override - protected boolean registerWithService() { - return true; + protected int registerWithService() { + return RemoteListenerHelper.RESULT_SUCCESS; } @Override diff --git a/services/core/java/com/android/server/location/NanoAppStateManager.java b/services/core/java/com/android/server/location/NanoAppStateManager.java new file mode 100644 index 000000000000..81c47849c3ad --- /dev/null +++ b/services/core/java/com/android/server/location/NanoAppStateManager.java @@ -0,0 +1,190 @@ +/* + * 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 com.android.server.location; + +import android.annotation.Nullable; +import android.hardware.contexthub.V1_0.HubAppInfo; +import android.hardware.location.NanoAppInstanceInfo; +import android.util.Log; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + +/** + * Manages the state of loaded nanoapps at the Context Hubs. + * + * This class maintains a list of nanoapps that have been informed as loaded at the hubs. The state + * should be updated based on the hub callbacks (defined in IContexthubCallback.hal), as a result + * of either loadNanoApp, unloadNanoApp, or queryApps. + * + * The state tracked by this manager is used by clients of ContextHubService that use the old APIs. + * + * TODO(b/69270990): Remove this class and its logic once the old API is deprecated. + * + * @hide + */ +/* package */ class NanoAppStateManager { + private static final String TAG = "NanoAppStateManager"; + + /* + * Enables verbose debug logs for this class. + */ + private static final boolean ENABLE_LOG_DEBUG = true; + + /* + * Service cache maintaining of handle to nanoapp infos. + */ + private final HashMap<Integer, NanoAppInstanceInfo> mNanoAppHash = new HashMap<>(); + + /* + * The next nanoapp handle to use. + */ + private int mNextHandle = 0; + + /** + * @param nanoAppHandle the nanoapp handle + * @return the NanoAppInstanceInfo for the given nanoapp, or null if the nanoapp does not exist + * in the cache + */ + @Nullable + /* package */ + synchronized NanoAppInstanceInfo getNanoAppInstanceInfo(int nanoAppHandle) { + return mNanoAppHash.get(nanoAppHandle); + } + + /** + * @return a collection of NanoAppInstanceInfo objects in the cache + */ + /* package */ + synchronized Collection<NanoAppInstanceInfo> getNanoAppInstanceInfoCollection() { + return mNanoAppHash.values(); + } + + /** + * @param contextHubId the ID of the hub to search for the instance + * @param nanoAppId the unique 64-bit ID of the nanoapp + * @return the nanoapp handle, -1 if the nanoapp is not in the cache + */ + /* package */ + synchronized int getNanoAppHandle(int contextHubId, long nanoAppId) { + for (NanoAppInstanceInfo info : mNanoAppHash.values()) { + if (info.getContexthubId() == contextHubId && info.getAppId() == nanoAppId) { + return info.getHandle(); + } + } + + return -1; + } + + /** + * Adds a nanoapp instance to the cache. + * + * If the cache already contained the nanoapp, the entry is removed and a new nanoapp handle is + * generated. + * + * @param contextHubId the ID of the hub the nanoapp is loaded in + * @param nanoAppId the unique 64-bit ID of the nanoapp + * @param nanoAppVersion the version of the nanoapp + */ + /* package */ + synchronized void addNanoAppInstance(int contextHubId, long nanoAppId, int nanoAppVersion) { + removeNanoAppInstance(contextHubId, nanoAppId); + if (mNanoAppHash.size() == Integer.MAX_VALUE) { + Log.e(TAG, "Error adding nanoapp instance: max limit exceeded"); + return; + } + + int nanoAppHandle = mNextHandle; + for (int i = 0; i <= Integer.MAX_VALUE; i++) { + if (!mNanoAppHash.containsKey(nanoAppHandle)) { + mNanoAppHash.put(nanoAppHandle, new NanoAppInstanceInfo( + nanoAppHandle, nanoAppId, nanoAppVersion, contextHubId)); + mNextHandle = (nanoAppHandle == Integer.MAX_VALUE) ? 0 : nanoAppHandle + 1; + break; + } + nanoAppHandle = (nanoAppHandle == Integer.MAX_VALUE) ? 0 : nanoAppHandle + 1; + } + + if (ENABLE_LOG_DEBUG) { + Log.v(TAG, "Added app instance with handle " + nanoAppHandle + " to hub " + + contextHubId + ": ID=0x" + Long.toHexString(nanoAppId) + + ", version=0x" + Integer.toHexString(nanoAppVersion)); + } + } + + /** + * Removes a nanoapp instance from the cache. + * + * @param nanoAppId the ID of the nanoapp to remove the instance of + */ + /* package */ + synchronized void removeNanoAppInstance(int contextHubId, long nanoAppId) { + int nanoAppHandle = getNanoAppHandle(contextHubId, nanoAppId); + mNanoAppHash.remove(nanoAppHandle); + } + + /** + * Performs a batch update of the nanoapp cache given a nanoapp query response. + * + * @param contextHubId the ID of the hub the response came from + * @param nanoAppInfoList the list of loaded nanoapps + */ + /* package */ + synchronized void updateCache(int contextHubId, List<HubAppInfo> nanoAppInfoList) { + HashSet<Long> nanoAppIdSet = new HashSet<>(); + for (HubAppInfo appInfo : nanoAppInfoList) { + handleQueryAppEntry(contextHubId, appInfo.appId, appInfo.version); + nanoAppIdSet.add(appInfo.appId); + } + + for (int nanoAppHandle : mNanoAppHash.keySet()) { + NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppHandle); + if (info.getContexthubId() == contextHubId && + !nanoAppIdSet.contains(info.getAppId())) { + mNanoAppHash.remove(nanoAppHandle); + } + } + } + + /** + * If the nanoapp exists in the cache, then the entry is updated. Otherwise, inserts a new + * instance of the nanoapp in the cache. This method should only be invoked from updateCache. + * + * @param contextHubId the ID of the hub the nanoapp is loaded in + * @param nanoAppId the unique 64-bit ID of the nanoapp + * @param nanoAppVersion the version of the nanoapp + */ + private void handleQueryAppEntry(int contextHubId, long nanoAppId, int nanoAppVersion) { + int nanoAppHandle = getNanoAppHandle(contextHubId, nanoAppId); + if (nanoAppHandle == -1) { + addNanoAppInstance(contextHubId, nanoAppId, nanoAppVersion); + } else { + NanoAppInstanceInfo info = mNanoAppHash.get(nanoAppHandle); + if (info.getAppVersion() != nanoAppVersion) { + mNanoAppHash.put(nanoAppHandle, new NanoAppInstanceInfo( + nanoAppHandle, nanoAppId, nanoAppVersion, contextHubId)); + if (ENABLE_LOG_DEBUG) { + Log.v(TAG, "Updated app instance with handle " + nanoAppHandle + " at hub " + + contextHubId + ": ID=0x" + Long.toHexString(nanoAppId) + + ", version=0x" + Integer.toHexString(nanoAppVersion)); + } + } + } + } +} diff --git a/services/core/java/com/android/server/location/OWNERS b/services/core/java/com/android/server/location/OWNERS index d3c0ea8caaf7..5f0369b5714d 100644 --- a/services/core/java/com/android/server/location/OWNERS +++ b/services/core/java/com/android/server/location/OWNERS @@ -1,4 +1,6 @@ ashutoshj@google.com bduddie@google.com +gomo@google.com +sooniln@google.com weiwa@google.com wyattriley@google.com diff --git a/services/core/java/com/android/server/location/RemoteListenerHelper.java b/services/core/java/com/android/server/location/RemoteListenerHelper.java index f51bc871c04f..58a95162ab82 100644 --- a/services/core/java/com/android/server/location/RemoteListenerHelper.java +++ b/services/core/java/com/android/server/location/RemoteListenerHelper.java @@ -16,8 +16,6 @@ package com.android.server.location; -import com.android.internal.util.Preconditions; - import android.annotation.NonNull; import android.os.Handler; import android.os.IBinder; @@ -25,7 +23,8 @@ import android.os.IInterface; import android.os.RemoteException; import android.util.Log; -import java.lang.Runnable; +import com.android.internal.util.Preconditions; + import java.util.HashMap; import java.util.Map; @@ -40,6 +39,7 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { protected static final int RESULT_GPS_LOCATION_DISABLED = 3; protected static final int RESULT_INTERNAL_ERROR = 4; protected static final int RESULT_UNKNOWN = 5; + protected static final int RESULT_NOT_ALLOWED = 6; private final Handler mHandler; private final String mTag; @@ -118,7 +118,8 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { protected abstract boolean isAvailableInPlatform(); protected abstract boolean isGpsEnabled(); - protected abstract boolean registerWithService(); // must access only on handler thread + // must access only on handler thread + protected abstract int registerWithService(); protected abstract void unregisterFromService(); // must access only on handler thread protected abstract ListenerOperation<TListener> getHandlerOperation(int result); @@ -177,10 +178,12 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { private void tryRegister() { mHandler.post(new Runnable() { + int registrationState = RESULT_INTERNAL_ERROR; @Override public void run() { if (!mIsRegistered) { - mIsRegistered = registerWithService(); + registrationState = registerWithService(); + mIsRegistered = registrationState == RESULT_SUCCESS; } if (!mIsRegistered) { // post back a failure @@ -188,7 +191,7 @@ abstract class RemoteListenerHelper<TListener extends IInterface> { @Override public void run() { synchronized (mListenerMap) { - ListenerOperation<TListener> operation = getHandlerOperation(RESULT_INTERNAL_ERROR); + ListenerOperation<TListener> operation = getHandlerOperation(registrationState); foreachUnsafe(operation); } } diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncUtils.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncUtils.java new file mode 100644 index 000000000000..e4d2b953b61a --- /dev/null +++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncUtils.java @@ -0,0 +1,167 @@ +/* + * 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.server.locksettings.recoverablekeystore; + +import java.nio.charset.StandardCharsets; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.util.HashMap; +import java.util.Map; + +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; + +/** + * Utility functions for the flow where the RecoverableKeyStoreLoader syncs keys with remote + * storage. + * + * @hide + */ +public class KeySyncUtils { + + private static final String RECOVERY_KEY_ALGORITHM = "AES"; + private static final int RECOVERY_KEY_SIZE_BITS = 256; + + private static final byte[] THM_ENCRYPTED_RECOVERY_KEY_HEADER = + "V1 THM_encrypted_recovery_key".getBytes(StandardCharsets.UTF_8); + private static final byte[] LOCALLY_ENCRYPTED_RECOVERY_KEY_HEADER = + "V1 locally_encrypted_recovery_key".getBytes(StandardCharsets.UTF_8); + private static final byte[] ENCRYPTED_APPLICATION_KEY_HEADER = + "V1 encrypted_application_key".getBytes(StandardCharsets.UTF_8); + + private static final byte[] THM_KF_HASH_PREFIX = "THM_KF_hash".getBytes(StandardCharsets.UTF_8); + + /** + * Encrypts the recovery key using both the lock screen hash and the remote storage's public + * key. + * + * @param publicKey The public key of the remote storage. + * @param lockScreenHash The user's lock screen hash. + * @param vaultParams Additional parameters to send to the remote storage. + * @param recoveryKey The recovery key. + * @return The encrypted bytes. + * @throws NoSuchAlgorithmException if any SecureBox algorithm is unavailable. + * @throws InvalidKeyException if the public key or the lock screen could not be used to encrypt + * the data. + * + * @hide + */ + public byte[] thmEncryptRecoveryKey( + PublicKey publicKey, + byte[] lockScreenHash, + byte[] vaultParams, + SecretKey recoveryKey + ) throws NoSuchAlgorithmException, InvalidKeyException { + byte[] encryptedRecoveryKey = locallyEncryptRecoveryKey(lockScreenHash, recoveryKey); + byte[] thmKfHash = calculateThmKfHash(lockScreenHash); + byte[] header = concat(THM_ENCRYPTED_RECOVERY_KEY_HEADER, vaultParams); + return SecureBox.encrypt( + /*theirPublicKey=*/ publicKey, + /*sharedSecret=*/ thmKfHash, + /*header=*/ header, + /*payload=*/ encryptedRecoveryKey); + } + + /** + * Calculates the THM_KF hash of the lock screen hash. + * + * @param lockScreenHash The lock screen hash. + * @return The hash. + * @throws NoSuchAlgorithmException if SHA-256 is unavailable (should never happen). + * + * @hide + */ + public static byte[] calculateThmKfHash(byte[] lockScreenHash) + throws NoSuchAlgorithmException { + MessageDigest messageDigest = MessageDigest.getInstance("SHA-256"); + messageDigest.update(THM_KF_HASH_PREFIX); + messageDigest.update(lockScreenHash); + return messageDigest.digest(); + } + + /** + * Encrypts the recovery key using the lock screen hash. + * + * @param lockScreenHash The raw lock screen hash. + * @param recoveryKey The recovery key. + * @return The encrypted bytes. + * @throws NoSuchAlgorithmException if any SecureBox algorithm is unavailable. + * @throws InvalidKeyException if the hash cannot be used to encrypt for some reason. + */ + private static byte[] locallyEncryptRecoveryKey(byte[] lockScreenHash, SecretKey recoveryKey) + throws NoSuchAlgorithmException, InvalidKeyException { + return SecureBox.encrypt( + /*theirPublicKey=*/ null, + /*sharedSecret=*/ lockScreenHash, + /*header=*/ LOCALLY_ENCRYPTED_RECOVERY_KEY_HEADER, + /*payload=*/ recoveryKey.getEncoded()); + } + + /** + * Returns a new random 256-bit AES recovery key. + * + * @hide + */ + public static SecretKey generateRecoveryKey() throws NoSuchAlgorithmException { + KeyGenerator keyGenerator = KeyGenerator.getInstance(RECOVERY_KEY_ALGORITHM); + keyGenerator.init(RECOVERY_KEY_SIZE_BITS, SecureRandom.getInstanceStrong()); + return keyGenerator.generateKey(); + } + + /** + * Encrypts all of the given keys with the recovery key, using SecureBox. + * + * @param recoveryKey The recovery key. + * @param keys The keys, indexed by their aliases. + * @return The encrypted key material, indexed by aliases. + * @throws NoSuchAlgorithmException if any of the SecureBox algorithms are unavailable. + * @throws InvalidKeyException if the recovery key is not appropriate for encrypting the keys. + * + * @hide + */ + public static Map<String, byte[]> encryptKeysWithRecoveryKey( + SecretKey recoveryKey, Map<String, SecretKey> keys) + throws NoSuchAlgorithmException, InvalidKeyException { + HashMap<String, byte[]> encryptedKeys = new HashMap<>(); + for (String alias : keys.keySet()) { + SecretKey key = keys.get(alias); + byte[] encryptedKey = SecureBox.encrypt( + /*theirPublicKey=*/ null, + /*sharedSecret=*/ recoveryKey.getEncoded(), + /*header=*/ ENCRYPTED_APPLICATION_KEY_HEADER, + /*payload=*/ key.getEncoded()); + encryptedKeys.put(alias, encryptedKey); + } + return encryptedKeys; + } + + /** + * Returns a new array, the contents of which are the concatenation of {@code a} and {@code b}. + */ + private static byte[] concat(byte[] a, byte[] b) { + byte[] result = new byte[a.length + b.length]; + System.arraycopy(a, 0, result, 0, a.length); + System.arraycopy(b, 0, result, a.length, b.length); + return result; + } + + // Statics only + private KeySyncUtils() {} +} diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/SecureBox.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/SecureBox.java new file mode 100644 index 000000000000..457fdc14c7f6 --- /dev/null +++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/SecureBox.java @@ -0,0 +1,39 @@ +/* + * 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.server.locksettings.recoverablekeystore; + +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; + +/** + * TODO(b/69056040) Add implementation of SecureBox. This is a placeholder so KeySyncUtils compiles. + * + * @hide + */ +public class SecureBox { + /** + * TODO(b/69056040) Add implementation of encrypt. + * + * @hide + */ + public static byte[] encrypt( + PublicKey theirPublicKey, byte[] sharedSecret, byte[] header, byte[] payload) + throws NoSuchAlgorithmException, InvalidKeyException { + throw new UnsupportedOperationException("Needs to be implemented."); + } +} diff --git a/services/core/java/com/android/server/locksettings/recoverablekeystore/WrappedKey.java b/services/core/java/com/android/server/locksettings/recoverablekeystore/WrappedKey.java index c97c66ef9016..9002292174ba 100644 --- a/services/core/java/com/android/server/locksettings/recoverablekeystore/WrappedKey.java +++ b/services/core/java/com/android/server/locksettings/recoverablekeystore/WrappedKey.java @@ -16,14 +16,21 @@ package com.android.server.locksettings.recoverablekeystore; +import android.util.Log; + +import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKey; +import javax.crypto.spec.GCMParameterSpec; /** * A {@link javax.crypto.SecretKey} wrapped with AES/GCM/NoPadding. @@ -31,7 +38,11 @@ import javax.crypto.SecretKey; * @hide */ public class WrappedKey { + private static final String TAG = "WrappedKey"; + private static final String KEY_WRAP_CIPHER_ALGORITHM = "AES/GCM/NoPadding"; + private static final String APPLICATION_KEY_ALGORITHM = "AES"; + private static final int GCM_TAG_LENGTH_BITS = 128; private final byte[] mNonce; private final byte[] mKeyMaterial; @@ -112,4 +123,54 @@ public class WrappedKey { public byte[] getKeyMaterial() { return mKeyMaterial; } + + /** + * Unwraps the {@code wrappedKeys} with the {@code platformKey}. + * + * @return The unwrapped keys, indexed by alias. + * @throws NoSuchAlgorithmException if AES/GCM/NoPadding Cipher or AES key type is unavailable. + * + * @hide + */ + public static Map<String, SecretKey> unwrapKeys( + SecretKey platformKey, + Map<String, WrappedKey> wrappedKeys) + throws NoSuchAlgorithmException, NoSuchPaddingException { + HashMap<String, SecretKey> unwrappedKeys = new HashMap<>(); + Cipher cipher = Cipher.getInstance(KEY_WRAP_CIPHER_ALGORITHM); + + for (String alias : wrappedKeys.keySet()) { + WrappedKey wrappedKey = wrappedKeys.get(alias); + try { + cipher.init( + Cipher.UNWRAP_MODE, + platformKey, + new GCMParameterSpec(GCM_TAG_LENGTH_BITS, wrappedKey.getNonce())); + } catch (InvalidKeyException | InvalidAlgorithmParameterException e) { + Log.e(TAG, + String.format( + Locale.US, + "Could not init Cipher to unwrap recoverable key with alias '%s'", + alias), + e); + continue; + } + SecretKey key; + try { + key = (SecretKey) cipher.unwrap( + wrappedKey.getKeyMaterial(), APPLICATION_KEY_ALGORITHM, Cipher.SECRET_KEY); + } catch (InvalidKeyException | NoSuchAlgorithmException e) { + Log.e(TAG, + String.format( + Locale.US, + "Error unwrapping recoverable key with alias '%s'", + alias), + e); + continue; + } + unwrappedKeys.put(alias, key); + } + + return unwrappedKeys; + } } diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS index 6b77d8326a39..5d4287b9a812 100644 --- a/services/core/java/com/android/server/net/OWNERS +++ b/services/core/java/com/android/server/net/OWNERS @@ -2,6 +2,7 @@ set noparent ek@google.com hugobenichi@google.com +jchalard@google.com jsharkey@android.com lorenzo@google.com satk@google.com diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 5f03dd262fa4..7c75f777ff1d 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3334,7 +3334,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } boolean keyguardOn() { - return isKeyguardShowingAndNotOccluded(); + return isKeyguardShowingAndNotOccluded() || inKeyguardRestrictedKeyInputMode(); } private static final int[] WINDOW_TYPES_WHERE_HOME_DOESNT_WORK = { @@ -6876,6 +6876,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { return mKeyguardOccluded; } + /** {@inheritDoc} */ + @Override + public boolean inKeyguardRestrictedKeyInputMode() { + if (mKeyguardDelegate == null) return false; + return mKeyguardDelegate.isInputRestricted(); + } + @Override public void dismissKeyguardLw(IKeyguardDismissCallback callback) { if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) { diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index bcb7212b620c..cfe4088781b4 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -1360,6 +1360,17 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { public boolean isKeyguardTrustedLw(); /** + * inKeyguardRestrictedKeyInputMode + * + * If keyguard screen is showing or in restricted key input mode (i.e. in + * keyguard password emergency screen). When in such mode, certain keys, + * such as the Home key and the right soft keys, don't work. + * + * @return true if in keyguard restricted input mode. + */ + public boolean inKeyguardRestrictedKeyInputMode(); + + /** * Ask the policy to dismiss the keyguard, if it is currently shown. * * @param callback Callback to be informed about the result. diff --git a/services/core/java/com/android/server/slice/PinnedSliceState.java b/services/core/java/com/android/server/slice/PinnedSliceState.java new file mode 100644 index 000000000000..cf930f5cc6b7 --- /dev/null +++ b/services/core/java/com/android/server/slice/PinnedSliceState.java @@ -0,0 +1,215 @@ +/* + * 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.server.slice; + +import android.app.slice.ISliceListener; +import android.app.slice.Slice; +import android.app.slice.SliceProvider; +import android.app.slice.SliceSpec; +import android.content.ContentProviderClient; +import android.net.Uri; +import android.os.Bundle; +import android.os.RemoteException; +import android.util.ArraySet; +import android.util.Log; + +import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * Manages the state of a pinned slice. + */ +public class PinnedSliceState { + + private static final long SLICE_TIMEOUT = 5000; + private static final String TAG = "PinnedSliceState"; + + private final Object mLock; + + private final SliceManagerService mService; + private final Uri mUri; + @GuardedBy("mLock") + private final ArraySet<String> mPinnedPkgs = new ArraySet<>(); + @GuardedBy("mLock") + private final ArraySet<ISliceListener> mListeners = new ArraySet<>(); + @GuardedBy("mLock") + private SliceSpec[] mSupportedSpecs = null; + + public PinnedSliceState(SliceManagerService service, Uri uri) { + mService = service; + mUri = uri; + mService.getHandler().post(this::handleSendPinned); + mLock = mService.getLock(); + } + + public SliceSpec[] getSpecs() { + return mSupportedSpecs; + } + + public void mergeSpecs(SliceSpec[] supportedSpecs) { + synchronized (mLock) { + if (mSupportedSpecs == null) { + mSupportedSpecs = supportedSpecs; + } else { + List<SliceSpec> specs = Arrays.asList(mSupportedSpecs); + mSupportedSpecs = specs.stream().map(s -> { + SliceSpec other = findSpec(supportedSpecs, s.getType()); + if (other == null) return null; + if (other.getRevision() < s.getRevision()) { + return other; + } + return s; + }).filter(s -> s != null).toArray(SliceSpec[]::new); + } + } + } + + private SliceSpec findSpec(SliceSpec[] specs, String type) { + for (SliceSpec spec : specs) { + if (Objects.equals(spec.getType(), type)) { + return spec; + } + } + return null; + } + + public Uri getUri() { + return mUri; + } + + public void destroy() { + mService.getHandler().post(this::handleSendUnpinned); + } + + public void onChange() { + mService.getHandler().post(this::handleBind); + } + + public void addSliceListener(ISliceListener listener, SliceSpec[] specs) { + synchronized (mLock) { + if (mListeners.add(listener) && mListeners.size() == 1) { + mService.listen(mUri); + } + mergeSpecs(specs); + } + } + + public boolean removeSliceListener(ISliceListener listener) { + synchronized (mLock) { + if (mListeners.remove(listener) && mListeners.size() == 0) { + mService.unlisten(mUri); + } + } + return !isPinned(); + } + + public void pin(String pkg, SliceSpec[] specs) { + synchronized (mLock) { + mPinnedPkgs.add(pkg); + mergeSpecs(specs); + } + } + + public boolean unpin(String pkg) { + synchronized (mLock) { + mPinnedPkgs.remove(pkg); + } + return !isPinned(); + } + + public boolean isListening() { + synchronized (mLock) { + return !mListeners.isEmpty(); + } + } + + @VisibleForTesting + public boolean isPinned() { + synchronized (mLock) { + return !mPinnedPkgs.isEmpty() || !mListeners.isEmpty(); + } + } + + ContentProviderClient getClient() { + ContentProviderClient client = + mService.getContext().getContentResolver().acquireContentProviderClient(mUri); + client.setDetectNotResponding(SLICE_TIMEOUT); + return client; + } + + private void handleBind() { + Slice s; + try (ContentProviderClient client = getClient()) { + Bundle extras = new Bundle(); + extras.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri); + extras.putParcelableArrayList(SliceProvider.EXTRA_SUPPORTED_SPECS, + new ArrayList<>(Arrays.asList(mSupportedSpecs))); + final Bundle res; + try { + res = client.call(SliceProvider.METHOD_SLICE, null, extras); + } catch (RemoteException e) { + Log.e(TAG, "Unable to bind slice " + mUri, e); + return; + } + if (res == null) return; + Bundle.setDefusable(res, true); + s = res.getParcelable(SliceProvider.EXTRA_SLICE); + } + synchronized (mLock) { + mListeners.removeIf(l -> { + try { + l.onSliceUpdated(s); + return false; + } catch (RemoteException e) { + Log.e(TAG, "Unable to notify slice " + mUri, e); + return true; + } + }); + if (!isPinned()) { + // All the listeners died, remove from pinned state. + mService.removePinnedSlice(mUri); + } + } + } + + private void handleSendPinned() { + try (ContentProviderClient client = getClient()) { + Bundle b = new Bundle(); + b.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri); + try { + client.call(SliceProvider.METHOD_PIN, null, b); + } catch (RemoteException e) { + Log.w(TAG, "Unable to contact " + mUri, e); + } + } + } + + private void handleSendUnpinned() { + try (ContentProviderClient client = getClient()) { + Bundle b = new Bundle(); + b.putParcelable(SliceProvider.EXTRA_BIND_URI, mUri); + try { + client.call(SliceProvider.METHOD_UNPIN, null, b); + } catch (RemoteException e) { + Log.w(TAG, "Unable to contact " + mUri, e); + } + } + } +} diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java index 047e270f3fac..2d9e772a6b0c 100644 --- a/services/core/java/com/android/server/slice/SliceManagerService.java +++ b/services/core/java/com/android/server/slice/SliceManagerService.java @@ -16,21 +16,307 @@ package com.android.server.slice; +import static android.content.ContentProvider.getUserIdFromUri; +import static android.content.ContentProvider.maybeAddUserId; + +import android.Manifest.permission; +import android.app.AppOpsManager; +import android.app.slice.ISliceListener; import android.app.slice.ISliceManager; +import android.app.slice.SliceSpec; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManagerInternal; +import android.content.pm.ResolveInfo; +import android.database.ContentObserver; +import android.net.Uri; +import android.os.Binder; +import android.os.Handler; +import android.os.Looper; +import android.os.Process; +import android.os.RemoteException; +import android.util.ArrayMap; +import android.util.Log; +import com.android.internal.annotations.GuardedBy; +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.app.AssistUtils; +import com.android.internal.util.Preconditions; +import com.android.server.LocalServices; +import com.android.server.ServiceThread; import com.android.server.SystemService; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + public class SliceManagerService extends ISliceManager.Stub { + private static final String TAG = "SliceManagerService"; + private final Object mLock = new Object(); + + private final Context mContext; + private final PackageManagerInternal mPackageManagerInternal; + private final AppOpsManager mAppOps; + private final AssistUtils mAssistUtils; + + @GuardedBy("mLock") + private final ArrayMap<Uri, PinnedSliceState> mPinnedSlicesByUri = new ArrayMap<>(); + private final Handler mHandler; + private final ContentObserver mObserver; + public SliceManagerService(Context context) { + this(context, createHandler().getLooper()); + } + @VisibleForTesting + SliceManagerService(Context context, Looper looper) { + mContext = context; + mPackageManagerInternal = Preconditions.checkNotNull( + LocalServices.getService(PackageManagerInternal.class)); + mAppOps = context.getSystemService(AppOpsManager.class); + mAssistUtils = new AssistUtils(context); + mHandler = new Handler(looper); + + mObserver = new ContentObserver(mHandler) { + @Override + public void onChange(boolean selfChange, Uri uri) { + try { + getPinnedSlice(uri).onChange(); + } catch (IllegalStateException e) { + Log.e(TAG, "Received change for unpinned slice " + uri, e); + } + } + }; } + /// ----- Lifecycle stuff ----- private void systemReady() { } - private void onUnlockUser(int userHandle) { + private void onUnlockUser(int userId) { + } + + private void onStopUser(int userId) { + synchronized (mLock) { + mPinnedSlicesByUri.values().removeIf(s -> getUserIdFromUri(s.getUri()) == userId); + } + } + + /// ----- ISliceManager stuff ----- + @Override + public void addSliceListener(Uri uri, String pkg, ISliceListener listener, SliceSpec[] specs) + throws RemoteException { + verifyCaller(pkg); + uri = maybeAddUserId(uri, Binder.getCallingUserHandle().getIdentifier()); + enforceAccess(pkg, uri); + getOrCreatePinnedSlice(uri).addSliceListener(listener, specs); + } + + @Override + public void removeSliceListener(Uri uri, String pkg, ISliceListener listener) + throws RemoteException { + verifyCaller(pkg); + uri = maybeAddUserId(uri, Binder.getCallingUserHandle().getIdentifier()); + enforceAccess(pkg, uri); + if (getPinnedSlice(uri).removeSliceListener(listener)) { + removePinnedSlice(uri); + } + } + + @Override + public void pinSlice(String pkg, Uri uri, SliceSpec[] specs) throws RemoteException { + verifyCaller(pkg); + enforceFullAccess(pkg, "pinSlice", uri); + uri = maybeAddUserId(uri, Binder.getCallingUserHandle().getIdentifier()); + getOrCreatePinnedSlice(uri).pin(pkg, specs); + } + + @Override + public void unpinSlice(String pkg, Uri uri) throws RemoteException { + verifyCaller(pkg); + enforceFullAccess(pkg, "unpinSlice", uri); + uri = maybeAddUserId(uri, Binder.getCallingUserHandle().getIdentifier()); + if (getPinnedSlice(uri).unpin(pkg)) { + removePinnedSlice(uri); + } + } + + @Override + public boolean hasSliceAccess(String pkg) throws RemoteException { + verifyCaller(pkg); + return hasFullSliceAccess(pkg, Binder.getCallingUserHandle().getIdentifier()); + } + + @Override + public SliceSpec[] getPinnedSpecs(Uri uri, String pkg) throws RemoteException { + verifyCaller(pkg); + enforceAccess(pkg, uri); + return getPinnedSlice(uri).getSpecs(); + } + + /// ----- internal code ----- + void removePinnedSlice(Uri uri) { + synchronized (mLock) { + mPinnedSlicesByUri.remove(uri).destroy(); + } + } + + private PinnedSliceState getPinnedSlice(Uri uri) { + synchronized (mLock) { + PinnedSliceState manager = mPinnedSlicesByUri.get(uri); + if (manager == null) { + throw new IllegalStateException(String.format("Slice %s not pinned", + uri.toString())); + } + return manager; + } + } + + private PinnedSliceState getOrCreatePinnedSlice(Uri uri) { + synchronized (mLock) { + PinnedSliceState manager = mPinnedSlicesByUri.get(uri); + if (manager == null) { + manager = createPinnedSlice(uri); + mPinnedSlicesByUri.put(uri, manager); + } + return manager; + } + } + + @VisibleForTesting + PinnedSliceState createPinnedSlice(Uri uri) { + return new PinnedSliceState(this, uri); + } + + public Object getLock() { + return mLock; + } + + public Context getContext() { + return mContext; + } + + public Handler getHandler() { + return mHandler; + } + + private void enforceAccess(String pkg, Uri uri) { + getContext().enforceUriPermission(uri, permission.BIND_SLICE, + permission.BIND_SLICE, Binder.getCallingPid(), Binder.getCallingUid(), + Intent.FLAG_GRANT_WRITE_URI_PERMISSION, + "Slice binding requires the permission BIND_SLICE"); + int user = Binder.getCallingUserHandle().getIdentifier(); + if (getUserIdFromUri(uri, user) != user) { + getContext().enforceCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS_FULL, + "Slice interaction across users requires INTERACT_ACROSS_USERS_FULL"); + } + } + + private void enforceFullAccess(String pkg, String name, Uri uri) { + int user = Binder.getCallingUserHandle().getIdentifier(); + if (!hasFullSliceAccess(pkg, user)) { + throw new SecurityException(String.format("Call %s requires full slice access", name)); + } + if (getUserIdFromUri(uri, user) != user) { + getContext().enforceCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS_FULL, + "Slice interaction across users requires INTERACT_ACROSS_USERS_FULL"); + } + } + + private void verifyCaller(String pkg) { + mAppOps.checkPackage(Binder.getCallingUid(), pkg); + } + + private boolean hasFullSliceAccess(String pkg, int userId) { + return isDefaultHomeApp(pkg, userId) || isAssistant(pkg, userId) + || isGrantedFullAccess(pkg, userId); + } + + private boolean isAssistant(String pkg, int userId) { + final ComponentName cn = mAssistUtils.getAssistComponentForUser(userId); + if (cn == null) { + return false; + } + return cn.getPackageName().equals(pkg); + } + + public void listen(Uri uri) { + mContext.getContentResolver().registerContentObserver(uri, true, mObserver); + } + + public void unlisten(Uri uri) { + mContext.getContentResolver().unregisterContentObserver(mObserver); + synchronized (mLock) { + mPinnedSlicesByUri.forEach((u, s) -> { + if (s.isListening()) { + listen(u); + } + }); + } + } + + private boolean isDefaultHomeApp(String pkg, int userId) { + String defaultHome = getDefaultHome(userId); + return Objects.equals(pkg, defaultHome); + } + + // Based on getDefaultHome in ShortcutService. + // TODO: Unify if possible + @VisibleForTesting + String getDefaultHome(int userId) { + final long token = Binder.clearCallingIdentity(); + try { + final List<ResolveInfo> allHomeCandidates = new ArrayList<>(); + + // Default launcher from package manager. + final ComponentName defaultLauncher = mPackageManagerInternal + .getHomeActivitiesAsUser(allHomeCandidates, userId); + + ComponentName detected = null; + if (defaultLauncher != null) { + detected = defaultLauncher; + } + + if (detected == null) { + // If we reach here, that means it's the first check since the user was created, + // and there's already multiple launchers and there's no default set. + // Find the system one with the highest priority. + // (We need to check the priority too because of FallbackHome in Settings.) + // If there's no system launcher yet, then no one can access slices, until + // the user explicitly sets one. + final int size = allHomeCandidates.size(); + + int lastPriority = Integer.MIN_VALUE; + for (int i = 0; i < size; i++) { + final ResolveInfo ri = allHomeCandidates.get(i); + if (!ri.activityInfo.applicationInfo.isSystemApp()) { + continue; + } + if (ri.priority < lastPriority) { + continue; + } + detected = ri.activityInfo.getComponentName(); + lastPriority = ri.priority; + } + } + return detected.getPackageName(); + } finally { + Binder.restoreCallingIdentity(token); + } + } + + private boolean isGrantedFullAccess(String pkg, int userId) { + // TODO: This will be user granted access, if we allow this through a prompt. + return false; + } + + private static ServiceThread createHandler() { + ServiceThread handlerThread = new ServiceThread(TAG, + Process.THREAD_PRIORITY_BACKGROUND, true /*allowIo*/); + handlerThread.start(); + return handlerThread; } public static class Lifecycle extends SystemService { @@ -57,5 +343,10 @@ public class SliceManagerService extends ISliceManager.Stub { public void onUnlockUser(int userHandle) { mService.onUnlockUser(userHandle); } + + @Override + public void onStopUser(int userHandle) { + mService.onStopUser(userHandle); + } } } diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index c39ce982e4cb..94a0cb715ec4 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -66,6 +66,7 @@ import android.view.IApplicationToken; import android.view.SurfaceControl; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; +import android.view.animation.Transformation; import com.android.internal.util.ToBooleanFunction; import com.android.server.input.InputApplicationHandle; @@ -75,6 +76,7 @@ import com.android.server.wm.WindowManagerService.H; import java.io.PrintWriter; import java.util.ArrayDeque; import java.util.ArrayList; +import java.util.LinkedList; class AppTokenList extends ArrayList<AppWindowToken> { } @@ -231,7 +233,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree // If this initial window is animating, stop it -- we will do an animation to reveal // it from behind the starting window, so there is no need for it to also be doing its // own stuff. - winAnimator.clearAnimation(); + win.cancelAnimation(); if (getController() != null) { getController().removeStartingWindow(); } @@ -389,7 +391,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } for (int i = mChildren.size() - 1; i >= 0 && !delayed; i--) { - if ((mChildren.get(i)).isWindowAnimationSet()) { + if ((mChildren.get(i)).isSelfOrChildAnimating()) { delayed = true; } } @@ -610,8 +612,12 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree */ private void destroySurfaces(boolean cleanupOnResume) { boolean destroyedSomething = false; - for (int i = mChildren.size() - 1; i >= 0; i--) { - final WindowState win = mChildren.get(i); + + // Copying to a different list as multiple children can be removed. + // TODO: Not sure why this is needed. + final LinkedList<WindowState> children = new LinkedList<>(mChildren); + for (int i = children.size() - 1; i >= 0; i--) { + final WindowState win = children.get(i); destroyedSomething |= win.destroySurface(cleanupOnResume, mAppStopped); } if (destroyedSomething) { @@ -1320,7 +1326,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree + " pv=" + w.mPolicyVisibility + " mDrawState=" + winAnimator.drawStateToString() + " ph=" + w.isParentWindowHidden() + " th=" + hiddenRequested - + " a=" + winAnimator.mAnimating); + + " a=" + winAnimator.isAnimationSet()); } } @@ -1520,6 +1526,11 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } @Override + boolean isSelfAnimating() { + return mAppAnimator.isAnimating(); + } + + @Override void dump(PrintWriter pw, String prefix) { super.dump(pw, prefix); if (appToken != null) { diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index eda8fec7ab39..f45845752054 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -146,6 +146,7 @@ import android.view.InputDevice; import android.view.MagnificationSpec; import android.view.Surface; import android.view.SurfaceControl; +import android.view.SurfaceControl.Transaction; import android.view.SurfaceSession; import com.android.internal.annotations.VisibleForTesting; @@ -339,6 +340,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo new ApplySurfaceChangesTransactionState(); private final ScreenshotApplicationState mScreenshotApplicationState = new ScreenshotApplicationState(); + private final Transaction mTmpTransaction = new Transaction(); // True if this display is in the process of being removed. Used to determine if the removal of // the display's direct children should be allowed. @@ -379,29 +381,11 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo */ private final ArrayList<SurfaceControl> mPendingDestroyingSurfaces = new ArrayList<>(); + /** Temporary float array to retrieve 3x3 matrix values. */ + private final float[] mTmpFloats = new float[9]; + private final Consumer<WindowState> mUpdateWindowsForAnimator = w -> { WindowStateAnimator winAnimator = w.mWinAnimator; - if (winAnimator.hasSurface()) { - final boolean wasAnimating = winAnimator.mWasAnimating; - final boolean nowAnimating = winAnimator.stepAnimationLocked( - mTmpWindowAnimator.mCurrentTime); - winAnimator.mWasAnimating = nowAnimating; - mTmpWindowAnimator.orAnimating(nowAnimating); - - if (DEBUG_WALLPAPER) Slog.v(TAG, - w + ": wasAnimating=" + wasAnimating + ", nowAnimating=" + nowAnimating); - - if (wasAnimating && !winAnimator.mAnimating - && mWallpaperController.isWallpaperTarget(w)) { - mTmpWindowAnimator.mBulkUpdateParams |= SET_WALLPAPER_MAY_CHANGE; - pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER; - if (DEBUG_LAYOUT_REPEATS) { - mService.mWindowPlacerLocked.debugLayoutRepeats( - "updateWindowsAndWallpaperLocked 2", pendingLayoutChanges); - } - } - } - final AppWindowToken atoken = w.mAppToken; if (winAnimator.mDrawState == READY_TO_SHOW) { if (atoken == null || atoken.allDrawn) { @@ -434,13 +418,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo // If this window is animating, make a note that we have an animating window and take // care of a request to run a detached wallpaper animation. - if (winAnimator.mAnimating) { - if (winAnimator.mAnimation != null) { - if ((flags & FLAG_SHOW_WALLPAPER) != 0 - && winAnimator.mAnimation.getDetachWallpaper()) { + if (winAnimator.isAnimationSet()) { + final AnimationAdapter anim = w.getAnimation(); + if (anim != null) { + if ((flags & FLAG_SHOW_WALLPAPER) != 0 && anim.getDetachWallpaper()) { mTmpWindow = w; } - final int color = winAnimator.mAnimation.getBackgroundColor(); + final int color = anim.getBackgroundColor(); if (color != 0) { final TaskStack stack = w.getStack(); if (stack != null) { @@ -448,7 +432,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } } } - mTmpWindowAnimator.setAnimating(true); } // If this window's app token is running a detached wallpaper animation, make a note so @@ -684,7 +667,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo mWallpaperController.updateWallpaperVisibility(); } - w.handleWindowMovedIfNeeded(); + // Use mTmpTransaction instead of mPendingTransaction because we don't want to commit + // other changes in mPendingTransaction at this point. + w.handleWindowMovedIfNeeded(mTmpTransaction); + SurfaceControl.mergeToGlobalTransaction(mTmpTransaction); final WindowStateAnimator winAnimator = w.mWinAnimator; @@ -720,7 +706,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } } final TaskStack stack = w.getStack(); - if ((!winAnimator.isAnimationStarting() && !winAnimator.isWaitingForOpening()) + if ((!winAnimator.isWaitingForOpening()) || (stack != null && stack.isAnimatingBounds())) { // Updates the shown frame before we set up the surface. This is needed // because the resizing could change the top-left position (in addition to @@ -736,6 +722,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo winAnimator.computeShownFrameLocked(); } winAnimator.setSurfaceBoundariesLocked(mTmpRecoveringMemory /* recoveringMemory */); + + // Since setSurfaceBoundariesLocked applies the clipping, we need to apply the position + // to the surface of the window container as well. Use mTmpTransaction instead of + // mPendingTransaction to avoid committing any existing changes in there. + w.updateSurfacePosition(mTmpTransaction); + SurfaceControl.mergeToGlobalTransaction(mTmpTransaction); } final AppWindowToken atoken = w.mAppToken; @@ -2617,8 +2609,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo forAllWindows(w -> { if (w.mAppToken == null && policy.canBeHiddenByKeyguardLw(w) && w.wouldBeVisibleIfPolicyIgnored() && !w.isVisible()) { - w.mWinAnimator.setAnimation( - policy.createHiddenByKeyguardExit(onWallpaper, goingToShade)); + w.startAnimation(policy.createHiddenByKeyguardExit(onWallpaper, goingToShade)); } }, true /* traverseTopToBottom */); } @@ -3775,13 +3766,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } @Override - void destroyAfterPendingTransaction(SurfaceControl surface) { + public void destroyAfterPendingTransaction(SurfaceControl surface) { mPendingDestroyingSurfaces.add(surface); } /** * Destroys any surfaces that have been put into the pending list with - * {@link #destroyAfterTransaction}. + * {@link #destroyAfterPendingTransaction}. */ void onPendingTransactionApplied() { for (int i = mPendingDestroyingSurfaces.size() - 1; i >= 0; i--) { @@ -3789,4 +3780,21 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } mPendingDestroyingSurfaces.clear(); } + + @Override + void prepareSurfaces() { + final ScreenRotationAnimation screenRotationAnimation = + mService.mAnimator.getScreenRotationAnimationLocked(mDisplayId); + if (screenRotationAnimation != null && screenRotationAnimation.isAnimating()) { + screenRotationAnimation.getEnterTransformation().getMatrix().getValues(mTmpFloats); + mPendingTransaction.setMatrix(mWindowingLayer, + mTmpFloats[Matrix.MSCALE_X], mTmpFloats[Matrix.MSKEW_Y], + mTmpFloats[Matrix.MSKEW_X], mTmpFloats[Matrix.MSCALE_Y]); + mPendingTransaction.setPosition(mWindowingLayer, + mTmpFloats[Matrix.MTRANS_X], mTmpFloats[Matrix.MTRANS_Y]); + mPendingTransaction.setAlpha(mWindowingLayer, + screenRotationAnimation.getEnterTransformation().getAlpha()); + } + super.prepareSurfaces(); + } } diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java index a37598e706c6..03c0768cdec0 100644 --- a/services/core/java/com/android/server/wm/DockedStackDividerController.java +++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java @@ -751,10 +751,10 @@ public class DockedStackDividerController { // There might be an old window delaying the animation start - clear it. if (mDelayedImeWin != null) { - mDelayedImeWin.mWinAnimator.endDelayingAnimationStart(); + mDelayedImeWin.endDelayingAnimationStart(); } mDelayedImeWin = imeWin; - imeWin.mWinAnimator.startDelayingAnimationStart(); + imeWin.startDelayingAnimationStart(); } // If we are already waiting for something to be drawn, clear out the old one so it @@ -765,25 +765,27 @@ public class DockedStackDividerController { mService.mWaitingForDrawnCallback.run(); } mService.mWaitingForDrawnCallback = () -> { - mAnimationStartDelayed = false; - if (mDelayedImeWin != null) { - mDelayedImeWin.mWinAnimator.endDelayingAnimationStart(); - } - // If the adjust status changed since this was posted, only notify - // the new states and don't animate. - long duration = 0; - if (mAdjustedForIme == adjustedForIme - && mAdjustedForDivider == adjustedForDivider) { - duration = IME_ADJUST_ANIM_DURATION; - } else { - Slog.w(TAG, "IME adjust changed while waiting for drawn:" - + " adjustedForIme=" + adjustedForIme - + " adjustedForDivider=" + adjustedForDivider - + " mAdjustedForIme=" + mAdjustedForIme - + " mAdjustedForDivider=" + mAdjustedForDivider); + synchronized (mService.mWindowMap) { + mAnimationStartDelayed = false; + if (mDelayedImeWin != null) { + mDelayedImeWin.endDelayingAnimationStart(); + } + // If the adjust status changed since this was posted, only notify + // the new states and don't animate. + long duration = 0; + if (mAdjustedForIme == adjustedForIme + && mAdjustedForDivider == adjustedForDivider) { + duration = IME_ADJUST_ANIM_DURATION; + } else { + Slog.w(TAG, "IME adjust changed while waiting for drawn:" + + " adjustedForIme=" + adjustedForIme + + " adjustedForDivider=" + adjustedForDivider + + " mAdjustedForIme=" + mAdjustedForIme + + " mAdjustedForDivider=" + mAdjustedForDivider); + } + notifyAdjustedForImeChanged( + mAdjustedForIme || mAdjustedForDivider, duration); } - notifyAdjustedForImeChanged( - mAdjustedForIme || mAdjustedForDivider, duration); }; } else { notifyAdjustedForImeChanged( diff --git a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java index 5bc27223edf4..3ef9b3fff80a 100644 --- a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java +++ b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java @@ -29,7 +29,6 @@ import android.util.ArrayMap; import android.view.Choreographer; import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; -import android.view.animation.Transformation; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; @@ -44,12 +43,19 @@ class SurfaceAnimationRunner { private final Object mLock = new Object(); + /** + * Lock for cancelling animations. Must be acquired on it's own, or after acquiring + * {@link #mLock} + */ + private final Object mCancelLock = new Object(); + @VisibleForTesting Choreographer mChoreographer; private final Runnable mApplyTransactionRunnable = this::applyTransaction; private final AnimationHandler mAnimationHandler; private final Transaction mFrameTransaction; + private final AnimatorFactory mAnimatorFactory; private boolean mApplyScheduled; @GuardedBy("mLock") @@ -58,15 +64,15 @@ class SurfaceAnimationRunner { @GuardedBy("mLock") @VisibleForTesting - final ArrayMap<SurfaceControl, ValueAnimator> mRunningAnimations = new ArrayMap<>(); + final ArrayMap<SurfaceControl, RunningAnimation> mRunningAnimations = new ArrayMap<>(); SurfaceAnimationRunner() { - this(null /* callbackProvider */, new Transaction()); + this(null /* callbackProvider */, null /* animatorFactory */, new Transaction()); } @VisibleForTesting SurfaceAnimationRunner(@Nullable AnimationFrameCallbackProvider callbackProvider, - Transaction frameTransaction) { + AnimatorFactory animatorFactory, Transaction frameTransaction) { SurfaceAnimationThread.getHandler().runWithScissors(() -> mChoreographer = getSfInstance(), 0 /* timeout */); mFrameTransaction = frameTransaction; @@ -74,6 +80,9 @@ class SurfaceAnimationRunner { mAnimationHandler.setProvider(callbackProvider != null ? callbackProvider : new SfVsyncFrameCallbackProvider(mChoreographer)); + mAnimatorFactory = animatorFactory != null + ? animatorFactory + : SfValueAnimator::new; } void startAnimation(AnimationSpec a, SurfaceControl animationLeash, Transaction t, @@ -94,18 +103,17 @@ class SurfaceAnimationRunner { synchronized (mLock) { if (mPendingAnimations.containsKey(leash)) { mPendingAnimations.remove(leash); - // TODO: Releasing the leash is problematic if reparenting hasn't happened yet. - // Fix with transaction - //leash.release(); return; } - final ValueAnimator anim = mRunningAnimations.get(leash); + final RunningAnimation anim = mRunningAnimations.get(leash); if (anim != null) { mRunningAnimations.remove(leash); + synchronized (mCancelLock) { + anim.mCancelled = true; + } SurfaceAnimationThread.getHandler().post(() -> { - anim.cancel(); + anim.mAnim.cancel(); applyTransaction(); - //leash.release(); }); } } @@ -119,54 +127,51 @@ class SurfaceAnimationRunner { } private void startAnimationLocked(RunningAnimation a) { - final ValueAnimator result = new SfValueAnimator(); + final ValueAnimator anim = mAnimatorFactory.makeAnimator(); // Animation length is already expected to be scaled. - result.overrideDurationScale(1.0f); - result.setDuration(a.animSpec.getDuration()); - result.addUpdateListener(animation -> { - applyTransformation(a, mFrameTransaction, result.getCurrentPlayTime()); + anim.overrideDurationScale(1.0f); + anim.setDuration(a.mAnimSpec.getDuration()); + anim.addUpdateListener(animation -> { + synchronized (mCancelLock) { + if (!a.mCancelled) { + applyTransformation(a, mFrameTransaction, anim.getCurrentPlayTime()); + } + } // Transaction will be applied in the commit phase. scheduleApplyTransaction(); }); - result.addListener(new AnimatorListenerAdapter() { - - private boolean mCancelled; - + anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationStart(Animator animation) { - mFrameTransaction.show(a.leash); - } - - @Override - public void onAnimationCancel(Animator animation) { - mCancelled = true; + synchronized (mCancelLock) { + if (!a.mCancelled) { + mFrameTransaction.show(a.mLeash); + } + } } @Override public void onAnimationEnd(Animator animation) { synchronized (mLock) { - mRunningAnimations.remove(a.leash); - } - if (!mCancelled) { - // Post on other thread that we can push final state without jank. - AnimationThread.getHandler().post(() -> { - a.finishCallback.run(); - - // Make sure to release the leash after finishCallback has been invoked such - // that reparenting is done already when releasing the leash. - a.leash.release(); - }); + mRunningAnimations.remove(a.mLeash); + synchronized (mCancelLock) { + if (!a.mCancelled) { + // Post on other thread that we can push final state without jank. + AnimationThread.getHandler().post(a.mFinishCallback); + } + } } } }); - result.start(); - mRunningAnimations.put(a.leash, result); + anim.start(); + a.mAnim = anim; + mRunningAnimations.put(a.mLeash, a); } private void applyTransformation(RunningAnimation a, Transaction t, long currentPlayTime) { - a.animSpec.apply(t, a.leash, currentPlayTime); + a.mAnimSpec.apply(t, a.mLeash, currentPlayTime); } private void stepAnimation(long frameTimeNanos) { @@ -189,17 +194,26 @@ class SurfaceAnimationRunner { } private static final class RunningAnimation { - final AnimationSpec animSpec; - final SurfaceControl leash; - final Runnable finishCallback; + final AnimationSpec mAnimSpec; + final SurfaceControl mLeash; + final Runnable mFinishCallback; + ValueAnimator mAnim; + + @GuardedBy("mCancelLock") + private boolean mCancelled; RunningAnimation(AnimationSpec animSpec, SurfaceControl leash, Runnable finishCallback) { - this.animSpec = animSpec; - this.leash = leash; - this.finishCallback = finishCallback; + mAnimSpec = animSpec; + mLeash = leash; + mFinishCallback = finishCallback; } } + @VisibleForTesting + interface AnimatorFactory { + ValueAnimator makeAnimator(); + } + /** * Value animator that uses sf-vsync signal to tick. */ diff --git a/services/core/java/com/android/server/wm/SurfaceAnimator.java b/services/core/java/com/android/server/wm/SurfaceAnimator.java index 713d58ba4d1a..e1652111a64e 100644 --- a/services/core/java/com/android/server/wm/SurfaceAnimator.java +++ b/services/core/java/com/android/server/wm/SurfaceAnimator.java @@ -97,7 +97,7 @@ class SurfaceAnimator { void startAnimation(Transaction t, AnimationAdapter anim, boolean hidden) { cancelAnimation(t, true /* restarting */); mAnimation = anim; - final SurfaceControl surface = mAnimatable.getSurface(); + final SurfaceControl surface = mAnimatable.getSurfaceControl(); if (surface == null) { Slog.w(TAG, "Unable to start animation, surface is null or no children."); cancelAnimation(); @@ -105,7 +105,7 @@ class SurfaceAnimator { } mLeash = createAnimationLeash(surface, t, mAnimatable.getSurfaceWidth(), mAnimatable.getSurfaceHeight(), hidden); - mAnimatable.onLeashCreated(t, mLeash); + mAnimatable.onAnimationLeashCreated(t, mLeash); if (mAnimationStartDelayed) { if (DEBUG_ANIM) Slog.i(TAG, "Animation start delayed"); return; @@ -169,7 +169,16 @@ class SurfaceAnimator { * surface is reparented to the leash. This method takes care of that. */ void setLayer(Transaction t, int layer) { - t.setLayer(mLeash != null ? mLeash : mAnimatable.getSurface(), layer); + t.setLayer(mLeash != null ? mLeash : mAnimatable.getSurfaceControl(), layer); + } + + /** + * Sets the surface to be relatively layered. + * + * @see #setLayer + */ + void setRelativeLayer(Transaction t, SurfaceControl relativeTo, int layer) { + t.setRelativeLayer(mLeash != null ? mLeash : mAnimatable.getSurfaceControl(), relativeTo, layer); } /** @@ -178,7 +187,7 @@ class SurfaceAnimator { * @see #setLayer */ void reparent(Transaction t, SurfaceControl newParent) { - t.reparent(mLeash != null ? mLeash : mAnimatable.getSurface(), newParent.getHandle()); + t.reparent(mLeash != null ? mLeash : mAnimatable.getSurfaceControl(), newParent.getHandle()); } /** @@ -207,8 +216,8 @@ class SurfaceAnimator { } private void reset(Transaction t) { - final SurfaceControl surface = mAnimatable.getSurface(); - final SurfaceControl parent = mAnimatable.getParentSurface(); + final SurfaceControl surface = mAnimatable.getSurfaceControl(); + final SurfaceControl parent = mAnimatable.getParentSurfaceControl(); // If the surface was destroyed, we don't care to reparent it back. final boolean destroy = mLeash != null && surface != null && parent != null; @@ -216,19 +225,22 @@ class SurfaceAnimator { if (DEBUG_ANIM) Slog.i(TAG, "Reparenting to original parent"); t.reparent(surface, parent.getHandle()); } + if (mLeash != null) { + mAnimatable.destroyAfterPendingTransaction(mLeash); + } mLeash = null; mAnimation = null; // Make sure to inform the animatable after the leash was destroyed. if (destroy) { - mAnimatable.onLeashDestroyed(t); + mAnimatable.onAnimationLeashDestroyed(t); } } private SurfaceControl createAnimationLeash(SurfaceControl surface, Transaction t, int width, int height, boolean hidden) { if (DEBUG_ANIM) Slog.i(TAG, "Reparenting to leash"); - final SurfaceControl.Builder builder = mAnimatable.makeLeash() + final SurfaceControl.Builder builder = mAnimatable.makeAnimationLeash() .setName(surface + " - animation-leash") .setSize(width, height); final SurfaceControl leash = builder.build(); @@ -273,7 +285,7 @@ class SurfaceAnimator { * @param t The transaction to use to apply any necessary changes. * @param leash The leash that was created. */ - void onLeashCreated(Transaction t, SurfaceControl leash); + void onAnimationLeashCreated(Transaction t, SurfaceControl leash); /** * Called when the leash is being destroyed, and the surface was reparented back to the @@ -281,22 +293,30 @@ class SurfaceAnimator { * * @param t The transaction to use to apply any necessary changes. */ - void onLeashDestroyed(Transaction t); + void onAnimationLeashDestroyed(Transaction t); + + /** + * Destroy a given surface after executing {@link #getPendingTransaction}. + * + * @see WindowContainer#destroyAfterPendingTransaction + */ + void destroyAfterPendingTransaction(SurfaceControl surface); /** - * @return A new child surface. + * @return A new surface to be used for the animation leash, inserted at the correct + * position in the hierarchy. */ - SurfaceControl.Builder makeLeash(); + SurfaceControl.Builder makeAnimationLeash(); /** * @return The surface of the object to be animated. */ - @Nullable SurfaceControl getSurface(); + @Nullable SurfaceControl getSurfaceControl(); /** * @return The parent of the surface object to be animated. */ - @Nullable SurfaceControl getParentSurface(); + @Nullable SurfaceControl getParentSurfaceControl(); /** * @return The width of the surface to be animated. diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 6ea8a4790630..244eb66a7ef0 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -22,7 +22,6 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PORTRA import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZABLE_PRESERVE_ORIENTATION; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.res.Configuration.EMPTY; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static com.android.server.EventLogTags.WM_TASK_REMOVED; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STACK; @@ -43,7 +42,6 @@ import android.graphics.Rect; import android.util.EventLog; import android.util.Slog; import android.util.proto.ProtoOutputStream; -import android.view.DisplayInfo; import android.view.Surface; import com.android.internal.annotations.VisibleForTesting; @@ -162,7 +160,7 @@ class Task extends WindowContainer<AppWindowToken> { boolean shouldDeferRemoval() { // TODO: This should probably return false if mChildren.isEmpty() regardless if the stack // is animating... - return hasWindowsAlive() && mStack.isAnimating(); + return hasWindowsAlive() && mStack.isSelfOrChildAnimating(); } @Override diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 28b1390d92de..9946c6a5eade 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -935,7 +935,7 @@ public class TaskStack extends WindowContainer<Task> implements @Override void removeIfPossible() { - if (isAnimating()) { + if (isSelfOrChildAnimating()) { mDeferRemoval = true; return; } @@ -1643,7 +1643,7 @@ public class TaskStack extends WindowContainer<Task> implements /** Returns true if a removal action is still being deferred. */ boolean checkCompleteDeferredRemoval() { - if (isAnimating()) { + if (isSelfOrChildAnimating()) { return true; } if (mDeferRemoval) { diff --git a/services/core/java/com/android/server/wm/WallpaperWindowToken.java b/services/core/java/com/android/server/wm/WallpaperWindowToken.java index a12c0e5003c8..3389f71394bc 100644 --- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java +++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java @@ -115,7 +115,7 @@ class WallpaperWindowToken extends WindowToken { void startAnimation(Animation anim) { for (int ndx = mChildren.size() - 1; ndx >= 0; ndx--) { final WindowState windowState = mChildren.get(ndx); - windowState.mWinAnimator.setAnimation(anim); + windowState.startAnimation(anim); } } diff --git a/services/core/java/com/android/server/wm/WindowAnimationSpec.java b/services/core/java/com/android/server/wm/WindowAnimationSpec.java index 56175c7d0538..bb25297857dd 100644 --- a/services/core/java/com/android/server/wm/WindowAnimationSpec.java +++ b/services/core/java/com/android/server/wm/WindowAnimationSpec.java @@ -31,7 +31,7 @@ public class WindowAnimationSpec implements AnimationSpec { private Animation mAnimation; private final Point mPosition = new Point(); - private final ThreadLocal<Tmp> mThreadLocalTmps = ThreadLocal.withInitial(Tmp::new); + private final ThreadLocal<TmpValues> mThreadLocalTmps = ThreadLocal.withInitial(TmpValues::new); public WindowAnimationSpec(Animation animation, Point position) { mAnimation = animation; @@ -55,7 +55,7 @@ public class WindowAnimationSpec implements AnimationSpec { @Override public void apply(Transaction t, SurfaceControl leash, long currentPlayTime) { - final Tmp tmp = mThreadLocalTmps.get(); + final TmpValues tmp = mThreadLocalTmps.get(); tmp.transformation.clear(); mAnimation.getTransformation(currentPlayTime, tmp.transformation); tmp.transformation.getMatrix().postTranslate(mPosition.x, mPosition.y); @@ -63,7 +63,7 @@ public class WindowAnimationSpec implements AnimationSpec { t.setAlpha(leash, tmp.transformation.getAlpha()); } - private static class Tmp { + private static class TmpValues { final Transformation transformation = new Transformation(); final float[] floats = new float[9]; } diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index d6329bfab5a1..b2b6119c559c 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -19,6 +19,9 @@ package com.android.server.wm; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; +import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; +import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; +import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.proto.WindowContainerProto.CONFIGURATION_CONTAINER; import static com.android.server.wm.proto.WindowContainerProto.ORIENTATION; import static com.android.server.wm.proto.WindowContainerProto.VISIBLE; @@ -26,14 +29,20 @@ import static android.view.SurfaceControl.Transaction; import android.annotation.CallSuper; import android.content.res.Configuration; +import android.graphics.PixelFormat.Opacity; +import android.util.Slog; import android.view.MagnificationSpec; import android.view.SurfaceControl; +import android.view.SurfaceControl.Builder; import android.view.SurfaceSession; import android.util.Pools; import android.util.proto.ProtoOutputStream; + import com.android.internal.util.ToBooleanFunction; +import com.android.server.wm.SurfaceAnimator.Animatable; +import java.io.PrintWriter; import java.util.Comparator; import java.util.LinkedList; import java.util.function.Consumer; @@ -46,7 +55,9 @@ import java.util.function.Predicate; * changes are made to this class. */ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<E> - implements Comparable<WindowContainer> { + implements Comparable<WindowContainer>, Animatable { + + private static final String TAG = TAG_WITH_CLASS_NAME ? "WindowContainer" : TAG_WM; static final int POSITION_TOP = Integer.MAX_VALUE; static final int POSITION_BOTTOM = Integer.MIN_VALUE; @@ -56,7 +67,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * For removing or setting new parent {@link #setParent} should be used, because it also * performs configuration updates based on new parent's settings. */ - private WindowContainer mParent = null; + private WindowContainer<WindowContainer> mParent = null; // List of children for this window container. List is in z-order as the children appear on // screen with the top-most window container at the tail of the list. @@ -69,7 +80,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< new Pools.SynchronizedPool<>(3); // The owner/creator for this container. No controller if null. - WindowContainerController mController; + WindowContainerController mController; protected SurfaceControl mSurfaceControl; private int mLastLayer = 0; @@ -78,12 +89,14 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< /** * Applied as part of the animation pass in "prepareSurfaces". */ - private final Transaction mPendingTransaction; + protected final Transaction mPendingTransaction; + protected final SurfaceAnimator mSurfaceAnimator; protected final WindowManagerService mService; WindowContainer(WindowManagerService service) { mService = service; mPendingTransaction = service.mTransactionFactory.make(); + mSurfaceAnimator = new SurfaceAnimator(this, this::onAnimationFinished, service); } @Override @@ -101,7 +114,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< return mChildren.get(index); } - final protected void setParent(WindowContainer parent) { + final protected void setParent(WindowContainer<WindowContainer> parent) { mParent = parent; // Removing parent usually means that we've detached this entity to destroy it or to attach // to another parent. In both cases we don't need to update the configuration now. @@ -123,14 +136,18 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< if (mParent == null) { return; } + if (mSurfaceControl == null) { // If we don't yet have a surface, but we now have a parent, we should // build a surface. mSurfaceControl = makeSurface().build(); getPendingTransaction().show(mSurfaceControl); } else { - // If we have a surface but a new parent, we just need to perform a reparent. - getPendingTransaction().reparent(mSurfaceControl, mParent.mSurfaceControl.getHandle()); + // If we have a surface but a new parent, we just need to perform a reparent. Go through + // surface animator such that hierarchy is preserved when animating, i.e. + // mSurfaceControl stays attached to the leash and we just reparent the leash to the + // new parent. + mSurfaceAnimator.reparent(getPendingTransaction(), mParent.mSurfaceControl); } // Either way we need to ask the parent to assign us a Z-order. @@ -139,8 +156,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } // Temp. holders for a chain of containers we are currently processing. - private final LinkedList<WindowContainer> mTmpChain1 = new LinkedList(); - private final LinkedList<WindowContainer> mTmpChain2 = new LinkedList(); + private final LinkedList<WindowContainer> mTmpChain1 = new LinkedList<>(); + private final LinkedList<WindowContainer> mTmpChain2 = new LinkedList<>(); /** * Adds the input window container has a child of this container in order based on the input @@ -214,7 +231,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< @CallSuper void removeImmediately() { while (!mChildren.isEmpty()) { - final WindowContainer child = mChildren.peekLast(); + final E child = mChildren.peekLast(); child.removeImmediately(); // Need to do this after calling remove on the child because the child might try to // remove/detach itself from its parent which will cause an exception if we remove @@ -401,16 +418,40 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } - boolean isAnimating() { + /** + * @return Whether our own container is running an animation or any child, no matter how deep in + * the hierarchy, is animating. + */ + boolean isSelfOrChildAnimating() { + if (isSelfAnimating()) { + return true; + } for (int j = mChildren.size() - 1; j >= 0; j--) { final WindowContainer wc = mChildren.get(j); - if (wc.isAnimating()) { + if (wc.isSelfOrChildAnimating()) { return true; } } return false; } + /** + * @return Whether our own container is running an animation or our parent is animating. This + * doesn't consider whether children are animating. + */ + boolean isAnimating() { + + // We are animating if we ourselves are animating or if our parent is animating. + return isSelfAnimating() || mParent != null && mParent.isAnimating(); + } + + /** + * @return Whether our own container running an animation at the moment. + */ + boolean isSelfAnimating() { + return mSurfaceAnimator.isAnimating(); + } + void sendAppVisibilityToClients() { for (int i = mChildren.size() - 1; i >= 0; --i) { final WindowContainer wc = mChildren.get(i); @@ -743,6 +784,15 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< .setParent(mSurfaceControl); } + @Override + public SurfaceControl getParentSurfaceControl() { + final WindowContainer parent = getParent(); + if (parent == null) { + return null; + } + return parent.getSurfaceControl(); + } + /** * @return Whether this WindowContainer should be magnified by the accessibility magnifier. */ @@ -765,7 +815,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< void assignLayer(Transaction t, int layer) { final boolean changed = layer != mLastLayer || mLastRelativeToLayer != null; if (mSurfaceControl != null && changed) { - t.setLayer(mSurfaceControl, layer); + + // Route through surface animator to accommodate that our surface control might be + // attached to the leash, and leash is attached to parent container. + mSurfaceAnimator.setLayer(t, layer); mLastLayer = layer; mLastRelativeToLayer = null; } @@ -774,7 +827,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< void assignRelativeLayer(Transaction t, SurfaceControl relativeTo, int layer) { final boolean changed = layer != mLastLayer || mLastRelativeToLayer != relativeTo; if (mSurfaceControl != null && changed) { - t.setRelativeLayer(mSurfaceControl, relativeTo, layer); + + // Route through surface animator to accommodate that our surface control might be + // attached to the leash, and leash is attached to parent container. + mSurfaceAnimator.setRelativeLayer(t, relativeTo, layer); mLastLayer = layer; mLastRelativeToLayer = relativeTo; } @@ -897,7 +953,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< } } - SurfaceControl getSurfaceControl() { + @Override + public SurfaceControl getSurfaceControl() { return mSurfaceControl; } @@ -907,13 +964,105 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< * rather than an intentional design, so please take care when * expanding use. */ - void destroyAfterPendingTransaction(SurfaceControl surface) { + @Override + public void destroyAfterPendingTransaction(SurfaceControl surface) { if (mParent != null) { mParent.destroyAfterPendingTransaction(surface); } } - - Transaction getPendingTransaction() { + + @Override + public Transaction getPendingTransaction() { return mPendingTransaction; } + + /** + * Starts an animation on the container. + * + * @param anim The animation to run. + * @param hidden Whether our container is currently hidden. TODO This should use isVisible at + * some point but the meaning is too weird to work for all containers. + */ + void startAnimation(Transaction t, AnimationAdapter anim, boolean hidden) { + if (DEBUG_ANIM) Slog.v(TAG, "Starting animation on " + this + ": " + anim); + + // TODO: This should use isVisible() but because isVisible has a really weird meaning at + // the moment this doesn't work for all animatable window containers. + mSurfaceAnimator.startAnimation(t, anim, hidden); + } + + void cancelAnimation() { + mSurfaceAnimator.cancelAnimation(); + } + + @Override + public Builder makeAnimationLeash() { + return makeSurface(); + } + + @Override + public void commitPendingTransaction() { + scheduleAnimation(); + } + + private void reassignLayer(Transaction t) { + final WindowContainer parent = getParent(); + if (parent != null) { + parent.assignChildLayers(t); + } + } + + @Override + public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) { + reassignLayer(t); + } + + @Override + public void onAnimationLeashDestroyed(Transaction t) { + reassignLayer(t); + } + + /** + * Called when an animation has finished running. + */ + protected void onAnimationFinished() { + } + + /** + * @return The currently running animation, if any, or {@code null} otherwise. + */ + AnimationAdapter getAnimation() { + return mSurfaceAnimator.getAnimation(); + } + + /** + * @see SurfaceAnimator#startDelayingAnimationStart + */ + void startDelayingAnimationStart() { + mSurfaceAnimator.startDelayingAnimationStart(); + } + + /** + * @see SurfaceAnimator#endDelayingAnimationStart + */ + void endDelayingAnimationStart() { + mSurfaceAnimator.endDelayingAnimationStart(); + } + + @Override + public int getSurfaceWidth() { + return mSurfaceControl.getWidth(); + } + + @Override + public int getSurfaceHeight() { + return mSurfaceControl.getHeight(); + } + + void dump(PrintWriter pw, String prefix, boolean dumpAll) { + if (mSurfaceAnimator.isAnimating()) { + pw.print(prefix); pw.println("ContainerAnimator:"); + mSurfaceAnimator.dump(pw, prefix + " "); + } + } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 8c9948e1ee49..a787543fb4b1 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -725,8 +725,6 @@ public class WindowManagerService extends IWindowManager.Stub } } - boolean mAnimateWallpaperWithTarget; - // TODO: Move to RootWindowContainer AppWindowToken mFocusedApp = null; @@ -2182,18 +2180,15 @@ public class WindowManagerService extends IWindowManager.Stub if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) { focusMayChange = isDefaultDisplay; win.mAnimatingExit = true; - win.mWinAnimator.mAnimating = true; } else if (win.mWinAnimator.isAnimationSet()) { // Currently in a hide animation... turn this into // an exit. win.mAnimatingExit = true; - win.mWinAnimator.mAnimating = true; } else if (win.getDisplayContent().mWallpaperController.isWallpaperTarget(win)) { // If the wallpaper is currently behind this // window, we need to change both of them inside // of a transaction to avoid artifacts. win.mAnimatingExit = true; - win.mWinAnimator.mAnimating = true; } else { if (mInputMethodWindow == win) { setInputMethodWindowLocked(null); @@ -4566,6 +4561,7 @@ public class WindowManagerService extends IWindowManager.Stub if (displayContent != null) { mAnimator.addDisplayLocked(displayId); displayContent.initializeDisplayBaseInfo(); + reconfigureDisplayLocked(displayContent); } } } @@ -6705,7 +6701,6 @@ public class WindowManagerService extends IWindowManager.Stub synchronized (mWindowMap) { final Display display = mDisplayManager.getDisplay(displayId); if (display != null) { - createDisplayContentLocked(display); displayReady(displayId); } mWindowPlacerLocked.requestTraversal(); diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index e38605d33f26..6bebcf407c75 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -19,11 +19,11 @@ package com.android.server.wm; import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.SurfaceControl.Transaction; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_CONTENT; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_FRAME; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION; import static android.view.ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_VISIBLE; -import static android.view.SurfaceControl.Transaction; import static android.view.WindowManager.LayoutParams.FIRST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW; import static android.view.WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON; @@ -91,6 +91,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER_LIG import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.H.SEND_NEW_CONFIGURATION; +import static com.android.server.wm.WindowManagerService.MAX_ANIMATION_DURATION; import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER; import static com.android.server.wm.WindowManagerService.TYPE_LAYER_OFFSET; import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL; @@ -160,10 +161,14 @@ import android.view.View; import android.view.ViewTreeObserver; import android.view.WindowInfo; import android.view.WindowManager; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; +import android.view.animation.Interpolator; import com.android.internal.util.ToBooleanFunction; import com.android.server.input.InputWindowHandle; import com.android.server.policy.WindowManagerPolicy; +import com.android.server.wm.LocalAnimationAdapter.AnimationSpec; import java.io.PrintWriter; import java.lang.ref.WeakReference; @@ -594,6 +599,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP */ private boolean mDrawnStateEvaluated; + private final Point mSurfacePosition = new Point(); + /** * Compares two window sub-layers and returns -1 if the first is lesser than the second in terms * of z-order and 1 otherwise. @@ -1470,9 +1477,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final AppWindowToken atoken = mAppToken; if (atoken != null) { return ((!isParentWindowHidden() && !atoken.hiddenRequested) - || mWinAnimator.mAnimation != null || atoken.mAppAnimator.animation != null); + || mWinAnimator.isAnimationSet() || atoken.mAppAnimator.animation != null); } - return !isParentWindowHidden() || mWinAnimator.mAnimation != null; + return !isParentWindowHidden() || mWinAnimator.isAnimationSet(); } /** @@ -1505,7 +1512,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } return mHasSurface && mPolicyVisibility && !mDestroying && ((!isParentWindowHidden() && mViewVisibility == View.VISIBLE && !mToken.hidden) - || mWinAnimator.mAnimation != null + || mWinAnimator.isAnimationSet() || ((mAppToken != null) && (mAppToken.mAppAnimator.animation != null))); } @@ -1520,8 +1527,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // started. final boolean appAnimationStarting = mAppToken != null && mAppToken.mAppAnimator.isAnimationStarting(); - final boolean exitingSelf = mAnimatingExit && (!mWinAnimator.isAnimationStarting() - && !appAnimationStarting); + final boolean exitingSelf = mAnimatingExit && !appAnimationStarting; final boolean appExiting = mAppToken != null && mAppToken.hidden && !appAnimationStarting; final boolean exiting = exitingSelf || mDestroying || appExiting; @@ -1544,7 +1550,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return isDrawnLw() && mPolicyVisibility && ((!isParentWindowHidden() && (atoken == null || !atoken.hiddenRequested)) - || mWinAnimator.mAnimating + || mWinAnimator.isAnimationSet() || (atoken != null && atoken.mAppAnimator.animation != null)); } @@ -1553,7 +1559,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP */ @Override public boolean isAnimatingLw() { - return mWinAnimator.mAnimation != null + return mWinAnimator.isAnimationSet() || (mAppToken != null && mAppToken.mAppAnimator.animation != null); } @@ -1600,7 +1606,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // to determine if it's occluding apps. return ((!mIsWallpaper && mAttrs.format == PixelFormat.OPAQUE) || (mIsWallpaper && mWallpaperVisible)) - && isDrawnLw() && mWinAnimator.mAnimation == null + && isDrawnLw() && !mWinAnimator.isAnimationSet() && (mAppToken == null || mAppToken.mAppAnimator.animation == null); } @@ -1732,7 +1738,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP * listeners and optionally animate it. Simply checking a change of position is not enough, * because being move due to dock divider is not a trigger for animation. */ - void handleWindowMovedIfNeeded() { + void handleWindowMovedIfNeeded(Transaction t) { if (!hasMoved()) { return; } @@ -1750,7 +1756,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP && !isDragResizing() && !adjustedForMinimizedDockOrIme && getWindowConfiguration().hasMovementAnimations() && !mWinAnimator.mLastHidden) { - mWinAnimator.setMoveAnimation(left, top); + startMoveAnimation(t, left, top); } //TODO (multidisplay): Accessibility supported only for the default display. @@ -2457,10 +2463,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (DEBUG_VISIBILITY) Slog.v(TAG, "Policy visibility true: " + this); if (doAnimation) { if (DEBUG_VISIBILITY) Slog.v(TAG, "doAnimation: mPolicyVisibility=" - + mPolicyVisibility + " mAnimation=" + mWinAnimator.mAnimation); + + mPolicyVisibility + " isAnimationSet=" + mWinAnimator.isAnimationSet()); if (!mToken.okToAnimate()) { doAnimation = false; - } else if (mPolicyVisibility && mWinAnimator.mAnimation == null) { + } else if (mPolicyVisibility && !mWinAnimator.isAnimationSet()) { // Check for the case where we are currently visible and // not animating; we do not want to do animation at such a // point to become visible when we already are. @@ -2499,7 +2505,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } if (doAnimation) { mWinAnimator.applyAnimationLocked(TRANSIT_EXIT, false); - if (mWinAnimator.mAnimation == null) { + if (!mWinAnimator.isAnimationSet()) { doAnimation = false; } } @@ -2599,14 +2605,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return mAnimatingExit || (mService.mClosingApps.contains(mAppToken)); } - @Override - boolean isAnimating() { - if (mWinAnimator.isAnimationSet() || mAnimatingExit) { - return true; - } - return super.isAnimating(); - } - void addWinAnimatorToList(ArrayList<WindowStateAnimator> animators) { animators.add(mWinAnimator); @@ -3133,6 +3131,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP proto.end(token); } + @Override void dump(PrintWriter pw, String prefix, boolean dumpAll) { final TaskStack stack = getStack(); pw.print(prefix); pw.print("mDisplayId="); pw.print(getDisplayId()); @@ -3275,6 +3274,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP pw.print(" cutout=" + mLastDisplayCutout); pw.println(); } + super.dump(pw, prefix, dumpAll); pw.print(prefix); pw.print(mWinAnimator); pw.println(":"); mWinAnimator.dump(pw, prefix + " ", dumpAll); if (mAnimatingExit || mRemoveOnExit || mDestroying || mRemoved) { @@ -3333,7 +3333,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP @Override String getName() { return Integer.toHexString(System.identityHashCode(this)) - + " " + getWindowTag(); + + " " + getWindowTag(); } CharSequence getWindowTag() { @@ -3694,7 +3694,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP + " tok.hiddenRequested=" + (mAppToken != null && mAppToken.hiddenRequested) + " tok.hidden=" + (mAppToken != null && mAppToken.hidden) - + " animating=" + mWinAnimator.mAnimating + + " animationSet=" + mWinAnimator.isAnimationSet() + " tok animating=" + (mWinAnimator.mAppAnimator != null && mWinAnimator.mAppAnimator.animating) + " Callers=" + Debug.getCallers(4)); @@ -3900,23 +3900,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return null; } - boolean isWindowAnimationSet() { - if (mWinAnimator.isWindowAnimationSet()) { - return true; - } - for (int i = mChildren.size() - 1; i >= 0; --i) { - final WindowState c = mChildren.get(i); - if (c.isWindowAnimationSet()) { - return true; - } - } - return false; - } - void onExitAnimationDone() { if (DEBUG_ANIM) Slog.v(TAG, "onExitAnimationDone in " + this + ": exiting=" + mAnimatingExit + " remove=" + mRemoveOnExit - + " windowAnimating=" + mWinAnimator.isWindowAnimationSet()); + + " selfAnimating=" + isSelfAnimating()); if (!mChildren.isEmpty()) { // Copying to a different list as multiple children can be removed. @@ -3940,18 +3927,16 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } } - if (!mWinAnimator.isWindowAnimationSet()) { - //TODO (multidisplay): Accessibility is supported only for the default display. - if (mService.mAccessibilityController != null && getDisplayId() == DEFAULT_DISPLAY) { - mService.mAccessibilityController.onSomeWindowResizedOrMovedLocked(); - } + if (isSelfAnimating()) { + return; } - if (!mAnimatingExit) { - return; + //TODO (multidisplay): Accessibility is supported only for the default display. + if (mService.mAccessibilityController != null && getDisplayId() == DEFAULT_DISPLAY) { + mService.mAccessibilityController.onSomeWindowResizedOrMovedLocked(); } - if (mWinAnimator.isWindowAnimationSet()) { + if (!mAnimatingExit) { return; } @@ -4005,10 +3990,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mAnimatingExit = false; didSomething = true; } - if (mWinAnimator.mAnimating) { - mWinAnimator.mAnimating = false; - didSomething = true; - } if (mDestroying) { mDestroying = false; mService.mDestroySurface.remove(this); @@ -4097,7 +4078,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP + " mDrawState=" + mWinAnimator.mDrawState + " ph=" + isParentWindowHidden() + " th=" + (mAppToken != null ? mAppToken.hiddenRequested : false) - + " a=" + mWinAnimator.mAnimating); + + " a=" + mWinAnimator.isAnimationSet()); } } @@ -4300,6 +4281,39 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mLastDisplayCutout = mDisplayCutout; } + void startAnimation(Animation anim) { + final DisplayInfo displayInfo = getDisplayContent().getDisplayInfo(); + anim.initialize(mFrame.width(), mFrame.height(), + displayInfo.appWidth, displayInfo.appHeight); + anim.restrictDuration(MAX_ANIMATION_DURATION); + anim.scaleCurrentDuration(mService.getWindowAnimationScaleLocked()); + final AnimationAdapter adapter = new LocalAnimationAdapter( + new WindowAnimationSpec(anim, mSurfacePosition), mService.mSurfaceAnimationRunner); + startAnimation(mPendingTransaction, adapter); + commitPendingTransaction(); + } + + private void startMoveAnimation(Transaction t, int left, int top) { + if (DEBUG_ANIM) Slog.v(TAG, "Setting move animation on " + this); + final Point oldPosition = new Point(); + final Point newPosition = new Point(); + transformFrameToSurfacePosition(mLastFrame.left, mLastFrame.top, oldPosition); + transformFrameToSurfacePosition(left, top, newPosition); + final AnimationAdapter adapter = new LocalAnimationAdapter( + new MoveAnimationSpec(oldPosition.x, oldPosition.y, newPosition.x, newPosition.y), + mService.mSurfaceAnimationRunner); + startAnimation(t, adapter); + } + + private void startAnimation(Transaction t, AnimationAdapter adapter) { + startAnimation(t, adapter, mWinAnimator.mLastHidden); + } + + @Override + protected void onAnimationFinished() { + mWinAnimator.onAnimationFinished(); + } + // TODO: Hack to work around the number of states AppWindowToken needs to access without having // access to its windows children. Need to investigate re-writing // {@link AppWindowToken#updateReportedVisibilityLocked} so this can be removed. @@ -4381,11 +4395,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return getAnimLayerAdjustment() > 0 || mWillReplaceWindow; } - @Override - SurfaceControl.Builder makeSurface() { - return getParent().makeChildSurface(this); - } - private void applyDims(Dimmer dimmer) { if (!mAnimatingExit && mAppDied) { mIsDimming = true; @@ -4405,11 +4414,51 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP applyDims(dimmer); } + updateSurfacePosition(mPendingTransaction); + mWinAnimator.prepareSurfaceLocked(true); super.prepareSurfaces(); } @Override + public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) { + super.onAnimationLeashCreated(t, leash); + + // Leash is now responsible for position, so set our position to 0. + t.setPosition(mSurfaceControl, 0, 0); + } + + @Override + public void onAnimationLeashDestroyed(Transaction t) { + super.onAnimationLeashDestroyed(t); + updateSurfacePosition(t); + } + + void updateSurfacePosition(Transaction t) { + if (mSurfaceControl == null) { + return; + } + + transformFrameToSurfacePosition(mFrame.left, mFrame.top, mSurfacePosition); + if (!mSurfaceAnimator.hasLeash()) { + t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y); + } + } + + private void transformFrameToSurfacePosition(int left, int top, Point outPoint) { + outPoint.set(left, top); + if (isChildWindow()) { + // TODO: This probably falls apart at some point and we should + // actually compute relative coordinates. + final WindowState parent = getParentWindow(); + outPoint.offset(-parent.mFrame.left, -parent.mFrame.top); + } + + // Expand for surface insets. See WindowState.expandForSurfaceInsets. + outPoint.offset(-mAttrs.surfaceInsets.left, -mAttrs.surfaceInsets.top); + } + + @Override void assignLayer(Transaction t, int layer) { // See comment in assignRelativeLayerForImeTargetChild if (!isChildWindow() @@ -4449,4 +4498,34 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP layer++; } } + + private final class MoveAnimationSpec implements AnimationSpec { + + private final long mDuration; + private Interpolator mInterpolator; + private Point mFrom = new Point(); + private Point mTo = new Point(); + + private MoveAnimationSpec(int fromX, int fromY, int toX, int toY) { + final Animation anim = AnimationUtils.loadAnimation(mContext, + com.android.internal.R.anim.window_move_from_decor); + mDuration = anim.computeDurationHint(); + mInterpolator = anim.getInterpolator(); + mFrom.set(fromX, fromY); + mTo.set(toX, toY); + } + + @Override + public long getDuration() { + return mDuration; + } + + @Override + public void apply(Transaction t, SurfaceControl leash, long currentPlayTime) { + final float fraction = (float) currentPlayTime / getDuration(); + final float v = mInterpolator.getInterpolation(fraction); + t.setPosition(leash, mFrom.x + (mTo.x - mFrom.x) * v, + mFrom.y + (mTo.y - mFrom.y) * v); + } + } } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 54c84ea5afed..0eabc898451a 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -23,16 +23,16 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CO import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.AppWindowAnimator.sDummyAnimation; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; -import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ORIENTATION; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_STARTING_WINDOW_VERBOSE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_VISIBILITY; -import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_CROP; import static com.android.server.wm.WindowManagerDebugConfig.SHOW_LIGHT_TRANSACTIONS; import static com.android.server.wm.WindowManagerDebugConfig.SHOW_SURFACE_ALLOC; @@ -40,7 +40,6 @@ import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER; -import static com.android.server.wm.WindowManagerService.localLOGV; import static com.android.server.wm.WindowManagerService.logWithStack; import static com.android.server.wm.WindowSurfacePlacer.SET_ORIENTATION_CHANGE_COMPLETE; import static com.android.server.wm.WindowSurfacePlacer.SET_TURN_ON_SCREEN; @@ -65,14 +64,13 @@ import android.view.SurfaceControl; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.animation.Animation; -import android.view.animation.AnimationSet; import android.view.animation.AnimationUtils; import android.view.animation.Transformation; import com.android.server.policy.WindowManagerPolicy; -import java.io.PrintWriter; import java.io.FileDescriptor; +import java.io.PrintWriter; /** * Keep track of animations and surface operations for a single WindowState. @@ -112,20 +110,9 @@ class WindowStateAnimator { final boolean mIsWallpaper; private final WallpaperController mWallpaperControllerLocked; - // Currently running animation. - boolean mAnimating; - boolean mLocalAnimating; - Animation mAnimation; boolean mAnimationIsEntrance; - boolean mHasTransformation; - boolean mHasLocalTransformation; - final Transformation mTransformation = new Transformation(); - boolean mWasAnimating; // Were we animating going into the most recent animation step? int mAnimLayer; int mLastLayer; - long mAnimationStartTime; - long mLastAnimationTime; - int mStackClip = STACK_CLIP_BEFORE_ANIM; /** * Set when we have changed the size of the surface, to know that @@ -168,13 +155,6 @@ class WindowStateAnimator { private final Rect mSystemDecorRect = new Rect(); private final Rect mLastSystemDecorRect = new Rect(); - // Used to save animation distances between the time they are calculated and when they are used. - private int mAnimDx; - private int mAnimDy; - - /** Is the next animation to be started a window move animation? */ - private boolean mAnimateMove = false; - float mDsDx=1, mDtDx=0, mDsDy=0, mDtDy=1; private float mLastDsDx=1, mLastDtDx=0, mLastDsDy=0, mLastDtDy=1; @@ -226,8 +206,6 @@ class WindowStateAnimator { int mAttrType; - static final long PENDING_TRANSACTION_FINISH_WAIT_TIME = 100; - boolean mForceScaleUntilResize; // WindowState.mHScale and WindowState.mVScale contain the @@ -247,15 +225,6 @@ class WindowStateAnimator { mAnimator = service.mAnimator; mPolicy = service.mPolicy; mContext = service.mContext; - final DisplayContent displayContent = win.getDisplayContent(); - if (displayContent != null) { - final DisplayInfo displayInfo = displayContent.getDisplayInfo(); - mAnimDx = displayInfo.appWidth; - mAnimDy = displayInfo.appHeight; - } else { - Slog.w(TAG, "WindowStateAnimator ctor: Display has been removed"); - // This is checked on return and dealt with. - } mWin = win; mParentWinAnimator = !win.isChildWindow() ? null : win.getParentWindow().mWinAnimator; @@ -266,54 +235,11 @@ class WindowStateAnimator { mWallpaperControllerLocked = mService.mRoot.mWallpaperController; } - public void setAnimation(Animation anim, long startTime, int stackClip) { - if (localLOGV) Slog.v(TAG, "Setting animation in " + this + ": " + anim); - mAnimating = false; - mLocalAnimating = false; - mAnimation = anim; - mAnimation.restrictDuration(WindowManagerService.MAX_ANIMATION_DURATION); - mAnimation.scaleCurrentDuration(mService.getWindowAnimationScaleLocked()); - // Start out animation gone if window is gone, or visible if window is visible. - mTransformation.clear(); - mTransformation.setAlpha(mLastHidden ? 0 : 1); - mHasLocalTransformation = true; - mAnimationStartTime = startTime; - mStackClip = stackClip; - } - - public void setAnimation(Animation anim, int stackClip) { - setAnimation(anim, -1, stackClip); - } - - public void setAnimation(Animation anim) { - setAnimation(anim, -1, STACK_CLIP_AFTER_ANIM); - } - - public void clearAnimation() { - if (mAnimation != null) { - mAnimating = true; - mLocalAnimating = false; - mAnimation.cancel(); - mAnimation = null; - mStackClip = STACK_CLIP_BEFORE_ANIM; - } - } - /** * Is the window or its container currently set to animate or currently animating? */ boolean isAnimationSet() { - return mAnimation != null - || (mParentWinAnimator != null && mParentWinAnimator.mAnimation != null) - || (mAppAnimator != null && mAppAnimator.isAnimating()); - } - - /** - * @return whether an animation is about to start, i.e. the animation is set already but we - * haven't processed the first frame yet. - */ - boolean isAnimationStarting() { - return isAnimationSet() && !mAnimating; + return mWin.isAnimating(); } /** Is the window animating the DummyAnimation? */ @@ -323,13 +249,6 @@ class WindowStateAnimator { } /** - * Is this window currently set to animate or currently animating? - */ - boolean isWindowAnimationSet() { - return mAnimation != null; - } - - /** * Is this window currently waiting to run an opening animation? */ boolean isWaitingForOpening() { @@ -341,130 +260,23 @@ class WindowStateAnimator { if (DEBUG_ANIM) Slog.d(TAG, "cancelExitAnimationForNextAnimationLocked: " + mWin); - if (mAnimation != null) { - mAnimation.cancel(); - mAnimation = null; - mLocalAnimating = false; - mWin.destroySurfaceUnchecked(); - } - } - - private boolean stepAnimation(long currentTime) { - if ((mAnimation == null) || !mLocalAnimating) { - return false; - } - currentTime = getAnimationFrameTime(mAnimation, currentTime); - mTransformation.clear(); - final boolean more = mAnimation.getTransformation(currentTime, mTransformation); - if (mAnimationStartDelayed && mAnimationIsEntrance) { - mTransformation.setAlpha(0f); - } - if (false && DEBUG_ANIM) Slog.v(TAG, "Stepped animation in " + this + ": more=" + more - + ", xform=" + mTransformation); - return more; + mWin.cancelAnimation(); + mWin.destroySurfaceUnchecked(); } - // This must be called while inside a transaction. Returns true if - // there is more animation to run. - boolean stepAnimationLocked(long currentTime) { - // Save the animation state as it was before this step so WindowManagerService can tell if - // we just started or just stopped animating by comparing mWasAnimating with isAnimationSet(). - mWasAnimating = mAnimating; - final DisplayContent displayContent = mWin.getDisplayContent(); - if (mWin.mToken.okToAnimate()) { - // We will run animations as long as the display isn't frozen. - - if (mWin.isDrawnLw() && mAnimation != null) { - mHasTransformation = true; - mHasLocalTransformation = true; - if (!mLocalAnimating) { - if (DEBUG_ANIM) Slog.v( - TAG, "Starting animation in " + this + - " @ " + currentTime + ": ww=" + mWin.mFrame.width() + - " wh=" + mWin.mFrame.height() + - " dx=" + mAnimDx + " dy=" + mAnimDy + - " scale=" + mService.getWindowAnimationScaleLocked()); - final DisplayInfo displayInfo = displayContent.getDisplayInfo(); - if (mAnimateMove) { - mAnimateMove = false; - mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(), - mAnimDx, mAnimDy); - } else { - mAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(), - displayInfo.appWidth, displayInfo.appHeight); - } - mAnimDx = displayInfo.appWidth; - mAnimDy = displayInfo.appHeight; - mAnimation.setStartTime(mAnimationStartTime != -1 - ? mAnimationStartTime - : currentTime); - mLocalAnimating = true; - mAnimating = true; - } - if ((mAnimation != null) && mLocalAnimating) { - mLastAnimationTime = currentTime; - if (stepAnimation(currentTime)) { - return true; - } - } - if (DEBUG_ANIM) Slog.v( - TAG, "Finished animation in " + this + - " @ " + currentTime); - //WindowManagerService.this.dump(); - } - mHasLocalTransformation = false; - if ((!mLocalAnimating || mAnimationIsEntrance) && mAppAnimator != null - && mAppAnimator.animation != null) { - // When our app token is animating, we kind-of pretend like - // we are as well. Note the mLocalAnimating mAnimationIsEntrance - // part of this check means that we will only do this if - // our window is not currently exiting, or it is not - // locally animating itself. The idea being that one that - // is exiting and doing a local animation should be removed - // once that animation is done. - mAnimating = true; - mHasTransformation = true; - mTransformation.clear(); - return false; - } else if (mHasTransformation) { - // Little trick to get through the path below to act like - // we have finished an animation. - mAnimating = true; - } else if (isAnimationSet()) { - mAnimating = true; - } - } else if (mAnimation != null) { - // If the display is frozen, and there is a pending animation, - // clear it and make sure we run the cleanup code. - mAnimating = true; - } - - if (!mAnimating && !mLocalAnimating) { - return false; - } - + void onAnimationFinished() { // Done animating, clean up. if (DEBUG_ANIM) Slog.v( - TAG, "Animation done in " + this + ": exiting=" + mWin.mAnimatingExit - + ", reportedVisible=" - + (mWin.mAppToken != null ? mWin.mAppToken.reportedVisible : false)); + TAG, "Animation done in " + this + ": exiting=" + mWin.mAnimatingExit + + ", reportedVisible=" + + (mWin.mAppToken != null ? mWin.mAppToken.reportedVisible : false)); - mAnimating = false; - mLocalAnimating = false; - if (mAnimation != null) { - mAnimation.cancel(); - mAnimation = null; - } if (mAnimator.mWindowDetachedWallpaper == mWin) { mAnimator.mWindowDetachedWallpaper = null; } - mAnimLayer = mWin.getSpecialWindowAnimLayerAdjustment(); - if (DEBUG_LAYERS) Slog.v(TAG, "Stepping win " + this + " anim layer: " + mAnimLayer); - mHasTransformation = false; - mHasLocalTransformation = false; - mStackClip = STACK_CLIP_BEFORE_ANIM; + mWin.checkPolicyVisibilityChange(); - mTransformation.clear(); + final DisplayContent displayContent = mWin.getDisplayContent(); if (mAttrType == LayoutParams.TYPE_STATUS_BAR && mWin.mPolicyVisibility) { // Upon completion of a not-visible to visible status bar animation a relayout is // required. @@ -475,7 +287,11 @@ class WindowStateAnimator { mWin.onExitAnimationDone(); final int displayId = mWin.getDisplayId(); - mAnimator.setPendingLayoutChanges(displayId, WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM); + int pendingLayoutChanges = FINISH_LAYOUT_REDO_ANIM; + if (displayContent.mWallpaperController.isWallpaperTarget(mWin)) { + pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER; + } + mAnimator.setPendingLayoutChanges(displayId, pendingLayoutChanges); if (DEBUG_LAYOUT_REPEATS) mService.mWindowPlacerLocked.debugLayoutRepeats( "WindowStateAnimator", mAnimator.getPendingLayoutChanges(displayId)); @@ -483,8 +299,6 @@ class WindowStateAnimator { if (mWin.mAppToken != null) { mWin.mAppToken.updateReportedVisibilityLocked(); } - - return false; } void hide(String reason) { @@ -683,8 +497,8 @@ class WindowStateAnimator { } mSurfaceController = new WindowSurfaceController(mSession.mSurfaceSession, - attrs.getTitle().toString(), - width, height, format, flags, this, windowType, ownerUid); + attrs.getTitle().toString(), width, height, format, flags, this, + windowType, ownerUid); mSurfaceFormat = format; w.setHasSurface(true); @@ -853,35 +667,8 @@ class WindowStateAnimator { } void computeShownFrameLocked() { - final boolean selfTransformation = mHasLocalTransformation; Transformation appTransformation = (mAppAnimator != null && mAppAnimator.hasTransformation) ? mAppAnimator.transformation : null; - Transformation wallpaperTargetTransformation = null; - - // Wallpapers are animated based on the "real" window they - // are currently targeting. - final WindowState wallpaperTarget = mWallpaperControllerLocked.getWallpaperTarget(); - if (mIsWallpaper && wallpaperTarget != null && mService.mAnimateWallpaperWithTarget) { - final WindowStateAnimator wallpaperAnimator = wallpaperTarget.mWinAnimator; - if (wallpaperAnimator.mHasLocalTransformation && - wallpaperAnimator.mAnimation != null && - !wallpaperAnimator.mAnimation.getDetachWallpaper()) { - wallpaperTargetTransformation = wallpaperAnimator.mTransformation; - if (DEBUG_WALLPAPER && wallpaperTargetTransformation != null) { - Slog.v(TAG, "WP target attached xform: " + wallpaperTargetTransformation); - } - } - final AppWindowAnimator wpAppAnimator = wallpaperTarget.mAppToken == null ? - null : wallpaperTarget.mAppToken.mAppAnimator; - if (wpAppAnimator != null && wpAppAnimator.hasTransformation - && wpAppAnimator.animation != null - && !wpAppAnimator.animation.getDetachWallpaper()) { - appTransformation = wpAppAnimator.transformation; - if (DEBUG_WALLPAPER && appTransformation != null) { - Slog.v(TAG, "WP target app xform: " + appTransformation); - } - } - } final int displayId = mWin.getDisplayId(); final ScreenRotationAnimation screenRotationAnimation = @@ -890,8 +677,7 @@ class WindowStateAnimator { screenRotationAnimation != null && screenRotationAnimation.isAnimating(); mHasClipRect = false; - if (selfTransformation || wallpaperTargetTransformation != null - || appTransformation != null || screenAnimation) { + if (appTransformation != null || screenAnimation) { // cache often used attributes locally final Rect frame = mWin.mFrame; final float tmpFloats[] = mService.mTmpFloats; @@ -917,34 +703,16 @@ class WindowStateAnimator { tmpMatrix.reset(); } tmpMatrix.postScale(mWin.mGlobalScale, mWin.mGlobalScale); - if (selfTransformation) { - tmpMatrix.postConcat(mTransformation.getMatrix()); - } - if (wallpaperTargetTransformation != null) { - tmpMatrix.postConcat(wallpaperTargetTransformation.getMatrix()); - } + // WindowState.prepareSurfaces expands for surface insets (in order they don't get + // clipped by the WindowState surface), so we need to go into the other direction here. + tmpMatrix.postTranslate(mWin.mXOffset + mWin.mAttrs.surfaceInsets.left, + mWin.mYOffset + mWin.mAttrs.surfaceInsets.top); + if (appTransformation != null) { tmpMatrix.postConcat(appTransformation.getMatrix()); } - int left = frame.left; - int top = frame.top; - if (mWin.isChildWindow()) { - WindowState parent = mWin.getParentWindow(); - left -= parent.mFrame.left; - top -= parent.mFrame.top; - } - - // The translation that applies the position of the window needs to be applied at the - // end in case that other translations include scaling. Otherwise the scaling will - // affect this translation. But it needs to be set before the screen rotation animation - // so the pivot point is at the center of the screen for all windows. - tmpMatrix.postTranslate(left + mWin.mXOffset, top + mWin.mYOffset); - if (screenAnimation) { - tmpMatrix.postConcat(screenRotationAnimation.getEnterTransformation().getMatrix()); - } - // "convert" it into SurfaceFlinger's format // (a 2x2 matrix + an offset) // Here we must not transform the position of the surface @@ -972,12 +740,6 @@ class WindowStateAnimator { || (mWin.isIdentityMatrix(mDsDx, mDtDx, mDtDy, mDsDy) && x == frame.left && y == frame.top))) { //Slog.i(TAG_WM, "Applying alpha transform"); - if (selfTransformation) { - mShownAlpha *= mTransformation.getAlpha(); - } - if (wallpaperTargetTransformation != null) { - mShownAlpha *= wallpaperTargetTransformation.getAlpha(); - } if (appTransformation != null) { mShownAlpha *= appTransformation.getAlpha(); if (appTransformation.hasClipRect()) { @@ -1006,9 +768,6 @@ class WindowStateAnimator { if ((DEBUG_ANIM || WindowManagerService.localLOGV) && (mShownAlpha == 1.0 || mShownAlpha == 0.0)) Slog.v( TAG, "computeShownFrameLocked: Animating " + this + " mAlpha=" + mAlpha - + " self=" + (selfTransformation ? mTransformation.getAlpha() : "null") - + " attached=" + (wallpaperTargetTransformation == null ? - "null" : wallpaperTargetTransformation.getAlpha()) + " app=" + (appTransformation == null ? "null" : appTransformation.getAlpha()) + " screen=" + (screenAnimation ? screenRotationAnimation.getEnterTransformation().getAlpha() : "null")); @@ -1028,10 +787,10 @@ class WindowStateAnimator { TAG, "computeShownFrameLocked: " + this + " not attached, mAlpha=" + mAlpha); - mWin.mShownPosition.set(mWin.mFrame.left, mWin.mFrame.top); - if (mWin.mXOffset != 0 || mWin.mYOffset != 0) { - mWin.mShownPosition.offset(mWin.mXOffset, mWin.mYOffset); - } + // WindowState.prepareSurfaces expands for surface insets (in order they don't get + // clipped by the WindowState surface), so we need to go into the other direction here. + mWin.mShownPosition.set(mWin.mXOffset + mWin.mAttrs.surfaceInsets.left, + mWin.mYOffset + mWin.mAttrs.surfaceInsets.top); mShownAlpha = mAlpha; mHaveMatrix = false; mDsDx = mWin.mGlobalScale; @@ -1182,7 +941,7 @@ class WindowStateAnimator { if (mAppAnimator != null && mAppAnimator.animation != null) { return mAppAnimator.getStackClip(); } else { - return mStackClip; + return STACK_CLIP_AFTER_ANIM; } } @@ -1434,7 +1193,7 @@ class WindowStateAnimator { if (mSurfaceResized) { mReportSurfaceResized = true; mAnimator.setPendingLayoutChanges(w.getDisplayId(), - WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER); + FINISH_LAYOUT_REDO_WALLPAPER); } } @@ -1546,7 +1305,7 @@ class WindowStateAnimator { // Run another pass through performLayout to set mHasContent in the // LogicalDisplay. mAnimator.setPendingLayoutChanges(w.getDisplayId(), - WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM); + FINISH_LAYOUT_REDO_ANIM); } else { w.setOrientationChanging(false); } @@ -1720,12 +1479,18 @@ class WindowStateAnimator { * @return true if an animation has been loaded. */ boolean applyAnimationLocked(int transit, boolean isEntrance) { - if (mLocalAnimating && mAnimationIsEntrance == isEntrance) { + if (mWin.isSelfAnimating() && mAnimationIsEntrance == isEntrance) { // If we are trying to apply an animation, but already running // an animation of the same type, then just leave that one alone. return true; } + if (isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) { + mWin.getDisplayContent().adjustForImeIfNeeded(); + mWin.setDisplayLayoutNeeded(); + mService.mWindowPlacerLocked.requestTraversal(); + } + // Only apply an animation if the display isn't frozen. If it is // frozen, there is no reason to animate and it can cause strange // artifacts when we unfreeze the display if some different animation @@ -1764,44 +1529,19 @@ class WindowStateAnimator { + " isEntrance=" + isEntrance + " Callers " + Debug.getCallers(3)); if (a != null) { if (DEBUG_ANIM) logWithStack(TAG, "Loaded animation " + a + " for " + this); - setAnimation(a); + mWin.startAnimation(a); mAnimationIsEntrance = isEntrance; } } else { - clearAnimation(); + mWin.cancelAnimation(); } - Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); - if (mWin.mAttrs.type == TYPE_INPUT_METHOD) { + if (!isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) { mWin.getDisplayContent().adjustForImeIfNeeded(); - if (isEntrance) { - mWin.setDisplayLayoutNeeded(); - mService.mWindowPlacerLocked.requestTraversal(); - } } - return mAnimation != null; - } - private void applyFadeoutDuringKeyguardExitAnimation() { - long startTime = mAnimation.getStartTime(); - long duration = mAnimation.getDuration(); - long elapsed = mLastAnimationTime - startTime; - long fadeDuration = duration - elapsed; - if (fadeDuration <= 0) { - // Never mind, this would be no visible animation, so abort the animation change. - return; - } - AnimationSet newAnimation = new AnimationSet(false /* shareInterpolator */); - newAnimation.setDuration(duration); - newAnimation.setStartTime(startTime); - newAnimation.addAnimation(mAnimation); - Animation fadeOut = AnimationUtils.loadAnimation( - mContext, com.android.internal.R.anim.app_starting_exit); - fadeOut.setDuration(fadeDuration); - fadeOut.setStartOffset(elapsed); - newAnimation.addAnimation(fadeOut); - newAnimation.initialize(mWin.mFrame.width(), mWin.mFrame.height(), mAnimDx, mAnimDy); - mAnimation = newAnimation; + Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER); + return isAnimationSet(); } void writeToProto(ProtoOutputStream proto, long fieldId) { @@ -1814,20 +1554,8 @@ class WindowStateAnimator { } public void dump(PrintWriter pw, String prefix, boolean dumpAll) { - if (mAnimating || mLocalAnimating || mAnimationIsEntrance - || mAnimation != null) { - pw.print(prefix); pw.print("mAnimating="); pw.print(mAnimating); - pw.print(" mLocalAnimating="); pw.print(mLocalAnimating); - pw.print(" mAnimationIsEntrance="); pw.print(mAnimationIsEntrance); - pw.print(" mAnimation="); pw.print(mAnimation); - pw.print(" mStackClip="); pw.println(mStackClip); - } - if (mHasTransformation || mHasLocalTransformation) { - pw.print(prefix); pw.print("XForm: has="); - pw.print(mHasTransformation); - pw.print(" hasLocal="); pw.print(mHasLocalTransformation); - pw.print(" "); mTransformation.printShortString(pw); - pw.println(); + if (mAnimationIsEntrance) { + pw.print(prefix); pw.print(" mAnimationIsEntrance="); pw.print(mAnimationIsEntrance); } if (mSurfaceController != null) { mSurfaceController.dump(pw, prefix, dumpAll); @@ -1907,44 +1635,6 @@ class WindowStateAnimator { } } - void setMoveAnimation(int left, int top) { - final Animation a = AnimationUtils.loadAnimation(mContext, - com.android.internal.R.anim.window_move_from_decor); - setAnimation(a); - mAnimDx = mWin.mLastFrame.left - left; - mAnimDy = mWin.mLastFrame.top - top; - mAnimateMove = true; - } - - void deferTransactionUntilParentFrame(long frameNumber) { - if (!mWin.isChildWindow()) { - return; - } - mSurfaceController.deferTransactionUntil( - mWin.getParentWindow().mWinAnimator.mSurfaceController.getHandle(), frameNumber); - } - - /** - * Sometimes we need to synchronize the first frame of animation with some external event. - * To achieve this, we prolong the start of the animation and keep producing the first frame of - * the animation. - */ - private long getAnimationFrameTime(Animation animation, long currentTime) { - if (mAnimationStartDelayed) { - animation.setStartTime(currentTime); - return currentTime + 1; - } - return currentTime; - } - - void startDelayingAnimationStart() { - mAnimationStartDelayed = true; - } - - void endDelayingAnimationStart() { - mAnimationStartDelayed = false; - } - void seamlesslyRotateWindow(int oldRotation, int newRotation) { final WindowState w = mWin; if (!w.isVisibleNow() || w.mIsWallpaper) { @@ -2026,4 +1716,8 @@ class WindowStateAnimator { mSurfaceController.detachChildren(); } } + + int getLayer() { + return mLastLayer; + } } diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index 6746754b92c1..e26a362b272d 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -59,8 +59,8 @@ class WindowSurfaceController { private boolean mSurfaceShown = false; private float mSurfaceX = 0; private float mSurfaceY = 0; - private float mSurfaceW = 0; - private float mSurfaceH = 0; + private int mSurfaceW = 0; + private int mSurfaceH = 0; // Initialize to the identity matrix. private float mLastDsdx = 1; @@ -517,11 +517,11 @@ class WindowSurfaceController { return mSurfaceY; } - float getWidth() { + int getWidth() { return mSurfaceW; } - float getHeight() { + int getHeight() { return mSurfaceH; } diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java index 169d0a3a6af3..d8e7457d95ef 100644 --- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java +++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java @@ -462,6 +462,7 @@ class WindowSurfacePlacer { appAnimator.setNullAnimation(); // TODO: Do we need to add to mNoAnimationNotifyOnTransitionFinished like above if not // animating? + wtoken.setAllAppWinAnimators(); wtoken.setVisibility(animLp, false, transit, false, voiceInteraction); wtoken.updateReportedVisibilityLocked(); // setAllAppWinAnimators so the windows get onExitAnimationDone once the animation is @@ -606,7 +607,7 @@ class WindowSurfacePlacer { + ", oldWallpaper=" + oldWallpaper + ", openingApps=" + openingApps + ", closingApps=" + closingApps); - mService.mAnimateWallpaperWithTarget = false; + if (openingCanBeWallpaperTarget && transit == TRANSIT_KEYGUARD_GOING_AWAY) { transit = TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER; if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, @@ -645,8 +646,6 @@ class WindowSurfacePlacer { transit = TRANSIT_WALLPAPER_OPEN; if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "New transit into wallpaper: " + AppTransition.appTransitionToString(transit)); - } else { - mService.mAnimateWallpaperWithTarget = true; } } return transit; diff --git a/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp b/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp index 222ac5b903fb..98921465c673 100644 --- a/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp +++ b/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp @@ -257,7 +257,7 @@ static const JNINativeMethod gRadioServiceMethods[] = { { "nativeFinalize", "(J)V", (void*)nativeFinalize }, { "nativeLoadModules", "(J)Ljava/util/List;", (void*)nativeLoadModules }, { "nativeOpenTuner", "(JILandroid/hardware/radio/RadioManager$BandConfig;Z" - "Landroid/hardware/radio/ITunerCallback;)Lcom/android/server/broadcastradio/Tuner;", + "Landroid/hardware/radio/ITunerCallback;)Lcom/android/server/broadcastradio/hal1/Tuner;", (void*)nativeOpenTuner }, }; @@ -270,7 +270,7 @@ void register_android_server_broadcastradio_BroadcastRadioService(JNIEnv *env) { register_android_server_broadcastradio_convert(env); - auto tunerClass = FindClassOrDie(env, "com/android/server/broadcastradio/Tuner"); + auto tunerClass = FindClassOrDie(env, "com/android/server/broadcastradio/hal1/Tuner"); gjni.Tuner.clazz = MakeGlobalRefOrDie(env, tunerClass); gjni.Tuner.cstor = GetMethodIDOrDie(env, tunerClass, "<init>", "(Landroid/hardware/radio/ITunerCallback;IIZI)V"); @@ -281,7 +281,7 @@ void register_android_server_broadcastradio_BroadcastRadioService(JNIEnv *env) { gjni.ArrayList.add = GetMethodIDOrDie(env, arrayListClass, "add", "(Ljava/lang/Object;)Z"); auto res = jniRegisterNativeMethods(env, - "com/android/server/broadcastradio/BroadcastRadioService", + "com/android/server/broadcastradio/hal1/BroadcastRadioService", gRadioServiceMethods, NELEM(gRadioServiceMethods)); LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods."); } diff --git a/services/core/jni/BroadcastRadio/Tuner.cpp b/services/core/jni/BroadcastRadio/Tuner.cpp index 63339e933cac..42eb8739c9e7 100644 --- a/services/core/jni/BroadcastRadio/Tuner.cpp +++ b/services/core/jni/BroadcastRadio/Tuner.cpp @@ -592,18 +592,18 @@ void register_android_server_broadcastradio_Tuner(JavaVM *vm, JNIEnv *env) { register_android_server_broadcastradio_TunerCallback(vm, env); - auto tunerClass = FindClassOrDie(env, "com/android/server/broadcastradio/Tuner"); + auto tunerClass = FindClassOrDie(env, "com/android/server/broadcastradio/hal1/Tuner"); gjni.Tuner.nativeContext = GetFieldIDOrDie(env, tunerClass, "mNativeContext", "J"); gjni.Tuner.region = GetFieldIDOrDie(env, tunerClass, "mRegion", "I"); gjni.Tuner.tunerCallback = GetFieldIDOrDie(env, tunerClass, "mTunerCallback", - "Lcom/android/server/broadcastradio/TunerCallback;"); + "Lcom/android/server/broadcastradio/hal1/TunerCallback;"); auto arrayListClass = FindClassOrDie(env, "java/util/ArrayList"); gjni.ArrayList.clazz = MakeGlobalRefOrDie(env, arrayListClass); gjni.ArrayList.cstor = GetMethodIDOrDie(env, arrayListClass, "<init>", "()V"); gjni.ArrayList.add = GetMethodIDOrDie(env, arrayListClass, "add", "(Ljava/lang/Object;)Z"); - auto res = jniRegisterNativeMethods(env, "com/android/server/broadcastradio/Tuner", + auto res = jniRegisterNativeMethods(env, "com/android/server/broadcastradio/hal1/Tuner", gTunerMethods, NELEM(gTunerMethods)); LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods."); } diff --git a/services/core/jni/BroadcastRadio/TunerCallback.cpp b/services/core/jni/BroadcastRadio/TunerCallback.cpp index d0ba00529d0b..39f2c057fc86 100644 --- a/services/core/jni/BroadcastRadio/TunerCallback.cpp +++ b/services/core/jni/BroadcastRadio/TunerCallback.cpp @@ -406,7 +406,7 @@ sp<ITunerCallback> getNativeCallback(JNIEnv *env, jobject jTunerCallback) { } static const JNINativeMethod gTunerCallbackMethods[] = { - { "nativeInit", "(Lcom/android/server/broadcastradio/Tuner;I)J", (void*)nativeInit }, + { "nativeInit", "(Lcom/android/server/broadcastradio/hal1/Tuner;I)J", (void*)nativeInit }, { "nativeFinalize", "(J)V", (void*)nativeFinalize }, { "nativeDetach", "(J)V", (void*)nativeDetach }, }; @@ -420,7 +420,7 @@ void register_android_server_broadcastradio_TunerCallback(JavaVM *vm, JNIEnv *en gvm = vm; - auto tunerCbClass = FindClassOrDie(env, "com/android/server/broadcastradio/TunerCallback"); + auto tunerCbClass = FindClassOrDie(env, "com/android/server/broadcastradio/hal1/TunerCallback"); gjni.TunerCallback.clazz = MakeGlobalRefOrDie(env, tunerCbClass); gjni.TunerCallback.nativeContext = GetFieldIDOrDie(env, tunerCbClass, "mNativeContext", "J"); gjni.TunerCallback.handleHwFailure = GetMethodIDOrDie(env, tunerCbClass, "handleHwFailure", "()V"); @@ -444,7 +444,7 @@ void register_android_server_broadcastradio_TunerCallback(JavaVM *vm, JNIEnv *en gjni.TunerCallback.onParametersUpdated = GetMethodIDOrDie(env, tunerCbClass, "onParametersUpdated", "(Ljava/util/Map;)V"); - auto res = jniRegisterNativeMethods(env, "com/android/server/broadcastradio/TunerCallback", + auto res = jniRegisterNativeMethods(env, "com/android/server/broadcastradio/hal1/TunerCallback", gTunerCallbackMethods, NELEM(gTunerCallbackMethods)); LOG_ALWAYS_FATAL_IF(res < 0, "Unable to register native methods."); } diff --git a/services/core/jni/BroadcastRadio/convert.cpp b/services/core/jni/BroadcastRadio/convert.cpp index f5381a8caac1..be1ad72b6006 100644 --- a/services/core/jni/BroadcastRadio/convert.cpp +++ b/services/core/jni/BroadcastRadio/convert.cpp @@ -678,7 +678,7 @@ void register_android_server_broadcastradio_convert(JNIEnv *env) { gjni.AmBandDescriptor.cstor = GetMethodIDOrDie(env, amBandDescriptorClass, "<init>", "(IIIIIZ)V"); - auto convertClass = FindClassOrDie(env, "com/android/server/broadcastradio/Convert"); + auto convertClass = FindClassOrDie(env, "com/android/server/broadcastradio/hal1/Convert"); gjni.Convert.clazz = MakeGlobalRefOrDie(env, convertClass); gjni.Convert.stringMapToNative = GetStaticMethodIDOrDie(env, convertClass, "stringMapToNative", "(Ljava/util/Map;)[[Ljava/lang/String;"); diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 4cbe64d26863..246bd426e68c 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -18,8 +18,11 @@ #define LOG_NDEBUG 0 +#include <android/hardware/gnss/1.0/IGnss.h> #include <android/hardware/gnss/1.1/IGnss.h> +#include <android/hardware/gnss/1.0/IGnssMeasurement.h> +#include <android/hardware/gnss/1.1/IGnssMeasurement.h> #include <nativehelper/JNIHelp.h> #include "jni.h" #include "hardware_legacy/power.h" @@ -77,23 +80,23 @@ using android::hardware::Void; using android::hardware::hidl_vec; using android::hardware::hidl_death_recipient; using android::hidl::base::V1_0::IBase; - using android::hardware::gnss::V1_0::GnssLocation; using android::hardware::gnss::V1_0::GnssLocationFlags; - +using IGnss_V1_1 = android::hardware::gnss::V1_1::IGnss; +using IGnssMeasurement_V1_0 = android::hardware::gnss::V1_0::IGnssMeasurement; +using IGnssMeasurement_V1_1 = android::hardware::gnss::V1_1::IGnssMeasurement; +using android::hardware::gnss::V1_0::IGnss; using android::hardware::gnss::V1_0::IAGnss; using android::hardware::gnss::V1_0::IAGnssCallback; using android::hardware::gnss::V1_0::IAGnssCallback; using android::hardware::gnss::V1_0::IAGnssRil; using android::hardware::gnss::V1_0::IAGnssRilCallback; -using android::hardware::gnss::V1_0::IGnss; using android::hardware::gnss::V1_0::IGnssBatching; using android::hardware::gnss::V1_0::IGnssBatchingCallback; using android::hardware::gnss::V1_0::IGnssConfiguration; using android::hardware::gnss::V1_0::IGnssDebug; using android::hardware::gnss::V1_0::IGnssGeofenceCallback; using android::hardware::gnss::V1_0::IGnssGeofencing; -using android::hardware::gnss::V1_0::IGnssMeasurement; using android::hardware::gnss::V1_0::IGnssMeasurementCallback; using android::hardware::gnss::V1_0::IGnssNavigationMessage; using android::hardware::gnss::V1_0::IGnssNavigationMessageCallback; @@ -101,8 +104,6 @@ using android::hardware::gnss::V1_0::IGnssNi; using android::hardware::gnss::V1_0::IGnssNiCallback; using android::hardware::gnss::V1_0::IGnssXtra; using android::hardware::gnss::V1_0::IGnssXtraCallback; - -using IGnssV1_1 = android::hardware::gnss::V1_1::IGnss; using android::hardware::gnss::V1_1::IGnssCallback; struct GnssDeathRecipient : virtual public hidl_death_recipient @@ -118,7 +119,7 @@ struct GnssDeathRecipient : virtual public hidl_death_recipient sp<GnssDeathRecipient> gnssHalDeathRecipient = nullptr; sp<IGnss> gnssHal = nullptr; -sp<IGnssV1_1> gnssHalV1_1 = nullptr; +sp<IGnss_V1_1> gnssHal_V1_1 = nullptr; sp<IGnssXtra> gnssXtraIface = nullptr; sp<IAGnssRil> agnssRilIface = nullptr; sp<IGnssGeofencing> gnssGeofencingIface = nullptr; @@ -127,7 +128,8 @@ sp<IGnssBatching> gnssBatchingIface = nullptr; sp<IGnssDebug> gnssDebugIface = nullptr; sp<IGnssConfiguration> gnssConfigurationIface = nullptr; sp<IGnssNi> gnssNiIface = nullptr; -sp<IGnssMeasurement> gnssMeasurementIface = nullptr; +sp<IGnssMeasurement_V1_0> gnssMeasurementIface = nullptr; +sp<IGnssMeasurement_V1_1> gnssMeasurementIface_V1_1 = nullptr; sp<IGnssNavigationMessage> gnssNavigationMessageIface = nullptr; #define WAKE_LOCK_NAME "GPS" @@ -1068,11 +1070,13 @@ static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env, LOG_ALWAYS_FATAL("Unable to get Java VM. Error: %d", jvmStatus); } - gnssHal = gnssHalV1_1 = IGnssV1_1::getService(); - - if (gnssHal == nullptr) { + // TODO(b/31632518) + gnssHal_V1_1 = IGnss_V1_1::getService(); + if (gnssHal_V1_1 == nullptr) { ALOGD("gnssHal 1.1 was null, trying 1.0"); gnssHal = IGnss::getService(); + } else { + gnssHal = gnssHal_V1_1; } if (gnssHal != nullptr) { @@ -1116,11 +1120,21 @@ static void android_location_GnssLocationProvider_class_init_native(JNIEnv* env, gnssNavigationMessageIface = gnssNavigationMessage; } - auto gnssMeasurement = gnssHal->getExtensionGnssMeasurement(); - if (!gnssMeasurement.isOk()) { - ALOGD("Unable to get a handle to GnssMeasurement"); + if (gnssHal_V1_1 != nullptr) { + auto gnssMeasurement = gnssHal_V1_1->getExtensionGnssMeasurement_1_1(); + if (!gnssMeasurement.isOk()) { + ALOGD("Unable to get a handle to GnssMeasurement"); + } else { + gnssMeasurementIface_V1_1 = gnssMeasurement; + gnssMeasurementIface = gnssMeasurementIface_V1_1; + } } else { - gnssMeasurementIface = gnssMeasurement; + auto gnssMeasurement_V1_0 = gnssHal->getExtensionGnssMeasurement(); + if (!gnssMeasurement_V1_0.isOk()) { + ALOGD("Unable to get a handle to GnssMeasurement"); + } else { + gnssMeasurementIface = gnssMeasurement_V1_0; + } } auto gnssDebug = gnssHal->getExtensionGnssDebug(); @@ -1195,8 +1209,8 @@ static jboolean android_location_GnssLocationProvider_init(JNIEnv* env, jobject sp<IGnssCallback> gnssCbIface = new GnssCallback(); Return<bool> result = false; - if (gnssHalV1_1 != nullptr) { - result = gnssHalV1_1->setCallback_1_1(gnssCbIface); + if (gnssHal_V1_1 != nullptr) { + result = gnssHal_V1_1->setCallback_1_1(gnssCbIface); } else { result = gnssHal->setCallback(gnssCbIface); } @@ -1255,21 +1269,27 @@ static void android_location_GnssLocationProvider_cleanup(JNIEnv* /* env */, job static jboolean android_location_GnssLocationProvider_set_position_mode(JNIEnv* /* env */, jobject /* obj */, jint mode, jint recurrence, jint min_interval, jint preferred_accuracy, - jint preferred_time) { - if (gnssHal != nullptr) { - auto result = gnssHal->setPositionMode(static_cast<IGnss::GnssPositionMode>(mode), - static_cast<IGnss::GnssPositionRecurrence>(recurrence), - min_interval, - preferred_accuracy, - preferred_time); - if (!result.isOk()) { - ALOGE("%s: GNSS setPositionMode failed\n", __func__); - return JNI_FALSE; - } else { - return result; - } + jint preferred_time, jboolean low_power_mode) { + Return<bool> result = false; + if (gnssHal_V1_1 != nullptr) { + result = gnssHal_V1_1->setPositionMode_1_1(static_cast<IGnss::GnssPositionMode>(mode), + static_cast<IGnss::GnssPositionRecurrence>(recurrence), + min_interval, + preferred_accuracy, + preferred_time, + low_power_mode); + } else if (gnssHal != nullptr) { + result = gnssHal->setPositionMode(static_cast<IGnss::GnssPositionMode>(mode), + static_cast<IGnss::GnssPositionRecurrence>(recurrence), + min_interval, + preferred_accuracy, + preferred_time); + } + if (!result.isOk()) { + ALOGE("%s: GNSS setPositionMode failed\n", __func__); + return JNI_FALSE; } else { - return JNI_FALSE; + return result; } } @@ -1679,16 +1699,29 @@ static jboolean android_location_GnssLocationProvider_is_measurement_supported( } static jboolean android_location_GnssLocationProvider_start_measurement_collection( - JNIEnv* env, - jobject obj) { + JNIEnv* /* env */, + jobject /* obj */, + jboolean enableFullTracking) { if (gnssMeasurementIface == nullptr) { ALOGE("GNSS Measurement interface is not available."); return JNI_FALSE; } sp<GnssMeasurementCallback> cbIface = new GnssMeasurementCallback(); - IGnssMeasurement::GnssMeasurementStatus result = gnssMeasurementIface->setCallback(cbIface); - if (result != IGnssMeasurement::GnssMeasurementStatus::SUCCESS) { + IGnssMeasurement_V1_0::GnssMeasurementStatus result = + IGnssMeasurement_V1_0::GnssMeasurementStatus::ERROR_GENERIC;; + if (gnssMeasurementIface_V1_1 != nullptr) { + result = gnssMeasurementIface_V1_1->setCallback_1_1(cbIface, + enableFullTracking); + } else { + if (enableFullTracking == JNI_TRUE) { + // full tracking mode not supported in 1.0 HAL + return JNI_FALSE; + } + result = gnssMeasurementIface->setCallback(cbIface); + } + + if (result != IGnssMeasurement_V1_0::GnssMeasurementStatus::SUCCESS) { ALOGE("An error has been found on GnssMeasurementInterface::init, status=%d", static_cast<int32_t>(result)); return JNI_FALSE; @@ -1941,8 +1974,8 @@ static const JNINativeMethod sMethods[] = { {"native_cleanup", "()V", reinterpret_cast<void *>( android_location_GnssLocationProvider_cleanup)}, {"native_set_position_mode", - "(IIIII)Z", - reinterpret_cast<void*>(android_location_GnssLocationProvider_set_position_mode)}, + "(IIIIIZ)Z", + reinterpret_cast<void*>(android_location_GnssLocationProvider_set_position_mode)}, {"native_start", "()Z", reinterpret_cast<void*>(android_location_GnssLocationProvider_start)}, {"native_stop", "()Z", reinterpret_cast<void*>(android_location_GnssLocationProvider_stop)}, {"native_delete_aiding_data", @@ -2010,7 +2043,7 @@ static const JNINativeMethod sMethods[] = { reinterpret_cast<void *>( android_location_GnssLocationProvider_is_measurement_supported)}, {"native_start_measurement_collection", - "()Z", + "(Z)Z", reinterpret_cast<void *>( android_location_GnssLocationProvider_start_measurement_collection)}, {"native_stop_measurement_collection", diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java b/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java index 84cfabe6bebb..6dbe1a867ba1 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/BaseIDevicePolicyManager.java @@ -17,6 +17,9 @@ package com.android.server.devicepolicy; import android.app.admin.IDevicePolicyManager; import android.content.ComponentName; +import android.os.PersistableBundle; +import android.security.keymaster.KeymasterCertificateChain; +import android.security.keystore.ParcelableKeyGenParameterSpec; import com.android.internal.R; import com.android.server.SystemService; @@ -55,6 +58,12 @@ abstract class BaseIDevicePolicyManager extends IDevicePolicyManager.Stub { * @see {@link SystemService#onStopUser} */ abstract void handleStopUser(int userId); - + public void setSystemSetting(ComponentName who, String setting, String value){} + + public void transferOwner(ComponentName admin, ComponentName target, PersistableBundle bundle) {} + public boolean generateKeyPair(ComponentName who, String callerPackage, String algorithm, + ParcelableKeyGenParameterSpec keySpec, KeymasterCertificateChain attestationChain) { + return false; + } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 7ee047b0c8d2..07b87f93c7a6 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -150,13 +150,16 @@ import android.provider.ContactsContract.QuickContact; import android.provider.ContactsInternal; import android.provider.Settings; import android.provider.Settings.Global; +import android.security.Credentials; import android.security.IKeyChainAliasCallback; import android.security.IKeyChainService; import android.security.KeyChain; import android.security.KeyChain.KeyChainConnection; +import android.security.keymaster.KeymasterCertificateChain; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.ParcelableKeyGenParameterSpec; import android.security.KeyStore; +import android.security.keystore.AttestationUtils; import android.service.persistentdata.PersistentDataBlockManager; import android.telephony.TelephonyManager; import android.text.TextUtils; @@ -751,7 +754,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { private static final String ATTR_NUM_NETWORK_LOGGING_NOTIFICATIONS = "num-notifications"; private static final String TAG_IS_LOGOUT_ENABLED = "is_logout_enabled"; - final DeviceAdminInfo info; + DeviceAdminInfo info; static final int DEF_PASSWORD_HISTORY_LENGTH = 0; @@ -1402,6 +1405,13 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return userRestrictions; } + public void transfer(DeviceAdminInfo deviceAdminInfo) { + if (hasParentActiveAdmin()) { + parentAdmin.info = deviceAdminInfo; + } + info = deviceAdminInfo; + } + void dump(String prefix, PrintWriter pw) { pw.print(prefix); pw.print("uid="); pw.println(getUid()); pw.print(prefix); pw.print("testOnlyAdmin="); @@ -2541,7 +2551,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { public DeviceAdminInfo findAdmin(ComponentName adminName, int userHandle, - boolean throwForMissiongPermission) { + boolean throwForMissingPermission) { if (!mHasFeature) { return null; } @@ -2564,7 +2574,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { final String message = "DeviceAdminReceiver " + adminName + " must be protected with " + permission.BIND_DEVICE_ADMIN; Slog.w(LOG_TAG, message); - if (throwForMissiongPermission && + if (throwForMissingPermission && ai.applicationInfo.targetSdkVersion > Build.VERSION_CODES.M) { throw new IllegalArgumentException(message); } @@ -2889,7 +2899,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { try { DeviceAdminInfo dai = findAdmin( ComponentName.unflattenFromString(name), userHandle, - /* throwForMissionPermission= */ false); + /* throwForMissingPermission= */ false); if (VERBOSE_LOG && (UserHandle.getUserId(dai.getActivityInfo().applicationInfo.uid) != userHandle)) { @@ -3293,19 +3303,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { DevicePolicyData policy = getUserData(userHandle); DeviceAdminInfo info = findAdmin(adminReceiver, userHandle, - /* throwForMissionPermission= */ true); - if (info == null) { - throw new IllegalArgumentException("Bad admin: " + adminReceiver); - } - if (!info.getActivityInfo().applicationInfo.isInternal()) { - throw new IllegalArgumentException("Only apps in internal storage can be active admin: " - + adminReceiver); - } - if (info.getActivityInfo().applicationInfo.isInstantApp()) { - throw new IllegalArgumentException("Instant apps cannot be device admins: " - + adminReceiver); - } + /* throwForMissingPermission= */ true); synchronized (this) { + checkActiveAdminPrecondition(adminReceiver, info, policy); long ident = mInjector.binderClearCallingIdentity(); try { final ActiveAdmin existingAdmin @@ -3313,10 +3313,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { if (!refreshing && existingAdmin != null) { throw new IllegalArgumentException("Admin is already added"); } - if (policy.mRemovingAdmins.contains(adminReceiver)) { - throw new IllegalArgumentException( - "Trying to set an admin which is being removed"); - } ActiveAdmin newAdmin = new ActiveAdmin(info, /* parent */ false); newAdmin.testOnlyAdmin = (existingAdmin != null) ? existingAdmin.testOnlyAdmin @@ -3346,6 +3342,46 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } } + private void transferActiveAdminUncheckedLocked(ComponentName incomingReceiver, + ComponentName outgoingReceiver, int userHandle) { + final DevicePolicyData policy = getUserData(userHandle); + final DeviceAdminInfo incomingDeviceInfo = findAdmin(incomingReceiver, userHandle, + /* throwForMissingPermission= */ true); + final ActiveAdmin adminToTransfer = policy.mAdminMap.get(outgoingReceiver); + final int oldAdminUid = adminToTransfer.getUid(); + + adminToTransfer.transfer(incomingDeviceInfo); + policy.mAdminMap.remove(outgoingReceiver); + policy.mAdminMap.put(incomingReceiver, adminToTransfer); + if (policy.mPasswordOwner == oldAdminUid) { + policy.mPasswordOwner = adminToTransfer.getUid(); + } + + saveSettingsLocked(userHandle); + //TODO: Make sure we revert back when we detect a failure. + sendAdminCommandLocked(adminToTransfer, DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED, + null, null); + } + + private void checkActiveAdminPrecondition(ComponentName adminReceiver, DeviceAdminInfo info, + DevicePolicyData policy) { + if (info == null) { + throw new IllegalArgumentException("Bad admin: " + adminReceiver); + } + if (!info.getActivityInfo().applicationInfo.isInternal()) { + throw new IllegalArgumentException("Only apps in internal storage can be active admin: " + + adminReceiver); + } + if (info.getActivityInfo().applicationInfo.isInstantApp()) { + throw new IllegalArgumentException("Instant apps cannot be device admins: " + + adminReceiver); + } + if (policy.mRemovingAdmins.contains(adminReceiver)) { + throw new IllegalArgumentException( + "Trying to set an admin which is being removed"); + } + } + @Override public boolean isAdminActive(ComponentName adminReceiver, int userHandle) { if (!mHasFeature) { @@ -4880,19 +4916,22 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public boolean generateKeyPair(ComponentName who, String callerPackage, String algorithm, - ParcelableKeyGenParameterSpec parcelableKeySpec) { + ParcelableKeyGenParameterSpec parcelableKeySpec, + KeymasterCertificateChain attestationChain) { enforceCanManageScope(who, callerPackage, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER, DELEGATION_CERT_INSTALL); final KeyGenParameterSpec keySpec = parcelableKeySpec.getSpec(); if (TextUtils.isEmpty(keySpec.getKeystoreAlias())) { throw new IllegalArgumentException("Empty alias provided."); } + final String alias = keySpec.getKeystoreAlias(); // As the caller will be granted access to the key, ensure no UID was specified, as // it will not have the desired effect. if (keySpec.getUid() != KeyStore.UID_SELF) { Log.e(LOG_TAG, "Only the caller can be granted access to the generated keypair."); return false; } + final int callingUid = mInjector.binderGetCallingUid(); final UserHandle userHandle = mInjector.binderGetCallingUserHandle(); @@ -4901,7 +4940,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { try (KeyChainConnection keyChainConnection = KeyChain.bindAsUser(mContext, userHandle)) { IKeyChainService keyChain = keyChainConnection.getService(); - final boolean generationResult = keyChain.generateKeyPair(algorithm, parcelableKeySpec); + + // Copy the provided keySpec, excluding the attestation challenge, which will be + // used later for requesting key attestation record. + final KeyGenParameterSpec noAttestationSpec = + new KeyGenParameterSpec.Builder(keySpec) + .setAttestationChallenge(null) + .build(); + + final boolean generationResult = keyChain.generateKeyPair(algorithm, + new ParcelableKeyGenParameterSpec(noAttestationSpec)); if (!generationResult) { Log.e(LOG_TAG, "KeyChain failed to generate a keypair."); return false; @@ -4912,7 +4960,19 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { // Note the use of the calling UID, since the request for the private // key will come from the client's process, so the grant has to be for // that UID. - keyChain.setGrant(callingUid, keySpec.getKeystoreAlias(), true); + keyChain.setGrant(callingUid, alias, true); + + final byte[] attestationChallenge = keySpec.getAttestationChallenge(); + if (attestationChallenge != null) { + final boolean attestationResult = keyChain.attestKey( + alias, attestationChallenge, attestationChain); + if (!attestationResult) { + Log.e(LOG_TAG, String.format( + "Attestation for %s failed, deleting key.", alias)); + keyChain.removeKeyPair(alias); + return false; + } + } return true; } } catch (RemoteException e) { @@ -11538,4 +11598,60 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { return new ArrayList<>( mOverlayPackagesProvider.getNonRequiredApps(admin, userId, provisioningAction)); } + + //TODO: Add callback information to the javadoc once it is completed. + //TODO: Make transferOwner atomic. + @Override + public void transferOwner(ComponentName admin, ComponentName target, PersistableBundle bundle) { + if (!mHasFeature) { + return; + } + + Preconditions.checkNotNull(admin, "Admin cannot be null."); + Preconditions.checkNotNull(target, "Target cannot be null."); + + enforceProfileOrDeviceOwner(admin); + + if (admin.equals(target)) { + throw new IllegalArgumentException("Provided administrator and target are " + + "the same object."); + } + + if (admin.getPackageName().equals(target.getPackageName())) { + throw new IllegalArgumentException("Provided administrator and target have " + + "the same package name."); + } + + final int callingUserId = mInjector.userHandleGetCallingUserId(); + final DevicePolicyData policy = getUserData(callingUserId); + final DeviceAdminInfo incomingDeviceInfo = findAdmin(target, callingUserId, + /* throwForMissingPermission= */ true); + checkActiveAdminPrecondition(target, incomingDeviceInfo, policy); + + final long id = mInjector.binderClearCallingIdentity(); + try { + //STOPSHIP add support for COMP, DO, edge cases when device is rebooted/work mode off, + //transfer callbacks and broadcast + if (isProfileOwner(admin, callingUserId)) { + transferProfileOwner(admin, target, callingUserId); + } + } finally { + mInjector.binderRestoreCallingIdentity(id); + } + } + + /** + * Transfers the profile owner for user with id profileOwnerUserId from admin to target. + */ + private void transferProfileOwner(ComponentName admin, ComponentName target, + int profileOwnerUserId) { + synchronized (this) { + transferActiveAdminUncheckedLocked(target, admin, profileOwnerUserId); + mOwners.transferProfileOwner(target, profileOwnerUserId); + Slog.i(LOG_TAG, "Profile owner set: " + target + " on user " + profileOwnerUserId); + mOwners.writeProfileOwner(profileOwnerUserId); + mDeviceAdminServiceController.startServiceForOwner( + target.getPackageName(), profileOwnerUserId, "transfer-profile-owner"); + } + } } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java index a5500dd70c96..9042a8d8b305 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java @@ -277,6 +277,17 @@ class Owners { } } + void transferProfileOwner(ComponentName target, int userId) { + synchronized (mLock) { + final OwnerInfo ownerInfo = mProfileOwners.get(userId); + final OwnerInfo newOwnerInfo = new OwnerInfo(target.getPackageName(), target, + ownerInfo.userRestrictionsMigrated, ownerInfo.remoteBugreportUri, + ownerInfo.remoteBugreportHash); + mProfileOwners.put(userId, newOwnerInfo); + pushToPackageManagerLocked(); + } + } + ComponentName getProfileOwnerComponent(int userId) { synchronized (mLock) { OwnerInfo profileOwner = mProfileOwners.get(userId); diff --git a/services/net/OWNERS b/services/net/OWNERS index 2d71c2013093..6f77e04da3c0 100644 --- a/services/net/OWNERS +++ b/services/net/OWNERS @@ -1,10 +1,7 @@ set noparent -per-file Android.mk = build.master@android.com -per-file Android.mk = ek@google.com -per-file Android.mk = hugobenichi@google.com -per-file Android.mk = lorenzo@google.com - ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk index 114929ccecfd..b5e4af78098f 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -40,15 +40,15 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) # Include the testing libraries (JUnit4 + Robolectric libs). LOCAL_STATIC_JAVA_LIBRARIES := \ + platform-robolectric-android-all-stubs \ android-support-test \ mockito-robolectric-prebuilt \ platform-test-annotations \ truth-prebuilt -# TODO(b/69254249): Migrate to Robolectric 3.4.2 LOCAL_JAVA_LIBRARIES := \ junit \ - platform-robolectric-3.1.1-prebuilt + platform-robolectric-3.5.1-prebuilt LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib LOCAL_MODULE := FrameworksServicesRoboTests @@ -73,5 +73,4 @@ LOCAL_TEST_PACKAGE := FrameworksServicesLib LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java -# TODO(b/69254249): Migrate to Robolectric 3.4.2 -include prebuilts/misc/common/robolectric/3.1.1/run_robotests.mk +include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk diff --git a/services/robotests/src/com/android/server/backup/TransportManagerTest.java b/services/robotests/src/com/android/server/backup/TransportManagerTest.java index 3d5851fc08a7..2cb4a69cdcc1 100644 --- a/services/robotests/src/com/android/server/backup/TransportManagerTest.java +++ b/services/robotests/src/com/android/server/backup/TransportManagerTest.java @@ -19,6 +19,7 @@ package com.android.server.backup; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; +import static org.robolectric.shadow.api.Shadow.extract; import android.app.backup.BackupManager; import android.content.ComponentName; @@ -31,24 +32,25 @@ import android.os.IBinder; import android.platform.test.annotations.Presubmit; import com.android.server.backup.testing.BackupTransportStub; -import com.android.server.backup.testing.DefaultPackageManagerWithQueryIntentServicesAsUser; import com.android.server.backup.testing.ShadowBackupTransportStub; import com.android.server.backup.testing.ShadowContextImplForBackup; +import com.android.server.backup.testing.ShadowPackageManagerForBackup; import com.android.server.backup.testing.TransportBoundListenerStub; import com.android.server.backup.testing.TransportReadyCallbackStub; import com.android.server.backup.transport.TransportClient; +import com.android.server.testing.FrameworkRobolectricTestRunner; +import com.android.server.testing.SystemLoaderClasses; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.res.builder.RobolectricPackageManager; import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLooper; +import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; import java.util.Arrays; @@ -56,15 +58,17 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; -@RunWith(RobolectricTestRunner.class) +@RunWith(FrameworkRobolectricTestRunner.class) @Config( manifest = Config.NONE, - sdk = 23, + sdk = 26, shadows = { ShadowContextImplForBackup.class, - ShadowBackupTransportStub.class + ShadowBackupTransportStub.class, + ShadowPackageManagerForBackup.class } ) +@SystemLoaderClasses({TransportManager.class}) @Presubmit public class TransportManagerTest { private static final String PACKAGE_NAME = "some.package.name"; @@ -73,7 +77,7 @@ public class TransportManagerTest { private TransportInfo mTransport1; private TransportInfo mTransport2; - private RobolectricPackageManager mPackageManager; + private ShadowPackageManager mPackageManagerShadow; private final TransportBoundListenerStub mTransportBoundListenerStub = new TransportBoundListenerStub(true); @@ -86,9 +90,10 @@ public class TransportManagerTest { MockitoAnnotations.initMocks(this); ShadowLog.stream = System.out; - mPackageManager = new DefaultPackageManagerWithQueryIntentServicesAsUser( - RuntimeEnvironment.getAppResourceLoader()); - RuntimeEnvironment.setRobolectricPackageManager(mPackageManager); + + mPackageManagerShadow = + (ShadowPackageManagerForBackup) + extract(RuntimeEnvironment.application.getPackageManager()); mTransport1 = new TransportInfo(PACKAGE_NAME, "transport1.name"); mTransport2 = new TransportInfo(PACKAGE_NAME, "transport2.name"); @@ -532,6 +537,18 @@ public class TransportManagerTest { assertThat(transportName).isEqualTo("newName"); } + @Test + public void isTransportRegistered_returnsCorrectly() throws Exception { + TransportManager transportManager = + createTransportManagerAndSetUpTransports( + Collections.singletonList(mTransport1), + Collections.singletonList(mTransport2), + mTransport1.name); + + assertThat(transportManager.isTransportRegistered(mTransport1.name)).isTrue(); + assertThat(transportManager.isTransportRegistered(mTransport2.name)).isFalse(); + } + private void setUpPackageWithTransports(String packageName, List<TransportInfo> transports, int flags) throws Exception { PackageInfo packageInfo = new PackageInfo(); @@ -539,7 +556,7 @@ public class TransportManagerTest { packageInfo.applicationInfo = new ApplicationInfo(); packageInfo.applicationInfo.privateFlags = flags; - mPackageManager.addPackage(packageInfo); + mPackageManagerShadow.addPackage(packageInfo); List<ResolveInfo> transportsInfo = new ArrayList<>(); for (TransportInfo transport : transports) { @@ -553,7 +570,7 @@ public class TransportManagerTest { Intent intent = new Intent(TransportManager.SERVICE_ACTION_TRANSPORT_HOST); intent.setPackage(packageName); - mPackageManager.addResolveInfoForIntent(intent, transportsInfo); + mPackageManagerShadow.addResolveInfoForIntent(intent, transportsInfo); } private TransportManager createTransportManagerAndSetUpTransports( diff --git a/services/robotests/src/com/android/server/backup/testing/DefaultPackageManagerWithQueryIntentServicesAsUser.java b/services/robotests/src/com/android/server/backup/testing/ShadowPackageManagerForBackup.java index 5a0967ba2420..b64b59d238d1 100644 --- a/services/robotests/src/com/android/server/backup/testing/DefaultPackageManagerWithQueryIntentServicesAsUser.java +++ b/services/robotests/src/com/android/server/backup/testing/ShadowPackageManagerForBackup.java @@ -16,28 +16,22 @@ package com.android.server.backup.testing; +import android.app.ApplicationPackageManager; import android.content.Intent; import android.content.pm.ResolveInfo; -import org.robolectric.res.ResourceLoader; -import org.robolectric.res.builder.DefaultPackageManager; +import org.robolectric.annotation.Implements; +import org.robolectric.shadows.ShadowApplicationPackageManager; import java.util.List; /** * Implementation of PackageManager for Robolectric which handles queryIntentServicesAsUser(). */ -public class DefaultPackageManagerWithQueryIntentServicesAsUser extends - DefaultPackageManager { - - /* package */ - public DefaultPackageManagerWithQueryIntentServicesAsUser( - ResourceLoader appResourceLoader) { - super(appResourceLoader); - } - +@Implements(value = ApplicationPackageManager.class, inheritImplementationMethods = true) +public class ShadowPackageManagerForBackup extends ShadowApplicationPackageManager { @Override public List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int flags, int userId) { - return super.queryIntentServices(intent, flags); + return queryIntentServices(intent, flags); } } diff --git a/services/robotests/src/com/android/server/backup/transport/TransportClientTest.java b/services/robotests/src/com/android/server/backup/transport/TransportClientTest.java index 4a3277f2be02..4462d2a01c76 100644 --- a/services/robotests/src/com/android/server/backup/transport/TransportClientTest.java +++ b/services/robotests/src/com/android/server/backup/transport/TransportClientTest.java @@ -17,6 +17,7 @@ package com.android.server.backup.transport; import static com.android.server.backup.TransportManager.SERVICE_ACTION_TRANSPORT_HOST; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -37,31 +38,34 @@ import android.os.UserHandle; import android.platform.test.annotations.Presubmit; import com.android.internal.backup.IBackupTransport; +import com.android.server.backup.TransportManager; +import com.android.server.testing.FrameworkRobolectricTestRunner; +import com.android.server.testing.SystemLoaderClasses; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; -@RunWith(RobolectricTestRunner.class) -@Config(manifest = Config.NONE, sdk = 23) +@RunWith(FrameworkRobolectricTestRunner.class) +@Config(manifest = Config.NONE, sdk = 26) +@SystemLoaderClasses({TransportManager.class, TransportClient.class}) @Presubmit public class TransportClientTest { private static final String PACKAGE_NAME = "some.package.name"; - private static final ComponentName TRANSPORT_COMPONENT = - new ComponentName(PACKAGE_NAME, PACKAGE_NAME + ".transport.Transport"); - private static final String TRANSPORT_DIR_NAME = TRANSPORT_COMPONENT.toString(); @Mock private Context mContext; @Mock private TransportConnectionListener mTransportConnectionListener; @Mock private TransportConnectionListener mTransportConnectionListener2; @Mock private IBackupTransport.Stub mIBackupTransport; private TransportClient mTransportClient; + private ComponentName mTransportComponent; + private String mTransportDirName; private Intent mBindIntent; private ShadowLooper mShadowLooper; @@ -71,13 +75,16 @@ public class TransportClientTest { Looper mainLooper = Looper.getMainLooper(); mShadowLooper = shadowOf(mainLooper); - mBindIntent = new Intent(SERVICE_ACTION_TRANSPORT_HOST).setComponent(TRANSPORT_COMPONENT); + mTransportComponent = + new ComponentName(PACKAGE_NAME, PACKAGE_NAME + ".transport.Transport"); + mTransportDirName = mTransportComponent.toString(); + mBindIntent = new Intent(SERVICE_ACTION_TRANSPORT_HOST).setComponent(mTransportComponent); mTransportClient = new TransportClient( mContext, mBindIntent, - TRANSPORT_COMPONENT, - TRANSPORT_DIR_NAME, + mTransportComponent, + mTransportDirName, "1", new Handler(mainLooper)); @@ -91,12 +98,12 @@ public class TransportClientTest { @Test public void testGetTransportDirName_returnsTransportDirName() { - assertThat(mTransportClient.getTransportDirName()).isEqualTo(TRANSPORT_DIR_NAME); + assertThat(mTransportClient.getTransportDirName()).isEqualTo(mTransportDirName); } @Test public void testGetTransportComponent_returnsTransportComponent() { - assertThat(mTransportClient.getTransportComponent()).isEqualTo(TRANSPORT_COMPONENT); + assertThat(mTransportClient.getTransportComponent()).isEqualTo(mTransportComponent); } @Test @@ -117,7 +124,7 @@ public class TransportClientTest { // Simulate framework connecting ServiceConnection connection = verifyBindServiceAsUserAndCaptureServiceConnection(mContext); - connection.onServiceConnected(TRANSPORT_COMPONENT, mIBackupTransport); + connection.onServiceConnected(mTransportComponent, mIBackupTransport); mShadowLooper.runToEndOfTasks(); verify(mTransportConnectionListener) @@ -132,7 +139,7 @@ public class TransportClientTest { mTransportClient.connectAsync(mTransportConnectionListener2, "caller2"); - connection.onServiceConnected(TRANSPORT_COMPONENT, mIBackupTransport); + connection.onServiceConnected(mTransportComponent, mIBackupTransport); mShadowLooper.runToEndOfTasks(); verify(mTransportConnectionListener) @@ -145,7 +152,7 @@ public class TransportClientTest { public void testConnectAsync_whenAlreadyConnected_callsListener() throws Exception { mTransportClient.connectAsync(mTransportConnectionListener, "caller1"); ServiceConnection connection = verifyBindServiceAsUserAndCaptureServiceConnection(mContext); - connection.onServiceConnected(TRANSPORT_COMPONENT, mIBackupTransport); + connection.onServiceConnected(mTransportComponent, mIBackupTransport); mTransportClient.connectAsync(mTransportConnectionListener2, "caller2"); @@ -190,8 +197,8 @@ public class TransportClientTest { throws Exception { mTransportClient.connectAsync(mTransportConnectionListener, "caller1"); ServiceConnection connection = verifyBindServiceAsUserAndCaptureServiceConnection(mContext); - connection.onServiceConnected(TRANSPORT_COMPONENT, mIBackupTransport); - connection.onServiceDisconnected(TRANSPORT_COMPONENT); + connection.onServiceConnected(mTransportComponent, mIBackupTransport); + connection.onServiceDisconnected(mTransportComponent); mTransportClient.connectAsync(mTransportConnectionListener2, "caller1"); @@ -204,9 +211,9 @@ public class TransportClientTest { throws Exception { mTransportClient.connectAsync(mTransportConnectionListener, "caller1"); ServiceConnection connection = verifyBindServiceAsUserAndCaptureServiceConnection(mContext); - connection.onServiceConnected(TRANSPORT_COMPONENT, mIBackupTransport); - connection.onServiceDisconnected(TRANSPORT_COMPONENT); - connection.onServiceConnected(TRANSPORT_COMPONENT, mIBackupTransport); + connection.onServiceConnected(mTransportComponent, mIBackupTransport); + connection.onServiceDisconnected(mTransportComponent); + connection.onServiceConnected(mTransportComponent, mIBackupTransport); mTransportClient.connectAsync(mTransportConnectionListener2, "caller1"); @@ -221,7 +228,7 @@ public class TransportClientTest { mTransportClient.connectAsync(mTransportListener, "caller"); ServiceConnection connection = verifyBindServiceAsUserAndCaptureServiceConnection(mContext); - connection.onBindingDied(TRANSPORT_COMPONENT); + connection.onBindingDied(mTransportComponent); mShadowLooper.runToEndOfTasks(); verify(mTransportListener).onTransportBound(isNull(), eq(mTransportClient)); @@ -235,7 +242,7 @@ public class TransportClientTest { mTransportClient.connectAsync(mTransportListener2, "caller2"); - connection.onBindingDied(TRANSPORT_COMPONENT); + connection.onBindingDied(mTransportComponent); mShadowLooper.runToEndOfTasks(); verify(mTransportListener).onTransportBound(isNull(), eq(mTransportClient)); diff --git a/services/robotests/src/com/android/server/testing/FrameworkRobolectricTestRunner.java b/services/robotests/src/com/android/server/testing/FrameworkRobolectricTestRunner.java new file mode 100644 index 000000000000..78ac4ed92788 --- /dev/null +++ b/services/robotests/src/com/android/server/testing/FrameworkRobolectricTestRunner.java @@ -0,0 +1,162 @@ +/* + * 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.server.testing; + +import com.google.common.collect.ImmutableSet; + +import org.junit.runners.model.FrameworkMethod; +import org.junit.runners.model.InitializationError; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.internal.SandboxFactory; +import org.robolectric.internal.SdkEnvironment; +import org.robolectric.internal.bytecode.InstrumentationConfiguration; +import org.robolectric.internal.bytecode.SandboxClassLoader; +import org.robolectric.util.Util; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.net.URL; +import java.util.Arrays; +import java.util.Set; + +import javax.annotation.Nonnull; + +/** + * HACK + * Robolectric loads up Android environment from prebuilt android jars before running a method. + * These jars are versioned according to the SDK level configured for the method (or class). The + * jars represent a snapshot of the Android APIs in that SDK level. For Robolectric tests that are + * testing Android components themselves we don't want certain classes (usually the + * class-under-test) to be loaded from the prebuilt jar, we want it instead to be loaded from the + * dependencies of our test target, i.e. the system class loader. That way we can write tests + * against the actual classes that are in the tree, not a past version of them. Ideally we would + * have a locally built jar referenced by Robolectric, but until that happens one can use this + * class. + * This class reads the {@link SystemLoaderClasses} annotation on test classes and for each class + * in that annotation value it will bypass the android jar and load it from the system class loader. + * Allowing the test to test the actual class in the tree. + * + * Implementation note: One could think about overriding + * {@link RobolectricTestRunner#createClassLoaderConfig(FrameworkMethod)} method and putting the + * classes in the annotation in the {@link InstrumentationConfiguration} list of classes not to + * acquire. Unfortunately, this will not work because we will not be instrumenting the class. + * Instead, we have to load the class bytes from the system class loader but still instrument it, we + * do this by overriding {@link SandboxClassLoader#getByteCode(String)} and loading the class bytes + * from the system class loader if it in the {@link SystemLoaderClasses} annotation. This way the + * {@link SandboxClassLoader} still instruments the class, but it's not loaded from the android jar. + * Finally, we inject the custom class loader in place of the default one. + * + * TODO: Remove this when we are using locally built android jars in the method's environment. + */ +public class FrameworkRobolectricTestRunner extends RobolectricTestRunner { + private final SandboxFactory mSandboxFactory; + + public FrameworkRobolectricTestRunner(Class<?> testClass) throws InitializationError { + super(testClass); + SystemLoaderClasses annotation = testClass.getAnnotation(SystemLoaderClasses.class); + Class<?>[] systemLoaderClasses = + (annotation != null) ? annotation.value() : new Class<?>[0]; + Set<String> systemLoaderClassNames = classesToClassNames(systemLoaderClasses); + mSandboxFactory = new FrameworkSandboxFactory(systemLoaderClassNames); + } + + @Nonnull + @Override + protected SdkEnvironment getSandbox(FrameworkMethod method) { + // HACK: Calling super just to get SdkConfig via sandbox.getSdkConfig(), because + // RobolectricFrameworkMethod, the runtime class of method, is package-protected + SdkEnvironment sandbox = super.getSandbox(method); + return mSandboxFactory.getSdkEnvironment( + createClassLoaderConfig(method), + getJarResolver(), + sandbox.getSdkConfig()); + } + + private static class FrameworkClassLoader extends SandboxClassLoader { + private final Set<String> mSystemLoaderClasses; + + private FrameworkClassLoader( + Set<String> systemLoaderClasses, + ClassLoader systemClassLoader, + InstrumentationConfiguration instrumentationConfig, + URL... urls) { + super(systemClassLoader, instrumentationConfig, urls); + mSystemLoaderClasses = systemLoaderClasses; + } + + @Override + protected byte[] getByteCode(String className) throws ClassNotFoundException { + String classFileName = className.replace('.', '/') + ".class"; + if (shouldLoadFromSystemLoader(className)) { + try (InputStream classByteStream = getResourceAsStream(classFileName)) { + if (classByteStream == null) { + throw new ClassNotFoundException(className); + } + return Util.readBytes(classByteStream); + } catch (IOException e) { + throw new ClassNotFoundException( + "Couldn't load " + className + " from system class loader", e); + } + } + return super.getByteCode(className); + } + + /** + * Classes like com.package.ClassName$InnerClass should also be loaded from the system class + * loader, so we test if the classes in the annotation are prefixes of the class to load. + */ + private boolean shouldLoadFromSystemLoader(String className) { + for (String classNamePrefix : mSystemLoaderClasses) { + if (className.startsWith(classNamePrefix)) { + return true; + } + } + return false; + } + } + + private static class FrameworkSandboxFactory extends SandboxFactory { + private final Set<String> mSystemLoaderClasses; + + private FrameworkSandboxFactory(Set<String> systemLoaderClasses) { + mSystemLoaderClasses = systemLoaderClasses; + } + + @Nonnull + @Override + public ClassLoader createClassLoader( + InstrumentationConfiguration instrumentationConfig, URL... urls) { + return new FrameworkClassLoader( + mSystemLoaderClasses, + ClassLoader.getSystemClassLoader(), + instrumentationConfig, + urls); + } + } + + private static Set<String> classesToClassNames(Class<?>[] classes) { + ImmutableSet.Builder<String> builder = ImmutableSet.builder(); + for (Class<?> classObject : classes) { + builder.add(classObject.getName()); + } + return builder.build(); + } +} diff --git a/services/robotests/src/com/android/server/testing/SystemLoaderClasses.java b/services/robotests/src/com/android/server/testing/SystemLoaderClasses.java new file mode 100644 index 000000000000..646a413c2667 --- /dev/null +++ b/services/robotests/src/com/android/server/testing/SystemLoaderClasses.java @@ -0,0 +1,35 @@ +/* + * 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.server.testing; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation to be used in test classes that run with {@link FrameworkRobolectricTestRunner}. + * This will make the classes specified be loaded from the system class loader, NOT from the + * Robolectric android jar. + * + * @see FrameworkRobolectricTestRunner + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface SystemLoaderClasses { + Class<?>[] value() default {}; +} diff --git a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java index 82ff0d835f33..6874624ae193 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java @@ -52,10 +52,10 @@ import com.android.internal.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mockito.compat.ArgumentMatcher; import java.util.ArrayList; import java.util.List; @@ -82,13 +82,9 @@ public class NetworkScorerAppManagerTest { MockitoAnnotations.initMocks(this); mAvailableServices = new ArrayList<>(); when(mMockContext.getPackageManager()).thenReturn(mMockPm); - when(mMockPm.queryIntentServices(Mockito.argThat(new ArgumentMatcher<Intent>() { - @Override - public boolean matchesObject(Object object) { - Intent intent = (Intent) object; - return NetworkScoreManager.ACTION_RECOMMEND_NETWORKS.equals(intent.getAction()); - } - }), eq(PackageManager.GET_META_DATA))).thenReturn(mAvailableServices); + when(mMockPm.queryIntentServices(Mockito.argThat( + intent -> NetworkScoreManager.ACTION_RECOMMEND_NETWORKS.equals(intent.getAction())), + eq(PackageManager.GET_META_DATA))).thenReturn(mAvailableServices); when(mMockContext.getResources()).thenReturn(mResources); when(mMockContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager); @@ -664,15 +660,10 @@ public class NetworkScorerAppManagerTest { final int flags = PackageManager.GET_META_DATA; when(mMockPm.resolveService( - Mockito.argThat(new ArgumentMatcher<Intent>() { - @Override - public boolean matchesObject(Object object) { - Intent intent = (Intent) object; - return NetworkScoreManager.ACTION_RECOMMEND_NETWORKS - .equals(intent.getAction()) - && compName.getPackageName().equals(intent.getPackage()); - } - }), Mockito.eq(flags))).thenReturn(serviceInfo); + Mockito.argThat(intent -> NetworkScoreManager.ACTION_RECOMMEND_NETWORKS + .equals(intent.getAction()) + && compName.getPackageName().equals(intent.getPackage())), + Mockito.eq(flags))).thenReturn(serviceInfo); mAvailableServices.add(serviceInfo); } @@ -685,13 +676,9 @@ public class NetworkScorerAppManagerTest { final int flags = 0; when(mMockPm.resolveActivity( - Mockito.argThat(new ArgumentMatcher<Intent>() { - @Override - public boolean matchesObject(Object object) { - Intent intent = (Intent) object; - return NetworkScoreManager.ACTION_CUSTOM_ENABLE.equals(intent.getAction()) - && useOpenWifiComp.getPackageName().equals(intent.getPackage()); - } - }), Mockito.eq(flags))).thenReturn(resolveActivityInfo); + Mockito.argThat(intent -> + NetworkScoreManager.ACTION_CUSTOM_ENABLE.equals(intent.getAction()) + && useOpenWifiComp.getPackageName().equals(intent.getPackage())), + Mockito.eq(flags))).thenReturn(resolveActivityInfo); } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java index d286b3f7cfb6..6cacb1fe0c06 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java @@ -65,7 +65,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.compat.ArgumentMatcher; /** * Tests for MotionEventInjector diff --git a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java index 0d03863a0804..f38404436e69 100644 --- a/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java +++ b/services/tests/servicestests/src/com/android/server/am/RecentTasksTest.java @@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; +import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK; import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT; import static android.view.Display.DEFAULT_DISPLAY; @@ -36,6 +37,7 @@ import static org.mockito.Mockito.spy; import static java.lang.Integer.MAX_VALUE; +import android.app.ActivityManager; import android.app.ActivityManager.RecentTaskInfo; import android.app.ActivityManager.RunningTaskInfo; import android.content.ComponentName; @@ -181,23 +183,70 @@ public class RecentTasksTest extends ActivityTestsBase { assertTrue(mCallbacksRecorder.removed.contains(mTasks.get(1))); mCallbacksRecorder.clear(); - // Add a task which will trigger the trimming of another + // Remove the callback, ensure we don't get any calls + mRecentTasks.unregisterCallback(mCallbacksRecorder); + mRecentTasks.add(mTasks.get(0)); + mRecentTasks.remove(mTasks.get(0)); + assertTrue(mCallbacksRecorder.added.isEmpty()); + assertTrue(mCallbacksRecorder.trimmed.isEmpty()); + assertTrue(mCallbacksRecorder.removed.isEmpty()); + } + + @Test + public void testAddTasksNoMultiple_expectNoTrim() throws Exception { + // Add same non-multiple-task document tasks will remove the task (to re-add it) but not + // trim it TaskRecord documentTask1 = createDocumentTask(".DocumentTask1"); - documentTask1.maxRecents = 1; TaskRecord documentTask2 = createDocumentTask(".DocumentTask1"); mRecentTasks.add(documentTask1); mRecentTasks.add(documentTask2); assertTrue(mCallbacksRecorder.added.contains(documentTask1)); assertTrue(mCallbacksRecorder.added.contains(documentTask2)); - assertTrue(mCallbacksRecorder.trimmed.contains(documentTask1)); + assertTrue(mCallbacksRecorder.trimmed.isEmpty()); assertTrue(mCallbacksRecorder.removed.contains(documentTask1)); - mCallbacksRecorder.clear(); + } - // Remove the callback, ensure we don't get any calls - mRecentTasks.unregisterCallback(mCallbacksRecorder); - mRecentTasks.add(mTasks.get(0)); - mRecentTasks.remove(mTasks.get(0)); - assertTrue(mCallbacksRecorder.added.isEmpty()); + @Test + public void testAddTasksMaxTaskRecents_expectNoTrim() throws Exception { + // Add a task hitting max-recents for that app will remove the task (to add the next one) + // but not trim it + TaskRecord documentTask1 = createDocumentTask(".DocumentTask1"); + TaskRecord documentTask2 = createDocumentTask(".DocumentTask1"); + documentTask1.maxRecents = 1; + documentTask2.maxRecents = 1; + mRecentTasks.add(documentTask1); + mRecentTasks.add(documentTask2); + assertTrue(mCallbacksRecorder.added.contains(documentTask1)); + assertTrue(mCallbacksRecorder.added.contains(documentTask2)); + assertTrue(mCallbacksRecorder.trimmed.isEmpty()); + assertTrue(mCallbacksRecorder.removed.contains(documentTask1)); + } + + @Test + public void testAddTasksSameTask_expectNoTrim() throws Exception { + // Add a task that is already in the task list does not trigger any callbacks, it just + // moves in the list + TaskRecord documentTask1 = createDocumentTask(".DocumentTask1"); + mRecentTasks.add(documentTask1); + mRecentTasks.add(documentTask1); + assertTrue(mCallbacksRecorder.added.size() == 1); + assertTrue(mCallbacksRecorder.added.contains(documentTask1)); + assertTrue(mCallbacksRecorder.trimmed.isEmpty()); + assertTrue(mCallbacksRecorder.removed.isEmpty()); + } + + @Test + public void testAddTasksMultipleTasks_expectNoTrim() throws Exception { + // Add same multiple-task document tasks does not trim the first tasks + TaskRecord documentTask1 = createDocumentTask(".DocumentTask1", + FLAG_ACTIVITY_MULTIPLE_TASK); + TaskRecord documentTask2 = createDocumentTask(".DocumentTask1", + FLAG_ACTIVITY_MULTIPLE_TASK); + mRecentTasks.add(documentTask1); + mRecentTasks.add(documentTask2); + assertTrue(mCallbacksRecorder.added.size() == 2); + assertTrue(mCallbacksRecorder.added.contains(documentTask1)); + assertTrue(mCallbacksRecorder.added.contains(documentTask2)); assertTrue(mCallbacksRecorder.trimmed.isEmpty()); assertTrue(mCallbacksRecorder.removed.isEmpty()); } @@ -549,10 +598,15 @@ public class RecentTasksTest extends ActivityTestsBase { } private TaskRecord createDocumentTask(String className) { + return createDocumentTask(className, 0); + } + + private TaskRecord createDocumentTask(String className, int flags) { TaskRecord task = createTaskBuilder(className) - .setFlags(FLAG_ACTIVITY_NEW_DOCUMENT) + .setFlags(FLAG_ACTIVITY_NEW_DOCUMENT | flags) .build(); task.affinity = null; + task.maxRecents = ActivityManager.getMaxAppRecentsLimitStatic(); return task; } diff --git a/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java b/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java new file mode 100644 index 000000000000..2629b12375a4 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/display/BrightnessMappingStrategyTest.java @@ -0,0 +1,230 @@ +/* + * 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 com.android.server.display; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import android.os.PowerManager; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.util.Spline; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.util.Arrays; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class BrightnessMappingStrategyTest { + + private static final float[] LUX_LEVELS = { + 0f, + 5f, + 20f, + 40f, + 100f, + 325f, + 600f, + 1250f, + 2200f, + 4000f, + 5000f + }; + + private static final float[] DISPLAY_LEVELS_NITS = { + 13.25f, + 54.0f, + 78.85f, + 105.02f, + 132.7f, + 170.12f, + 212.1f, + 265.2f, + 335.8f, + 415.2f, + 478.5f, + }; + + private static final int[] DISPLAY_LEVELS_BACKLIGHT = { + 9, + 30, + 45, + 62, + 78, + 96, + 119, + 146, + 178, + 221, + 255 + }; + + private static final float[] DISPLAY_RANGE_NITS = { 2.685f, 478.5f }; + private static final int[] BACKLIGHT_RANGE = { 1, 255 }; + + @Test + public void testSimpleStrategyMappingAtControlPoints() { + BrightnessMappingStrategy simple = BrightnessMappingStrategy.create( + LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT, + null /*brightnessLevelsNits*/, null /*nitsRange*/, null /*backlightRange*/); + assertNotNull("BrightnessMappingStrategy should not be null", simple); + for (int i = 0; i < LUX_LEVELS.length; i++) { + final float expectedLevel = + (float) DISPLAY_LEVELS_BACKLIGHT[i] / PowerManager.BRIGHTNESS_ON; + assertEquals(expectedLevel, + simple.getBrightness(LUX_LEVELS[i]), 0.01f /*tolerance*/); + } + } + + @Test + public void testSimpleStrategyMappingBetweenControlPoints() { + BrightnessMappingStrategy simple = BrightnessMappingStrategy.create( + LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT, + null /*brightnessLevelsNits*/, null /*nitsRange*/, null /*backlightRange*/); + assertNotNull("BrightnessMappingStrategy should not be null", simple); + for (int i = 1; i < LUX_LEVELS.length; i++) { + final float lux = (LUX_LEVELS[i - 1] + LUX_LEVELS[i]) / 2; + final float backlight = simple.getBrightness(lux) * PowerManager.BRIGHTNESS_ON; + assertTrue("Desired brightness should be between adjacent control points.", + backlight > DISPLAY_LEVELS_BACKLIGHT[i-1] + && backlight < DISPLAY_LEVELS_BACKLIGHT[i]); + } + } + + @Test + public void testPhysicalStrategyMappingAtControlPoints() { + BrightnessMappingStrategy physical = BrightnessMappingStrategy.create( + LUX_LEVELS, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertNotNull("BrightnessMappingStrategy should not be null", physical); + for (int i = 0; i < LUX_LEVELS.length; i++) { + final float expectedLevel = DISPLAY_LEVELS_NITS[i] / DISPLAY_RANGE_NITS[1]; + assertEquals(expectedLevel, + physical.getBrightness(LUX_LEVELS[i]), 0.01f /*tolerance*/); + } + } + + @Test + public void testPhysicalStrategyMappingBetweenControlPoints() { + BrightnessMappingStrategy physical = BrightnessMappingStrategy.create( + LUX_LEVELS, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertNotNull("BrightnessMappingStrategy should not be null", physical); + Spline backlightToBrightness = + Spline.createSpline(toFloatArray(BACKLIGHT_RANGE), DISPLAY_RANGE_NITS); + for (int i = 1; i < LUX_LEVELS.length; i++) { + final float lux = (LUX_LEVELS[i - 1] + LUX_LEVELS[i]) / 2; + final float backlight = physical.getBrightness(lux) * PowerManager.BRIGHTNESS_ON; + final float nits = backlightToBrightness.interpolate(backlight); + assertTrue("Desired brightness should be between adjacent control points.", + nits > DISPLAY_LEVELS_NITS[i-1] && nits < DISPLAY_LEVELS_NITS[i]); + } + } + + @Test + public void testDefaultStrategyIsPhysical() { + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create( + LUX_LEVELS, DISPLAY_LEVELS_BACKLIGHT, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertTrue(strategy instanceof BrightnessMappingStrategy.PhysicalMappingStrategy); + } + + @Test + public void testNonStrictlyIncreasingLuxLevelsFails() { + final float[] lux = Arrays.copyOf(LUX_LEVELS, LUX_LEVELS.length); + final int idx = lux.length / 2; + float tmp = lux[idx]; + lux[idx] = lux[idx+1]; + lux[idx+1] = tmp; + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create( + lux, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertNull(strategy); + + // And make sure we get the same result even if it's monotone but not increasing. + lux[idx] = lux[idx+1]; + strategy = BrightnessMappingStrategy.create( + lux, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertNull(strategy); + } + + @Test + public void testDifferentNumberOfControlPointValuesFails() { + //Extra lux level + final float[] lux = Arrays.copyOf(LUX_LEVELS, LUX_LEVELS.length+1); + // Make sure it's strictly increasing so that the only failure is the differing array + // lengths + lux[lux.length - 1] = lux[lux.length - 2] + 1; + BrightnessMappingStrategy strategy = BrightnessMappingStrategy.create( + lux, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertNull(strategy); + + strategy = BrightnessMappingStrategy.create( + lux, DISPLAY_LEVELS_BACKLIGHT, + null /*brightnessLevelsNits*/, null /*nitsRange*/, null /*backlightRange*/); + assertNull(strategy); + + // Extra backlight level + final int[] backlight = Arrays.copyOf( + DISPLAY_LEVELS_BACKLIGHT, DISPLAY_LEVELS_BACKLIGHT.length+1); + backlight[backlight.length - 1] = backlight[backlight.length - 2] + 1; + strategy = BrightnessMappingStrategy.create( + LUX_LEVELS, backlight, + null /*brightnessLevelsNits*/, null /*nitsRange*/, null /*backlightRange*/); + assertNull(strategy); + + // Extra nits level + final float[] nits = Arrays.copyOf(DISPLAY_RANGE_NITS, DISPLAY_LEVELS_NITS.length+1); + nits[nits.length - 1] = nits[nits.length - 2] + 1; + strategy = BrightnessMappingStrategy.create( + LUX_LEVELS, null /*brightnessLevelsBacklight*/, + nits, DISPLAY_RANGE_NITS, BACKLIGHT_RANGE); + assertNull(strategy); + } + + @Test + public void testPhysicalStrategyRequiresNitsMapping() { + BrightnessMappingStrategy physical = BrightnessMappingStrategy.create( + LUX_LEVELS, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, null, BACKLIGHT_RANGE); + assertNull(physical); + + physical = BrightnessMappingStrategy.create( + LUX_LEVELS, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, DISPLAY_RANGE_NITS, null); + assertNull(physical); + + physical = BrightnessMappingStrategy.create( + LUX_LEVELS, null /*brightnessLevelsBacklight*/, + DISPLAY_LEVELS_NITS, null, null); + assertNull(physical); + } + + private static float[] toFloatArray(int[] vals) { + float[] newVals = new float[vals.length]; + for (int i = 0; i < vals.length; i++) { + newVals[i] = (float) vals[i]; + } + return newVals; + } +} diff --git a/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java b/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java new file mode 100644 index 000000000000..0cc37b48184e --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/display/PersistentDataStoreTest.java @@ -0,0 +1,223 @@ +/* + * 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 com.android.server.display; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import android.hardware.display.BrightnessConfiguration; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.util.AtomicFile; +import android.util.Pair; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.FileInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class PersistentDataStoreTest { + private PersistentDataStore mDataStore; + private TestInjector mInjector; + + @Before + public void setUp() { + mInjector = new TestInjector(); + mDataStore = new PersistentDataStore(mInjector); + } + + @Test + public void testLoadingBrightnessConfigurations() { + String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + + "<display-manager-state>\n" + + " <brightness-configurations>\n" + + " <brightness-configuration user-serial=\"1\">\n" + + " <brightness-curve>\n" + + " <brightness-point lux=\"0\" nits=\"13.25\"/>\n" + + " <brightness-point lux=\"25\" nits=\"35.94\"/>\n" + + " </brightness-curve>\n" + + " </brightness-configuration>\n" + + " <brightness-configuration user-serial=\"3\">\n" + + " <brightness-curve>\n" + + " <brightness-point lux=\"0\" nits=\"13.25\"/>\n" + + " <brightness-point lux=\"10.2\" nits=\"15\"/>\n" + + " </brightness-curve>\n" + + " </brightness-configuration>\n" + + " </brightness-configurations>\n" + + "</display-manager-state>\n"; + InputStream is = new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)); + mInjector.setReadStream(is); + mDataStore.loadIfNeeded(); + BrightnessConfiguration config = mDataStore.getBrightnessConfiguration(1 /*userSerial*/); + Pair<float[], float[]> curve = config.getCurve(); + float[] expectedLux = { 0f, 25f }; + float[] expectedNits = { 13.25f, 35.94f }; + assertArrayEquals(expectedLux, curve.first, "lux"); + assertArrayEquals(expectedNits, curve.second, "nits"); + + config = mDataStore.getBrightnessConfiguration(3 /*userSerial*/); + curve = config.getCurve(); + expectedLux = new float[] { 0f, 10.2f }; + expectedNits = new float[] { 13.25f, 15f }; + assertArrayEquals(expectedLux, curve.first, "lux"); + assertArrayEquals(expectedNits, curve.second, "nits"); + } + + @Test + public void testBrightnessConfigWithInvalidCurveIsIgnored() { + String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + + "<display-manager-state>\n" + + " <brightness-configurations>\n" + + " <brightness-configuration user-serial=\"0\">\n" + + " <brightness-curve>\n" + + " <brightness-point lux=\"1\" nits=\"13.25\"/>\n" + + " <brightness-point lux=\"25\" nits=\"35.94\"/>\n" + + " </brightness-curve>\n" + + " </brightness-configuration>\n" + + " </brightness-configurations>\n" + + "</display-manager-state>\n"; + InputStream is = new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)); + mInjector.setReadStream(is); + mDataStore.loadIfNeeded(); + assertNull(mDataStore.getBrightnessConfiguration(0 /*userSerial*/)); + } + + @Test + public void testBrightnessConfigWithInvalidFloatsIsIgnored() { + String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + + "<display-manager-state>\n" + + " <brightness-configurations>\n" + + " <brightness-configuration user-serial=\"0\">\n" + + " <brightness-curve>\n" + + " <brightness-point lux=\"0\" nits=\"13.25\"/>\n" + + " <brightness-point lux=\"0xFF\" nits=\"foo\"/>\n" + + " </brightness-curve>\n" + + " </brightness-configuration>\n" + + " </brightness-configurations>\n" + + "</display-manager-state>\n"; + InputStream is = new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)); + mInjector.setReadStream(is); + mDataStore.loadIfNeeded(); + assertNull(mDataStore.getBrightnessConfiguration(0 /*userSerial*/)); + } + + @Test + public void testEmptyBrightnessConfigurationsDoesntCrash() { + String contents = "<?xml version='1.0' encoding='utf-8' standalone='yes' ?>\n" + + "<display-manager-state>\n" + + " <brightness-configurations />\n" + + "</display-manager-state>\n"; + InputStream is = new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)); + mInjector.setReadStream(is); + mDataStore.loadIfNeeded(); + assertNull(mDataStore.getBrightnessConfiguration(0 /*userSerial*/)); + } + + @Test + public void testStoreAndReloadOfBrightnessConfigurations() { + final float[] lux = { 0f, 10f }; + final float[] nits = {1f, 100f }; + final BrightnessConfiguration config = new BrightnessConfiguration.Builder() + .setCurve(lux, nits) + .build(); + mDataStore.loadIfNeeded(); + assertNull(mDataStore.getBrightnessConfiguration(0 /*userSerial*/)); + mDataStore.setBrightnessConfigurationForUser(config, 0); + + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + mInjector.setWriteStream(baos); + mDataStore.saveIfNeeded(); + assertTrue(mInjector.wasWriteSuccessful()); + + TestInjector newInjector = new TestInjector(); + PersistentDataStore newDataStore = new PersistentDataStore(newInjector); + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + newInjector.setReadStream(bais); + newDataStore.loadIfNeeded(); + assertNotNull(newDataStore.getBrightnessConfiguration(0 /*userSerial*/)); + assertEquals(mDataStore.getBrightnessConfiguration(0 /*userSerial*/), + newDataStore.getBrightnessConfiguration(0 /*userSerial*/)); + } + + public class TestInjector extends PersistentDataStore.Injector { + private InputStream mReadStream; + private OutputStream mWriteStream; + + private boolean mWasSuccessful; + + @Override + public InputStream openRead() throws FileNotFoundException { + if (mReadStream != null) { + return mReadStream; + } else { + throw new FileNotFoundException(); + } + } + + @Override + public OutputStream startWrite() { + return mWriteStream; + } + + @Override + public void finishWrite(OutputStream os, boolean success) { + mWasSuccessful = success; + try { + os.close(); + } catch (IOException e) { + // This method can't throw IOException since the super implementation doesn't, so + // we just wrap it in a RuntimeException so we end up crashing the test all the + // same. + throw new RuntimeException(e); + } + } + + public void setReadStream(InputStream is) { + mReadStream = is; + } + + public void setWriteStream(OutputStream os) { + mWriteStream = os; + } + + public boolean wasWriteSuccessful() { + return mWasSuccessful; + } + } + + private static void assertArrayEquals(float[] expected, float[] actual, String name) { + assertEquals("Expected " + name + " arrays to be the same length!", + expected.length, actual.length); + for (int i = 0; i < expected.length; i++) { + assertEquals("Expected " + name + " arrays to be equivalent when value " + i + + "differs", expected[i], actual[i], 0.01 /*tolerance*/); + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncUtilsTest.java b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncUtilsTest.java new file mode 100644 index 000000000000..c918e8c7899d --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncUtilsTest.java @@ -0,0 +1,82 @@ +/* + * 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.server.locksettings.recoverablekeystore; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.Arrays; + +import javax.crypto.SecretKey; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class KeySyncUtilsTest { + private static final int RECOVERY_KEY_LENGTH_BITS = 256; + private static final int THM_KF_HASH_SIZE = 256; + private static final String SHA_256_ALGORITHM = "SHA-256"; + + @Test + public void calculateThmKfHash_isShaOfLockScreenHashWithPrefix() throws Exception { + byte[] lockScreenHash = utf8Bytes("012345678910"); + + byte[] thmKfHash = KeySyncUtils.calculateThmKfHash(lockScreenHash); + + assertArrayEquals(calculateSha256(utf8Bytes("THM_KF_hash012345678910")), thmKfHash); + } + + @Test + public void calculateThmKfHash_is256BitsLong() throws Exception { + byte[] thmKfHash = KeySyncUtils.calculateThmKfHash(utf8Bytes("1234")); + + assertEquals(THM_KF_HASH_SIZE / Byte.SIZE, thmKfHash.length); + } + + @Test + public void generateRecoveryKey_returnsA256BitKey() throws Exception { + SecretKey key = KeySyncUtils.generateRecoveryKey(); + + assertEquals(RECOVERY_KEY_LENGTH_BITS / Byte.SIZE, key.getEncoded().length); + } + + @Test + public void generateRecoveryKey_generatesANewKeyEachTime() throws Exception { + SecretKey a = KeySyncUtils.generateRecoveryKey(); + SecretKey b = KeySyncUtils.generateRecoveryKey(); + + assertFalse(Arrays.equals(a.getEncoded(), b.getEncoded())); + } + + private static byte[] utf8Bytes(String s) { + return s.getBytes(StandardCharsets.UTF_8); + } + + private static byte[] calculateSha256(byte[] bytes) throws Exception { + MessageDigest messageDigest = MessageDigest.getInstance(SHA_256_ALGORITHM); + messageDigest.update(bytes); + return messageDigest.digest(); + } +} diff --git a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/WrappedKeyTest.java b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/WrappedKeyTest.java index 4cd5631c9b8d..fa73722ea060 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/WrappedKeyTest.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/WrappedKeyTest.java @@ -16,7 +16,9 @@ package com.android.server.locksettings.recoverablekeystore; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import android.security.keystore.AndroidKeyStoreSecretKey; import android.security.keystore.KeyGenParameterSpec; @@ -29,6 +31,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.security.KeyStore; +import java.util.HashMap; +import java.util.Map; import javax.crypto.Cipher; import javax.crypto.KeyGenerator; @@ -70,6 +74,36 @@ public class WrappedKeyTest { assertEquals(rawKey, unwrappedKey); } + @Test + public void decryptWrappedKeys_decryptsWrappedKeys() throws Exception { + String alias = "karlin"; + SecretKey platformKey = generateAndroidKeyStoreKey(); + SecretKey appKey = generateKey(); + WrappedKey wrappedKey = WrappedKey.fromSecretKey(platformKey, appKey); + HashMap<String, WrappedKey> keysByAlias = new HashMap<>(); + keysByAlias.put(alias, wrappedKey); + + Map<String, SecretKey> unwrappedKeys = WrappedKey.unwrapKeys(platformKey, keysByAlias); + + assertEquals(1, unwrappedKeys.size()); + assertTrue(unwrappedKeys.containsKey(alias)); + assertArrayEquals(appKey.getEncoded(), unwrappedKeys.get(alias).getEncoded()); + } + + @Test + public void decryptWrappedKeys_doesNotDieIfSomeKeysAreUnwrappable() throws Exception { + String alias = "karlin"; + SecretKey appKey = generateKey(); + WrappedKey wrappedKey = WrappedKey.fromSecretKey(generateKey(), appKey); + HashMap<String, WrappedKey> keysByAlias = new HashMap<>(); + keysByAlias.put(alias, wrappedKey); + + Map<String, SecretKey> unwrappedKeys = WrappedKey.unwrapKeys( + generateAndroidKeyStoreKey(), keysByAlias); + + assertEquals(0, unwrappedKeys.size()); + } + private SecretKey generateKey() throws Exception { KeyGenerator keyGenerator = KeyGenerator.getInstance(KEY_ALGORITHM); keyGenerator.init(/*keySize=*/ 256); @@ -81,7 +115,8 @@ public class WrappedKeyTest { KEY_ALGORITHM, ANDROID_KEY_STORE_PROVIDER); keyGenerator.init(new KeyGenParameterSpec.Builder( - WRAPPING_KEY_ALIAS, KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT) + WRAPPING_KEY_ALIAS, + KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT) .setBlockModes(KeyProperties.BLOCK_MODE_GCM) .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) .build()); diff --git a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java index 1938487c6d2f..9ad41cd27f14 100644 --- a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java @@ -39,9 +39,9 @@ import android.webkit.WebViewProviderResponse; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentMatcher; import org.mockito.Mockito; import org.mockito.Matchers; -import org.mockito.compat.ArgumentMatcher; import java.lang.Integer; import java.util.concurrent.CountDownLatch; @@ -141,7 +141,7 @@ public class WebViewUpdateServiceTest { } // For matching the package name of a PackageInfo - private class IsPackageInfoWithName extends ArgumentMatcher<PackageInfo> { + private class IsPackageInfoWithName implements ArgumentMatcher<PackageInfo> { private final String mPackageName; IsPackageInfoWithName(String name) { @@ -149,8 +149,8 @@ public class WebViewUpdateServiceTest { } @Override - public boolean matchesObject(Object p) { - return ((PackageInfo) p).packageName.equals(mPackageName); + public boolean matches(PackageInfo p) { + return p.packageName.equals(mPackageName); } @Override diff --git a/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java b/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java index 4dd51ebd2d06..70906dfbdb14 100644 --- a/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/DimmerTests.java @@ -53,12 +53,12 @@ public class DimmerTests extends WindowTestsBase { } @Override - SurfaceControl getSurfaceControl() { + public SurfaceControl getSurfaceControl() { return mControl; } @Override - SurfaceControl.Transaction getPendingTransaction() { + public SurfaceControl.Transaction getPendingTransaction() { return mTransaction; } } @@ -93,12 +93,12 @@ public class DimmerTests extends WindowTestsBase { } @Override - SurfaceControl getSurfaceControl() { + public SurfaceControl getSurfaceControl() { return mHostControl; } @Override - SurfaceControl.Transaction getPendingTransaction() { + public SurfaceControl.Transaction getPendingTransaction() { return mHostTransaction; } } @@ -110,8 +110,8 @@ public class DimmerTests extends WindowTestsBase { @Before public void setUp() throws Exception { super.setUp(); - mHost = new MockSurfaceBuildingContainer(); + mTransaction = mock(SurfaceControl.Transaction.class); mDimmer = new Dimmer(mHost); } diff --git a/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java b/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java index 9ecf51ef2249..c309611bb139 100644 --- a/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimationRunnerTest.java @@ -24,9 +24,13 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.animation.AnimationHandler; import android.animation.AnimationHandler.AnimationFrameCallbackProvider; +import android.animation.ValueAnimator; import android.graphics.Matrix; import android.graphics.Point; import android.platform.test.annotations.Presubmit; @@ -40,6 +44,7 @@ import android.view.animation.Animation; import android.view.animation.TranslateAnimation; import com.android.server.wm.LocalAnimationAdapter.AnimationSpec; +import com.android.server.wm.SurfaceAnimationRunner.AnimatorFactory; import org.junit.Before; import org.junit.Rule; @@ -54,7 +59,7 @@ import java.util.concurrent.CountDownLatch; /** * Test class for {@link SurfaceAnimationRunner}. * - * runtest frameworks-services -c com.android.server.wm.SurfaceAnimationRunnerTest + * atest FrameworksServicesTests:com.android.server.wm.SurfaceAnimationRunnerTest */ @SmallTest @Presubmit @@ -63,6 +68,7 @@ public class SurfaceAnimationRunnerTest extends WindowTestsBase { @Mock SurfaceControl mMockSurface; @Mock Transaction mMockTransaction; + @Mock AnimationSpec mMockAnimationSpec; @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); private SurfaceAnimationRunner mSurfaceAnimationRunner; @@ -72,7 +78,7 @@ public class SurfaceAnimationRunnerTest extends WindowTestsBase { public void setUp() throws Exception { super.setUp(); mFinishCallbackLatch = new CountDownLatch(1); - mSurfaceAnimationRunner = new SurfaceAnimationRunner(null /* callbackProvider */, + mSurfaceAnimationRunner = new SurfaceAnimationRunner(null /* callbackProvider */, null, mMockTransaction); } @@ -104,7 +110,8 @@ public class SurfaceAnimationRunnerTest extends WindowTestsBase { @Test public void testCancel_notStarted() throws Exception { - mSurfaceAnimationRunner = new SurfaceAnimationRunner(new NoOpFrameCallbackProvider(), mMockTransaction); + mSurfaceAnimationRunner = new SurfaceAnimationRunner(new NoOpFrameCallbackProvider(), null, + mMockTransaction); mSurfaceAnimationRunner .startAnimation(createTranslateAnimation(), mMockSurface, mMockTransaction, this::finishedCallback); @@ -112,22 +119,47 @@ public class SurfaceAnimationRunnerTest extends WindowTestsBase { waitUntilHandlersIdle(); assertTrue(mSurfaceAnimationRunner.mPendingAnimations.isEmpty()); assertFinishCallbackNotCalled(); - //verify(mMockSurface).release(); } @Test public void testCancel_running() throws Exception { - mSurfaceAnimationRunner = new SurfaceAnimationRunner(new NoOpFrameCallbackProvider(), mMockTransaction); - mSurfaceAnimationRunner - .startAnimation(createTranslateAnimation(), mMockSurface, mMockTransaction, - this::finishedCallback); + mSurfaceAnimationRunner = new SurfaceAnimationRunner(new NoOpFrameCallbackProvider(), null, + mMockTransaction); + mSurfaceAnimationRunner.startAnimation(createTranslateAnimation(), mMockSurface, + mMockTransaction, this::finishedCallback); waitUntilNextFrame(); assertFalse(mSurfaceAnimationRunner.mRunningAnimations.isEmpty()); mSurfaceAnimationRunner.onAnimationCancelled(mMockSurface); assertTrue(mSurfaceAnimationRunner.mRunningAnimations.isEmpty()); waitUntilHandlersIdle(); assertFinishCallbackNotCalled(); - //verify(mMockSurface).release(); + } + + @Test + public void testCancel_sneakyCancelBeforeUpdate() throws Exception { + mSurfaceAnimationRunner = new SurfaceAnimationRunner(null, () -> new ValueAnimator() { + { + setFloatValues(0f, 1f); + } + + @Override + public void addUpdateListener(AnimatorUpdateListener listener) { + super.addUpdateListener(animation -> { + // Sneaky test cancels animation just before applying frame to simulate + // interleaving of multiple threads. Muahahaha + if (animation.getCurrentPlayTime() > 0) { + mSurfaceAnimationRunner.onAnimationCancelled(mMockSurface); + } + listener.onAnimationUpdate(animation); + }); + } + }, mMockTransaction); + when(mMockAnimationSpec.getDuration()).thenReturn(200L); + mSurfaceAnimationRunner.startAnimation(mMockAnimationSpec, mMockSurface, mMockTransaction, + this::finishedCallback); + waitUntilNextFrame(); + assertFalse(mSurfaceAnimationRunner.mRunningAnimations.isEmpty()); + verify(mMockAnimationSpec, atLeastOnce()).apply(any(), any(), eq(0L)); } private void waitUntilNextFrame() throws Exception { diff --git a/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimatorTest.java b/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimatorTest.java index 9a52042b5821..6f739ca54eb6 100644 --- a/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimatorTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/SurfaceAnimatorTest.java @@ -33,8 +33,6 @@ import android.view.SurfaceControl.Builder; import android.view.SurfaceControl.Transaction; import android.view.SurfaceSession; -import com.google.android.collect.Lists; - import com.android.server.wm.SurfaceAnimator.Animatable; import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback; @@ -50,168 +48,183 @@ import java.util.ArrayList; /** * Test class for {@link SurfaceAnimatorTest}. * - * runtest frameworks-services -c com.android.server.wm.SurfaceAnimatorTest + * atest FrameworksServicesTests:com.android.server.wm.SurfaceAnimatorTest */ @SmallTest @Presubmit @RunWith(AndroidJUnit4.class) public class SurfaceAnimatorTest extends WindowTestsBase { - @Mock - AnimationAdapter mSpec; - @Mock - AnimationAdapter mSpec2; + @Mock AnimationAdapter mSpec; + @Mock AnimationAdapter mSpec2; @Mock Transaction mTransaction; - private SurfaceAnimator mSurfaceAnimator; - private SurfaceControl mParent; - private SurfaceControl mSurface; - private boolean mFinishedCallbackCalled; - private SurfaceControl mLeash; private SurfaceSession mSession = new SurfaceSession(); - - private final Animatable mAnimatable = new Animatable() { - @Override - public Transaction getPendingTransaction() { - return mTransaction; - } - - @Override - public void commitPendingTransaction() { - } - - @Override - public void onLeashCreated(Transaction t, SurfaceControl leash) { - } - - @Override - public void onLeashDestroyed(Transaction t) { - } - - @Override - public Builder makeLeash() { - return new SurfaceControl.Builder(mSession) { - - @Override - public SurfaceControl build() { - mLeash = super.build(); - return mLeash; - } - }.setParent(mParent); - } - - @Override - public SurfaceControl getSurface() { - return mSurface; - } - - @Override - public SurfaceControl getParentSurface() { - return mParent; - } - - @Override - public int getSurfaceWidth() { - return 1; - } - - @Override - public int getSurfaceHeight() { - return 1; - } - }; - - private final Runnable mFinishedCallback = () -> { - mFinishedCallbackCalled = true; - }; + private MyAnimatable mAnimatable; @Before public void setUp() throws Exception { super.setUp(); MockitoAnnotations.initMocks(this); - mParent = sWm.makeSurfaceBuilder(mSession) - .setName("test surface parent") - .setSize(3000, 3000) - .build(); - mSurface = sWm.makeSurfaceBuilder(mSession) - .setName("test surface") - .setSize(1, 1) - .build(); - mFinishedCallbackCalled = false; - mLeash = null; - mSurfaceAnimator = new SurfaceAnimator(mAnimatable, mFinishedCallback, sWm); + mAnimatable = new MyAnimatable(); } @Test public void testRunAnimation() throws Exception { - mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); + mAnimatable.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); final ArgumentCaptor<OnAnimationFinishedCallback> callbackCaptor = ArgumentCaptor.forClass( OnAnimationFinishedCallback.class); - assertTrue(mSurfaceAnimator.isAnimating()); - assertNotNull(mSurfaceAnimator.getAnimation()); - verify(mTransaction).reparent(eq(mSurface), eq(mLeash.getHandle())); + assertTrue(mAnimatable.mSurfaceAnimator.isAnimating()); + assertNotNull(mAnimatable.mSurfaceAnimator.getAnimation()); + verify(mTransaction).reparent(eq(mAnimatable.mSurface), eq(mAnimatable.mLeash.getHandle())); verify(mSpec).startAnimation(any(), any(), callbackCaptor.capture()); callbackCaptor.getValue().onAnimationFinished(mSpec); - assertFalse(mSurfaceAnimator.isAnimating()); - assertNull(mSurfaceAnimator.getAnimation()); - assertTrue(mFinishedCallbackCalled); - + assertFalse(mAnimatable.mSurfaceAnimator.isAnimating()); + assertNull(mAnimatable.mSurfaceAnimator.getAnimation()); + assertTrue(mAnimatable.mFinishedCallbackCalled); + assertTrue(mAnimatable.mPendingDestroySurfaces.contains(mAnimatable.mLeash)); // TODO: Verify reparenting once we use mPendingTransaction to reparent it back } @Test public void testOverrideAnimation() throws Exception { - mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); - mSurfaceAnimator.startAnimation(mTransaction, mSpec2, true /* hidden */); + mAnimatable.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); + final SurfaceControl firstLeash = mAnimatable.mLeash; + mAnimatable.mSurfaceAnimator.startAnimation(mTransaction, mSpec2, true /* hidden */); - assertFalse(mFinishedCallbackCalled); + assertTrue(mAnimatable.mPendingDestroySurfaces.contains(firstLeash)); + assertFalse(mAnimatable.mFinishedCallbackCalled); final ArgumentCaptor<OnAnimationFinishedCallback> callbackCaptor = ArgumentCaptor.forClass( OnAnimationFinishedCallback.class); - assertTrue(mSurfaceAnimator.isAnimating()); - assertNotNull(mSurfaceAnimator.getAnimation()); + assertTrue(mAnimatable.mSurfaceAnimator.isAnimating()); + assertNotNull(mAnimatable.mSurfaceAnimator.getAnimation()); verify(mSpec).startAnimation(any(), any(), callbackCaptor.capture()); // First animation was finished, but this shouldn't cancel the second animation callbackCaptor.getValue().onAnimationFinished(mSpec); - assertTrue(mSurfaceAnimator.isAnimating()); + assertTrue(mAnimatable.mSurfaceAnimator.isAnimating()); // Second animation was finished verify(mSpec2).startAnimation(any(), any(), callbackCaptor.capture()); callbackCaptor.getValue().onAnimationFinished(mSpec2); - assertFalse(mSurfaceAnimator.isAnimating()); - assertTrue(mFinishedCallbackCalled); + assertFalse(mAnimatable.mSurfaceAnimator.isAnimating()); + assertTrue(mAnimatable.mFinishedCallbackCalled); } @Test public void testCancelAnimation() throws Exception { - mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); - assertTrue(mSurfaceAnimator.isAnimating()); - mSurfaceAnimator.cancelAnimation(); - assertFalse(mSurfaceAnimator.isAnimating()); + mAnimatable.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); + assertTrue(mAnimatable.mSurfaceAnimator.isAnimating()); + mAnimatable.mSurfaceAnimator.cancelAnimation(); + assertFalse(mAnimatable.mSurfaceAnimator.isAnimating()); verify(mSpec).onAnimationCancelled(any()); - assertTrue(mFinishedCallbackCalled); + assertTrue(mAnimatable.mFinishedCallbackCalled); + assertTrue(mAnimatable.mPendingDestroySurfaces.contains(mAnimatable.mLeash)); } @Test public void testDelayingAnimationStart() throws Exception { - mSurfaceAnimator.startDelayingAnimationStart(); - mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); + mAnimatable.mSurfaceAnimator.startDelayingAnimationStart(); + mAnimatable.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); verifyZeroInteractions(mSpec); - assertTrue(mSurfaceAnimator.isAnimating()); - mSurfaceAnimator.endDelayingAnimationStart(); + assertTrue(mAnimatable.mSurfaceAnimator.isAnimating()); + mAnimatable.mSurfaceAnimator.endDelayingAnimationStart(); verify(mSpec).startAnimation(any(), any(), any()); } @Test public void testDelayingAnimationStartAndCancelled() throws Exception { - mSurfaceAnimator.startDelayingAnimationStart(); - mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); - mSurfaceAnimator.cancelAnimation(); + mAnimatable.mSurfaceAnimator.startDelayingAnimationStart(); + mAnimatable.mSurfaceAnimator.startAnimation(mTransaction, mSpec, true /* hidden */); + mAnimatable.mSurfaceAnimator.cancelAnimation(); verifyZeroInteractions(mSpec); - assertFalse(mSurfaceAnimator.isAnimating()); - assertTrue(mFinishedCallbackCalled); + assertFalse(mAnimatable.mSurfaceAnimator.isAnimating()); + assertTrue(mAnimatable.mFinishedCallbackCalled); + assertTrue(mAnimatable.mPendingDestroySurfaces.contains(mAnimatable.mLeash)); + } + + private class MyAnimatable implements Animatable { + + final SurfaceControl mParent; + final SurfaceControl mSurface; + final ArrayList<SurfaceControl> mPendingDestroySurfaces = new ArrayList<>(); + final SurfaceAnimator mSurfaceAnimator; + SurfaceControl mLeash; + boolean mFinishedCallbackCalled; + + MyAnimatable() { + mParent = sWm.makeSurfaceBuilder(mSession) + .setName("test surface parent") + .setSize(3000, 3000) + .build(); + mSurface = sWm.makeSurfaceBuilder(mSession) + .setName("test surface") + .setSize(1, 1) + .build(); + mFinishedCallbackCalled = false; + mLeash = null; + mSurfaceAnimator = new SurfaceAnimator(this, mFinishedCallback, sWm); + } + + @Override + public Transaction getPendingTransaction() { + return mTransaction; + } + + @Override + public void commitPendingTransaction() { + } + + @Override + public void onAnimationLeashCreated(Transaction t, SurfaceControl leash) { + } + + @Override + public void onAnimationLeashDestroyed(Transaction t) { + } + + @Override + public void destroyAfterPendingTransaction(SurfaceControl surface) { + mPendingDestroySurfaces.add(surface); + } + + @Override + public Builder makeAnimationLeash() { + return new SurfaceControl.Builder(mSession) { + + @Override + public SurfaceControl build() { + mLeash = super.build(); + return mLeash; + } + }.setParent(mParent); + } + + @Override + public SurfaceControl getSurfaceControl() { + return mSurface; + } + + @Override + public SurfaceControl getParentSurfaceControl() { + return mParent; + } + + @Override + public int getSurfaceWidth() { + return 1; + } + + @Override + public int getSurfaceHeight() { + return 1; + } + + private final Runnable mFinishedCallback = () -> { + mFinishedCallbackCalled = true; + }; } } diff --git a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java index 481c898414ac..c73534196f45 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java +++ b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java @@ -411,6 +411,11 @@ class TestWindowManagerPolicy implements WindowManagerPolicy { } @Override + public boolean inKeyguardRestrictedKeyInputMode() { + return false; + } + + @Override public void dismissKeyguardLw(@Nullable IKeyguardDismissCallback callback) { } diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java index 5cb94678a58c..307deb487bbf 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java @@ -29,8 +29,6 @@ import java.util.Comparator; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; -import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; -import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; @@ -333,12 +331,19 @@ public class WindowContainerTests extends WindowTestsBase { final TestWindowContainer child12 = child1.addChildWindow(builder.setIsAnimating(true)); final TestWindowContainer child21 = child2.addChildWindow(); - assertTrue(root.isAnimating()); + assertFalse(root.isAnimating()); assertTrue(child1.isAnimating()); - assertFalse(child11.isAnimating()); + assertTrue(child11.isAnimating()); assertTrue(child12.isAnimating()); assertFalse(child2.isAnimating()); assertFalse(child21.isAnimating()); + + assertTrue(root.isSelfOrChildAnimating()); + assertTrue(child1.isSelfOrChildAnimating()); + assertFalse(child11.isSelfOrChildAnimating()); + assertTrue(child12.isSelfOrChildAnimating()); + assertFalse(child2.isSelfOrChildAnimating()); + assertFalse(child21.isSelfOrChildAnimating()); } @Test @@ -630,8 +635,8 @@ public class WindowContainerTests extends WindowTestsBase { } @Override - boolean isAnimating() { - return mIsAnimating || super.isAnimating(); + boolean isSelfAnimating() { + return mIsAnimating; } @Override diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java index b2334e848d4d..5f587444fcf4 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowTestUtils.java @@ -189,7 +189,6 @@ public class WindowTestUtils { public static class TestTask extends Task { boolean mShouldDeferRemoval = false; boolean mOnDisplayChangedCalled = false; - private boolean mUseLocalIsAnimating = false; private boolean mIsAnimating = false; TestTask(int taskId, TaskStack stack, int userId, WindowManagerService service, @@ -214,12 +213,11 @@ public class WindowTestUtils { } @Override - boolean isAnimating() { - return mUseLocalIsAnimating ? mIsAnimating : super.isAnimating(); + boolean isSelfAnimating() { + return mIsAnimating; } void setLocalIsAnimating(boolean isAnimating) { - mUseLocalIsAnimating = true; mIsAnimating = isAnimating; } } diff --git a/services/tests/uiservicestests/Android.mk b/services/tests/uiservicestests/Android.mk index 40e78785b9f5..d8e14ecab1cd 100644 --- a/services/tests/uiservicestests/Android.mk +++ b/services/tests/uiservicestests/Android.mk @@ -10,7 +10,8 @@ LOCAL_MODULE_TAGS := tests # Include test java files and source from notifications package. LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-java-files-under, ../../core/java/com/android/server/notification) + $(call all-java-files-under, ../../core/java/com/android/server/notification) \ + $(call all-java-files-under, ../../core/java/com/android/server/slice) \ LOCAL_STATIC_JAVA_LIBRARIES := \ frameworks-base-testutils \ diff --git a/services/tests/uiservicestests/AndroidManifest.xml b/services/tests/uiservicestests/AndroidManifest.xml index 621b4572c467..f022dcf376a6 100644 --- a/services/tests/uiservicestests/AndroidManifest.xml +++ b/services/tests/uiservicestests/AndroidManifest.xml @@ -28,6 +28,9 @@ <application> <uses-library android:name="android.test.runner" /> + + <provider android:name=".DummyProvider" + android:authorities="com.android.services.uitests" /> </application> <instrumentation diff --git a/services/tests/uiservicestests/src/com/android/frameworks/tests/uiservices/DummyProvider.java b/services/tests/uiservicestests/src/com/android/frameworks/tests/uiservices/DummyProvider.java new file mode 100644 index 000000000000..574c226699c6 --- /dev/null +++ b/services/tests/uiservicestests/src/com/android/frameworks/tests/uiservices/DummyProvider.java @@ -0,0 +1,53 @@ +/* + * 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.frameworks.tests.uiservices; + +import android.content.ContentProvider; +import android.content.ContentValues; +import android.database.Cursor; +import android.net.Uri; + +public class DummyProvider extends ContentProvider { + @Override + public boolean onCreate() { + return true; + } + + @Override + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, + String sortOrder) { + return null; + } + + @Override + public String getType(Uri uri) { + return null; + } + + @Override + public Uri insert(Uri uri, ContentValues values) { + return null; + } + + @Override + public int delete(Uri uri, String selection, String[] selectionArgs) { + return 0; + } + + @Override + public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { + return 0; + } +} diff --git a/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java b/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java new file mode 100644 index 000000000000..f534b5c40267 --- /dev/null +++ b/services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java @@ -0,0 +1,38 @@ +/* + * 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.server; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.testing.TestableContext; + +import org.junit.Before; +import org.junit.Rule; + + +public class UiServiceTestCase { + @Rule + public final TestableContext mContext = + new TestableContext(InstrumentationRegistry.getContext(), null); + + protected TestableContext getContext() { + return mContext; + } + + @Before + public void setup() { + // Share classloader to allow package access. + System.setProperty("dexmaker.share_classloader", "true"); + } +} diff --git a/services/tests/uiservicestests/src/com/android/server/notification/AlertRateLimiterTest.java b/services/tests/uiservicestests/src/com/android/server/notification/AlertRateLimiterTest.java index faf6a9b76434..d4c41e0285bd 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/AlertRateLimiterTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/AlertRateLimiterTest.java @@ -22,13 +22,16 @@ import static junit.framework.Assert.assertTrue; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; + +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class AlertRateLimiterTest extends NotificationTestCase { +public class AlertRateLimiterTest extends UiServiceTestCase { private long mTestStartTime; private diff --git a/services/tests/uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java index 262516dda7ad..142041a4f705 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/BadgeExtractorTest.java @@ -27,13 +27,13 @@ import android.app.ActivityManager; import android.app.Notification; import android.app.Notification.Builder; import android.app.NotificationChannel; -import android.app.NotificationManager; import android.os.UserHandle; -import android.provider.Settings.Secure; import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,7 +42,7 @@ import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidJUnit4.class) -public class BadgeExtractorTest extends NotificationTestCase { +public class BadgeExtractorTest extends UiServiceTestCase { @Mock RankingConfig mConfig; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java index 0b4d61fb783e..a92f7e7af5d8 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -58,13 +58,13 @@ import android.provider.Settings; import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import android.util.Slog; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.IAccessibilityManager; import android.view.accessibility.IAccessibilityManagerClient; import com.android.internal.util.IntPair; +import com.android.server.UiServiceTestCase; import com.android.server.lights.Light; import org.junit.Before; @@ -74,12 +74,10 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; @SmallTest @RunWith(AndroidJUnit4.class) -public class BuzzBeepBlinkTest extends NotificationTestCase { +public class BuzzBeepBlinkTest extends UiServiceTestCase { @Mock AudioManager mAudioManager; @Mock Vibrator mVibrator; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/GlobalSortKeyComparatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/GlobalSortKeyComparatorTest.java index f92bd842e815..97f210400141 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/GlobalSortKeyComparatorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/GlobalSortKeyComparatorTest.java @@ -28,6 +28,8 @@ import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import org.junit.Test; import org.junit.runner.RunWith; @@ -37,7 +39,7 @@ import java.util.List; @SmallTest @RunWith(AndroidJUnit4.class) -public class GlobalSortKeyComparatorTest extends NotificationTestCase { +public class GlobalSortKeyComparatorTest extends UiServiceTestCase { private final String PKG = "PKG"; private final int UID = 1111111; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java index f75c648f3c3e..8d4c5b1df7d2 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java @@ -38,6 +38,8 @@ import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -45,7 +47,7 @@ import java.util.Map; @SmallTest @RunWith(AndroidJUnit4.class) -public class GroupHelperTest extends NotificationTestCase { +public class GroupHelperTest extends UiServiceTestCase { private @Mock GroupHelper.Callback mCallback; private GroupHelper mGroupHelper; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ImportanceExtractorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ImportanceExtractorTest.java index d325e10b5897..73d5961ee90b 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ImportanceExtractorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ImportanceExtractorTest.java @@ -30,7 +30,6 @@ import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import static org.mockito.Matchers.anyInt; @@ -39,9 +38,11 @@ import static org.mockito.Mockito.when; import static org.junit.Assert.assertEquals; +import com.android.server.UiServiceTestCase; + @SmallTest @RunWith(AndroidJUnit4.class) -public class ImportanceExtractorTest extends NotificationTestCase { +public class ImportanceExtractorTest extends UiServiceTestCase { @Mock RankingConfig mConfig; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java index a4b9b256aa07..9ef0ec7ac99b 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java @@ -49,6 +49,7 @@ import android.util.ArrayMap; import android.util.Xml; import com.android.internal.util.FastXmlSerializer; +import com.android.server.UiServiceTestCase; import com.google.android.collect.Lists; @@ -68,7 +69,7 @@ import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.List; -public class ManagedServicesTest extends NotificationTestCase { +public class ManagedServicesTest extends UiServiceTestCase { @Mock private IPackageManager mIpm; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAdjustmentExtractorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAdjustmentExtractorTest.java index e52764450ee5..fd674f0c3858 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationAdjustmentExtractorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationAdjustmentExtractorTest.java @@ -31,12 +31,14 @@ import android.service.notification.Adjustment; import android.service.notification.SnoozeCriterion; import android.service.notification.StatusBarNotification; +import com.android.server.UiServiceTestCase; + import org.junit.Test; import java.util.ArrayList; import java.util.Objects; -public class NotificationAdjustmentExtractorTest extends NotificationTestCase { +public class NotificationAdjustmentExtractorTest extends UiServiceTestCase { @Test public void testExtractsAdjustment() { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java index d75213c3e773..eb45960bc82f 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelExtractorTest.java @@ -16,7 +16,6 @@ package com.android.server.notification; -import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; @@ -31,17 +30,17 @@ import static org.mockito.Mockito.when; import android.app.Notification; import android.app.NotificationChannel; -import android.app.PendingIntent; -import android.content.Intent; import android.os.UserHandle; import android.service.notification.StatusBarNotification; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -public class NotificationChannelExtractorTest extends NotificationTestCase { +public class NotificationChannelExtractorTest extends UiServiceTestCase { @Mock RankingConfig mConfig; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelTest.java index f457f6a550c1..2241047dec0e 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationChannelTest.java @@ -26,6 +26,7 @@ import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; import com.android.internal.util.FastXmlSerializer; +import com.android.server.UiServiceTestCase; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,7 +37,7 @@ import java.io.ByteArrayOutputStream; @SmallTest @RunWith(AndroidJUnit4.class) -public class NotificationChannelTest extends NotificationTestCase { +public class NotificationChannelTest extends UiServiceTestCase { @Test public void testWriteToParcel() { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java index 1e5f96f7be3a..3dcd5b9829da 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationComparatorTest.java @@ -38,6 +38,8 @@ import android.telecom.TelecomManager; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,7 +52,7 @@ import java.util.List; @SmallTest @RunWith(AndroidJUnit4.class) -public class NotificationComparatorTest extends NotificationTestCase { +public class NotificationComparatorTest extends UiServiceTestCase { @Mock Context mContext; @Mock TelecomManager mTm; @Mock RankingHandler handler; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationIntrusivenessExtractorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationIntrusivenessExtractorTest.java index 85852f90c281..00d93ded9a3c 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationIntrusivenessExtractorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationIntrusivenessExtractorTest.java @@ -32,9 +32,11 @@ import android.content.Intent; import android.os.UserHandle; import android.service.notification.StatusBarNotification; +import com.android.server.UiServiceTestCase; + import org.junit.Test; -public class NotificationIntrusivenessExtractorTest extends NotificationTestCase { +public class NotificationIntrusivenessExtractorTest extends UiServiceTestCase { @Test public void testNonIntrusive() { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java index d767ba2e8487..f4313b80c520 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java @@ -37,6 +37,8 @@ import android.service.notification.SnoozeCriterion; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import org.junit.Test; import org.junit.runner.RunWith; @@ -45,7 +47,7 @@ import java.util.List; @SmallTest @RunWith(AndroidJUnit4.class) -public class NotificationListenerServiceTest extends NotificationTestCase { +public class NotificationListenerServiceTest extends UiServiceTestCase { private String[] mKeys = new String[] { "key", "key1", "key2", "key3"}; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 0343ab2d14f4..ad3fecf4b50e 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -83,6 +83,7 @@ import android.util.ArrayMap; import android.util.AtomicFile; import com.android.internal.statusbar.NotificationVisibility; +import com.android.server.UiServiceTestCase; import com.android.server.lights.Light; import com.android.server.lights.LightsManager; import com.android.server.notification.NotificationManagerService.NotificationAssistants; @@ -110,7 +111,7 @@ import java.util.Map; @SmallTest @RunWith(AndroidTestingRunner.class) @RunWithLooper -public class NotificationManagerServiceTest extends NotificationTestCase { +public class NotificationManagerServiceTest extends UiServiceTestCase { private static final String TEST_CHANNEL_ID = "NotificationManagerServiceTestChannelId"; private final int mUid = Binder.getCallingUid(); private NotificationManagerService mService; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java index ef26705aa71c..a5fa903c4f00 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java @@ -53,6 +53,7 @@ import android.test.suitebuilder.annotation.SmallTest; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.server.UiServiceTestCase; import org.junit.Before; import org.junit.Test; @@ -65,7 +66,7 @@ import java.util.Objects; @SmallTest @RunWith(AndroidJUnit4.class) -public class NotificationRecordTest extends NotificationTestCase { +public class NotificationRecordTest extends UiServiceTestCase { private final Context mMockContext = Mockito.mock(Context.class); @Mock PackageManager mPm; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationStatsTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationStatsTest.java index fec28115b418..4f153eed7326 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationStatsTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationStatsTest.java @@ -11,12 +11,14 @@ import android.service.notification.NotificationStats; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import org.junit.Test; import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class NotificationStatsTest extends NotificationTestCase { +public class NotificationStatsTest extends UiServiceTestCase { @Test public void testConstructor() { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationTest.java index 4165e9e0aceb..4bfb2362988e 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationTest.java @@ -33,6 +33,8 @@ import android.os.Build; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,7 +43,7 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest -public class NotificationTest extends NotificationTestCase { +public class NotificationTest extends UiServiceTestCase { @Mock ActivityManager mAm; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java index 2d03f111e528..abfc54d19068 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RankingHelperTest.java @@ -65,6 +65,7 @@ import android.util.ArrayMap; import android.util.Xml; import com.android.internal.util.FastXmlSerializer; +import com.android.server.UiServiceTestCase; import org.json.JSONArray; import org.json.JSONObject; @@ -90,7 +91,7 @@ import java.util.concurrent.ThreadLocalRandom; @SmallTest @RunWith(AndroidJUnit4.class) -public class RankingHelperTest extends NotificationTestCase { +public class RankingHelperTest extends UiServiceTestCase { private static final String PKG = "com.android.server.notification"; private static final int UID = 0; private static final UserHandle USER = UserHandle.of(0); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java index e354267dce21..5d8d48f158fa 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RateEstimatorTest.java @@ -24,9 +24,11 @@ import org.junit.runner.RunWith; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import com.android.server.UiServiceTestCase; + @SmallTest @RunWith(AndroidJUnit4.class) -public class RateEstimatorTest extends NotificationTestCase { +public class RateEstimatorTest extends UiServiceTestCase { private long mTestStartTime; private RateEstimator mEstimator; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java index 5ebfd488eb97..9564ab9bdfee 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ScheduleCalendarTest.java @@ -27,6 +27,8 @@ import android.support.test.filters.FlakyTest; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,7 +38,7 @@ import java.util.GregorianCalendar; @SmallTest @RunWith(AndroidJUnit4.class) -public class ScheduleCalendarTest extends NotificationTestCase { +public class ScheduleCalendarTest extends UiServiceTestCase { private ScheduleCalendar mScheduleCalendar; private ZenModeConfig.ScheduleInfo mScheduleInfo; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ScheduleConditionProviderTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ScheduleConditionProviderTest.java index 610592f6b71c..17fed83c4b02 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ScheduleConditionProviderTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ScheduleConditionProviderTest.java @@ -13,6 +13,8 @@ import android.service.notification.ZenModeConfig; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,7 +25,7 @@ import java.util.GregorianCalendar; @RunWith(AndroidJUnit4.class) @SmallTest -public class ScheduleConditionProviderTest extends NotificationTestCase { +public class ScheduleConditionProviderTest extends UiServiceTestCase { ScheduleConditionProvider mService; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java index 07b21fbc8f5f..88c6fcf138cf 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/SnoozeHelperTest.java @@ -32,7 +32,6 @@ import android.os.UserHandle; import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; -import android.util.Slog; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -46,10 +45,12 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.android.server.UiServiceTestCase; + @SmallTest @RunWith(AndroidJUnit4.class) -public class SnoozeHelperTest extends NotificationTestCase { +public class SnoozeHelperTest extends UiServiceTestCase { private static final String TEST_CHANNEL_ID = "test_channel_id"; @Mock SnoozeHelper.Callback mCallback; diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java index 4ac0c65791fd..58f0ded9b9a1 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ValidateNotificationPeopleTest.java @@ -30,9 +30,11 @@ import org.junit.runner.RunWith; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertEquals; +import com.android.server.UiServiceTestCase; + @SmallTest @RunWith(AndroidJUnit4.class) -public class ValidateNotificationPeopleTest extends NotificationTestCase { +public class ValidateNotificationPeopleTest extends UiServiceTestCase { @Test public void testNoExtra() throws Exception { diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java index 8ac6481e69d9..0c7397afb879 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java @@ -32,6 +32,8 @@ import android.test.suitebuilder.annotation.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; +import com.android.server.UiServiceTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -41,7 +43,7 @@ import org.mockito.MockitoAnnotations; @SmallTest @RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper -public class ZenModeHelperTest extends NotificationTestCase { +public class ZenModeHelperTest extends UiServiceTestCase { @Mock ConditionProviders mConditionProviders; private TestableLooper mTestableLooper; diff --git a/services/tests/uiservicestests/src/com/android/server/slice/PinnedSliceStateTest.java b/services/tests/uiservicestests/src/com/android/server/slice/PinnedSliceStateTest.java new file mode 100644 index 000000000000..ce328c29f01c --- /dev/null +++ b/services/tests/uiservicestests/src/com/android/server/slice/PinnedSliceStateTest.java @@ -0,0 +1,214 @@ +package com.android.server.slice; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.slice.ISliceListener; +import android.app.slice.Slice; +import android.app.slice.SliceProvider; +import android.app.slice.SliceSpec; +import android.content.ContentProvider; +import android.content.IContentProvider; +import android.net.Uri; +import android.os.Bundle; +import android.os.Handler; +import android.os.RemoteException; +import android.support.test.filters.SmallTest; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.testing.TestableLooper.RunWithLooper; + +import com.android.server.UiServiceTestCase; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +@RunWithLooper +public class PinnedSliceStateTest extends UiServiceTestCase { + + private static final String AUTH = "my.authority"; + private static final Uri TEST_URI = Uri.parse("content://" + AUTH + "/path"); + + private static final SliceSpec[] FIRST_SPECS = new SliceSpec[]{ + new SliceSpec("spec1", 3), + new SliceSpec("spec2", 3), + new SliceSpec("spec3", 2), + new SliceSpec("spec4", 1), + }; + + private static final SliceSpec[] SECOND_SPECS = new SliceSpec[]{ + new SliceSpec("spec2", 1), + new SliceSpec("spec3", 2), + new SliceSpec("spec4", 3), + new SliceSpec("spec5", 4), + }; + + private SliceManagerService mSliceService; + private PinnedSliceState mPinnedSliceManager; + private IContentProvider mIContentProvider; + private ContentProvider mContentProvider; + + @Before + public void setup() { + mSliceService = mock(SliceManagerService.class); + when(mSliceService.getLock()).thenReturn(new Object()); + when(mSliceService.getContext()).thenReturn(mContext); + when(mSliceService.getHandler()).thenReturn(new Handler(TestableLooper.get(this).getLooper())); + mContentProvider = mock(ContentProvider.class); + mIContentProvider = mock(IContentProvider.class); + when(mContentProvider.getIContentProvider()).thenReturn(mIContentProvider); + mContext.getContentResolver().addProvider(AUTH, mContentProvider); + mPinnedSliceManager = new PinnedSliceState(mSliceService, TEST_URI); + } + + @Test + public void testMergeSpecs() { + // No annotations to start. + assertNull(mPinnedSliceManager.getSpecs()); + + mPinnedSliceManager.mergeSpecs(FIRST_SPECS); + assertArrayEquals(FIRST_SPECS, mPinnedSliceManager.getSpecs()); + + mPinnedSliceManager.mergeSpecs(SECOND_SPECS); + assertArrayEquals(new SliceSpec[]{ + // spec1 is gone because it's not in the second set. + new SliceSpec("spec2", 1), // spec2 is 1 because it's smaller in the second set. + new SliceSpec("spec3", 2), // spec3 is the same in both sets + new SliceSpec("spec4", 1), // spec4 is 1 because it's smaller in the first set. + // spec5 is gone because it's not in the first set. + }, mPinnedSliceManager.getSpecs()); + } + + @Test + public void testSendPinnedOnCreate() throws RemoteException { + // When created, a pinned message should be sent. + TestableLooper.get(this).processAllMessages(); + + verify(mIContentProvider).call(anyString(), eq(SliceProvider.METHOD_PIN), eq(null), + argThat(b -> { + assertEquals(TEST_URI, b.getParcelable(SliceProvider.EXTRA_BIND_URI)); + return true; + })); + } + + @Test + public void testSendUnpinnedOnDestroy() throws RemoteException { + TestableLooper.get(this).processAllMessages(); + clearInvocations(mIContentProvider); + + mPinnedSliceManager.destroy(); + TestableLooper.get(this).processAllMessages(); + + verify(mIContentProvider).call(anyString(), eq(SliceProvider.METHOD_UNPIN), eq(null), + argThat(b -> { + assertEquals(TEST_URI, b.getParcelable(SliceProvider.EXTRA_BIND_URI)); + return true; + })); + } + + @Test + public void testPkgPin() { + assertFalse(mPinnedSliceManager.isPinned()); + + mPinnedSliceManager.pin("pkg", FIRST_SPECS); + assertTrue(mPinnedSliceManager.isPinned()); + + assertTrue(mPinnedSliceManager.unpin("pkg")); + assertFalse(mPinnedSliceManager.isPinned()); + } + + @Test + public void testMultiPkgPin() { + assertFalse(mPinnedSliceManager.isPinned()); + + mPinnedSliceManager.pin("pkg", FIRST_SPECS); + assertTrue(mPinnedSliceManager.isPinned()); + mPinnedSliceManager.pin("pkg2", FIRST_SPECS); + + assertFalse(mPinnedSliceManager.unpin("pkg")); + assertTrue(mPinnedSliceManager.unpin("pkg2")); + assertFalse(mPinnedSliceManager.isPinned()); + } + + @Test + public void testListenerPin() { + ISliceListener listener = mock(ISliceListener.class); + assertFalse(mPinnedSliceManager.isPinned()); + + mPinnedSliceManager.addSliceListener(listener, FIRST_SPECS); + assertTrue(mPinnedSliceManager.isPinned()); + + assertTrue(mPinnedSliceManager.removeSliceListener(listener)); + assertFalse(mPinnedSliceManager.isPinned()); + } + + @Test + public void testMultiListenerPin() { + ISliceListener listener = mock(ISliceListener.class); + ISliceListener listener2 = mock(ISliceListener.class); + assertFalse(mPinnedSliceManager.isPinned()); + + mPinnedSliceManager.addSliceListener(listener, FIRST_SPECS); + assertTrue(mPinnedSliceManager.isPinned()); + mPinnedSliceManager.addSliceListener(listener2, FIRST_SPECS); + + assertFalse(mPinnedSliceManager.removeSliceListener(listener)); + assertTrue(mPinnedSliceManager.removeSliceListener(listener2)); + assertFalse(mPinnedSliceManager.isPinned()); + } + + @Test + public void testPkgListenerPin() { + ISliceListener listener = mock(ISliceListener.class); + assertFalse(mPinnedSliceManager.isPinned()); + + mPinnedSliceManager.addSliceListener(listener, FIRST_SPECS); + assertTrue(mPinnedSliceManager.isPinned()); + mPinnedSliceManager.pin("pkg", FIRST_SPECS); + + assertFalse(mPinnedSliceManager.removeSliceListener(listener)); + assertTrue(mPinnedSliceManager.unpin("pkg")); + assertFalse(mPinnedSliceManager.isPinned()); + } + + @Test + public void testBind() throws RemoteException { + TestableLooper.get(this).processAllMessages(); + clearInvocations(mIContentProvider); + + ISliceListener listener = mock(ISliceListener.class); + Slice s = new Slice.Builder(TEST_URI).build(); + Bundle b = new Bundle(); + b.putParcelable(SliceProvider.EXTRA_SLICE, s); + when(mIContentProvider.call(anyString(), eq(SliceProvider.METHOD_SLICE), eq(null), + any())).thenReturn(b); + + assertFalse(mPinnedSliceManager.isPinned()); + + mPinnedSliceManager.addSliceListener(listener, FIRST_SPECS); + + mPinnedSliceManager.onChange(); + TestableLooper.get(this).processAllMessages(); + + verify(mIContentProvider).call(anyString(), eq(SliceProvider.METHOD_SLICE), eq(null), + argThat(bundle -> { + assertEquals(TEST_URI, bundle.getParcelable(SliceProvider.EXTRA_BIND_URI)); + return true; + })); + verify(listener).onSliceUpdated(eq(s)); + } +}
\ No newline at end of file diff --git a/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java new file mode 100644 index 000000000000..fe9ea7a1bb9b --- /dev/null +++ b/services/tests/uiservicestests/src/com/android/server/slice/SliceManagerServiceTest.java @@ -0,0 +1,135 @@ +/* + * 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.server.slice; + +import static android.content.ContentProvider.maybeAddUserId; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; + +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.app.AppOpsManager; +import android.app.slice.ISliceListener; +import android.app.slice.SliceSpec; +import android.content.pm.PackageManagerInternal; +import android.net.Uri; +import android.os.RemoteException; +import android.support.test.filters.SmallTest; +import android.testing.AndroidTestingRunner; +import android.testing.TestableLooper; +import android.testing.TestableLooper.RunWithLooper; + +import com.android.server.LocalServices; +import com.android.server.UiServiceTestCase; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidTestingRunner.class) +@RunWithLooper +public class SliceManagerServiceTest extends UiServiceTestCase { + + private static final String AUTH = "com.android.services.uitests"; + private static final Uri TEST_URI = maybeAddUserId(Uri.parse("content://" + AUTH + "/path"), 0); + + private static final SliceSpec[] EMPTY_SPECS = new SliceSpec[]{ + }; + + private SliceManagerService mService; + private PinnedSliceState mCreatedSliceState; + + @Before + public void setup() { + LocalServices.addService(PackageManagerInternal.class, mock(PackageManagerInternal.class)); + mContext.addMockSystemService(AppOpsManager.class, mock(AppOpsManager.class)); + mContext.getTestablePermissions().setPermission(TEST_URI, PERMISSION_GRANTED); + + mService = spy(new SliceManagerService(mContext, TestableLooper.get(this).getLooper())); + mCreatedSliceState = mock(PinnedSliceState.class); + doReturn(mCreatedSliceState).when(mService).createPinnedSlice(eq(TEST_URI)); + } + + @After + public void teardown() { + LocalServices.removeServiceForTest(PackageManagerInternal.class); + } + + @Test + public void testAddListenerCreatesPinned() throws RemoteException { + mService.addSliceListener(TEST_URI, "pkg", mock(ISliceListener.class), EMPTY_SPECS); + verify(mService, times(1)).createPinnedSlice(eq(TEST_URI)); + } + + @Test + public void testAddListenerCreatesOnePinned() throws RemoteException { + mService.addSliceListener(TEST_URI, "pkg", mock(ISliceListener.class), EMPTY_SPECS); + mService.addSliceListener(TEST_URI, "pkg", mock(ISliceListener.class), EMPTY_SPECS); + verify(mService, times(1)).createPinnedSlice(eq(TEST_URI)); + } + + @Test + public void testRemoveListenerDestroysPinned() throws RemoteException { + ISliceListener listener = mock(ISliceListener.class); + mService.addSliceListener(TEST_URI, "pkg", listener, EMPTY_SPECS); + + when(mCreatedSliceState.removeSliceListener(eq(listener))).thenReturn(false); + mService.removeSliceListener(TEST_URI, "pkg", listener); + verify(mCreatedSliceState, never()).destroy(); + + when(mCreatedSliceState.removeSliceListener(eq(listener))).thenReturn(true); + mService.removeSliceListener(TEST_URI, "pkg", listener); + verify(mCreatedSliceState).destroy(); + } + + @Test(expected = IllegalStateException.class) + public void testUnrecognizedThrows() throws RemoteException { + mService.removeSliceListener(TEST_URI, "pkg", mock(ISliceListener.class)); + } + + @Test + public void testAddPinCreatesPinned() throws RemoteException { + doReturn("pkg").when(mService).getDefaultHome(anyInt()); + + mService.pinSlice("pkg", TEST_URI, EMPTY_SPECS); + mService.pinSlice("pkg", TEST_URI, EMPTY_SPECS); + verify(mService, times(1)).createPinnedSlice(eq(TEST_URI)); + } + + @Test + public void testRemovePinDestroysPinned() throws RemoteException { + doReturn("pkg").when(mService).getDefaultHome(anyInt()); + + mService.pinSlice("pkg", TEST_URI, EMPTY_SPECS); + + when(mCreatedSliceState.unpin(eq("pkg"))).thenReturn(false); + mService.unpinSlice("pkg", TEST_URI); + verify(mCreatedSliceState, never()).destroy(); + + when(mCreatedSliceState.unpin(eq("pkg"))).thenReturn(true); + mService.unpinSlice("pkg", TEST_URI); + verify(mCreatedSliceState).destroy(); + } + +}
\ No newline at end of file diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java index e76d2113a62e..7a352a4dc69d 100644 --- a/services/usb/java/com/android/server/usb/UsbHostManager.java +++ b/services/usb/java/com/android/server/usb/UsbHostManager.java @@ -28,6 +28,7 @@ import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.IndentingPrintWriter; +import com.android.server.usb.descriptors.UsbDescriptor; import com.android.server.usb.descriptors.UsbDescriptorParser; import com.android.server.usb.descriptors.UsbDeviceDescriptor; import com.android.server.usb.descriptors.report.TextReportCanvas; @@ -84,7 +85,10 @@ public class UsbHostManager { String mDeviceAddress; static final int CONNECT = 0; - static final int DISCONNECT = 1; + static final int CONNECT_BADPARSE = 1; + static final int CONNECT_BADDEVICE = 2; + static final int DISCONNECT = -1; + final int mMode; final byte[] mDescriptors; @@ -100,8 +104,8 @@ public class UsbHostManager { } void dumpShort(IndentingPrintWriter pw) { - if (mMode == CONNECT) { - pw.println(formatTime() + " Connect " + mDeviceAddress); + if (mMode != DISCONNECT) { + pw.println(formatTime() + " Connect " + mDeviceAddress + " mode:" + mMode); UsbDescriptorParser parser = new UsbDescriptorParser(mDeviceAddress, mDescriptors); UsbDeviceDescriptor deviceDescriptor = parser.getDeviceDescriptor(); @@ -115,9 +119,9 @@ public class UsbHostManager { } } - void dumpLong(IndentingPrintWriter pw) { - if (mMode == CONNECT) { - pw.println(formatTime() + " Connect " + mDeviceAddress); + void dumpTree(IndentingPrintWriter pw) { + if (mMode != DISCONNECT) { + pw.println(formatTime() + " Connect " + mDeviceAddress + " mode:" + mMode); UsbDescriptorParser parser = new UsbDescriptorParser(mDeviceAddress, mDescriptors); StringBuilder stringBuilder = new StringBuilder(); UsbDescriptorsTree descriptorTree = new UsbDescriptorsTree(); @@ -131,6 +135,55 @@ public class UsbHostManager { pw.println(formatTime() + " Disconnect " + mDeviceAddress); } } + + void dumpList(IndentingPrintWriter pw) { + if (mMode != DISCONNECT) { + pw.println(formatTime() + " Connect " + mDeviceAddress + " mode:" + mMode); + UsbDescriptorParser parser = new UsbDescriptorParser(mDeviceAddress, mDescriptors); + StringBuilder stringBuilder = new StringBuilder(); + TextReportCanvas canvas = new TextReportCanvas(parser, stringBuilder); + for (UsbDescriptor descriptor : parser.getDescriptors()) { + descriptor.report(canvas); + } + pw.println(stringBuilder.toString()); + + pw.println("isHeadset[in: " + parser.isInputHeadset() + + " , out: " + parser.isOutputHeadset() + "]"); + } else { + pw.println(formatTime() + " Disconnect " + mDeviceAddress); + } + } + + private static final int kDumpBytesPerLine = 16; + + void dumpRaw(IndentingPrintWriter pw) { + if (mMode != DISCONNECT) { + pw.println(formatTime() + " Connect " + mDeviceAddress + " mode:" + mMode); + int length = mDescriptors.length; + pw.println("Raw Descriptors " + length + " bytes"); + int dataOffset = 0; + for (int line = 0; line < length / kDumpBytesPerLine; line++) { + StringBuilder sb = new StringBuilder(); + for (int offset = 0; offset < kDumpBytesPerLine; offset++) { + sb.append("0x") + .append(String.format("0x%02X", mDescriptors[dataOffset++])) + .append(" "); + } + pw.println(sb.toString()); + } + + // remainder + StringBuilder sb = new StringBuilder(); + while (dataOffset < length) { + sb.append("0x") + .append(String.format("0x%02X", mDescriptors[dataOffset++])) + .append(" "); + } + pw.println(sb.toString()); + } else { + pw.println(formatTime() + " Disconnect " + mDeviceAddress); + } + } } /* @@ -205,7 +258,7 @@ public class UsbHostManager { ConnectionRecord rec = new ConnectionRecord(deviceAddress, mode, rawDescriptors); mConnections.add(rec); - if (mode == ConnectionRecord.CONNECT) { + if (mode != ConnectionRecord.DISCONNECT) { mLastConnect = rec; } } @@ -241,31 +294,41 @@ public class UsbHostManager { if (parser.parseDescriptors(descriptors)) { UsbDevice newDevice = parser.toAndroidUsbDevice(); - mDevices.put(deviceAddress, newDevice); - - // It is fine to call this only for the current user as all broadcasts are sent to - // all profiles of the user and the dialogs should only show once. - ComponentName usbDeviceConnectionHandler = getUsbDeviceConnectionHandler(); - if (usbDeviceConnectionHandler == null) { - getCurrentUserSettings().deviceAttached(newDevice); + if (newDevice == null) { + Slog.e(TAG, "Couldn't create UsbDevice object."); + // Tracking + addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT_BADDEVICE, + parser.getRawDescriptors()); } else { - getCurrentUserSettings().deviceAttachedForFixedHandler(newDevice, - usbDeviceConnectionHandler); + mDevices.put(deviceAddress, newDevice); + + // It is fine to call this only for the current user as all broadcasts are + // sent to all profiles of the user and the dialogs should only show once. + ComponentName usbDeviceConnectionHandler = getUsbDeviceConnectionHandler(); + if (usbDeviceConnectionHandler == null) { + getCurrentUserSettings().deviceAttached(newDevice); + } else { + getCurrentUserSettings().deviceAttachedForFixedHandler(newDevice, + usbDeviceConnectionHandler); + } + + // Headset? + boolean isInputHeadset = parser.isInputHeadset(); + boolean isOutputHeadset = parser.isOutputHeadset(); + Slog.i(TAG, "---- isHeadset[in: " + isInputHeadset + + " , out: " + isOutputHeadset + "]"); + + mUsbAlsaManager.usbDeviceAdded(newDevice, isInputHeadset, isOutputHeadset); + + // Tracking + addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT, + parser.getRawDescriptors()); } - - // Headset? - boolean isInputHeadset = parser.isInputHeadset(); - boolean isOutputHeadset = parser.isOutputHeadset(); - Slog.i(TAG, "---- isHeadset[in: " + isInputHeadset - + " , out: " + isOutputHeadset + "]"); - - mUsbAlsaManager.usbDeviceAdded(newDevice, isInputHeadset, isOutputHeadset); - - // Tracking - addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT, - parser.getRawDescriptors()); } else { Slog.e(TAG, "Error parsing USB device descriptors for " + deviceAddress); + // Tracking + addConnectionRecord(deviceAddress, ConnectionRecord.CONNECT_BADPARSE, + parser.getRawDescriptors()); return false; } } @@ -330,7 +393,11 @@ public class UsbHostManager { } } - public void dump(IndentingPrintWriter pw) { + /** + * Dump out various information about the state of USB device connections. + * + */ + public void dump(IndentingPrintWriter pw, String[] args) { pw.println("USB Host State:"); synchronized (mHandlerLock) { if (mUsbDeviceConnectionHandler != null) { @@ -342,21 +409,38 @@ public class UsbHostManager { pw.println(" " + name + ": " + mDevices.get(name)); } + // Connections pw.println("" + mNumConnects + " total connects/disconnects"); pw.println("Last " + mConnections.size() + " connections/disconnections"); for (ConnectionRecord rec : mConnections) { rec.dumpShort(pw); } - if (mLastConnect != null) { - pw.println("Last Connected USB Device:"); - mLastConnect.dumpLong(pw); - } } mUsbAlsaManager.dump(pw); } + /** + * Dump various descriptor data. + */ + public void dumpDescriptors(IndentingPrintWriter pw, String[] args) { + if (mLastConnect != null) { + pw.println("Last Connected USB Device:"); + if (args.length <= 1 || args[1].equals("-dump-short")) { + mLastConnect.dumpShort(pw); + } else if (args[1].equals("-dump-tree")) { + mLastConnect.dumpTree(pw); + } else if (args[1].equals("-dump-list")) { + mLastConnect.dumpList(pw); + } else if (args[1].equals("-dump-raw")) { + mLastConnect.dumpRaw(pw); + } + } else { + pw.println("No USB Devices have been connected."); + } + } + private native void monitorUsbHostBus(); private native ParcelFileDescriptor nativeOpenDevice(String deviceAddress); } diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index 17de83f0cac9..8554cf7b186f 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -496,7 +496,7 @@ public class UsbService extends IUsbManager.Stub { mDeviceManager.dump(pw); } if (mHostManager != null) { - mHostManager.dump(pw); + mHostManager.dump(pw, args); } if (mPortManager != null) { mPortManager.dump(pw); @@ -504,7 +504,7 @@ public class UsbService extends IUsbManager.Stub { mAlsaManager.dump(pw); mSettingsManager.dump(pw); - } else if (args.length == 4 && "set-port-roles".equals(args[0])) { + } else if ("set-port-roles".equals(args[0]) && args.length == 4) { final String portId = args[1]; final int powerRole; switch (args[2]) { @@ -546,7 +546,7 @@ public class UsbService extends IUsbManager.Stub { pw.println(); mPortManager.dump(pw); } - } else if (args.length == 3 && "add-port".equals(args[0])) { + } else if ("add-port".equals(args[0]) && args.length == 3) { final String portId = args[1]; final int supportedModes; switch (args[2]) { @@ -571,7 +571,7 @@ public class UsbService extends IUsbManager.Stub { pw.println(); mPortManager.dump(pw); } - } else if (args.length == 5 && "connect-port".equals(args[0])) { + } else if ("connect-port".equals(args[0]) && args.length == 5) { final String portId = args[1]; final int mode; final boolean canChangeMode = args[2].endsWith("?"); @@ -618,30 +618,32 @@ public class UsbService extends IUsbManager.Stub { pw.println(); mPortManager.dump(pw); } - } else if (args.length == 2 && "disconnect-port".equals(args[0])) { + } else if ("disconnect-port".equals(args[0]) && args.length == 2) { final String portId = args[1]; if (mPortManager != null) { mPortManager.disconnectSimulatedPort(portId, pw); pw.println(); mPortManager.dump(pw); } - } else if (args.length == 2 && "remove-port".equals(args[0])) { + } else if ("remove-port".equals(args[0]) && args.length == 2) { final String portId = args[1]; if (mPortManager != null) { mPortManager.removeSimulatedPort(portId, pw); pw.println(); mPortManager.dump(pw); } - } else if (args.length == 1 && "reset".equals(args[0])) { + } else if ("reset".equals(args[0]) && args.length == 1) { if (mPortManager != null) { mPortManager.resetSimulation(pw); pw.println(); mPortManager.dump(pw); } - } else if (args.length == 1 && "ports".equals(args[0])) { + } else if ("ports".equals(args[0]) && args.length == 1) { if (mPortManager != null) { mPortManager.dump(pw); } + } else if ("dump-descriptors".equals(args[0])) { + mHostManager.dumpDescriptors(pw, args); } else { pw.println("Dump current USB state or issue command:"); pw.println(" ports"); @@ -678,6 +680,12 @@ public class UsbService extends IUsbManager.Stub { pw.println(" dumpsys usb add-port \"matrix\" ufp"); pw.println(" dumpsys usb connect-port \"matrix\" ufp sink device"); pw.println(" dumpsys usb reset"); + pw.println(); + pw.println("Example USB device descriptors:"); + pw.println(" dumpsys usb dump-descriptors -dump-short"); + pw.println(" dumpsys usb dump-descriptors -dump-tree"); + pw.println(" dumpsys usb dump-descriptors -dump-list"); + pw.println(" dumpsys usb dump-descriptors -dump-raw"); } } finally { Binder.restoreCallingIdentity(ident); diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java index 993778fa3991..639aa4e03849 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbConfigDescriptor.java @@ -17,6 +17,7 @@ package com.android.server.usb.descriptors; import android.hardware.usb.UsbConfiguration; import android.hardware.usb.UsbInterface; +import android.util.Log; import com.android.server.usb.descriptors.report.ReportCanvas; @@ -29,6 +30,7 @@ import java.util.ArrayList; */ public final class UsbConfigDescriptor extends UsbDescriptor { private static final String TAG = "UsbConfigDescriptor"; + private static final boolean DEBUG = false; private int mTotalLength; // 2:2 Total length in bytes of data returned private byte mNumInterfaces; // 4:1 Number of Interfaces @@ -77,10 +79,16 @@ public final class UsbConfigDescriptor extends UsbDescriptor { } UsbConfiguration toAndroid(UsbDescriptorParser parser) { + if (DEBUG) { + Log.d(TAG, " toAndroid()"); + } String name = parser.getDescriptorString(mConfigIndex); UsbConfiguration config = new UsbConfiguration(mConfigValue, name, mAttribs, mMaxPower); UsbInterface[] interfaces = new UsbInterface[mInterfaceDescriptors.size()]; + if (DEBUG) { + Log.d(TAG, " " + mInterfaceDescriptors.size() + " interfaces."); + } for (int index = 0; index < mInterfaceDescriptors.size(); index++) { interfaces[index] = mInterfaceDescriptors.get(index).toAndroid(parser); } diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java index 78c7fdc91526..7a1e9e2f9896 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptorParser.java @@ -26,7 +26,7 @@ import java.util.ArrayList; */ public final class UsbDescriptorParser { private static final String TAG = "UsbDescriptorParser"; - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; private final String mDeviceAddr; @@ -289,10 +289,15 @@ public final class UsbDescriptorParser { */ public UsbDevice toAndroidUsbDevice() { if (mDeviceDescriptor == null) { + Log.e(TAG, "toAndroidUsbDevice() ERROR - No Device Descriptor"); return null; } - return mDeviceDescriptor.toAndroid(this); + UsbDevice device = mDeviceDescriptor.toAndroid(this); + if (device == null) { + Log.e(TAG, "toAndroidUsbDevice() ERROR Creating Device"); + } + return device; } /** diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java index 8e7f0fde1537..e31e3a312648 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbDeviceDescriptor.java @@ -17,6 +17,7 @@ package com.android.server.usb.descriptors; import android.hardware.usb.UsbConfiguration; import android.hardware.usb.UsbDevice; +import android.util.Log; import com.android.server.usb.descriptors.report.ReportCanvas; import com.android.server.usb.descriptors.report.UsbStrings; @@ -30,6 +31,7 @@ import java.util.ArrayList; */ public final class UsbDeviceDescriptor extends UsbDescriptor { private static final String TAG = "UsbDeviceDescriptor"; + private static final boolean DEBUG = false; public static final int USBSPEC_1_0 = 0x0100; public static final int USBSPEC_1_1 = 0x0110; @@ -113,19 +115,30 @@ public final class UsbDeviceDescriptor extends UsbDescriptor { * @hide */ public UsbDevice toAndroid(UsbDescriptorParser parser) { + if (DEBUG) { + Log.d(TAG, "toAndroid()"); + } + String mfgName = parser.getDescriptorString(mMfgIndex); String prodName = parser.getDescriptorString(mProductIndex); + if (DEBUG) { + Log.d(TAG, " mfgName:" + mfgName + " prodName:" + prodName); + } // Create version string in "%.%" format String versionString = Integer.toString(mDeviceRelease >> 8) + "." + (mDeviceRelease & 0xFF); String serialStr = parser.getDescriptorString(mSerialNum); + if (DEBUG) { + Log.d(TAG, " versionString:" + versionString + " serialStr:" + serialStr); + } UsbDevice device = new UsbDevice(parser.getDeviceAddr(), mVendorID, mProductID, mDevClass, mDevSubClass, mProtocol, mfgName, prodName, versionString, serialStr); UsbConfiguration[] configs = new UsbConfiguration[mConfigDescriptors.size()]; + Log.d(TAG, " " + configs.length + " configs"); for (int index = 0; index < mConfigDescriptors.size(); index++) { configs[index] = mConfigDescriptors.get(index).toAndroid(parser); } diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java index 11302380b589..4da31ea469c3 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbEndpointDescriptor.java @@ -16,6 +16,7 @@ package com.android.server.usb.descriptors; import android.hardware.usb.UsbEndpoint; +import android.util.Log; import com.android.server.usb.descriptors.report.ReportCanvas; @@ -26,6 +27,7 @@ import com.android.server.usb.descriptors.report.ReportCanvas; */ public class UsbEndpointDescriptor extends UsbDescriptor { private static final String TAG = "UsbEndpointDescriptor"; + private static final boolean DEBUG = false; public static final int MASK_ENDPOINT_ADDRESS = 0b000000000001111; public static final int MASK_ENDPOINT_DIRECTION = (byte) 0b0000000010000000; @@ -108,6 +110,12 @@ public class UsbEndpointDescriptor extends UsbDescriptor { } /* package */ UsbEndpoint toAndroid(UsbDescriptorParser parser) { + if (DEBUG) { + Log.d(TAG, "toAndroid() type:" + + Integer.toHexString(mAttributes & MASK_ATTRIBS_TRANSTYPE) + + " sync:" + Integer.toHexString(mAttributes & MASK_ATTRIBS_SYNCTYPE) + + " usage:" + Integer.toHexString(mAttributes & MASK_ATTRIBS_USEAGE)); + } return new UsbEndpoint(mEndpointAddress, mAttributes, mPacketSize, mInterval); } diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbInterfaceDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbInterfaceDescriptor.java index d87b1afba79a..632e3dc500fa 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbInterfaceDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbInterfaceDescriptor.java @@ -17,6 +17,7 @@ package com.android.server.usb.descriptors; import android.hardware.usb.UsbEndpoint; import android.hardware.usb.UsbInterface; +import android.util.Log; import com.android.server.usb.descriptors.report.ReportCanvas; import com.android.server.usb.descriptors.report.UsbStrings; @@ -30,6 +31,7 @@ import java.util.ArrayList; */ public class UsbInterfaceDescriptor extends UsbDescriptor { private static final String TAG = "UsbInterfaceDescriptor"; + private static final boolean DEBUG = false; protected int mInterfaceNumber; // 2:1 Number of Interface protected byte mAlternateSetting; // 3:1 Value used to select alternative setting @@ -93,6 +95,11 @@ public class UsbInterfaceDescriptor extends UsbDescriptor { } UsbInterface toAndroid(UsbDescriptorParser parser) { + if (DEBUG) { + Log.d(TAG, "toAndroid() class:" + Integer.toHexString(mUsbClass) + + " subclass:" + Integer.toHexString(mUsbSubclass) + + " " + mEndpointDescriptors.size() + " endpoints."); + } String name = parser.getDescriptorString(mDescrIndex); UsbInterface ntrface = new UsbInterface( mInterfaceNumber, mAlternateSetting, name, mUsbClass, mUsbSubclass, mProtocol); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 2d93da9fa9fa..c0685f927398 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -75,7 +75,6 @@ import com.android.server.soundtrigger.SoundTriggerInternal; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.List; -import java.util.TreeSet; /** * SystemService that publishes an IVoiceInteractionManagerService. @@ -442,11 +441,11 @@ public class VoiceInteractionManagerService extends SystemService { mImpl.shutdownLocked(); } if (hasComponent) { - mImpl = new VoiceInteractionManagerServiceImpl(mContext, - UiThread.getHandler(), this, mCurUser, serviceComponent); + setImplLocked(new VoiceInteractionManagerServiceImpl(mContext, + UiThread.getHandler(), this, mCurUser, serviceComponent)); mImpl.startLocked(); } else { - mImpl = null; + setImplLocked(null); } } } @@ -1177,6 +1176,12 @@ public class VoiceInteractionManagerService extends SystemService { } } + private void setImplLocked(VoiceInteractionManagerServiceImpl impl) { + mImpl = impl; + mAmInternal.notifyActiveVoiceInteractionServiceChanged( + getActiveServiceComponentName()); + } + class SettingsObserver extends ContentObserver { SettingsObserver(Handler handler) { super(handler); @@ -1219,7 +1224,7 @@ public class VoiceInteractionManagerService extends SystemService { unloadAllKeyphraseModels(); if (mImpl != null) { mImpl.shutdownLocked(); - mImpl = null; + setImplLocked(null); } setCurInteractor(null, userHandle); setCurRecognizer(null, userHandle); diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 70016157960a..dec7b762459d 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -21,6 +21,7 @@ import android.app.Service; import android.content.ComponentName; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -145,6 +146,7 @@ public abstract class ConnectionService extends Service { private static final String SESSION_RTT_UPGRADE_RESPONSE = "CS.rTRUR"; private static final String SESSION_CONNECTION_SERVICE_FOCUS_LOST = "CS.cSFL"; private static final String SESSION_CONNECTION_SERVICE_FOCUS_GAINED = "CS.cSFG"; + private static final String SESSION_HANDOVER_FAILED = "CS.haF"; private static final int MSG_ADD_CONNECTION_SERVICE_ADAPTER = 1; private static final int MSG_CREATE_CONNECTION = 2; @@ -176,6 +178,7 @@ public abstract class ConnectionService extends Service { private static final int MSG_CREATE_CONNECTION_COMPLETE = 29; private static final int MSG_CONNECTION_SERVICE_FOCUS_LOST = 30; private static final int MSG_CONNECTION_SERVICE_FOCUS_GAINED = 31; + private static final int MSG_HANDOVER_FAILED = 32; private static Connection sNullConnection; @@ -279,6 +282,22 @@ public abstract class ConnectionService extends Service { } @Override + public void handoverFailed(String callId, ConnectionRequest request, int reason, + Session.Info sessionInfo) { + Log.startSession(sessionInfo, SESSION_HANDOVER_FAILED); + try { + SomeArgs args = SomeArgs.obtain(); + args.arg1 = callId; + args.arg2 = request; + args.arg3 = Log.createSubsession(); + args.arg4 = reason; + mHandler.obtainMessage(MSG_HANDOVER_FAILED, args).sendToTarget(); + } finally { + Log.endSession(); + } + } + + @Override public void abort(String callId, Session.Info sessionInfo) { Log.startSession(sessionInfo, SESSION_ABORT); try { @@ -747,6 +766,36 @@ public abstract class ConnectionService extends Service { } break; } + case MSG_HANDOVER_FAILED: { + SomeArgs args = (SomeArgs) msg.obj; + Log.continueSession((Session) args.arg3, SESSION_HANDLER + + SESSION_HANDOVER_FAILED); + try { + final String id = (String) args.arg1; + final ConnectionRequest request = (ConnectionRequest) args.arg2; + final int reason = (int) args.arg4; + if (!mAreAccountsInitialized) { + Log.d(this, "Enqueueing pre-init request %s", id); + mPreInitializationConnectionRequests.add( + new android.telecom.Logging.Runnable( + SESSION_HANDLER + + SESSION_HANDOVER_FAILED + ".pICR", + null /*lock*/) { + @Override + public void loggedRun() { + handoverFailed(id, request, reason); + } + }.prepare()); + } else { + Log.i(this, "createConnectionFailed %s", id); + handoverFailed(id, request, reason); + } + } finally { + args.recycle(); + Log.endSession(); + } + break; + } case MSG_ABORT: { SomeArgs args = (SomeArgs) msg.obj; Log.continueSession((Session) args.arg2, SESSION_HANDLER + SESSION_ABORT); @@ -1402,12 +1451,13 @@ public abstract class ConnectionService extends Service { isUnknown); Connection connection = null; - if (request.getExtras() != null && request.getExtras().getBoolean( - TelecomManager.EXTRA_IS_HANDOVER,false)) { + if (getApplicationContext().getApplicationInfo().targetSdkVersion > + Build.VERSION_CODES.O_MR1 && request.getExtras() != null && + request.getExtras().getBoolean(TelecomManager.EXTRA_IS_HANDOVER,false)) { if (!isIncoming) { connection = onCreateOutgoingHandoverConnection(callManagerAccount, request); } else { - // Todo: Call onCreateIncommingHandoverConnection() + connection = onCreateIncomingHandoverConnection(callManagerAccount, request); } } else { connection = isUnknown ? onCreateUnknownConnection(callManagerAccount, request) @@ -1482,6 +1532,13 @@ public abstract class ConnectionService extends Service { } } + private void handoverFailed(final String callId, final ConnectionRequest request, + int reason) { + + Log.i(this, "handoverFailed %s", callId); + onHandoverFailed(request, reason); + } + /** * Called by Telecom when the creation of a new Connection has completed and it is now added * to Telecom. diff --git a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl index a74056607a24..3d04bfc1bae5 100644 --- a/telecomm/java/com/android/internal/telecom/IConnectionService.aidl +++ b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl @@ -104,4 +104,7 @@ oneway interface IConnectionService { void connectionServiceFocusLost(in Session.Info sessionInfo); void connectionServiceFocusGained(in Session.Info sessionInfo); + + void handoverFailed(String callId, in ConnectionRequest request, + int error, in Session.Info sessionInfo); } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c050a1029eb0..ead8849c363e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -735,12 +735,11 @@ public class CarrierConfigManager { public static final String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool"; /** - * Flag specifying whether signal strength is hidden in SIM Status screen, - * default to false. - * @hide + * Flag specifying whether the {@link android.telephony.SignalStrength} is shown in the SIM + * Status screen. The default value is true. */ - public static final String KEY_HIDE_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL = - "hide_signal_strength_in_sim_status_bool"; + public static final String KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL = + "show_signal_strength_in_sim_status_bool"; /** * Flag specifying whether an additional (client initiated) intent needs to be sent on System @@ -1801,7 +1800,7 @@ public class CarrierConfigManager { sDefaults.putString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING, ""); sDefaults.putStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY, null); sDefaults.putBoolean(KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false); - sDefaults.putBoolean(KEY_HIDE_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, false); + sDefaults.putBoolean(KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, true); sDefaults.putBoolean(KEY_CI_ACTION_ON_SYS_UPDATE_BOOL, false); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING, ""); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, ""); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 38819ce1d90b..28ae10bf85f5 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -29,7 +29,6 @@ import android.annotation.SystemService; import android.annotation.WorkerThread; import android.app.ActivityThread; import android.app.PendingIntent; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; @@ -43,7 +42,6 @@ import android.os.RemoteException; import android.os.ResultReceiver; import android.os.ServiceManager; import android.os.SystemProperties; -import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; import android.service.carrier.CarrierIdentifier; import android.telecom.PhoneAccount; @@ -979,6 +977,63 @@ public class TelephonyManager { */ public static final int CDMA_ROAMING_MODE_ANY = 2; + /** + * An unknown carrier id. It could either be subscription unavailable or the subscription + * carrier cannot be recognized. Unrecognized carriers here means + * {@link #getSimOperator() MCC+MNC} cannot be identified. + */ + public static final int UNKNOWN_CARRIER_ID = -1; + + /** + * Broadcast Action: The subscription carrier identity has changed. + * This intent could be sent on the following events: + * <ul> + * <li>Subscription absent. Carrier identity could change from a valid id to + * {@link TelephonyManager#UNKNOWN_CARRIER_ID}.</li> + * <li>Subscription loaded. Carrier identity could change from + * {@link TelephonyManager#UNKNOWN_CARRIER_ID} to a valid id.</li> + * <li>The subscription carrier is recognized after a remote update.</li> + * </ul> + * The intent will have the following extra values: + * <ul> + * <li>{@link #EXTRA_CARRIER_ID} The up-to-date carrier id of the current subscription id. + * </li> + * <li>{@link #EXTRA_CARRIER_NAME} The up-to-date carrier name of the current subscription. + * </li> + * <li>{@link #EXTRA_SUBSCRIPTION_ID} The subscription id associated with the changed carrier + * identity. + * </li> + * </ul> + * <p class="note">This is a protected intent that can only be sent by the system. + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED = + "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"; + + /** + * An int extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which indicates + * the updated carrier id {@link TelephonyManager#getSubscriptionCarrierId()} of the current + * subscription. + * <p>Will be {@link TelephonyManager#UNKNOWN_CARRIER_ID} if the subscription is unavailable or + * the carrier cannot be identified. + */ + public static final String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID"; + + /** + * An string extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which + * indicates the updated carrier name of the current subscription. + * {@see TelephonyManager#getSubscriptionCarrierName()} + * <p>Carrier name is a user-facing name of the carrier id {@link #EXTRA_CARRIER_ID}, + * usually the brand name of the subsidiary (e.g. T-Mobile). + */ + public static final String EXTRA_CARRIER_NAME = "android.telephony.extra.CARRIER_NAME"; + + /** + * An int extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} to indicate the + * subscription which has changed. + */ + public static final String EXTRA_SUBSCRIPTION_ID = "android.telephony.extra.SUBSCRIPTION_ID"; + // // // Device Info @@ -6509,6 +6564,9 @@ public class TelephonyManager { * @param uri The URI for the ringtone to play when receiving a voicemail from a specific * PhoneAccount. * @see #hasCarrierPrivileges + * + * @deprecated Use {@link android.provider.Settings#ACTION_CHANNEL_NOTIFICATION_SETTINGS} + * instead. */ public void setVoicemailRingtoneUri(PhoneAccountHandle phoneAccountHandle, Uri uri) { try { @@ -6551,6 +6609,9 @@ public class TelephonyManager { * @param enabled Whether to enable or disable vibration for voicemail notifications from a * specific PhoneAccount. * @see #hasCarrierPrivileges + * + * @deprecated Use {@link android.provider.Settings#ACTION_CHANNEL_NOTIFICATION_SETTINGS} + * instead. */ public void setVoicemailVibrationEnabled(PhoneAccountHandle phoneAccountHandle, boolean enabled) { @@ -6566,6 +6627,55 @@ public class TelephonyManager { } /** + * Returns carrier id of the current subscription. + * <p>To recognize a carrier (including MVNO) as a first class identity, assign each carrier + * with a canonical integer a.k.a carrier id. + * + * @return Carrier id of the current subscription. Return {@link #UNKNOWN_CARRIER_ID} if the + * subscription is unavailable or the carrier cannot be identified. + * @throws IllegalStateException if telephony service is unavailable. + */ + public int getSubscriptionCarrierId() { + try { + ITelephony service = getITelephony(); + return service.getSubscriptionCarrierId(getSubId()); + } catch (RemoteException ex) { + // This could happen if binder process crashes. + ex.rethrowAsRuntimeException(); + } catch (NullPointerException ex) { + // This could happen before phone restarts due to crashing. + throw new IllegalStateException("Telephony service unavailable"); + } + return UNKNOWN_CARRIER_ID; + } + + /** + * Returns carrier name of the current subscription. + * <p>Carrier name is a user-facing name of carrier id {@link #getSubscriptionCarrierId()}, + * usually the brand name of the subsidiary (e.g. T-Mobile). Each carrier could configure + * multiple {@link #getSimOperatorName() SPN} but should have a single carrier name. + * Carrier name is not a canonical identity, use {@link #getSubscriptionCarrierId()} instead. + * <p>The returned carrier name is unlocalized. + * + * @return Carrier name of the current subscription. Return {@code null} if the subscription is + * unavailable or the carrier cannot be identified. + * @throws IllegalStateException if telephony service is unavailable. + */ + public String getSubscriptionCarrierName() { + try { + ITelephony service = getITelephony(); + return service.getSubscriptionCarrierName(getSubId()); + } catch (RemoteException ex) { + // This could happen if binder process crashes. + ex.rethrowAsRuntimeException(); + } catch (NullPointerException ex) { + // This could happen before phone restarts due to crashing. + throw new IllegalStateException("Telephony service unavailable"); + } + return null; + } + + /** * Return the application ID for the app type like {@link APPTYPE_CSIM}. * * Requires that the calling app has READ_PRIVILEGED_PHONE_STATE permission diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index fd6091a78f3a..a9f8f45f6c0d 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -1298,6 +1298,34 @@ interface ITelephony { */ List<CarrierIdentifier> getAllowedCarriers(int slotIndex); + /** + * Returns carrier id of the given subscription. + * <p>To recognize carrier as a first class identity, assign each carrier with a canonical + * integer a.k.a carrier id. + * + * @param subId The subscription id + * @return Carrier id of given subscription id. return {@link #UNKNOWN_CARRIER_ID} if + * subscription is unavailable or carrier cannot be identified. + * @throws IllegalStateException if telephony service is unavailable. + * @hide + */ + int getSubscriptionCarrierId(int subId); + + /** + * Returns carrier name of the given subscription. + * <p>Carrier name is a user-facing name of carrier id {@link #getSubscriptionCarrierId(int)}, + * usually the brand name of the subsidiary (e.g. T-Mobile). Each carrier could configure + * multiple {@link #getSimOperatorName() SPN} but should have a single carrier name. + * Carrier name is not canonical identity, use {@link #getSubscriptionCarrierId(int)} instead. + * <p>Returned carrier name is unlocalized. + * + * @return Carrier name of given subscription id. return {@code null} if subscription is + * unavailable or carrier cannot be identified. + * @throws IllegalStateException if telephony service is unavailable. + * @hide + */ + String getSubscriptionCarrierName(int subId); + /** * Action set from carrier signalling broadcast receivers to enable/disable metered apns * Permissions android.Manifest.permission.MODIFY_PHONE_STATE is required diff --git a/test-mock/src/android/test/mock/MockContext.java b/test-mock/src/android/test/mock/MockContext.java index 5e5ba462cfca..4dfd0507f351 100644 --- a/test-mock/src/android/test/mock/MockContext.java +++ b/test-mock/src/android/test/mock/MockContext.java @@ -19,13 +19,12 @@ package android.test.mock; import android.annotation.SystemApi; import android.app.IApplicationThread; import android.app.IServiceConnection; -import android.app.Notification; +import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.BroadcastReceiver; import android.content.IntentSender; import android.content.ServiceConnection; import android.content.SharedPreferences; @@ -44,8 +43,8 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.UserHandle; -import android.view.DisplayAdjustments; import android.view.Display; +import android.view.DisplayAdjustments; import java.io.File; import java.io.FileInputStream; @@ -53,6 +52,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.util.concurrent.Executor; /** * A mock {@link android.content.Context} class. All methods are non-functional and throw @@ -87,6 +87,11 @@ public class MockContext extends Context { } @Override + public Executor getMainExecutor() { + throw new UnsupportedOperationException(); + } + + @Override public Context getApplicationContext() { throw new UnsupportedOperationException(); } diff --git a/tests/net/OWNERS b/tests/net/OWNERS index 2d71c2013093..6f77e04da3c0 100644 --- a/tests/net/OWNERS +++ b/tests/net/OWNERS @@ -1,10 +1,7 @@ set noparent -per-file Android.mk = build.master@android.com -per-file Android.mk = ek@google.com -per-file Android.mk = hugobenichi@google.com -per-file Android.mk = lorenzo@google.com - ek@google.com hugobenichi@google.com +jchalard@google.com lorenzo@google.com +satk@google.com diff --git a/tests/net/java/android/net/IpSecManagerTest.java b/tests/net/java/android/net/IpSecManagerTest.java index ccb0f3b07d0f..0f40b4562b0d 100644 --- a/tests/net/java/android/net/IpSecManagerTest.java +++ b/tests/net/java/android/net/IpSecManagerTest.java @@ -80,7 +80,7 @@ public class IpSecManagerTest { int resourceId = 1; IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.OK, resourceId, DROID_SPI); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( eq(IpSecTransform.DIRECTION_IN), eq(GOOGLE_DNS_4.getHostAddress()), eq(DROID_SPI), @@ -88,7 +88,7 @@ public class IpSecManagerTest { .thenReturn(spiResp); IpSecManager.SecurityParameterIndex droidSpi = - mIpSecManager.reserveSecurityParameterIndex( + mIpSecManager.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_IN, GOOGLE_DNS_4, DROID_SPI); assertEquals(DROID_SPI, droidSpi.getSpi()); @@ -102,7 +102,7 @@ public class IpSecManagerTest { int resourceId = 1; IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.OK, resourceId, DROID_SPI); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( eq(IpSecTransform.DIRECTION_OUT), eq(GOOGLE_DNS_4.getHostAddress()), eq(IpSecManager.INVALID_SECURITY_PARAMETER_INDEX), @@ -110,7 +110,7 @@ public class IpSecManagerTest { .thenReturn(spiResp); IpSecManager.SecurityParameterIndex randomSpi = - mIpSecManager.reserveSecurityParameterIndex( + mIpSecManager.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); assertEquals(DROID_SPI, randomSpi.getSpi()); @@ -127,12 +127,13 @@ public class IpSecManagerTest { public void testAllocSpiResUnavaiableExeption() throws Exception { IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.RESOURCE_UNAVAILABLE, 0, 0); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( anyInt(), anyString(), anyInt(), anyObject())) .thenReturn(spiResp); try { - mIpSecManager.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); + mIpSecManager.allocateSecurityParameterIndex( + IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); fail("ResourceUnavailableException was not thrown"); } catch (IpSecManager.ResourceUnavailableException e) { } @@ -144,12 +145,13 @@ public class IpSecManagerTest { @Test public void testAllocSpiSpiUnavaiableExeption() throws Exception { IpSecSpiResponse spiResp = new IpSecSpiResponse(IpSecManager.Status.SPI_UNAVAILABLE, 0, 0); - when(mMockIpSecService.reserveSecurityParameterIndex( + when(mMockIpSecService.allocateSecurityParameterIndex( anyInt(), anyString(), anyInt(), anyObject())) .thenReturn(spiResp); try { - mIpSecManager.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); + mIpSecManager.allocateSecurityParameterIndex( + IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4); fail("ResourceUnavailableException was not thrown"); } catch (IpSecManager.ResourceUnavailableException e) { } @@ -161,7 +163,7 @@ public class IpSecManagerTest { @Test public void testRequestAllocInvalidSpi() throws Exception { try { - mIpSecManager.reserveSecurityParameterIndex( + mIpSecManager.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, GOOGLE_DNS_4, 0); fail("Able to allocate invalid spi"); } catch (IllegalArgumentException e) { diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 5c031eb11372..80e42a33b3cc 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -22,7 +22,6 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -39,6 +38,7 @@ import android.net.NetworkUtils; import android.os.Binder; import android.os.ParcelFileDescriptor; import android.support.test.filters.SmallTest; +import android.system.Os; import java.net.Socket; import java.util.Arrays; @@ -125,7 +125,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(TEST_SPI_OUT); IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); assertEquals(IpSecManager.Status.OK, spiResp.status); assertEquals(TEST_SPI_OUT, spiResp.spi); @@ -142,7 +142,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(TEST_SPI_OUT); IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); mIpSecService.releaseSecurityParameterIndex(spiResp.resourceId); @@ -154,6 +154,56 @@ public class IpSecServiceParameterizedTest { anyString(), anyString(), eq(TEST_SPI_OUT)); + + // Verify quota and RefcountedResource objects cleaned up + IpSecService.UserRecord userRecord = + mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); + assertEquals(0, userRecord.mSpiQuotaTracker.mCurrent); + try { + userRecord.mSpiRecords.getRefcountedResourceOrThrow(spiResp.resourceId); + fail("Expected IllegalArgumentException on attempt to access deleted resource"); + } catch (IllegalArgumentException expected) { + + } + } + + @Test + public void testSecurityParameterIndexBinderDeath() throws Exception { + when(mMockNetd.ipSecAllocateSpi( + anyInt(), + eq(IpSecTransform.DIRECTION_OUT), + anyString(), + eq(mRemoteAddr), + eq(TEST_SPI_OUT))) + .thenReturn(TEST_SPI_OUT); + + IpSecSpiResponse spiResp = + mIpSecService.allocateSecurityParameterIndex( + IpSecTransform.DIRECTION_OUT, mRemoteAddr, TEST_SPI_OUT, new Binder()); + + IpSecService.UserRecord userRecord = + mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); + IpSecService.RefcountedResource refcountedRecord = + userRecord.mSpiRecords.getRefcountedResourceOrThrow(spiResp.resourceId); + + refcountedRecord.binderDied(); + + verify(mMockNetd) + .ipSecDeleteSecurityAssociation( + eq(spiResp.resourceId), + anyInt(), + anyString(), + anyString(), + eq(TEST_SPI_OUT)); + + // Verify quota and RefcountedResource objects cleaned up + assertEquals(0, userRecord.mSpiQuotaTracker.mCurrent); + try { + userRecord.mSpiRecords.getRefcountedResourceOrThrow(spiResp.resourceId); + fail("Expected IllegalArgumentException on attempt to access deleted resource"); + } catch (IllegalArgumentException expected) { + + } } private int getNewSpiResourceId(int direction, String remoteAddress, int returnSpi) @@ -162,7 +212,7 @@ public class IpSecServiceParameterizedTest { .thenReturn(returnSpi); IpSecSpiResponse spi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( direction, NetworkUtils.numericToInetAddress(remoteAddress).getHostAddress(), IpSecManager.INVALID_SECURITY_PARAMETER_INDEX, @@ -379,6 +429,61 @@ public class IpSecServiceParameterizedTest { anyString(), anyString(), eq(TEST_SPI_IN)); + + // Verify quota and RefcountedResource objects cleaned up + IpSecService.UserRecord userRecord = + mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); + assertEquals(0, userRecord.mTransformQuotaTracker.mCurrent); + try { + userRecord.mTransformRecords.getRefcountedResourceOrThrow( + createTransformResp.resourceId); + fail("Expected IllegalArgumentException on attempt to access deleted resource"); + } catch (IllegalArgumentException expected) { + + } + } + + @Test + public void testTransportModeTransformBinderDeath() throws Exception { + IpSecConfig ipSecConfig = new IpSecConfig(); + addDefaultSpisAndRemoteAddrToIpSecConfig(ipSecConfig); + addAuthAndCryptToIpSecConfig(ipSecConfig); + + IpSecTransformResponse createTransformResp = + mIpSecService.createTransportModeTransform(ipSecConfig, new Binder()); + + IpSecService.UserRecord userRecord = + mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); + IpSecService.RefcountedResource refcountedRecord = + userRecord.mTransformRecords.getRefcountedResourceOrThrow( + createTransformResp.resourceId); + + refcountedRecord.binderDied(); + + verify(mMockNetd) + .ipSecDeleteSecurityAssociation( + eq(createTransformResp.resourceId), + eq(IpSecTransform.DIRECTION_OUT), + anyString(), + anyString(), + eq(TEST_SPI_OUT)); + verify(mMockNetd) + .ipSecDeleteSecurityAssociation( + eq(createTransformResp.resourceId), + eq(IpSecTransform.DIRECTION_IN), + anyString(), + anyString(), + eq(TEST_SPI_IN)); + + // Verify quota and RefcountedResource objects cleaned up + assertEquals(0, userRecord.mTransformQuotaTracker.mCurrent); + try { + userRecord.mTransformRecords.getRefcountedResourceOrThrow( + createTransformResp.resourceId); + fail("Expected IllegalArgumentException on attempt to access deleted resource"); + } catch (IllegalArgumentException expected) { + + } } @Test diff --git a/tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java b/tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java new file mode 100644 index 000000000000..cf8f715f23af --- /dev/null +++ b/tests/net/java/com/android/server/IpSecServiceRefcountedResourceTest.java @@ -0,0 +1,356 @@ +/* + * 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.server; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import android.content.Context; +import android.os.Binder; +import android.os.IBinder; +import android.os.RemoteException; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import com.android.server.IpSecService.IResource; +import com.android.server.IpSecService.RefcountedResource; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ThreadLocalRandom; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** Unit tests for {@link IpSecService.RefcountedResource}. */ +@SmallTest +@RunWith(AndroidJUnit4.class) +public class IpSecServiceRefcountedResourceTest { + Context mMockContext; + IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; + IpSecService mIpSecService; + + @Before + public void setUp() throws Exception { + mMockContext = mock(Context.class); + mMockIpSecSrvConfig = mock(IpSecService.IpSecServiceConfiguration.class); + mIpSecService = new IpSecService(mMockContext, mMockIpSecSrvConfig); + } + + private void assertResourceState( + RefcountedResource<IResource> resource, + int refCount, + int userReleaseCallCount, + int releaseReferenceCallCount, + int invalidateCallCount, + int freeUnderlyingResourcesCallCount) + throws RemoteException { + // Check refcount on RefcountedResource + assertEquals(refCount, resource.mRefCount); + + // Check call count of RefcountedResource + verify(resource, times(userReleaseCallCount)).userRelease(); + verify(resource, times(releaseReferenceCallCount)).releaseReference(); + + // Check call count of IResource + verify(resource.getResource(), times(invalidateCallCount)).invalidate(); + verify(resource.getResource(), times(freeUnderlyingResourcesCallCount)) + .freeUnderlyingResources(); + } + + /** Adds mockito instrumentation */ + private RefcountedResource<IResource> getTestRefcountedResource( + RefcountedResource... children) { + return getTestRefcountedResource(new Binder(), children); + } + + /** Adds mockito instrumentation with provided binder */ + private RefcountedResource<IResource> getTestRefcountedResource( + IBinder binder, RefcountedResource... children) { + return spy( + mIpSecService + .new RefcountedResource<IResource>(mock(IResource.class), binder, children)); + } + + @Test + public void testConstructor() throws RemoteException { + IBinder binderMock = mock(IBinder.class); + RefcountedResource<IResource> resource = getTestRefcountedResource(binderMock); + + // Verify resource's refcount starts at 1 (for user-reference) + assertResourceState(resource, 1, 0, 0, 0, 0); + + // Verify linking to binder death + verify(binderMock).linkToDeath(anyObject(), anyInt()); + } + + @Test + public void testConstructorWithChildren() throws RemoteException { + IBinder binderMockChild = mock(IBinder.class); + IBinder binderMockParent = mock(IBinder.class); + RefcountedResource<IResource> childResource = getTestRefcountedResource(binderMockChild); + RefcountedResource<IResource> parentResource = + getTestRefcountedResource(binderMockParent, childResource); + + // Verify parent's refcount starts at 1 (for user-reference) + assertResourceState(parentResource, 1, 0, 0, 0, 0); + + // Verify child's refcounts were incremented + assertResourceState(childResource, 2, 0, 0, 0, 0); + + // Verify linking to binder death + verify(binderMockChild).linkToDeath(anyObject(), anyInt()); + verify(binderMockParent).linkToDeath(anyObject(), anyInt()); + } + + @Test + public void testFailLinkToDeath() throws RemoteException { + IBinder binderMock = mock(IBinder.class); + doThrow(new RemoteException()).when(binderMock).linkToDeath(anyObject(), anyInt()); + + RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(binderMock); + + // Verify that cleanup is performed (Spy limitations prevent verification of method calls + // for binder death scenario; check refcount to determine if cleanup was performed.) + assertEquals(-1, refcountedResource.mRefCount); + } + + @Test + public void testCleanupAndRelease() throws RemoteException { + IBinder binderMock = mock(IBinder.class); + RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(binderMock); + + // Verify user-initiated cleanup path decrements refcount and calls full cleanup flow + refcountedResource.userRelease(); + assertResourceState(refcountedResource, -1, 1, 1, 1, 1); + + // Verify user-initated cleanup path unlinks from binder + verify(binderMock).unlinkToDeath(eq(refcountedResource), eq(0)); + assertNull(refcountedResource.mBinder); + } + + @Test + public void testMultipleCallsToCleanupAndRelease() throws RemoteException { + RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(); + + // Verify calling userRelease multiple times does not trigger any other cleanup + // methods + refcountedResource.userRelease(); + assertResourceState(refcountedResource, -1, 1, 1, 1, 1); + + refcountedResource.userRelease(); + refcountedResource.userRelease(); + assertResourceState(refcountedResource, -1, 3, 1, 1, 1); + } + + @Test + public void testBinderDeathAfterCleanupAndReleaseDoesNothing() throws RemoteException { + RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(); + + refcountedResource.userRelease(); + assertResourceState(refcountedResource, -1, 1, 1, 1, 1); + + // Verify binder death call does not trigger any other cleanup methods if called after + // userRelease() + refcountedResource.binderDied(); + assertResourceState(refcountedResource, -1, 2, 1, 1, 1); + } + + @Test + public void testBinderDeath() throws RemoteException { + RefcountedResource<IResource> refcountedResource = getTestRefcountedResource(); + + // Verify binder death caused cleanup + refcountedResource.binderDied(); + verify(refcountedResource, times(1)).binderDied(); + assertResourceState(refcountedResource, -1, 1, 1, 1, 1); + assertNull(refcountedResource.mBinder); + } + + @Test + public void testCleanupParentDecrementsChildRefcount() throws RemoteException { + RefcountedResource<IResource> childResource = getTestRefcountedResource(); + RefcountedResource<IResource> parentResource = getTestRefcountedResource(childResource); + + parentResource.userRelease(); + + // Verify parent gets cleaned up properly, and triggers releaseReference on + // child + assertResourceState(childResource, 1, 0, 1, 0, 0); + assertResourceState(parentResource, -1, 1, 1, 1, 1); + } + + @Test + public void testCleanupReferencedChildDoesNotTriggerRelease() throws RemoteException { + RefcountedResource<IResource> childResource = getTestRefcountedResource(); + RefcountedResource<IResource> parentResource = getTestRefcountedResource(childResource); + + childResource.userRelease(); + + // Verify that child does not clean up kernel resources and quota. + assertResourceState(childResource, 1, 1, 1, 1, 0); + assertResourceState(parentResource, 1, 0, 0, 0, 0); + } + + @Test + public void testTwoParents() throws RemoteException { + RefcountedResource<IResource> childResource = getTestRefcountedResource(); + RefcountedResource<IResource> parentResource1 = getTestRefcountedResource(childResource); + RefcountedResource<IResource> parentResource2 = getTestRefcountedResource(childResource); + + // Verify that child does not cleanup kernel resources and quota until all references + // have been released. Assumption: parents release correctly based on + // testCleanupParentDecrementsChildRefcount() + childResource.userRelease(); + assertResourceState(childResource, 2, 1, 1, 1, 0); + + parentResource1.userRelease(); + assertResourceState(childResource, 1, 1, 2, 1, 0); + + parentResource2.userRelease(); + assertResourceState(childResource, -1, 1, 3, 1, 1); + } + + @Test + public void testTwoChildren() throws RemoteException { + RefcountedResource<IResource> childResource1 = getTestRefcountedResource(); + RefcountedResource<IResource> childResource2 = getTestRefcountedResource(); + RefcountedResource<IResource> parentResource = + getTestRefcountedResource(childResource1, childResource2); + + childResource1.userRelease(); + assertResourceState(childResource1, 1, 1, 1, 1, 0); + assertResourceState(childResource2, 2, 0, 0, 0, 0); + + parentResource.userRelease(); + assertResourceState(childResource1, -1, 1, 2, 1, 1); + assertResourceState(childResource2, 1, 0, 1, 0, 0); + + childResource2.userRelease(); + assertResourceState(childResource1, -1, 1, 2, 1, 1); + assertResourceState(childResource2, -1, 1, 2, 1, 1); + } + + @Test + public void testSampleUdpEncapTranform() throws RemoteException { + RefcountedResource<IResource> spi1 = getTestRefcountedResource(); + RefcountedResource<IResource> spi2 = getTestRefcountedResource(); + RefcountedResource<IResource> udpEncapSocket = getTestRefcountedResource(); + RefcountedResource<IResource> transform = + getTestRefcountedResource(spi1, spi2, udpEncapSocket); + + // Pretend one SPI goes out of reference (releaseManagedResource -> userRelease) + spi1.userRelease(); + + // User called releaseManagedResource on udpEncap socket + udpEncapSocket.userRelease(); + + // User dies, and binder kills the rest + spi2.binderDied(); + transform.binderDied(); + + // Check resource states + assertResourceState(spi1, -1, 1, 2, 1, 1); + assertResourceState(spi2, -1, 1, 2, 1, 1); + assertResourceState(udpEncapSocket, -1, 1, 2, 1, 1); + assertResourceState(transform, -1, 1, 1, 1, 1); + } + + @Test + public void testSampleDualTransformEncapSocket() throws RemoteException { + RefcountedResource<IResource> spi1 = getTestRefcountedResource(); + RefcountedResource<IResource> spi2 = getTestRefcountedResource(); + RefcountedResource<IResource> spi3 = getTestRefcountedResource(); + RefcountedResource<IResource> spi4 = getTestRefcountedResource(); + RefcountedResource<IResource> udpEncapSocket = getTestRefcountedResource(); + RefcountedResource<IResource> transform1 = + getTestRefcountedResource(spi1, spi2, udpEncapSocket); + RefcountedResource<IResource> transform2 = + getTestRefcountedResource(spi3, spi4, udpEncapSocket); + + // Pretend one SPIs goes out of reference (releaseManagedResource -> userRelease) + spi1.userRelease(); + + // User called releaseManagedResource on udpEncap socket and spi4 + udpEncapSocket.userRelease(); + spi4.userRelease(); + + // User dies, and binder kills the rest + spi2.binderDied(); + spi3.binderDied(); + transform2.binderDied(); + transform1.binderDied(); + + // Check resource states + assertResourceState(spi1, -1, 1, 2, 1, 1); + assertResourceState(spi2, -1, 1, 2, 1, 1); + assertResourceState(spi3, -1, 1, 2, 1, 1); + assertResourceState(spi4, -1, 1, 2, 1, 1); + assertResourceState(udpEncapSocket, -1, 1, 3, 1, 1); + assertResourceState(transform1, -1, 1, 1, 1, 1); + assertResourceState(transform2, -1, 1, 1, 1, 1); + } + + @Test + public void fuzzTest() throws RemoteException { + List<RefcountedResource<IResource>> resources = new ArrayList<>(); + + // Build a tree of resources + for (int i = 0; i < 100; i++) { + // Choose a random number of children from the existing list + int numChildren = ThreadLocalRandom.current().nextInt(0, resources.size() + 1); + + // Build a (random) list of children + Set<RefcountedResource<IResource>> children = new HashSet<>(); + for (int j = 0; j < numChildren; j++) { + int childIndex = ThreadLocalRandom.current().nextInt(0, resources.size()); + children.add(resources.get(childIndex)); + } + + RefcountedResource<IResource> newRefcountedResource = + getTestRefcountedResource( + children.toArray(new RefcountedResource[children.size()])); + resources.add(newRefcountedResource); + } + + // Cleanup all resources in a random order + List<RefcountedResource<IResource>> clonedResources = + new ArrayList<>(resources); // shallow copy + while (!clonedResources.isEmpty()) { + int index = ThreadLocalRandom.current().nextInt(0, clonedResources.size()); + RefcountedResource<IResource> refcountedResource = clonedResources.get(index); + refcountedResource.userRelease(); + clonedResources.remove(index); + } + + // Verify all resources were cleaned up properly + for (RefcountedResource<IResource> refcountedResource : resources) { + assertEquals(-1, refcountedResource.mRefCount); + } + } +} diff --git a/tests/net/java/com/android/server/IpSecServiceTest.java b/tests/net/java/com/android/server/IpSecServiceTest.java index 0720886f8816..8683c12e192e 100644 --- a/tests/net/java/com/android/server/IpSecServiceTest.java +++ b/tests/net/java/com/android/server/IpSecServiceTest.java @@ -131,7 +131,39 @@ public class IpSecServiceTest { mIpSecService.closeUdpEncapsulationSocket(udpEncapResp.resourceId); udpEncapResp.fileDescriptor.close(); - // TODO: Added check for the resource tracker + IpSecService.UserRecord userRecord = + mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); + assertEquals(0, userRecord.mSocketQuotaTracker.mCurrent); + try { + userRecord.mEncapSocketRecords.getRefcountedResourceOrThrow(udpEncapResp.resourceId); + fail("Expected IllegalArgumentException on attempt to access deleted resource"); + } catch (IllegalArgumentException expected) { + + } + } + + @Test + public void testUdpEncapsulationSocketBinderDeath() throws Exception { + int localport = findUnusedPort(); + + IpSecUdpEncapResponse udpEncapResp = + mIpSecService.openUdpEncapsulationSocket(localport, new Binder()); + + IpSecService.UserRecord userRecord = + mIpSecService.mUserResourceTracker.getUserRecord(Os.getuid()); + IpSecService.RefcountedResource refcountedRecord = + userRecord.mEncapSocketRecords.getRefcountedResourceOrThrow( + udpEncapResp.resourceId); + + refcountedRecord.binderDied(); + + assertEquals(0, userRecord.mSocketQuotaTracker.mCurrent); + try { + userRecord.mEncapSocketRecords.getRefcountedResourceOrThrow(udpEncapResp.resourceId); + fail("Expected IllegalArgumentException on attempt to access deleted resource"); + } catch (IllegalArgumentException expected) { + + } } @Test @@ -255,7 +287,7 @@ public class IpSecServiceTest { for (String address : invalidAddresses) { try { IpSecSpiResponse spiResp = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( IpSecTransform.DIRECTION_OUT, address, DROID_SPI, new Binder()); fail("Invalid address was passed through IpSecService validation: " + address); } catch (IllegalArgumentException e) { @@ -336,7 +368,7 @@ public class IpSecServiceTest { // Reserve spis until it fails. for (int i = 0; i < MAX_NUM_SPIS; i++) { IpSecSpiResponse newSpi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( 0x1, InetAddress.getLoopbackAddress().getHostAddress(), DROID_SPI + i, @@ -352,7 +384,7 @@ public class IpSecServiceTest { // Try to reserve one more SPI, and should fail. IpSecSpiResponse extraSpi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( 0x1, InetAddress.getLoopbackAddress().getHostAddress(), DROID_SPI + MAX_NUM_SPIS, @@ -366,7 +398,7 @@ public class IpSecServiceTest { // Should successfully reserve one more spi. extraSpi = - mIpSecService.reserveSecurityParameterIndex( + mIpSecService.allocateSecurityParameterIndex( 0x1, InetAddress.getLoopbackAddress().getHostAddress(), DROID_SPI + MAX_NUM_SPIS, diff --git a/tools/aapt2/cmd/Optimize.cpp b/tools/aapt2/cmd/Optimize.cpp index eaadfd82629e..d8bb9992c152 100644 --- a/tools/aapt2/cmd/Optimize.cpp +++ b/tools/aapt2/cmd/Optimize.cpp @@ -44,8 +44,7 @@ #include "util/Util.h" using ::aapt::configuration::Abi; -using ::aapt::configuration::Artifact; -using ::aapt::configuration::PostProcessingConfiguration; +using ::aapt::configuration::OutputArtifact; using ::android::ResTable_config; using ::android::StringPiece; using ::android::base::ReadFileToString; @@ -74,7 +73,7 @@ struct OptimizeOptions { TableFlattenerOptions table_flattener_options; - Maybe<PostProcessingConfiguration> configuration; + Maybe<std::vector<OutputArtifact>> apk_artifacts; // Set of artifacts to keep when generating multi-APK splits. If the list is empty, all artifacts // are kept and will be written as output. @@ -199,14 +198,11 @@ class OptimizeCommand { ++split_constraints_iter; } - if (options_.configuration && options_.output_dir) { + if (options_.apk_artifacts && options_.output_dir) { MultiApkGenerator generator{apk.get(), context_}; MultiApkGeneratorOptions generator_options = { - options_.output_dir.value(), - options_.configuration.value(), - options_.table_flattener_options, - options_.kept_artifacts, - }; + options_.output_dir.value(), options_.apk_artifacts.value(), + options_.table_flattener_options, options_.kept_artifacts}; if (!generator.FromBaseApk(generator_options)) { return 1; } @@ -423,29 +419,27 @@ int Optimize(const std::vector<StringPiece>& args) { std::string& path = config_path.value(); Maybe<ConfigurationParser> for_path = ConfigurationParser::ForPath(path); if (for_path) { - options.configuration = for_path.value().WithDiagnostics(diag).Parse(); + options.apk_artifacts = for_path.value().WithDiagnostics(diag).Parse(apk_path); + if (!options.apk_artifacts) { + diag->Error(DiagMessage() << "Failed to parse the output artifact list"); + return 1; + } + } else { diag->Error(DiagMessage() << "Could not parse config file " << path); return 1; } if (print_only) { - std::vector<std::string> names; - const PostProcessingConfiguration& config = options.configuration.value(); - if (!config.AllArtifactNames(file::GetFilename(apk_path), &names, diag)) { - diag->Error(DiagMessage() << "Failed to generate output artifact list"); - return 1; - } - - for (const auto& name : names) { - std::cout << name << std::endl; + for (const OutputArtifact& artifact : options.apk_artifacts.value()) { + std::cout << artifact.name << std::endl; } return 0; } if (!kept_artifacts.empty()) { - for (const auto& artifact_str : kept_artifacts) { - for (const auto& artifact : util::Tokenize(artifact_str, ',')) { + for (const std::string& artifact_str : kept_artifacts) { + for (const StringPiece& artifact : util::Tokenize(artifact_str, ',')) { options.kept_artifacts.insert(artifact.to_string()); } } diff --git a/tools/aapt2/configuration/ConfigurationParser.cpp b/tools/aapt2/configuration/ConfigurationParser.cpp index 852ff176ed7d..ebc523f096db 100644 --- a/tools/aapt2/configuration/ConfigurationParser.cpp +++ b/tools/aapt2/configuration/ConfigurationParser.cpp @@ -28,6 +28,7 @@ #include "ConfigDescription.h" #include "Diagnostics.h" #include "ResourceUtils.h" +#include "configuration/ConfigurationParser.internal.h" #include "io/File.h" #include "io/FileSystem.h" #include "io/StringStream.h" @@ -45,11 +46,22 @@ namespace { using ::aapt::configuration::Abi; using ::aapt::configuration::AndroidManifest; using ::aapt::configuration::AndroidSdk; -using ::aapt::configuration::Artifact; -using ::aapt::configuration::PostProcessingConfiguration; +using ::aapt::configuration::ConfiguredArtifact; +using ::aapt::configuration::DeviceFeature; +using ::aapt::configuration::Entry; using ::aapt::configuration::GlTexture; using ::aapt::configuration::Group; using ::aapt::configuration::Locale; +using ::aapt::configuration::OutputArtifact; +using ::aapt::configuration::PostProcessingConfiguration; +using ::aapt::configuration::handler::AbiGroupTagHandler; +using ::aapt::configuration::handler::AndroidSdkGroupTagHandler; +using ::aapt::configuration::handler::ArtifactFormatTagHandler; +using ::aapt::configuration::handler::ArtifactTagHandler; +using ::aapt::configuration::handler::DeviceFeatureGroupTagHandler; +using ::aapt::configuration::handler::GlTextureGroupTagHandler; +using ::aapt::configuration::handler::LocaleGroupTagHandler; +using ::aapt::configuration::handler::ScreenDensityGroupTagHandler; using ::aapt::io::IFile; using ::aapt::io::RegularFile; using ::aapt::io::StringInputStream; @@ -59,19 +71,16 @@ using ::aapt::xml::NodeCast; using ::aapt::xml::XmlActionExecutor; using ::aapt::xml::XmlActionExecutorPolicy; using ::aapt::xml::XmlNodeAction; -using ::android::base::ReadFileToString; using ::android::StringPiece; +using ::android::base::ReadFileToString; -const std::unordered_map<std::string, Abi> kStringToAbiMap = { +const std::unordered_map<StringPiece, Abi> kStringToAbiMap = { {"armeabi", Abi::kArmeV6}, {"armeabi-v7a", Abi::kArmV7a}, {"arm64-v8a", Abi::kArm64V8a}, {"x86", Abi::kX86}, {"x86_64", Abi::kX86_64}, {"mips", Abi::kMips}, {"mips64", Abi::kMips64}, {"universal", Abi::kUniversal}, }; -const std::map<Abi, std::string> kAbiToStringMap = { - {Abi::kArmeV6, "armeabi"}, {Abi::kArmV7a, "armeabi-v7a"}, {Abi::kArm64V8a, "arm64-v8a"}, - {Abi::kX86, "x86"}, {Abi::kX86_64, "x86_64"}, {Abi::kMips, "mips"}, - {Abi::kMips64, "mips64"}, {Abi::kUniversal, "universal"}, -}; +const std::array<StringPiece, 8> kAbiToStringMap = { + {"armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64", "universal"}}; constexpr const char* kAaptXmlNs = "http://schemas.android.com/tools/aapt"; @@ -106,12 +115,25 @@ class NamespaceVisitor : public xml::Visitor { } }; -} // namespace +/** Copies the values referenced in a configuration group to the target list. */ +template <typename T> +bool CopyXmlReferences(const Maybe<std::string>& name, const Group<T>& groups, + std::vector<T>* target) { + // If there was no item configured, there is nothing to do and no error. + if (!name) { + return true; + } -namespace configuration { + // If the group could not be found, then something is wrong. + auto group = groups.find(name.value()); + if (group == groups.end()) { + return false; + } -const std::string& AbiToString(Abi abi) { - return kAbiToStringMap.find(abi)->second; + for (const T& item : group->second) { + target->push_back(item); + } + return true; } /** @@ -119,8 +141,8 @@ const std::string& AbiToString(Abi abi) { * success, or false if the either the placeholder is not found in the name, or the value is not * present and the placeholder was. */ -static bool ReplacePlaceholder(const StringPiece& placeholder, const Maybe<StringPiece>& value, - std::string* name, IDiagnostics* diag) { +bool ReplacePlaceholder(const StringPiece& placeholder, const Maybe<StringPiece>& value, + std::string* name, IDiagnostics* diag) { size_t offset = name->find(placeholder.data()); bool found = (offset != std::string::npos); @@ -152,6 +174,160 @@ static bool ReplacePlaceholder(const StringPiece& placeholder, const Maybe<Strin } /** + * An ActionHandler for processing XML elements in the XmlActionExecutor. Returns true if the + * element was successfully processed, otherwise returns false. + */ +using ActionHandler = std::function<bool(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag)>; + +/** Binds an ActionHandler to the current configuration being populated. */ +xml::XmlNodeAction::ActionFuncWithDiag Bind(configuration::PostProcessingConfiguration* config, + const ActionHandler& handler) { + return [config, handler](xml::Element* root_element, SourcePathDiagnostics* diag) { + return handler(config, root_element, diag); + }; +} + +/** Returns the binary reprasentation of the XML configuration. */ +Maybe<PostProcessingConfiguration> ExtractConfiguration(const std::string& contents, + IDiagnostics* diag) { + StringInputStream in(contents); + std::unique_ptr<xml::XmlResource> doc = xml::Inflate(&in, diag, Source("config.xml")); + if (!doc) { + return {}; + } + + // Strip any namespaces from the XML as the XmlActionExecutor ignores anything with a namespace. + Element* root = doc->root.get(); + if (root == nullptr) { + diag->Error(DiagMessage() << "Could not find the root element in the XML document"); + return {}; + } + + std::string& xml_ns = root->namespace_uri; + if (!xml_ns.empty()) { + if (xml_ns != kAaptXmlNs) { + diag->Error(DiagMessage() << "Unknown namespace found on root element: " << xml_ns); + return {}; + } + + xml_ns.clear(); + NamespaceVisitor visitor; + root->Accept(&visitor); + } + + XmlActionExecutor executor; + XmlNodeAction& root_action = executor["post-process"]; + XmlNodeAction& artifacts_action = root_action["artifacts"]; + XmlNodeAction& groups_action = root_action["groups"]; + + PostProcessingConfiguration config; + + // Parse the artifact elements. + artifacts_action["artifact"].Action(Bind(&config, ArtifactTagHandler)); + artifacts_action["artifact-format"].Action(Bind(&config, ArtifactFormatTagHandler)); + + // Parse the different configuration groups. + groups_action["abi-group"].Action(Bind(&config, AbiGroupTagHandler)); + groups_action["screen-density-group"].Action(Bind(&config, ScreenDensityGroupTagHandler)); + groups_action["locale-group"].Action(Bind(&config, LocaleGroupTagHandler)); + groups_action["android-sdk-group"].Action(Bind(&config, AndroidSdkGroupTagHandler)); + groups_action["gl-texture-group"].Action(Bind(&config, GlTextureGroupTagHandler)); + groups_action["device-feature-group"].Action(Bind(&config, DeviceFeatureGroupTagHandler)); + + if (!executor.Execute(XmlActionExecutorPolicy::kNone, diag, doc.get())) { + diag->Error(DiagMessage() << "Could not process XML document"); + return {}; + } + + return {config}; +} + +/** Converts a ConfiguredArtifact into an OutputArtifact. */ +Maybe<OutputArtifact> ToOutputArtifact(const ConfiguredArtifact& artifact, + const std::string& apk_name, + const PostProcessingConfiguration& config, + IDiagnostics* diag) { + if (!artifact.name && !config.artifact_format) { + diag->Error( + DiagMessage() << "Artifact does not have a name and no global name template defined"); + return {}; + } + + Maybe<std::string> artifact_name = + (artifact.name) ? artifact.Name(apk_name, diag) + : artifact.ToArtifactName(config.artifact_format.value(), apk_name, diag); + + if (!artifact_name) { + diag->Error(DiagMessage() << "Could not determine split APK artifact name"); + return {}; + } + + OutputArtifact output_artifact; + output_artifact.name = artifact_name.value(); + + SourcePathDiagnostics src_diag{{output_artifact.name}, diag}; + bool has_errors = false; + + if (!CopyXmlReferences(artifact.abi_group, config.abi_groups, &output_artifact.abis)) { + src_diag.Error(DiagMessage() << "Could not lookup required ABIs: " + << artifact.abi_group.value()); + has_errors = true; + } + + if (!CopyXmlReferences(artifact.locale_group, config.locale_groups, &output_artifact.locales)) { + src_diag.Error(DiagMessage() << "Could not lookup required locales: " + << artifact.locale_group.value()); + has_errors = true; + } + + if (!CopyXmlReferences(artifact.screen_density_group, config.screen_density_groups, + &output_artifact.screen_densities)) { + src_diag.Error(DiagMessage() << "Could not lookup required screen densities: " + << artifact.screen_density_group.value()); + has_errors = true; + } + + if (!CopyXmlReferences(artifact.device_feature_group, config.device_feature_groups, + &output_artifact.features)) { + src_diag.Error(DiagMessage() << "Could not lookup required device features: " + << artifact.device_feature_group.value()); + has_errors = true; + } + + if (!CopyXmlReferences(artifact.gl_texture_group, config.gl_texture_groups, + &output_artifact.textures)) { + src_diag.Error(DiagMessage() << "Could not lookup required OpenGL texture formats: " + << artifact.gl_texture_group.value()); + has_errors = true; + } + + if (artifact.android_sdk_group) { + auto entry = config.android_sdk_groups.find(artifact.android_sdk_group.value()); + if (entry == config.android_sdk_groups.end()) { + src_diag.Error(DiagMessage() << "Could not lookup required Android SDK version: " + << artifact.android_sdk_group.value()); + has_errors = true; + } else { + output_artifact.android_sdk = {entry->second}; + } + } + + if (has_errors) { + return {}; + } + return {output_artifact}; +} + +} // namespace + +namespace configuration { + +const StringPiece& AbiToString(Abi abi) { + return kAbiToStringMap.at(static_cast<size_t>(abi)); +} + +/** * Returns the common artifact base name from a template string. */ Maybe<std::string> ToBaseName(std::string result, const StringPiece& apk_name, IDiagnostics* diag) { @@ -186,8 +362,9 @@ Maybe<std::string> ToBaseName(std::string result, const StringPiece& apk_name, I return result; } -Maybe<std::string> Artifact::ToArtifactName(const StringPiece& format, const StringPiece& apk_name, - IDiagnostics* diag) const { +Maybe<std::string> ConfiguredArtifact::ToArtifactName(const StringPiece& format, + const StringPiece& apk_name, + IDiagnostics* diag) const { Maybe<std::string> base = ToBaseName(format.to_string(), apk_name, diag); if (!base) { return {}; @@ -221,7 +398,7 @@ Maybe<std::string> Artifact::ToArtifactName(const StringPiece& format, const Str return result; } -Maybe<std::string> Artifact::Name(const StringPiece& apk_name, IDiagnostics* diag) const { +Maybe<std::string> ConfiguredArtifact::Name(const StringPiece& apk_name, IDiagnostics* diag) const { if (!name) { return {}; } @@ -229,31 +406,6 @@ Maybe<std::string> Artifact::Name(const StringPiece& apk_name, IDiagnostics* dia return ToBaseName(name.value(), apk_name, diag); } -bool PostProcessingConfiguration::AllArtifactNames(const StringPiece& apk_name, - std::vector<std::string>* artifact_names, - IDiagnostics* diag) const { - for (const auto& artifact : artifacts) { - Maybe<std::string> name; - if (artifact.name) { - name = artifact.Name(apk_name, diag); - } else { - if (!artifact_format) { - diag->Error(DiagMessage() << "No global artifact template and an artifact name is missing"); - return false; - } - name = artifact.ToArtifactName(artifact_format.value(), apk_name, diag); - } - - if (!name) { - return false; - } - - artifact_names->push_back(std::move(name.value())); - } - - return true; -} - } // namespace configuration /** Returns a ConfigurationParser for the file located at the provided path. */ @@ -270,86 +422,58 @@ ConfigurationParser::ConfigurationParser(std::string contents) diag_(&noop_) { } -Maybe<PostProcessingConfiguration> ConfigurationParser::Parse() { - StringInputStream in(contents_); - std::unique_ptr<xml::XmlResource> doc = xml::Inflate(&in, diag_, Source("config.xml")); - if (!doc) { - return {}; - } - - // Strip any namespaces from the XML as the XmlActionExecutor ignores anything with a namespace. - Element* root = doc->root.get(); - if (root == nullptr) { - diag_->Error(DiagMessage() << "Could not find the root element in the XML document"); - return {}; - } - - std::string& xml_ns = root->namespace_uri; - if (!xml_ns.empty()) { - if (xml_ns != kAaptXmlNs) { - diag_->Error(DiagMessage() << "Unknown namespace found on root element: " << xml_ns); - return {}; - } - - xml_ns.clear(); - NamespaceVisitor visitor; - root->Accept(&visitor); - } - - XmlActionExecutor executor; - XmlNodeAction& root_action = executor["post-process"]; - XmlNodeAction& artifacts_action = root_action["artifacts"]; - XmlNodeAction& groups_action = root_action["groups"]; - - PostProcessingConfiguration config; - - // Helper to bind a static method to an action handler in the DOM executor. - auto bind_handler = - [&config](std::function<bool(PostProcessingConfiguration*, Element*, IDiagnostics*)> h) - -> XmlNodeAction::ActionFuncWithDiag { - return std::bind(h, &config, std::placeholders::_1, std::placeholders::_2); - }; - - // Parse the artifact elements. - artifacts_action["artifact"].Action(bind_handler(artifact_handler_)); - artifacts_action["artifact-format"].Action(bind_handler(artifact_format_handler_)); - - // Parse the different configuration groups. - groups_action["abi-group"].Action(bind_handler(abi_group_handler_)); - groups_action["screen-density-group"].Action(bind_handler(screen_density_group_handler_)); - groups_action["locale-group"].Action(bind_handler(locale_group_handler_)); - groups_action["android-sdk-group"].Action(bind_handler(android_sdk_group_handler_)); - groups_action["gl-texture-group"].Action(bind_handler(gl_texture_group_handler_)); - groups_action["device-feature-group"].Action(bind_handler(device_feature_group_handler_)); - - if (!executor.Execute(XmlActionExecutorPolicy::kNone, diag_, doc.get())) { - diag_->Error(DiagMessage() << "Could not process XML document"); +Maybe<std::vector<OutputArtifact>> ConfigurationParser::Parse( + const android::StringPiece& apk_path) { + Maybe<PostProcessingConfiguration> maybe_config = ExtractConfiguration(contents_, diag_); + if (!maybe_config) { return {}; } - - // TODO: Validate all references in the configuration are valid. It should be safe to assume from - // this point on that any references from one section to another will be present. + const PostProcessingConfiguration& config = maybe_config.value(); // TODO: Automatically arrange artifacts so that they match Play Store multi-APK requirements. // see: https://developer.android.com/google/play/publishing/multiple-apks.html // // For now, make sure the version codes are unique. - std::vector<Artifact>& artifacts = config.artifacts; + std::vector<ConfiguredArtifact> artifacts = config.artifacts; std::sort(artifacts.begin(), artifacts.end()); if (std::adjacent_find(artifacts.begin(), artifacts.end()) != artifacts.end()) { diag_->Error(DiagMessage() << "Configuration has duplicate versions"); return {}; } - return {config}; + const std::string& apk_name = file::GetFilename(apk_path).to_string(); + const StringPiece ext = file::GetExtension(apk_name); + const std::string base_name = apk_name.substr(0, apk_name.size() - ext.size()); + + // Convert from a parsed configuration to a list of artifacts for processing. + std::vector<OutputArtifact> output_artifacts; + bool has_errors = false; + + for (const ConfiguredArtifact& artifact : artifacts) { + Maybe<OutputArtifact> output_artifact = ToOutputArtifact(artifact, apk_name, config, diag_); + if (!output_artifact) { + // Defer return an error condition so that all errors are reported. + has_errors = true; + } else { + output_artifacts.push_back(std::move(output_artifact.value())); + } + } + + if (has_errors) { + return {}; + } + return {output_artifacts}; } -ConfigurationParser::ActionHandler ConfigurationParser::artifact_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +namespace configuration { +namespace handler { + +bool ArtifactTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { // This will be incremented later so the first version will always be different to the base APK. int current_version = (config->artifacts.empty()) ? 0 : config->artifacts.back().version; - Artifact artifact{}; + ConfiguredArtifact artifact{}; Maybe<int> version; for (const auto& attr : root_element->attributes) { if (attr.name == "name") { @@ -380,8 +504,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::artifact_handler_ = return true; }; -ConfigurationParser::ActionHandler ConfigurationParser::artifact_format_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool ArtifactFormatTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* /* diag */) { for (auto& node : root_element->children) { xml::Text* t; if ((t = NodeCast<xml::Text>(node.get())) != nullptr) { @@ -392,8 +516,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::artifact_format_handler_ return true; }; -ConfigurationParser::ActionHandler ConfigurationParser::abi_group_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool AbiGroupTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { std::string label = GetLabel(root_element, diag); if (label.empty()) { return false; @@ -420,8 +544,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::abi_group_handler_ = return valid; }; -ConfigurationParser::ActionHandler ConfigurationParser::screen_density_group_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool ScreenDensityGroupTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { std::string label = GetLabel(root_element, diag); if (label.empty()) { return false; @@ -461,8 +585,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::screen_density_group_han return valid; }; -ConfigurationParser::ActionHandler ConfigurationParser::locale_group_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool LocaleGroupTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { std::string label = GetLabel(root_element, diag); if (label.empty()) { return false; @@ -502,8 +626,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::locale_group_handler_ = return valid; }; -ConfigurationParser::ActionHandler ConfigurationParser::android_sdk_group_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool AndroidSdkGroupTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { std::string label = GetLabel(root_element, diag); if (label.empty()) { return false; @@ -560,8 +684,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::android_sdk_group_handle return valid; }; -ConfigurationParser::ActionHandler ConfigurationParser::gl_texture_group_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool GlTextureGroupTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { std::string label = GetLabel(root_element, diag); if (label.empty()) { return false; @@ -603,8 +727,8 @@ ConfigurationParser::ActionHandler ConfigurationParser::gl_texture_group_handler return valid; }; -ConfigurationParser::ActionHandler ConfigurationParser::device_feature_group_handler_ = - [](PostProcessingConfiguration* config, Element* root_element, IDiagnostics* diag) -> bool { +bool DeviceFeatureGroupTagHandler(PostProcessingConfiguration* config, Element* root_element, + IDiagnostics* diag) { std::string label = GetLabel(root_element, diag); if (label.empty()) { return false; @@ -632,4 +756,7 @@ ConfigurationParser::ActionHandler ConfigurationParser::device_feature_group_han return valid; }; +} // namespace handler +} // namespace configuration + } // namespace aapt diff --git a/tools/aapt2/configuration/ConfigurationParser.h b/tools/aapt2/configuration/ConfigurationParser.h index c5d3284c33f4..ca5891025c92 100644 --- a/tools/aapt2/configuration/ConfigurationParser.h +++ b/tools/aapt2/configuration/ConfigurationParser.h @@ -30,54 +30,6 @@ namespace aapt { namespace configuration { -/** A mapping of group labels to group of configuration items. */ -template<class T> -using Group = std::unordered_map<std::string, std::vector<T>>; - -/** A mapping of group label to a single configuration item. */ -template <class T> -using Entry = std::unordered_map<std::string, T>; - -/** Output artifact configuration options. */ -struct Artifact { - /** Name to use for output of processing foo.apk -> foo.<name>.apk. */ - Maybe<std::string> name; - /** - * Value to add to the base Android manifest versionCode. If it is not present in the - * configuration file, it is set to the previous artifact + 1. If the first artifact does not have - * a value, artifacts are a 1 based index. - */ - int version; - /** If present, uses the ABI group with this name. */ - Maybe<std::string> abi_group; - /** If present, uses the screen density group with this name. */ - Maybe<std::string> screen_density_group; - /** If present, uses the locale group with this name. */ - Maybe<std::string> locale_group; - /** If present, uses the Android SDK group with this name. */ - Maybe<std::string> android_sdk_group; - /** If present, uses the device feature group with this name. */ - Maybe<std::string> device_feature_group; - /** If present, uses the OpenGL texture group with this name. */ - Maybe<std::string> gl_texture_group; - - /** Convert an artifact name template into a name string based on configuration contents. */ - Maybe<std::string> ToArtifactName(const android::StringPiece& format, - const android::StringPiece& apk_name, IDiagnostics* diag) const; - - /** Convert an artifact name template into a name string based on configuration contents. */ - Maybe<std::string> Name(const android::StringPiece& apk_name, IDiagnostics* diag) const; - - bool operator<(const Artifact& rhs) const { - // TODO(safarmer): Order by play store multi-APK requirements. - return version < rhs.version; - } - - bool operator==(const Artifact& rhs) const { - return version == rhs.version; - } -}; - /** Enumeration of currently supported ABIs. */ enum class Abi { kArmeV6, @@ -91,7 +43,7 @@ enum class Abi { }; /** Helper method to convert an ABI to a string representing the path within the APK. */ -const std::string& AbiToString(Abi abi); +const android::StringPiece& AbiToString(Abi abi); /** * Represents an individual locale. When a locale is included, it must be @@ -151,22 +103,16 @@ struct GlTexture { } }; -/** AAPT2 XML configuration file binary representation. */ -struct PostProcessingConfiguration { - // TODO: Support named artifacts? - std::vector<Artifact> artifacts; - Maybe<std::string> artifact_format; - - Group<Abi> abi_groups; - Group<ConfigDescription> screen_density_groups; - Group<ConfigDescription> locale_groups; - Entry<AndroidSdk> android_sdk_groups; - Group<DeviceFeature> device_feature_groups; - Group<GlTexture> gl_texture_groups; - - /** Helper method that generates a list of artifact names and returns true on success. */ - bool AllArtifactNames(const android::StringPiece& apk_name, - std::vector<std::string>* artifact_names, IDiagnostics* diag) const; +/** An artifact with all the details pulled from the PostProcessingConfiguration. */ +struct OutputArtifact { + std::string name; + int version; + std::vector<Abi> abis; + std::vector<ConfigDescription> screen_densities; + std::vector<ConfigDescription> locales; + Maybe<AndroidSdk> android_sdk; + std::vector<DeviceFeature> features; + std::vector<GlTexture> textures; }; } // namespace configuration @@ -202,7 +148,7 @@ class ConfigurationParser { * Parses the configuration file and returns the results. If the configuration could not be parsed * the result is empty and any errors will be displayed with the provided diagnostics context. */ - Maybe<configuration::PostProcessingConfiguration> Parse(); + Maybe<std::vector<configuration::OutputArtifact>> Parse(const android::StringPiece& apk_path); protected: /** @@ -217,30 +163,6 @@ class ConfigurationParser { return diag_; } - /** - * An ActionHandler for processing XML elements in the XmlActionExecutor. Returns true if the - * element was successfully processed, otherwise returns false. - */ - using ActionHandler = std::function<bool(configuration::PostProcessingConfiguration* config, - xml::Element* element, IDiagnostics* diag)>; - - /** Handler for <artifact> tags. */ - static ActionHandler artifact_handler_; - /** Handler for <artifact-format> tags. */ - static ActionHandler artifact_format_handler_; - /** Handler for <abi-group> tags. */ - static ActionHandler abi_group_handler_; - /** Handler for <screen-density-group> tags. */ - static ActionHandler screen_density_group_handler_; - /** Handler for <locale-group> tags. */ - static ActionHandler locale_group_handler_; - /** Handler for <android-sdk-group> tags. */ - static ActionHandler android_sdk_group_handler_; - /** Handler for <gl-texture-group> tags. */ - static ActionHandler gl_texture_group_handler_; - /** Handler for <device-feature-group> tags. */ - static ActionHandler device_feature_group_handler_; - private: /** The contents of the configuration file to parse. */ const std::string contents_; diff --git a/tools/aapt2/configuration/ConfigurationParser.internal.h b/tools/aapt2/configuration/ConfigurationParser.internal.h new file mode 100644 index 000000000000..7657ebd70a8b --- /dev/null +++ b/tools/aapt2/configuration/ConfigurationParser.internal.h @@ -0,0 +1,122 @@ +/* + * 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. + */ + +#ifndef AAPT2_CONFIGURATIONPARSER_INTERNAL_H +#define AAPT2_CONFIGURATIONPARSER_INTERNAL_H + +namespace aapt { +namespace configuration { + +/** A mapping of group labels to group of configuration items. */ +template <class T> +using Group = std::unordered_map<std::string, std::vector<T>>; + +/** A mapping of group label to a single configuration item. */ +template <class T> +using Entry = std::unordered_map<std::string, T>; + +/** Output artifact configuration options. */ +struct ConfiguredArtifact { + /** Name to use for output of processing foo.apk -> foo.<name>.apk. */ + Maybe<std::string> name; + /** + * Value to add to the base Android manifest versionCode. If it is not present in the + * configuration file, it is set to the previous artifact + 1. If the first artifact does not have + * a value, artifacts are a 1 based index. + */ + int version; + /** If present, uses the ABI group with this name. */ + Maybe<std::string> abi_group; + /** If present, uses the screen density group with this name. */ + Maybe<std::string> screen_density_group; + /** If present, uses the locale group with this name. */ + Maybe<std::string> locale_group; + /** If present, uses the Android SDK group with this name. */ + Maybe<std::string> android_sdk_group; + /** If present, uses the device feature group with this name. */ + Maybe<std::string> device_feature_group; + /** If present, uses the OpenGL texture group with this name. */ + Maybe<std::string> gl_texture_group; + + /** Convert an artifact name template into a name string based on configuration contents. */ + Maybe<std::string> ToArtifactName(const android::StringPiece& format, + const android::StringPiece& apk_name, IDiagnostics* diag) const; + + /** Convert an artifact name template into a name string based on configuration contents. */ + Maybe<std::string> Name(const android::StringPiece& apk_name, IDiagnostics* diag) const; + + bool operator<(const ConfiguredArtifact& rhs) const { + // TODO(safarmer): Order by play store multi-APK requirements. + return version < rhs.version; + } + + bool operator==(const ConfiguredArtifact& rhs) const { + return version == rhs.version; + } +}; + +/** AAPT2 XML configuration file binary representation. */ +struct PostProcessingConfiguration { + // TODO: Support named artifacts? + std::vector<ConfiguredArtifact> artifacts; + Maybe<std::string> artifact_format; + + Group<Abi> abi_groups; + Group<ConfigDescription> screen_density_groups; + Group<ConfigDescription> locale_groups; + Entry<AndroidSdk> android_sdk_groups; + Group<DeviceFeature> device_feature_groups; + Group<GlTexture> gl_texture_groups; +}; + +namespace handler { + +/** Handler for <artifact> tags. */ +bool ArtifactTagHandler(configuration::PostProcessingConfiguration* config, xml::Element* element, + IDiagnostics* diag); + +/** Handler for <artifact-format> tags. */ +bool ArtifactFormatTagHandler(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag); + +/** Handler for <abi-group> tags. */ +bool AbiGroupTagHandler(configuration::PostProcessingConfiguration* config, xml::Element* element, + IDiagnostics* diag); + +/** Handler for <screen-density-group> tags. */ +bool ScreenDensityGroupTagHandler(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag); + +/** Handler for <locale-group> tags. */ +bool LocaleGroupTagHandler(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag); + +/** Handler for <android-sdk-group> tags. */ +bool AndroidSdkGroupTagHandler(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag); + +/** Handler for <gl-texture-group> tags. */ +bool GlTextureGroupTagHandler(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag); + +/** Handler for <device-feature-group> tags. */ +bool DeviceFeatureGroupTagHandler(configuration::PostProcessingConfiguration* config, + xml::Element* element, IDiagnostics* diag); + +} // namespace handler +} // namespace configuration +} // namespace aapt +#endif // AAPT2_CONFIGURATIONPARSER_INTERNAL_H diff --git a/tools/aapt2/configuration/ConfigurationParser_test.cpp b/tools/aapt2/configuration/ConfigurationParser_test.cpp index f7153c822bbc..3f356d78bbfe 100644 --- a/tools/aapt2/configuration/ConfigurationParser_test.cpp +++ b/tools/aapt2/configuration/ConfigurationParser_test.cpp @@ -22,6 +22,7 @@ #include "androidfw/ResourceTypes.h" #include "SdkConstants.h" +#include "configuration/ConfigurationParser.internal.h" #include "test/Test.h" #include "xml/XmlDom.h" @@ -33,14 +34,15 @@ void PrintTo(const AndroidSdk& sdk, std::ostream* os) { << ", target=" << sdk.target_sdk_version.value_or_default(-1) << ", max=" << sdk.max_sdk_version.value_or_default(-1); } -} // namespace configuration + +namespace handler { namespace { using ::aapt::configuration::Abi; using ::aapt::configuration::AndroidManifest; using ::aapt::configuration::AndroidSdk; -using ::aapt::configuration::Artifact; +using ::aapt::configuration::ConfiguredArtifact; using ::aapt::configuration::DeviceFeature; using ::aapt::configuration::GlTexture; using ::aapt::configuration::Locale; @@ -50,6 +52,7 @@ using ::aapt::xml::NodeCast; using ::android::ResTable_config; using ::android::base::StringPrintf; using ::testing::ElementsAre; +using ::testing::SizeIs; constexpr const char* kValidConfig = R"(<?xml version="1.0" encoding="utf-8" ?> <post-process xmlns="http://schemas.android.com/tools/aapt"> @@ -144,44 +147,47 @@ TEST_F(ConfigurationParserTest, ForPath_NoFile) { TEST_F(ConfigurationParserTest, ValidateFile) { auto parser = ConfigurationParser::ForContents(kValidConfig).WithDiagnostics(&diag_); - auto result = parser.Parse(); + auto result = parser.Parse("test.apk"); ASSERT_TRUE(result); - PostProcessingConfiguration& value = result.value(); - EXPECT_EQ(2ul, value.artifacts.size()); - ASSERT_TRUE(value.artifact_format); - EXPECT_EQ( - "${base}.${abi}.${screen-density}.${locale}.${sdk}.${gl}.${feature}.release", - value.artifact_format.value() - ); - - EXPECT_EQ(2ul, value.abi_groups.size()); - EXPECT_EQ(2ul, value.abi_groups["arm"].size()); - EXPECT_EQ(2ul, value.abi_groups["other"].size()); - - EXPECT_EQ(2ul, value.screen_density_groups.size()); - EXPECT_EQ(3ul, value.screen_density_groups["large"].size()); - EXPECT_EQ(6ul, value.screen_density_groups["alldpi"].size()); - - EXPECT_EQ(2ul, value.locale_groups.size()); - EXPECT_EQ(4ul, value.locale_groups["europe"].size()); - EXPECT_EQ(3ul, value.locale_groups["north-america"].size()); - - EXPECT_EQ(1ul, value.android_sdk_groups.size()); - EXPECT_TRUE(value.android_sdk_groups["v19"].min_sdk_version); - EXPECT_EQ(19, value.android_sdk_groups["v19"].min_sdk_version.value()); - - EXPECT_EQ(1ul, value.gl_texture_groups.size()); - EXPECT_EQ(1ul, value.gl_texture_groups["dxt1"].size()); - - EXPECT_EQ(1ul, value.device_feature_groups.size()); - EXPECT_EQ(1ul, value.device_feature_groups["low-latency"].size()); + const std::vector<OutputArtifact>& value = result.value(); + EXPECT_THAT(value, SizeIs(2ul)); + + const OutputArtifact& a1 = value[0]; + EXPECT_EQ(a1.name, "art1.apk"); + EXPECT_THAT(a1.abis, ElementsAre(Abi::kArmV7a, Abi::kArm64V8a)); + EXPECT_THAT(a1.screen_densities, + ElementsAre(test::ParseConfigOrDie("xhdpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("xxhdpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("xxxhdpi").CopyWithoutSdkVersion())); + EXPECT_THAT(a1.locales, ElementsAre(test::ParseConfigOrDie("en"), test::ParseConfigOrDie("es"), + test::ParseConfigOrDie("fr"), test::ParseConfigOrDie("de"))); + EXPECT_EQ(a1.android_sdk.value().min_sdk_version.value(), 19l); + EXPECT_THAT(a1.textures, SizeIs(1ul)); + EXPECT_THAT(a1.features, SizeIs(1ul)); + + const OutputArtifact& a2 = value[1]; + EXPECT_EQ(a2.name, "art2.apk"); + EXPECT_THAT(a2.abis, ElementsAre(Abi::kX86, Abi::kMips)); + EXPECT_THAT(a2.screen_densities, + ElementsAre(test::ParseConfigOrDie("ldpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("mdpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("hdpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("xhdpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("xxhdpi").CopyWithoutSdkVersion(), + test::ParseConfigOrDie("xxxhdpi").CopyWithoutSdkVersion())); + EXPECT_THAT(a2.locales, + ElementsAre(test::ParseConfigOrDie("en"), test::ParseConfigOrDie("es-rMX"), + test::ParseConfigOrDie("fr-rCA"))); + EXPECT_EQ(a2.android_sdk.value().min_sdk_version.value(), 19l); + EXPECT_THAT(a2.textures, SizeIs(1ul)); + EXPECT_THAT(a2.features, SizeIs(1ul)); } TEST_F(ConfigurationParserTest, InvalidNamespace) { constexpr const char* invalid_ns = R"(<?xml version="1.0" encoding="utf-8" ?> <post-process xmlns="http://schemas.android.com/tools/another-unknown-tool" />)"; - auto result = ConfigurationParser::ForContents(invalid_ns).Parse(); + auto result = ConfigurationParser::ForContents(invalid_ns).Parse("test.apk"); ASSERT_FALSE(result); } @@ -197,9 +203,9 @@ TEST_F(ConfigurationParserTest, ArtifactAction) { gl-texture-group="dxt1" device-feature-group="low-latency"/>)xml"); - ASSERT_TRUE(artifact_handler_(&config, NodeCast<Element>(doc->root.get()), &diag_)); + ASSERT_TRUE(ArtifactTagHandler(&config, NodeCast<Element>(doc->root.get()), &diag_)); - EXPECT_EQ(1ul, config.artifacts.size()); + EXPECT_THAT(config.artifacts, SizeIs(1ul)); auto& artifact = config.artifacts.back(); EXPECT_FALSE(artifact.name); // TODO: make this fail. @@ -223,8 +229,8 @@ TEST_F(ConfigurationParserTest, ArtifactAction) { gl-texture-group="dxt1" device-feature-group="low-latency"/>)xml"); - ASSERT_TRUE(artifact_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_)); - EXPECT_EQ(2ul, config.artifacts.size()); + ASSERT_TRUE(ArtifactTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_)); + EXPECT_THAT(config.artifacts, SizeIs(2ul)); EXPECT_EQ(2, config.artifacts.back().version); } @@ -240,8 +246,8 @@ TEST_F(ConfigurationParserTest, ArtifactAction) { gl-texture-group="dxt1" device-feature-group="low-latency"/>)xml"); - ASSERT_TRUE(artifact_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_)); - EXPECT_EQ(3ul, config.artifacts.size()); + ASSERT_TRUE(ArtifactTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_)); + EXPECT_THAT(config.artifacts, SizeIs(3ul)); EXPECT_EQ(5, config.artifacts.back().version); } @@ -256,8 +262,8 @@ TEST_F(ConfigurationParserTest, ArtifactAction) { gl-texture-group="dxt1" device-feature-group="low-latency"/>)xml"); - ASSERT_TRUE(artifact_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_)); - EXPECT_EQ(4ul, config.artifacts.size()); + ASSERT_TRUE(ArtifactTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_)); + EXPECT_THAT(config.artifacts, SizeIs(4ul)); EXPECT_EQ(6, config.artifacts.back().version); } } @@ -288,7 +294,7 @@ TEST_F(ConfigurationParserTest, DuplicateArtifactVersion) { device-feature-group="low-latency"/> </artifacts> </post-process>)xml"; - auto result = ConfigurationParser::ForContents(configuration).Parse(); + auto result = ConfigurationParser::ForContents(configuration).Parse("test.apk"); ASSERT_FALSE(result); } @@ -299,7 +305,7 @@ TEST_F(ConfigurationParserTest, ArtifactFormatAction) { </artifact-format>)xml"); PostProcessingConfiguration config; - bool ok = artifact_format_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = ArtifactFormatTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_TRUE(config.artifact_format); EXPECT_EQ( @@ -322,10 +328,10 @@ TEST_F(ConfigurationParserTest, AbiGroupAction) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = abi_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AbiGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); - EXPECT_EQ(1ul, config.abi_groups.size()); + EXPECT_THAT(config.abi_groups, SizeIs(1ul)); ASSERT_EQ(1u, config.abi_groups.count("arm")); auto& out = config.abi_groups["arm"]; @@ -345,11 +351,10 @@ TEST_F(ConfigurationParserTest, ScreenDensityGroupAction) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = - screen_density_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = ScreenDensityGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); - EXPECT_EQ(1ul, config.screen_density_groups.size()); + EXPECT_THAT(config.screen_density_groups, SizeIs(1ul)); ASSERT_EQ(1u, config.screen_density_groups.count("large")); ConfigDescription xhdpi; @@ -375,7 +380,7 @@ TEST_F(ConfigurationParserTest, LocaleGroupAction) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = locale_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = LocaleGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_EQ(1ul, config.locale_groups.size()); @@ -407,7 +412,7 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = android_sdk_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AndroidSdkGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_EQ(1ul, config.android_sdk_groups.size()); @@ -434,7 +439,7 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_SingleVersion) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = android_sdk_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AndroidSdkGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_EQ(1ul, config.android_sdk_groups.size()); @@ -455,7 +460,7 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_SingleVersion) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = android_sdk_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AndroidSdkGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_EQ(1ul, config.android_sdk_groups.size()); @@ -476,7 +481,7 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_SingleVersion) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = android_sdk_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AndroidSdkGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_EQ(1ul, config.android_sdk_groups.size()); @@ -505,7 +510,7 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_InvalidVersion) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = android_sdk_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AndroidSdkGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_FALSE(ok); } @@ -526,7 +531,7 @@ TEST_F(ConfigurationParserTest, AndroidSdkGroupAction_NonNumeric) { auto doc = test::BuildXmlDom(StringPrintf(xml, codename, codename)); PostProcessingConfiguration config; - bool ok = android_sdk_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = AndroidSdkGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); ASSERT_EQ(1ul, config.android_sdk_groups.size()); @@ -556,10 +561,10 @@ TEST_F(ConfigurationParserTest, GlTextureGroupAction) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok = gl_texture_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = GlTextureGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); - EXPECT_EQ(1ul, config.gl_texture_groups.size()); + EXPECT_THAT(config.gl_texture_groups, SizeIs(1ul)); ASSERT_EQ(1u, config.gl_texture_groups.count("dxt1")); auto& out = config.gl_texture_groups["dxt1"]; @@ -585,11 +590,10 @@ TEST_F(ConfigurationParserTest, DeviceFeatureGroupAction) { auto doc = test::BuildXmlDom(xml); PostProcessingConfiguration config; - bool ok - = device_feature_group_handler_(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); + bool ok = DeviceFeatureGroupTagHandler(&config, NodeCast<Element>(doc.get()->root.get()), &diag_); ASSERT_TRUE(ok); - EXPECT_EQ(1ul, config.device_feature_groups.size()); + EXPECT_THAT(config.device_feature_groups, SizeIs(1ul)); ASSERT_EQ(1u, config.device_feature_groups.count("low-latency")); auto& out = config.device_feature_groups["low-latency"]; @@ -603,14 +607,14 @@ TEST_F(ConfigurationParserTest, DeviceFeatureGroupAction) { TEST(ArtifactTest, Simple) { StdErrDiagnostics diag; - Artifact x86; + ConfiguredArtifact x86; x86.abi_group = {"x86"}; auto x86_result = x86.ToArtifactName("something.${abi}.apk", "", &diag); ASSERT_TRUE(x86_result); EXPECT_EQ(x86_result.value(), "something.x86.apk"); - Artifact arm; + ConfiguredArtifact arm; arm.abi_group = {"armeabi-v7a"}; { @@ -640,7 +644,7 @@ TEST(ArtifactTest, Simple) { TEST(ArtifactTest, Complex) { StdErrDiagnostics diag; - Artifact artifact; + ConfiguredArtifact artifact; artifact.abi_group = {"mips64"}; artifact.screen_density_group = {"ldpi"}; artifact.device_feature_group = {"df1"}; @@ -686,7 +690,7 @@ TEST(ArtifactTest, Complex) { TEST(ArtifactTest, Missing) { StdErrDiagnostics diag; - Artifact x86; + ConfiguredArtifact x86; x86.abi_group = {"x86"}; EXPECT_FALSE(x86.ToArtifactName("something.${density}.apk", "", &diag)); @@ -697,7 +701,7 @@ TEST(ArtifactTest, Missing) { TEST(ArtifactTest, Empty) { StdErrDiagnostics diag; - Artifact artifact; + ConfiguredArtifact artifact; EXPECT_FALSE(artifact.ToArtifactName("something.${density}.apk", "", &diag)); EXPECT_TRUE(artifact.ToArtifactName("something.apk", "", &diag)); @@ -707,7 +711,7 @@ TEST(ArtifactTest, Empty) { TEST(ArtifactTest, Repeated) { StdErrDiagnostics diag; - Artifact artifact; + ConfiguredArtifact artifact; artifact.screen_density_group = {"mdpi"}; ASSERT_TRUE(artifact.ToArtifactName("something.${density}.apk", "", &diag)); @@ -717,7 +721,7 @@ TEST(ArtifactTest, Repeated) { TEST(ArtifactTest, Nesting) { StdErrDiagnostics diag; - Artifact x86; + ConfiguredArtifact x86; x86.abi_group = {"x86"}; EXPECT_FALSE(x86.ToArtifactName("something.${abi${density}}.apk", "", &diag)); @@ -729,7 +733,7 @@ TEST(ArtifactTest, Nesting) { TEST(ArtifactTest, Recursive) { StdErrDiagnostics diag; - Artifact artifact; + ConfiguredArtifact artifact; artifact.device_feature_group = {"${gl}"}; artifact.gl_texture_group = {"glx1"}; @@ -755,4 +759,6 @@ TEST(ArtifactTest, Recursive) { } } // namespace +} // namespace handler +} // namespace configuration } // namespace aapt diff --git a/tools/aapt2/filter/AbiFilter.cpp b/tools/aapt2/filter/AbiFilter.cpp index cb96235f98f9..9ace82ad4af7 100644 --- a/tools/aapt2/filter/AbiFilter.cpp +++ b/tools/aapt2/filter/AbiFilter.cpp @@ -25,7 +25,7 @@ namespace aapt { std::unique_ptr<AbiFilter> AbiFilter::FromAbiList(const std::vector<configuration::Abi>& abi_list) { std::unordered_set<std::string> abi_set; for (auto& abi : abi_list) { - abi_set.insert(configuration::AbiToString(abi)); + abi_set.insert(configuration::AbiToString(abi).to_string()); } // Make unique by hand as the constructor is private. return std::unique_ptr<AbiFilter>(new AbiFilter(abi_set)); diff --git a/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk index 94686c095bd8..2da294ce88ad 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_PACKAGE_NAME := AaptTestNamespace_App +LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_STATIC_ANDROID_LIBRARIES := \ diff --git a/tools/aapt2/integration-tests/NamespaceTest/App/res/values/values.xml b/tools/aapt2/integration-tests/NamespaceTest/App/res/values/values.xml index 1b80d9542881..174e746e55ce 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/App/res/values/values.xml +++ b/tools/aapt2/integration-tests/NamespaceTest/App/res/values/values.xml @@ -26,4 +26,4 @@ @com.android.aapt.namespace.libtwo:string/public_string </item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk new file mode 100644 index 000000000000..a35f6edd77a5 --- /dev/null +++ b/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk @@ -0,0 +1,28 @@ +# +# 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. +# + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_USE_AAPT2 := true +LOCAL_AAPT_NAMESPACES := true +LOCAL_PACKAGE_NAME := AaptTestNamespace_Split +LOCAL_MODULE_TAGS := tests +LOCAL_SRC_FILES := $(call all-java-files-under,src) +LOCAL_APK_LIBRARIES := AaptTestNamespace_App +LOCAL_RES_LIBRARIES := AaptTestNamespace_App +LOCAL_AAPT_FLAGS := --package-id 0x80 --rename-manifest-package com.android.aapt.namespace.app +include $(BUILD_PACKAGE) diff --git a/tools/aapt2/integration-tests/NamespaceTest/Split/AndroidManifest.xml b/tools/aapt2/integration-tests/NamespaceTest/Split/AndroidManifest.xml new file mode 100644 index 000000000000..bc9583b70ef8 --- /dev/null +++ b/tools/aapt2/integration-tests/NamespaceTest/Split/AndroidManifest.xml @@ -0,0 +1,31 @@ +<?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. +--> + +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.aapt.namespace.split" + featureSplit="split"> + + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/> + + <application> + <activity android:name=".SplitActivity" android:theme="@style/ActivityTheme"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> +</manifest> diff --git a/tools/aapt2/integration-tests/NamespaceTest/Split/res/values/values.xml b/tools/aapt2/integration-tests/NamespaceTest/Split/res/values/values.xml new file mode 100644 index 000000000000..63da5529f757 --- /dev/null +++ b/tools/aapt2/integration-tests/NamespaceTest/Split/res/values/values.xml @@ -0,0 +1,25 @@ +<?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. +--> + +<resources> + <string name="activity_name">Namespace Split</string> + + <style name="ActivityTheme" parent="com.android.aapt.namespace.libone:style/Theme"> + <item name="android:colorPrimary">#FF9800</item> + <item name="android:colorPrimaryDark">#E65100</item> + <item name="android:colorAccent">#FFD180</item> + </style> +</resources> diff --git a/tools/aapt2/integration-tests/NamespaceTest/Split/src/com/android/aapt/namespace/split/SplitActivity.java b/tools/aapt2/integration-tests/NamespaceTest/Split/src/com/android/aapt/namespace/split/SplitActivity.java new file mode 100644 index 000000000000..3fff3cf38dc4 --- /dev/null +++ b/tools/aapt2/integration-tests/NamespaceTest/Split/src/com/android/aapt/namespace/split/SplitActivity.java @@ -0,0 +1,26 @@ +/* + * 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.aapt.namespace.split; + +import android.app.Activity; +import android.os.Bundle; + +public class SplitActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } +} diff --git a/tools/aapt2/optimize/MultiApkGenerator.cpp b/tools/aapt2/optimize/MultiApkGenerator.cpp index e2d738aec5a2..16898d6f3e03 100644 --- a/tools/aapt2/optimize/MultiApkGenerator.cpp +++ b/tools/aapt2/optimize/MultiApkGenerator.cpp @@ -40,33 +40,11 @@ namespace aapt { using ::aapt::configuration::AndroidSdk; -using ::aapt::configuration::Artifact; -using ::aapt::configuration::PostProcessingConfiguration; +using ::aapt::configuration::OutputArtifact; using ::aapt::xml::kSchemaAndroid; using ::aapt::xml::XmlResource; using ::android::StringPiece; -namespace { - -Maybe<AndroidSdk> GetAndroidSdk(const Artifact& artifact, const PostProcessingConfiguration& config, - IDiagnostics* diag) { - if (!artifact.android_sdk_group) { - return {}; - } - - const std::string& group_name = artifact.android_sdk_group.value(); - auto group = config.android_sdk_groups.find(group_name); - // TODO: Remove validation when configuration parser ensures referential integrity. - if (group == config.android_sdk_groups.end()) { - diag->Error(DiagMessage() << "could not find referenced group '" << group_name << "'"); - return {}; - } - - return group->second; -} - -} // namespace - /** * Context wrapper that allows the min Android SDK value to be overridden. */ @@ -115,8 +93,9 @@ class ContextWrapper : public IAaptContext { min_sdk_ = min_sdk; } - void SetSource(const Source& source) { - source_diag_ = util::make_unique<SourcePathDiagnostics>(source, context_->GetDiagnostics()); + void SetSource(const std::string& source) { + source_diag_ = + util::make_unique<SourcePathDiagnostics>(Source{source}, context_->GetDiagnostics()); } private: @@ -142,82 +121,60 @@ MultiApkGenerator::MultiApkGenerator(LoadedApk* apk, IAaptContext* context) bool MultiApkGenerator::FromBaseApk(const MultiApkGeneratorOptions& options) { // TODO(safarmer): Handle APK version codes for the generated APKs. - const PostProcessingConfiguration& config = options.config; - - const std::string& apk_name = file::GetFilename(apk_->GetSource().path).to_string(); - const StringPiece ext = file::GetExtension(apk_name); - const std::string base_name = apk_name.substr(0, apk_name.rfind(ext.to_string())); std::unordered_set<std::string> artifacts_to_keep = options.kept_artifacts; std::unordered_set<std::string> filtered_artifacts; std::unordered_set<std::string> kept_artifacts; // For now, just write out the stripped APK since ABI splitting doesn't modify anything else. - for (const Artifact& artifact : config.artifacts) { - SourcePathDiagnostics diag{{apk_name}, context_->GetDiagnostics()}; - + for (const OutputArtifact& artifact : options.apk_artifacts) { FilterChain filters; - if (!artifact.name && !config.artifact_format) { - diag.Error( - DiagMessage() << "Artifact does not have a name and no global name template defined"); - return false; - } - - Maybe<std::string> maybe_artifact_name = - (artifact.name) ? artifact.Name(apk_name, &diag) - : artifact.ToArtifactName(config.artifact_format.value(), apk_name, &diag); - - if (!maybe_artifact_name) { - diag.Error(DiagMessage() << "Could not determine split APK artifact name"); - return false; - } - - const std::string& artifact_name = maybe_artifact_name.value(); - ContextWrapper wrapped_context{context_}; - wrapped_context.SetSource({artifact_name}); + wrapped_context.SetSource(artifact.name); if (!options.kept_artifacts.empty()) { - const auto& it = artifacts_to_keep.find(artifact_name); + const auto& it = artifacts_to_keep.find(artifact.name); if (it == artifacts_to_keep.end()) { - filtered_artifacts.insert(artifact_name); + filtered_artifacts.insert(artifact.name); if (context_->IsVerbose()) { - context_->GetDiagnostics()->Note(DiagMessage(artifact_name) << "skipping artifact"); + context_->GetDiagnostics()->Note(DiagMessage(artifact.name) << "skipping artifact"); } continue; } else { artifacts_to_keep.erase(it); - kept_artifacts.insert(artifact_name); + kept_artifacts.insert(artifact.name); } } std::unique_ptr<ResourceTable> table = - FilterTable(artifact, config, *apk_->GetResourceTable(), &wrapped_context, &filters); + FilterTable(context_, artifact, *apk_->GetResourceTable(), &filters); if (!table) { return false; } + IDiagnostics* diag = wrapped_context.GetDiagnostics(); + std::unique_ptr<XmlResource> manifest; - if (!UpdateManifest(artifact, config, &manifest, &diag)) { - diag.Error(DiagMessage() << "could not update AndroidManifest.xml for output artifact"); + if (!UpdateManifest(artifact, &manifest, diag)) { + diag->Error(DiagMessage() << "could not update AndroidManifest.xml for output artifact"); return false; } std::string out = options.out_dir; if (!file::mkdirs(out)) { - diag.Warn(DiagMessage() << "could not create out dir: " << out); + diag->Warn(DiagMessage() << "could not create out dir: " << out); } - file::AppendPath(&out, artifact_name); + file::AppendPath(&out, artifact.name); if (context_->IsVerbose()) { - diag.Note(DiagMessage() << "Generating split: " << out); + diag->Note(DiagMessage() << "Generating split: " << out); } - std::unique_ptr<IArchiveWriter> writer = CreateZipFileArchiveWriter(&diag, out); + std::unique_ptr<IArchiveWriter> writer = CreateZipFileArchiveWriter(diag, out); if (context_->IsVerbose()) { - diag.Note(DiagMessage() << "Writing output: " << out); + diag->Note(DiagMessage() << "Writing output: " << out); } filters.AddFilter(util::make_unique<SignatureFilter>()); @@ -254,64 +211,34 @@ bool MultiApkGenerator::FromBaseApk(const MultiApkGeneratorOptions& options) { return true; } -std::unique_ptr<ResourceTable> MultiApkGenerator::FilterTable( - const configuration::Artifact& artifact, - const configuration::PostProcessingConfiguration& config, const ResourceTable& old_table, - IAaptContext* context, FilterChain* filters) { +std::unique_ptr<ResourceTable> MultiApkGenerator::FilterTable(IAaptContext* context, + const OutputArtifact& artifact, + const ResourceTable& old_table, + FilterChain* filters) { TableSplitterOptions splits; AxisConfigFilter axis_filter; ContextWrapper wrapped_context{context}; + wrapped_context.SetSource(artifact.name); - if (artifact.abi_group) { - const std::string& group_name = artifact.abi_group.value(); - - auto group = config.abi_groups.find(group_name); - // TODO: Remove validation when configuration parser ensures referential integrity. - if (group == config.abi_groups.end()) { - context->GetDiagnostics()->Error(DiagMessage() << "could not find referenced ABI group '" - << group_name << "'"); - return {}; - } - filters->AddFilter(AbiFilter::FromAbiList(group->second)); + if (!artifact.abis.empty()) { + filters->AddFilter(AbiFilter::FromAbiList(artifact.abis)); } - if (artifact.screen_density_group) { - const std::string& group_name = artifact.screen_density_group.value(); - - auto group = config.screen_density_groups.find(group_name); - // TODO: Remove validation when configuration parser ensures referential integrity. - if (group == config.screen_density_groups.end()) { - context->GetDiagnostics()->Error(DiagMessage() - << "could not find referenced group '" << group_name << "'"); - return {}; - } - - const std::vector<ConfigDescription>& densities = group->second; - for (const auto& density_config : densities) { + if (!artifact.screen_densities.empty()) { + for (const auto& density_config : artifact.screen_densities) { splits.preferred_densities.push_back(density_config.density); } } - if (artifact.locale_group) { - const std::string& group_name = artifact.locale_group.value(); - auto group = config.locale_groups.find(group_name); - // TODO: Remove validation when configuration parser ensures referential integrity. - if (group == config.locale_groups.end()) { - context->GetDiagnostics()->Error(DiagMessage() - << "could not find referenced group '" << group_name << "'"); - return {}; - } - - const std::vector<ConfigDescription>& locales = group->second; - for (const auto& locale : locales) { + if (!artifact.locales.empty()) { + for (const auto& locale : artifact.locales) { axis_filter.AddConfig(locale); } splits.config_filter = &axis_filter; } - Maybe<AndroidSdk> sdk = GetAndroidSdk(artifact, config, context->GetDiagnostics()); - if (sdk && sdk.value().min_sdk_version) { - wrapped_context.SetMinSdkVersion(sdk.value().min_sdk_version.value()); + if (artifact.android_sdk && artifact.android_sdk.value().min_sdk_version) { + wrapped_context.SetMinSdkVersion(artifact.android_sdk.value().min_sdk_version.value()); } std::unique_ptr<ResourceTable> table = old_table.Clone(); @@ -327,8 +254,7 @@ std::unique_ptr<ResourceTable> MultiApkGenerator::FilterTable( return table; } -bool MultiApkGenerator::UpdateManifest(const Artifact& artifact, - const PostProcessingConfiguration& config, +bool MultiApkGenerator::UpdateManifest(const OutputArtifact& artifact, std::unique_ptr<XmlResource>* updated_manifest, IDiagnostics* diag) { const xml::XmlResource* apk_manifest = apk_->GetManifest(); @@ -367,10 +293,9 @@ bool MultiApkGenerator::UpdateManifest(const Artifact& artifact, versionCode->compiled_value = ResourceUtils::TryParseInt(std::to_string(new_version)); // Check to see if the minSdkVersion needs to be updated. - Maybe<AndroidSdk> maybe_sdk = GetAndroidSdk(artifact, config, diag); - if (maybe_sdk) { + if (artifact.android_sdk) { // TODO(safarmer): Handle the rest of the Android SDK. - const AndroidSdk& android_sdk = maybe_sdk.value(); + const AndroidSdk& android_sdk = artifact.android_sdk.value(); if (xml::Element* uses_sdk_el = manifest_el->FindChild({}, "uses-sdk")) { if (xml::Attribute* min_sdk_attr = @@ -392,10 +317,7 @@ bool MultiApkGenerator::UpdateManifest(const Artifact& artifact, } } - if (artifact.screen_density_group) { - auto densities = config.screen_density_groups.find(artifact.screen_density_group.value()); - CHECK(densities != config.screen_density_groups.end()) << "Missing density group"; - + if (!artifact.screen_densities.empty()) { xml::Element* screens_el = manifest_el->FindChild({}, "compatible-screens"); if (!screens_el) { // create a new element. @@ -408,7 +330,7 @@ bool MultiApkGenerator::UpdateManifest(const Artifact& artifact, screens_el->GetChildElements().clear(); } - for (const auto& density : densities->second) { + for (const auto& density : artifact.screen_densities) { std::unique_ptr<xml::Element> screen_el = util::make_unique<xml::Element>(); screen_el->name = "screen"; const char* density_str = density.toString().string(); diff --git a/tools/aapt2/optimize/MultiApkGenerator.h b/tools/aapt2/optimize/MultiApkGenerator.h index dedb610e1caa..19f64cc0e588 100644 --- a/tools/aapt2/optimize/MultiApkGenerator.h +++ b/tools/aapt2/optimize/MultiApkGenerator.h @@ -20,6 +20,7 @@ #include <memory> #include <string> #include <unordered_set> +#include <vector> #include "Diagnostics.h" #include "LoadedApk.h" @@ -29,7 +30,7 @@ namespace aapt { struct MultiApkGeneratorOptions { std::string out_dir; - configuration::PostProcessingConfiguration config; + std::vector<configuration::OutputArtifact> apk_artifacts; TableFlattenerOptions table_flattener_options; std::unordered_set<std::string> kept_artifacts; }; @@ -49,18 +50,17 @@ class MultiApkGenerator { bool FromBaseApk(const MultiApkGeneratorOptions& options); protected: - virtual std::unique_ptr<ResourceTable> FilterTable( - const configuration::Artifact& artifact, - const configuration::PostProcessingConfiguration& config, const ResourceTable& old_table, - IAaptContext* context, FilterChain* chain); + virtual std::unique_ptr<ResourceTable> FilterTable(IAaptContext* context, + const configuration::OutputArtifact& artifact, + const ResourceTable& old_table, + FilterChain* chain); private: IDiagnostics* GetDiagnostics() { return context_->GetDiagnostics(); } - bool UpdateManifest(const configuration::Artifact& artifact, - const configuration::PostProcessingConfiguration& config, + bool UpdateManifest(const configuration::OutputArtifact& artifact, std::unique_ptr<xml::XmlResource>* updated_manifest, IDiagnostics* diag); LoadedApk* apk_; diff --git a/tools/aapt2/optimize/MultiApkGenerator_test.cpp b/tools/aapt2/optimize/MultiApkGenerator_test.cpp index 2d303e220f8f..e1d951fc9776 100644 --- a/tools/aapt2/optimize/MultiApkGenerator_test.cpp +++ b/tools/aapt2/optimize/MultiApkGenerator_test.cpp @@ -36,8 +36,7 @@ namespace { using ::aapt::configuration::Abi; using ::aapt::configuration::AndroidSdk; -using ::aapt::configuration::Artifact; -using ::aapt::configuration::PostProcessingConfiguration; +using ::aapt::configuration::OutputArtifact; using ::aapt::test::GetValue; using ::aapt::test::GetValueForConfig; using ::aapt::test::ParseConfigOrDie; @@ -48,7 +47,6 @@ using ::testing::NotNull; using ::testing::PrintToString; using ::testing::Return; using ::testing::Test; -using ::testing::_; /** * Subclass the MultiApkGenerator class so that we can access the protected FilterTable method to @@ -60,11 +58,11 @@ class MultiApkGeneratorWrapper : public MultiApkGenerator { : MultiApkGenerator(apk, context) { } - std::unique_ptr<ResourceTable> FilterTable( - const configuration::Artifact& artifact, - const configuration::PostProcessingConfiguration& config, const ResourceTable& old_table, - IAaptContext* context, FilterChain* filter_chain) override { - return MultiApkGenerator::FilterTable(artifact, config, old_table, context, filter_chain); + std::unique_ptr<ResourceTable> FilterTable(IAaptContext* context, + const configuration::OutputArtifact& artifact, + const ResourceTable& old_table, + FilterChain* filter_chain) override { + return MultiApkGenerator::FilterTable(context, artifact, old_table, filter_chain); } }; @@ -108,27 +106,13 @@ TEST_F(MultiApkGeneratorTest, VersionFilterNewerVersion) { LoadedApk apk = {{"test.apk"}, {}, std::move(table), {}}; std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(19).Build(); - PostProcessingConfiguration empty_config; - TableFlattenerOptions table_flattener_options; FilterChain chain; - Artifact x64 = test::ArtifactBuilder() - .SetName("${basename}.${sdk}.apk") - .SetDensityGroup("xhdpi") - .SetAndroidSdk("v23") - .Build(); - - auto config = test::PostProcessingConfigurationBuilder() - .SetLocaleGroup("en", {"en"}) - .SetAbiGroup("x64", {Abi::kX86_64}) - .SetDensityGroup("xhdpi", {"xhdpi"}) - .SetAndroidSdk("v23", AndroidSdk::ForMinSdk(23)) - .AddArtifact(x64) - .Build(); + OutputArtifact artifact = test::ArtifactBuilder().AddDensity(xhdpi_).SetAndroidSdk(23).Build(); MultiApkGeneratorWrapper generator{&apk, ctx.get()}; std::unique_ptr<ResourceTable> split = - generator.FilterTable(x64, config, *apk.GetResourceTable(), ctx.get(), &chain); + generator.FilterTable(ctx.get(), artifact, *apk.GetResourceTable(), &chain); ResourceTable* new_table = split.get(); EXPECT_THAT(ValueForConfig(new_table, mdpi_), IsNull()); @@ -149,27 +133,13 @@ TEST_F(MultiApkGeneratorTest, VersionFilterOlderVersion) { LoadedApk apk = {{"test.apk"}, {}, std::move(table), {}}; std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(1).Build(); - PostProcessingConfiguration empty_config; - TableFlattenerOptions table_flattener_options; FilterChain chain; - Artifact x64 = test::ArtifactBuilder() - .SetName("${basename}.${sdk}.apk") - .SetDensityGroup("xhdpi") - .SetAndroidSdk("v4") - .Build(); - - auto config = test::PostProcessingConfigurationBuilder() - .SetLocaleGroup("en", {"en"}) - .SetAbiGroup("x64", {Abi::kX86_64}) - .SetDensityGroup("xhdpi", {"xhdpi"}) - .SetAndroidSdk("v4", AndroidSdk::ForMinSdk(4)) - .AddArtifact(x64) - .Build(); + OutputArtifact artifact = test::ArtifactBuilder().AddDensity(xhdpi_).SetAndroidSdk(4).Build(); MultiApkGeneratorWrapper generator{&apk, ctx.get()};; std::unique_ptr<ResourceTable> split = - generator.FilterTable(x64, config, *apk.GetResourceTable(), ctx.get(), &chain); + generator.FilterTable(ctx.get(), artifact, *apk.GetResourceTable(), &chain); ResourceTable* new_table = split.get(); EXPECT_THAT(ValueForConfig(new_table, mdpi_), IsNull()); @@ -188,23 +158,13 @@ TEST_F(MultiApkGeneratorTest, VersionFilterNoVersion) { LoadedApk apk = {{"test.apk"}, {}, std::move(table), {}}; std::unique_ptr<IAaptContext> ctx = test::ContextBuilder().SetMinSdkVersion(1).Build(); - PostProcessingConfiguration empty_config; - TableFlattenerOptions table_flattener_options; FilterChain chain; - Artifact x64 = - test::ArtifactBuilder().SetName("${basename}.${sdk}.apk").SetDensityGroup("xhdpi").Build(); - - auto config = test::PostProcessingConfigurationBuilder() - .SetLocaleGroup("en", {"en"}) - .SetAbiGroup("x64", {Abi::kX86_64}) - .SetDensityGroup("xhdpi", {"xhdpi"}) - .AddArtifact(x64) - .Build(); + OutputArtifact artifact = test::ArtifactBuilder().AddDensity(xhdpi_).Build(); MultiApkGeneratorWrapper generator{&apk, ctx.get()}; std::unique_ptr<ResourceTable> split = - generator.FilterTable(x64, config, *apk.GetResourceTable(), ctx.get(), &chain); + generator.FilterTable(ctx.get(), artifact, *apk.GetResourceTable(), &chain); ResourceTable* new_table = split.get(); EXPECT_THAT(ValueForConfig(new_table, mdpi_), IsNull()); diff --git a/tools/aapt2/process/SymbolTable.cpp b/tools/aapt2/process/SymbolTable.cpp index 2d517c76944b..0cfc0bdfaaa6 100644 --- a/tools/aapt2/process/SymbolTable.cpp +++ b/tools/aapt2/process/SymbolTable.cpp @@ -30,7 +30,8 @@ #include "ValueVisitor.h" #include "util/Util.h" -using android::StringPiece; +using ::android::StringPiece; +using ::android::StringPiece16; namespace aapt { @@ -291,11 +292,34 @@ std::unique_ptr<SymbolTable::Symbol> AssetManagerSymbolSource::FindByName( const std::u16string package16 = util::Utf8ToUtf16(name.package); const std::u16string type16 = util::Utf8ToUtf16(to_string(name.type)); const std::u16string entry16 = util::Utf8ToUtf16(name.entry); + const std::u16string mangled_entry16 = + util::Utf8ToUtf16(NameMangler::MangleEntry(name.package, name.entry)); + + uint32_t type_spec_flags; + ResourceId res_id; + + // There can be mangled resources embedded within other packages. Here we will + // look into each package and look-up the mangled name until we find the resource. + const size_t count = table.getBasePackageCount(); + for (size_t i = 0; i < count; i++) { + const android::String16 package_name = table.getBasePackageName(i); + StringPiece16 real_package16 = package16; + StringPiece16 real_entry16 = entry16; + std::u16string scratch_entry16; + if (StringPiece16(package_name) != package16) { + real_entry16 = mangled_entry16; + real_package16 = package_name.string(); + } + + type_spec_flags = 0; + res_id = table.identifierForName(real_entry16.data(), real_entry16.size(), type16.data(), + type16.size(), real_package16.data(), real_package16.size(), + &type_spec_flags); + if (res_id.is_valid()) { + break; + } + } - uint32_t type_spec_flags = 0; - ResourceId res_id = table.identifierForName( - entry16.data(), entry16.size(), type16.data(), type16.size(), - package16.data(), package16.size(), &type_spec_flags); if (!res_id.is_valid()) { return {}; } diff --git a/tools/aapt2/process/SymbolTable_test.cpp b/tools/aapt2/process/SymbolTable_test.cpp index fd8a5080278b..1f59d7034300 100644 --- a/tools/aapt2/process/SymbolTable_test.cpp +++ b/tools/aapt2/process/SymbolTable_test.cpp @@ -16,7 +16,15 @@ #include "process/SymbolTable.h" +#include "SdkConstants.h" +#include "format/binary/TableFlattener.h" #include "test/Test.h" +#include "util/BigBuffer.h" + +using ::testing::Eq; +using ::testing::IsNull; +using ::testing::Ne; +using ::testing::NotNull; namespace aapt { @@ -30,13 +38,13 @@ TEST(ResourceTableSymbolSourceTest, FindSymbols) { .Build(); ResourceTableSymbolSource symbol_source(table.get()); - EXPECT_NE(nullptr, symbol_source.FindByName(test::ParseNameOrDie("android:id/foo"))); - EXPECT_NE(nullptr, symbol_source.FindByName(test::ParseNameOrDie("android:id/bar"))); + EXPECT_THAT(symbol_source.FindByName(test::ParseNameOrDie("android:id/foo")), NotNull()); + EXPECT_THAT(symbol_source.FindByName(test::ParseNameOrDie("android:id/bar")), NotNull()); std::unique_ptr<SymbolTable::Symbol> s = symbol_source.FindByName(test::ParseNameOrDie("android:attr/foo")); - ASSERT_NE(nullptr, s); - EXPECT_NE(nullptr, s->attribute); + ASSERT_THAT(s, NotNull()); + EXPECT_THAT(s->attribute, NotNull()); } TEST(ResourceTableSymbolSourceTest, FindPrivateAttrSymbol) { @@ -49,8 +57,8 @@ TEST(ResourceTableSymbolSourceTest, FindPrivateAttrSymbol) { ResourceTableSymbolSource symbol_source(table.get()); std::unique_ptr<SymbolTable::Symbol> s = symbol_source.FindByName(test::ParseNameOrDie("android:attr/foo")); - ASSERT_NE(nullptr, s); - EXPECT_NE(nullptr, s->attribute); + ASSERT_THAT(s, NotNull()); + EXPECT_THAT(s->attribute, NotNull()); } TEST(SymbolTableTest, FindByName) { @@ -64,8 +72,52 @@ TEST(SymbolTableTest, FindByName) { SymbolTable symbol_table(&mangler); symbol_table.AppendSource(util::make_unique<ResourceTableSymbolSource>(table.get())); - EXPECT_NE(nullptr, symbol_table.FindByName(test::ParseNameOrDie("id/foo"))); - EXPECT_NE(nullptr, symbol_table.FindByName(test::ParseNameOrDie("com.android.lib:id/foo"))); + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("id/foo")), NotNull()); + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("com.android.lib:id/foo")), NotNull()); +} + +TEST(SymbolTableTest, FindByNameWhenSymbolIsMangledInResTable) { + using namespace android; + + std::unique_ptr<IAaptContext> context = + test::ContextBuilder() + .SetCompilationPackage("com.android.app") + .SetPackageId(0x7f) + .SetPackageType(PackageType::kApp) + .SetMinSdkVersion(SDK_LOLLIPOP_MR1) + .SetNameManglerPolicy(NameManglerPolicy{"com.android.app"}) + .Build(); + + // Create a ResourceTable with a mangled resource, simulating a static library being merged into + // the main application package. + std::unique_ptr<ResourceTable> table = + test::ResourceTableBuilder() + .AddSimple("com.android.app:id/" + NameMangler::MangleEntry("com.android.lib", "foo"), + ResourceId(0x7f020000)) + .AddSimple("com.android.app:id/bar", ResourceId(0x7f020001)) + .Build(); + + BigBuffer buffer(1024u); + TableFlattener flattener({}, &buffer); + ASSERT_TRUE(flattener.Consume(context.get(), table.get())); + + std::unique_ptr<uint8_t[]> data = util::Copy(buffer); + + // Construct the test AssetManager. + auto asset_manager_source = util::make_unique<AssetManagerSymbolSource>(); + ResTable& res_table = const_cast<ResTable&>( + asset_manager_source->GetAssetManager()->getResources(false /*required*/)); + ASSERT_THAT(res_table.add(data.get(), buffer.size()), Eq(NO_ERROR)); + + SymbolTable symbol_table(context->GetNameMangler()); + symbol_table.AppendSource(std::move(asset_manager_source)); + + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("com.android.lib:id/foo")), NotNull()); + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("com.android.app:id/bar")), NotNull()); + + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("com.android.app:id/foo")), IsNull()); + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("com.android.lib:id/bar")), IsNull()); + EXPECT_THAT(symbol_table.FindByName(test::ParseNameOrDie("com.android.other:id/foo")), IsNull()); } } // namespace aapt diff --git a/tools/aapt2/test/Builders.cpp b/tools/aapt2/test/Builders.cpp index ecec63f3cf31..88897a8afac3 100644 --- a/tools/aapt2/test/Builders.cpp +++ b/tools/aapt2/test/Builders.cpp @@ -25,7 +25,7 @@ using ::aapt::configuration::Abi; using ::aapt::configuration::AndroidSdk; -using ::aapt::configuration::Artifact; +using ::aapt::configuration::ConfiguredArtifact; using ::aapt::io::StringInputStream; using ::android::StringPiece; @@ -221,72 +221,32 @@ std::unique_ptr<xml::XmlResource> BuildXmlDomForPackageName(IAaptContext* contex return doc; } -PostProcessingConfigurationBuilder& PostProcessingConfigurationBuilder::SetAbiGroup( - const std::string& name, const std::vector<Abi>& abis) { - config_.abi_groups[name] = abis; - return *this; -} - -PostProcessingConfigurationBuilder& PostProcessingConfigurationBuilder::SetLocaleGroup( - const std::string& name, const std::vector<std::string>& locales) { - auto& group = config_.locale_groups[name]; - for (const auto& locale : locales) { - group.push_back(ParseConfigOrDie(locale)); - } - return *this; -} - -PostProcessingConfigurationBuilder& PostProcessingConfigurationBuilder::SetDensityGroup( - const std::string& name, const std::vector<std::string>& densities) { - auto& group = config_.screen_density_groups[name]; - for (const auto& density : densities) { - group.push_back(ParseConfigOrDie(density)); - } - return *this; -} - -PostProcessingConfigurationBuilder& PostProcessingConfigurationBuilder::SetAndroidSdk( - const std::string& name, const AndroidSdk& sdk) { - config_.android_sdk_groups[name] = sdk; - return *this; -} - -PostProcessingConfigurationBuilder& PostProcessingConfigurationBuilder::AddArtifact( - const Artifact& artifact) { - config_.artifacts.push_back(artifact); - return *this; -} - -configuration::PostProcessingConfiguration PostProcessingConfigurationBuilder::Build() { - return config_; -} - ArtifactBuilder& ArtifactBuilder::SetName(const std::string& name) { - artifact_.name = {name}; + artifact_.name = name; return *this; } -ArtifactBuilder& ArtifactBuilder::SetAbiGroup(const std::string& name) { - artifact_.abi_group = {name}; +ArtifactBuilder& ArtifactBuilder::AddAbi(configuration::Abi abi) { + artifact_.abis.push_back(abi); return *this; } -ArtifactBuilder& ArtifactBuilder::SetDensityGroup(const std::string& name) { - artifact_.screen_density_group = {name}; +ArtifactBuilder& ArtifactBuilder::AddDensity(const ConfigDescription& density) { + artifact_.screen_densities.push_back(density); return *this; } -ArtifactBuilder& ArtifactBuilder::SetLocaleGroup(const std::string& name) { - artifact_.locale_group = {name}; +ArtifactBuilder& ArtifactBuilder::AddLocale(const ConfigDescription& locale) { + artifact_.locales.push_back(locale); return *this; } -ArtifactBuilder& ArtifactBuilder::SetAndroidSdk(const std::string& name) { - artifact_.android_sdk_group = {name}; +ArtifactBuilder& ArtifactBuilder::SetAndroidSdk(int min_sdk) { + artifact_.android_sdk = {AndroidSdk::ForMinSdk(min_sdk)}; return *this; } -configuration::Artifact ArtifactBuilder::Build() { +configuration::OutputArtifact ArtifactBuilder::Build() { return artifact_; } diff --git a/tools/aapt2/test/Builders.h b/tools/aapt2/test/Builders.h index 4cdfc33e92e3..2f83b78ffb2a 100644 --- a/tools/aapt2/test/Builders.h +++ b/tools/aapt2/test/Builders.h @@ -25,6 +25,7 @@ #include "ResourceTable.h" #include "ResourceValues.h" #include "configuration/ConfigurationParser.h" +#include "configuration/ConfigurationParser.internal.h" #include "process/IResourceTableConsumer.h" #include "test/Common.h" #include "util/Maybe.h" @@ -154,38 +155,19 @@ std::unique_ptr<xml::XmlResource> BuildXmlDom(const android::StringPiece& str); std::unique_ptr<xml::XmlResource> BuildXmlDomForPackageName(IAaptContext* context, const android::StringPiece& str); -class PostProcessingConfigurationBuilder { - public: - PostProcessingConfigurationBuilder() = default; - - PostProcessingConfigurationBuilder& SetAbiGroup(const std::string& name, - const std::vector<configuration::Abi>& abis); - PostProcessingConfigurationBuilder& SetLocaleGroup(const std::string& name, - const std::vector<std::string>& locales); - PostProcessingConfigurationBuilder& SetDensityGroup(const std::string& name, - const std::vector<std::string>& densities); - PostProcessingConfigurationBuilder& SetAndroidSdk(const std::string& name, - const configuration::AndroidSdk& sdk); - PostProcessingConfigurationBuilder& AddArtifact(const configuration::Artifact& artifact); - configuration::PostProcessingConfiguration Build(); - - private: - configuration::PostProcessingConfiguration config_; -}; - class ArtifactBuilder { public: ArtifactBuilder() = default; ArtifactBuilder& SetName(const std::string& name); - ArtifactBuilder& SetAbiGroup(const std::string& name); - ArtifactBuilder& SetDensityGroup(const std::string& name); - ArtifactBuilder& SetLocaleGroup(const std::string& name); - ArtifactBuilder& SetAndroidSdk(const std::string& name); - configuration::Artifact Build(); + ArtifactBuilder& AddAbi(configuration::Abi abi); + ArtifactBuilder& AddDensity(const ConfigDescription& density); + ArtifactBuilder& AddLocale(const ConfigDescription& locale); + ArtifactBuilder& SetAndroidSdk(int min_sdk); + configuration::OutputArtifact Build(); private: - configuration::Artifact artifact_; + configuration::OutputArtifact artifact_; }; } // namespace test diff --git a/tools/streaming_proto/cpp/main.cpp b/tools/streaming_proto/cpp/main.cpp index 477902065f99..745b3dc51181 100644 --- a/tools/streaming_proto/cpp/main.cpp +++ b/tools/streaming_proto/cpp/main.cpp @@ -85,11 +85,17 @@ should_generate_fields_mapping(const DescriptorProto& message) return message.options().GetExtension(stream_msg).enable_fields_mapping(); } +static inline bool +should_generate_fields_mapping_recursively(const DescriptorProto& message) { + return message.options().GetExtension(stream_msg).enable_fields_mapping_recursively(); +} + static void -write_message(stringstream& text, const DescriptorProto& message, const string& indent) +write_message(stringstream& text, const DescriptorProto& message, const string& indent, bool genMapping) { int N; const string indented = indent + INDENT; + genMapping |= should_generate_fields_mapping_recursively(message); text << indent << "// message " << message.name() << endl; text << indent << "namespace " << message.name() << " {" << endl; @@ -103,7 +109,7 @@ write_message(stringstream& text, const DescriptorProto& message, const string& // Nested classes N = message.nested_type_size(); for (int i=0; i<N; i++) { - write_message(text, message.nested_type(i), indented); + write_message(text, message.nested_type(i), indented, genMapping); } // Fields @@ -112,7 +118,7 @@ write_message(stringstream& text, const DescriptorProto& message, const string& write_field(text, message.field(i), indented); } - if (should_generate_fields_mapping(message)) { + if (genMapping | should_generate_fields_mapping(message)) { N = message.field_size(); text << indented << "const int _FIELD_COUNT = " << N << ";" << endl; text << indented << "const char* _FIELD_NAMES[" << N << "] = {" << endl; @@ -161,7 +167,7 @@ write_header_file(CodeGeneratorResponse* response, const FileDescriptorProto& fi N = file_descriptor.message_type_size(); for (size_t i=0; i<N; i++) { - write_message(text, file_descriptor.message_type(i), ""); + write_message(text, file_descriptor.message_type(i), "", false); } for (vector<string>::iterator it = namespaces.begin(); it != namespaces.end(); it++) { diff --git a/tools/streaming_proto/stream.proto b/tools/streaming_proto/stream.proto index c08120986cc7..e9b24a8a5824 100644 --- a/tools/streaming_proto/stream.proto +++ b/tools/streaming_proto/stream.proto @@ -24,6 +24,9 @@ package android.stream_proto; message MessageOptions { // creates a mapping of field names of the message to its field ids optional bool enable_fields_mapping = 1; + + // creates mapping between field names to its field ids and recursively for its submessages. + optional bool enable_fields_mapping_recursively = 2; } extend google.protobuf.MessageOptions { diff --git a/wifi/java/android/net/wifi/aware/PublishConfig.java b/wifi/java/android/net/wifi/aware/PublishConfig.java index e60f52f88f9e..7a5049d731f1 100644 --- a/wifi/java/android/net/wifi/aware/PublishConfig.java +++ b/wifi/java/android/net/wifi/aware/PublishConfig.java @@ -182,7 +182,7 @@ public final class PublishConfig implements Parcelable { * * @hide */ - public void assertValid(Characteristics characteristics) + public void assertValid(Characteristics characteristics, boolean rttSupported) throws IllegalArgumentException { WifiAwareUtils.validateServiceName(mServiceName); @@ -216,6 +216,10 @@ public final class PublishConfig implements Parcelable { "Match filter longer than supported by device characteristics"); } } + + if (!rttSupported && mEnableRanging) { + throw new IllegalArgumentException("Ranging is not supported"); + } } /** @@ -364,6 +368,9 @@ public final class PublishConfig implements Parcelable { * Optional. Disabled by default - i.e. any peer which attempts to measure distance to this * device will be refused. If the peer has ranging enabled (using the * {@link SubscribeConfig} APIs listed above, it will never discover this device. + * <p> + * The device must support Wi-Fi RTT for this feature to be used. Feature support is checked + * as described in {@link android.net.wifi.rtt}. * * @param enable If true, ranging is supported on request of the peer. * diff --git a/wifi/java/android/net/wifi/aware/SubscribeConfig.java b/wifi/java/android/net/wifi/aware/SubscribeConfig.java index f6552a767f4f..91f8e5207357 100644 --- a/wifi/java/android/net/wifi/aware/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/aware/SubscribeConfig.java @@ -224,7 +224,7 @@ public final class SubscribeConfig implements Parcelable { * * @hide */ - public void assertValid(Characteristics characteristics) + public void assertValid(Characteristics characteristics, boolean rttSupported) throws IllegalArgumentException { WifiAwareUtils.validateServiceName(mServiceName); @@ -269,6 +269,10 @@ public final class SubscribeConfig implements Parcelable { throw new IllegalArgumentException( "Maximum distance must be greater than minimum distance"); } + + if (!rttSupported && (mMinDistanceMmSet || mMaxDistanceMmSet)) { + throw new IllegalArgumentException("Ranging is not supported"); + } } /** @@ -422,6 +426,9 @@ public final class SubscribeConfig implements Parcelable { * peer must enable ranging using * {@link PublishConfig.Builder#setRangingEnabled(boolean)}. Otherwise discovery will * never be triggered. + * <p> + * The device must support Wi-Fi RTT for this feature to be used. Feature support is checked + * as described in {@link android.net.wifi.rtt}. * * @param minDistanceMm Minimum distance, in mm, to the publisher above which to trigger * discovery. @@ -450,6 +457,9 @@ public final class SubscribeConfig implements Parcelable { * peer must enable ranging using * {@link PublishConfig.Builder#setRangingEnabled(boolean)}. Otherwise discovery will * never be triggered. + * <p> + * The device must support Wi-Fi RTT for this feature to be used. Feature support is checked + * as described in {@link android.net.wifi.rtt}. * * @param maxDistanceMm Maximum distance, in mm, to the publisher below which to trigger * discovery. |