diff options
473 files changed, 8917 insertions, 10123 deletions
diff --git a/Android.bp b/Android.bp index fd6f8258fd27..dda318b38d0d 100644 --- a/Android.bp +++ b/Android.bp @@ -25,8 +25,8 @@ // // READ ME: ######################################################## -java_library { - name: "framework", +java_defaults { + name: "framework-defaults", installable: true, srcs: [ @@ -476,6 +476,8 @@ java_library { "media/java/android/media/tv/ITvRemoteServiceInput.aidl", "media/java/android/service/media/IMediaBrowserService.aidl", "media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl", + "telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl", + "telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl", "telecomm/java/com/android/internal/telecom/ICallScreeningAdapter.aidl", "telecomm/java/com/android/internal/telecom/ICallScreeningService.aidl", "telecomm/java/com/android/internal/telecom/IVideoCallback.aidl", @@ -488,6 +490,8 @@ java_library { "telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl", "telephony/java/android/telephony/data/IDataService.aidl", "telephony/java/android/telephony/data/IDataServiceCallback.aidl", + "telephony/java/android/telephony/data/IQualifiedNetworksService.aidl", + "telephony/java/android/telephony/data/IQualifiedNetworksServiceCallback.aidl", "telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl", "telephony/java/android/telephony/ims/aidl/IImsCapabilityCallback.aidl", "telephony/java/android/telephony/ims/aidl/IImsConfig.aidl", @@ -691,12 +695,38 @@ java_library { "libmedia2_jni", ], - javac_shard_size: 150, - dxflags: [ "--core-library", "--multi-dex", ], + +} + +java_library { + name: "framework", + defaults: ["framework-defaults"], + javac_shard_size: 150, +} + +java_library { + name: "framework-annotation-proc", + defaults: ["framework-defaults"], + // Use UsedByApps annotation processor + annotation_processors: ["unsupportedappusage-annotation-processor"], + // b/25860419: annotation processors must be explicitly specified for grok + annotation_processor_classes: [ + "android.processor.unsupportedappusage.UsedByAppsProcessor", + ], +} + +// A host library including just UnsupportedAppUsage.java so that the annotation +// processor can also use this annotation. +java_library_host { + name: "unsupportedappusage-annotation", + srcs: [ + "core/java/android/annotation/IntDef.java", + "core/java/android/annotation/UnsupportedAppUsage.java", + ], } // A temporary build target that is conditionally included on the bootclasspath if @@ -1169,6 +1199,48 @@ doc_defaults { create_stubs: false, } +metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + + "--hide-package com.android.okhttp " + + "--hide-package com.android.org.conscrypt --hide-package com.android.server " + + "--hide RequiresPermission " + + "--hide MissingPermission --hide BroadcastBehavior " + + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo" + +doc_defaults { + name: "metalava-api-stubs-default", + srcs: [ + ":opt-telephony-srcs", + ":opt-net-voip-srcs", + ":openjdk_javadoc_files", + ":non_openjdk_javadoc_files", + ":android_icu4j_src_files_for_docs", + ], + srcs_lib: "framework", + srcs_lib_whitelist_dirs: frameworks_base_subdirs, + srcs_lib_whitelist_pkgs: packages_to_document, + libs: [ + "core-oj", + "core-libart", + "conscrypt", + "bouncycastle", + "okhttp", + "ext", + "framework", + "voip-common", + "android.test.mock", + ], + local_sourcepaths: frameworks_base_subdirs, + installable: false, + metalava_enabled: true, + metalava_annotations_enabled: true, + metalava_previous_api: ":last-released-public-api", + metalava_merge_annotations_dirs: [ + "metalava-manual", + "ojluni-annotated-stubs", + ], +} + droiddoc { name: "doc-comment-check-docs", defaults: ["framework-docs-default"], @@ -1396,26 +1468,21 @@ java_library_static { } droiddoc { - name: "hiddenapi-lists", - defaults: ["api-stubs-default"], + name: "hiddenapi-lists-docs", + defaults: ["metalava-api-stubs-default"], arg_files: [ "core/res/AndroidManifest.xml", - ":api-version-xml", - "core/java/overview.html", - ":current-support-api", - "api/current.txt", ], dex_api_filename: "public-dex.txt", private_dex_api_filename: "private-dex.txt", removed_dex_api_filename: "removed-dex.txt", - args: framework_docs_args + - " -referenceonly" + - " -nodocs" + - " -showUnannotated" + - " -showAnnotation android.annotation.SystemApi" + - " -showAnnotation android.annotation.TestApi", + args: metalava_framework_docs_args + + " --show-unannotated " + + " --show-annotation android.annotation.SystemApi " + + " --show-annotation android.annotation.TestApi " } + droiddoc { name: "hiddenapi-mappings", defaults: ["api-stubs-default"], @@ -1459,48 +1526,6 @@ filegroup { ], } -metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + - "--hide-package com.android.okhttp " + - "--hide-package com.android.org.conscrypt --hide-package com.android.server " + - "--hide RequiresPermission " + - "--hide MissingPermission --hide BroadcastBehavior " + - "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + - "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo" - -doc_defaults { - name: "metalava-api-stubs-default", - srcs: [ - ":opt-telephony-srcs", - ":opt-net-voip-srcs", - ":openjdk_javadoc_files", - ":non_openjdk_javadoc_files", - ":android_icu4j_src_files_for_docs", - ], - srcs_lib: "framework", - srcs_lib_whitelist_dirs: frameworks_base_subdirs, - srcs_lib_whitelist_pkgs: packages_to_document, - libs: [ - "core-oj", - "core-libart", - "conscrypt", - "bouncycastle", - "okhttp", - "ext", - "framework", - "voip-common", - "android.test.mock", - ], - local_sourcepaths: frameworks_base_subdirs, - installable: false, - metalava_enabled: true, - metalava_annotations_enabled: true, - metalava_previous_api: ":last-released-public-api", - metalava_merge_annotations_dirs: [ - "metalava-manual", - "ojluni-annotated-stubs", - ], -} - droiddoc { name: "api-stubs-docs", defaults: ["metalava-api-stubs-default"], @@ -1516,6 +1541,10 @@ droiddoc { api_file: "api/current.txt", removed_api_file: "api/removed.txt", }, + last_released: { + api_file: ":last-released-public-api", + removed_api_file: "api/removed.txt", + }, }, } @@ -1536,6 +1565,10 @@ droiddoc { api_file: "api/system-current.txt", removed_api_file: "api/system-removed.txt", }, + last_released: { + api_file: ":last-released-system-api", + removed_api_file: "api/system-removed.txt", + }, }, } diff --git a/Android.mk b/Android.mk index 29454e4ae304..988c009bdbac 100644 --- a/Android.mk +++ b/Android.mk @@ -322,119 +322,34 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip ( unzip -qo $< -d $(OUT_DOCS)/offline-sdk && touch -f $@ ) || exit 1 # ==== hiddenapi lists ======================================= -include $(CLEAR_VARS) - -# File names of final API lists -LOCAL_LIGHT_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) -LOCAL_DARK_GREYLIST := $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) -LOCAL_BLACKLIST := $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) - -# File names of source files we will use to generate the final API lists. -LOCAL_SRC_GREYLIST := frameworks/base/config/hiddenapi-light-greylist.txt -LOCAL_SRC_VENDOR_LIST := frameworks/base/config/hiddenapi-vendor-list.txt -LOCAL_SRC_FORCE_BLACKLIST := frameworks/base/config/hiddenapi-force-blacklist.txt -LOCAL_SRC_PUBLIC_API := $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) -LOCAL_SRC_PRIVATE_API := $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) -LOCAL_SRC_REMOVED_API := $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) - -LOCAL_SRC_ALL := \ - $(LOCAL_SRC_GREYLIST) \ - $(LOCAL_SRC_VENDOR_LIST) \ - $(LOCAL_SRC_FORCE_BLACKLIST) \ - $(LOCAL_SRC_PUBLIC_API) \ - $(LOCAL_SRC_PRIVATE_API) \ - $(LOCAL_SRC_REMOVED_API) - -define assert-has-no-overlap -if [ ! -z "`comm -12 <(sort $(1)) <(sort $(2))`" ]; then \ - echo "$(1) and $(2) should not overlap" 1>&2; \ - comm -12 <(sort $(1)) <(sort $(2)) 1>&2; \ - exit 1; \ -fi -endef - -define assert-is-subset -if [ ! -z "`comm -23 <(sort $(1)) <(sort $(2))`" ]; then \ - echo "$(1) must be a subset of $(2)" 1>&2; \ - comm -23 <(sort $(1)) <(sort $(2)) 1>&2; \ - exit 1; \ -fi -endef - -define assert-has-no-duplicates -if [ ! -z "`sort $(1) | uniq -D`" ]; then \ - echo "$(1) has duplicate entries" 1>&2; \ - sort $(1) | uniq -D 1>&2; \ - exit 1; \ -fi -endef - -# The following rules build API lists in the build folder. -# By not using files from the source tree, ART buildbots can mock these lists -# or have alternative rules for building them. Other rules in the build system -# should depend on the files in the build folder. - -# Merge light greylist from multiple files: -# (1) manual greylist LOCAL_SRC_GREYLIST -# (2) list of usages from vendor apps LOCAL_SRC_VENDOR_LIST -# (3) list of removed APIs in LOCAL_SRC_REMOVED_API -# @removed does not imply private in Doclava. We must take the subset also -# in LOCAL_SRC_PRIVATE_API. -# (4) list of serialization APIs -# Automatically adds all methods which match the signatures in -# REGEX_SERIALIZATION. These are greylisted in order to allow applications -# to write their own serializers. -$(LOCAL_LIGHT_GREYLIST): REGEX_SERIALIZATION := \ - "readObject\(Ljava/io/ObjectInputStream;\)V" \ - "readObjectNoData\(\)V" \ - "readResolve\(\)Ljava/lang/Object;" \ - "serialVersionUID:J" \ - "serialPersistentFields:\[Ljava/io/ObjectStreamField;" \ - "writeObject\(Ljava/io/ObjectOutputStream;\)V" \ - "writeReplace\(\)Ljava/lang/Object;" -$(LOCAL_LIGHT_GREYLIST): $(LOCAL_SRC_ALL) - sort $(LOCAL_SRC_GREYLIST) $(LOCAL_SRC_VENDOR_LIST) $(PRIVATE_GREYLIST_INPUTS) \ - <(grep -E "\->("$(subst $(space),"|",$(REGEX_SERIALIZATION))")$$" \ - $(LOCAL_SRC_PRIVATE_API)) \ - <(comm -12 <(sort $(LOCAL_SRC_REMOVED_API)) <(sort $(LOCAL_SRC_PRIVATE_API))) \ - > $@ - $(call assert-has-no-duplicates,$@) - $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API)) - $(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST)) - -# Generate dark greylist as remaining classes and class members in the same -# package as classes listed in the light greylist. -# The algorithm is as follows: -# (1) extract the class descriptor from each entry in LOCAL_LIGHT_GREYLIST -# (2) strip everything after the last forward-slash, -# e.g. 'Lpackage/subpackage/class$inner;' turns into 'Lpackage/subpackage/' -# (3) insert all entries from LOCAL_SRC_PRIVATE_API which begin with the package -# name but do not contain another forward-slash in the class name, e.g. -# matching '^Lpackage/subpackage/[^/;]*;' -# (4) subtract entries shared with LOCAL_LIGHT_GREYLIST -$(LOCAL_DARK_GREYLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) - comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_SRC_FORCE_BLACKLIST)) \ - <(cat $(LOCAL_SRC_PUBLIC_API) $(LOCAL_LIGHT_GREYLIST) | \ - sed 's/\->.*//' | sed 's/\(.*\/\).*/\1/' | sort | uniq | \ - while read PKG_NAME; do \ - grep -E "^$${PKG_NAME}[^/;]*;" $(LOCAL_SRC_PRIVATE_API); \ - done | sort | uniq) \ - > $@ - $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API)) - $(call assert-has-no-duplicates,$@) - $(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST)) - $(call assert-has-no-overlap,$@,$(LOCAL_SRC_FORCE_BLACKLIST)) - -# Generate blacklist as private API minus (light greylist plus dark greylist). -$(LOCAL_BLACKLIST): $(LOCAL_SRC_ALL) $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST) - comm -13 <(sort $(LOCAL_LIGHT_GREYLIST) $(LOCAL_DARK_GREYLIST)) \ - <(sort $(LOCAL_SRC_PRIVATE_API)) \ - > $@ - $(call assert-is-subset,$@,$(LOCAL_SRC_PRIVATE_API)) - $(call assert-has-no-duplicates,$@) - $(call assert-has-no-overlap,$@,$(LOCAL_LIGHT_GREYLIST)) - $(call assert-has-no-overlap,$@,$(LOCAL_DARK_GREYLIST)) - $(call assert-is-subset,$(LOCAL_SRC_FORCE_BLACKLIST),$@) +$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ + .KATI_IMPLICIT_OUTPUTS := \ + $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) +$(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ + frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \ + frameworks/base/config/hiddenapi-light-greylist.txt \ + frameworks/base/config/hiddenapi-vendor-list.txt \ + frameworks/base/config/hiddenapi-force-blacklist.txt \ + $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ + $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ + $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) + frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \ + --input-public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ + --input-private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ + --input-whitelists $(PRIVATE_WHITELIST_INPUTS) \ + --input-greylists \ + frameworks/base/config/hiddenapi-light-greylist.txt \ + frameworks/base/config/hiddenapi-vendor-list.txt \ + <(comm -12 <(sort $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)) \ + $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)) \ + $(PRIVATE_GREYLIST_INPUTS) \ + --input-blacklists frameworks/base/config/hiddenapi-force-blacklist.txt \ + --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST) \ + --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ + --output-dark-greylist $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ + --output-blacklist $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) # Include subdirectory makefiles # ============================================================ diff --git a/api/current.txt b/api/current.txt index f7ec2fb59de5..6a70b14c1afd 100644..100755 --- a/api/current.txt +++ b/api/current.txt @@ -8689,6 +8689,8 @@ package android.bluetooth.le { method public byte[] getServiceData(); method public byte[] getServiceDataMask(); method public android.os.ParcelUuid getServiceDataUuid(); + method public android.os.ParcelUuid getServiceSolicitationUuid(); + method public android.os.ParcelUuid getServiceSolicitationUuidMask(); method public android.os.ParcelUuid getServiceUuid(); method public android.os.ParcelUuid getServiceUuidMask(); method public boolean matches(android.bluetooth.le.ScanResult); @@ -8705,6 +8707,8 @@ package android.bluetooth.le { method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]); method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]); method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]); + method public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(android.os.ParcelUuid); + method public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(android.os.ParcelUuid, android.os.ParcelUuid); method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid); method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid); } @@ -8717,6 +8721,7 @@ package android.bluetooth.le { method public byte[] getManufacturerSpecificData(int); method public java.util.Map<android.os.ParcelUuid, byte[]> getServiceData(); method public byte[] getServiceData(android.os.ParcelUuid); + method public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids(); method public java.util.List<android.os.ParcelUuid> getServiceUuids(); method public int getTxPowerLevel(); } @@ -32229,6 +32234,7 @@ package android.os { field public static final int O = 26; // 0x1a field public static final int O_MR1 = 27; // 0x1b field public static final int P = 28; // 0x1c + field public static final int Q = 10000; // 0x2710 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { @@ -37163,7 +37169,7 @@ package android.provider { field public static final int RESULT_SMS_HANDLED = 1; // 0x1 field public static final int RESULT_SMS_OUT_OF_MEMORY = 3; // 0x3 field public static final int RESULT_SMS_UNSUPPORTED = 4; // 0x4 - field public static final java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE"; + field public static final deprecated java.lang.String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE"; field public static final java.lang.String SIM_FULL_ACTION = "android.provider.Telephony.SIM_FULL"; field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED"; field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER"; @@ -40893,6 +40899,16 @@ package android.telecom { field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5 } + public abstract class CallRedirectionService extends android.app.Service { + ctor public CallRedirectionService(); + method public final void cancelCall(); + method public android.os.IBinder onBind(android.content.Intent); + method public abstract void onPlaceCall(android.net.Uri, android.telecom.PhoneAccountHandle); + method public final void placeCallUnmodified(); + method public final void redirectCall(android.net.Uri, android.telecom.PhoneAccountHandle); + field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.CallRedirectionService"; + } + public abstract class CallScreeningService extends android.app.Service { ctor public CallScreeningService(); method public android.os.IBinder onBind(android.content.Intent); @@ -41689,9 +41705,14 @@ package android.telephony { field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool"; field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool"; field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool"; + field public static final java.lang.String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool"; + field public static final java.lang.String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = "call_barring_supports_password_change_bool"; + field public static final java.lang.String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool"; field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array"; field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool"; field public static final java.lang.String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings"; + field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int"; + field public static final java.lang.String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int"; field public static final java.lang.String KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL = "carrier_force_disable_etws_cmas_test_bool"; field public static final java.lang.String KEY_CARRIER_IMS_GBA_REQUIRED_BOOL = "carrier_ims_gba_required_bool"; field public static final java.lang.String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL = "carrier_instant_lettering_available_bool"; @@ -41789,9 +41810,10 @@ package android.telephony { field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array"; field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool"; field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool"; + field public static final java.lang.String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY = "radio_restart_failure_causes_int_array"; field public static final java.lang.String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string"; field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool"; - field public static final java.lang.String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = "restart_radio_on_pdp_fail_regular_deactivation_bool"; + field public static final deprecated java.lang.String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = "restart_radio_on_pdp_fail_regular_deactivation_bool"; field public static final java.lang.String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool"; field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool"; field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool"; @@ -42546,6 +42568,7 @@ package android.telephony { method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String); method public boolean isConcurrentVoiceAndDataSupported(); method public boolean isDataEnabled(); + method public boolean isDataRoamingEnabled(); method public boolean isHearingAidCompatibilitySupported(); method public boolean isNetworkRoaming(); method public boolean isSmsCapable(); @@ -42572,6 +42595,7 @@ package android.telephony { 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_SECRET_CODE = "android.telephony.action.SECRET_CODE"; 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 @@ -45239,6 +45263,7 @@ package android.util { field public static final int DENSITY_420 = 420; // 0x1a4 field public static final int DENSITY_440 = 440; // 0x1b8 field public static final int DENSITY_560 = 560; // 0x230 + field public static final int DENSITY_600 = 600; // 0x258 field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_DEVICE_STABLE; field public static final int DENSITY_HIGH = 240; // 0xf0 diff --git a/api/system-current.txt b/api/system-current.txt index 859ee98fc121..1df9a466ddc7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5262,16 +5262,17 @@ package android.telephony { method public boolean handlePinMmi(java.lang.String); method public boolean handlePinMmiForSubscriber(int, java.lang.String); method public boolean isDataConnectivityPossible(); - method public boolean isIdle(); - method public boolean isOffhook(); - method public boolean isRadioOn(); - method public boolean isRinging(); + method public deprecated boolean isIdle(); + method public deprecated boolean isOffhook(); + method public deprecated boolean isRadioOn(); + method public deprecated boolean isRinging(); method public boolean isVideoCallingEnabled(); method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle); method public boolean needsOtaServiceProvisioning(); method public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>); method public void setDataActivationState(int); method public deprecated void setDataEnabled(int, boolean); + method public void setDataRoamingEnabled(boolean); method public boolean setRadio(boolean); method public boolean setRadioPower(boolean); method public void setSimPowerState(int); @@ -5426,6 +5427,19 @@ package android.telephony.data { field public static final int RESULT_SUCCESS = 0; // 0x0 } + public abstract class QualifiedNetworksService extends android.app.Service { + ctor public QualifiedNetworksService(); + method public abstract android.telephony.data.QualifiedNetworksService.NetworkAvailabilityUpdater createNetworkAvailabilityUpdater(int); + field public static final java.lang.String QUALIFIED_NETWORKS_SERVICE_INTERFACE = "android.telephony.data.QualifiedNetworksService"; + } + + public abstract class QualifiedNetworksService.NetworkAvailabilityUpdater implements java.lang.AutoCloseable { + ctor public QualifiedNetworksService.NetworkAvailabilityUpdater(int); + method public abstract void close(); + method public final int getSlotIndex(); + method public final void updateQualifiedNetworkTypes(int, int[]); + } + } package android.telephony.euicc { @@ -5776,6 +5790,7 @@ package android.telephony.ims { field public static final int CODE_NETWORK_DETACH = 1513; // 0x5e9 field public static final int CODE_NETWORK_REJECT = 1504; // 0x5e0 field public static final int CODE_NETWORK_RESP_TIMEOUT = 1503; // 0x5df + field public static final int CODE_NO_CSFB_IN_CS_ROAM = 1516; // 0x5ec field public static final int CODE_NO_VALID_SIM = 1501; // 0x5dd field public static final int CODE_OEM_CAUSE_1 = 61441; // 0xf001 field public static final int CODE_OEM_CAUSE_10 = 61450; // 0xf00a @@ -5844,6 +5859,7 @@ package android.telephony.ims { field public static final int CODE_SIP_SERVER_TIMEOUT = 353; // 0x161 field public static final int CODE_SIP_SERVICE_UNAVAILABLE = 352; // 0x160 field public static final int CODE_SIP_TEMPRARILY_UNAVAILABLE = 336; // 0x150 + field public static final int CODE_SIP_USER_MARKED_UNWANTED = 365; // 0x16d field public static final int CODE_SIP_USER_REJECTED = 361; // 0x169 field public static final int CODE_SUPP_SVC_CANCELLED = 1202; // 0x4b2 field public static final int CODE_SUPP_SVC_FAILED = 1201; // 0x4b1 @@ -6085,6 +6101,10 @@ package android.telephony.ims.feature { field public static final int STATE_UNAVAILABLE = 0; // 0x0 } + public static class ImsFeature.Capabilities { + field protected int mCapabilities; + } + protected static class ImsFeature.CapabilityCallbackProxy { method public void onChangeCapabilityConfigurationError(int, int, int); } diff --git a/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp b/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp index 0615c74b8d64..2a89c920c119 100644 --- a/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp +++ b/cmds/incident_helper/src/parsers/PageTypeInfoParser.cpp @@ -75,18 +75,13 @@ PageTypeInfoParser::Parse(const int in, const int out) const } else return BAD_VALUE; // expect part 2 starts with "type" if (stripPrefix(&record[2], "type")) { - // expect the rest of part 2 has number of (pageBlockOrder + 2) parts // An example looks like: // header line: type 0 1 2 3 4 5 6 7 8 9 10 // record line: Unmovable 426 279 226 1 1 1 0 0 2 2 0 - // The pageBlockOrder = 10 and it's zero-indexed. so total parts - // are 10 + 1(zero-indexed) + 1(the type part) = 12. record_t pageCounts = parseRecord(record[2]); - int pageCountsSize = pageBlockOrder + 2; - if ((int)pageCounts.size() != pageCountsSize) return BAD_VALUE; proto.write(PageTypeInfoProto::MigrateType::TYPE, pageCounts[0]); - for (auto i=1; i<pageCountsSize; i++) { + for (size_t i=1; i<pageCounts.size(); i++) { proto.write(PageTypeInfoProto::MigrateType::FREE_PAGES_COUNT, toInt(pageCounts[i])); } } else return BAD_VALUE; @@ -125,4 +120,4 @@ PageTypeInfoParser::Parse(const int in, const int out) const fprintf(stderr, "[%s]Proto size: %zu bytes\n", this->name.string(), proto.size()); return NO_ERROR; -}
\ No newline at end of file +} diff --git a/cmds/incident_helper/testdata/pagetypeinfo.txt b/cmds/incident_helper/testdata/pagetypeinfo.txt index d45ddc408c0f..c65b5a1fa1e1 100644 --- a/cmds/incident_helper/testdata/pagetypeinfo.txt +++ b/cmds/incident_helper/testdata/pagetypeinfo.txt @@ -1,5 +1,5 @@ -Page block order: 10 -Pages per block: 1024 +Page block order: 9 +Pages per block: 512 Free pages count per migrate type at order 0 1 2 3 4 5 6 7 8 9 10 Node 0, zone DMA, type Unmovable 426 279 226 1 1 1 0 0 2 2 0 diff --git a/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp b/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp index 9bad7be4a07e..5688681e45fd 100644 --- a/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp +++ b/cmds/incident_helper/tests/PageTypeInfoParser_test.cpp @@ -54,8 +54,8 @@ TEST_F(PageTypeInfoParserTest, Success) { PageTypeInfoParser parser; PageTypeInfoProto expected; - expected.set_page_block_order(10); - expected.set_pages_per_block(1024); + expected.set_page_block_order(9); + expected.set_pages_per_block(512); PageTypeInfoProto::MigrateType* mt1 = expected.add_migrate_types(); mt1->set_node(0); diff --git a/cmds/statsd/src/external/Perfetto.cpp b/cmds/statsd/src/external/Perfetto.cpp index 05544837b752..c1f9a643e153 100644 --- a/cmds/statsd/src/external/Perfetto.cpp +++ b/cmds/statsd/src/external/Perfetto.cpp @@ -105,9 +105,9 @@ bool CollectPerfettoTraceAndUploadToDropbox(const PerfettoDetails& config, readPipe.reset(); // Close the read end (owned by the child process). - // Using fopen() because fwrite() has the right logic to chunking write() + // Using fdopen() because fwrite() has the right logic to chunking write() // over a pipe (see __sfvwrite()). - FILE* writePipeStream = fdopen(writePipe.get(), "wb"); + FILE* writePipeStream = android::base::Fdopen(std::move(writePipe), "wb"); if (!writePipeStream) { ALOGE("fdopen() failed while calling the Perfetto client: %s", strerror(errno)); return false; diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt index a78773692ef3..9ca0745c04f4 100644 --- a/config/boot-image-profile.txt +++ b/config/boot-image-profile.txt @@ -12204,11 +12204,11 @@ HPLorg/json/JSONStringer;->value(J)Lorg/json/JSONStringer; HPLorg/json/JSONStringer;->value(Z)Lorg/json/JSONStringer; HPLorg/json/JSONTokener;->syntaxError(Ljava/lang/String;)Lorg/json/JSONException; HPLorg/json/JSONTokener;->toString()Ljava/lang/String; -HPLorg/kxml2/io/KXmlSerializer;->getDepth()I -HPLorg/kxml2/io/KXmlSerializer;->getNamespace()Ljava/lang/String; -HPLorg/kxml2/io/KXmlSerializer;->getPrefix(Ljava/lang/String;ZZ)Ljava/lang/String; -HPLorg/kxml2/io/KXmlSerializer;->setPrefix(Ljava/lang/String;Ljava/lang/String;)V -HPLorg/kxml2/io/KXmlSerializer;->text(Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; +HPLcom/android/org/kxml2/io/KXmlSerializer;->getDepth()I +HPLcom/android/org/kxml2/io/KXmlSerializer;->getNamespace()Ljava/lang/String; +HPLcom/android/org/kxml2/io/KXmlSerializer;->getPrefix(Ljava/lang/String;ZZ)Ljava/lang/String; +HPLcom/android/org/kxml2/io/KXmlSerializer;->setPrefix(Ljava/lang/String;Ljava/lang/String;)V +HPLcom/android/org/kxml2/io/KXmlSerializer;->text(Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; HPLorg/w3c/dom/NamedNodeMap;->getLength()I HPLorg/w3c/dom/NamedNodeMap;->getNamedItem(Ljava/lang/String;)Lorg/w3c/dom/Node; HPLorg/w3c/dom/NamedNodeMap;->getNamedItemNS(Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Node; @@ -51896,7 +51896,7 @@ HSPLorg/apache/harmony/xml/dom/NodeListImpl;->item(I)Lorg/w3c/dom/Node; HSPLorg/apache/harmony/xml/dom/TextImpl;->getNodeType()S HSPLorg/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl;->newDocumentBuilder()Ljavax/xml/parsers/DocumentBuilder; HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->appendText(Lorg/apache/harmony/xml/dom/DocumentImpl;Lorg/w3c/dom/Node;ILjava/lang/String;)V -HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->parse(Lorg/kxml2/io/KXmlParser;Lorg/apache/harmony/xml/dom/DocumentImpl;Lorg/w3c/dom/Node;I)V +HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->parse(Lcom/android/org/kxml2/io/KXmlParser;Lorg/apache/harmony/xml/dom/DocumentImpl;Lorg/w3c/dom/Node;I)V HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->parse(Lorg/xml/sax/InputSource;)Lorg/w3c/dom/Document; HSPLorg/apache/harmony/xml/parsers/SAXParserFactoryImpl;->getFeature(Ljava/lang/String;)Z HSPLorg/apache/harmony/xml/parsers/SAXParserFactoryImpl;->isValidating()Z @@ -52176,64 +52176,64 @@ HSPLorg/json/JSONTokener;->readEscapeCharacter()C HSPLorg/json/JSONTokener;->readLiteral()Ljava/lang/Object; HSPLorg/json/JSONTokener;->readObject()Lorg/json/JSONObject; HSPLorg/json/JSONTokener;->skipToEndOfLine()V -HSPLorg/kxml2/io/KXmlParser$ValueContext;-><init>(Ljava/lang/String;I)V -HSPLorg/kxml2/io/KXmlParser;-><init>()V -HSPLorg/kxml2/io/KXmlParser;->adjustNsp()Z -HSPLorg/kxml2/io/KXmlParser;->close()V -HSPLorg/kxml2/io/KXmlParser;->fillBuffer(I)Z -HSPLorg/kxml2/io/KXmlParser;->getAttributeCount()I -HSPLorg/kxml2/io/KXmlParser;->getAttributeName(I)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getAttributeNamespace(I)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getAttributePrefix(I)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getAttributeType(I)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getAttributeValue(I)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getAttributeValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getColumnNumber()I -HSPLorg/kxml2/io/KXmlParser;->getDepth()I -HSPLorg/kxml2/io/KXmlParser;->getEventType()I -HSPLorg/kxml2/io/KXmlParser;->getFeature(Ljava/lang/String;)Z -HSPLorg/kxml2/io/KXmlParser;->getLineNumber()I -HSPLorg/kxml2/io/KXmlParser;->getName()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getNamespace()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getNamespace(Ljava/lang/String;)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getNamespaceCount(I)I -HSPLorg/kxml2/io/KXmlParser;->getPositionDescription()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getPrefix()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getText()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->getTextCharacters([I)[C -HSPLorg/kxml2/io/KXmlParser;->next()I -HSPLorg/kxml2/io/KXmlParser;->next(Z)I -HSPLorg/kxml2/io/KXmlParser;->nextTag()I -HSPLorg/kxml2/io/KXmlParser;->nextText()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->nextToken()I -HSPLorg/kxml2/io/KXmlParser;->parseStartTag(ZZ)V -HSPLorg/kxml2/io/KXmlParser;->peekType(Z)I -HSPLorg/kxml2/io/KXmlParser;->read(C)V -HSPLorg/kxml2/io/KXmlParser;->read([C)V -HSPLorg/kxml2/io/KXmlParser;->readComment(Z)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->readEndTag()V -HSPLorg/kxml2/io/KXmlParser;->readEntity(Ljava/lang/StringBuilder;ZZLorg/kxml2/io/KXmlParser$ValueContext;)V -HSPLorg/kxml2/io/KXmlParser;->readName()Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->readUntil([CZ)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->readValue(CZZLorg/kxml2/io/KXmlParser$ValueContext;)Ljava/lang/String; -HSPLorg/kxml2/io/KXmlParser;->readXmlDeclaration()V -HSPLorg/kxml2/io/KXmlParser;->require(ILjava/lang/String;Ljava/lang/String;)V -HSPLorg/kxml2/io/KXmlParser;->setFeature(Ljava/lang/String;Z)V -HSPLorg/kxml2/io/KXmlParser;->setInput(Ljava/io/InputStream;Ljava/lang/String;)V -HSPLorg/kxml2/io/KXmlParser;->setInput(Ljava/io/Reader;)V -HSPLorg/kxml2/io/KXmlSerializer;-><init>()V -HSPLorg/kxml2/io/KXmlSerializer;->append(Ljava/lang/String;II)V -HSPLorg/kxml2/io/KXmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; -HSPLorg/kxml2/io/KXmlSerializer;->check(Z)V -HSPLorg/kxml2/io/KXmlSerializer;->endDocument()V -HSPLorg/kxml2/io/KXmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; -HSPLorg/kxml2/io/KXmlSerializer;->flush()V -HSPLorg/kxml2/io/KXmlSerializer;->setFeature(Ljava/lang/String;Z)V -HSPLorg/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/OutputStream;Ljava/lang/String;)V -HSPLorg/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/Writer;)V -HSPLorg/kxml2/io/KXmlSerializer;->startDocument(Ljava/lang/String;Ljava/lang/Boolean;)V -HSPLorg/kxml2/io/KXmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; -HSPLorg/kxml2/io/KXmlSerializer;->writeEscaped(Ljava/lang/String;I)V +HSPLcom/android/org/kxml2/io/KXmlParser$ValueContext;-><init>(Ljava/lang/String;I)V +HSPLcom/android/org/kxml2/io/KXmlParser;-><init>()V +HSPLcom/android/org/kxml2/io/KXmlParser;->adjustNsp()Z +HSPLcom/android/org/kxml2/io/KXmlParser;->close()V +HSPLcom/android/org/kxml2/io/KXmlParser;->fillBuffer(I)Z +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeCount()I +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeName(I)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeNamespace(I)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributePrefix(I)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeType(I)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeValue(I)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getColumnNumber()I +HSPLcom/android/org/kxml2/io/KXmlParser;->getDepth()I +HSPLcom/android/org/kxml2/io/KXmlParser;->getEventType()I +HSPLcom/android/org/kxml2/io/KXmlParser;->getFeature(Ljava/lang/String;)Z +HSPLcom/android/org/kxml2/io/KXmlParser;->getLineNumber()I +HSPLcom/android/org/kxml2/io/KXmlParser;->getName()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getNamespace()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getNamespace(Ljava/lang/String;)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getNamespaceCount(I)I +HSPLcom/android/org/kxml2/io/KXmlParser;->getPositionDescription()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getPrefix()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getText()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->getTextCharacters([I)[C +HSPLcom/android/org/kxml2/io/KXmlParser;->next()I +HSPLcom/android/org/kxml2/io/KXmlParser;->next(Z)I +HSPLcom/android/org/kxml2/io/KXmlParser;->nextTag()I +HSPLcom/android/org/kxml2/io/KXmlParser;->nextText()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->nextToken()I +HSPLcom/android/org/kxml2/io/KXmlParser;->parseStartTag(ZZ)V +HSPLcom/android/org/kxml2/io/KXmlParser;->peekType(Z)I +HSPLcom/android/org/kxml2/io/KXmlParser;->read(C)V +HSPLcom/android/org/kxml2/io/KXmlParser;->read([C)V +HSPLcom/android/org/kxml2/io/KXmlParser;->readComment(Z)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->readEndTag()V +HSPLcom/android/org/kxml2/io/KXmlParser;->readEntity(Ljava/lang/StringBuilder;ZZLcom/android/org/kxml2/io/KXmlParser$ValueContext;)V +HSPLcom/android/org/kxml2/io/KXmlParser;->readName()Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->readUntil([CZ)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->readValue(CZZLcom/android/org/kxml2/io/KXmlParser$ValueContext;)Ljava/lang/String; +HSPLcom/android/org/kxml2/io/KXmlParser;->readXmlDeclaration()V +HSPLcom/android/org/kxml2/io/KXmlParser;->require(ILjava/lang/String;Ljava/lang/String;)V +HSPLcom/android/org/kxml2/io/KXmlParser;->setFeature(Ljava/lang/String;Z)V +HSPLcom/android/org/kxml2/io/KXmlParser;->setInput(Ljava/io/InputStream;Ljava/lang/String;)V +HSPLcom/android/org/kxml2/io/KXmlParser;->setInput(Ljava/io/Reader;)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;-><init>()V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->append(Ljava/lang/String;II)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; +HSPLcom/android/org/kxml2/io/KXmlSerializer;->check(Z)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->endDocument()V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; +HSPLcom/android/org/kxml2/io/KXmlSerializer;->flush()V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->setFeature(Ljava/lang/String;Z)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/OutputStream;Ljava/lang/String;)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/Writer;)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->startDocument(Ljava/lang/String;Ljava/lang/Boolean;)V +HSPLcom/android/org/kxml2/io/KXmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer; +HSPLcom/android/org/kxml2/io/KXmlSerializer;->writeEscaped(Ljava/lang/String;I)V HSPLorg/w3c/dom/Attr;->getName()Ljava/lang/String; HSPLorg/w3c/dom/Attr;->getOwnerElement()Lorg/w3c/dom/Element; HSPLorg/w3c/dom/Attr;->getSchemaTypeInfo()Lorg/w3c/dom/TypeInfo; @@ -63397,9 +63397,9 @@ Lorg/json/JSONObject; Lorg/json/JSONStringer$Scope; Lorg/json/JSONStringer; Lorg/json/JSONTokener; -Lorg/kxml2/io/KXmlParser$ValueContext; -Lorg/kxml2/io/KXmlParser; -Lorg/kxml2/io/KXmlSerializer; +Lcom/android/org/kxml2/io/KXmlParser$ValueContext; +Lcom/android/org/kxml2/io/KXmlParser; +Lcom/android/org/kxml2/io/KXmlSerializer; Lorg/w3c/dom/CharacterData; Lorg/w3c/dom/DOMImplementation; Lorg/w3c/dom/Document; diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 9460c801abc7..99b58d9eb42d 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -1,14 +1,11 @@ -Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;-><init>()V Landroid/accessibilityservice/IAccessibilityServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accessibilityservice/IAccessibilityServiceConnection; Landroid/accounts/IAccountAuthenticator$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/accounts/IAccountAuthenticator$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/accounts/IAccountAuthenticator$Stub;-><init>()V Landroid/accounts/IAccountAuthenticator$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountAuthenticator; Landroid/accounts/IAccountAuthenticator;->addAccount(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;)V -Landroid/accounts/IAccountAuthenticator;->addAccountFromCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Landroid/os/Bundle;)V Landroid/accounts/IAccountAuthenticator;->confirmCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Landroid/os/Bundle;)V Landroid/accounts/IAccountAuthenticator;->editProperties(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V -Landroid/accounts/IAccountAuthenticator;->getAccountCredentialsForCloning(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;)V Landroid/accounts/IAccountAuthenticator;->getAccountRemovalAllowed(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;)V Landroid/accounts/IAccountAuthenticator;->getAuthToken(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)V Landroid/accounts/IAccountAuthenticator;->getAuthTokenLabel(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V @@ -51,9 +48,6 @@ Landroid/app/backup/IBackupManager;->setBackupEnabled(Z)V Landroid/app/backup/IFullBackupRestoreObserver$Stub;-><init>()V Landroid/app/backup/IRestoreObserver$Stub;-><init>()V Landroid/app/DownloadManager;->restartDownload([J)V -Landroid/app/IActivityController;->activityResuming(Ljava/lang/String;)Z -Landroid/app/IActivityController;->activityStarting(Landroid/content/Intent;Ljava/lang/String;)Z -Landroid/app/IActivityController;->appNotResponding(Ljava/lang/String;ILjava/lang/String;)I Landroid/app/IActivityManager$Stub$Proxy;->getConfiguration()Landroid/content/res/Configuration; Landroid/app/IActivityManager$Stub$Proxy;->getLaunchedFromUid(Landroid/os/IBinder;)I Landroid/app/IActivityManager$Stub$Proxy;->getProcessLimit()I @@ -66,7 +60,6 @@ Landroid/app/IActivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/a Landroid/app/IActivityManager;->bindService(Landroid/app/IApplicationThread;Landroid/os/IBinder;Landroid/content/Intent;Ljava/lang/String;Landroid/app/IServiceConnection;ILjava/lang/String;I)I Landroid/app/IActivityManager;->broadcastIntent(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;Landroid/content/IIntentReceiver;ILjava/lang/String;Landroid/os/Bundle;[Ljava/lang/String;ILandroid/os/Bundle;ZZI)I Landroid/app/IActivityManager;->checkPermission(Ljava/lang/String;II)I -Landroid/app/IActivityManager;->enterSafeMode()V Landroid/app/IActivityManager;->finishActivity(Landroid/os/IBinder;ILandroid/content/Intent;I)Z Landroid/app/IActivityManager;->finishHeavyWeightApp()V Landroid/app/IActivityManager;->finishReceiver(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/Bundle;ZI)V @@ -92,7 +85,6 @@ Landroid/app/IActivityManager;->isIntentSenderAnActivity(Landroid/content/IInten Landroid/app/IActivityManager;->isTopOfTask(Landroid/os/IBinder;)Z Landroid/app/IActivityManager;->isUserRunning(II)Z Landroid/app/IActivityManager;->killAllBackgroundProcesses()V -Landroid/app/IActivityManager;->killApplicationProcess(Ljava/lang/String;I)V Landroid/app/IActivityManager;->killBackgroundProcesses(Ljava/lang/String;I)V Landroid/app/IActivityManager;->moveActivityTaskToBack(Landroid/os/IBinder;Z)Z Landroid/app/IActivityManager;->moveTaskToFront(IILandroid/os/Bundle;)V @@ -135,7 +127,6 @@ Landroid/app/IActivityManager;->stopService(Landroid/app/IApplicationThread;Land Landroid/app/IActivityManager;->stopUser(IZLandroid/app/IStopUserCallback;)I Landroid/app/IActivityManager;->suppressResizeConfigChanges(Z)V Landroid/app/IActivityManager;->switchUser(I)Z -Landroid/app/IActivityManager;->unbindBackupAgent(Landroid/content/pm/ApplicationInfo;)V Landroid/app/IActivityManager;->unbindService(Landroid/app/IServiceConnection;)Z Landroid/app/IActivityManager;->unhandledBack()V Landroid/app/IActivityManager;->unlockUser(I[B[BLandroid/os/IProgressListener;)Z @@ -145,32 +136,23 @@ Landroid/app/IActivityManager;->unstableProviderDied(Landroid/os/IBinder;)V Landroid/app/IActivityManager;->updateConfiguration(Landroid/content/res/Configuration;)Z Landroid/app/IActivityManager;->updatePersistentConfiguration(Landroid/content/res/Configuration;)V Landroid/app/IAlarmManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/IAlarmManager$Stub;-><init>()V Landroid/app/IAlarmManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IAlarmManager; Landroid/app/IAlarmManager$Stub;->TRANSACTION_remove:I Landroid/app/IAlarmManager$Stub;->TRANSACTION_set:I Landroid/app/IAlarmManager;->getNextAlarmClock(I)Landroid/app/AlarmManager$AlarmClockInfo; Landroid/app/IAlarmManager;->set(Ljava/lang/String;IJJJILandroid/app/PendingIntent;Landroid/app/IAlarmListener;Ljava/lang/String;Landroid/os/WorkSource;Landroid/app/AlarmManager$AlarmClockInfo;)V -Landroid/app/IApplicationThread;->processInBackground()V Landroid/app/IApplicationThread;->scheduleBindService(Landroid/os/IBinder;Landroid/content/Intent;ZI)V Landroid/app/IApplicationThread;->scheduleCreateService(Landroid/os/IBinder;Landroid/content/pm/ServiceInfo;Landroid/content/res/CompatibilityInfo;I)V -Landroid/app/IApplicationThread;->scheduleExit()V -Landroid/app/IApplicationThread;->scheduleLowMemory()V Landroid/app/IApplicationThread;->scheduleStopService(Landroid/os/IBinder;)V -Landroid/app/IApplicationThread;->scheduleSuicide()V Landroid/app/IApplicationThread;->scheduleTrimMemory(I)V Landroid/app/IApplicationThread;->scheduleUnbindService(Landroid/os/IBinder;Landroid/content/Intent;)V -Landroid/app/IApplicationThread;->updateTimeZone()V Landroid/app/IAppTask;->getTaskInfo()Landroid/app/ActivityManager$RecentTaskInfo; -Landroid/app/IBackupAgent$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IBackupAgent; Landroid/app/IInputForwarder;->forwardEvent(Landroid/view/InputEvent;)Z Landroid/app/IInstrumentationWatcher$Stub;-><init>()V Landroid/app/IInstrumentationWatcher$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IInstrumentationWatcher; -Landroid/app/IInstrumentationWatcher;->instrumentationFinished(Landroid/content/ComponentName;ILandroid/os/Bundle;)V Landroid/app/IInstrumentationWatcher;->instrumentationStatus(Landroid/content/ComponentName;ILandroid/os/Bundle;)V Landroid/app/INotificationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/INotificationManager$Stub$Proxy;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z -Landroid/app/INotificationManager$Stub;-><init>()V Landroid/app/INotificationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/INotificationManager; Landroid/app/INotificationManager$Stub;->TRANSACTION_enqueueNotificationWithTag:I Landroid/app/INotificationManager;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z @@ -198,13 +180,11 @@ Landroid/app/IStopUserCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/app/IStopUserCallback$Stub;-><init>()V Landroid/app/IStopUserCallback;->userStopped(I)V Landroid/app/ITransientNotification$Stub;-><init>()V -Landroid/app/ITransientNotification;->hide()V Landroid/app/ITransientNotification;->show(Landroid/os/IBinder;)V Landroid/app/IUiModeManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/IUiModeManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IUiModeManager; Landroid/app/IUiModeManager;->disableCarMode(I)V Landroid/app/IUserSwitchObserver$Stub;-><init>()V -Landroid/app/IWallpaperManager$Stub;-><init>()V Landroid/app/IWallpaperManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IWallpaperManager; Landroid/app/IWallpaperManager;->getHeightHint()I Landroid/app/IWallpaperManager;->getWallpaper(Ljava/lang/String;Landroid/app/IWallpaperManagerCallback;ILandroid/os/Bundle;I)Landroid/os/ParcelFileDescriptor; @@ -213,7 +193,6 @@ Landroid/app/IWallpaperManager;->getWidthHint()I Landroid/app/IWallpaperManager;->hasNamedWallpaper(Ljava/lang/String;)Z Landroid/app/IWallpaperManager;->setWallpaperComponent(Landroid/content/ComponentName;)V Landroid/app/IWallpaperManagerCallback$Stub;-><init>()V -Landroid/app/IWallpaperManagerCallback;->onWallpaperChanged()V Landroid/app/job/IJobCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/job/IJobCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/app/job/IJobCallback$Stub;-><init>()V @@ -235,14 +214,6 @@ Landroid/app/PackageDeleteObserver;-><init>()V Landroid/app/PackageInstallObserver;-><init>()V Landroid/app/ResourcesManager$ActivityResources;-><init>()V Landroid/app/ResourcesManager;-><init>()V -Landroid/app/servertransaction/ActivityResultItem;->mResultInfoList:Ljava/util/List; -Landroid/app/servertransaction/ClientTransaction;->getActivityToken()Landroid/os/IBinder; -Landroid/app/servertransaction/ClientTransaction;->getCallbacks()Ljava/util/List; -Landroid/app/servertransaction/ClientTransaction;->getLifecycleStateRequest()Landroid/app/servertransaction/ActivityLifecycleItem; -Landroid/app/servertransaction/ClientTransaction;->mActivityCallbacks:Ljava/util/List; -Landroid/app/servertransaction/LaunchActivityItem;->mInfo:Landroid/content/pm/ActivityInfo; -Landroid/app/servertransaction/LaunchActivityItem;->mIntent:Landroid/content/Intent; -Landroid/app/servertransaction/NewIntentItem;->mIntents:Ljava/util/List; Landroid/app/TaskStackListener;-><init>()V Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/UiAutomationConnection;-><init>()V @@ -307,7 +278,6 @@ Landroid/content/IIntentReceiver$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/content/IIntentReceiver$Stub;-><init>()V Landroid/content/IIntentReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentReceiver; Landroid/content/IIntentReceiver;->performReceive(Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZI)V -Landroid/content/IIntentSender$Stub;-><init>()V Landroid/content/IIntentSender$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IIntentSender; Landroid/content/IOnPrimaryClipChangedListener$Stub;-><init>()V Landroid/content/IOnPrimaryClipChangedListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IOnPrimaryClipChangedListener; @@ -378,7 +348,6 @@ Landroid/content/pm/IPackageManager$Stub$Proxy;->getLastChosenActivity(Landroid/ Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo; Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackagesForUid(I)[Ljava/lang/String; Landroid/content/pm/IPackageManager$Stub$Proxy;->getSystemSharedLibraryNames()[Ljava/lang/String; -Landroid/content/pm/IPackageManager$Stub;-><init>()V Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager; Landroid/content/pm/IPackageManager$Stub;->TRANSACTION_getApplicationInfo:I Landroid/content/pm/IPackageManager;->addPermission(Landroid/content/pm/PermissionInfo;)Z @@ -386,12 +355,10 @@ Landroid/content/pm/IPackageManager;->addPermissionAsync(Landroid/content/pm/Per Landroid/content/pm/IPackageManager;->canonicalToCurrentPackageNames([Ljava/lang/String;)[Ljava/lang/String; Landroid/content/pm/IPackageManager;->checkPermission(Ljava/lang/String;Ljava/lang/String;I)I Landroid/content/pm/IPackageManager;->checkSignatures(Ljava/lang/String;Ljava/lang/String;)I -Landroid/content/pm/IPackageManager;->checkUidPermission(Ljava/lang/String;I)I Landroid/content/pm/IPackageManager;->checkUidSignatures(II)I Landroid/content/pm/IPackageManager;->clearPackagePreferredActivities(Ljava/lang/String;)V Landroid/content/pm/IPackageManager;->currentToCanonicalPackageNames([Ljava/lang/String;)[Ljava/lang/String; Landroid/content/pm/IPackageManager;->deleteApplicationCacheFiles(Ljava/lang/String;Landroid/content/pm/IPackageDataObserver;)V -Landroid/content/pm/IPackageManager;->enterSafeMode()V Landroid/content/pm/IPackageManager;->getApplicationEnabledSetting(Ljava/lang/String;I)I Landroid/content/pm/IPackageManager;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String; Landroid/content/pm/IPackageManager;->getBlockUninstallForUser(Ljava/lang/String;I)Z @@ -420,7 +387,6 @@ Landroid/content/pm/IPackageManager;->getUidForSharedUser(Ljava/lang/String;)I Landroid/content/pm/IPackageManager;->grantRuntimePermission(Ljava/lang/String;Ljava/lang/String;I)V Landroid/content/pm/IPackageManager;->hasSystemUidErrors()Z Landroid/content/pm/IPackageManager;->isPackageAvailable(Ljava/lang/String;I)Z -Landroid/content/pm/IPackageManager;->isProtectedBroadcast(Ljava/lang/String;)Z Landroid/content/pm/IPackageManager;->isSafeMode()Z Landroid/content/pm/IPackageManager;->isStorageLow()Z Landroid/content/pm/IPackageManager;->isUidPrivileged(I)Z @@ -436,7 +402,6 @@ Landroid/content/pm/IPackageManager;->setComponentEnabledSetting(Landroid/conten Landroid/content/pm/IPackageManager;->setInstallerPackageName(Ljava/lang/String;Ljava/lang/String;)V Landroid/content/pm/IPackageManager;->setLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;ILandroid/content/IntentFilter;ILandroid/content/ComponentName;)V Landroid/content/pm/IPackageManager;->setPackageStoppedState(Ljava/lang/String;ZI)V -Landroid/content/pm/IPackageManager;->systemReady()V Landroid/content/pm/IPackageMoveObserver$Stub;-><init>()V Landroid/content/pm/IPackageMoveObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageMoveObserver; Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V @@ -453,9 +418,6 @@ Landroid/content/UndoManager;-><init>()V Landroid/database/IContentObserver$Stub;-><init>()V Landroid/database/IContentObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/database/IContentObserver; Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V -Landroid/graphics/ColorMatrixColorFilter;->setColorMatrixArray([F)V -Landroid/graphics/FontFamily;->mNativePtr:J -Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig; Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_MAX_REGIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; @@ -567,7 +529,6 @@ Landroid/location/ILocationListener;->onProviderDisabled(Ljava/lang/String;)V Landroid/location/ILocationListener;->onProviderEnabled(Ljava/lang/String;)V Landroid/location/ILocationListener;->onStatusChanged(Ljava/lang/String;ILandroid/os/Bundle;)V Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/location/ILocationManager$Stub;-><init>()V Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager; Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I Landroid/location/ILocationManager;->getAllProviders()Ljava/util/List; @@ -600,7 +561,6 @@ Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableIfaces()[Ljava/lang/ Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableUsbRegexs()[Ljava/lang/String; Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredIfaces()[Ljava/lang/String; Landroid/net/IConnectivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/IConnectivityManager$Stub;-><init>()V Landroid/net/IConnectivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IConnectivityManager; Landroid/net/IConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties; Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo; @@ -640,7 +600,6 @@ Landroid/net/nsd/INsdManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/ne Landroid/net/nsd/INsdManager;->getMessenger()Landroid/os/Messenger; Landroid/net/SntpClient;-><init>()V Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiManager$Stub;-><init>()V Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager; Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network; @@ -848,20 +807,6 @@ Landroid/os/Handler;->hasCallbacks(Ljava/lang/Runnable;)Z Landroid/os/Handler;->mCallback:Landroid/os/Handler$Callback; Landroid/os/Handler;->mLooper:Landroid/os/Looper; Landroid/os/Handler;->mMessenger:Landroid/os/IMessenger; -Landroid/os/health/HealthKeys$Constants;-><init>(Ljava/lang/Class;)V -Landroid/os/health/HealthStats;-><init>(Landroid/os/Parcel;)V -Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/health/HealthStatsWriter;)V -Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/Parcel;)V -Landroid/os/health/HealthStatsParceler;->getHealthStats()Landroid/os/health/HealthStats; -Landroid/os/health/HealthStatsWriter;-><init>(Landroid/os/health/HealthKeys$Constants;)V -Landroid/os/health/HealthStatsWriter;->addMeasurement(IJ)V -Landroid/os/health/HealthStatsWriter;->addMeasurements(ILjava/lang/String;J)V -Landroid/os/health/HealthStatsWriter;->addStats(ILjava/lang/String;Landroid/os/health/HealthStatsWriter;)V -Landroid/os/health/HealthStatsWriter;->addTimer(IIJ)V -Landroid/os/health/HealthStatsWriter;->addTimers(ILjava/lang/String;Landroid/os/health/TimerStat;)V -Landroid/os/health/HealthStatsWriter;->flattenToParcel(Landroid/os/Parcel;)V -Landroid/os/health/SystemHealthManager;-><init>()V -Landroid/os/health/SystemHealthManager;->from(Landroid/content/Context;)Landroid/os/health/SystemHealthManager; Landroid/os/HwParcel;-><init>(Z)V Landroid/os/HwRemoteBinder;-><init>()V Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V @@ -884,11 +829,9 @@ Landroid/os/INetworkManagementService;->stopTethering()V Landroid/os/INetworkManagementService;->tetherInterface(Ljava/lang/String;)V Landroid/os/INetworkManagementService;->untetherInterface(Ljava/lang/String;)V Landroid/os/IPermissionController$Stub$Proxy;->checkPermission(Ljava/lang/String;II)Z -Landroid/os/IPermissionController$Stub;-><init>()V Landroid/os/IPermissionController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPermissionController; Landroid/os/IPowerManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/IPowerManager$Stub$Proxy;->isLightDeviceIdleMode()Z -Landroid/os/IPowerManager$Stub;-><init>()V Landroid/os/IPowerManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPowerManager; Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I @@ -1051,99 +994,10 @@ Landroid/os/ServiceSpecificException;-><init>(ILjava/lang/String;)V Landroid/os/SharedMemory;->getFd()I Landroid/os/ShellCommand;->peekNextArg()Ljava/lang/String; Landroid/os/StatFs;->mStat:Landroid/system/StructStatVfs; -Landroid/os/storage/DiskInfo;-><init>(Landroid/os/Parcel;)V -Landroid/os/storage/DiskInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/os/storage/DiskInfo;->flags:I -Landroid/os/storage/DiskInfo;->getDescription()Ljava/lang/String; -Landroid/os/storage/DiskInfo;->isAdoptable()Z -Landroid/os/storage/DiskInfo;->isDefaultPrimary()Z -Landroid/os/storage/DiskInfo;->isSd()Z -Landroid/os/storage/DiskInfo;->isUsb()Z -Landroid/os/storage/DiskInfo;->label:Ljava/lang/String; -Landroid/os/storage/DiskInfo;->size:J Landroid/os/storage/IObbActionListener$Stub;-><init>()V Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener; Landroid/os/storage/IStorageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager; -Landroid/os/storage/StorageEventListener;->onDiskDestroyed(Landroid/os/storage/DiskInfo;)V -Landroid/os/storage/StorageEventListener;->onDiskScanned(Landroid/os/storage/DiskInfo;I)V -Landroid/os/storage/StorageEventListener;->onStorageStateChanged(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Landroid/os/storage/StorageEventListener;->onUsbMassStorageConnectionChanged(Z)V -Landroid/os/storage/StorageEventListener;->onVolumeForgotten(Ljava/lang/String;)V -Landroid/os/storage/StorageEventListener;->onVolumeRecordChanged(Landroid/os/storage/VolumeRecord;)V -Landroid/os/storage/StorageEventListener;->onVolumeStateChanged(Landroid/os/storage/VolumeInfo;II)V -Landroid/os/storage/StorageManager;-><init>(Landroid/content/Context;Landroid/os/Looper;)V -Landroid/os/storage/StorageManager;->CRYPT_TYPE_DEFAULT:I -Landroid/os/storage/StorageManager;->CRYPT_TYPE_PASSWORD:I -Landroid/os/storage/StorageManager;->disableUsbMassStorage()V -Landroid/os/storage/StorageManager;->enableUsbMassStorage()V -Landroid/os/storage/StorageManager;->ENCRYPTION_STATE_NONE:I -Landroid/os/storage/StorageManager;->findDiskById(Ljava/lang/String;)Landroid/os/storage/DiskInfo; -Landroid/os/storage/StorageManager;->findEmulatedForPrivate(Landroid/os/storage/VolumeInfo;)Landroid/os/storage/VolumeInfo; -Landroid/os/storage/StorageManager;->findVolumeByUuid(Ljava/lang/String;)Landroid/os/storage/VolumeInfo; -Landroid/os/storage/StorageManager;->format(Ljava/lang/String;)V -Landroid/os/storage/StorageManager;->getBestVolumeDescription(Landroid/os/storage/VolumeInfo;)Ljava/lang/String; -Landroid/os/storage/StorageManager;->getDisks()Ljava/util/List; -Landroid/os/storage/StorageManager;->getPrimaryPhysicalVolume()Landroid/os/storage/VolumeInfo; -Landroid/os/storage/StorageManager;->getStorageBytesUntilLow(Ljava/io/File;)J -Landroid/os/storage/StorageManager;->getStorageFullBytes(Ljava/io/File;)J -Landroid/os/storage/StorageManager;->getStorageLowBytes(Ljava/io/File;)J -Landroid/os/storage/StorageManager;->getStorageVolume([Landroid/os/storage/StorageVolume;Ljava/io/File;)Landroid/os/storage/StorageVolume; -Landroid/os/storage/StorageManager;->getVolumeList(II)[Landroid/os/storage/StorageVolume; -Landroid/os/storage/StorageManager;->getVolumePaths()[Ljava/lang/String; -Landroid/os/storage/StorageManager;->getVolumes()Ljava/util/List; -Landroid/os/storage/StorageManager;->getVolumeState(Ljava/lang/String;)Ljava/lang/String; -Landroid/os/storage/StorageManager;->isFileEncryptedNativeOnly()Z -Landroid/os/storage/StorageManager;->isUsbMassStorageConnected()Z -Landroid/os/storage/StorageManager;->isUsbMassStorageEnabled()Z -Landroid/os/storage/StorageManager;->partitionPublic(Ljava/lang/String;)V -Landroid/os/storage/StorageManager;->unmount(Ljava/lang/String;)V -Landroid/os/storage/StorageVolume;->allowMassStorage()Z -Landroid/os/storage/StorageVolume;->getFatVolumeId()I -Landroid/os/storage/StorageVolume;->getMaxFileSize()J -Landroid/os/storage/StorageVolume;->getOwner()Landroid/os/UserHandle; -Landroid/os/storage/StorageVolume;->getPath()Ljava/lang/String; -Landroid/os/storage/StorageVolume;->getPathFile()Ljava/io/File; -Landroid/os/storage/StorageVolume;->getUserLabel()Ljava/lang/String; -Landroid/os/storage/StorageVolume;->mDescription:Ljava/lang/String; -Landroid/os/storage/StorageVolume;->mId:Ljava/lang/String; -Landroid/os/storage/StorageVolume;->mPath:Ljava/io/File; -Landroid/os/storage/StorageVolume;->mPrimary:Z -Landroid/os/storage/StorageVolume;->mRemovable:Z -Landroid/os/storage/VolumeInfo;-><init>(Landroid/os/Parcel;)V -Landroid/os/storage/VolumeInfo;->buildBrowseIntent()Landroid/content/Intent; -Landroid/os/storage/VolumeInfo;->buildStableMtpStorageId(Ljava/lang/String;)I -Landroid/os/storage/VolumeInfo;->buildStorageVolume(Landroid/content/Context;IZ)Landroid/os/storage/StorageVolume; -Landroid/os/storage/VolumeInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/os/storage/VolumeInfo;->disk:Landroid/os/storage/DiskInfo; -Landroid/os/storage/VolumeInfo;->fsLabel:Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->fsUuid:Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getDescription()Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getDisk()Landroid/os/storage/DiskInfo; -Landroid/os/storage/VolumeInfo;->getDiskId()Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getEnvironmentForState(I)Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getFsUuid()Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getInternalPath()Ljava/io/File; -Landroid/os/storage/VolumeInfo;->getInternalPathForUser(I)Ljava/io/File; -Landroid/os/storage/VolumeInfo;->getMountUserId()I -Landroid/os/storage/VolumeInfo;->getPath()Ljava/io/File; -Landroid/os/storage/VolumeInfo;->getPathForUser(I)Ljava/io/File; -Landroid/os/storage/VolumeInfo;->getState()I -Landroid/os/storage/VolumeInfo;->getType()I -Landroid/os/storage/VolumeInfo;->internalPath:Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->isMountedReadable()Z -Landroid/os/storage/VolumeInfo;->isMountedWritable()Z -Landroid/os/storage/VolumeInfo;->isPrimary()Z -Landroid/os/storage/VolumeInfo;->isPrimaryPhysical()Z -Landroid/os/storage/VolumeInfo;->isVisible()Z -Landroid/os/storage/VolumeInfo;->isVisibleForWrite(I)Z -Landroid/os/storage/VolumeInfo;->path:Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->state:I -Landroid/os/storage/VolumeInfo;->type:I -Landroid/os/storage/VolumeInfo;->TYPE_EMULATED:I -Landroid/os/storage/VolumeInfo;->TYPE_PUBLIC:I -Landroid/os/storage/VolumeRecord;-><init>(Landroid/os/Parcel;)V -Landroid/os/storage/VolumeRecord;->CREATOR:Landroid/os/Parcelable$Creator; Landroid/os/StrictMode$Span;->finish()V Landroid/os/StrictMode$ThreadPolicy;->mask:I Landroid/os/StrictMode$VmPolicy$Builder;->mMask:I @@ -1599,7 +1453,6 @@ Landroid/service/wallpaper/IWallpaperConnection$Stub;-><init>()V Landroid/service/wallpaper/IWallpaperEngine;->destroy()V Landroid/service/wallpaper/IWallpaperEngine;->dispatchPointer(Landroid/view/MotionEvent;)V Landroid/service/wallpaper/IWallpaperEngine;->dispatchWallpaperCommand(Ljava/lang/String;IIILandroid/os/Bundle;)V -Landroid/service/wallpaper/IWallpaperEngine;->setDesiredSize(II)V Landroid/service/wallpaper/IWallpaperEngine;->setVisibility(Z)V Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/wallpaper/IWallpaperService; Landroid/speech/IRecognitionListener;->onEvent(ILandroid/os/Bundle;)V @@ -1659,388 +1512,25 @@ Landroid/system/OsConstants;->XATTR_CREATE:I Landroid/system/OsConstants;->XATTR_REPLACE:I Landroid/system/OsConstants;->_LINUX_CAPABILITY_VERSION_3:I Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval; -Landroid/telephony/CarrierConfigManager;->KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY:Ljava/lang/String; -Landroid/telephony/CarrierConfigManager;->KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL:Ljava/lang/String; Landroid/telephony/CarrierMessagingServiceManager;-><init>()V -Landroid/telephony/cdma/CdmaCellLocation;->equalsHandlesNulls(Ljava/lang/Object;Ljava/lang/Object;)Z -Landroid/telephony/cdma/CdmaCellLocation;->mBaseStationId:I -Landroid/telephony/cdma/CdmaCellLocation;->mBaseStationLatitude:I -Landroid/telephony/cdma/CdmaCellLocation;->mBaseStationLongitude:I -Landroid/telephony/cdma/CdmaCellLocation;->mNetworkId:I -Landroid/telephony/cdma/CdmaCellLocation;->mSystemId:I -Landroid/telephony/CellBroadcastMessage;-><init>(Landroid/telephony/SmsCbMessage;)V -Landroid/telephony/CellBroadcastMessage;->createFromCursor(Landroid/database/Cursor;)Landroid/telephony/CellBroadcastMessage; -Landroid/telephony/CellBroadcastMessage;->getContentValues()Landroid/content/ContentValues; -Landroid/telephony/CellBroadcastMessage;->getDeliveryTime()J -Landroid/telephony/CellBroadcastMessage;->getEtwsWarningInfo()Landroid/telephony/SmsCbEtwsInfo; -Landroid/telephony/CellBroadcastMessage;->getLanguageCode()Ljava/lang/String; -Landroid/telephony/CellBroadcastMessage;->getMessageBody()Ljava/lang/String; -Landroid/telephony/CellBroadcastMessage;->getSerialNumber()I -Landroid/telephony/CellBroadcastMessage;->getServiceCategory()I -Landroid/telephony/CellBroadcastMessage;->getSpokenDateString(Landroid/content/Context;)Ljava/lang/String; -Landroid/telephony/CellBroadcastMessage;->isCmasMessage()Z -Landroid/telephony/CellBroadcastMessage;->isEmergencyAlertMessage()Z -Landroid/telephony/CellBroadcastMessage;->isEtwsMessage()Z -Landroid/telephony/CellBroadcastMessage;->isRead()Z -Landroid/telephony/CellIdentityCdma;-><init>(IIIII)V -Landroid/telephony/CellIdentityGsm;-><init>()V -Landroid/telephony/CellIdentityGsm;->mArfcn:I -Landroid/telephony/CellIdentityGsm;->mBsic:I -Landroid/telephony/CellIdentityLte;-><init>()V -Landroid/telephony/CellIdentityLte;-><init>(IIIII)V -Landroid/telephony/CellIdentityLte;->mEarfcn:I -Landroid/telephony/CellIdentityWcdma;->mUarfcn:I -Landroid/telephony/CellInfo;->getTimeStampType()I -Landroid/telephony/CellInfo;->timeStampTypeToString(I)Ljava/lang/String; -Landroid/telephony/CellInfo;->TIMESTAMP_TYPE_ANTENNA:I -Landroid/telephony/CellInfo;->TIMESTAMP_TYPE_JAVA_RIL:I -Landroid/telephony/CellInfo;->TIMESTAMP_TYPE_MODEM:I -Landroid/telephony/CellInfo;->TIMESTAMP_TYPE_OEM_RIL:I -Landroid/telephony/CellInfo;->TIMESTAMP_TYPE_UNKNOWN:I -Landroid/telephony/CellInfoCdma;-><init>()V -Landroid/telephony/CellInfoCdma;-><init>(Landroid/telephony/CellInfoCdma;)V -Landroid/telephony/CellInfoCdma;->setCellIdentity(Landroid/telephony/CellIdentityCdma;)V -Landroid/telephony/CellInfoGsm;-><init>()V -Landroid/telephony/CellInfoLte;-><init>()V -Landroid/telephony/CellInfoLte;->setCellIdentity(Landroid/telephony/CellIdentityLte;)V -Landroid/telephony/CellInfoLte;->setCellSignalStrength(Landroid/telephony/CellSignalStrengthLte;)V -Landroid/telephony/CellLocation;->fillInNotifierBundle(Landroid/os/Bundle;)V -Landroid/telephony/CellLocation;->isEmpty()Z -Landroid/telephony/CellLocation;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/CellLocation; -Landroid/telephony/CellSignalStrengthGsm;-><init>()V -Landroid/telephony/CellSignalStrengthGsm;->mBitErrorRate:I -Landroid/telephony/CellSignalStrengthGsm;->mSignalStrength:I -Landroid/telephony/CellSignalStrengthGsm;->mTimingAdvance:I -Landroid/telephony/CellSignalStrengthLte;-><init>()V -Landroid/telephony/CellSignalStrengthLte;->mCqi:I -Landroid/telephony/CellSignalStrengthLte;->mRsrp:I -Landroid/telephony/CellSignalStrengthLte;->mRsrq:I -Landroid/telephony/CellSignalStrengthLte;->mRssnr:I -Landroid/telephony/CellSignalStrengthLte;->mSignalStrength:I -Landroid/telephony/CellSignalStrengthLte;->mTimingAdvance:I -Landroid/telephony/CellSignalStrengthWcdma;->mBitErrorRate:I -Landroid/telephony/CellSignalStrengthWcdma;->mSignalStrength:I -Landroid/telephony/DisconnectCause;->toString(I)Ljava/lang/String; -Landroid/telephony/euicc/EuiccInfo;->osVersion:Ljava/lang/String; -Landroid/telephony/gsm/GsmCellLocation;->setPsc(I)V -Landroid/telephony/ims/ImsSsInfo;-><init>()V -Landroid/telephony/NeighboringCellInfo;->mCid:I -Landroid/telephony/NeighboringCellInfo;->mLac:I -Landroid/telephony/NeighboringCellInfo;->mNetworkType:I -Landroid/telephony/NeighboringCellInfo;->mPsc:I -Landroid/telephony/NeighboringCellInfo;->mRssi:I -Landroid/telephony/PhoneNumberFormattingTextWatcher;->mFormatter:Lcom/android/i18n/phonenumbers/AsYouTypeFormatter; -Landroid/telephony/PhoneNumberUtils;->cdmaCheckAndProcessPlusCode(Ljava/lang/String;)Ljava/lang/String; -Landroid/telephony/PhoneNumberUtils;->compare(Ljava/lang/String;Ljava/lang/String;Z)Z -Landroid/telephony/PhoneNumberUtils;->compareLoosely(Ljava/lang/String;Ljava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->compareStrictly(Ljava/lang/String;Ljava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->compareStrictly(Ljava/lang/String;Ljava/lang/String;Z)Z -Landroid/telephony/PhoneNumberUtils;->convertPreDial(Ljava/lang/String;)Ljava/lang/String; -Landroid/telephony/PhoneNumberUtils;->extractNetworkPortionAlt(Ljava/lang/String;)Ljava/lang/String; -Landroid/telephony/PhoneNumberUtils;->getUsernameFromUriNumber(Ljava/lang/String;)Ljava/lang/String; -Landroid/telephony/PhoneNumberUtils;->isEmergencyNumber(Ljava/lang/String;Ljava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isLocalEmergencyNumber(Landroid/content/Context;ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isNanp(Ljava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isPotentialLocalEmergencyNumber(Landroid/content/Context;Ljava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isUriNumber(Ljava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isVoiceMailNumber(Landroid/content/Context;ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->MIN_MATCH:I -Landroid/telephony/PhoneNumberUtils;->ttsSpanAsPhoneNumber(Ljava/lang/CharSequence;)Ljava/lang/CharSequence; -Landroid/telephony/PhoneStateListener;-><init>(Landroid/os/Looper;)V -Landroid/telephony/PhoneStateListener;->callback:Lcom/android/internal/telephony/IPhoneStateListener; -Landroid/telephony/PhoneStateListener;->LISTEN_PRECISE_CALL_STATE:I -Landroid/telephony/PhoneStateListener;->mSubId:Ljava/lang/Integer; -Landroid/telephony/PhoneStateListener;->onDataConnectionRealTimeInfoChanged(Landroid/telephony/DataConnectionRealTimeInfo;)V -Landroid/telephony/PhoneStateListener;->onOemHookRawEvent([B)V -Landroid/telephony/PhoneStateListener;->onOtaspChanged(I)V -Landroid/telephony/PhoneStateListener;->onPreciseCallStateChanged(Landroid/telephony/PreciseCallState;)V -Landroid/telephony/PhoneStateListener;->onPreciseDataConnectionStateChanged(Landroid/telephony/PreciseDataConnectionState;)V -Landroid/telephony/PhoneStateListener;->onVoLteServiceStateChanged(Landroid/telephony/VoLteServiceState;)V -Landroid/telephony/PreciseCallState;-><init>(IIIII)V -Landroid/telephony/PreciseCallState;->getDisconnectCause()I -Landroid/telephony/PreciseCallState;->getPreciseDisconnectCause()I -Landroid/telephony/PreciseCallState;->getRingingCallState()I -Landroid/telephony/PreciseDataConnectionState;-><init>(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/LinkProperties;Ljava/lang/String;)V -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionAPN()Ljava/lang/String; -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionAPNType()Ljava/lang/String; -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionChangeReason()Ljava/lang/String; -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionFailCause()Ljava/lang/String; -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionLinkProperties()Landroid/net/LinkProperties; -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionNetworkType()I -Landroid/telephony/PreciseDataConnectionState;->getDataConnectionState()I -Landroid/telephony/RadioAccessFamily;->getNetworkTypeFromRaf(I)I -Landroid/telephony/RadioAccessFamily;->getPhoneId()I -Landroid/telephony/RadioAccessFamily;->getRadioAccessFamily()I -Landroid/telephony/Rlog;->d(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I -Landroid/telephony/Rlog;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I -Landroid/telephony/Rlog;->v(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/Rlog;->w(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/Rlog;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I -Landroid/telephony/ServiceState;->bearerBitmapHasCdma(I)Z -Landroid/telephony/ServiceState;->equalsHandlesNulls(Ljava/lang/Object;Ljava/lang/Object;)Z -Landroid/telephony/ServiceState;->fillInNotifierBundle(Landroid/os/Bundle;)V -Landroid/telephony/ServiceState;->getCdmaDefaultRoamingIndicator()I -Landroid/telephony/ServiceState;->getCdmaEriIconIndex()I -Landroid/telephony/ServiceState;->getCdmaEriIconMode()I -Landroid/telephony/ServiceState;->getCdmaRoamingIndicator()I -Landroid/telephony/ServiceState;->getCssIndicator()I -Landroid/telephony/ServiceState;->getDataNetworkType()I -Landroid/telephony/ServiceState;->getDataOperatorAlphaShort()Ljava/lang/String; -Landroid/telephony/ServiceState;->getDataOperatorNumeric()Ljava/lang/String; -Landroid/telephony/ServiceState;->getDataRoamingType()I -Landroid/telephony/ServiceState;->getRadioTechnology()I -Landroid/telephony/ServiceState;->getRilVoiceRadioTechnology()I -Landroid/telephony/ServiceState;->getVoiceOperatorAlphaLong()Ljava/lang/String; -Landroid/telephony/ServiceState;->getVoiceOperatorAlphaShort()Ljava/lang/String; -Landroid/telephony/ServiceState;->getVoiceOperatorNumeric()Ljava/lang/String; -Landroid/telephony/ServiceState;->getVoiceRoaming()Z -Landroid/telephony/ServiceState;->getVoiceRoamingType()I -Landroid/telephony/ServiceState;->mCdmaDefaultRoamingIndicator:I -Landroid/telephony/ServiceState;->mCdmaEriIconIndex:I -Landroid/telephony/ServiceState;->mCdmaEriIconMode:I -Landroid/telephony/ServiceState;->mCdmaRoamingIndicator:I -Landroid/telephony/ServiceState;->mCssIndicator:Z -Landroid/telephony/ServiceState;->mIsManualNetworkSelection:Z -Landroid/telephony/ServiceState;->mIsUsingCarrierAggregation:Z -Landroid/telephony/ServiceState;->mNetworkId:I -Landroid/telephony/ServiceState;->mSystemId:I -Landroid/telephony/ServiceState;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/ServiceState; -Landroid/telephony/ServiceState;->RIL_RADIO_TECHNOLOGY_IWLAN:I -Landroid/telephony/ServiceState;->setCdmaDefaultRoamingIndicator(I)V -Landroid/telephony/ServiceState;->setCdmaEriIconIndex(I)V -Landroid/telephony/ServiceState;->setCdmaEriIconMode(I)V -Landroid/telephony/ServiceState;->setCdmaRoamingIndicator(I)V -Landroid/telephony/ServiceState;->setCssIndicator(I)V -Landroid/telephony/ServiceState;->setDataRegState(I)V -Landroid/telephony/ServiceState;->setDataRoaming(Z)V -Landroid/telephony/ServiceState;->setDataRoamingFromRegistration(Z)V -Landroid/telephony/ServiceState;->setDataRoamingType(I)V -Landroid/telephony/ServiceState;->setEmergencyOnly(Z)V -Landroid/telephony/ServiceState;->setFromNotifierBundle(Landroid/os/Bundle;)V -Landroid/telephony/ServiceState;->setOperatorAlphaLong(Ljava/lang/String;)V -Landroid/telephony/ServiceState;->setVoiceRegState(I)V -Landroid/telephony/ServiceState;->setVoiceRoaming(Z)V -Landroid/telephony/ServiceState;->setVoiceRoamingType(I)V -Landroid/telephony/SignalStrength;-><init>()V -Landroid/telephony/SignalStrength;-><init>(Landroid/os/Parcel;)V -Landroid/telephony/SignalStrength;-><init>(Landroid/telephony/SignalStrength;)V -Landroid/telephony/SignalStrength;-><init>(Z)V -Landroid/telephony/SignalStrength;->copyFrom(Landroid/telephony/SignalStrength;)V -Landroid/telephony/SignalStrength;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/telephony/SignalStrength;->fillInNotifierBundle(Landroid/os/Bundle;)V -Landroid/telephony/SignalStrength;->getAsuLevel()I -Landroid/telephony/SignalStrength;->getCdmaAsuLevel()I -Landroid/telephony/SignalStrength;->getCdmaLevel()I -Landroid/telephony/SignalStrength;->getDbm()I -Landroid/telephony/SignalStrength;->getEvdoAsuLevel()I -Landroid/telephony/SignalStrength;->getEvdoLevel()I -Landroid/telephony/SignalStrength;->getGsmAsuLevel()I -Landroid/telephony/SignalStrength;->getGsmDbm()I -Landroid/telephony/SignalStrength;->getGsmLevel()I -Landroid/telephony/SignalStrength;->getLteAsuLevel()I -Landroid/telephony/SignalStrength;->getLteCqi()I -Landroid/telephony/SignalStrength;->getLteDbm()I -Landroid/telephony/SignalStrength;->getLteLevel()I -Landroid/telephony/SignalStrength;->getLteRsrp()I -Landroid/telephony/SignalStrength;->getLteRsrq()I -Landroid/telephony/SignalStrength;->getLteRssnr()I -Landroid/telephony/SignalStrength;->getLteSignalStrength()I -Landroid/telephony/SignalStrength;->getTdScdmaAsuLevel()I -Landroid/telephony/SignalStrength;->getTdScdmaDbm()I -Landroid/telephony/SignalStrength;->getTdScdmaLevel()I -Landroid/telephony/SignalStrength;->mCdmaDbm:I -Landroid/telephony/SignalStrength;->mCdmaEcio:I -Landroid/telephony/SignalStrength;->mEvdoDbm:I -Landroid/telephony/SignalStrength;->mEvdoEcio:I -Landroid/telephony/SignalStrength;->mEvdoSnr:I -Landroid/telephony/SignalStrength;->mGsmBitErrorRate:I -Landroid/telephony/SignalStrength;->mGsmSignalStrength:I -Landroid/telephony/SignalStrength;->mLteCqi:I -Landroid/telephony/SignalStrength;->mLteRsrp:I -Landroid/telephony/SignalStrength;->mLteRsrpBoost:I -Landroid/telephony/SignalStrength;->mLteRsrq:I -Landroid/telephony/SignalStrength;->mLteRssnr:I -Landroid/telephony/SignalStrength;->mLteSignalStrength:I -Landroid/telephony/SignalStrength;->mTdScdmaRscp:I -Landroid/telephony/SignalStrength;->mWcdmaRscp:I -Landroid/telephony/SignalStrength;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/SignalStrength; -Landroid/telephony/SignalStrength;->NUM_SIGNAL_STRENGTH_BINS:I -Landroid/telephony/SignalStrength;->setFromNotifierBundle(Landroid/os/Bundle;)V -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_GOOD:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_GREAT:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_MODERATE:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_NONE_OR_UNKNOWN:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_POOR:I -Landroid/telephony/SignalStrength;->validateInput()V -Landroid/telephony/SmsManager;->copyMessageToIcc([B[BI)Z -Landroid/telephony/SmsManager;->deleteMessageFromIcc(I)Z -Landroid/telephony/SmsManager;->disableCellBroadcastRange(III)Z -Landroid/telephony/SmsManager;->enableCellBroadcastRange(III)Z -Landroid/telephony/SmsManager;->getAllMessagesFromIcc()Ljava/util/ArrayList; -Landroid/telephony/SmsManager;->isSMSPromptEnabled()Z -Landroid/telephony/SmsManager;->mSubId:I -Landroid/telephony/SmsManager;->sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;IZI)V -Landroid/telephony/SmsManager;->sendTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;IZI)V -Landroid/telephony/SmsManager;->sendTextMessageWithoutPersisting(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;IZI)V -Landroid/telephony/SmsManager;->updateMessageOnIcc(II[B)Z -Landroid/telephony/SmsMessage;->fragmentText(Ljava/lang/String;)Ljava/util/ArrayList; -Landroid/telephony/SmsMessage;->getSubId()I -Landroid/telephony/SmsMessage;->mSubId:I -Landroid/telephony/SmsMessage;->mWrappedSmsMessage:Lcom/android/internal/telephony/SmsMessageBase; -Landroid/telephony/SmsMessage;->setSubId(I)V -Landroid/telephony/SmsMessage;->useCdmaFormatForMoSms()Z -Landroid/telephony/SmsMessage;->useCdmaFormatForMoSms(I)Z -Landroid/telephony/SubscriptionInfo;->getNameSource()I -Landroid/telephony/SubscriptionManager;-><init>(Landroid/content/Context;)V -Landroid/telephony/SubscriptionManager;->CONTENT_URI:Landroid/net/Uri; -Landroid/telephony/SubscriptionManager;->DEFAULT_SUBSCRIPTION_ID:I -Landroid/telephony/SubscriptionManager;->getActiveSubscriptionIdList()[I -Landroid/telephony/SubscriptionManager;->getAllSubscriptionInfoCount()I -Landroid/telephony/SubscriptionManager;->getAllSubscriptionInfoList()Ljava/util/List; -Landroid/telephony/SubscriptionManager;->getDefaultDataPhoneId()I -Landroid/telephony/SubscriptionManager;->getDefaultDataSubscriptionInfo()Landroid/telephony/SubscriptionInfo; -Landroid/telephony/SubscriptionManager;->getDefaultSmsPhoneId()I -Landroid/telephony/SubscriptionManager;->getDefaultVoiceSubscriptionInfo()Landroid/telephony/SubscriptionInfo; -Landroid/telephony/SubscriptionManager;->getPhoneId(I)I -Landroid/telephony/SubscriptionManager;->getSlotIndex(I)I -Landroid/telephony/SubscriptionManager;->getSubId(I)[I -Landroid/telephony/SubscriptionManager;->NAME_SOURCE_USER_INPUT:I -Landroid/telephony/SubscriptionManager;->setDataRoaming(II)I -Landroid/telephony/SubscriptionManager;->setDefaultDataSubId(I)V -Landroid/telephony/SubscriptionManager;->setDefaultSmsSubId(I)V -Landroid/telephony/SubscriptionManager;->setDisplayNumber(Ljava/lang/String;I)I -Landroid/telephony/TelephonyManager$MultiSimVariants;->TSTS:Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager$MultiSimVariants;->UNKNOWN:Landroid/telephony/TelephonyManager$MultiSimVariants; Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager;-><init>()V -Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;)V -Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;I)V -Landroid/telephony/TelephonyManager;->ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED:Ljava/lang/String; -Landroid/telephony/TelephonyManager;->from(Landroid/content/Context;)Landroid/telephony/TelephonyManager; -Landroid/telephony/TelephonyManager;->getCallState(I)I -Landroid/telephony/TelephonyManager;->getCdmaEriIconIndex(I)I -Landroid/telephony/TelephonyManager;->getCdmaEriIconMode(I)I -Landroid/telephony/TelephonyManager;->getCdmaEriText(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getCompleteVoiceMailNumber()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getCompleteVoiceMailNumber(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getDataNetworkType(I)I -Landroid/telephony/TelephonyManager;->getDefault()Landroid/telephony/TelephonyManager; -Landroid/telephony/TelephonyManager;->getDeviceSoftwareVersion(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getGroupIdLevel1(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getIccAuthentication(IIILjava/lang/String;)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getImsConfig(II)Landroid/telephony/ims/aidl/IImsConfig; -Landroid/telephony/TelephonyManager;->getImsRegistration(II)Landroid/telephony/ims/aidl/IImsRegistration; -Landroid/telephony/TelephonyManager;->getIsimImpi()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getIsimImpu()[Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getIsimPcscf()[Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getITelephony()Lcom/android/internal/telephony/ITelephony; -Landroid/telephony/TelephonyManager;->getLine1AlphaTag(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getLine1Number(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getLteOnCdmaMode()I -Landroid/telephony/TelephonyManager;->getLteOnCdmaMode(I)I -Landroid/telephony/TelephonyManager;->getLteOnCdmaModeStatic()I -Landroid/telephony/TelephonyManager;->getMergedSubscriberIds()[Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getMsisdn()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getMsisdn(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getMultiSimConfiguration()Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager;->getNai(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkClass(I)I -Landroid/telephony/TelephonyManager;->getNetworkCountryIso(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkCountryIsoForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkOperator(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkOperatorForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkOperatorName(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkType(I)I -Landroid/telephony/TelephonyManager;->getNetworkTypeName(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getOtaSpNumberSchemaForPhone(ILjava/lang/String;)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getPhoneId(I)I -Landroid/telephony/TelephonyManager;->getPhoneType(I)I -Landroid/telephony/TelephonyManager;->getPhoneTypeFromProperty(I)I -Landroid/telephony/TelephonyManager;->getProcCmdLine()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimCount()I -Landroid/telephony/TelephonyManager;->getSimCountryIso(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimCountryIsoForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperator(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorName(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNameForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNumeric()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNumeric(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNumericForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimSerialNumber(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSlotIndex()I -Landroid/telephony/TelephonyManager;->getSubId(I)I -Landroid/telephony/TelephonyManager;->getSubIdForPhoneAccount(Landroid/telecom/PhoneAccount;)I -Landroid/telephony/TelephonyManager;->getSubscriberId(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSubscriberInfo()Lcom/android/internal/telephony/IPhoneSubInfo; -Landroid/telephony/TelephonyManager;->getTelephonyProperty(ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getTelephonyProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getVoiceMailAlphaTag(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getVoiceMailNumber(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getVoiceMessageCount(I)I -Landroid/telephony/TelephonyManager;->hasIccCard(I)Z -Landroid/telephony/TelephonyManager;->isMultiSimEnabled()Z -Landroid/telephony/TelephonyManager;->isNetworkRoaming(I)Z -Landroid/telephony/TelephonyManager;->isVideoTelephonyAvailable()Z -Landroid/telephony/TelephonyManager;->isVolteAvailable()Z -Landroid/telephony/TelephonyManager;->isWifiCallingAvailable()Z -Landroid/telephony/TelephonyManager;->mSubscriptionManager:Landroid/telephony/SubscriptionManager; -Landroid/telephony/TelephonyManager;->NETWORK_CLASS_2_G:I -Landroid/telephony/TelephonyManager;->NETWORK_CLASS_3_G:I -Landroid/telephony/TelephonyManager;->NETWORK_CLASS_4_G:I -Landroid/telephony/TelephonyManager;->NETWORK_TYPE_LTE_CA:I -Landroid/telephony/TelephonyManager;->nvReadItem(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->setBasebandVersionForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setDataNetworkTypeForPhone(II)V -Landroid/telephony/TelephonyManager;->setImsRegistrationState(Z)V -Landroid/telephony/TelephonyManager;->setNetworkOperatorNameForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setNetworkOperatorNumericForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setNetworkRoamingForPhone(IZ)V -Landroid/telephony/TelephonyManager;->setPhoneType(II)V -Landroid/telephony/TelephonyManager;->setRoamingOverride(Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;)Z -Landroid/telephony/TelephonyManager;->setSimCountryIsoForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setSimOperatorNameForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setSimOperatorNumericForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setSimStateForPhone(ILjava/lang/String;)V -Landroid/telephony/TelephonyManager;->setTelephonyProperty(ILjava/lang/String;Ljava/lang/String;)V -Landroid/telephony/VoLteServiceState;-><init>(I)V -Landroid/transition/ChangeBounds;->BOTTOM_RIGHT_ONLY_PROPERTY:Landroid/util/Property; -Landroid/transition/ChangeBounds;->POSITION_PROPERTY:Landroid/util/Property; -Landroid/transition/Scene;->mEnterAction:Ljava/lang/Runnable; -Landroid/transition/Scene;->mExitAction:Ljava/lang/Runnable; -Landroid/transition/Scene;->setCurrentScene(Landroid/view/View;Landroid/transition/Scene;)V -Landroid/transition/Transition;->cancel()V -Landroid/transition/Transition;->end()V -Landroid/transition/Transition;->getRunningAnimators()Landroid/util/ArrayMap; -Landroid/transition/TransitionManager;->getRunningTransitions()Landroid/util/ArrayMap; -Landroid/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList; -Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal; Landroid/util/Singleton;-><init>()V Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setFindAccessibilityNodeInfoResult(Landroid/view/accessibility/AccessibilityNodeInfo;I)V Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setFindAccessibilityNodeInfosResult(Ljava/util/List;I)V Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setPerformAccessibilityActionResult(ZI)V Landroid/view/accessibility/IAccessibilityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/view/accessibility/IAccessibilityManager$Stub;-><init>()V Landroid/view/accessibility/IAccessibilityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/accessibility/IAccessibilityManager; Landroid/view/accessibility/IAccessibilityManager;->getEnabledAccessibilityServiceList(II)Ljava/util/List; Landroid/view/AccessibilityIterators$AbstractTextSegmentIterator;-><init>()V Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/autofill/IAutoFillManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/autofill/IAutoFillManager; -Landroid/view/IApplicationToken$Stub;-><init>()V Landroid/view/IDockedStackListener$Stub;-><init>()V Landroid/view/IGraphicsStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/IGraphicsStats$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IGraphicsStats; -Landroid/view/IOnKeyguardExitResult;->onKeyguardExitResult(Z)V Landroid/view/IRecentsAnimationController;->setAnimationTargetsBehindSystemBars(Z)V Landroid/view/IRotationWatcher$Stub;-><init>()V -Landroid/view/IRotationWatcher;->onRotationChanged(I)V Landroid/view/IWindow$Stub;-><init>()V Landroid/view/IWindow$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindow; -Landroid/view/IWindow;->closeSystemDialogs(Ljava/lang/String;)V -Landroid/view/IWindow;->dispatchAppVisibility(Z)V -Landroid/view/IWindow;->dispatchGetNewSurface()V -Landroid/view/IWindow;->dispatchWallpaperCommand(Ljava/lang/String;IIILandroid/os/Bundle;Z)V -Landroid/view/IWindow;->dispatchWallpaperOffsets(FFFFZ)V -Landroid/view/IWindow;->windowFocusChanged(ZZ)V Landroid/view/IWindowManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/view/IWindowManager$Stub$Proxy;->getBaseDisplayDensity(I)I Landroid/view/IWindowManager$Stub$Proxy;->getDockedStackSide()I @@ -2059,7 +1549,6 @@ Landroid/view/IWindowManager;->getInitialDisplayDensity(I)I Landroid/view/IWindowManager;->getInitialDisplaySize(ILandroid/graphics/Point;)V Landroid/view/IWindowManager;->getPendingAppTransition()I Landroid/view/IWindowManager;->hasNavigationBar()Z -Landroid/view/IWindowManager;->inputMethodClientHasFocus(Lcom/android/internal/view/IInputMethodClient;)Z Landroid/view/IWindowManager;->isKeyguardLocked()Z Landroid/view/IWindowManager;->isKeyguardSecure()Z Landroid/view/IWindowManager;->isSafeModeEnabled()Z @@ -2074,7 +1563,6 @@ Landroid/view/IWindowManager;->setStrictModeVisualIndicatorPreference(Ljava/lang Landroid/view/IWindowManager;->showStrictModeViolation(Z)V Landroid/view/IWindowManager;->thawRotation()V Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I -Landroid/view/IWindowSession$Stub;-><init>()V Landroid/view/IWindowSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowSession; Landroid/view/IWindowSession;->finishDrawing(Landroid/view/IWindow;)V Landroid/view/IWindowSession;->getInTouchMode()Z @@ -2145,32 +1633,15 @@ Lcom/android/internal/app/IAppOpsService;->getPackagesForOps([I)Ljava/util/List; Lcom/android/internal/app/IAppOpsService;->resetAllModes(ILjava/lang/String;)V Lcom/android/internal/app/IAppOpsService;->setMode(IILjava/lang/String;I)V Lcom/android/internal/app/IBatteryStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/app/IBatteryStats$Stub;-><init>()V Lcom/android/internal/app/IBatteryStats$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IBatteryStats; Lcom/android/internal/app/IBatteryStats;->computeChargeTimeRemaining()J Lcom/android/internal/app/IBatteryStats;->getAwakeTimeBattery()J Lcom/android/internal/app/IBatteryStats;->getStatistics()[B Lcom/android/internal/app/IBatteryStats;->isCharging()Z -Lcom/android/internal/app/IBatteryStats;->noteFullWifiLockAcquired(I)V -Lcom/android/internal/app/IBatteryStats;->noteFullWifiLockReleased(I)V -Lcom/android/internal/app/IBatteryStats;->notePhoneDataConnectionState(IZ)V -Lcom/android/internal/app/IBatteryStats;->notePhoneOff()V -Lcom/android/internal/app/IBatteryStats;->notePhoneOn()V -Lcom/android/internal/app/IBatteryStats;->notePhoneSignalStrength(Landroid/telephony/SignalStrength;)V -Lcom/android/internal/app/IBatteryStats;->notePhoneState(I)V -Lcom/android/internal/app/IBatteryStats;->noteScreenBrightness(I)V -Lcom/android/internal/app/IBatteryStats;->noteStartSensor(II)V -Lcom/android/internal/app/IBatteryStats;->noteStopSensor(II)V -Lcom/android/internal/app/IBatteryStats;->noteUserActivity(II)V -Lcom/android/internal/app/IBatteryStats;->noteWifiMulticastDisabled(I)V -Lcom/android/internal/app/IBatteryStats;->noteWifiMulticastEnabled(I)V Lcom/android/internal/app/IMediaContainerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IMediaContainerService; Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z Lcom/android/internal/app/IVoiceInteractionManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IVoiceInteractionManagerService; Lcom/android/internal/app/IVoiceInteractionManagerService;->getKeyphraseSoundModel(ILjava/lang/String;)Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel; -Lcom/android/internal/appwidget/IAppWidgetHost;->providerChanged(ILandroid/appwidget/AppWidgetProviderInfo;)V -Lcom/android/internal/appwidget/IAppWidgetHost;->updateAppWidget(ILandroid/widget/RemoteViews;)V -Lcom/android/internal/appwidget/IAppWidgetService$Stub;-><init>()V Lcom/android/internal/appwidget/IAppWidgetService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/appwidget/IAppWidgetService; Lcom/android/internal/appwidget/IAppWidgetService$Stub;->TRANSACTION_bindAppWidgetId:I Lcom/android/internal/appwidget/IAppWidgetService;->bindAppWidgetId(Ljava/lang/String;IILandroid/content/ComponentName;Landroid/os/Bundle;)Z @@ -2178,15 +1649,6 @@ Lcom/android/internal/appwidget/IAppWidgetService;->bindRemoteViewsService(Ljava Lcom/android/internal/appwidget/IAppWidgetService;->getAppWidgetIds(Landroid/content/ComponentName;)[I Lcom/android/internal/appwidget/IAppWidgetService;->getAppWidgetViews(Ljava/lang/String;I)Landroid/widget/RemoteViews; Lcom/android/internal/backup/IBackupTransport$Stub;-><init>()V -Lcom/android/internal/backup/IBackupTransport$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/backup/IBackupTransport; -Lcom/android/internal/backup/IBackupTransport;->clearBackupData(Landroid/content/pm/PackageInfo;)I -Lcom/android/internal/backup/IBackupTransport;->finishBackup()I -Lcom/android/internal/backup/IBackupTransport;->finishRestore()V -Lcom/android/internal/backup/IBackupTransport;->getRestoreData(Landroid/os/ParcelFileDescriptor;)I -Lcom/android/internal/backup/IBackupTransport;->initializeDevice()I -Lcom/android/internal/backup/IBackupTransport;->requestBackupTime()J -Lcom/android/internal/backup/IBackupTransport;->startRestore(J[Landroid/content/pm/PackageInfo;)I -Lcom/android/internal/backup/IBackupTransport;->transportDirName()Ljava/lang/String; Lcom/android/internal/location/ILocationProvider$Stub;-><init>()V Lcom/android/internal/logging/MetricsLogger;-><init>()V Lcom/android/internal/net/LegacyVpnInfo;-><init>()V @@ -2458,7 +1920,6 @@ Lcom/android/internal/R$styleable;->AndroidManifest_installLocation:I Lcom/android/internal/R$styleable;->AndroidManifest_sharedUserId:I Lcom/android/internal/R$styleable;->AndroidManifest_versionCode:I Lcom/android/internal/R$styleable;->AndroidManifest_versionName:I -Lcom/android/internal/R$styleable;->AppWidgetProviderInfo:[I Lcom/android/internal/R$styleable;->AutoCompleteTextView:[I Lcom/android/internal/R$styleable;->CheckBoxPreference:[I Lcom/android/internal/R$styleable;->CheckBoxPreference_disableDependentsState:I @@ -2648,7 +2109,6 @@ Lcom/android/internal/R$styleable;->View_id:I Lcom/android/internal/R$styleable;->View_longClickable:I Lcom/android/internal/R$styleable;->WallpaperPreviewInfo:[I Lcom/android/internal/R$styleable;->Window:[I -Lcom/android/internal/R$styleable;->WindowAnimation:[I Lcom/android/internal/R$styleable;->Window_windowActionBarFullscreenDecorLayout:I Lcom/android/internal/R$styleable;->Window_windowBackground:I Lcom/android/internal/R$styleable;->Window_windowFullscreen:I @@ -2667,59 +2127,10 @@ Lcom/android/internal/statusbar/IStatusBarService;->removeIcon(Ljava/lang/String Lcom/android/internal/statusbar/IStatusBarService;->setIconVisibility(Ljava/lang/String;Z)V Lcom/android/internal/telecom/ITelecomService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telecom/ITelecomService; Lcom/android/internal/telecom/ITelecomService;->getCallState()I -Lcom/android/internal/telephony/CallerInfo;-><init>()V -Lcom/android/internal/telephony/CallerInfo;->contactIdOrZero:J -Lcom/android/internal/telephony/CallerInfo;->getCallerInfo(Landroid/content/Context;Landroid/net/Uri;)Lcom/android/internal/telephony/CallerInfo; -Lcom/android/internal/telephony/CallerInfo;->getCallerInfo(Landroid/content/Context;Ljava/lang/String;)Lcom/android/internal/telephony/CallerInfo; -Lcom/android/internal/telephony/CallerInfo;->getCallerInfo(Landroid/content/Context;Ljava/lang/String;I)Lcom/android/internal/telephony/CallerInfo; -Lcom/android/internal/telephony/CallerInfo;->name:Ljava/lang/String; -Lcom/android/internal/telephony/CallerInfo;->numberLabel:Ljava/lang/String; -Lcom/android/internal/telephony/CallerInfo;->numberType:I -Lcom/android/internal/telephony/CallerInfo;->phoneNumber:Ljava/lang/String; -Lcom/android/internal/telephony/EncodeException;-><init>(C)V -Lcom/android/internal/telephony/EncodeException;-><init>(Ljava/lang/String;)V -Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;-><init>(I)V -Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;->languageCode:I -Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;->septetCounts:[I -Lcom/android/internal/telephony/GsmAlphabet$LanguagePairCount;->unencodableCounts:[I Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;-><init>()V -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->codeUnitCount:I -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->codeUnitSize:I -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->codeUnitsRemaining:I -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->languageShiftTable:I -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->languageTable:I -Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;->msgCount:I -Lcom/android/internal/telephony/GsmAlphabet;->charToGsm(C)I -Lcom/android/internal/telephony/GsmAlphabet;->charToGsm(CZ)I -Lcom/android/internal/telephony/GsmAlphabet;->countGsmSeptets(CZ)I -Lcom/android/internal/telephony/GsmAlphabet;->findGsmSeptetLimitIndex(Ljava/lang/String;IIII)I -Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BIIIII)Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->gsm8BitUnpackedToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->gsm8BitUnpackedToString([BIILjava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->gsmToChar(I)C -Lcom/android/internal/telephony/GsmAlphabet;->packSmsChar([BII)V -Lcom/android/internal/telephony/GsmAlphabet;->sCharsToGsmTables:[Landroid/util/SparseIntArray; -Lcom/android/internal/telephony/GsmAlphabet;->sCharsToShiftTables:[Landroid/util/SparseIntArray; -Lcom/android/internal/telephony/GsmAlphabet;->sEnabledLockingShiftTables:[I -Lcom/android/internal/telephony/GsmAlphabet;->sEnabledSingleShiftTables:[I -Lcom/android/internal/telephony/GsmAlphabet;->sHighestEnabledSingleShiftCode:I -Lcom/android/internal/telephony/GsmAlphabet;->sLanguageShiftTables:[Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->sLanguageTables:[Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPacked(Ljava/lang/String;IZII)[B -Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPackedWithHeader(Ljava/lang/String;[BII)[B -Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm8BitPacked(Ljava/lang/String;)[B Lcom/android/internal/telephony/ICarrierConfigLoader;->getConfigForSubId(ILjava/lang/String;)Landroid/os/PersistableBundle; Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms; Lcom/android/internal/telephony/IPhoneStateListener$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneStateListener; -Lcom/android/internal/telephony/IPhoneStateListener;->onCallForwardingIndicatorChanged(Z)V -Lcom/android/internal/telephony/IPhoneStateListener;->onCallStateChanged(ILjava/lang/String;)V -Lcom/android/internal/telephony/IPhoneStateListener;->onCellLocationChanged(Landroid/os/Bundle;)V -Lcom/android/internal/telephony/IPhoneStateListener;->onDataActivity(I)V -Lcom/android/internal/telephony/IPhoneStateListener;->onDataConnectionStateChanged(II)V -Lcom/android/internal/telephony/IPhoneStateListener;->onMessageWaitingIndicatorChanged(Z)V -Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Landroid/telephony/ServiceState;)V -Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V -Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V @@ -2778,7 +2189,6 @@ Lcom/android/internal/telephony/ITelephony;->supplyPin(Ljava/lang/String;)Z Lcom/android/internal/telephony/ITelephony;->toggleRadioOnOff()V Lcom/android/internal/telephony/ITelephony;->updateServiceLocation()V Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/telephony/ITelephonyRegistry$Stub;-><init>()V Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry; Lcom/android/internal/telephony/ITelephonyRegistry;->listen(Ljava/lang/String;Lcom/android/internal/telephony/IPhoneStateListener;IZ)V Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallForwardingChanged(Z)V @@ -2792,80 +2202,15 @@ Lcom/android/internal/telephony/IWapPushManager$Stub;->asInterface(Landroid/os/I Lcom/android/internal/telephony/IWapPushManager;->addPackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZ)Z Lcom/android/internal/telephony/IWapPushManager;->deletePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z Lcom/android/internal/telephony/IWapPushManager;->updatePackage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZ)Z -Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/android/internal/telephony/OperatorInfo$State;)V -Lcom/android/internal/telephony/OperatorInfo;->mOperatorAlphaLong:Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->mOperatorAlphaShort:Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->mOperatorNumeric:Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->mState:Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/OperatorInfo;->rilStateToState(Ljava/lang/String;)Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/SmsAddress;->origBytes:[B -Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_0:Lcom/android/internal/telephony/SmsConstants$MessageClass; -Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_1:Lcom/android/internal/telephony/SmsConstants$MessageClass; -Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_2:Lcom/android/internal/telephony/SmsConstants$MessageClass; -Lcom/android/internal/telephony/SmsConstants$MessageClass;->CLASS_3:Lcom/android/internal/telephony/SmsConstants$MessageClass; -Lcom/android/internal/telephony/SmsConstants$MessageClass;->UNKNOWN:Lcom/android/internal/telephony/SmsConstants$MessageClass; Lcom/android/internal/telephony/SmsHeader$ConcatRef;-><init>()V -Lcom/android/internal/telephony/SmsHeader$ConcatRef;->msgCount:I -Lcom/android/internal/telephony/SmsHeader$ConcatRef;->refNumber:I -Lcom/android/internal/telephony/SmsHeader$ConcatRef;->seqNumber:I Lcom/android/internal/telephony/SmsHeader$PortAddrs;-><init>()V -Lcom/android/internal/telephony/SmsHeader$PortAddrs;->destPort:I -Lcom/android/internal/telephony/SmsHeader$PortAddrs;->origPort:I -Lcom/android/internal/telephony/SmsHeader;-><init>()V -Lcom/android/internal/telephony/SmsHeader;->concatRef:Lcom/android/internal/telephony/SmsHeader$ConcatRef; -Lcom/android/internal/telephony/SmsHeader;->fromByteArray([B)Lcom/android/internal/telephony/SmsHeader; -Lcom/android/internal/telephony/SmsHeader;->languageShiftTable:I -Lcom/android/internal/telephony/SmsHeader;->languageTable:I -Lcom/android/internal/telephony/SmsHeader;->portAddrs:Lcom/android/internal/telephony/SmsHeader$PortAddrs; -Lcom/android/internal/telephony/SmsHeader;->toByteArray(Lcom/android/internal/telephony/SmsHeader;)[B -Lcom/android/internal/telephony/SmsMessageBase$SubmitPduBase;->encodedMessage:[B -Lcom/android/internal/telephony/SmsMessageBase$SubmitPduBase;->encodedScAddress:[B Lcom/android/internal/telephony/SmsMessageBase;-><init>()V -Lcom/android/internal/telephony/SmsMessageBase;->getDisplayMessageBody()Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->getDisplayOriginatingAddress()Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->getMessageBody()Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->getOriginatingAddress()Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->getProtocolIdentifier()I -Lcom/android/internal/telephony/SmsMessageBase;->getPseudoSubject()Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->getServiceCenterAddress()Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->getStatus()I -Lcom/android/internal/telephony/SmsMessageBase;->getTimestampMillis()J -Lcom/android/internal/telephony/SmsMessageBase;->getUserData()[B -Lcom/android/internal/telephony/SmsMessageBase;->getUserDataHeader()Lcom/android/internal/telephony/SmsHeader; -Lcom/android/internal/telephony/SmsMessageBase;->isReplace()Z -Lcom/android/internal/telephony/SmsMessageBase;->isReplyPathPresent()Z -Lcom/android/internal/telephony/SmsMessageBase;->isStatusReportMessage()Z -Lcom/android/internal/telephony/SmsMessageBase;->mIsMwi:Z -Lcom/android/internal/telephony/SmsMessageBase;->mMessageBody:Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->mMessageRef:I -Lcom/android/internal/telephony/SmsMessageBase;->mMwiDontStore:Z -Lcom/android/internal/telephony/SmsMessageBase;->mMwiSense:Z -Lcom/android/internal/telephony/SmsMessageBase;->mOriginatingAddress:Lcom/android/internal/telephony/SmsAddress; -Lcom/android/internal/telephony/SmsMessageBase;->mPdu:[B -Lcom/android/internal/telephony/SmsMessageBase;->mScAddress:Ljava/lang/String; -Lcom/android/internal/telephony/SmsMessageBase;->mUserDataHeader:Lcom/android/internal/telephony/SmsHeader; -Lcom/android/internal/telephony/SmsRawData;-><init>([B)V -Lcom/android/internal/telephony/SmsRawData;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/telephony/SmsRawData;->getBytes()[B Lcom/android/internal/textservice/ITextServicesManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/util/HexDump;->toHexString([BZ)Ljava/lang/String; Lcom/android/internal/view/BaseIWindow;-><init>()V -Lcom/android/internal/view/IInputMethod$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethod; -Lcom/android/internal/view/IInputMethod;->attachToken(Landroid/os/IBinder;)V -Lcom/android/internal/view/IInputMethod;->bindInput(Landroid/view/inputmethod/InputBinding;)V -Lcom/android/internal/view/IInputMethod;->hideSoftInput(ILandroid/os/ResultReceiver;)V -Lcom/android/internal/view/IInputMethod;->setSessionEnabled(Lcom/android/internal/view/IInputMethodSession;Z)V -Lcom/android/internal/view/IInputMethod;->showSoftInput(ILandroid/os/ResultReceiver;)V -Lcom/android/internal/view/IInputMethod;->unbindInput()V -Lcom/android/internal/view/IInputMethodClient;->onBindMethod(Lcom/android/internal/view/InputBindResult;)V -Lcom/android/internal/view/IInputMethodClient;->setUsingInputMethod(Z)V Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;->getEnabledInputMethodList()Ljava/util/List; -Lcom/android/internal/view/IInputMethodManager$Stub;-><init>()V Lcom/android/internal/view/IInputMethodManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodManager; -Lcom/android/internal/view/IInputMethodManager;->addClient(Lcom/android/internal/view/IInputMethodClient;Lcom/android/internal/view/IInputContext;II)V -Lcom/android/internal/view/IInputMethodManager;->removeClient(Lcom/android/internal/view/IInputMethodClient;)V Lcom/android/internal/view/IInputMethodSession$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodSession; Lcom/android/internal/widget/ILockSettings$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/widget/ILockSettings; Lcom/android/internal/widget/ILockSettings;->getBoolean(Ljava/lang/String;ZI)Z diff --git a/config/hiddenapi-p-light-greylist.txt b/config/hiddenapi-p-light-greylist.txt deleted file mode 100644 index 1bcb6850d929..000000000000 --- a/config/hiddenapi-p-light-greylist.txt +++ /dev/null @@ -1,5998 +0,0 @@ -Landroid/R$styleable;->ActionBar:[I -Landroid/R$styleable;->ActionBar_background:I -Landroid/R$styleable;->ActionBar_backgroundSplit:I -Landroid/R$styleable;->ActionBar_backgroundStacked:I -Landroid/R$styleable;->ActionBar_divider:I -Landroid/R$styleable;->ActionBar_itemPadding:I -Landroid/R$styleable;->CalendarView:[I -Landroid/R$styleable;->CalendarView_dateTextAppearance:I -Landroid/R$styleable;->CalendarView_firstDayOfWeek:I -Landroid/R$styleable;->CalendarView_focusedMonthDateColor:I -Landroid/R$styleable;->CalendarView_selectedDateVerticalBar:I -Landroid/R$styleable;->CalendarView_selectedWeekBackgroundColor:I -Landroid/R$styleable;->CalendarView_showWeekNumber:I -Landroid/R$styleable;->CalendarView_shownWeekCount:I -Landroid/R$styleable;->CalendarView_unfocusedMonthDateColor:I -Landroid/R$styleable;->CalendarView_weekDayTextAppearance:I -Landroid/R$styleable;->CalendarView_weekNumberColor:I -Landroid/R$styleable;->CalendarView_weekSeparatorLineColor:I -Landroid/R$styleable;->CheckBoxPreference:[I -Landroid/R$styleable;->CheckedTextView:[I -Landroid/R$styleable;->CheckedTextView_checkMark:I -Landroid/R$styleable;->CompoundButton:[I -Landroid/R$styleable;->CompoundButton_button:I -Landroid/R$styleable;->DrawableStates:[I -Landroid/R$styleable;->ImageView:[I -Landroid/R$styleable;->ImageView_adjustViewBounds:I -Landroid/R$styleable;->ImageView_baselineAlignBottom:I -Landroid/R$styleable;->ImageView_cropToPadding:I -Landroid/R$styleable;->ImageView_maxHeight:I -Landroid/R$styleable;->ImageView_maxWidth:I -Landroid/R$styleable;->ImageView_scaleType:I -Landroid/R$styleable;->ImageView_src:I -Landroid/R$styleable;->ImageView_tint:I -Landroid/R$styleable;->LinearLayout:[I -Landroid/R$styleable;->LinearLayout_divider:I -Landroid/R$styleable;->LinearLayout_dividerPadding:I -Landroid/R$styleable;->LinearLayout_showDividers:I -Landroid/R$styleable;->ListView:[I -Landroid/R$styleable;->ListView_divider:I -Landroid/R$styleable;->ListView_dividerHeight:I -Landroid/R$styleable;->ProgressBar:[I -Landroid/R$styleable;->ProgressBar_indeterminateDrawable:I -Landroid/R$styleable;->ProgressBar_indeterminateDuration:I -Landroid/R$styleable;->ProgressBar_maxHeight:I -Landroid/R$styleable;->ProgressBar_maxWidth:I -Landroid/R$styleable;->ProgressBar_minHeight:I -Landroid/R$styleable;->ProgressBar_minWidth:I -Landroid/R$styleable;->ProgressBar_progressDrawable:I -Landroid/R$styleable;->SeekBar:[I -Landroid/R$styleable;->SeekBar_thumb:I -Landroid/R$styleable;->SeekBar_thumbOffset:I -Landroid/R$styleable;->Switch:[I -Landroid/R$styleable;->Switch_showText:I -Landroid/R$styleable;->Switch_splitTrack:I -Landroid/R$styleable;->Switch_switchMinWidth:I -Landroid/R$styleable;->Switch_switchPadding:I -Landroid/R$styleable;->Switch_switchTextAppearance:I -Landroid/R$styleable;->Switch_textOff:I -Landroid/R$styleable;->Switch_textOn:I -Landroid/R$styleable;->Switch_thumb:I -Landroid/R$styleable;->Switch_thumbTextPadding:I -Landroid/R$styleable;->Switch_track:I -Landroid/R$styleable;->TextAppearance:[I -Landroid/R$styleable;->TextAppearance_textAllCaps:I -Landroid/R$styleable;->TextAppearance_textColor:I -Landroid/R$styleable;->TextAppearance_textColorHighlight:I -Landroid/R$styleable;->TextAppearance_textColorHint:I -Landroid/R$styleable;->TextAppearance_textColorLink:I -Landroid/R$styleable;->TextAppearance_textSize:I -Landroid/R$styleable;->TextAppearance_textStyle:I -Landroid/R$styleable;->TextAppearance_typeface:I -Landroid/R$styleable;->TextView:[I -Landroid/R$styleable;->TextView_autoLink:I -Landroid/R$styleable;->TextView_autoText:I -Landroid/R$styleable;->TextView_bufferType:I -Landroid/R$styleable;->TextView_capitalize:I -Landroid/R$styleable;->TextView_cursorVisible:I -Landroid/R$styleable;->TextView_digits:I -Landroid/R$styleable;->TextView_drawableBottom:I -Landroid/R$styleable;->TextView_drawableEnd:I -Landroid/R$styleable;->TextView_drawableLeft:I -Landroid/R$styleable;->TextView_drawablePadding:I -Landroid/R$styleable;->TextView_drawableRight:I -Landroid/R$styleable;->TextView_drawableStart:I -Landroid/R$styleable;->TextView_drawableTop:I -Landroid/R$styleable;->TextView_editable:I -Landroid/R$styleable;->TextView_ellipsize:I -Landroid/R$styleable;->TextView_ems:I -Landroid/R$styleable;->TextView_enabled:I -Landroid/R$styleable;->TextView_freezesText:I -Landroid/R$styleable;->TextView_gravity:I -Landroid/R$styleable;->TextView_height:I -Landroid/R$styleable;->TextView_hint:I -Landroid/R$styleable;->TextView_imeActionId:I -Landroid/R$styleable;->TextView_imeActionLabel:I -Landroid/R$styleable;->TextView_imeOptions:I -Landroid/R$styleable;->TextView_includeFontPadding:I -Landroid/R$styleable;->TextView_inputMethod:I -Landroid/R$styleable;->TextView_inputType:I -Landroid/R$styleable;->TextView_lineSpacingExtra:I -Landroid/R$styleable;->TextView_lineSpacingMultiplier:I -Landroid/R$styleable;->TextView_lines:I -Landroid/R$styleable;->TextView_linksClickable:I -Landroid/R$styleable;->TextView_marqueeRepeatLimit:I -Landroid/R$styleable;->TextView_maxEms:I -Landroid/R$styleable;->TextView_maxHeight:I -Landroid/R$styleable;->TextView_maxLength:I -Landroid/R$styleable;->TextView_maxLines:I -Landroid/R$styleable;->TextView_maxWidth:I -Landroid/R$styleable;->TextView_minEms:I -Landroid/R$styleable;->TextView_minHeight:I -Landroid/R$styleable;->TextView_minLines:I -Landroid/R$styleable;->TextView_minWidth:I -Landroid/R$styleable;->TextView_numeric:I -Landroid/R$styleable;->TextView_password:I -Landroid/R$styleable;->TextView_phoneNumber:I -Landroid/R$styleable;->TextView_privateImeOptions:I -Landroid/R$styleable;->TextView_scrollHorizontally:I -Landroid/R$styleable;->TextView_selectAllOnFocus:I -Landroid/R$styleable;->TextView_shadowColor:I -Landroid/R$styleable;->TextView_shadowDx:I -Landroid/R$styleable;->TextView_shadowDy:I -Landroid/R$styleable;->TextView_shadowRadius:I -Landroid/R$styleable;->TextView_singleLine:I -Landroid/R$styleable;->TextView_text:I -Landroid/R$styleable;->TextView_textAllCaps:I -Landroid/R$styleable;->TextView_textAppearance:I -Landroid/R$styleable;->TextView_textColor:I -Landroid/R$styleable;->TextView_textColorHighlight:I -Landroid/R$styleable;->TextView_textColorHint:I -Landroid/R$styleable;->TextView_textColorLink:I -Landroid/R$styleable;->TextView_textCursorDrawable:I -Landroid/R$styleable;->TextView_textIsSelectable:I -Landroid/R$styleable;->TextView_textScaleX:I -Landroid/R$styleable;->TextView_textSelectHandle:I -Landroid/R$styleable;->TextView_textSelectHandleLeft:I -Landroid/R$styleable;->TextView_textSelectHandleRight:I -Landroid/R$styleable;->TextView_textSize:I -Landroid/R$styleable;->TextView_textStyle:I -Landroid/R$styleable;->TextView_typeface:I -Landroid/R$styleable;->TextView_width:I -Landroid/R$styleable;->View:[I -Landroid/R$styleable;->ViewDrawableStates:[I -Landroid/R$styleable;->ViewGroup_Layout:[I -Landroid/R$styleable;->ViewGroup_MarginLayout:[I -Landroid/R$styleable;->View_background:I -Landroid/R$styleable;->View_clickable:I -Landroid/R$styleable;->View_contentDescription:I -Landroid/R$styleable;->View_drawingCacheQuality:I -Landroid/R$styleable;->View_duplicateParentState:I -Landroid/R$styleable;->View_fadingEdge:I -Landroid/R$styleable;->View_filterTouchesWhenObscured:I -Landroid/R$styleable;->View_fitsSystemWindows:I -Landroid/R$styleable;->View_focusable:I -Landroid/R$styleable;->View_focusableInTouchMode:I -Landroid/R$styleable;->View_hapticFeedbackEnabled:I -Landroid/R$styleable;->View_id:I -Landroid/R$styleable;->View_isScrollContainer:I -Landroid/R$styleable;->View_keepScreenOn:I -Landroid/R$styleable;->View_longClickable:I -Landroid/R$styleable;->View_minHeight:I -Landroid/R$styleable;->View_minWidth:I -Landroid/R$styleable;->View_nextFocusDown:I -Landroid/R$styleable;->View_nextFocusLeft:I -Landroid/R$styleable;->View_nextFocusRight:I -Landroid/R$styleable;->View_nextFocusUp:I -Landroid/R$styleable;->View_onClick:I -Landroid/R$styleable;->View_overScrollMode:I -Landroid/R$styleable;->View_padding:I -Landroid/R$styleable;->View_paddingBottom:I -Landroid/R$styleable;->View_paddingEnd:I -Landroid/R$styleable;->View_paddingLeft:I -Landroid/R$styleable;->View_paddingRight:I -Landroid/R$styleable;->View_paddingStart:I -Landroid/R$styleable;->View_paddingTop:I -Landroid/R$styleable;->View_saveEnabled:I -Landroid/R$styleable;->View_scrollX:I -Landroid/R$styleable;->View_scrollY:I -Landroid/R$styleable;->View_scrollbarDefaultDelayBeforeFade:I -Landroid/R$styleable;->View_scrollbarFadeDuration:I -Landroid/R$styleable;->View_scrollbarSize:I -Landroid/R$styleable;->View_scrollbarStyle:I -Landroid/R$styleable;->View_scrollbarThumbHorizontal:I -Landroid/R$styleable;->View_scrollbarThumbVertical:I -Landroid/R$styleable;->View_scrollbarTrackHorizontal:I -Landroid/R$styleable;->View_scrollbarTrackVertical:I -Landroid/R$styleable;->View_scrollbars:I -Landroid/R$styleable;->View_soundEffectsEnabled:I -Landroid/R$styleable;->View_tag:I -Landroid/R$styleable;->View_visibility:I -Landroid/R$styleable;->Window:[I -Landroid/R$styleable;->Window_windowBackground:I -Landroid/R$styleable;->Window_windowFrame:I -Landroid/accounts/AccountManager;-><init>(Landroid/content/Context;Landroid/accounts/IAccountManager;Landroid/os/Handler;)V -Landroid/accounts/AccountManager;->mContext:Landroid/content/Context; -Landroid/accounts/IAccountAuthenticator$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/accounts/IAccountAuthenticator$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/accounts/IAccountAuthenticator$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountAuthenticator; -Landroid/accounts/IAccountAuthenticator;->addAccount(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Landroid/os/Bundle;)V -Landroid/accounts/IAccountAuthenticator;->confirmCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Landroid/os/Bundle;)V -Landroid/accounts/IAccountAuthenticator;->editProperties(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V -Landroid/accounts/IAccountAuthenticator;->getAccountRemovalAllowed(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;)V -Landroid/accounts/IAccountAuthenticator;->getAuthToken(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)V -Landroid/accounts/IAccountAuthenticator;->getAuthTokenLabel(Landroid/accounts/IAccountAuthenticatorResponse;Ljava/lang/String;)V -Landroid/accounts/IAccountAuthenticator;->hasFeatures(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;[Ljava/lang/String;)V -Landroid/accounts/IAccountAuthenticator;->updateCredentials(Landroid/accounts/IAccountAuthenticatorResponse;Landroid/accounts/Account;Ljava/lang/String;Landroid/os/Bundle;)V -Landroid/accounts/IAccountAuthenticatorResponse$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/accounts/IAccountAuthenticatorResponse$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/accounts/IAccountAuthenticatorResponse$Stub;-><init>()V -Landroid/accounts/IAccountAuthenticatorResponse$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountAuthenticatorResponse; -Landroid/accounts/IAccountManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/accounts/IAccountManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManager; -Landroid/accounts/IAccountManagerResponse$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/accounts/IAccountManagerResponse$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/accounts/IAccountManagerResponse$Stub;-><init>()V -Landroid/accounts/IAccountManagerResponse$Stub;->asInterface(Landroid/os/IBinder;)Landroid/accounts/IAccountManagerResponse; -Landroid/accounts/IAccountManagerResponse;->onError(ILjava/lang/String;)V -Landroid/accounts/IAccountManagerResponse;->onResult(Landroid/os/Bundle;)V -Landroid/animation/LayoutTransition;->cancel()V -Landroid/animation/LayoutTransition;->cancel(I)V -Landroid/animation/ValueAnimator;->animateValue(F)V -Landroid/animation/ValueAnimator;->sDurationScale:F -Landroid/app/ActionBar;->setShowHideAnimationEnabled(Z)V -Landroid/app/Activity;->enterPictureInPictureMode(Landroid/app/PictureInPictureArgs;)Z -Landroid/app/Activity;->getActivityOptions()Landroid/app/ActivityOptions; -Landroid/app/Activity;->getActivityToken()Landroid/os/IBinder; -Landroid/app/Activity;->mActivityInfo:Landroid/content/pm/ActivityInfo; -Landroid/app/Activity;->mApplication:Landroid/app/Application; -Landroid/app/Activity;->mComponent:Landroid/content/ComponentName; -Landroid/app/Activity;->mFinished:Z -Landroid/app/Activity;->mFragments:Landroid/app/FragmentController; -Landroid/app/Activity;->mHandler:Landroid/os/Handler; -Landroid/app/Activity;->mInstrumentation:Landroid/app/Instrumentation; -Landroid/app/Activity;->mMainThread:Landroid/app/ActivityThread; -Landroid/app/Activity;->mReferrer:Ljava/lang/String; -Landroid/app/Activity;->mResultCode:I -Landroid/app/Activity;->mResultData:Landroid/content/Intent; -Landroid/app/Activity;->mResumed:Z -Landroid/app/Activity;->mToken:Landroid/os/IBinder; -Landroid/app/Activity;->mWindow:Landroid/view/Window; -Landroid/app/Activity;->mWindowManager:Landroid/view/WindowManager; -Landroid/app/Activity;->managedQuery(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; -Landroid/app/Activity;->registerRemoteAnimations(Landroid/view/RemoteAnimationDefinition;)V -Landroid/app/Activity;->setDisablePreviewScreenshots(Z)V -Landroid/app/Activity;->setPersistent(Z)V -Landroid/app/Activity;->setPictureInPictureArgs(Landroid/app/PictureInPictureArgs;)V -Landroid/app/ActivityGroup;->mLocalActivityManager:Landroid/app/LocalActivityManager; -Landroid/app/ActivityManager$RecentTaskInfo;->configuration:Landroid/content/res/Configuration; -Landroid/app/ActivityManager$RecentTaskInfo;->firstActiveTime:J -Landroid/app/ActivityManager$RecentTaskInfo;->lastActiveTime:J -Landroid/app/ActivityManager$RecentTaskInfo;->resizeMode:I -Landroid/app/ActivityManager$RecentTaskInfo;->supportsSplitScreenMultiWindow:Z -Landroid/app/ActivityManager$RecentTaskInfo;->userId:I -Landroid/app/ActivityManager$RunningAppProcessInfo;->flags:I -Landroid/app/ActivityManager$RunningAppProcessInfo;->processState:I -Landroid/app/ActivityManager$TaskDescription;->getBackgroundColor()I -Landroid/app/ActivityManager$TaskDescription;->getInMemoryIcon()Landroid/graphics/Bitmap; -Landroid/app/ActivityManager$TaskDescription;->loadTaskDescriptionIcon(Ljava/lang/String;I)Landroid/graphics/Bitmap; -Landroid/app/ActivityManager$TaskSnapshot;->getContentInsets()Landroid/graphics/Rect; -Landroid/app/ActivityManager$TaskSnapshot;->getOrientation()I -Landroid/app/ActivityManager$TaskSnapshot;->getScale()F -Landroid/app/ActivityManager$TaskSnapshot;->getSnapshot()Landroid/graphics/GraphicBuffer; -Landroid/app/ActivityManager$TaskSnapshot;->isRealSnapshot()Z -Landroid/app/ActivityManager$TaskSnapshot;->isReducedResolution()Z -Landroid/app/ActivityManager;->IActivityManagerSingleton:Landroid/util/Singleton; -Landroid/app/ActivityManager;->PROCESS_STATE_IMPORTANT_BACKGROUND:I -Landroid/app/ActivityManager;->PROCESS_STATE_TOP:I -Landroid/app/ActivityManager;->clearApplicationUserData(Ljava/lang/String;Landroid/content/pm/IPackageDataObserver;)Z -Landroid/app/ActivityManager;->getMaxNumPictureInPictureActions()I -Landroid/app/ActivityManager;->getMaxRecentTasksStatic()I -Landroid/app/ActivityManager;->getService()Landroid/app/IActivityManager; -Landroid/app/ActivityManager;->isHighEndGfx()Z -Landroid/app/ActivityManager;->isLowRamDeviceStatic()Z -Landroid/app/ActivityManager;->isUserRunning(I)Z -Landroid/app/ActivityManager;->mContext:Landroid/content/Context; -Landroid/app/ActivityManager;->setPersistentVrThread(I)V -Landroid/app/ActivityManagerNative;->asInterface(Landroid/os/IBinder;)Landroid/app/IActivityManager; -Landroid/app/ActivityManagerNative;->broadcastStickyIntent(Landroid/content/Intent;Ljava/lang/String;I)V -Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager; -Landroid/app/ActivityOptions;->makeMultiThumbFutureAspectScaleAnimation(Landroid/content/Context;Landroid/os/Handler;Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/app/ActivityOptions$OnAnimationStartedListener;Z)Landroid/app/ActivityOptions; -Landroid/app/ActivityOptions;->makeRemoteAnimation(Landroid/view/RemoteAnimationAdapter;)Landroid/app/ActivityOptions; -Landroid/app/ActivityOptions;->setSplitScreenCreateMode(I)V -Landroid/app/ActivityThread$ActivityClientRecord;->activity:Landroid/app/Activity; -Landroid/app/ActivityThread$ActivityClientRecord;->activityInfo:Landroid/content/pm/ActivityInfo; -Landroid/app/ActivityThread$ActivityClientRecord;->compatInfo:Landroid/content/res/CompatibilityInfo; -Landroid/app/ActivityThread$ActivityClientRecord;->intent:Landroid/content/Intent; -Landroid/app/ActivityThread$ActivityClientRecord;->mPreserveWindow:Z -Landroid/app/ActivityThread$ActivityClientRecord;->packageInfo:Landroid/app/LoadedApk; -Landroid/app/ActivityThread$ActivityClientRecord;->paused:Z -Landroid/app/ActivityThread$ActivityClientRecord;->stopped:Z -Landroid/app/ActivityThread$ActivityClientRecord;->token:Landroid/os/IBinder; -Landroid/app/ActivityThread$AppBindData;->appInfo:Landroid/content/pm/ApplicationInfo; -Landroid/app/ActivityThread$AppBindData;->info:Landroid/app/LoadedApk; -Landroid/app/ActivityThread$AppBindData;->instrumentationArgs:Landroid/os/Bundle; -Landroid/app/ActivityThread$AppBindData;->persistent:Z -Landroid/app/ActivityThread$AppBindData;->processName:Ljava/lang/String; -Landroid/app/ActivityThread$AppBindData;->providers:Ljava/util/List; -Landroid/app/ActivityThread$AppBindData;->restrictedBackupMode:Z -Landroid/app/ActivityThread$BindServiceData;->intent:Landroid/content/Intent; -Landroid/app/ActivityThread$BindServiceData;->token:Landroid/os/IBinder; -Landroid/app/ActivityThread$CreateServiceData;-><init>()V -Landroid/app/ActivityThread$CreateServiceData;->compatInfo:Landroid/content/res/CompatibilityInfo; -Landroid/app/ActivityThread$CreateServiceData;->info:Landroid/content/pm/ServiceInfo; -Landroid/app/ActivityThread$CreateServiceData;->intent:Landroid/content/Intent; -Landroid/app/ActivityThread$CreateServiceData;->token:Landroid/os/IBinder; -Landroid/app/ActivityThread$H;->BIND_SERVICE:I -Landroid/app/ActivityThread$H;->CREATE_SERVICE:I -Landroid/app/ActivityThread$H;->DUMP_PROVIDER:I -Landroid/app/ActivityThread$H;->ENTER_ANIMATION_COMPLETE:I -Landroid/app/ActivityThread$H;->EXIT_APPLICATION:I -Landroid/app/ActivityThread$H;->GC_WHEN_IDLE:I -Landroid/app/ActivityThread$H;->INSTALL_PROVIDER:I -Landroid/app/ActivityThread$H;->RECEIVER:I -Landroid/app/ActivityThread$H;->REMOVE_PROVIDER:I -Landroid/app/ActivityThread$H;->SCHEDULE_CRASH:I -Landroid/app/ActivityThread$H;->SERVICE_ARGS:I -Landroid/app/ActivityThread$H;->STOP_SERVICE:I -Landroid/app/ActivityThread$H;->UNBIND_SERVICE:I -Landroid/app/ActivityThread$ProviderClientRecord;->mHolder:Landroid/app/ContentProviderHolder; -Landroid/app/ActivityThread$ProviderClientRecord;->mLocalProvider:Landroid/content/ContentProvider; -Landroid/app/ActivityThread$ProviderClientRecord;->mProvider:Landroid/content/IContentProvider; -Landroid/app/ActivityThread$ReceiverData;->compatInfo:Landroid/content/res/CompatibilityInfo; -Landroid/app/ActivityThread$ReceiverData;->info:Landroid/content/pm/ActivityInfo; -Landroid/app/ActivityThread$ReceiverData;->intent:Landroid/content/Intent; -Landroid/app/ActivityThread$ServiceArgsData;->args:Landroid/content/Intent; -Landroid/app/ActivityThread$ServiceArgsData;->token:Landroid/os/IBinder; -Landroid/app/ActivityThread;->currentActivityThread()Landroid/app/ActivityThread; -Landroid/app/ActivityThread;->currentApplication()Landroid/app/Application; -Landroid/app/ActivityThread;->currentPackageName()Ljava/lang/String; -Landroid/app/ActivityThread;->currentProcessName()Ljava/lang/String; -Landroid/app/ActivityThread;->getActivity(Landroid/os/IBinder;)Landroid/app/Activity; -Landroid/app/ActivityThread;->getApplication()Landroid/app/Application; -Landroid/app/ActivityThread;->getApplicationThread()Landroid/app/ActivityThread$ApplicationThread; -Landroid/app/ActivityThread;->getHandler()Landroid/os/Handler; -Landroid/app/ActivityThread;->getInstrumentation()Landroid/app/Instrumentation; -Landroid/app/ActivityThread;->getPackageInfo(Landroid/content/pm/ApplicationInfo;Landroid/content/res/CompatibilityInfo;I)Landroid/app/LoadedApk; -Landroid/app/ActivityThread;->getPackageInfoNoCheck(Landroid/content/pm/ApplicationInfo;Landroid/content/res/CompatibilityInfo;)Landroid/app/LoadedApk; -Landroid/app/ActivityThread;->getPackageManager()Landroid/content/pm/IPackageManager; -Landroid/app/ActivityThread;->getProcessName()Ljava/lang/String; -Landroid/app/ActivityThread;->getSystemContext()Landroid/app/ContextImpl; -Landroid/app/ActivityThread;->handleBindApplication(Landroid/app/ActivityThread$AppBindData;)V -Landroid/app/ActivityThread;->installContentProviders(Landroid/content/Context;Ljava/util/List;)V -Landroid/app/ActivityThread;->installProvider(Landroid/content/Context;Landroid/app/ContentProviderHolder;Landroid/content/pm/ProviderInfo;ZZZ)Landroid/app/ContentProviderHolder; -Landroid/app/ActivityThread;->mActivities:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->mAllApplications:Ljava/util/ArrayList; -Landroid/app/ActivityThread;->mBoundApplication:Landroid/app/ActivityThread$AppBindData; -Landroid/app/ActivityThread;->mConfiguration:Landroid/content/res/Configuration; -Landroid/app/ActivityThread;->mCurDefaultDisplayDpi:I -Landroid/app/ActivityThread;->mDensityCompatMode:Z -Landroid/app/ActivityThread;->mH:Landroid/app/ActivityThread$H; -Landroid/app/ActivityThread;->mInitialApplication:Landroid/app/Application; -Landroid/app/ActivityThread;->mInstrumentation:Landroid/app/Instrumentation; -Landroid/app/ActivityThread;->mLocalProviders:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->mLocalProvidersByName:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->mNumVisibleActivities:I -Landroid/app/ActivityThread;->mPackages:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->mPendingConfiguration:Landroid/content/res/Configuration; -Landroid/app/ActivityThread;->mProviderMap:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->mResourcePackages:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->mResourcesManager:Landroid/app/ResourcesManager; -Landroid/app/ActivityThread;->mServices:Landroid/util/ArrayMap; -Landroid/app/ActivityThread;->performNewIntents(Landroid/os/IBinder;Ljava/util/List;Z)V -Landroid/app/ActivityThread;->performStopActivity(Landroid/os/IBinder;ZLjava/lang/String;)V -Landroid/app/ActivityThread;->sCurrentActivityThread:Landroid/app/ActivityThread; -Landroid/app/ActivityThread;->sPackageManager:Landroid/content/pm/IPackageManager; -Landroid/app/ActivityThread;->sendActivityResult(Landroid/os/IBinder;Ljava/lang/String;IILandroid/content/Intent;)V -Landroid/app/ActivityThread;->startActivityNow(Landroid/app/Activity;Ljava/lang/String;Landroid/content/Intent;Landroid/content/pm/ActivityInfo;Landroid/os/IBinder;Landroid/os/Bundle;Landroid/app/Activity$NonConfigurationInstances;)Landroid/app/Activity; -Landroid/app/ActivityView;-><init>(Landroid/content/Context;)V -Landroid/app/ActivityView;->release()V -Landroid/app/ActivityView;->startActivity(Landroid/app/PendingIntent;)V -Landroid/app/ActivityView;->startActivity(Landroid/content/Intent;)V -Landroid/app/AlarmManager;->FLAG_ALLOW_WHILE_IDLE_UNRESTRICTED:I -Landroid/app/AlarmManager;->FLAG_IDLE_UNTIL:I -Landroid/app/AlarmManager;->FLAG_STANDALONE:I -Landroid/app/AlarmManager;->FLAG_WAKE_FROM_IDLE:I -Landroid/app/AlarmManager;->WINDOW_EXACT:J -Landroid/app/AlarmManager;->WINDOW_HEURISTIC:J -Landroid/app/AlarmManager;->mService:Landroid/app/IAlarmManager; -Landroid/app/AlertDialog$Builder;->P:Lcom/android/internal/app/AlertController$AlertParams; -Landroid/app/AlertDialog$Builder;->setRecycleOnMeasureEnabled(Z)Landroid/app/AlertDialog$Builder; -Landroid/app/AlertDialog$Builder;->setView(Landroid/view/View;IIII)Landroid/app/AlertDialog$Builder; -Landroid/app/AlertDialog;->mAlert:Lcom/android/internal/app/AlertController; -Landroid/app/AppGlobals;->getInitialApplication()Landroid/app/Application; -Landroid/app/AppGlobals;->getInitialPackage()Ljava/lang/String; -Landroid/app/AppGlobals;->getPackageManager()Landroid/content/pm/IPackageManager; -Landroid/app/AppOpsManager$OpEntry;->getDuration()I -Landroid/app/AppOpsManager$OpEntry;->getOp()I -Landroid/app/AppOpsManager$OpEntry;->getRejectTime()J -Landroid/app/AppOpsManager$OpEntry;->getTime()J -Landroid/app/AppOpsManager$OpEntry;->isRunning()Z -Landroid/app/AppOpsManager$PackageOps;->getOps()Ljava/util/List; -Landroid/app/AppOpsManager$PackageOps;->getPackageName()Ljava/lang/String; -Landroid/app/AppOpsManager$PackageOps;->getUid()I -Landroid/app/AppOpsManager;->OP_AUDIO_NOTIFICATION_VOLUME:I -Landroid/app/AppOpsManager;->OP_COARSE_LOCATION:I -Landroid/app/AppOpsManager;->OP_FINE_LOCATION:I -Landroid/app/AppOpsManager;->OP_GET_USAGE_STATS:I -Landroid/app/AppOpsManager;->OP_POST_NOTIFICATION:I -Landroid/app/AppOpsManager;->OP_PROJECT_MEDIA:I -Landroid/app/AppOpsManager;->OP_READ_CONTACTS:I -Landroid/app/AppOpsManager;->OP_READ_PHONE_STATE:I -Landroid/app/AppOpsManager;->OP_READ_SMS:I -Landroid/app/AppOpsManager;->OP_RUN_IN_BACKGROUND:I -Landroid/app/AppOpsManager;->OP_VIBRATE:I -Landroid/app/AppOpsManager;->OP_WIFI_SCAN:I -Landroid/app/AppOpsManager;->OP_WRITE_CONTACTS:I -Landroid/app/AppOpsManager;->OP_WRITE_SMS:I -Landroid/app/AppOpsManager;->checkOp(IILjava/lang/String;)I -Landroid/app/AppOpsManager;->checkOpNoThrow(IILjava/lang/String;)I -Landroid/app/AppOpsManager;->getOpsForPackage(ILjava/lang/String;[I)Ljava/util/List; -Landroid/app/AppOpsManager;->getPackagesForOps([I)Ljava/util/List; -Landroid/app/AppOpsManager;->getToken(Lcom/android/internal/app/IAppOpsService;)Landroid/os/IBinder; -Landroid/app/AppOpsManager;->mService:Lcom/android/internal/app/IAppOpsService; -Landroid/app/AppOpsManager;->noteOp(I)I -Landroid/app/AppOpsManager;->noteOp(IILjava/lang/String;)I -Landroid/app/AppOpsManager;->permissionToOpCode(Ljava/lang/String;)I -Landroid/app/AppOpsManager;->sOpPerms:[Ljava/lang/String; -Landroid/app/AppOpsManager;->setRestriction(III[Ljava/lang/String;)V -Landroid/app/AppOpsManager;->strOpToOp(Ljava/lang/String;)I -Landroid/app/Application;->attach(Landroid/content/Context;)V -Landroid/app/Application;->collectActivityLifecycleCallbacks()[Ljava/lang/Object; -Landroid/app/Application;->dispatchActivityCreated(Landroid/app/Activity;Landroid/os/Bundle;)V -Landroid/app/Application;->dispatchActivityDestroyed(Landroid/app/Activity;)V -Landroid/app/Application;->dispatchActivityPaused(Landroid/app/Activity;)V -Landroid/app/Application;->dispatchActivityResumed(Landroid/app/Activity;)V -Landroid/app/Application;->dispatchActivitySaveInstanceState(Landroid/app/Activity;Landroid/os/Bundle;)V -Landroid/app/Application;->dispatchActivityStarted(Landroid/app/Activity;)V -Landroid/app/Application;->dispatchActivityStopped(Landroid/app/Activity;)V -Landroid/app/Application;->mComponentCallbacks:Ljava/util/ArrayList; -Landroid/app/Application;->mLoadedApk:Landroid/app/LoadedApk; -Landroid/app/ApplicationLoaders;->getDefault()Landroid/app/ApplicationLoaders; -Landroid/app/ApplicationLoaders;->mLoaders:Landroid/util/ArrayMap; -Landroid/app/ApplicationPackageManager;-><init>(Landroid/app/ContextImpl;Landroid/content/pm/IPackageManager;)V -Landroid/app/ApplicationPackageManager;->configurationChanged()V -Landroid/app/ApplicationPackageManager;->deletePackage(Ljava/lang/String;Landroid/content/pm/IPackageDeleteObserver;I)V -Landroid/app/ApplicationPackageManager;->getPackageCurrentVolume(Landroid/content/pm/ApplicationInfo;)Landroid/os/storage/VolumeInfo; -Landroid/app/ApplicationPackageManager;->getPackageSizeInfoAsUser(Ljava/lang/String;ILandroid/content/pm/IPackageStatsObserver;)V -Landroid/app/ApplicationPackageManager;->mPM:Landroid/content/pm/IPackageManager; -Landroid/app/ApplicationPackageManager;->setInstantAppCookie([B)Z -Landroid/app/ApplicationPackageManager;->shouldShowRequestPermissionRationale(Ljava/lang/String;)Z -Landroid/app/ContentProviderHolder;-><init>(Landroid/content/pm/ProviderInfo;)V -Landroid/app/ContentProviderHolder;->info:Landroid/content/pm/ProviderInfo; -Landroid/app/ContentProviderHolder;->provider:Landroid/content/IContentProvider; -Landroid/app/ContextImpl;->createActivityContext(Landroid/app/ActivityThread;Landroid/app/LoadedApk;Landroid/content/pm/ActivityInfo;Landroid/os/IBinder;ILandroid/content/res/Configuration;)Landroid/app/ContextImpl; -Landroid/app/ContextImpl;->getActivityToken()Landroid/os/IBinder; -Landroid/app/ContextImpl;->getDisplay()Landroid/view/Display; -Landroid/app/ContextImpl;->getPreferencesDir()Ljava/io/File; -Landroid/app/ContextImpl;->getReceiverRestrictedContext()Landroid/content/Context; -Landroid/app/ContextImpl;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences; -Landroid/app/ContextImpl;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File; -Landroid/app/ContextImpl;->mBasePackageName:Ljava/lang/String; -Landroid/app/ContextImpl;->mClassLoader:Ljava/lang/ClassLoader; -Landroid/app/ContextImpl;->mContentResolver:Landroid/app/ContextImpl$ApplicationContentResolver; -Landroid/app/ContextImpl;->mMainThread:Landroid/app/ActivityThread; -Landroid/app/ContextImpl;->mOpPackageName:Ljava/lang/String; -Landroid/app/ContextImpl;->mOuterContext:Landroid/content/Context; -Landroid/app/ContextImpl;->mPackageInfo:Landroid/app/LoadedApk; -Landroid/app/ContextImpl;->mPackageManager:Landroid/content/pm/PackageManager; -Landroid/app/ContextImpl;->mResources:Landroid/content/res/Resources; -Landroid/app/ContextImpl;->mServiceCache:[Ljava/lang/Object; -Landroid/app/ContextImpl;->mTheme:Landroid/content/res/Resources$Theme; -Landroid/app/ContextImpl;->mThemeResource:I -Landroid/app/ContextImpl;->sSharedPrefsCache:Landroid/util/ArrayMap; -Landroid/app/ContextImpl;->scheduleFinalCleanup(Ljava/lang/String;Ljava/lang/String;)V -Landroid/app/ContextImpl;->setOuterContext(Landroid/content/Context;)V -Landroid/app/DatePickerDialog;->mDatePicker:Landroid/widget/DatePicker; -Landroid/app/Dialog;->CANCEL:I -Landroid/app/Dialog;->dismissDialog()V -Landroid/app/Dialog;->mCancelMessage:Landroid/os/Message; -Landroid/app/Dialog;->mDismissMessage:Landroid/os/Message; -Landroid/app/Dialog;->mListenersHandler:Landroid/os/Handler; -Landroid/app/Dialog;->mOwnerActivity:Landroid/app/Activity; -Landroid/app/Dialog;->mShowMessage:Landroid/os/Message; -Landroid/app/DialogFragment;->showAllowingStateLoss(Landroid/app/FragmentManager;Ljava/lang/String;)V -Landroid/app/DownloadManager$Request;->mUri:Landroid/net/Uri; -Landroid/app/DownloadManager;->setAccessFilename(Z)V -Landroid/app/Fragment;->mChildFragmentManager:Landroid/app/FragmentManagerImpl; -Landroid/app/Fragment;->mWho:Ljava/lang/String; -Landroid/app/FragmentManagerImpl;->mAdded:Ljava/util/ArrayList; -Landroid/app/FragmentManagerImpl;->mStateSaved:Z -Landroid/app/FragmentManagerImpl;->noteStateNotSaved()V -Landroid/app/IActivityController$Stub;-><init>()V -Landroid/app/IActivityManager$Stub$Proxy;->getConfiguration()Landroid/content/res/Configuration; -Landroid/app/IActivityManager$Stub$Proxy;->getLaunchedFromUid(Landroid/os/IBinder;)I -Landroid/app/IActivityManager$Stub$Proxy;->getProcessLimit()I -Landroid/app/IActivityManager$Stub$Proxy;->getProcessPss([I)[J -Landroid/app/IActivityManager$Stub$Proxy;->isAppForeground(I)Z -Landroid/app/IActivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/app/IActivityManager;->bindService(Landroid/app/IApplicationThread;Landroid/os/IBinder;Landroid/content/Intent;Ljava/lang/String;Landroid/app/IServiceConnection;ILjava/lang/String;I)I -Landroid/app/IActivityManager;->broadcastIntent(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;Landroid/content/IIntentReceiver;ILjava/lang/String;Landroid/os/Bundle;[Ljava/lang/String;ILandroid/os/Bundle;ZZI)I -Landroid/app/IActivityManager;->cancelRecentsAnimation(Z)V -Landroid/app/IActivityManager;->cancelTaskWindowTransition(I)V -Landroid/app/IActivityManager;->closeSystemDialogs(Ljava/lang/String;)V -Landroid/app/IActivityManager;->finishActivity(Landroid/os/IBinder;ILandroid/content/Intent;I)Z -Landroid/app/IActivityManager;->finishReceiver(Landroid/os/IBinder;ILjava/lang/String;Landroid/os/Bundle;ZI)V -Landroid/app/IActivityManager;->forceStopPackage(Ljava/lang/String;I)V -Landroid/app/IActivityManager;->getConfiguration()Landroid/content/res/Configuration; -Landroid/app/IActivityManager;->getCurrentUser()Landroid/content/pm/UserInfo; -Landroid/app/IActivityManager;->getFilteredTasks(III)Ljava/util/List; -Landroid/app/IActivityManager;->getIntentSender(ILjava/lang/String;Landroid/os/IBinder;Ljava/lang/String;I[Landroid/content/Intent;[Ljava/lang/String;ILandroid/os/Bundle;I)Landroid/content/IIntentSender; -Landroid/app/IActivityManager;->getLaunchedFromPackage(Landroid/os/IBinder;)Ljava/lang/String; -Landroid/app/IActivityManager;->getLockTaskModeState()I -Landroid/app/IActivityManager;->getProcessMemoryInfo([I)[Landroid/os/Debug$MemoryInfo; -Landroid/app/IActivityManager;->getProviderMimeType(Landroid/net/Uri;I)Ljava/lang/String; -Landroid/app/IActivityManager;->getRecentTasks(III)Landroid/content/pm/ParceledListSlice; -Landroid/app/IActivityManager;->getRunningAppProcesses()Ljava/util/List; -Landroid/app/IActivityManager;->getTaskForActivity(Landroid/os/IBinder;Z)I -Landroid/app/IActivityManager;->getTaskSnapshot(IZ)Landroid/app/ActivityManager$TaskSnapshot; -Landroid/app/IActivityManager;->moveActivityTaskToBack(Landroid/os/IBinder;Z)Z -Landroid/app/IActivityManager;->moveTaskToFront(IILandroid/os/Bundle;)V -Landroid/app/IActivityManager;->publishContentProviders(Landroid/app/IApplicationThread;Ljava/util/List;)V -Landroid/app/IActivityManager;->registerTaskStackListener(Landroid/app/ITaskStackListener;)V -Landroid/app/IActivityManager;->removeTask(I)Z -Landroid/app/IActivityManager;->requestBugReport(I)V -Landroid/app/IActivityManager;->resumeAppSwitches()V -Landroid/app/IActivityManager;->setActivityController(Landroid/app/IActivityController;Z)V -Landroid/app/IActivityManager;->setRequestedOrientation(Landroid/os/IBinder;I)V -Landroid/app/IActivityManager;->setTaskResizeable(II)V -Landroid/app/IActivityManager;->startActivity(Landroid/app/IApplicationThread;Ljava/lang/String;Landroid/content/Intent;Ljava/lang/String;Landroid/os/IBinder;Ljava/lang/String;IILandroid/app/ProfilerInfo;Landroid/os/Bundle;)I -Landroid/app/IActivityManager;->startActivityAsUser(Landroid/app/IApplicationThread;Ljava/lang/String;Landroid/content/Intent;Ljava/lang/String;Landroid/os/IBinder;Ljava/lang/String;IILandroid/app/ProfilerInfo;Landroid/os/Bundle;I)I -Landroid/app/IActivityManager;->startActivityFromRecents(ILandroid/os/Bundle;)I -Landroid/app/IActivityManager;->startRecentsActivity(Landroid/content/Intent;Landroid/app/IAssistDataReceiver;Landroid/view/IRecentsAnimationRunner;)V -Landroid/app/IActivityManager;->stopService(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;I)I -Landroid/app/IActivityManager;->unbindService(Landroid/app/IServiceConnection;)Z -Landroid/app/IActivityManager;->unstableProviderDied(Landroid/os/IBinder;)V -Landroid/app/IAlarmManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/IAlarmManager$Stub;->TRANSACTION_remove:I -Landroid/app/IAlarmManager$Stub;->TRANSACTION_set:I -Landroid/app/IAlarmManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IAlarmManager; -Landroid/app/IAlarmManager;->setTime(J)Z -Landroid/app/IAppTask;->getTaskInfo()Landroid/app/ActivityManager$RecentTaskInfo; -Landroid/app/IApplicationThread;->scheduleTrimMemory(I)V -Landroid/app/IAssistDataReceiver$Stub;-><init>()V -Landroid/app/IAssistDataReceiver;->onHandleAssistData(Landroid/os/Bundle;)V -Landroid/app/IAssistDataReceiver;->onHandleAssistScreenshot(Landroid/graphics/Bitmap;)V -Landroid/app/INotificationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/INotificationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/INotificationManager; -Landroid/app/INotificationManager;->cancelAllNotifications(Ljava/lang/String;I)V -Landroid/app/INotificationManager;->cancelNotificationWithTag(Ljava/lang/String;Ljava/lang/String;II)V -Landroid/app/INotificationManager;->cancelToast(Ljava/lang/String;Landroid/app/ITransientNotification;)V -Landroid/app/INotificationManager;->enqueueToast(Ljava/lang/String;Landroid/app/ITransientNotification;I)V -Landroid/app/IProcessObserver$Stub;-><init>()V -Landroid/app/ISearchManager$Stub$Proxy;->getGlobalSearchActivity()Landroid/content/ComponentName; -Landroid/app/ISearchManager$Stub$Proxy;->getWebSearchActivity()Landroid/content/ComponentName; -Landroid/app/ISearchManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/ISearchManager; -Landroid/app/IServiceConnection$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/IServiceConnection$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/app/IServiceConnection$Stub;-><init>()V -Landroid/app/IServiceConnection$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IServiceConnection; -Landroid/app/IStopUserCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/IStopUserCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/app/IStopUserCallback$Stub;-><init>()V -Landroid/app/IStopUserCallback;->userStopped(I)V -Landroid/app/IUiModeManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/IWallpaperManager;->getWallpaper(Ljava/lang/String;Landroid/app/IWallpaperManagerCallback;ILandroid/os/Bundle;I)Landroid/os/ParcelFileDescriptor; -Landroid/app/Instrumentation;->execStartActivities(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;[Landroid/content/Intent;Landroid/os/Bundle;)V -Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult; -Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult; -Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;Landroid/os/UserHandle;)Landroid/app/Instrumentation$ActivityResult; -Landroid/app/IntentService;->mServiceHandler:Landroid/app/IntentService$ServiceHandler; -Landroid/app/KeyguardManager;->dismissKeyguard(Landroid/app/Activity;Landroid/app/KeyguardManager$KeyguardDismissCallback;Landroid/os/Handler;)V -Landroid/app/KeyguardManager;->isDeviceLocked(I)Z -Landroid/app/LoadedApk$ReceiverDispatcher;->getIIntentReceiver()Landroid/content/IIntentReceiver; -Landroid/app/LoadedApk$ReceiverDispatcher;->getIntentReceiver()Landroid/content/BroadcastReceiver; -Landroid/app/LoadedApk$ReceiverDispatcher;->mContext:Landroid/content/Context; -Landroid/app/LoadedApk$ReceiverDispatcher;->mReceiver:Landroid/content/BroadcastReceiver; -Landroid/app/LoadedApk$ServiceDispatcher$InnerConnection;->mDispatcher:Ljava/lang/ref/WeakReference; -Landroid/app/LoadedApk$ServiceDispatcher;-><init>(Landroid/content/ServiceConnection;Landroid/content/Context;Landroid/os/Handler;I)V -Landroid/app/LoadedApk$ServiceDispatcher;->getIServiceConnection()Landroid/app/IServiceConnection; -Landroid/app/LoadedApk$ServiceDispatcher;->mConnection:Landroid/content/ServiceConnection; -Landroid/app/LoadedApk$ServiceDispatcher;->mContext:Landroid/content/Context; -Landroid/app/LoadedApk;->getAssets()Landroid/content/res/AssetManager; -Landroid/app/LoadedApk;->getClassLoader()Ljava/lang/ClassLoader; -Landroid/app/LoadedApk;->getCompatibilityInfo()Landroid/content/res/CompatibilityInfo; -Landroid/app/LoadedApk;->getDataDirFile()Ljava/io/File; -Landroid/app/LoadedApk;->getResources()Landroid/content/res/Resources; -Landroid/app/LoadedApk;->mActivityThread:Landroid/app/ActivityThread; -Landroid/app/LoadedApk;->mAppDir:Ljava/lang/String; -Landroid/app/LoadedApk;->mApplication:Landroid/app/Application; -Landroid/app/LoadedApk;->mApplicationInfo:Landroid/content/pm/ApplicationInfo; -Landroid/app/LoadedApk;->mBaseClassLoader:Ljava/lang/ClassLoader; -Landroid/app/LoadedApk;->mClassLoader:Ljava/lang/ClassLoader; -Landroid/app/LoadedApk;->mDataDir:Ljava/lang/String; -Landroid/app/LoadedApk;->mDataDirFile:Ljava/io/File; -Landroid/app/LoadedApk;->mDisplayAdjustments:Landroid/view/DisplayAdjustments; -Landroid/app/LoadedApk;->mLibDir:Ljava/lang/String; -Landroid/app/LoadedApk;->mPackageName:Ljava/lang/String; -Landroid/app/LoadedApk;->mReceivers:Landroid/util/ArrayMap; -Landroid/app/LoadedApk;->mResDir:Ljava/lang/String; -Landroid/app/LoadedApk;->mResources:Landroid/content/res/Resources; -Landroid/app/LoadedApk;->mServices:Landroid/util/ArrayMap; -Landroid/app/LoadedApk;->mSplitResDirs:[Ljava/lang/String; -Landroid/app/LoadedApk;->makeApplication(ZLandroid/app/Instrumentation;)Landroid/app/Application; -Landroid/app/LoadedApk;->rewriteRValues(Ljava/lang/ClassLoader;Ljava/lang/String;I)V -Landroid/app/LocalActivityManager;->mActivities:Ljava/util/Map; -Landroid/app/LocalActivityManager;->mActivityArray:Ljava/util/ArrayList; -Landroid/app/LocalActivityManager;->mParent:Landroid/app/Activity; -Landroid/app/LocalActivityManager;->mResumed:Landroid/app/LocalActivityManager$LocalActivityRecord; -Landroid/app/LocalActivityManager;->mSingleMode:Z -Landroid/app/NativeActivity;->hideIme(I)V -Landroid/app/NativeActivity;->setWindowFlags(II)V -Landroid/app/NativeActivity;->setWindowFormat(I)V -Landroid/app/NativeActivity;->showIme(I)V -Landroid/app/Notification$Action;->mIcon:Landroid/graphics/drawable/Icon; -Landroid/app/Notification$Builder;->mActions:Ljava/util/ArrayList; -Landroid/app/Notification$Builder;->makePublicContentView()Landroid/widget/RemoteViews; -Landroid/app/Notification$Builder;->setChannel(Ljava/lang/String;)Landroid/app/Notification$Builder; -Landroid/app/Notification$Builder;->setTimeout(J)Landroid/app/Notification$Builder; -Landroid/app/Notification$TvExtender;->getChannel()Ljava/lang/String; -Landroid/app/Notification;-><init>(Landroid/content/Context;ILjava/lang/CharSequence;JLjava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/content/Intent;)V -Landroid/app/Notification;->getChannel()Ljava/lang/String; -Landroid/app/Notification;->getNotificationStyleClass(Ljava/lang/String;)Ljava/lang/Class; -Landroid/app/Notification;->getTimeout()J -Landroid/app/Notification;->isGroupSummary()Z -Landroid/app/Notification;->mChannelId:Ljava/lang/String; -Landroid/app/Notification;->mGroupKey:Ljava/lang/String; -Landroid/app/Notification;->mLargeIcon:Landroid/graphics/drawable/Icon; -Landroid/app/Notification;->mSmallIcon:Landroid/graphics/drawable/Icon; -Landroid/app/Notification;->setLatestEventInfo(Landroid/content/Context;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/app/PendingIntent;)V -Landroid/app/Notification;->setSmallIcon(Landroid/graphics/drawable/Icon;)V -Landroid/app/NotificationManager;->cancelAsUser(Ljava/lang/String;ILandroid/os/UserHandle;)V -Landroid/app/NotificationManager;->getService()Landroid/app/INotificationManager; -Landroid/app/NotificationManager;->notifyAsUser(Ljava/lang/String;ILandroid/app/Notification;Landroid/os/UserHandle;)V -Landroid/app/NotificationManager;->sService:Landroid/app/INotificationManager; -Landroid/app/PendingIntent;->getActivityAsUser(Landroid/content/Context;ILandroid/content/Intent;ILandroid/os/Bundle;Landroid/os/UserHandle;)Landroid/app/PendingIntent; -Landroid/app/PendingIntent;->getIntent()Landroid/content/Intent; -Landroid/app/PendingIntent;->isActivity()Z -Landroid/app/PictureInPictureArgs$Builder; -Landroid/app/PictureInPictureArgs$Builder;-><init>()V -Landroid/app/PictureInPictureArgs$Builder;->build()Landroid/app/PictureInPictureArgs; -Landroid/app/PictureInPictureArgs$Builder;->setActions(Ljava/util/List;)Landroid/app/PictureInPictureArgs$Builder; -Landroid/app/PictureInPictureArgs$Builder;->setAspectRatio(Landroid/util/Rational;)Landroid/app/PictureInPictureArgs$Builder; -Landroid/app/PictureInPictureArgs$Builder;->setSourceRectHint(Landroid/graphics/Rect;)Landroid/app/PictureInPictureArgs$Builder; -Landroid/app/PictureInPictureArgs; -Landroid/app/PictureInPictureArgs;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/app/PictureInPictureArgs;->convert(Landroid/app/PictureInPictureArgs;)Landroid/app/PictureInPictureParams; -Landroid/app/PictureInPictureArgs;->convert(Landroid/app/PictureInPictureParams;)Landroid/app/PictureInPictureArgs; -Landroid/app/PictureInPictureParams;->getAspectRatio()F -Landroid/app/Presentation;->createPresentationContext(Landroid/content/Context;Landroid/view/Display;I)Landroid/content/Context; -Landroid/app/ProgressDialog;->mProgressNumber:Landroid/widget/TextView; -Landroid/app/QueuedWork;->addFinisher(Ljava/lang/Runnable;)V -Landroid/app/QueuedWork;->removeFinisher(Ljava/lang/Runnable;)V -Landroid/app/QueuedWork;->sFinishers:Ljava/util/LinkedList; -Landroid/app/ResourcesManager;->appendLibAssetForMainAssetPath(Ljava/lang/String;Ljava/lang/String;)V -Landroid/app/ResourcesManager;->getInstance()Landroid/app/ResourcesManager; -Landroid/app/ResourcesManager;->mActivityResourceReferences:Ljava/util/WeakHashMap; -Landroid/app/ResourcesManager;->mResConfiguration:Landroid/content/res/Configuration; -Landroid/app/ResourcesManager;->mResourceImpls:Landroid/util/ArrayMap; -Landroid/app/ResourcesManager;->mResourceReferences:Ljava/util/ArrayList; -Landroid/app/ResultInfo;->mData:Landroid/content/Intent; -Landroid/app/ResultInfo;->mResultWho:Ljava/lang/String; -Landroid/app/Service;->attach(Landroid/content/Context;Landroid/app/ActivityThread;Ljava/lang/String;Landroid/os/IBinder;Landroid/app/Application;Ljava/lang/Object;)V -Landroid/app/Service;->mActivityManager:Landroid/app/IActivityManager; -Landroid/app/Service;->mApplication:Landroid/app/Application; -Landroid/app/Service;->mClassName:Ljava/lang/String; -Landroid/app/Service;->mStartCompatibility:Z -Landroid/app/Service;->mThread:Landroid/app/ActivityThread; -Landroid/app/Service;->mToken:Landroid/os/IBinder; -Landroid/app/Service;->setForeground(Z)V -Landroid/app/SharedPreferencesImpl;-><init>(Ljava/io/File;I)V -Landroid/app/SharedPreferencesImpl;->mFile:Ljava/io/File; -Landroid/app/SharedPreferencesImpl;->startReloadIfChangedUnexpectedly()V -Landroid/app/StatusBarManager;->collapsePanels()V -Landroid/app/StatusBarManager;->disable(I)V -Landroid/app/StatusBarManager;->expandNotificationsPanel()V -Landroid/app/StatusBarManager;->expandSettingsPanel()V -Landroid/app/StatusBarManager;->expandSettingsPanel(Ljava/lang/String;)V -Landroid/app/StatusBarManager;->getService()Lcom/android/internal/statusbar/IStatusBarService; -Landroid/app/StatusBarManager;->removeIcon(Ljava/lang/String;)V -Landroid/app/StatusBarManager;->setIcon(Ljava/lang/String;IILjava/lang/String;)V -Landroid/app/TaskStackListener;-><init>()V -Landroid/app/TaskStackListener;->onActivityDismissingDockedStack()V -Landroid/app/TaskStackListener;->onActivityForcedResizable(Ljava/lang/String;II)V -Landroid/app/TaskStackListener;->onActivityLaunchOnSecondaryDisplayFailed()V -Landroid/app/TaskStackListener;->onActivityPinned(Ljava/lang/String;III)V -Landroid/app/TaskStackListener;->onActivityRequestedOrientationChanged(II)V -Landroid/app/TaskStackListener;->onActivityUnpinned()V -Landroid/app/TaskStackListener;->onPinnedActivityRestartAttempt(Z)V -Landroid/app/TaskStackListener;->onPinnedStackAnimationEnded()V -Landroid/app/TaskStackListener;->onPinnedStackAnimationStarted()V -Landroid/app/TaskStackListener;->onTaskMovedToFront(I)V -Landroid/app/TaskStackListener;->onTaskProfileLocked(II)V -Landroid/app/TaskStackListener;->onTaskRemoved(I)V -Landroid/app/TaskStackListener;->onTaskSnapshotChanged(ILandroid/app/ActivityManager$TaskSnapshot;)V -Landroid/app/TaskStackListener;->onTaskStackChanged()V -Landroid/app/TimePickerDialog;->mTimePicker:Landroid/widget/TimePicker; -Landroid/app/Vr2dDisplayProperties$Builder;-><init>()V -Landroid/app/Vr2dDisplayProperties$Builder;->build()Landroid/app/Vr2dDisplayProperties; -Landroid/app/Vr2dDisplayProperties$Builder;->setEnabled(Z)Landroid/app/Vr2dDisplayProperties$Builder; -Landroid/app/Vr2dDisplayProperties;-><init>(III)V -Landroid/app/VrManager;->getPersistentVrModeEnabled()Z -Landroid/app/VrManager;->mService:Landroid/service/vr/IVrManager; -Landroid/app/VrManager;->registerVrStateCallback(Landroid/app/VrStateCallback;Landroid/os/Handler;)V -Landroid/app/VrManager;->setVr2dDisplayProperties(Landroid/app/Vr2dDisplayProperties;)V -Landroid/app/VrManager;->unregisterVrStateCallback(Landroid/app/VrStateCallback;)V -Landroid/app/VrStateCallback;-><init>()V -Landroid/app/VrStateCallback;->onPersistentVrStateChanged(Z)V -Landroid/app/WallpaperColors;-><init>(Landroid/graphics/Color;Landroid/graphics/Color;Landroid/graphics/Color;I)V -Landroid/app/WallpaperColors;->getColorHints()I -Landroid/app/WallpaperManager;->getBitmap()Landroid/graphics/Bitmap; -Landroid/app/WallpaperManager;->getBitmap(Z)Landroid/graphics/Bitmap; -Landroid/app/WallpaperManager;->getIWallpaperManager()Landroid/app/IWallpaperManager; -Landroid/app/WallpaperManager;->openDefaultWallpaper(Landroid/content/Context;I)Ljava/io/InputStream; -Landroid/app/WallpaperManager;->sGlobals:Landroid/app/WallpaperManager$Globals; -Landroid/app/WallpaperManager;->setBitmap(Landroid/graphics/Bitmap;Landroid/graphics/Rect;ZII)I -Landroid/app/admin/DevicePolicyManager;->createAndInitializeUser(Landroid/content/ComponentName;Ljava/lang/String;Ljava/lang/String;Landroid/content/ComponentName;Landroid/os/Bundle;)Landroid/os/UserHandle; -Landroid/app/admin/DevicePolicyManager;->createUser(Landroid/content/ComponentName;Ljava/lang/String;)Landroid/os/UserHandle; -Landroid/app/admin/DevicePolicyManager;->getDeviceInitializerApp()Ljava/lang/String; -Landroid/app/admin/DevicePolicyManager;->getDeviceInitializerComponent()Landroid/content/ComponentName; -Landroid/app/admin/DevicePolicyManager;->getMandatoryBackupTransport()Landroid/content/ComponentName; -Landroid/app/admin/DevicePolicyManager;->getProfileOwnerAsUser(I)Landroid/content/ComponentName; -Landroid/app/admin/DevicePolicyManager;->getTrustAgentConfiguration(Landroid/content/ComponentName;Landroid/content/ComponentName;I)Ljava/util/List; -Landroid/app/admin/DevicePolicyManager;->packageHasActiveAdmins(Ljava/lang/String;I)Z -Landroid/app/admin/DevicePolicyManager;->setActiveAdmin(Landroid/content/ComponentName;Z)V -Landroid/app/admin/DevicePolicyManager;->setActiveAdmin(Landroid/content/ComponentName;ZI)V -Landroid/app/admin/DevicePolicyManager;->setDefaultSmsApplication(Landroid/content/ComponentName;Ljava/lang/String;)V -Landroid/app/admin/DevicePolicyManager;->throwIfParentInstance(Ljava/lang/String;)V -Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_packageHasActiveAdmins:I -Landroid/app/admin/IDevicePolicyManager$Stub;->TRANSACTION_removeActiveAdmin:I -Landroid/app/admin/IDevicePolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/admin/IDevicePolicyManager; -Landroid/app/admin/SecurityLog$SecurityEvent;-><init>([B)V -Landroid/app/backup/BackupDataInput$EntityHeader;->dataSize:I -Landroid/app/backup/BackupDataInput$EntityHeader;->key:Ljava/lang/String; -Landroid/app/backup/BackupDataInputStream;->dataSize:I -Landroid/app/backup/BackupDataInputStream;->key:Ljava/lang/String; -Landroid/app/backup/BackupDataOutput;->mBackupWriter:J -Landroid/app/backup/BackupHelperDispatcher$Header;->chunkSize:I -Landroid/app/backup/BackupHelperDispatcher$Header;->keyPrefix:Ljava/lang/String; -Landroid/app/backup/FileBackupHelperBase;->writeNewStateDescription(Landroid/os/ParcelFileDescriptor;)V -Landroid/app/backup/FullBackup;->backupToTar(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/backup/FullBackupDataOutput;)I -Landroid/app/backup/FullBackupDataOutput;-><init>(Landroid/os/ParcelFileDescriptor;)V -Landroid/app/backup/FullBackupDataOutput;->addSize(J)V -Landroid/app/backup/FullBackupDataOutput;->mData:Landroid/app/backup/BackupDataOutput; -Landroid/app/backup/IBackupManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/backup/IBackupManager; -Landroid/app/job/IJobCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/job/IJobCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/app/job/IJobCallback$Stub;-><init>()V -Landroid/app/job/IJobCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobCallback; -Landroid/app/job/IJobCallback;->acknowledgeStartMessage(IZ)V -Landroid/app/job/IJobCallback;->acknowledgeStopMessage(IZ)V -Landroid/app/job/IJobCallback;->jobFinished(IZ)V -Landroid/app/job/IJobScheduler$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/job/IJobScheduler$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobScheduler; -Landroid/app/job/IJobService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/job/IJobService$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/app/job/IJobService$Stub;-><init>()V -Landroid/app/job/IJobService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/job/IJobService; -Landroid/app/job/IJobService;->startJob(Landroid/app/job/JobParameters;)V -Landroid/app/job/IJobService;->stopJob(Landroid/app/job/JobParameters;)V -Landroid/app/job/JobInfo$Builder;->setEstimatedNetworkBytes(J)Landroid/app/job/JobInfo$Builder; -Landroid/app/job/JobInfo$Builder;->setIsPrefetch(Z)Landroid/app/job/JobInfo$Builder; -Landroid/app/job/JobInfo;->flags:I -Landroid/app/job/JobInfo;->getEstimatedNetworkBytes()J -Landroid/app/job/JobInfo;->jobId:I -Landroid/app/job/JobInfo;->service:Landroid/content/ComponentName; -Landroid/app/job/JobParameters;->callback:Landroid/os/IBinder; -Landroid/app/job/JobParameters;->jobId:I -Landroid/app/job/JobWorkItem;-><init>(Landroid/content/Intent;J)V -Landroid/app/job/JobWorkItem;->getEstimatedNetworkBytes()J -Landroid/app/slice/Slice$Builder;-><init>(Landroid/net/Uri;)V -Landroid/app/slice/Slice$Builder;->addTimestamp(JLjava/lang/String;Ljava/util/List;)Landroid/app/slice/Slice$Builder; -Landroid/app/slice/Slice$Builder;->setSpec(Landroid/app/slice/SliceSpec;)Landroid/app/slice/Slice$Builder; -Landroid/app/slice/Slice;->EXTRA_SLIDER_VALUE:Ljava/lang/String; -Landroid/app/slice/Slice;->SUBTYPE_SLIDER:Ljava/lang/String; -Landroid/app/slice/SliceItem;->FORMAT_TIMESTAMP:Ljava/lang/String; -Landroid/app/slice/SliceItem;->getTimestamp()J -Landroid/app/slice/SliceManager;->bindSlice(Landroid/content/Intent;Ljava/util/List;)Landroid/app/slice/Slice; -Landroid/app/slice/SliceManager;->bindSlice(Landroid/net/Uri;Ljava/util/List;)Landroid/app/slice/Slice; -Landroid/app/slice/SliceManager;->pinSlice(Landroid/net/Uri;Ljava/util/List;)V -Landroid/app/slice/SliceProvider;->onBindSlice(Landroid/net/Uri;Ljava/util/List;)Landroid/app/slice/Slice; -Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/app/usage/StorageStats;->getCodeBytes()J -Landroid/app/usage/StorageStatsManager;->getFreeBytes(Ljava/lang/String;)J -Landroid/app/usage/StorageStatsManager;->getTotalBytes(Ljava/lang/String;)J -Landroid/app/usage/StorageStatsManager;->isQuotaSupported(Ljava/lang/String;)Z -Landroid/app/usage/StorageStatsManager;->queryExternalStatsForUser(Ljava/lang/String;Landroid/os/UserHandle;)Landroid/app/usage/ExternalStorageStats; -Landroid/app/usage/StorageStatsManager;->queryStatsForPackage(Ljava/lang/String;Ljava/lang/String;Landroid/os/UserHandle;)Landroid/app/usage/StorageStats; -Landroid/app/usage/StorageStatsManager;->queryStatsForUid(Ljava/lang/String;I)Landroid/app/usage/StorageStats; -Landroid/app/usage/StorageStatsManager;->queryStatsForUser(Ljava/lang/String;Landroid/os/UserHandle;)Landroid/app/usage/StorageStats; -Landroid/app/usage/UsageStats;->mLastEvent:I -Landroid/app/usage/UsageStats;->mLaunchCount:I -Landroid/app/usage/UsageStats;->mTotalTimeInForeground:J -Landroid/app/usage/UsageStatsManager;->mService:Landroid/app/usage/IUsageStatsManager; -Landroid/appwidget/AppWidgetHost;->sService:Lcom/android/internal/appwidget/IAppWidgetService; -Landroid/appwidget/AppWidgetManager;->bindAppWidgetId(ILandroid/content/ComponentName;)V -Landroid/appwidget/AppWidgetManager;->bindAppWidgetId(ILandroid/content/ComponentName;Landroid/os/Bundle;)V -Landroid/appwidget/AppWidgetManager;->bindAppWidgetIdIfAllowed(IILandroid/content/ComponentName;Landroid/os/Bundle;)Z -Landroid/appwidget/AppWidgetManager;->mService:Lcom/android/internal/appwidget/IAppWidgetService; -Landroid/appwidget/AppWidgetProviderInfo;->providerInfo:Landroid/content/pm/ActivityInfo; -Landroid/bluetooth/BluetoothA2dp;->ACTION_ACTIVE_DEVICE_CHANGED:Ljava/lang/String; -Landroid/bluetooth/BluetoothA2dp;->ACTION_CODEC_CONFIG_CHANGED:Ljava/lang/String; -Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_NOT_SUPPORTED:I -Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_PREF_DISABLED:I -Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_PREF_ENABLED:I -Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_PREF_UNKNOWN:I -Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_SUPPORTED:I -Landroid/bluetooth/BluetoothA2dp;->OPTIONAL_CODECS_SUPPORT_UNKNOWN:I -Landroid/bluetooth/BluetoothA2dp;->connect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothA2dp;->disableOptionalCodecs(Landroid/bluetooth/BluetoothDevice;)V -Landroid/bluetooth/BluetoothA2dp;->enableOptionalCodecs(Landroid/bluetooth/BluetoothDevice;)V -Landroid/bluetooth/BluetoothA2dp;->getActiveDevice()Landroid/bluetooth/BluetoothDevice; -Landroid/bluetooth/BluetoothA2dp;->getCodecStatus(Landroid/bluetooth/BluetoothDevice;)Landroid/bluetooth/BluetoothCodecStatus; -Landroid/bluetooth/BluetoothA2dp;->getOptionalCodecsEnabled(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/BluetoothA2dp;->setActiveDevice(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothA2dp;->setCodecConfigPreference(Landroid/bluetooth/BluetoothDevice;Landroid/bluetooth/BluetoothCodecConfig;)V -Landroid/bluetooth/BluetoothA2dp;->setOptionalCodecsEnabled(Landroid/bluetooth/BluetoothDevice;I)V -Landroid/bluetooth/BluetoothA2dp;->supportsOptionalCodecs(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/BluetoothAdapter;->disable(Z)Z -Landroid/bluetooth/BluetoothAdapter;->factoryReset()Z -Landroid/bluetooth/BluetoothAdapter;->getDiscoverableTimeout()I -Landroid/bluetooth/BluetoothAdapter;->getLeState()I -Landroid/bluetooth/BluetoothAdapter;->mService:Landroid/bluetooth/IBluetooth; -Landroid/bluetooth/BluetoothAdapter;->setScanMode(I)Z -Landroid/bluetooth/BluetoothAdapter;->setScanMode(II)Z -Landroid/bluetooth/BluetoothCodecConfig; -Landroid/bluetooth/BluetoothCodecConfig;-><init>(IIIIIJJJJ)V -Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_16:I -Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_24:I -Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_32:I -Landroid/bluetooth/BluetoothCodecConfig;->BITS_PER_SAMPLE_NONE:I -Landroid/bluetooth/BluetoothCodecConfig;->CHANNEL_MODE_MONO:I -Landroid/bluetooth/BluetoothCodecConfig;->CHANNEL_MODE_NONE:I -Landroid/bluetooth/BluetoothCodecConfig;->CHANNEL_MODE_STEREO:I -Landroid/bluetooth/BluetoothCodecConfig;->CODEC_PRIORITY_DEFAULT:I -Landroid/bluetooth/BluetoothCodecConfig;->CODEC_PRIORITY_DISABLED:I -Landroid/bluetooth/BluetoothCodecConfig;->CODEC_PRIORITY_HIGHEST:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_176400:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_192000:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_44100:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_48000:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_88200:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_96000:I -Landroid/bluetooth/BluetoothCodecConfig;->SAMPLE_RATE_NONE:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_AAC:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_APTX:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_APTX_HD:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_INVALID:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_LDAC:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_MAX:I -Landroid/bluetooth/BluetoothCodecConfig;->SOURCE_CODEC_TYPE_SBC:I -Landroid/bluetooth/BluetoothCodecConfig;->getBitsPerSample()I -Landroid/bluetooth/BluetoothCodecConfig;->getChannelMode()I -Landroid/bluetooth/BluetoothCodecConfig;->getCodecPriority()I -Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific1()J -Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific2()J -Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific3()J -Landroid/bluetooth/BluetoothCodecConfig;->getCodecSpecific4()J -Landroid/bluetooth/BluetoothCodecConfig;->getCodecType()I -Landroid/bluetooth/BluetoothCodecConfig;->getSampleRate()I -Landroid/bluetooth/BluetoothCodecConfig;->setCodecPriority(I)V -Landroid/bluetooth/BluetoothCodecStatus; -Landroid/bluetooth/BluetoothCodecStatus;->EXTRA_CODEC_STATUS:Ljava/lang/String; -Landroid/bluetooth/BluetoothCodecStatus;->getCodecConfig()Landroid/bluetooth/BluetoothCodecConfig; -Landroid/bluetooth/BluetoothCodecStatus;->getCodecsLocalCapabilities()[Landroid/bluetooth/BluetoothCodecConfig; -Landroid/bluetooth/BluetoothCodecStatus;->getCodecsSelectableCapabilities()[Landroid/bluetooth/BluetoothCodecConfig; -Landroid/bluetooth/BluetoothDevice;->createBond(I)Z -Landroid/bluetooth/BluetoothDevice;->getAlias()Ljava/lang/String; -Landroid/bluetooth/BluetoothDevice;->getAliasName()Ljava/lang/String; -Landroid/bluetooth/BluetoothGatt;->mAuthRetryState:I -Landroid/bluetooth/BluetoothGatt;->mClientIf:I -Landroid/bluetooth/BluetoothGatt;->refresh()Z -Landroid/bluetooth/BluetoothGattCharacteristic;->mInstance:I -Landroid/bluetooth/BluetoothGattCharacteristic;->mService:Landroid/bluetooth/BluetoothGattService; -Landroid/bluetooth/BluetoothGattDescriptor;->mCharacteristic:Landroid/bluetooth/BluetoothGattCharacteristic; -Landroid/bluetooth/BluetoothGattDescriptor;->mInstance:I -Landroid/bluetooth/BluetoothHeadset;->ACTION_ACTIVE_DEVICE_CHANGED:Ljava/lang/String; -Landroid/bluetooth/BluetoothHeadset;->close()V -Landroid/bluetooth/BluetoothHeadset;->connectAudio()Z -Landroid/bluetooth/BluetoothHeadset;->disconnectAudio()Z -Landroid/bluetooth/BluetoothHeadset;->getActiveDevice()Landroid/bluetooth/BluetoothDevice; -Landroid/bluetooth/BluetoothHeadset;->phoneStateChanged(IIILjava/lang/String;I)V -Landroid/bluetooth/BluetoothHeadset;->setActiveDevice(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothHeadset;->startScoUsingVirtualVoiceCall()Z -Landroid/bluetooth/BluetoothHeadset;->stopScoUsingVirtualVoiceCall()Z -Landroid/bluetooth/BluetoothHearingAid;->ACTION_ACTIVE_DEVICE_CHANGED:Ljava/lang/String; -Landroid/bluetooth/BluetoothHearingAid;->getActiveDevices()Ljava/util/List; -Landroid/bluetooth/BluetoothHearingAid;->setActiveDevice(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothMapClient;->sendMessage(Landroid/bluetooth/BluetoothDevice;[Landroid/net/Uri;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;)Z -Landroid/bluetooth/BluetoothPan;-><init>(Landroid/content/Context;Landroid/bluetooth/BluetoothProfile$ServiceListener;)V -Landroid/bluetooth/BluetoothPan;->close()V -Landroid/bluetooth/BluetoothPan;->connect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothPan;->disconnect(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothPan;->doBind()Z -Landroid/bluetooth/BluetoothPan;->isEnabled()Z -Landroid/bluetooth/BluetoothPan;->isTetheringOn()Z -Landroid/bluetooth/BluetoothPan;->isValidDevice(Landroid/bluetooth/BluetoothDevice;)Z -Landroid/bluetooth/BluetoothPan;->log(Ljava/lang/String;)V -Landroid/bluetooth/BluetoothPan;->setBluetoothTethering(Z)V -Landroid/bluetooth/BluetoothProfile;->PAN:I -Landroid/bluetooth/BluetoothSocket;->mPfd:Landroid/os/ParcelFileDescriptor; -Landroid/bluetooth/BluetoothUuid;->RESERVED_UUIDS:[Landroid/os/ParcelUuid; -Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String; -Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I -Landroid/bluetooth/IBluetooth$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetooth; -Landroid/bluetooth/IBluetooth;->getAddress()Ljava/lang/String; -Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V -Landroid/bluetooth/IBluetoothManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/bluetooth/IBluetoothManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothManager; -Landroid/bluetooth/le/ScanRecord;->parseFromBytes([B)Landroid/bluetooth/le/ScanRecord; -Landroid/companion/AssociationRequest;->getDeviceFilters()Ljava/util/List; -Landroid/companion/AssociationRequest;->isSingleDevice()Z -Landroid/companion/BluetoothDeviceFilter;->getAddress()Ljava/lang/String; -Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceDisplayNameInternal(Landroid/bluetooth/BluetoothDevice;)Ljava/lang/String; -Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceDisplayNameInternal(Landroid/net/wifi/ScanResult;)Ljava/lang/String; -Landroid/companion/BluetoothDeviceFilterUtils;->getDeviceMacAddress(Landroid/os/Parcelable;)Ljava/lang/String; -Landroid/companion/BluetoothLeDeviceFilter;->getScanFilter()Landroid/bluetooth/le/ScanFilter; -Landroid/companion/DeviceFilter;->getDeviceDisplayName(Landroid/os/Parcelable;)Ljava/lang/String; -Landroid/companion/DeviceFilter;->matches(Landroid/os/Parcelable;)Z -Landroid/companion/ICompanionDeviceDiscoveryService$Stub;-><init>()V -Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V -Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V -Landroid/companion/IFindDeviceCallback;->onSuccess(Landroid/app/PendingIntent;)V -Landroid/content/AsyncTaskLoader;->mExecutor:Ljava/util/concurrent/Executor; -Landroid/content/BroadcastReceiver$PendingResult;-><init>(ILjava/lang/String;Landroid/os/Bundle;IZZLandroid/os/IBinder;II)V -Landroid/content/BroadcastReceiver$PendingResult;->mAbortBroadcast:Z -Landroid/content/BroadcastReceiver$PendingResult;->mFinished:Z -Landroid/content/BroadcastReceiver$PendingResult;->mFlags:I -Landroid/content/BroadcastReceiver$PendingResult;->mInitialStickyHint:Z -Landroid/content/BroadcastReceiver$PendingResult;->mOrderedHint:Z -Landroid/content/BroadcastReceiver$PendingResult;->mResultCode:I -Landroid/content/BroadcastReceiver$PendingResult;->mResultData:Ljava/lang/String; -Landroid/content/BroadcastReceiver$PendingResult;->mResultExtras:Landroid/os/Bundle; -Landroid/content/BroadcastReceiver$PendingResult;->mSendingUser:I -Landroid/content/BroadcastReceiver$PendingResult;->mToken:Landroid/os/IBinder; -Landroid/content/BroadcastReceiver$PendingResult;->mType:I -Landroid/content/BroadcastReceiver;->getPendingResult()Landroid/content/BroadcastReceiver$PendingResult; -Landroid/content/BroadcastReceiver;->setPendingResult(Landroid/content/BroadcastReceiver$PendingResult;)V -Landroid/content/ClipData$Item;->mUri:Landroid/net/Uri; -Landroid/content/ClipData;->addItem(Landroid/content/ClipData$Item;Landroid/content/ContentResolver;)V -Landroid/content/ContentProvider;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Landroid/content/pm/PathPermission;)V -Landroid/content/ContentProvider;->attachInfoForTesting(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V -Landroid/content/ContentProvider;->coerceToLocalContentProvider(Landroid/content/IContentProvider;)Landroid/content/ContentProvider; -Landroid/content/ContentProvider;->getIContentProvider()Landroid/content/IContentProvider; -Landroid/content/ContentProvider;->mContext:Landroid/content/Context; -Landroid/content/ContentProvider;->mPathPermissions:[Landroid/content/pm/PathPermission; -Landroid/content/ContentProvider;->mReadPermission:Ljava/lang/String; -Landroid/content/ContentProvider;->mWritePermission:Ljava/lang/String; -Landroid/content/ContentProvider;->setAppOps(II)V -Landroid/content/ContentProviderClient;->mContentProvider:Landroid/content/IContentProvider; -Landroid/content/ContentProviderClient;->mPackageName:Ljava/lang/String; -Landroid/content/ContentProviderOperation;->TYPE_DELETE:I -Landroid/content/ContentProviderOperation;->TYPE_INSERT:I -Landroid/content/ContentProviderOperation;->TYPE_UPDATE:I -Landroid/content/ContentProviderOperation;->mSelection:Ljava/lang/String; -Landroid/content/ContentProviderOperation;->mType:I -Landroid/content/ContentProviderOperation;->mUri:Landroid/net/Uri; -Landroid/content/ContentResolver;->acquireExistingProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider; -Landroid/content/ContentResolver;->acquireProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider; -Landroid/content/ContentResolver;->acquireProvider(Landroid/net/Uri;)Landroid/content/IContentProvider; -Landroid/content/ContentResolver;->acquireProvider(Ljava/lang/String;)Landroid/content/IContentProvider; -Landroid/content/ContentResolver;->acquireUnstableProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider; -Landroid/content/ContentResolver;->getContentService()Landroid/content/IContentService; -Landroid/content/ContentResolver;->getSyncStatus(Landroid/accounts/Account;Ljava/lang/String;)Landroid/content/SyncStatusInfo; -Landroid/content/ContentResolver;->mContext:Landroid/content/Context; -Landroid/content/ContentResolver;->mPackageName:Ljava/lang/String; -Landroid/content/ContentResolver;->registerContentObserver(Landroid/net/Uri;ZLandroid/database/ContentObserver;I)V -Landroid/content/ContentResolver;->releaseProvider(Landroid/content/IContentProvider;)Z -Landroid/content/ContentResolver;->releaseUnstableProvider(Landroid/content/IContentProvider;)Z -Landroid/content/ContentResolver;->takePersistableUriPermission(Ljava/lang/String;Landroid/net/Uri;I)V -Landroid/content/ContentResolver;->unstableProviderDied(Landroid/content/IContentProvider;)V -Landroid/content/ContentValues;-><init>(Ljava/util/HashMap;)V -Landroid/content/ContentValues;->getStringArrayList(Ljava/lang/String;)Ljava/util/ArrayList; -Landroid/content/ContentValues;->mValues:Ljava/util/HashMap; -Landroid/content/ContentValues;->putStringArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V -Landroid/content/Context;->getBasePackageName()Ljava/lang/String; -Landroid/content/Context;->getOpPackageName()Ljava/lang/String; -Landroid/content/Context;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences; -Landroid/content/Context;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File; -Landroid/content/Context;->getSharedPrefsFile(Ljava/lang/String;)Ljava/io/File; -Landroid/content/Context;->getThemeResId()I -Landroid/content/Context;->registerReceiverAsUser(Landroid/content/BroadcastReceiver;Landroid/os/UserHandle;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;)Landroid/content/Intent; -Landroid/content/Context;->sendBroadcastAsUser(Landroid/content/Intent;Landroid/os/UserHandle;Ljava/lang/String;I)V -Landroid/content/Context;->sendOrderedBroadcastAsUser(Landroid/content/Intent;Landroid/os/UserHandle;Ljava/lang/String;ILandroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V -Landroid/content/Context;->sendOrderedBroadcastAsUser(Landroid/content/Intent;Landroid/os/UserHandle;Ljava/lang/String;ILandroid/os/Bundle;Landroid/content/BroadcastReceiver;Landroid/os/Handler;ILjava/lang/String;Landroid/os/Bundle;)V -Landroid/content/Context;->startActivityAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)V -Landroid/content/Context;->startServiceAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)Landroid/content/ComponentName; -Landroid/content/ContextWrapper;->getDisplay()Landroid/view/Display; -Landroid/content/ContextWrapper;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences; -Landroid/content/ContextWrapper;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File; -Landroid/content/ContextWrapper;->getThemeResId()I -Landroid/content/ContextWrapper;->mBase:Landroid/content/Context; -Landroid/content/CursorLoader;->mCancellationSignal:Landroid/os/CancellationSignal; -Landroid/content/CursorLoader;->mObserver:Landroid/content/Loader$ForceLoadContentObserver; -Landroid/content/IClipboard$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/IClipboard$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IClipboard; -Landroid/content/IContentProvider;->call(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle; -Landroid/content/IContentService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/IContentService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IContentService; -Landroid/content/IContentService;->cancelSync(Landroid/accounts/Account;Ljava/lang/String;Landroid/content/ComponentName;)V -Landroid/content/IContentService;->getMasterSyncAutomatically()Z -Landroid/content/IContentService;->setMasterSyncAutomatically(Z)V -Landroid/content/IIntentReceiver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/IIntentReceiver$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/IIntentReceiver$Stub;-><init>()V -Landroid/content/IIntentReceiver;->performReceive(Landroid/content/Intent;ILjava/lang/String;Landroid/os/Bundle;ZZI)V -Landroid/content/IRestrictionsManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/IRestrictionsManager; -Landroid/content/ISyncAdapter$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/ISyncAdapter$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/ISyncContext$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/ISyncContext$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/ISyncContext$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/ISyncContext; -Landroid/content/ISyncStatusObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/ISyncStatusObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/Intent;->ACTION_ALARM_CHANGED:Ljava/lang/String; -Landroid/content/Intent;->ACTION_DEVICE_INITIALIZATION_WIZARD:Ljava/lang/String; -Landroid/content/Intent;->ACTION_MASTER_CLEAR:Ljava/lang/String; -Landroid/content/Intent;->ACTION_SERVICE_STATE:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_CDMA_DEFAULT_ROAMING_INDICATOR:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_CDMA_ROAMING_INDICATOR:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_CSS_INDICATOR:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_DATA_OPERATOR_ALPHA_LONG:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_DATA_OPERATOR_ALPHA_SHORT:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_DATA_OPERATOR_NUMERIC:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_DATA_RADIO_TECH:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_DATA_REG_STATE:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_DATA_ROAMING_TYPE:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_EMERGENCY_ONLY:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_IS_DATA_ROAMING_FROM_REGISTRATION:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_IS_USING_CARRIER_AGGREGATION:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_LTE_EARFCN_RSRP_BOOST:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_MANUAL:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_NETWORK_ID:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_OPERATOR_ALPHA_LONG:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_OPERATOR_ALPHA_SHORT:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_OPERATOR_NUMERIC:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_QUICK_VIEW_ADVANCED:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_SYSTEM_ID:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_VOICE_RADIO_TECH:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_VOICE_REG_STATE:Ljava/lang/String; -Landroid/content/Intent;->EXTRA_VOICE_ROAMING_TYPE:Ljava/lang/String; -Landroid/content/Intent;->getExtra(Ljava/lang/String;)Ljava/lang/Object; -Landroid/content/Intent;->getIBinderExtra(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/content/Intent;->mExtras:Landroid/os/Bundle; -Landroid/content/Intent;->prepareToLeaveProcess(Landroid/content/Context;)V -Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/IBinder;)Landroid/content/Intent; -Landroid/content/Intent;->resolveSystemService(Landroid/content/pm/PackageManager;I)Landroid/content/ComponentName; -Landroid/content/Intent;->setAllowFds(Z)V -Landroid/content/Intent;->toInsecureString()Ljava/lang/String; -Landroid/content/IntentFilter;->mActions:Ljava/util/ArrayList; -Landroid/content/IntentSender;-><init>(Landroid/content/IIntentSender;)V -Landroid/content/IntentSender;->mTarget:Landroid/content/IIntentSender; -Landroid/content/RestrictionsManager;->mService:Landroid/content/IRestrictionsManager; -Landroid/content/SearchRecentSuggestionsProvider;->mSuggestionProjection:[Ljava/lang/String; -Landroid/content/SyncAdapterType;->allowParallelSyncs:Z -Landroid/content/SyncAdapterType;->isAlwaysSyncable:Z -Landroid/content/SyncAdapterType;->settingsActivity:Ljava/lang/String; -Landroid/content/SyncContext;->setStatusText(Ljava/lang/String;)V -Landroid/content/SyncInfo;-><init>(ILandroid/accounts/Account;Ljava/lang/String;J)V -Landroid/content/SyncRequest;->mAccountToSync:Landroid/accounts/Account; -Landroid/content/SyncRequest;->mAuthority:Ljava/lang/String; -Landroid/content/SyncRequest;->mExtras:Landroid/os/Bundle; -Landroid/content/SyncRequest;->mIsPeriodic:Z -Landroid/content/SyncRequest;->mSyncRunTimeSecs:J -Landroid/content/SyncStatusInfo;-><init>(Landroid/os/Parcel;)V -Landroid/content/SyncStatusInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/content/SyncStatusInfo;->authorityId:I -Landroid/content/SyncStatusInfo;->ensurePeriodicSyncTimeSize(I)V -Landroid/content/SyncStatusInfo;->initialFailureTime:J -Landroid/content/SyncStatusInfo;->initialize:Z -Landroid/content/SyncStatusInfo;->lastFailureMesg:Ljava/lang/String; -Landroid/content/SyncStatusInfo;->lastFailureSource:I -Landroid/content/SyncStatusInfo;->lastFailureTime:J -Landroid/content/SyncStatusInfo;->lastSuccessSource:I -Landroid/content/SyncStatusInfo;->lastSuccessTime:J -Landroid/content/SyncStatusInfo;->pending:Z -Landroid/content/SyncStatusInfo;->periodicSyncTimes:Ljava/util/ArrayList; -Landroid/content/UriMatcher;->mChildren:Ljava/util/ArrayList; -Landroid/content/UriMatcher;->mText:Ljava/lang/String; -Landroid/content/pm/ActivityInfo;->isResizeableMode(I)Z -Landroid/content/pm/ActivityInfo;->resizeMode:I -Landroid/content/pm/ActivityInfo;->supportsPictureInPicture()Z -Landroid/content/pm/ApplicationInfo;->enabledSetting:I -Landroid/content/pm/ApplicationInfo;->getBaseResourcePath()Ljava/lang/String; -Landroid/content/pm/ApplicationInfo;->installLocation:I -Landroid/content/pm/ApplicationInfo;->isForwardLocked()Z -Landroid/content/pm/ApplicationInfo;->primaryCpuAbi:Ljava/lang/String; -Landroid/content/pm/ApplicationInfo;->privateFlags:I -Landroid/content/pm/ApplicationInfo;->scanPublicSourceDir:Ljava/lang/String; -Landroid/content/pm/ApplicationInfo;->scanSourceDir:Ljava/lang/String; -Landroid/content/pm/ApplicationInfo;->secondaryCpuAbi:Ljava/lang/String; -Landroid/content/pm/ApplicationInfo;->secondaryNativeLibraryDir:Ljava/lang/String; -Landroid/content/pm/ApplicationInfo;->versionCode:I -Landroid/content/pm/ApplicationInfo;->volumeUuid:Ljava/lang/String; -Landroid/content/pm/ComponentInfo;->encryptionAware:Z -Landroid/content/pm/ComponentInfo;->getComponentName()Landroid/content/ComponentName; -Landroid/content/pm/IPackageDataObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IPackageDataObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/pm/IPackageDataObserver$Stub;-><init>()V -Landroid/content/pm/IPackageDataObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDataObserver; -Landroid/content/pm/IPackageDataObserver;->onRemoveCompleted(Ljava/lang/String;Z)V -Landroid/content/pm/IPackageDeleteObserver$Stub;-><init>()V -Landroid/content/pm/IPackageDeleteObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDeleteObserver; -Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/pm/IPackageDeleteObserver2;->onPackageDeleted(Ljava/lang/String;ILjava/lang/String;)V -Landroid/content/pm/IPackageDeleteObserver;->packageDeleted(Ljava/lang/String;I)V -Landroid/content/pm/IPackageInstallObserver2$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IPackageInstallObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/pm/IPackageInstallObserver2$Stub;-><init>()V -Landroid/content/pm/IPackageInstallObserver2;->onPackageInstalled(Ljava/lang/String;ILjava/lang/String;Landroid/os/Bundle;)V -Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/pm/IPackageInstallerCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallerCallback; -Landroid/content/pm/IPackageInstallerCallback;->onSessionActiveChanged(IZ)V -Landroid/content/pm/IPackageInstallerCallback;->onSessionBadgingChanged(I)V -Landroid/content/pm/IPackageInstallerCallback;->onSessionCreated(I)V -Landroid/content/pm/IPackageInstallerCallback;->onSessionFinished(IZ)V -Landroid/content/pm/IPackageInstallerCallback;->onSessionProgressChanged(IF)V -Landroid/content/pm/IPackageInstallerSession$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IPackageInstallerSession$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/pm/IPackageInstallerSession$Stub;-><init>()V -Landroid/content/pm/IPackageInstallerSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallerSession; -Landroid/content/pm/IPackageManager$Stub$Proxy;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice; -Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo; -Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackagesForUid(I)[Ljava/lang/String; -Landroid/content/pm/IPackageManager$Stub$Proxy;->getSystemSharedLibraryNames()[Ljava/lang/String; -Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager; -Landroid/content/pm/IPackageManager;->addPermission(Landroid/content/pm/PermissionInfo;)Z -Landroid/content/pm/IPackageManager;->addPermissionAsync(Landroid/content/pm/PermissionInfo;)Z -Landroid/content/pm/IPackageManager;->getActivityInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo; -Landroid/content/pm/IPackageManager;->getApplicationInfo(Ljava/lang/String;II)Landroid/content/pm/ApplicationInfo; -Landroid/content/pm/IPackageManager;->getComponentEnabledSetting(Landroid/content/ComponentName;I)I -Landroid/content/pm/IPackageManager;->getHomeActivities(Ljava/util/List;)Landroid/content/ComponentName; -Landroid/content/pm/IPackageManager;->getInstallLocation()I -Landroid/content/pm/IPackageManager;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice; -Landroid/content/pm/IPackageManager;->getInstallerPackageName(Ljava/lang/String;)Ljava/lang/String; -Landroid/content/pm/IPackageManager;->getLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;I)Landroid/content/pm/ResolveInfo; -Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo; -Landroid/content/pm/IPackageManager;->getProviderInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ProviderInfo; -Landroid/content/pm/IPackageManager;->getReceiverInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo; -Landroid/content/pm/IPackageManager;->getServiceInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ServiceInfo; -Landroid/content/pm/IPackageManager;->setApplicationEnabledSetting(Ljava/lang/String;IIILjava/lang/String;)V -Landroid/content/pm/IPackageManager;->setComponentEnabledSetting(Landroid/content/ComponentName;III)V -Landroid/content/pm/IPackageManager;->setInstallerPackageName(Ljava/lang/String;Ljava/lang/String;)V -Landroid/content/pm/IPackageManager;->setLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;ILandroid/content/IntentFilter;ILandroid/content/ComponentName;)V -Landroid/content/pm/IPackageMoveObserver$Stub;-><init>()V -Landroid/content/pm/IPackageMoveObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageMoveObserver; -Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IPackageStatsObserver$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/content/pm/IPackageStatsObserver$Stub;-><init>()V -Landroid/content/pm/IPackageStatsObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageStatsObserver; -Landroid/content/pm/IPackageStatsObserver;->onGetStatsCompleted(Landroid/content/pm/PackageStats;Z)V -Landroid/content/pm/IShortcutService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/content/pm/IShortcutService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IShortcutService; -Landroid/content/pm/LauncherActivityInfo;->mActivityInfo:Landroid/content/pm/ActivityInfo; -Landroid/content/pm/LauncherApps;->mPm:Landroid/content/pm/PackageManager; -Landroid/content/pm/LauncherApps;->startShortcut(Ljava/lang/String;Ljava/lang/String;Landroid/graphics/Rect;Landroid/os/Bundle;I)V -Landroid/content/pm/PackageInfo;->INSTALL_LOCATION_UNSPECIFIED:I -Landroid/content/pm/PackageInfo;->REQUESTED_PERMISSION_REQUIRED:I -Landroid/content/pm/PackageInstaller$SessionInfo;-><init>()V -Landroid/content/pm/PackageInstaller$SessionInfo;->active:Z -Landroid/content/pm/PackageInstaller$SessionInfo;->appIcon:Landroid/graphics/Bitmap; -Landroid/content/pm/PackageInstaller$SessionInfo;->appLabel:Ljava/lang/CharSequence; -Landroid/content/pm/PackageInstaller$SessionInfo;->appPackageName:Ljava/lang/String; -Landroid/content/pm/PackageInstaller$SessionInfo;->installerPackageName:Ljava/lang/String; -Landroid/content/pm/PackageInstaller$SessionInfo;->mode:I -Landroid/content/pm/PackageInstaller$SessionInfo;->progress:F -Landroid/content/pm/PackageInstaller$SessionInfo;->resolvedBaseCodePath:Ljava/lang/String; -Landroid/content/pm/PackageInstaller$SessionInfo;->sealed:Z -Landroid/content/pm/PackageInstaller$SessionInfo;->sessionId:I -Landroid/content/pm/PackageInstaller$SessionInfo;->sizeBytes:J -Landroid/content/pm/PackageInstaller$SessionParams;->appIcon:Landroid/graphics/Bitmap; -Landroid/content/pm/PackageInstaller$SessionParams;->appLabel:Ljava/lang/String; -Landroid/content/pm/PackageInstaller$SessionParams;->appPackageName:Ljava/lang/String; -Landroid/content/pm/PackageInstaller$SessionParams;->installFlags:I -Landroid/content/pm/PackageInstaller$SessionParams;->mode:I -Landroid/content/pm/PackageInstaller$SessionParams;->sizeBytes:J -Landroid/content/pm/PackageItemInfo;->setForceSafeLabels(Z)V -Landroid/content/pm/PackageManager;->NO_NATIVE_LIBRARIES:I -Landroid/content/pm/PackageManager;->buildRequestPermissionsIntent([Ljava/lang/String;)Landroid/content/Intent; -Landroid/content/pm/PackageManager;->freeStorage(JLandroid/content/IntentSender;)V -Landroid/content/pm/PackageManager;->freeStorage(Ljava/lang/String;JLandroid/content/IntentSender;)V -Landroid/content/pm/PackageManager;->freeStorageAndNotify(JLandroid/content/pm/IPackageDataObserver;)V -Landroid/content/pm/PackageManager;->freeStorageAndNotify(Ljava/lang/String;JLandroid/content/pm/IPackageDataObserver;)V -Landroid/content/pm/PackageManager;->getApplicationInfoAsUser(Ljava/lang/String;II)Landroid/content/pm/ApplicationInfo; -Landroid/content/pm/PackageManager;->getHomeActivities(Ljava/util/List;)Landroid/content/ComponentName; -Landroid/content/pm/PackageManager;->getPackageCandidateVolumes(Landroid/content/pm/ApplicationInfo;)Ljava/util/List; -Landroid/content/pm/PackageManager;->getPackageInfoAsUser(Ljava/lang/String;II)Landroid/content/pm/PackageInfo; -Landroid/content/pm/PackageManager;->getPackageSizeInfo(Ljava/lang/String;Landroid/content/pm/IPackageStatsObserver;)V -Landroid/content/pm/PackageManager;->getResourcesForApplicationAsUser(Ljava/lang/String;I)Landroid/content/res/Resources; -Landroid/content/pm/PackageManager;->movePackage(Ljava/lang/String;Landroid/os/storage/VolumeInfo;)I -Landroid/content/pm/PackageManager;->queryBroadcastReceivers(Landroid/content/Intent;II)Ljava/util/List; -Landroid/content/pm/PackageManager;->setInstantAppCookie([B)Z -Landroid/content/pm/PackageParser$Activity;->info:Landroid/content/pm/ActivityInfo; -Landroid/content/pm/PackageParser$ActivityIntentInfo;->activity:Landroid/content/pm/PackageParser$Activity; -Landroid/content/pm/PackageParser$Component;->className:Ljava/lang/String; -Landroid/content/pm/PackageParser$Component;->getComponentName()Landroid/content/ComponentName; -Landroid/content/pm/PackageParser$Component;->intents:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Component;->metaData:Landroid/os/Bundle; -Landroid/content/pm/PackageParser$Instrumentation;->info:Landroid/content/pm/InstrumentationInfo; -Landroid/content/pm/PackageParser$IntentInfo;-><init>()V -Landroid/content/pm/PackageParser$IntentInfo;->banner:I -Landroid/content/pm/PackageParser$IntentInfo;->hasDefault:Z -Landroid/content/pm/PackageParser$IntentInfo;->icon:I -Landroid/content/pm/PackageParser$IntentInfo;->labelRes:I -Landroid/content/pm/PackageParser$IntentInfo;->logo:I -Landroid/content/pm/PackageParser$IntentInfo;->nonLocalizedLabel:Ljava/lang/CharSequence; -Landroid/content/pm/PackageParser$Package;->activities:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->applicationInfo:Landroid/content/pm/ApplicationInfo; -Landroid/content/pm/PackageParser$Package;->configPreferences:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->instrumentation:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->mAppMetaData:Landroid/os/Bundle; -Landroid/content/pm/PackageParser$Package;->mKeySetMapping:Landroid/util/ArrayMap; -Landroid/content/pm/PackageParser$Package;->mPreferredOrder:I -Landroid/content/pm/PackageParser$Package;->mSharedUserId:Ljava/lang/String; -Landroid/content/pm/PackageParser$Package;->mSharedUserLabel:I -Landroid/content/pm/PackageParser$Package;->mVersionCode:I -Landroid/content/pm/PackageParser$Package;->mVersionName:Ljava/lang/String; -Landroid/content/pm/PackageParser$Package;->packageName:Ljava/lang/String; -Landroid/content/pm/PackageParser$Package;->permissionGroups:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->permissions:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->providers:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->receivers:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->reqFeatures:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->requestedPermissions:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->services:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->usesLibraries:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Package;->usesOptionalLibraries:Ljava/util/ArrayList; -Landroid/content/pm/PackageParser$Provider;->info:Landroid/content/pm/ProviderInfo; -Landroid/content/pm/PackageParser$ProviderIntentInfo;->provider:Landroid/content/pm/PackageParser$Provider; -Landroid/content/pm/PackageParser$Service;->info:Landroid/content/pm/ServiceInfo; -Landroid/content/pm/PackageParser$ServiceIntentInfo;->service:Landroid/content/pm/PackageParser$Service; -Landroid/content/pm/PackageParser;-><init>()V -Landroid/content/pm/PackageParser;->collectCertificates(Landroid/content/pm/PackageParser$Package;Ljava/io/File;Z)V -Landroid/content/pm/PackageParser;->collectCertificates(Landroid/content/pm/PackageParser$Package;Z)V -Landroid/content/pm/PackageParser;->generateActivityInfo(Landroid/content/pm/PackageParser$Activity;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ActivityInfo; -Landroid/content/pm/PackageParser;->generateApplicationInfo(Landroid/content/pm/PackageParser$Package;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ApplicationInfo; -Landroid/content/pm/PackageParser;->generateInstrumentationInfo(Landroid/content/pm/PackageParser$Instrumentation;I)Landroid/content/pm/InstrumentationInfo; -Landroid/content/pm/PackageParser;->generatePackageInfo(Landroid/content/pm/PackageParser$Package;[IIJJLjava/util/Set;Landroid/content/pm/PackageUserState;)Landroid/content/pm/PackageInfo; -Landroid/content/pm/PackageParser;->generatePackageInfo(Landroid/content/pm/PackageParser$Package;[IIJJLjava/util/Set;Landroid/content/pm/PackageUserState;I)Landroid/content/pm/PackageInfo; -Landroid/content/pm/PackageParser;->generatePermissionGroupInfo(Landroid/content/pm/PackageParser$PermissionGroup;I)Landroid/content/pm/PermissionGroupInfo; -Landroid/content/pm/PackageParser;->generatePermissionInfo(Landroid/content/pm/PackageParser$Permission;I)Landroid/content/pm/PermissionInfo; -Landroid/content/pm/PackageParser;->generateProviderInfo(Landroid/content/pm/PackageParser$Provider;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ProviderInfo; -Landroid/content/pm/PackageParser;->generateServiceInfo(Landroid/content/pm/PackageParser$Service;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ServiceInfo; -Landroid/content/pm/PackageParser;->parseBaseApk(Ljava/lang/String;Landroid/content/res/Resources;Landroid/content/res/XmlResourceParser;I[Ljava/lang/String;)Landroid/content/pm/PackageParser$Package; -Landroid/content/pm/PackageParser;->parseMonolithicPackage(Ljava/io/File;I)Landroid/content/pm/PackageParser$Package; -Landroid/content/pm/PackageParser;->parsePackage(Ljava/io/File;I)Landroid/content/pm/PackageParser$Package; -Landroid/content/pm/PackageParser;->parsePackage(Ljava/io/File;IZ)Landroid/content/pm/PackageParser$Package; -Landroid/content/pm/PackageUserState;-><init>()V -Landroid/content/pm/ParceledListSlice;-><init>(Ljava/util/List;)V -Landroid/content/pm/ResolveInfo;->instantAppAvailable:Z -Landroid/content/pm/SharedLibraryInfo;->isBuiltin()Z -Landroid/content/pm/SharedLibraryInfo;->isDynamic()Z -Landroid/content/pm/SharedLibraryInfo;->isStatic()Z -Landroid/content/pm/ShortcutManager;->mService:Landroid/content/pm/IShortcutService; -Landroid/content/pm/Signature;->getPublicKey()Ljava/security/PublicKey; -Landroid/content/pm/UserInfo;-><init>(ILjava/lang/String;I)V -Landroid/content/pm/UserInfo;->FLAG_PRIMARY:I -Landroid/content/pm/UserInfo;->id:I -Landroid/content/pm/UserInfo;->isPrimary()Z -Landroid/content/pm/UserInfo;->serialNumber:I -Landroid/content/res/AssetFileDescriptor;->mFd:Landroid/os/ParcelFileDescriptor; -Landroid/content/res/AssetFileDescriptor;->mLength:J -Landroid/content/res/AssetFileDescriptor;->mStartOffset:J -Landroid/content/res/AssetManager;-><init>()V -Landroid/content/res/AssetManager;->addAssetPath(Ljava/lang/String;)I -Landroid/content/res/AssetManager;->addAssetPathAsSharedLibrary(Ljava/lang/String;)I -Landroid/content/res/AssetManager;->applyStyle(JIILandroid/content/res/XmlBlock$Parser;[IJJ)V -Landroid/content/res/AssetManager;->createTheme()J -Landroid/content/res/AssetManager;->getAssignedPackageIdentifiers()Landroid/util/SparseArray; -Landroid/content/res/AssetManager;->getResourceBagText(II)Ljava/lang/CharSequence; -Landroid/content/res/AssetManager;->getResourceEntryName(I)Ljava/lang/String; -Landroid/content/res/AssetManager;->getResourceIdentifier(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I -Landroid/content/res/AssetManager;->getResourceName(I)Ljava/lang/String; -Landroid/content/res/AssetManager;->getResourcePackageName(I)Ljava/lang/String; -Landroid/content/res/AssetManager;->getResourceTypeName(I)Ljava/lang/String; -Landroid/content/res/AssetManager;->isUpToDate()Z -Landroid/content/res/AssetManager;->mObject:J -Landroid/content/res/AssetManager;->openNonAsset(ILjava/lang/String;)Ljava/io/InputStream; -Landroid/content/res/AssetManager;->openNonAsset(ILjava/lang/String;I)Ljava/io/InputStream; -Landroid/content/res/AssetManager;->openNonAsset(Ljava/lang/String;)Ljava/io/InputStream; -Landroid/content/res/AssetManager;->openNonAsset(Ljava/lang/String;I)Ljava/io/InputStream; -Landroid/content/res/AssetManager;->resolveAttrs(JII[I[I[I[I)Z -Landroid/content/res/AssetManager;->retrieveAttributes(Landroid/content/res/XmlBlock$Parser;[I[I[I)Z -Landroid/content/res/AssetManager;->setConfiguration(IILjava/lang/String;IIIIIIIIIIIIIII)V -Landroid/content/res/ColorStateList$ColorStateListFactory;-><init>(Landroid/content/res/ColorStateList;)V -Landroid/content/res/ColorStateList;->getColors()[I -Landroid/content/res/ColorStateList;->mColors:[I -Landroid/content/res/ColorStateList;->mDefaultColor:I -Landroid/content/res/ColorStateList;->mFactory:Landroid/content/res/ColorStateList$ColorStateListFactory; -Landroid/content/res/ColorStateList;->mStateSpecs:[[I -Landroid/content/res/ColorStateList;->onColorsChanged()V -Landroid/content/res/CompatibilityInfo;-><init>(Landroid/content/pm/ApplicationInfo;IIZ)V -Landroid/content/res/CompatibilityInfo;->DEFAULT_COMPATIBILITY_INFO:Landroid/content/res/CompatibilityInfo; -Landroid/content/res/CompatibilityInfo;->applicationScale:F -Landroid/content/res/DrawableCache;-><init>()V -Landroid/content/res/DrawableCache;->getInstance(JLandroid/content/res/Resources;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; -Landroid/content/res/ObbInfo;->salt:[B -Landroid/content/res/Resources;->getCompatibilityInfo()Landroid/content/res/CompatibilityInfo; -Landroid/content/res/Resources;->loadXmlResourceParser(ILjava/lang/String;)Landroid/content/res/XmlResourceParser; -Landroid/content/res/Resources;->loadXmlResourceParser(Ljava/lang/String;IILjava/lang/String;)Landroid/content/res/XmlResourceParser; -Landroid/content/res/Resources;->mClassLoader:Ljava/lang/ClassLoader; -Landroid/content/res/Resources;->mDrawableInflater:Landroid/graphics/drawable/DrawableInflater; -Landroid/content/res/Resources;->mResourcesImpl:Landroid/content/res/ResourcesImpl; -Landroid/content/res/Resources;->mSystem:Landroid/content/res/Resources; -Landroid/content/res/Resources;->mTmpValue:Landroid/util/TypedValue; -Landroid/content/res/Resources;->mTypedArrayPool:Landroid/util/Pools$SynchronizedPool; -Landroid/content/res/Resources;->selectDefaultTheme(II)I -Landroid/content/res/Resources;->setCompatibilityInfo(Landroid/content/res/CompatibilityInfo;)V -Landroid/content/res/Resources;->updateSystemConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;Landroid/content/res/CompatibilityInfo;)V -Landroid/content/res/ResourcesImpl;->TRACE_FOR_MISS_PRELOAD:Z -Landroid/content/res/ResourcesImpl;->TRACE_FOR_PRELOAD:Z -Landroid/content/res/ResourcesImpl;->getAssets()Landroid/content/res/AssetManager; -Landroid/content/res/ResourcesImpl;->getValue(ILandroid/util/TypedValue;Z)V -Landroid/content/res/ResourcesImpl;->mAccessLock:Ljava/lang/Object; -Landroid/content/res/ResourcesImpl;->mAnimatorCache:Landroid/content/res/ConfigurationBoundResourceCache; -Landroid/content/res/ResourcesImpl;->mAssets:Landroid/content/res/AssetManager; -Landroid/content/res/ResourcesImpl;->mColorDrawableCache:Landroid/content/res/DrawableCache; -Landroid/content/res/ResourcesImpl;->mConfiguration:Landroid/content/res/Configuration; -Landroid/content/res/ResourcesImpl;->mDrawableCache:Landroid/content/res/DrawableCache; -Landroid/content/res/ResourcesImpl;->mPreloading:Z -Landroid/content/res/ResourcesImpl;->mStateListAnimatorCache:Landroid/content/res/ConfigurationBoundResourceCache; -Landroid/content/res/ResourcesImpl;->sPreloadedColorDrawables:Landroid/util/LongSparseArray; -Landroid/content/res/ResourcesImpl;->sPreloadedComplexColors:Landroid/util/LongSparseArray; -Landroid/content/res/ResourcesImpl;->sPreloadedDrawables:[Landroid/util/LongSparseArray; -Landroid/content/res/ResourcesKey;->mSplitResDirs:[Ljava/lang/String; -Landroid/content/res/StringBlock;-><init>(JZ)V -Landroid/content/res/ThemedResourceCache;->onConfigurationChange(I)V -Landroid/content/res/TypedArray;->extractThemeAttrs()[I -Landroid/content/res/TypedArray;->getNonConfigurationString(II)Ljava/lang/String; -Landroid/content/res/TypedArray;->getValueAt(ILandroid/util/TypedValue;)Z -Landroid/content/res/TypedArray;->mAssets:Landroid/content/res/AssetManager; -Landroid/content/res/TypedArray;->mData:[I -Landroid/content/res/TypedArray;->mIndices:[I -Landroid/content/res/TypedArray;->mLength:I -Landroid/content/res/TypedArray;->mMetrics:Landroid/util/DisplayMetrics; -Landroid/content/res/TypedArray;->mRecycled:Z -Landroid/content/res/TypedArray;->mResources:Landroid/content/res/Resources; -Landroid/content/res/TypedArray;->mTheme:Landroid/content/res/Resources$Theme; -Landroid/content/res/TypedArray;->mValue:Landroid/util/TypedValue; -Landroid/content/res/TypedArray;->mXml:Landroid/content/res/XmlBlock$Parser; -Landroid/content/res/XmlBlock$Parser;->mBlock:Landroid/content/res/XmlBlock; -Landroid/content/res/XmlBlock$Parser;->mParseState:J -Landroid/content/res/XmlBlock;-><init>([B)V -Landroid/content/res/XmlBlock;->newParser()Landroid/content/res/XmlResourceParser; -Landroid/database/AbstractCursor;->mCurrentRowID:Ljava/lang/Long; -Landroid/database/AbstractCursor;->mExtras:Landroid/os/Bundle; -Landroid/database/AbstractCursor;->mNotifyUri:Landroid/net/Uri; -Landroid/database/AbstractCursor;->mRowIdColumnIndex:I -Landroid/database/AbstractCursor;->mUpdatedRows:Ljava/util/HashMap; -Landroid/database/AbstractWindowedCursor;->clearOrCreateWindow(Ljava/lang/String;)V -Landroid/database/CursorWindow;->mWindowPtr:J -Landroid/database/CursorWindow;->sCursorWindowSize:I -Landroid/database/CursorWindow;->sWindowToPidMap:Landroid/util/LongSparseArray; -Landroid/database/CursorWrapper;->mCursor:Landroid/database/Cursor; -Landroid/database/sqlite/SQLiteCustomFunction;->dispatchCallback([Ljava/lang/String;)V -Landroid/database/sqlite/SQLiteCustomFunction;->name:Ljava/lang/String; -Landroid/database/sqlite/SQLiteCustomFunction;->numArgs:I -Landroid/database/sqlite/SQLiteDatabase;->CONFLICT_VALUES:[Ljava/lang/String; -Landroid/database/sqlite/SQLiteDatabase;->mConfigurationLocked:Landroid/database/sqlite/SQLiteDatabaseConfiguration; -Landroid/database/sqlite/SQLiteDatabase;->mConnectionPoolLocked:Landroid/database/sqlite/SQLiteConnectionPool; -Landroid/database/sqlite/SQLiteDatabase;->reopenReadWrite()V -Landroid/database/sqlite/SQLiteDatabaseConfiguration;->maxSqlCacheSize:I -Landroid/database/sqlite/SQLiteDebug$PagerStats;->largestMemAlloc:I -Landroid/database/sqlite/SQLiteDebug$PagerStats;->memoryUsed:I -Landroid/database/sqlite/SQLiteDebug$PagerStats;->pageCacheOverflow:I -Landroid/database/sqlite/SQLiteOpenHelper;->mName:Ljava/lang/String; -Landroid/database/sqlite/SQLiteStatement;-><init>(Landroid/database/sqlite/SQLiteDatabase;Ljava/lang/String;[Ljava/lang/Object;)V -Landroid/database/sqlite/SqliteWrapper;->insert(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri; -Landroid/database/sqlite/SqliteWrapper;->query(Landroid/content/Context;Landroid/content/ContentResolver;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; -Landroid/ddm/DdmHandleAppName;->getAppName()Ljava/lang/String; -Landroid/ddm/DdmHandleAppName;->setAppName(Ljava/lang/String;I)V -Landroid/graphics/AvoidXfermode$Mode; -Landroid/graphics/AvoidXfermode$Mode;->AVOID:Landroid/graphics/AvoidXfermode$Mode; -Landroid/graphics/AvoidXfermode$Mode;->TARGET:Landroid/graphics/AvoidXfermode$Mode; -Landroid/graphics/AvoidXfermode$Mode;->valueOf(Ljava/lang/String;)Landroid/graphics/AvoidXfermode$Mode; -Landroid/graphics/AvoidXfermode$Mode;->values()[Landroid/graphics/AvoidXfermode$Mode; -Landroid/graphics/AvoidXfermode; -Landroid/graphics/AvoidXfermode;-><init>(IILandroid/graphics/AvoidXfermode$Mode;)V -Landroid/graphics/BaseCanvas;->mNativeCanvasWrapper:J -Landroid/graphics/Bitmap$Config;->nativeInt:I -Landroid/graphics/Bitmap$Config;->nativeToConfig(I)Landroid/graphics/Bitmap$Config; -Landroid/graphics/Bitmap;-><init>(JIIIZZ[BLandroid/graphics/NinePatch$InsetStruct;)V -Landroid/graphics/Bitmap;->createAshmemBitmap()Landroid/graphics/Bitmap; -Landroid/graphics/Bitmap;->createAshmemBitmap(Landroid/graphics/Bitmap$Config;)Landroid/graphics/Bitmap; -Landroid/graphics/Bitmap;->createGraphicBufferHandle()Landroid/graphics/GraphicBuffer; -Landroid/graphics/Bitmap;->createHardwareBitmap(Landroid/graphics/GraphicBuffer;)Landroid/graphics/Bitmap; -Landroid/graphics/Bitmap;->getDefaultDensity()I -Landroid/graphics/Bitmap;->mNativePtr:J -Landroid/graphics/Bitmap;->mNinePatchChunk:[B -Landroid/graphics/Bitmap;->mNinePatchInsets:Landroid/graphics/NinePatch$InsetStruct; -Landroid/graphics/Bitmap;->reinit(IIZ)V -Landroid/graphics/Bitmap;->setDefaultDensity(I)V -Landroid/graphics/BitmapFactory;->nativeDecodeAsset(JLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap; -Landroid/graphics/BitmapFactory;->nativeDecodeByteArray([BIILandroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap; -Landroid/graphics/BitmapFactory;->nativeDecodeFileDescriptor(Ljava/io/FileDescriptor;Landroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap; -Landroid/graphics/BitmapFactory;->nativeDecodeStream(Ljava/io/InputStream;[BLandroid/graphics/Rect;Landroid/graphics/BitmapFactory$Options;)Landroid/graphics/Bitmap; -Landroid/graphics/BitmapRegionDecoder;-><init>(J)V -Landroid/graphics/Camera;->native_instance:J -Landroid/graphics/Canvas;-><init>(J)V -Landroid/graphics/Canvas;->CLIP_SAVE_FLAG:I -Landroid/graphics/Canvas;->CLIP_TO_LAYER_SAVE_FLAG:I -Landroid/graphics/Canvas;->FULL_COLOR_LAYER_SAVE_FLAG:I -Landroid/graphics/Canvas;->HAS_ALPHA_LAYER_SAVE_FLAG:I -Landroid/graphics/Canvas;->MATRIX_SAVE_FLAG:I -Landroid/graphics/Canvas;->clipRegion(Landroid/graphics/Region;)Z -Landroid/graphics/Canvas;->clipRegion(Landroid/graphics/Region;Landroid/graphics/Region$Op;)Z -Landroid/graphics/Canvas;->release()V -Landroid/graphics/Canvas;->save(I)I -Landroid/graphics/ColorMatrixColorFilter;->setColorMatrix(Landroid/graphics/ColorMatrix;)V -Landroid/graphics/FontFamily;-><init>()V -Landroid/graphics/FontFamily;->abortCreation()V -Landroid/graphics/FontFamily;->addFontFromAssetManager(Landroid/content/res/AssetManager;Ljava/lang/String;IZIII[Landroid/graphics/fonts/FontVariationAxis;)Z -Landroid/graphics/FontFamily;->addFontFromBuffer(Ljava/nio/ByteBuffer;I[Landroid/graphics/fonts/FontVariationAxis;II)Z -Landroid/graphics/FontFamily;->freeze()Z -Landroid/graphics/GraphicBuffer;-><init>(IIIIJ)V -Landroid/graphics/GraphicBuffer;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/graphics/GraphicBuffer;->createFromExisting(IIIIJ)Landroid/graphics/GraphicBuffer; -Landroid/graphics/GraphicBuffer;->mNativeObject:J -Landroid/graphics/ImageDecoder$IncompleteException; -Landroid/graphics/ImageDecoder$IncompleteException;-><init>()V -Landroid/graphics/ImageDecoder;->ERROR_SOURCE_ERROR:I -Landroid/graphics/ImageDecoder;->ERROR_SOURCE_EXCEPTION:I -Landroid/graphics/ImageDecoder;->ERROR_SOURCE_INCOMPLETE:I -Landroid/graphics/ImageDecoder;->getAsAlphaMask()Z -Landroid/graphics/ImageDecoder;->getConserveMemory()Z -Landroid/graphics/ImageDecoder;->getDecodeAsAlphaMask()Z -Landroid/graphics/ImageDecoder;->getMutable()Z -Landroid/graphics/ImageDecoder;->getRequireUnpremultiplied()Z -Landroid/graphics/ImageDecoder;->postProcessAndRelease(Landroid/graphics/Canvas;)I -Landroid/graphics/ImageDecoder;->setAsAlphaMask(Z)Landroid/graphics/ImageDecoder; -Landroid/graphics/ImageDecoder;->setConserveMemory(Z)V -Landroid/graphics/ImageDecoder;->setDecodeAsAlphaMask(Z)Landroid/graphics/ImageDecoder; -Landroid/graphics/ImageDecoder;->setMutable(Z)Landroid/graphics/ImageDecoder; -Landroid/graphics/ImageDecoder;->setRequireUnpremultiplied(Z)Landroid/graphics/ImageDecoder; -Landroid/graphics/ImageDecoder;->setResize(I)Landroid/graphics/ImageDecoder; -Landroid/graphics/ImageDecoder;->setResize(II)Landroid/graphics/ImageDecoder; -Landroid/graphics/Insets;->left:I -Landroid/graphics/Insets;->right:I -Landroid/graphics/LayerRasterizer; -Landroid/graphics/LayerRasterizer;-><init>()V -Landroid/graphics/LayerRasterizer;->addLayer(Landroid/graphics/Paint;)V -Landroid/graphics/LayerRasterizer;->addLayer(Landroid/graphics/Paint;FF)V -Landroid/graphics/LinearGradient;->mColors:[I -Landroid/graphics/Matrix;->native_instance:J -Landroid/graphics/Movie;-><init>(J)V -Landroid/graphics/Movie;->mNativeMovie:J -Landroid/graphics/NinePatch$InsetStruct;-><init>(IIIIIIIIFIF)V -Landroid/graphics/NinePatch;->mBitmap:Landroid/graphics/Bitmap; -Landroid/graphics/Paint;->getRasterizer()Landroid/graphics/Rasterizer; -Landroid/graphics/Paint;->setRasterizer(Landroid/graphics/Rasterizer;)Landroid/graphics/Rasterizer; -Landroid/graphics/Picture;->mNativePicture:J -Landroid/graphics/PixelXorXfermode; -Landroid/graphics/PixelXorXfermode;-><init>(I)V -Landroid/graphics/PorterDuffColorFilter;->getColor()I -Landroid/graphics/PorterDuffColorFilter;->setColor(I)V -Landroid/graphics/PorterDuffColorFilter;->setMode(Landroid/graphics/PorterDuff$Mode;)V -Landroid/graphics/Rasterizer; -Landroid/graphics/Rasterizer;-><init>()V -Landroid/graphics/Rect;->scale(F)V -Landroid/graphics/Region;-><init>(JI)V -Landroid/graphics/Region;->mNativeRegion:J -Landroid/graphics/SurfaceTexture;->mFrameAvailableListener:J -Landroid/graphics/SurfaceTexture;->mProducer:J -Landroid/graphics/SurfaceTexture;->mSurfaceTexture:J -Landroid/graphics/SurfaceTexture;->nativeDetachFromGLContext()I -Landroid/graphics/SurfaceTexture;->postEventFromNative(Ljava/lang/ref/WeakReference;)V -Landroid/graphics/Typeface;->createFromFamiliesWithDefault([Landroid/graphics/FontFamily;II)Landroid/graphics/Typeface; -Landroid/graphics/Typeface;->createFromFamiliesWithDefault([Landroid/graphics/FontFamily;Ljava/lang/String;II)Landroid/graphics/Typeface; -Landroid/graphics/Typeface;->mStyle:I -Landroid/graphics/Typeface;->sDefaults:[Landroid/graphics/Typeface; -Landroid/graphics/Typeface;->sSystemFontMap:Ljava/util/Map; -Landroid/graphics/Typeface;->setDefault(Landroid/graphics/Typeface;)V -Landroid/graphics/drawable/AnimatedImageDrawable;->LOOP_INFINITE:I -Landroid/graphics/drawable/AnimatedImageDrawable;->getLoopCount(I)I -Landroid/graphics/drawable/AnimatedImageDrawable;->onAnimationEnd()V -Landroid/graphics/drawable/AnimatedImageDrawable;->setLoopCount(I)V -Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mStateIds:Landroid/util/SparseIntArray; -Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState;->mTransitions:Landroid/util/LongSparseLongArray; -Landroid/graphics/drawable/AnimatedStateListDrawable;->mState:Landroid/graphics/drawable/AnimatedStateListDrawable$AnimatedStateListState; -Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;->callOnFinished(Landroid/graphics/drawable/AnimatedVectorDrawable$VectorDrawableAnimatorRT;I)V -Landroid/graphics/drawable/AnimationDrawable;->mCurFrame:I -Landroid/graphics/drawable/BitmapDrawable;->getOpticalInsets()Landroid/graphics/Insets; -Landroid/graphics/drawable/BitmapDrawable;->getTint()Landroid/content/res/ColorStateList; -Landroid/graphics/drawable/BitmapDrawable;->getTintMode()Landroid/graphics/PorterDuff$Mode; -Landroid/graphics/drawable/BitmapDrawable;->mTargetDensity:I -Landroid/graphics/drawable/BitmapDrawable;->setBitmap(Landroid/graphics/Bitmap;)V -Landroid/graphics/drawable/ColorDrawable$ColorState;->mUseColor:I -Landroid/graphics/drawable/Drawable;->getOpticalInsets()Landroid/graphics/Insets; -Landroid/graphics/drawable/Drawable;->inflateWithAttributes(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/TypedArray;I)V -Landroid/graphics/drawable/Drawable;->isProjected()Z -Landroid/graphics/drawable/Drawable;->mCallback:Ljava/lang/ref/WeakReference; -Landroid/graphics/drawable/Drawable;->parseTintMode(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuff$Mode; -Landroid/graphics/drawable/Drawable;->updateTintFilter(Landroid/graphics/PorterDuffColorFilter;Landroid/content/res/ColorStateList;Landroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter; -Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect; -Landroid/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawables:[Landroid/graphics/drawable/Drawable; -Landroid/graphics/drawable/DrawableContainer;->getOpticalInsets()Landroid/graphics/Insets; -Landroid/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/graphics/drawable/DrawableContainer$DrawableContainerState; -Landroid/graphics/drawable/DrawableInflater;->mClassLoader:Ljava/lang/ClassLoader; -Landroid/graphics/drawable/GradientDrawable$GradientState;->mAngle:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mGradient:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mGradientColors:[I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mHeight:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mInnerRadius:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mInnerRadiusRatio:F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mOrientation:Landroid/graphics/drawable/GradientDrawable$Orientation; -Landroid/graphics/drawable/GradientDrawable$GradientState;->mPadding:Landroid/graphics/Rect; -Landroid/graphics/drawable/GradientDrawable$GradientState;->mPositions:[F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mRadius:F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mRadiusArray:[F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mShape:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mSolidColors:Landroid/content/res/ColorStateList; -Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashGap:F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeDashWidth:F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mStrokeWidth:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mThickness:I -Landroid/graphics/drawable/GradientDrawable$GradientState;->mThicknessRatio:F -Landroid/graphics/drawable/GradientDrawable$GradientState;->mWidth:I -Landroid/graphics/drawable/GradientDrawable;->getOpticalInsets()Landroid/graphics/Insets; -Landroid/graphics/drawable/GradientDrawable;->mGradientState:Landroid/graphics/drawable/GradientDrawable$GradientState; -Landroid/graphics/drawable/GradientDrawable;->mPadding:Landroid/graphics/Rect; -Landroid/graphics/drawable/Icon;->getBitmap()Landroid/graphics/Bitmap; -Landroid/graphics/drawable/Icon;->getDataBytes()[B -Landroid/graphics/drawable/Icon;->getDataLength()I -Landroid/graphics/drawable/Icon;->getDataOffset()I -Landroid/graphics/drawable/Icon;->getResources()Landroid/content/res/Resources; -Landroid/graphics/drawable/Icon;->hasTint()Z -Landroid/graphics/drawable/Icon;->mString1:Ljava/lang/String; -Landroid/graphics/drawable/Icon;->mType:I -Landroid/graphics/drawable/InsetDrawable;->mState:Landroid/graphics/drawable/InsetDrawable$InsetState; -Landroid/graphics/drawable/LayerDrawable$ChildDrawable;->mDrawable:Landroid/graphics/drawable/Drawable; -Landroid/graphics/drawable/LayerDrawable$LayerState;->mChildren:[Landroid/graphics/drawable/LayerDrawable$ChildDrawable; -Landroid/graphics/drawable/LayerDrawable;->mLayerState:Landroid/graphics/drawable/LayerDrawable$LayerState; -Landroid/graphics/drawable/NinePatchDrawable$NinePatchState;->mNinePatch:Landroid/graphics/NinePatch; -Landroid/graphics/drawable/NinePatchDrawable;->mNinePatchState:Landroid/graphics/drawable/NinePatchDrawable$NinePatchState; -Landroid/graphics/drawable/RippleDrawable$RippleState;->mColor:Landroid/content/res/ColorStateList; -Landroid/graphics/drawable/RippleDrawable;->mState:Landroid/graphics/drawable/RippleDrawable$RippleState; -Landroid/graphics/drawable/StateListDrawable;->extractStateSet(Landroid/util/AttributeSet;)[I -Landroid/graphics/drawable/StateListDrawable;->getStateCount()I -Landroid/graphics/drawable/StateListDrawable;->getStateDrawable(I)Landroid/graphics/drawable/Drawable; -Landroid/graphics/drawable/StateListDrawable;->getStateDrawableIndex([I)I -Landroid/graphics/drawable/StateListDrawable;->getStateSet(I)[I -Landroid/graphics/drawable/StateListDrawable;->mStateListState:Landroid/graphics/drawable/StateListDrawable$StateListState; -Landroid/graphics/drawable/StateListDrawable;->updateStateFromTypedArray(Landroid/content/res/TypedArray;)V -Landroid/graphics/drawable/VectorDrawable$VGroup;->setRotation(F)V -Landroid/graphics/drawable/VectorDrawable;->getTargetByName(Ljava/lang/String;)Ljava/lang/Object; -Landroid/graphics/drawable/VectorDrawable;->mTintFilter:Landroid/graphics/PorterDuffColorFilter; -Landroid/graphics/drawable/VectorDrawable;->setAllowCaching(Z)V -Landroid/graphics/fonts/FontVariationAxis;->mStyleValue:F -Landroid/graphics/fonts/FontVariationAxis;->mTag:I -Landroid/hardware/Camera;->addCallbackBuffer([BI)V -Landroid/hardware/Camera;->mNativeContext:J -Landroid/hardware/Camera;->native_setup(Ljava/lang/Object;IILjava/lang/String;)I -Landroid/hardware/Camera;->openLegacy(II)Landroid/hardware/Camera; -Landroid/hardware/Camera;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/hardware/HardwareBuffer;-><init>(J)V -Landroid/hardware/HardwareBuffer;->destroy()V -Landroid/hardware/HardwareBuffer;->isDestroyed()Z -Landroid/hardware/HardwareBuffer;->mNativeObject:J -Landroid/hardware/ICameraService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/ICameraService; -Landroid/hardware/SensorDirectChannel;->isValid()Z -Landroid/hardware/SensorManager;->configureDirectChannel(Landroid/hardware/SensorDirectChannel;Landroid/hardware/Sensor;I)I -Landroid/hardware/SerialPort;->mNativeContext:I -Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchAdditionalInfoEvent(III[F[I)V -Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchFlushCompleteEvent(I)V -Landroid/hardware/SystemSensorManager$BaseEventQueue;->dispatchSensorEvent(I[FIJ)V -Landroid/hardware/camera2/CameraAccessException;->serialVersionUID:J -Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V -Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V -Landroid/hardware/camera2/CameraCharacteristics$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V -Landroid/hardware/camera2/CameraCharacteristics$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key; -Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_MAX_REGIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->LED_AVAILABLE_LEDS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->LENS_INFO_SHADING_MAP_SIZE:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->LOGICAL_MULTI_CAMERA_PHYSICAL_IDS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->QUIRKS_USE_PARTIAL_RESULT:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_CHARACTERISTICS_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_RESULT_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_SESSION_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_MAX_NUM_OUTPUT_STREAMS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_FORMATS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_JPEG_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_PROCESSED_SIZES:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STALL_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CameraCharacteristics;->SCALER_AVAILABLE_STREAM_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key; -Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V -Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V -Landroid/hardware/camera2/CaptureRequest$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V -Landroid/hardware/camera2/CaptureRequest$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key; -Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->REQUEST_ID:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureRequest$Key; -Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Landroid/hardware/camera2/utils/TypeReference;)V -Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;)V -Landroid/hardware/camera2/CaptureResult$Key;-><init>(Ljava/lang/String;Ljava/lang/Class;J)V -Landroid/hardware/camera2/CaptureResult$Key;->getNativeKey()Landroid/hardware/camera2/impl/CameraMetadataNative$Key; -Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_COORDINATES:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->QUIRKS_PARTIAL_RESULT:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->REQUEST_FRAME_COUNT:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->REQUEST_ID:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_IDS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_LANDMARKS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_RECTANGLES:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_FACE_SCORES:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_LENS_SHADING_MAP:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_TIMESTAMPS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_X_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_OIS_Y_SHIFTS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_GAINS:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->STATISTICS_PREDICTED_COLOR_TRANSFORM:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->SYNC_FRAME_NUMBER:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureResult$Key; -Landroid/hardware/camera2/impl/CameraMetadataNative$Key;->getTag()I -Landroid/hardware/camera2/impl/CameraMetadataNative;->mMetadataPtr:J -Landroid/hardware/camera2/utils/TypeReference;->createSpecializedTypeReference(Ljava/lang/reflect/Type;)Landroid/hardware/camera2/utils/TypeReference; -Landroid/hardware/display/DisplayManagerGlobal;->getInstance()Landroid/hardware/display/DisplayManagerGlobal; -Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display; -Landroid/hardware/display/DisplayManagerGlobal;->mDm:Landroid/hardware/display/IDisplayManager; -Landroid/hardware/display/DisplayManagerGlobal;->sInstance:Landroid/hardware/display/DisplayManagerGlobal; -Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager; -Landroid/hardware/display/WifiDisplayStatus;->mActiveDisplay:Landroid/hardware/display/WifiDisplay; -Landroid/hardware/display/WifiDisplayStatus;->mDisplays:[Landroid/hardware/display/WifiDisplay; -Landroid/hardware/fingerprint/Fingerprint;->getFingerId()I -Landroid/hardware/fingerprint/Fingerprint;->getName()Ljava/lang/CharSequence; -Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/hardware/input/IInputManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/hardware/input/IInputManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/input/IInputManager; -Landroid/hardware/input/InputManager;->INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH:I -Landroid/hardware/input/InputManager;->getInstance()Landroid/hardware/input/InputManager; -Landroid/hardware/input/InputManager;->injectInputEvent(Landroid/view/InputEvent;I)Z -Landroid/hardware/input/InputManager;->mIm:Landroid/hardware/input/IInputManager; -Landroid/hardware/location/GeofenceHardware;-><init>(Landroid/hardware/location/IGeofenceHardware;)V -Landroid/hardware/location/IActivityRecognitionHardwareClient$Stub;-><init>()V -Landroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V -Landroid/hardware/location/IContextHubService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/location/IContextHubService; -Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;-><init>(II)V -Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;->confidenceLevel:I -Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;->userId:I -Landroid/hardware/soundtrigger/SoundTrigger$GenericRecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$GenericSoundModel;-><init>(Ljava/util/UUID;Ljava/util/UUID;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->id:I -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->locale:Ljava/lang/String; -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->recognitionModes:I -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->text:Ljava/lang/String; -Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase;->users:[I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;)V -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;-><init>(III[Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel;)V -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->coarseConfidenceLevel:I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->confidenceLevels:[Landroid/hardware/soundtrigger/SoundTrigger$ConfidenceLevel; -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->id:I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;->recognitionModes:I -Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel;->keyphrases:[Landroid/hardware/soundtrigger/SoundTrigger$Keyphrase; -Landroid/hardware/soundtrigger/SoundTrigger$ModuleProperties;-><init>(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIIIZIZIZ)V -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;-><init>(ZZ[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->captureRequested:Z -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->data:[B -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;->keyphrases:[Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseRecognitionExtra; -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;-><init>(IIZIIIZLandroid/media/AudioFormat;[B)V -Landroid/hardware/soundtrigger/SoundTrigger$RecognitionEvent;->data:[B -Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->data:[B -Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->uuid:Ljava/util/UUID; -Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;->vendorUuid:Ljava/util/UUID; -Landroid/hardware/soundtrigger/SoundTrigger$SoundModelEvent;-><init>(II[B)V -Landroid/hardware/soundtrigger/SoundTriggerModule;->mId:I -Landroid/hardware/soundtrigger/SoundTriggerModule;->mNativeContext:J -Landroid/hardware/soundtrigger/SoundTriggerModule;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/hardware/usb/IUsbManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/hardware/usb/UsbDeviceConnection;->mNativeContext:J -Landroid/hardware/usb/UsbManager;->getPortStatus(Landroid/hardware/usb/UsbPort;)Landroid/hardware/usb/UsbPortStatus; -Landroid/hardware/usb/UsbManager;->getPorts()[Landroid/hardware/usb/UsbPort; -Landroid/hardware/usb/UsbManager;->setCurrentFunction(Ljava/lang/String;Z)V -Landroid/hardware/usb/UsbManager;->setPortRoles(Landroid/hardware/usb/UsbPort;II)V -Landroid/hardware/usb/UsbPortStatus;->getCurrentDataRole()I -Landroid/hardware/usb/UsbPortStatus;->getCurrentMode()I -Landroid/hardware/usb/UsbPortStatus;->getCurrentPowerRole()I -Landroid/hardware/usb/UsbPortStatus;->getSupportedRoleCombinations()I -Landroid/hardware/usb/UsbPortStatus;->isConnected()Z -Landroid/hardware/usb/UsbPortStatus;->isRoleCombinationSupported(II)Z -Landroid/hardware/usb/UsbRequest;->mBuffer:Ljava/nio/ByteBuffer; -Landroid/hardware/usb/UsbRequest;->mLength:I -Landroid/hardware/usb/UsbRequest;->mNativeContext:J -Landroid/icu/impl/CurrencyData;-><init>()V -Landroid/icu/impl/TimeZoneGenericNames;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/impl/TimeZoneGenericNames;->serialVersionUID:J -Landroid/icu/impl/locale/LocaleSyntaxException;->serialVersionUID:J -Landroid/icu/impl/number/DecimalFormatProperties;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/impl/number/DecimalFormatProperties;->serialVersionUID:J -Landroid/icu/impl/number/DecimalFormatProperties;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/math/BigDecimal;->serialVersionUID:J -Landroid/icu/math/MathContext;->serialVersionUID:J -Landroid/icu/text/ArabicShaping;->isAlefMaksouraChar(C)Z -Landroid/icu/text/ArabicShaping;->isSeenTailFamilyChar(C)I -Landroid/icu/text/ArabicShaping;->isTailChar(C)Z -Landroid/icu/text/ArabicShaping;->isYehHamzaChar(C)Z -Landroid/icu/text/ArabicShapingException;->serialVersionUID:J -Landroid/icu/text/ChineseDateFormat$Field;->serialVersionUID:J -Landroid/icu/text/ChineseDateFormat;->serialVersionUID:J -Landroid/icu/text/ChineseDateFormatSymbols;->serialVersionUID:J -Landroid/icu/text/CompactDecimalFormat;->serialVersionUID:J -Landroid/icu/text/CurrencyPluralInfo;->serialVersionUID:J -Landroid/icu/text/DateFormat$Field;->serialVersionUID:J -Landroid/icu/text/DateFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/DateFormat;->serialVersionUID:J -Landroid/icu/text/DateFormatSymbols;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; -Landroid/icu/text/DateFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/DateFormatSymbols;->serialVersionUID:J -Landroid/icu/text/DateIntervalFormat;-><init>()V -Landroid/icu/text/DateIntervalFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/DateIntervalFormat;->serialVersionUID:J -Landroid/icu/text/DateIntervalInfo$PatternInfo;->serialVersionUID:J -Landroid/icu/text/DateIntervalInfo;->serialVersionUID:J -Landroid/icu/text/DateTimePatternGenerator$DistanceInfo;-><init>()V -Landroid/icu/text/DecimalFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/DecimalFormat;->serialVersionUID:J -Landroid/icu/text/DecimalFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/DecimalFormatSymbols;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; -Landroid/icu/text/DecimalFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/DecimalFormatSymbols;->serialVersionUID:J -Landroid/icu/text/DecimalFormat_ICU58_Android;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/DecimalFormat_ICU58_Android;->serialVersionUID:J -Landroid/icu/text/DecimalFormat_ICU58_Android;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/DurationFormat;->serialVersionUID:J -Landroid/icu/text/MeasureFormat$MeasureProxy;->readResolve()Ljava/lang/Object; -Landroid/icu/text/MeasureFormat$MeasureProxy;->serialVersionUID:J -Landroid/icu/text/MeasureFormat;->serialVersionUID:J -Landroid/icu/text/MeasureFormat;->writeReplace()Ljava/lang/Object; -Landroid/icu/text/MessageFormat$Field;->serialVersionUID:J -Landroid/icu/text/MessageFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/MessageFormat;->serialVersionUID:J -Landroid/icu/text/MessageFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/NumberFormat$Field;->serialVersionUID:J -Landroid/icu/text/NumberFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/NumberFormat;->serialVersionUID:J -Landroid/icu/text/NumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/PluralFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/PluralFormat;->serialVersionUID:J -Landroid/icu/text/PluralRules$AndConstraint;->serialVersionUID:J -Landroid/icu/text/PluralRules$BinaryConstraint;->serialVersionUID:J -Landroid/icu/text/PluralRules$FixedDecimal;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/PluralRules$FixedDecimal;->serialVersionUID:J -Landroid/icu/text/PluralRules$FixedDecimal;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/PluralRules$OrConstraint;->serialVersionUID:J -Landroid/icu/text/PluralRules$RangeConstraint;->serialVersionUID:J -Landroid/icu/text/PluralRules$Rule;->serialVersionUID:J -Landroid/icu/text/PluralRules$RuleList;->serialVersionUID:J -Landroid/icu/text/PluralRules;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/PluralRules;->serialVersionUID:J -Landroid/icu/text/PluralRules;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/PluralRules;->writeReplace()Ljava/lang/Object; -Landroid/icu/text/RuleBasedCollator;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; -Landroid/icu/text/RuleBasedNumberFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/RuleBasedNumberFormat;->serialVersionUID:J -Landroid/icu/text/RuleBasedNumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/SelectFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/SelectFormat;->serialVersionUID:J -Landroid/icu/text/SimpleDateFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/SimpleDateFormat;->serialVersionUID:J -Landroid/icu/text/SimpleDateFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/SpoofChecker$ScriptSet;-><init>()V -Landroid/icu/text/SpoofChecker$ScriptSet;->and(I)V -Landroid/icu/text/SpoofChecker$ScriptSet;->isFull()Z -Landroid/icu/text/SpoofChecker$ScriptSet;->serialVersionUID:J -Landroid/icu/text/SpoofChecker$ScriptSet;->setAll()V -Landroid/icu/text/StringPrepParseException;->serialVersionUID:J -Landroid/icu/text/TimeUnitFormat;->readResolve()Ljava/lang/Object; -Landroid/icu/text/TimeUnitFormat;->serialVersionUID:J -Landroid/icu/text/TimeUnitFormat;->writeReplace()Ljava/lang/Object; -Landroid/icu/text/TimeZoneFormat;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/text/TimeZoneFormat;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Landroid/icu/text/TimeZoneFormat;->serialVersionUID:J -Landroid/icu/text/TimeZoneFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/text/TimeZoneNames$DefaultTimeZoneNames$FactoryImpl;-><init>()V -Landroid/icu/text/TimeZoneNames$DefaultTimeZoneNames;->serialVersionUID:J -Landroid/icu/text/TimeZoneNames;->serialVersionUID:J -Landroid/icu/text/Transliterator;->createFromRules(Ljava/lang/String;Ljava/lang/String;I)Landroid/icu/text/Transliterator; -Landroid/icu/text/Transliterator;->getInstance(Ljava/lang/String;)Landroid/icu/text/Transliterator; -Landroid/icu/text/Transliterator;->transliterate(Ljava/lang/String;)Ljava/lang/String; -Landroid/icu/text/UFormat;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; -Landroid/icu/text/UFormat;->serialVersionUID:J -Landroid/icu/util/AnnualTimeZoneRule;->serialVersionUID:J -Landroid/icu/util/BasicTimeZone;->serialVersionUID:J -Landroid/icu/util/BuddhistCalendar;->serialVersionUID:J -Landroid/icu/util/CECalendar;->serialVersionUID:J -Landroid/icu/util/Calendar;->getLocale(Landroid/icu/util/ULocale$Type;)Landroid/icu/util/ULocale; -Landroid/icu/util/Calendar;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/util/Calendar;->serialVersionUID:J -Landroid/icu/util/Calendar;->writeObject(Ljava/io/ObjectOutputStream;)V -Landroid/icu/util/ChineseCalendar;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/util/ChineseCalendar;->serialVersionUID:J -Landroid/icu/util/CopticCalendar;->serialVersionUID:J -Landroid/icu/util/Currency;->readResolve()Ljava/lang/Object; -Landroid/icu/util/Currency;->serialVersionUID:J -Landroid/icu/util/Currency;->writeReplace()Ljava/lang/Object; -Landroid/icu/util/DangiCalendar;->serialVersionUID:J -Landroid/icu/util/DateInterval;->serialVersionUID:J -Landroid/icu/util/DateTimeRule;->serialVersionUID:J -Landroid/icu/util/EthiopicCalendar;->serialVersionUID:J -Landroid/icu/util/GregorianCalendar;->serialVersionUID:J -Landroid/icu/util/HebrewCalendar;->serialVersionUID:J -Landroid/icu/util/ICUCloneNotSupportedException;->serialVersionUID:J -Landroid/icu/util/ICUException;->serialVersionUID:J -Landroid/icu/util/ICUUncheckedIOException;->serialVersionUID:J -Landroid/icu/util/IllformedLocaleException;->serialVersionUID:J -Landroid/icu/util/IndianCalendar;->serialVersionUID:J -Landroid/icu/util/InitialTimeZoneRule;->serialVersionUID:J -Landroid/icu/util/IslamicCalendar;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/util/IslamicCalendar;->serialVersionUID:J -Landroid/icu/util/JapaneseCalendar;->serialVersionUID:J -Landroid/icu/util/MeasureUnit$MeasureUnitProxy;->readResolve()Ljava/lang/Object; -Landroid/icu/util/MeasureUnit$MeasureUnitProxy;->serialVersionUID:J -Landroid/icu/util/MeasureUnit;->serialVersionUID:J -Landroid/icu/util/MeasureUnit;->writeReplace()Ljava/lang/Object; -Landroid/icu/util/NoUnit;->serialVersionUID:J -Landroid/icu/util/PersianCalendar;->serialVersionUID:J -Landroid/icu/util/RuleBasedTimeZone;->serialVersionUID:J -Landroid/icu/util/STZInfo;->serialVersionUID:J -Landroid/icu/util/SimpleTimeZone;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/icu/util/SimpleTimeZone;->serialVersionUID:J -Landroid/icu/util/TaiwanCalendar;->serialVersionUID:J -Landroid/icu/util/TimeArrayTimeZoneRule;->serialVersionUID:J -Landroid/icu/util/TimeUnit;->readResolve()Ljava/lang/Object; -Landroid/icu/util/TimeUnit;->serialVersionUID:J -Landroid/icu/util/TimeUnit;->writeReplace()Ljava/lang/Object; -Landroid/icu/util/TimeZone$ConstantZone;->serialVersionUID:J -Landroid/icu/util/TimeZone;->serialVersionUID:J -Landroid/icu/util/TimeZoneRule;->serialVersionUID:J -Landroid/icu/util/ULocale;->serialVersionUID:J -Landroid/icu/util/UResourceTypeMismatchException;->serialVersionUID:J -Landroid/icu/util/VTimeZone;->serialVersionUID:J -Landroid/inputmethodservice/InputMethodService$SettingsObserver;->shouldShowImeWithHardKeyboard()Z -Landroid/inputmethodservice/InputMethodService;->mExtractEditText:Landroid/inputmethodservice/ExtractEditText; -Landroid/inputmethodservice/InputMethodService;->mRootView:Landroid/view/View; -Landroid/inputmethodservice/InputMethodService;->mSettingsObserver:Landroid/inputmethodservice/InputMethodService$SettingsObserver; -Landroid/location/Country;->getCountryIso()Ljava/lang/String; -Landroid/location/Country;->getSource()I -Landroid/location/CountryDetector;->detectCountry()Landroid/location/Country; -Landroid/location/GeocoderParams;->getClientPackage()Ljava/lang/String; -Landroid/location/GeocoderParams;->getLocale()Ljava/util/Locale; -Landroid/location/IGeocodeProvider$Stub;-><init>()V -Landroid/location/IGeocodeProvider;->getFromLocation(DDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String; -Landroid/location/IGeocodeProvider;->getFromLocationName(Ljava/lang/String;DDDDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String; -Landroid/location/IGeofenceProvider$Stub;-><init>()V -Landroid/location/IGeofenceProvider;->setGeofenceHardware(Landroid/hardware/location/IGeofenceHardware;)V -Landroid/location/ILocationListener$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/location/ILocationListener$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/location/ILocationListener;->onLocationChanged(Landroid/location/Location;)V -Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager; -Landroid/location/ILocationManager;->getNetworkProviderPackage()Ljava/lang/String; -Landroid/location/ILocationManager;->reportLocation(Landroid/location/Location;Z)V -Landroid/location/INetInitiatedListener$Stub;-><init>()V -Landroid/location/INetInitiatedListener;->sendNiResponse(II)Z -Landroid/location/Location;->mElapsedRealtimeNanos:J -Landroid/location/Location;->removeBearingAccuracy()V -Landroid/location/Location;->removeSpeedAccuracy()V -Landroid/location/Location;->removeVerticalAccuracy()V -Landroid/location/Location;->setExtraLocation(Ljava/lang/String;Landroid/location/Location;)V -Landroid/location/LocationManager;->mService:Landroid/location/ILocationManager; -Landroid/location/LocationRequest;->mHideFromAppOps:Z -Landroid/location/LocationRequest;->mInterval:J -Landroid/location/LocationRequest;->mProvider:Ljava/lang/String; -Landroid/location/LocationRequest;->mWorkSource:Landroid/os/WorkSource; -Landroid/media/AudioAttributes$Builder;->addTag(Ljava/lang/String;)Landroid/media/AudioAttributes$Builder; -Landroid/media/AudioAttributes;->mContentType:I -Landroid/media/AudioAttributes;->mFlags:I -Landroid/media/AudioAttributes;->mFormattedTags:Ljava/lang/String; -Landroid/media/AudioAttributes;->mSource:I -Landroid/media/AudioAttributes;->mUsage:I -Landroid/media/AudioAttributes;->toLegacyStreamType(Landroid/media/AudioAttributes;)I -Landroid/media/AudioDevicePort;-><init>(Landroid/media/AudioHandle;Ljava/lang/String;[I[I[I[I[Landroid/media/AudioGain;ILjava/lang/String;)V -Landroid/media/AudioDevicePortConfig;-><init>(Landroid/media/AudioDevicePort;IIILandroid/media/AudioGainConfig;)V -Landroid/media/AudioFormat;-><init>()V -Landroid/media/AudioFormat;-><init>(IIII)V -Landroid/media/AudioFormat;->mChannelMask:I -Landroid/media/AudioFormat;->mEncoding:I -Landroid/media/AudioFormat;->mSampleRate:I -Landroid/media/AudioGain;-><init>(IIIIIIIII)V -Landroid/media/AudioGainConfig;-><init>(ILandroid/media/AudioGain;II[II)V -Landroid/media/AudioGainConfig;->mChannelMask:I -Landroid/media/AudioGainConfig;->mIndex:I -Landroid/media/AudioGainConfig;->mMode:I -Landroid/media/AudioGainConfig;->mRampDurationMs:I -Landroid/media/AudioGainConfig;->mValues:[I -Landroid/media/AudioHandle;-><init>(I)V -Landroid/media/AudioHandle;->mId:I -Landroid/media/AudioManager;-><init>(Landroid/content/Context;)V -Landroid/media/AudioManager;->STREAM_BLUETOOTH_SCO:I -Landroid/media/AudioManager;->STREAM_SYSTEM_ENFORCED:I -Landroid/media/AudioManager;->STREAM_TTS:I -Landroid/media/AudioManager;->forceVolumeControlStream(I)V -Landroid/media/AudioManager;->getOutputLatency(I)I -Landroid/media/AudioManager;->getService()Landroid/media/IAudioService; -Landroid/media/AudioManager;->mAudioFocusIdListenerMap:Ljava/util/concurrent/ConcurrentHashMap; -Landroid/media/AudioManager;->registerAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V -Landroid/media/AudioManager;->setMasterMute(ZI)V -Landroid/media/AudioManager;->setRingerModeInternal(I)V -Landroid/media/AudioManager;->startBluetoothScoVirtualCall()V -Landroid/media/AudioManager;->unregisterAudioPortUpdateListener(Landroid/media/AudioManager$OnAudioPortUpdateListener;)V -Landroid/media/AudioMixPort;-><init>(Landroid/media/AudioHandle;IILjava/lang/String;[I[I[I[I[Landroid/media/AudioGain;)V -Landroid/media/AudioMixPortConfig;-><init>(Landroid/media/AudioMixPort;IIILandroid/media/AudioGainConfig;)V -Landroid/media/AudioPatch;-><init>(Landroid/media/AudioHandle;[Landroid/media/AudioPortConfig;[Landroid/media/AudioPortConfig;)V -Landroid/media/AudioPatch;->mHandle:Landroid/media/AudioHandle; -Landroid/media/AudioPort;-><init>(Landroid/media/AudioHandle;ILjava/lang/String;[I[I[I[I[Landroid/media/AudioGain;)V -Landroid/media/AudioPort;->mActiveConfig:Landroid/media/AudioPortConfig; -Landroid/media/AudioPort;->mGains:[Landroid/media/AudioGain; -Landroid/media/AudioPort;->mHandle:Landroid/media/AudioHandle; -Landroid/media/AudioPort;->mRole:I -Landroid/media/AudioPortConfig;-><init>(Landroid/media/AudioPort;IIILandroid/media/AudioGainConfig;)V -Landroid/media/AudioPortConfig;->mChannelMask:I -Landroid/media/AudioPortConfig;->mConfigMask:I -Landroid/media/AudioPortConfig;->mFormat:I -Landroid/media/AudioPortConfig;->mGain:Landroid/media/AudioGainConfig; -Landroid/media/AudioPortConfig;->mPort:Landroid/media/AudioPort; -Landroid/media/AudioPortConfig;->mSamplingRate:I -Landroid/media/AudioPortEventHandler;->mJniCallback:J -Landroid/media/AudioPortEventHandler;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/media/AudioRecord;->mNativeCallbackCookie:J -Landroid/media/AudioRecord;->mNativeDeviceCallback:J -Landroid/media/AudioRecord;->mNativeRecorderInJavaObj:J -Landroid/media/AudioRecord;->native_release()V -Landroid/media/AudioRecord;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/media/AudioRecordingConfiguration;->getClientPackageName()Ljava/lang/String; -Landroid/media/AudioRecordingConfiguration;->getClientUid()I -Landroid/media/AudioSystem;->checkAudioFlinger()I -Landroid/media/AudioSystem;->dynamicPolicyCallbackFromNative(ILjava/lang/String;I)V -Landroid/media/AudioSystem;->errorCallbackFromNative(I)V -Landroid/media/AudioSystem;->getForceUse(I)I -Landroid/media/AudioSystem;->getParameters(Ljava/lang/String;)Ljava/lang/String; -Landroid/media/AudioSystem;->getPrimaryOutputFrameCount()I -Landroid/media/AudioSystem;->getPrimaryOutputSamplingRate()I -Landroid/media/AudioSystem;->isSourceActive(I)Z -Landroid/media/AudioSystem;->isStreamActive(II)Z -Landroid/media/AudioSystem;->recordingCallbackFromNative(IIII[I)V -Landroid/media/AudioSystem;->setDeviceConnectionState(IILjava/lang/String;Ljava/lang/String;)I -Landroid/media/AudioSystem;->setErrorCallback(Landroid/media/AudioSystem$ErrorCallback;)V -Landroid/media/AudioSystem;->setForceUse(II)I -Landroid/media/AudioSystem;->setParameters(Ljava/lang/String;)I -Landroid/media/AudioTrack;->deferred_connect(J)V -Landroid/media/AudioTrack;->getLatency()I -Landroid/media/AudioTrack;->mJniData:J -Landroid/media/AudioTrack;->mNativeTrackInJavaObj:J -Landroid/media/AudioTrack;->mStreamType:I -Landroid/media/AudioTrack;->native_release()V -Landroid/media/AudioTrack;->postEventFromNative(Ljava/lang/Object;IIILjava/lang/Object;)V -Landroid/media/ExifInterface;->getDateTime()J -Landroid/media/IAudioService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/media/IAudioService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IAudioService; -Landroid/media/IAudioService;->getStreamMaxVolume(I)I -Landroid/media/IAudioService;->getStreamVolume(I)I -Landroid/media/IAudioService;->setStreamVolume(IIILjava/lang/String;)V -Landroid/media/IMediaRouterService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaRouterService; -Landroid/media/IMediaScannerService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IMediaScannerService; -Landroid/media/IMediaScannerService;->scanFile(Ljava/lang/String;Ljava/lang/String;)V -Landroid/media/IRemoteDisplayCallback;->onStateChanged(Landroid/media/RemoteDisplayState;)V -Landroid/media/IVolumeController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/IVolumeController; -Landroid/media/Image;-><init>()V -Landroid/media/JetPlayer;->mNativePlayerInJavaObj:J -Landroid/media/JetPlayer;->postEventFromNative(Ljava/lang/Object;III)V -Landroid/media/MediaCodec$CodecException;-><init>(IILjava/lang/String;)V -Landroid/media/MediaCodec;->getBuffers(Z)[Ljava/nio/ByteBuffer; -Landroid/media/MediaCodec;->releaseOutputBuffer(IZZJ)V -Landroid/media/MediaDrm$Certificate;->getContent()[B -Landroid/media/MediaDrm$Certificate;->getWrappedPrivateKey()[B -Landroid/media/MediaDrm$CertificateRequest;->getData()[B -Landroid/media/MediaDrm$CertificateRequest;->getDefaultUrl()Ljava/lang/String; -Landroid/media/MediaDrm;->getCertificateRequest(ILjava/lang/String;)Landroid/media/MediaDrm$CertificateRequest; -Landroid/media/MediaDrm;->provideCertificateResponse([B)Landroid/media/MediaDrm$Certificate; -Landroid/media/MediaDrm;->signRSA([BLjava/lang/String;[B[B)[B -Landroid/media/MediaFile$MediaFileType;->fileType:I -Landroid/media/MediaFile$MediaFileType;->mimeType:Ljava/lang/String; -Landroid/media/MediaFile;-><init>()V -Landroid/media/MediaFile;->FIRST_AUDIO_FILE_TYPE:I -Landroid/media/MediaFile;->LAST_AUDIO_FILE_TYPE:I -Landroid/media/MediaFile;->getFileType(Ljava/lang/String;)Landroid/media/MediaFile$MediaFileType; -Landroid/media/MediaFile;->getFileTypeForMimeType(Ljava/lang/String;)I -Landroid/media/MediaFile;->getMimeTypeForFile(Ljava/lang/String;)Ljava/lang/String; -Landroid/media/MediaFile;->isAudioFileType(I)Z -Landroid/media/MediaFile;->isImageFileType(I)Z -Landroid/media/MediaFile;->isPlayListFileType(I)Z -Landroid/media/MediaFile;->isVideoFileType(I)Z -Landroid/media/MediaFile;->sFileTypeMap:Ljava/util/HashMap; -Landroid/media/MediaFormat;->getMap()Ljava/util/Map; -Landroid/media/MediaHTTPService;->createHttpServiceBinderIfNecessary(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/media/MediaMetadataRetriever;->getEmbeddedPicture(I)[B -Landroid/media/MediaPlayer;->getMetadata(ZZ)Landroid/media/Metadata; -Landroid/media/MediaPlayer;->invoke(Landroid/os/Parcel;Landroid/os/Parcel;)V -Landroid/media/MediaPlayer;->mEventHandler:Landroid/media/MediaPlayer$EventHandler; -Landroid/media/MediaPlayer;->newRequest()Landroid/os/Parcel; -Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;Ljava/util/Map;)V -Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;Ljava/util/Map;Ljava/util/List;)V -Landroid/media/MediaPlayer;->setDataSource(Ljava/lang/String;[Ljava/lang/String;[Ljava/lang/String;Ljava/util/List;)V -Landroid/media/MediaPlayer;->setRetransmitEndpoint(Ljava/net/InetSocketAddress;)V -Landroid/media/MediaRecorder;->setParameter(Ljava/lang/String;)V -Landroid/media/MediaRouter$RouteInfo;->STATUS_CONNECTING:I -Landroid/media/MediaRouter$RouteInfo;->getStatusCode()I -Landroid/media/MediaRouter;->selectRouteInt(ILandroid/media/MediaRouter$RouteInfo;Z)V -Landroid/media/MediaScanner;->isNoMediaPath(Ljava/lang/String;)Z -Landroid/media/MediaScanner;->mClient:Landroid/media/MediaScanner$MyMediaScannerClient; -Landroid/media/MediaScanner;->scanSingleFile(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri; -Landroid/media/Metadata;->PAUSE_AVAILABLE:I -Landroid/media/Metadata;->SEEK_BACKWARD_AVAILABLE:I -Landroid/media/Metadata;->SEEK_FORWARD_AVAILABLE:I -Landroid/media/Metadata;->getBoolean(I)Z -Landroid/media/Metadata;->has(I)Z -Landroid/media/MicrophoneInfo;-><init>(Ljava/lang/String;ILjava/lang/String;IIILandroid/media/MicrophoneInfo$Coordinate3F;Landroid/media/MicrophoneInfo$Coordinate3F;Ljava/util/List;Ljava/util/List;FFFI)V -Landroid/media/MiniThumbFile;->reset()V -Landroid/media/PlaybackParams;->SET_AUDIO_FALLBACK_MODE:I -Landroid/media/PlaybackParams;->SET_AUDIO_STRETCH_MODE:I -Landroid/media/PlaybackParams;->SET_PITCH:I -Landroid/media/PlaybackParams;->SET_SPEED:I -Landroid/media/PlaybackParams;->mAudioFallbackMode:I -Landroid/media/PlaybackParams;->mAudioStretchMode:I -Landroid/media/PlaybackParams;->mPitch:F -Landroid/media/PlaybackParams;->mSet:I -Landroid/media/PlaybackParams;->mSpeed:F -Landroid/media/RemoteDisplay;->notifyDisplayConnected(Landroid/view/Surface;IIII)V -Landroid/media/RemoteDisplay;->notifyDisplayDisconnected()V -Landroid/media/RemoteDisplay;->notifyDisplayError(I)V -Landroid/media/RemoteDisplayState;-><init>()V -Landroid/media/RemoteDisplayState;->displays:Ljava/util/ArrayList; -Landroid/media/RingtoneManager;->getRingtone(Landroid/content/Context;Landroid/net/Uri;I)Landroid/media/Ringtone; -Landroid/media/SubtitleController;->mHandler:Landroid/os/Handler; -Landroid/media/SubtitleTrack$RenderingWidget;->draw(Landroid/graphics/Canvas;)V -Landroid/media/SubtitleTrack$RenderingWidget;->onAttachedToWindow()V -Landroid/media/SubtitleTrack$RenderingWidget;->onDetachedFromWindow()V -Landroid/media/SubtitleTrack$RenderingWidget;->setOnChangedListener(Landroid/media/SubtitleTrack$RenderingWidget$OnChangedListener;)V -Landroid/media/SubtitleTrack$RenderingWidget;->setSize(II)V -Landroid/media/ThumbnailUtils;->createImageThumbnail(Ljava/lang/String;I)Landroid/graphics/Bitmap; -Landroid/media/ToneGenerator;->mNativeContext:J -Landroid/media/VolumeShaper$Configuration;-><init>(IIIDI[F[F)V -Landroid/media/VolumeShaper$Configuration;->mDurationMs:D -Landroid/media/VolumeShaper$Configuration;->mId:I -Landroid/media/VolumeShaper$Configuration;->mInterpolatorType:I -Landroid/media/VolumeShaper$Configuration;->mOptionFlags:I -Landroid/media/VolumeShaper$Configuration;->mTimes:[F -Landroid/media/VolumeShaper$Configuration;->mType:I -Landroid/media/VolumeShaper$Configuration;->mVolumes:[F -Landroid/media/VolumeShaper$Operation;-><init>(IIF)V -Landroid/media/VolumeShaper$Operation;->mFlags:I -Landroid/media/VolumeShaper$Operation;->mReplaceId:I -Landroid/media/VolumeShaper$Operation;->mXOffset:F -Landroid/media/VolumeShaper$State;-><init>(FF)V -Landroid/media/VolumeShaper$State;->mVolume:F -Landroid/media/VolumeShaper$State;->mXOffset:F -Landroid/media/audiofx/AudioEffect;-><init>(Ljava/util/UUID;Ljava/util/UUID;II)V -Landroid/media/audiofx/AudioEffect;->command(I[B[B)I -Landroid/media/audiofx/AudioEffect;->getParameter([I[B)I -Landroid/media/audiofx/AudioEffect;->getParameter([I[I)I -Landroid/media/audiofx/AudioEffect;->setParameter([I[S)I -Landroid/media/audiopolicy/AudioMix;->mCallbackFlags:I -Landroid/media/audiopolicy/AudioMix;->mDeviceAddress:Ljava/lang/String; -Landroid/media/audiopolicy/AudioMix;->mDeviceSystemType:I -Landroid/media/audiopolicy/AudioMix;->mFormat:Landroid/media/AudioFormat; -Landroid/media/audiopolicy/AudioMix;->mMixType:I -Landroid/media/audiopolicy/AudioMix;->mRouteFlags:I -Landroid/media/audiopolicy/AudioMix;->mRule:Landroid/media/audiopolicy/AudioMixingRule; -Landroid/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion;->mAttr:Landroid/media/AudioAttributes; -Landroid/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion;->mIntProp:I -Landroid/media/audiopolicy/AudioMixingRule$AudioMixMatchCriterion;->mRule:I -Landroid/media/audiopolicy/AudioMixingRule;->mCriteria:Ljava/util/ArrayList; -Landroid/media/session/ISessionManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/media/session/ISessionManager; -Landroid/media/session/MediaSession;->getCallingPackage()Ljava/lang/String; -Landroid/media/session/MediaSession;->mCallback:Landroid/media/session/MediaSession$CallbackMessageHandler; -Landroid/media/session/MediaSessionLegacyHelper;->getHelper(Landroid/content/Context;)Landroid/media/session/MediaSessionLegacyHelper; -Landroid/media/soundtrigger/SoundTriggerDetector$EventPayload;->getCaptureSession()Ljava/lang/Integer; -Landroid/media/soundtrigger/SoundTriggerDetector$EventPayload;->getData()[B -Landroid/media/soundtrigger/SoundTriggerManager;->loadSoundModel(Landroid/hardware/soundtrigger/SoundTrigger$SoundModel;)I -Landroid/media/soundtrigger/SoundTriggerManager;->startRecognition(Ljava/util/UUID;Landroid/app/PendingIntent;Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;)I -Landroid/media/soundtrigger/SoundTriggerManager;->startRecognition(Ljava/util/UUID;Landroid/os/Bundle;Landroid/content/ComponentName;Landroid/hardware/soundtrigger/SoundTrigger$RecognitionConfig;)I -Landroid/media/soundtrigger/SoundTriggerManager;->stopRecognition(Ljava/util/UUID;)I -Landroid/media/soundtrigger/SoundTriggerManager;->unloadSoundModel(Ljava/util/UUID;)I -Landroid/media/tv/ITvRemoteProvider$Stub;-><init>()V -Landroid/media/tv/ITvRemoteServiceInput;->clearInputBridge(Landroid/os/IBinder;)V -Landroid/media/tv/ITvRemoteServiceInput;->closeInputBridge(Landroid/os/IBinder;)V -Landroid/media/tv/ITvRemoteServiceInput;->openInputBridge(Landroid/os/IBinder;Ljava/lang/String;III)V -Landroid/media/tv/ITvRemoteServiceInput;->sendKeyDown(Landroid/os/IBinder;I)V -Landroid/media/tv/ITvRemoteServiceInput;->sendKeyUp(Landroid/os/IBinder;I)V -Landroid/media/tv/ITvRemoteServiceInput;->sendPointerDown(Landroid/os/IBinder;III)V -Landroid/media/tv/ITvRemoteServiceInput;->sendPointerSync(Landroid/os/IBinder;)V -Landroid/media/tv/ITvRemoteServiceInput;->sendPointerUp(Landroid/os/IBinder;I)V -Landroid/media/tv/ITvRemoteServiceInput;->sendTimestamp(Landroid/os/IBinder;J)V -Landroid/media/tv/TvInputManager$Hardware;->dispatchKeyEventToHdmi(Landroid/view/KeyEvent;)Z -Landroid/media/tv/TvInputManager;->acquireTvInputHardware(ILandroid/media/tv/TvInputManager$HardwareCallback;Landroid/media/tv/TvInputInfo;)Landroid/media/tv/TvInputManager$Hardware; -Landroid/media/tv/TvView;->requestUnblockContent(Landroid/media/tv/TvContentRating;)V -Landroid/net/ConnectivityManager$PacketKeepalive;->stop()V -Landroid/net/ConnectivityManager$PacketKeepaliveCallback;-><init>()V -Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onError(I)V -Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStarted()V -Landroid/net/ConnectivityManager$PacketKeepaliveCallback;->onStopped()V -Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String; -Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String; -Landroid/net/ConnectivityManager;->TYPE_MOBILE_CBS:I -Landroid/net/ConnectivityManager;->TYPE_MOBILE_EMERGENCY:I -Landroid/net/ConnectivityManager;->TYPE_MOBILE_FOTA:I -Landroid/net/ConnectivityManager;->TYPE_MOBILE_IA:I -Landroid/net/ConnectivityManager;->TYPE_MOBILE_IMS:I -Landroid/net/ConnectivityManager;->TYPE_NONE:I -Landroid/net/ConnectivityManager;->TYPE_PROXY:I -Landroid/net/ConnectivityManager;->TYPE_WIFI_P2P:I -Landroid/net/ConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties; -Landroid/net/ConnectivityManager;->getActiveNetworkQuotaInfo()Landroid/net/NetworkQuotaInfo; -Landroid/net/ConnectivityManager;->getLinkProperties(I)Landroid/net/LinkProperties; -Landroid/net/ConnectivityManager;->getMobileDataEnabled()Z -Landroid/net/ConnectivityManager;->getTetherableUsbRegexs()[Ljava/lang/String; -Landroid/net/ConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String; -Landroid/net/ConnectivityManager;->getTetheredIfaces()[Ljava/lang/String; -Landroid/net/ConnectivityManager;->isNetworkSupported(I)Z -Landroid/net/ConnectivityManager;->isNetworkTypeMobile(I)Z -Landroid/net/ConnectivityManager;->mService:Landroid/net/IConnectivityManager; -Landroid/net/ConnectivityManager;->registerNetworkFactory(Landroid/os/Messenger;Ljava/lang/String;)V -Landroid/net/ConnectivityManager;->requestRouteToHost(II)Z -Landroid/net/ConnectivityManager;->requestRouteToHostAddress(ILjava/net/InetAddress;)Z -Landroid/net/ConnectivityManager;->setAirplaneMode(Z)V -Landroid/net/ConnectivityManager;->setBackgroundDataSetting(Z)V -Landroid/net/ConnectivityManager;->startNattKeepalive(Landroid/net/Network;ILandroid/net/ConnectivityManager$PacketKeepaliveCallback;Ljava/net/InetAddress;ILjava/net/InetAddress;)Landroid/net/ConnectivityManager$PacketKeepalive; -Landroid/net/ConnectivityManager;->startUsingNetworkFeature(ILjava/lang/String;)I -Landroid/net/ConnectivityManager;->stopUsingNetworkFeature(ILjava/lang/String;)I -Landroid/net/ConnectivityManager;->tether(Ljava/lang/String;)I -Landroid/net/ConnectivityManager;->untether(Ljava/lang/String;)I -Landroid/net/DhcpResults;-><init>()V -Landroid/net/DhcpResults;-><init>(Landroid/net/DhcpResults;)V -Landroid/net/DhcpResults;-><init>(Landroid/net/StaticIpConfiguration;)V -Landroid/net/DhcpResults;->leaseDuration:I -Landroid/net/DhcpResults;->mtu:I -Landroid/net/DhcpResults;->serverAddress:Ljava/net/Inet4Address; -Landroid/net/DhcpResults;->vendorInfo:Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveLinkProperties()Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager$Stub$Proxy;->getActiveNetworkInfo()Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworkInfo()[Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager$Stub$Proxy;->getAllNetworks()[Landroid/net/Network; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableIfaces()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetherableUsbRegexs()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->getTetheredIfaces()[Ljava/lang/String; -Landroid/net/IConnectivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/IConnectivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/IConnectivityManager; -Landroid/net/IConnectivityManager;->getActiveLinkProperties()Landroid/net/LinkProperties; -Landroid/net/IConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager;->getAllNetworkInfo()[Landroid/net/NetworkInfo; -Landroid/net/IConnectivityManager;->getAllNetworkState()[Landroid/net/NetworkState; -Landroid/net/IConnectivityManager;->getTetheredIfaces()[Ljava/lang/String; -Landroid/net/INetd$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetd; -Landroid/net/INetd;->interfaceAddAddress(Ljava/lang/String;Ljava/lang/String;I)V -Landroid/net/INetworkPolicyManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkPolicyManager; -Landroid/net/INetworkPolicyManager;->getNetworkQuotaInfo(Landroid/net/NetworkState;)Landroid/net/NetworkQuotaInfo; -Landroid/net/INetworkScoreService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkScoreService; -Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String; -Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService; -Landroid/net/INetworkStatsService;->openSession()Landroid/net/INetworkStatsSession; -Landroid/net/INetworkStatsSession;->getHistoryForNetwork(Landroid/net/NetworkTemplate;I)Landroid/net/NetworkStatsHistory; -Landroid/net/INetworkStatsSession;->getHistoryForUid(Landroid/net/NetworkTemplate;IIII)Landroid/net/NetworkStatsHistory; -Landroid/net/InterfaceConfiguration;-><init>()V -Landroid/net/InterfaceConfiguration;->setLinkAddress(Landroid/net/LinkAddress;)V -Landroid/net/IpConfiguration;->httpProxy:Landroid/net/ProxyInfo; -Landroid/net/LinkAddress;-><init>(Ljava/lang/String;)V -Landroid/net/LinkAddress;-><init>(Ljava/net/InetAddress;I)V -Landroid/net/LinkAddress;->isIPv6()Z -Landroid/net/LinkAddress;->isSameAddressAs(Landroid/net/LinkAddress;)Z -Landroid/net/LinkProperties$ProvisioningChange;->GAINED_PROVISIONING:Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties$ProvisioningChange;->LOST_PROVISIONING:Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties$ProvisioningChange;->STILL_NOT_PROVISIONED:Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties$ProvisioningChange;->STILL_PROVISIONED:Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties$ProvisioningChange;->values()[Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties;-><init>()V -Landroid/net/LinkProperties;-><init>(Landroid/net/LinkProperties;)V -Landroid/net/LinkProperties;->addDnsServer(Ljava/net/InetAddress;)Z -Landroid/net/LinkProperties;->addRoute(Landroid/net/RouteInfo;)Z -Landroid/net/LinkProperties;->addStackedLink(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->clear()V -Landroid/net/LinkProperties;->compareProvisioning(Landroid/net/LinkProperties;Landroid/net/LinkProperties;)Landroid/net/LinkProperties$ProvisioningChange; -Landroid/net/LinkProperties;->getAllInterfaceNames()Ljava/util/List; -Landroid/net/LinkProperties;->getAllRoutes()Ljava/util/List; -Landroid/net/LinkProperties;->getMtu()I -Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List; -Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z -Landroid/net/LinkProperties;->hasIPv4Address()Z -Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z -Landroid/net/LinkProperties;->hasIPv4DnsServer()Z -Landroid/net/LinkProperties;->hasIPv6DefaultRoute()Z -Landroid/net/LinkProperties;->hasIPv6DnsServer()Z -Landroid/net/LinkProperties;->isIPv6Provisioned()Z -Landroid/net/LinkProperties;->isIdenticalAddresses(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIdenticalDnses(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIdenticalRoutes(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isIdenticalStackedLinks(Landroid/net/LinkProperties;)Z -Landroid/net/LinkProperties;->isProvisioned()Z -Landroid/net/LinkProperties;->isReachable(Ljava/net/InetAddress;)Z -Landroid/net/LinkProperties;->removeDnsServer(Ljava/net/InetAddress;)Z -Landroid/net/LinkProperties;->removeRoute(Landroid/net/RouteInfo;)Z -Landroid/net/LinkProperties;->setDnsServers(Ljava/util/Collection;)V -Landroid/net/LinkProperties;->setDomains(Ljava/lang/String;)V -Landroid/net/LinkProperties;->setHttpProxy(Landroid/net/ProxyInfo;)V -Landroid/net/LinkProperties;->setInterfaceName(Ljava/lang/String;)V -Landroid/net/LinkProperties;->setLinkAddresses(Ljava/util/Collection;)V -Landroid/net/LinkProperties;->setMtu(I)V -Landroid/net/LinkProperties;->setTcpBufferSizes(Ljava/lang/String;)V -Landroid/net/LocalSocketImpl;->inboundFileDescriptors:[Ljava/io/FileDescriptor; -Landroid/net/LocalSocketImpl;->outboundFileDescriptors:[Ljava/io/FileDescriptor; -Landroid/net/MacAddress;->ALL_ZEROS_ADDRESS:Landroid/net/MacAddress; -Landroid/net/Network;-><init>(I)V -Landroid/net/Network;->netId:I -Landroid/net/NetworkBadging$Badging; -Landroid/net/NetworkBadging; -Landroid/net/NetworkBadging;->BADGING_4K:I -Landroid/net/NetworkBadging;->BADGING_HD:I -Landroid/net/NetworkBadging;->BADGING_NONE:I -Landroid/net/NetworkBadging;->BADGING_SD:I -Landroid/net/NetworkBadging;->getWifiIcon(IILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; -Landroid/net/NetworkCapabilities;->getCapabilities()[I -Landroid/net/NetworkCapabilities;->getNetworkSpecifier()Landroid/net/NetworkSpecifier; -Landroid/net/NetworkCapabilities;->getSignalStrength()I -Landroid/net/NetworkCapabilities;->getTransportTypes()[I -Landroid/net/NetworkCapabilities;->hasSignalStrength()Z -Landroid/net/NetworkCapabilities;->transportNamesOf([I)Ljava/lang/String; -Landroid/net/NetworkPolicyManager;->mService:Landroid/net/INetworkPolicyManager; -Landroid/net/NetworkQuotaInfo;->getEstimatedBytes()J -Landroid/net/NetworkQuotaInfo;->getHardLimitBytes()J -Landroid/net/NetworkQuotaInfo;->getSoftLimitBytes()J -Landroid/net/NetworkRequest$Builder;->setSignalStrength(I)Landroid/net/NetworkRequest$Builder; -Landroid/net/NetworkRequest;->networkCapabilities:Landroid/net/NetworkCapabilities; -Landroid/net/NetworkState;->network:Landroid/net/Network; -Landroid/net/NetworkStats$Entry;-><init>()V -Landroid/net/NetworkStats$Entry;->iface:Ljava/lang/String; -Landroid/net/NetworkStats$Entry;->rxBytes:J -Landroid/net/NetworkStats$Entry;->rxPackets:J -Landroid/net/NetworkStats$Entry;->set:I -Landroid/net/NetworkStats$Entry;->tag:I -Landroid/net/NetworkStats$Entry;->txBytes:J -Landroid/net/NetworkStats$Entry;->txPackets:J -Landroid/net/NetworkStats$Entry;->uid:I -Landroid/net/NetworkStats;-><init>(JI)V -Landroid/net/NetworkStats;->capacity:I -Landroid/net/NetworkStats;->combineValues(Landroid/net/NetworkStats$Entry;)Landroid/net/NetworkStats; -Landroid/net/NetworkStats;->defaultNetwork:[I -Landroid/net/NetworkStats;->iface:[Ljava/lang/String; -Landroid/net/NetworkStats;->metered:[I -Landroid/net/NetworkStats;->operations:[J -Landroid/net/NetworkStats;->roaming:[I -Landroid/net/NetworkStats;->rxBytes:[J -Landroid/net/NetworkStats;->rxPackets:[J -Landroid/net/NetworkStats;->set:[I -Landroid/net/NetworkStats;->size:I -Landroid/net/NetworkStats;->tag:[I -Landroid/net/NetworkStats;->txBytes:[J -Landroid/net/NetworkStats;->txPackets:[J -Landroid/net/NetworkStats;->uid:[I -Landroid/net/NetworkStatsHistory$Entry;->rxBytes:J -Landroid/net/NetworkStatsHistory$Entry;->txBytes:J -Landroid/net/NetworkStatsHistory;->getStart()J -Landroid/net/NetworkStatsHistory;->getValues(JJLandroid/net/NetworkStatsHistory$Entry;)Landroid/net/NetworkStatsHistory$Entry; -Landroid/net/NetworkTemplate;->buildTemplateMobileAll(Ljava/lang/String;)Landroid/net/NetworkTemplate; -Landroid/net/NetworkTemplate;->buildTemplateWifi()Landroid/net/NetworkTemplate; -Landroid/net/NetworkUtils;->attachControlPacketFilter(Ljava/io/FileDescriptor;I)V -Landroid/net/NetworkUtils;->attachDhcpFilter(Ljava/io/FileDescriptor;)V -Landroid/net/NetworkUtils;->attachRaFilter(Ljava/io/FileDescriptor;I)V -Landroid/net/NetworkUtils;->getImplicitNetmask(Ljava/net/Inet4Address;)I -Landroid/net/NetworkUtils;->netmaskToPrefixLength(Ljava/net/Inet4Address;)I -Landroid/net/NetworkUtils;->protectFromVpn(Ljava/io/FileDescriptor;)Z -Landroid/net/Proxy;->getProxy(Landroid/content/Context;Ljava/lang/String;)Ljava/net/Proxy; -Landroid/net/ProxyInfo;-><init>(Ljava/lang/String;ILjava/lang/String;)V -Landroid/net/RouteInfo;-><init>(Landroid/net/IpPrefix;Ljava/net/InetAddress;Ljava/lang/String;)V -Landroid/net/RouteInfo;->hasGateway()Z -Landroid/net/RouteInfo;->selectBestRoute(Ljava/util/Collection;Ljava/net/InetAddress;)Landroid/net/RouteInfo; -Landroid/net/SSLCertificateSocketFactory;-><init>(ILandroid/net/SSLSessionCache;Z)V -Landroid/net/SSLCertificateSocketFactory;->INSECURE_TRUST_MANAGER:[Ljavax/net/ssl/TrustManager; -Landroid/net/SSLCertificateSocketFactory;->TAG:Ljava/lang/String; -Landroid/net/SSLCertificateSocketFactory;->castToOpenSSLSocket(Ljava/net/Socket;)Lcom/android/org/conscrypt/OpenSSLSocketImpl; -Landroid/net/SSLCertificateSocketFactory;->getAlpnSelectedProtocol(Ljava/net/Socket;)[B -Landroid/net/SSLCertificateSocketFactory;->getDelegate()Ljavax/net/ssl/SSLSocketFactory; -Landroid/net/SSLCertificateSocketFactory;->getHttpSocketFactory(ILandroid/net/SSLSessionCache;)Lorg/apache/http/conn/ssl/SSLSocketFactory; -Landroid/net/SSLCertificateSocketFactory;->isSslCheckRelaxed()Z -Landroid/net/SSLCertificateSocketFactory;->mAlpnProtocols:[B -Landroid/net/SSLCertificateSocketFactory;->mChannelIdPrivateKey:Ljava/security/PrivateKey; -Landroid/net/SSLCertificateSocketFactory;->mHandshakeTimeoutMillis:I -Landroid/net/SSLCertificateSocketFactory;->mInsecureFactory:Ljavax/net/ssl/SSLSocketFactory; -Landroid/net/SSLCertificateSocketFactory;->mKeyManagers:[Ljavax/net/ssl/KeyManager; -Landroid/net/SSLCertificateSocketFactory;->mNpnProtocols:[B -Landroid/net/SSLCertificateSocketFactory;->mSecure:Z -Landroid/net/SSLCertificateSocketFactory;->mSecureFactory:Ljavax/net/ssl/SSLSocketFactory; -Landroid/net/SSLCertificateSocketFactory;->mSessionCache:Lcom/android/org/conscrypt/SSLClientSessionCache; -Landroid/net/SSLCertificateSocketFactory;->mTrustManagers:[Ljavax/net/ssl/TrustManager; -Landroid/net/SSLCertificateSocketFactory;->makeSocketFactory([Ljavax/net/ssl/KeyManager;[Ljavax/net/ssl/TrustManager;)Ljavax/net/ssl/SSLSocketFactory; -Landroid/net/SSLCertificateSocketFactory;->setAlpnProtocols([[B)V -Landroid/net/SSLCertificateSocketFactory;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V -Landroid/net/SSLCertificateSocketFactory;->setSoWriteTimeout(Ljava/net/Socket;I)V -Landroid/net/SSLCertificateSocketFactory;->verifyHostname(Ljava/net/Socket;Ljava/lang/String;)V -Landroid/net/SSLSessionCache;->mSessionCache:Lcom/android/org/conscrypt/SSLClientSessionCache; -Landroid/net/SntpClient;-><init>()V -Landroid/net/SntpClient;->getNtpTime()J -Landroid/net/SntpClient;->getNtpTimeReference()J -Landroid/net/SntpClient;->getRoundTripTime()J -Landroid/net/SntpClient;->requestTime(Ljava/lang/String;I)Z -Landroid/net/StaticIpConfiguration;-><init>()V -Landroid/net/StaticIpConfiguration;->dnsServers:Ljava/util/ArrayList; -Landroid/net/StaticIpConfiguration;->domains:Ljava/lang/String; -Landroid/net/StaticIpConfiguration;->gateway:Ljava/net/InetAddress; -Landroid/net/StaticIpConfiguration;->getRoutes(Ljava/lang/String;)Ljava/util/List; -Landroid/net/StaticIpConfiguration;->ipAddress:Landroid/net/LinkAddress; -Landroid/net/StringNetworkSpecifier;->specifier:Ljava/lang/String; -Landroid/net/TrafficStats;->getMobileIfaces()[Ljava/lang/String; -Landroid/net/TrafficStats;->getMobileTcpRxPackets()J -Landroid/net/TrafficStats;->getMobileTcpTxPackets()J -Landroid/net/TrafficStats;->getRxBytes(Ljava/lang/String;)J -Landroid/net/TrafficStats;->getStatsService()Landroid/net/INetworkStatsService; -Landroid/net/TrafficStats;->getTxBytes(Ljava/lang/String;)J -Landroid/net/TrafficStats;->setThreadStatsUidSelf()V -Landroid/net/Uri;-><init>()V -Landroid/net/http/SslError;->mCertificate:Landroid/net/http/SslCertificate; -Landroid/net/metrics/ApfProgramEvent;-><init>()V -Landroid/net/metrics/ApfProgramEvent;->actualLifetime:J -Landroid/net/metrics/ApfProgramEvent;->currentRas:I -Landroid/net/metrics/ApfProgramEvent;->filteredRas:I -Landroid/net/metrics/ApfProgramEvent;->flags:I -Landroid/net/metrics/ApfProgramEvent;->flagsFor(ZZ)I -Landroid/net/metrics/ApfProgramEvent;->lifetime:J -Landroid/net/metrics/ApfProgramEvent;->programLength:I -Landroid/net/metrics/ApfStats;-><init>()V -Landroid/net/metrics/ApfStats;->droppedRas:I -Landroid/net/metrics/ApfStats;->durationMs:J -Landroid/net/metrics/ApfStats;->matchingRas:I -Landroid/net/metrics/ApfStats;->maxProgramSize:I -Landroid/net/metrics/ApfStats;->parseErrors:I -Landroid/net/metrics/ApfStats;->programUpdates:I -Landroid/net/metrics/ApfStats;->programUpdatesAll:I -Landroid/net/metrics/ApfStats;->programUpdatesAllowingMulticast:I -Landroid/net/metrics/ApfStats;->receivedRas:I -Landroid/net/metrics/ApfStats;->zeroLifetimeRas:I -Landroid/net/metrics/DhcpClientEvent;-><init>(Ljava/lang/String;I)V -Landroid/net/metrics/DhcpErrorEvent;-><init>(I)V -Landroid/net/metrics/DhcpErrorEvent;->BOOTP_TOO_SHORT:I -Landroid/net/metrics/DhcpErrorEvent;->BUFFER_UNDERFLOW:I -Landroid/net/metrics/DhcpErrorEvent;->DHCP_BAD_MAGIC_COOKIE:I -Landroid/net/metrics/DhcpErrorEvent;->DHCP_INVALID_OPTION_LENGTH:I -Landroid/net/metrics/DhcpErrorEvent;->DHCP_NO_COOKIE:I -Landroid/net/metrics/DhcpErrorEvent;->DHCP_NO_MSG_TYPE:I -Landroid/net/metrics/DhcpErrorEvent;->DHCP_UNKNOWN_MSG_TYPE:I -Landroid/net/metrics/DhcpErrorEvent;->L2_TOO_SHORT:I -Landroid/net/metrics/DhcpErrorEvent;->L2_WRONG_ETH_TYPE:I -Landroid/net/metrics/DhcpErrorEvent;->L3_INVALID_IP:I -Landroid/net/metrics/DhcpErrorEvent;->L3_NOT_IPV4:I -Landroid/net/metrics/DhcpErrorEvent;->L3_TOO_SHORT:I -Landroid/net/metrics/DhcpErrorEvent;->L4_NOT_UDP:I -Landroid/net/metrics/DhcpErrorEvent;->L4_WRONG_PORT:I -Landroid/net/metrics/DhcpErrorEvent;->PARSING_ERROR:I -Landroid/net/metrics/DhcpErrorEvent;->RECEIVE_ERROR:I -Landroid/net/metrics/DhcpErrorEvent;->errorCodeWithOption(II)I -Landroid/net/metrics/IpConnectivityLog;-><init>()V -Landroid/net/metrics/IpConnectivityLog;->log(Landroid/os/Parcelable;)Z -Landroid/net/metrics/IpConnectivityLog;->log(Ljava/lang/String;Landroid/os/Parcelable;)Z -Landroid/net/metrics/IpManagerEvent;-><init>(IJ)V -Landroid/net/metrics/IpReachabilityEvent;-><init>(I)V -Landroid/net/metrics/IpReachabilityEvent;->nudFailureEventType(ZZ)I -Landroid/net/metrics/RaEvent$Builder;-><init>()V -Landroid/net/metrics/RaEvent$Builder;->build()Landroid/net/metrics/RaEvent; -Landroid/net/metrics/RaEvent$Builder;->updateDnsslLifetime(J)Landroid/net/metrics/RaEvent$Builder; -Landroid/net/metrics/RaEvent$Builder;->updatePrefixPreferredLifetime(J)Landroid/net/metrics/RaEvent$Builder; -Landroid/net/metrics/RaEvent$Builder;->updatePrefixValidLifetime(J)Landroid/net/metrics/RaEvent$Builder; -Landroid/net/metrics/RaEvent$Builder;->updateRdnssLifetime(J)Landroid/net/metrics/RaEvent$Builder; -Landroid/net/metrics/RaEvent$Builder;->updateRouteInfoLifetime(J)Landroid/net/metrics/RaEvent$Builder; -Landroid/net/metrics/RaEvent$Builder;->updateRouterLifetime(J)Landroid/net/metrics/RaEvent$Builder; -Landroid/net/sip/SipProfile;->readResolve()Ljava/lang/Object; -Landroid/net/sip/SipProfile;->serialVersionUID:J -Landroid/net/wifi/BatchedScanResult; -Landroid/net/wifi/BatchedScanResult;-><init>()V -Landroid/net/wifi/BatchedScanResult;-><init>(Landroid/net/wifi/BatchedScanResult;)V -Landroid/net/wifi/BatchedScanResult;->scanResults:Ljava/util/List; -Landroid/net/wifi/BatchedScanResult;->truncated:Z -Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager; -Landroid/net/wifi/IWifiScanner$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/net/wifi/IWifiScanner$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Landroid/net/wifi/IWifiScanner$Stub;-><init>()V -Landroid/net/wifi/IWifiScanner$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiScanner; -Landroid/net/wifi/ScanResult$InformationElement;->EID_BSS_LOAD:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_ERP:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_CAPS:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_EXTENDED_SUPPORTED_RATES:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_HT_OPERATION:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_INTERWORKING:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_ROAMING_CONSORTIUM:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_RSN:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_SSID:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_SUPPORTED_RATES:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_TIM:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_VHT_OPERATION:I -Landroid/net/wifi/ScanResult$InformationElement;->EID_VSA:I -Landroid/net/wifi/ScanResult$InformationElement;->bytes:[B -Landroid/net/wifi/ScanResult$InformationElement;->id:I -Landroid/net/wifi/ScanResult;->anqpDomainId:I -Landroid/net/wifi/ScanResult;->anqpLines:Ljava/util/List; -Landroid/net/wifi/ScanResult;->distanceCm:I -Landroid/net/wifi/ScanResult;->distanceSdCm:I -Landroid/net/wifi/ScanResult;->flags:J -Landroid/net/wifi/ScanResult;->hessid:J -Landroid/net/wifi/ScanResult;->informationElements:[Landroid/net/wifi/ScanResult$InformationElement; -Landroid/net/wifi/ScanResult;->numUsage:I -Landroid/net/wifi/ScanResult;->seen:J -Landroid/net/wifi/ScanResult;->untrusted:Z -Landroid/net/wifi/ScanResult;->wifiSsid:Landroid/net/wifi/WifiSsid; -Landroid/net/wifi/WifiConfiguration;->apBand:I -Landroid/net/wifi/WifiConfiguration;->apChannel:I -Landroid/net/wifi/WifiConfiguration;->defaultGwMacAddress:Ljava/lang/String; -Landroid/net/wifi/WifiConfiguration;->lastConnectUid:I -Landroid/net/wifi/WifiConfiguration;->mIpConfiguration:Landroid/net/IpConfiguration; -Landroid/net/wifi/WifiConfiguration;->setIpAssignment(Landroid/net/IpConfiguration$IpAssignment;)V -Landroid/net/wifi/WifiConfiguration;->setStaticIpConfiguration(Landroid/net/StaticIpConfiguration;)V -Landroid/net/wifi/WifiConfiguration;->validatedInternetAccess:Z -Landroid/net/wifi/WifiEnterpriseConfig;->getCaCertificateAlias()Ljava/lang/String; -Landroid/net/wifi/WifiEnterpriseConfig;->getClientCertificateAlias()Ljava/lang/String; -Landroid/net/wifi/WifiInfo;->DEFAULT_MAC_ADDRESS:Ljava/lang/String; -Landroid/net/wifi/WifiInfo;->getMeteredHint()Z -Landroid/net/wifi/WifiInfo;->getWifiSsid()Landroid/net/wifi/WifiSsid; -Landroid/net/wifi/WifiInfo;->is5GHz()Z -Landroid/net/wifi/WifiInfo;->mMacAddress:Ljava/lang/String; -Landroid/net/wifi/WifiInfo;->removeDoubleQuotes(Ljava/lang/String;)Ljava/lang/String; -Landroid/net/wifi/WifiInfo;->score:I -Landroid/net/wifi/WifiManager;->cancelLocalOnlyHotspotRequest()V -Landroid/net/wifi/WifiManager;->connect(ILandroid/net/wifi/WifiManager$ActionListener;)V -Landroid/net/wifi/WifiManager;->forget(ILandroid/net/wifi/WifiManager$ActionListener;)V -Landroid/net/wifi/WifiManager;->isDualBandSupported()Z -Landroid/net/wifi/WifiManager;->mService:Landroid/net/wifi/IWifiManager; -Landroid/net/wifi/WifiManager;->save(Landroid/net/wifi/WifiConfiguration;Landroid/net/wifi/WifiManager$ActionListener;)V -Landroid/net/wifi/WifiSsid;->NONE:Ljava/lang/String; -Landroid/net/wifi/WifiSsid;->getOctets()[B -Landroid/net/wifi/p2p/WifiP2pGroup;->TEMPORARY_NET_ID:I -Landroid/net/wifi/p2p/WifiP2pGroup;->getNetworkId()I -Landroid/net/wifi/p2p/WifiP2pGroupList;->getGroupList()Ljava/util/Collection; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->mAsyncChannel:Lcom/android/internal/util/AsyncChannel; -Landroid/net/wifi/p2p/WifiP2pManager$Channel;->putListener(Ljava/lang/Object;)I -Landroid/net/wifi/p2p/WifiP2pManager;->CREATE_GROUP:I -Landroid/net/wifi/p2p/WifiP2pManager;->deletePersistentGroup(Landroid/net/wifi/p2p/WifiP2pManager$Channel;ILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->requestPersistentGroupInfo(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/p2p/WifiP2pManager$PersistentGroupInfoListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->setDeviceName(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Ljava/lang/String;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V -Landroid/net/wifi/p2p/WifiP2pManager;->setWifiP2pChannels(Landroid/net/wifi/p2p/WifiP2pManager$Channel;IILandroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V -Landroid/nfc/NfcAdapter;->getAdapterState()I -Landroid/nfc/NfcAdapter;->getDefaultAdapter()Landroid/nfc/NfcAdapter; -Landroid/nfc/NfcAdapter;->getNfcAdapter(Landroid/content/Context;)Landroid/nfc/NfcAdapter; -Landroid/nfc/NfcAdapter;->setNdefPushMessageCallback(Landroid/nfc/NfcAdapter$CreateNdefMessageCallback;Landroid/app/Activity;I)V -Landroid/opengl/GLSurfaceView$EglHelper;->mEglContext:Ljavax/microedition/khronos/egl/EGLContext; -Landroid/opengl/GLSurfaceView$GLThread;->mEglHelper:Landroid/opengl/GLSurfaceView$EglHelper; -Landroid/opengl/GLSurfaceView;->mGLThread:Landroid/opengl/GLSurfaceView$GLThread; -Landroid/opengl/GLSurfaceView;->mRenderer:Landroid/opengl/GLSurfaceView$Renderer; -Landroid/os/AsyncResult;-><init>(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Throwable;)V -Landroid/os/AsyncResult;->exception:Ljava/lang/Throwable; -Landroid/os/AsyncResult;->forMessage(Landroid/os/Message;Ljava/lang/Object;Ljava/lang/Throwable;)Landroid/os/AsyncResult; -Landroid/os/AsyncResult;->result:Ljava/lang/Object; -Landroid/os/AsyncResult;->userObj:Ljava/lang/Object; -Landroid/os/AsyncTask;->mFuture:Ljava/util/concurrent/FutureTask; -Landroid/os/AsyncTask;->mStatus:Landroid/os/AsyncTask$Status; -Landroid/os/AsyncTask;->mTaskInvoked:Ljava/util/concurrent/atomic/AtomicBoolean; -Landroid/os/AsyncTask;->mWorker:Landroid/os/AsyncTask$WorkerRunnable; -Landroid/os/AsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor; -Landroid/os/AsyncTask;->setDefaultExecutor(Ljava/util/concurrent/Executor;)V -Landroid/os/BatteryManager;-><init>()V -Landroid/os/BatteryStats$Counter;->getCountLocked(I)I -Landroid/os/BatteryStats$HistoryItem;-><init>()V -Landroid/os/BatteryStats$HistoryItem;->CMD_UPDATE:B -Landroid/os/BatteryStats$HistoryItem;->batteryLevel:B -Landroid/os/BatteryStats$HistoryItem;->cmd:B -Landroid/os/BatteryStats$HistoryItem;->states2:I -Landroid/os/BatteryStats$HistoryItem;->states:I -Landroid/os/BatteryStats$HistoryItem;->time:J -Landroid/os/BatteryStats$Timer;->getCountLocked(I)I -Landroid/os/BatteryStats$Timer;->getTotalTimeLocked(JI)J -Landroid/os/BatteryStats$Uid$Pkg$Serv;->getLaunches(I)I -Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStartTime(JI)J -Landroid/os/BatteryStats$Uid$Pkg;->getServiceStats()Landroid/util/ArrayMap; -Landroid/os/BatteryStats$Uid$Pkg;->getWakeupAlarmStats()Landroid/util/ArrayMap; -Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->overTime:J -Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->type:I -Landroid/os/BatteryStats$Uid$Proc$ExcessivePower;->usedTime:J -Landroid/os/BatteryStats$Uid$Proc;->countExcessivePowers()I -Landroid/os/BatteryStats$Uid$Proc;->getExcessivePower(I)Landroid/os/BatteryStats$Uid$Proc$ExcessivePower; -Landroid/os/BatteryStats$Uid$Proc;->getForegroundTime(I)J -Landroid/os/BatteryStats$Uid$Proc;->getStarts(I)I -Landroid/os/BatteryStats$Uid$Proc;->getSystemTime(I)J -Landroid/os/BatteryStats$Uid$Proc;->getUserTime(I)J -Landroid/os/BatteryStats$Uid$Sensor;->getHandle()I -Landroid/os/BatteryStats$Uid$Sensor;->getSensorTime()Landroid/os/BatteryStats$Timer; -Landroid/os/BatteryStats$Uid$Wakelock;->getWakeTime(I)Landroid/os/BatteryStats$Timer; -Landroid/os/BatteryStats$Uid;-><init>()V -Landroid/os/BatteryStats$Uid;->getAudioTurnedOnTimer()Landroid/os/BatteryStats$Timer; -Landroid/os/BatteryStats$Uid;->getFullWifiLockTime(JI)J -Landroid/os/BatteryStats$Uid;->getPackageStats()Landroid/util/ArrayMap; -Landroid/os/BatteryStats$Uid;->getProcessStats()Landroid/util/ArrayMap; -Landroid/os/BatteryStats$Uid;->getSensorStats()Landroid/util/SparseArray; -Landroid/os/BatteryStats$Uid;->getUid()I -Landroid/os/BatteryStats$Uid;->getVideoTurnedOnTimer()Landroid/os/BatteryStats$Timer; -Landroid/os/BatteryStats$Uid;->getWifiMulticastTime(JI)J -Landroid/os/BatteryStats$Uid;->getWifiRunningTime(JI)J -Landroid/os/BatteryStats$Uid;->getWifiScanTime(JI)J -Landroid/os/BatteryStats;->NUM_DATA_CONNECTION_TYPES:I -Landroid/os/BatteryStats;->getNextHistoryLocked(Landroid/os/BatteryStats$HistoryItem;)Z -Landroid/os/BatteryStats;->getUidStats()Landroid/util/SparseArray; -Landroid/os/BatteryStats;->startIteratingHistoryLocked()Z -Landroid/os/Binder;->execTransact(IJJI)Z -Landroid/os/Binder;->mObject:J -Landroid/os/Broadcaster;-><init>()V -Landroid/os/Broadcaster;->broadcast(Landroid/os/Message;)V -Landroid/os/Broadcaster;->cancelRequest(ILandroid/os/Handler;I)V -Landroid/os/Broadcaster;->request(ILandroid/os/Handler;I)V -Landroid/os/Build$VERSION;->ACTIVE_CODENAMES:[Ljava/lang/String; -Landroid/os/Build;->IS_DEBUGGABLE:Z -Landroid/os/Build;->IS_EMULATOR:Z -Landroid/os/Build;->PERMISSIONS_REVIEW_REQUIRED:Z -Landroid/os/Build;->getString(Ljava/lang/String;)Ljava/lang/String; -Landroid/os/Bundle;->getIBinder(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/os/Bundle;->putIBinder(Ljava/lang/String;Landroid/os/IBinder;)V -Landroid/os/Debug$MemoryInfo;->NUM_DVK_STATS:I -Landroid/os/Debug$MemoryInfo;->NUM_OTHER_STATS:I -Landroid/os/Debug$MemoryInfo;->dalvikPrivateClean:I -Landroid/os/Debug$MemoryInfo;->dalvikRss:I -Landroid/os/Debug$MemoryInfo;->dalvikSharedClean:I -Landroid/os/Debug$MemoryInfo;->dalvikSwappablePss:I -Landroid/os/Debug$MemoryInfo;->dalvikSwappedOut:I -Landroid/os/Debug$MemoryInfo;->dalvikSwappedOutPss:I -Landroid/os/Debug$MemoryInfo;->getOtherLabel(I)Ljava/lang/String; -Landroid/os/Debug$MemoryInfo;->getOtherPrivate(I)I -Landroid/os/Debug$MemoryInfo;->getOtherPrivateDirty(I)I -Landroid/os/Debug$MemoryInfo;->getOtherPss(I)I -Landroid/os/Debug$MemoryInfo;->getOtherSharedDirty(I)I -Landroid/os/Debug$MemoryInfo;->getTotalUss()I -Landroid/os/Debug$MemoryInfo;->hasSwappedOutPss:Z -Landroid/os/Debug$MemoryInfo;->nativePrivateClean:I -Landroid/os/Debug$MemoryInfo;->nativeRss:I -Landroid/os/Debug$MemoryInfo;->nativeSharedClean:I -Landroid/os/Debug$MemoryInfo;->nativeSwappablePss:I -Landroid/os/Debug$MemoryInfo;->nativeSwappedOut:I -Landroid/os/Debug$MemoryInfo;->nativeSwappedOutPss:I -Landroid/os/Debug$MemoryInfo;->otherPrivateClean:I -Landroid/os/Debug$MemoryInfo;->otherRss:I -Landroid/os/Debug$MemoryInfo;->otherSharedClean:I -Landroid/os/Debug$MemoryInfo;->otherStats:[I -Landroid/os/Debug$MemoryInfo;->otherSwappablePss:I -Landroid/os/Debug$MemoryInfo;->otherSwappedOut:I -Landroid/os/Debug$MemoryInfo;->otherSwappedOutPss:I -Landroid/os/Debug;-><init>()V -Landroid/os/Debug;->countInstancesOfClass(Ljava/lang/Class;)J -Landroid/os/Debug;->dumpReferenceTables()V -Landroid/os/DropBoxManager;->mService:Lcom/android/internal/os/IDropBoxManagerService; -Landroid/os/Environment;->buildExternalStorageAppDataDirs(Ljava/lang/String;)[Ljava/io/File; -Landroid/os/Environment;->getLegacyExternalStorageDirectory()Ljava/io/File; -Landroid/os/Environment;->getStorageDirectory()Ljava/io/File; -Landroid/os/Environment;->getVendorDirectory()Ljava/io/File; -Landroid/os/Environment;->maybeTranslateEmulatedPathToInternal(Ljava/io/File;)Ljava/io/File; -Landroid/os/FileObserver$ObserverThread;->onEvent(IILjava/lang/String;)V -Landroid/os/FileUtils;->checksumCrc32(Ljava/io/File;)J -Landroid/os/FileUtils;->copyFile(Ljava/io/File;Ljava/io/File;)Z -Landroid/os/FileUtils;->copyToFile(Ljava/io/InputStream;Ljava/io/File;)Z -Landroid/os/FileUtils;->deleteOlderFiles(Ljava/io/File;IJ)Z -Landroid/os/FileUtils;->readTextFile(Ljava/io/File;ILjava/lang/String;)Ljava/lang/String; -Landroid/os/FileUtils;->setPermissions(Ljava/io/File;III)I -Landroid/os/FileUtils;->setPermissions(Ljava/io/FileDescriptor;III)I -Landroid/os/FileUtils;->setPermissions(Ljava/lang/String;III)I -Landroid/os/FileUtils;->stringToFile(Ljava/io/File;Ljava/lang/String;)V -Landroid/os/FileUtils;->stringToFile(Ljava/lang/String;Ljava/lang/String;)V -Landroid/os/FileUtils;->sync(Ljava/io/FileOutputStream;)Z -Landroid/os/Handler;-><init>(Landroid/os/Looper;Landroid/os/Handler$Callback;Z)V -Landroid/os/Handler;-><init>(Z)V -Landroid/os/Handler;->getIMessenger()Landroid/os/IMessenger; -Landroid/os/Handler;->getMain()Landroid/os/Handler; -Landroid/os/Handler;->hasCallbacks(Ljava/lang/Runnable;)Z -Landroid/os/Handler;->mCallback:Landroid/os/Handler$Callback; -Landroid/os/Handler;->mMessenger:Landroid/os/IMessenger; -Landroid/os/HwBinder;->reportSyspropChanged()V -Landroid/os/HwParcel;-><init>(Z)V -Landroid/os/HwRemoteBinder;-><init>()V -Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/os/INetworkManagementService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/INetworkManagementService; -Landroid/os/INetworkManagementService;->clearInterfaceAddresses(Ljava/lang/String;)V -Landroid/os/INetworkManagementService;->disableIpv6(Ljava/lang/String;)V -Landroid/os/INetworkManagementService;->enableIpv6(Ljava/lang/String;)V -Landroid/os/INetworkManagementService;->isBandwidthControlEnabled()Z -Landroid/os/INetworkManagementService;->registerObserver(Landroid/net/INetworkManagementEventObserver;)V -Landroid/os/INetworkManagementService;->setIPv6AddrGenMode(Ljava/lang/String;I)V -Landroid/os/INetworkManagementService;->setInterfaceConfig(Ljava/lang/String;Landroid/net/InterfaceConfiguration;)V -Landroid/os/INetworkManagementService;->setInterfaceIpv6PrivacyExtensions(Ljava/lang/String;Z)V -Landroid/os/INetworkManagementService;->unregisterObserver(Landroid/net/INetworkManagementEventObserver;)V -Landroid/os/IPermissionController$Stub$Proxy;->checkPermission(Ljava/lang/String;II)Z -Landroid/os/IPermissionController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPermissionController; -Landroid/os/IPowerManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/os/IPowerManager$Stub$Proxy;->isLightDeviceIdleMode()Z -Landroid/os/IPowerManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPowerManager; -Landroid/os/IPowerManager;->goToSleep(JII)V -Landroid/os/IPowerManager;->reboot(ZLjava/lang/String;Z)V -Landroid/os/IPowerManager;->releaseWakeLock(Landroid/os/IBinder;I)V -Landroid/os/IPowerManager;->userActivity(JII)V -Landroid/os/IRecoverySystem$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IRecoverySystem; -Landroid/os/IRemoteCallback$Stub;-><init>()V -Landroid/os/IServiceManager;->checkService(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/os/IServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/os/IUserManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/os/IUserManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IUserManager; -Landroid/os/IVibratorService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IVibratorService; -Landroid/os/LocaleList;->setDefault(Landroid/os/LocaleList;I)V -Landroid/os/Looper;->mQueue:Landroid/os/MessageQueue; -Landroid/os/Looper;->sThreadLocal:Ljava/lang/ThreadLocal; -Landroid/os/Looper;->setTraceTag(J)V -Landroid/os/MemoryFile;->getFileDescriptor()Ljava/io/FileDescriptor; -Landroid/os/Message;->callback:Ljava/lang/Runnable; -Landroid/os/Message;->flags:I -Landroid/os/Message;->markInUse()V -Landroid/os/Message;->next:Landroid/os/Message; -Landroid/os/Message;->recycleUnchecked()V -Landroid/os/Message;->setCallback(Ljava/lang/Runnable;)Landroid/os/Message; -Landroid/os/Message;->target:Landroid/os/Handler; -Landroid/os/Message;->when:J -Landroid/os/MessageQueue;->dispatchEvents(II)I -Landroid/os/MessageQueue;->mIdleHandlers:Ljava/util/ArrayList; -Landroid/os/MessageQueue;->mMessages:Landroid/os/Message; -Landroid/os/MessageQueue;->mPtr:J -Landroid/os/MessageQueue;->mQuitAllowed:Z -Landroid/os/MessageQueue;->nativePollOnce(JI)V -Landroid/os/MessageQueue;->next()Landroid/os/Message; -Landroid/os/MessageQueue;->postSyncBarrier()I -Landroid/os/MessageQueue;->removeSyncBarrier(I)V -Landroid/os/Parcel$ReadWriteHelper;-><init>()V -Landroid/os/Parcel;->mNativePtr:J -Landroid/os/Parcel;->readArrayMap(Landroid/util/ArrayMap;Ljava/lang/ClassLoader;)V -Landroid/os/Parcel;->readBlob()[B -Landroid/os/Parcel;->readParcelableList(Ljava/util/List;Ljava/lang/ClassLoader;)Ljava/util/List; -Landroid/os/Parcel;->readStringArray()[Ljava/lang/String; -Landroid/os/Parcel;->writeArrayMap(Landroid/util/ArrayMap;)V -Landroid/os/Parcel;->writeBlob([B)V -Landroid/os/Parcel;->writeParcelableList(Ljava/util/List;I)V -Landroid/os/ParcelFileDescriptor$FileDescriptorDetachedException;->serialVersionUID:J -Landroid/os/ParcelFileDescriptor;-><init>(Ljava/io/FileDescriptor;)V -Landroid/os/ParcelFileDescriptor;->fromData([BLjava/lang/String;)Landroid/os/ParcelFileDescriptor; -Landroid/os/PowerManager;->ACTION_SCREEN_BRIGHTNESS_BOOST_CHANGED:Ljava/lang/String; -Landroid/os/PowerManager;->getDefaultScreenBrightnessSetting()I -Landroid/os/PowerManager;->getMaximumScreenBrightnessSetting()I -Landroid/os/PowerManager;->getMinimumScreenBrightnessSetting()I -Landroid/os/PowerManager;->goToSleep(J)V -Landroid/os/PowerManager;->isLightDeviceIdleMode()Z -Landroid/os/PowerManager;->isScreenBrightnessBoosted()Z -Landroid/os/PowerManager;->mService:Landroid/os/IPowerManager; -Landroid/os/PowerManager;->userActivity(JZ)V -Landroid/os/PowerManager;->validateWakeLockParameters(ILjava/lang/String;)V -Landroid/os/PowerManager;->wakeUp(J)V -Landroid/os/PowerManager;->wakeUp(JLjava/lang/String;)V -Landroid/os/Process;->getFreeMemory()J -Landroid/os/Process;->getParentPid(I)I -Landroid/os/Process;->getPids(Ljava/lang/String;[I)[I -Landroid/os/Process;->getTotalMemory()J -Landroid/os/Process;->getUidForPid(I)I -Landroid/os/Process;->isIsolated(I)Z -Landroid/os/Process;->readProcFile(Ljava/lang/String;[I[Ljava/lang/String;[J[F)Z -Landroid/os/Process;->readProcLines(Ljava/lang/String;[Ljava/lang/String;[J)V -Landroid/os/Process;->setArgV0(Ljava/lang/String;)V -Landroid/os/RecoverySystem;-><init>()V -Landroid/os/Registrant;-><init>(Landroid/os/Handler;ILjava/lang/Object;)V -Landroid/os/Registrant;->clear()V -Landroid/os/Registrant;->notifyRegistrant()V -Landroid/os/Registrant;->notifyRegistrant(Landroid/os/AsyncResult;)V -Landroid/os/RegistrantList;-><init>()V -Landroid/os/RegistrantList;->add(Landroid/os/Registrant;)V -Landroid/os/RegistrantList;->addUnique(Landroid/os/Handler;ILjava/lang/Object;)V -Landroid/os/RegistrantList;->notifyRegistrants()V -Landroid/os/RegistrantList;->notifyRegistrants(Landroid/os/AsyncResult;)V -Landroid/os/RegistrantList;->remove(Landroid/os/Handler;)V -Landroid/os/RegistrantList;->removeCleared()V -Landroid/os/RemoteException;->rethrowFromSystemServer()Ljava/lang/RuntimeException; -Landroid/os/SELinux;->checkSELinuxAccess(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z -Landroid/os/SELinux;->getFileContext(Ljava/lang/String;)Ljava/lang/String; -Landroid/os/SELinux;->getPidContext(I)Ljava/lang/String; -Landroid/os/SELinux;->isSELinuxEnabled()Z -Landroid/os/SELinux;->isSELinuxEnforced()Z -Landroid/os/ServiceManager;-><init>()V -Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V -Landroid/os/ServiceManager;->checkService(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/os/ServiceManager;->getIServiceManager()Landroid/os/IServiceManager; -Landroid/os/ServiceManager;->getService(Ljava/lang/String;)Landroid/os/IBinder; -Landroid/os/ServiceManager;->listServices()[Ljava/lang/String; -Landroid/os/ServiceManager;->sCache:Ljava/util/HashMap; -Landroid/os/ServiceManager;->sServiceManager:Landroid/os/IServiceManager; -Landroid/os/ServiceManagerNative;->asInterface(Landroid/os/IBinder;)Landroid/os/IServiceManager; -Landroid/os/ServiceSpecificException;->errorCode:I -Landroid/os/SharedMemory;->getFd()I -Landroid/os/StrictMode$Span;->finish()V -Landroid/os/StrictMode$ThreadPolicy$Builder;->penaltyListener(Landroid/os/StrictMode$OnThreadViolationListener;Ljava/util/concurrent/Executor;)Landroid/os/StrictMode$ThreadPolicy$Builder; -Landroid/os/StrictMode$VmPolicy$Builder;->penaltyListener(Landroid/os/StrictMode$OnVmViolationListener;Ljava/util/concurrent/Executor;)Landroid/os/StrictMode$VmPolicy$Builder; -Landroid/os/StrictMode;->conditionallyCheckInstanceCounts()V -Landroid/os/StrictMode;->disableDeathOnFileUriExposure()V -Landroid/os/StrictMode;->enterCriticalSpan(Ljava/lang/String;)Landroid/os/StrictMode$Span; -Landroid/os/StrictMode;->getThreadPolicyMask()I -Landroid/os/StrictMode;->onBinderStrictModePolicyChange(I)V -Landroid/os/StrictMode;->violationsBeingTimed:Ljava/lang/ThreadLocal; -Landroid/os/SystemClock;->elapsedRealtimeClock()Ljava/time/Clock; -Landroid/os/SystemClock;->uptimeClock()Ljava/time/Clock; -Landroid/os/SystemClock;->uptimeMillisClock()Ljava/time/Clock; -Landroid/os/SystemProperties;-><init>()V -Landroid/os/SystemProperties;->PROP_NAME_MAX:I -Landroid/os/SystemProperties;->addChangeCallback(Ljava/lang/Runnable;)V -Landroid/os/SystemProperties;->native_get(Ljava/lang/String;)Ljava/lang/String; -Landroid/os/SystemProperties;->reportSyspropChanged()V -Landroid/os/SystemProperties;->set(Ljava/lang/String;Ljava/lang/String;)V -Landroid/os/SystemService;->start(Ljava/lang/String;)V -Landroid/os/SystemService;->stop(Ljava/lang/String;)V -Landroid/os/SystemVibrator;-><init>()V -Landroid/os/TestLooperManager;->getQueue()Landroid/os/MessageQueue; -Landroid/os/Trace;->TRACE_TAG_APP:J -Landroid/os/Trace;->TRACE_TAG_VIEW:J -Landroid/os/Trace;->asyncTraceBegin(JLjava/lang/String;I)V -Landroid/os/Trace;->asyncTraceEnd(JLjava/lang/String;I)V -Landroid/os/Trace;->isTagEnabled(J)Z -Landroid/os/Trace;->setAppTracingAllowed(Z)V -Landroid/os/Trace;->traceBegin(JLjava/lang/String;)V -Landroid/os/Trace;->traceCounter(JLjava/lang/String;I)V -Landroid/os/Trace;->traceEnd(J)V -Landroid/os/UpdateLock;->NOW_IS_CONVENIENT:Ljava/lang/String; -Landroid/os/UpdateLock;->TIMESTAMP:Ljava/lang/String; -Landroid/os/UpdateLock;->UPDATE_LOCK_CHANGED:Ljava/lang/String; -Landroid/os/UpdateLock;->acquire()V -Landroid/os/UpdateLock;->isHeld()Z -Landroid/os/UpdateLock;->release()V -Landroid/os/UserHandle;-><init>(I)V -Landroid/os/UserHandle;->AID_APP_END:I -Landroid/os/UserHandle;->AID_APP_START:I -Landroid/os/UserHandle;->AID_CACHE_GID_START:I -Landroid/os/UserHandle;->AID_ROOT:I -Landroid/os/UserHandle;->AID_SHARED_GID_START:I -Landroid/os/UserHandle;->ALL:Landroid/os/UserHandle; -Landroid/os/UserHandle;->CURRENT:Landroid/os/UserHandle; -Landroid/os/UserHandle;->CURRENT_OR_SELF:Landroid/os/UserHandle; -Landroid/os/UserHandle;->ERR_GID:I -Landroid/os/UserHandle;->MU_ENABLED:Z -Landroid/os/UserHandle;->OWNER:Landroid/os/UserHandle; -Landroid/os/UserHandle;->PER_USER_RANGE:I -Landroid/os/UserHandle;->USER_ALL:I -Landroid/os/UserHandle;->USER_CURRENT:I -Landroid/os/UserHandle;->USER_CURRENT_OR_SELF:I -Landroid/os/UserHandle;->USER_NULL:I -Landroid/os/UserHandle;->USER_OWNER:I -Landroid/os/UserHandle;->USER_SERIAL_SYSTEM:I -Landroid/os/UserHandle;->USER_SYSTEM:I -Landroid/os/UserHandle;->getAppIdFromSharedAppGid(I)I -Landroid/os/UserHandle;->getCallingUserId()I -Landroid/os/UserHandle;->getUid(II)I -Landroid/os/UserHandle;->getUserId(I)I -Landroid/os/UserHandle;->isSameApp(II)Z -Landroid/os/UserManager;->get(Landroid/content/Context;)Landroid/os/UserManager; -Landroid/os/UserManager;->getBadgedDrawableForUser(Landroid/graphics/drawable/Drawable;Landroid/os/UserHandle;Landroid/graphics/Rect;I)Landroid/graphics/drawable/Drawable; -Landroid/os/UserManager;->getBadgedIconForUser(Landroid/graphics/drawable/Drawable;Landroid/os/UserHandle;)Landroid/graphics/drawable/Drawable; -Landroid/os/UserManager;->getBadgedLabelForUser(Ljava/lang/CharSequence;Landroid/os/UserHandle;)Ljava/lang/CharSequence; -Landroid/os/UserManager;->getMaxSupportedUsers()I -Landroid/os/UserManager;->getProfiles(I)Ljava/util/List; -Landroid/os/UserManager;->getUserHandle()I -Landroid/os/UserManager;->getUserHandle(I)I -Landroid/os/UserManager;->getUserIcon(I)Landroid/graphics/Bitmap; -Landroid/os/UserManager;->getUserInfo(I)Landroid/content/pm/UserInfo; -Landroid/os/UserManager;->getUserSerialNumber(I)I -Landroid/os/UserManager;->getUserStartRealtime()J -Landroid/os/UserManager;->getUserUnlockRealtime()J -Landroid/os/UserManager;->getUsers()Ljava/util/List; -Landroid/os/UserManager;->hasBaseUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z -Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z -Landroid/os/UserManager;->isAdminUser()Z -Landroid/os/UserManager;->isLinkedUser()Z -Landroid/os/UserManager;->isUserUnlocked(I)Z -Landroid/os/UserManager;->mService:Landroid/os/IUserManager; -Landroid/os/VintfObject;->getHalNamesAndVersions()[Ljava/lang/String; -Landroid/os/VintfObject;->getSepolicyVersion()Ljava/lang/String; -Landroid/os/VintfObject;->getTargetFrameworkCompatibilityMatrixVersion()Ljava/lang/Long; -Landroid/os/VintfObject;->getVndkSnapshots()Ljava/util/Map; -Landroid/os/VintfObject;->report()[Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getCpuInfo()Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getHardwareId()Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getKernelVersion()Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getNodeName()Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getOsName()Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getOsRelease()Ljava/lang/String; -Landroid/os/VintfRuntimeInfo;->getOsVersion()Ljava/lang/String; -Landroid/os/WorkSource;-><init>(I)V -Landroid/os/WorkSource;->add(I)Z -Landroid/os/WorkSource;->add(ILjava/lang/String;)Z -Landroid/os/WorkSource;->addReturningNewbs(Landroid/os/WorkSource;)Landroid/os/WorkSource; -Landroid/os/WorkSource;->get(I)I -Landroid/os/WorkSource;->getName(I)Ljava/lang/String; -Landroid/os/WorkSource;->mNames:[Ljava/lang/String; -Landroid/os/WorkSource;->mNum:I -Landroid/os/WorkSource;->mUids:[I -Landroid/os/WorkSource;->setReturningDiffs(Landroid/os/WorkSource;)[Landroid/os/WorkSource; -Landroid/os/WorkSource;->size()I -Landroid/os/health/HealthKeys$Constants;-><init>(Ljava/lang/Class;)V -Landroid/os/health/HealthStats;-><init>(Landroid/os/Parcel;)V -Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/Parcel;)V -Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/health/HealthStatsWriter;)V -Landroid/os/health/HealthStatsParceler;->getHealthStats()Landroid/os/health/HealthStats; -Landroid/os/health/HealthStatsWriter;-><init>(Landroid/os/health/HealthKeys$Constants;)V -Landroid/os/health/HealthStatsWriter;->addMeasurement(IJ)V -Landroid/os/health/HealthStatsWriter;->addMeasurements(ILjava/lang/String;J)V -Landroid/os/health/HealthStatsWriter;->addStats(ILjava/lang/String;Landroid/os/health/HealthStatsWriter;)V -Landroid/os/health/HealthStatsWriter;->addTimer(IIJ)V -Landroid/os/health/HealthStatsWriter;->addTimers(ILjava/lang/String;Landroid/os/health/TimerStat;)V -Landroid/os/health/HealthStatsWriter;->flattenToParcel(Landroid/os/Parcel;)V -Landroid/os/health/SystemHealthManager;->from(Landroid/content/Context;)Landroid/os/health/SystemHealthManager; -Landroid/os/storage/DiskInfo;->getDescription()Ljava/lang/String; -Landroid/os/storage/DiskInfo;->getId()Ljava/lang/String; -Landroid/os/storage/DiskInfo;->isSd()Z -Landroid/os/storage/DiskInfo;->isUsb()Z -Landroid/os/storage/IStorageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager; -Landroid/os/storage/StorageEventListener;-><init>()V -Landroid/os/storage/StorageManager;->findVolumeById(Ljava/lang/String;)Landroid/os/storage/VolumeInfo; -Landroid/os/storage/StorageManager;->findVolumeByUuid(Ljava/lang/String;)Landroid/os/storage/VolumeInfo; -Landroid/os/storage/StorageManager;->from(Landroid/content/Context;)Landroid/os/storage/StorageManager; -Landroid/os/storage/StorageManager;->getBestVolumeDescription(Landroid/os/storage/VolumeInfo;)Ljava/lang/String; -Landroid/os/storage/StorageManager;->getDisks()Ljava/util/List; -Landroid/os/storage/StorageManager;->getPrimaryVolume()Landroid/os/storage/StorageVolume; -Landroid/os/storage/StorageManager;->getStorageBytesUntilLow(Ljava/io/File;)J -Landroid/os/storage/StorageManager;->getStorageFullBytes(Ljava/io/File;)J -Landroid/os/storage/StorageManager;->getStorageLowBytes(Ljava/io/File;)J -Landroid/os/storage/StorageManager;->getVolumeList()[Landroid/os/storage/StorageVolume; -Landroid/os/storage/StorageManager;->getVolumeList(II)[Landroid/os/storage/StorageVolume; -Landroid/os/storage/StorageManager;->getVolumePaths()[Ljava/lang/String; -Landroid/os/storage/StorageManager;->getVolumeState(Ljava/lang/String;)Ljava/lang/String; -Landroid/os/storage/StorageManager;->getVolumes()Ljava/util/List; -Landroid/os/storage/StorageManager;->registerListener(Landroid/os/storage/StorageEventListener;)V -Landroid/os/storage/StorageManager;->unregisterListener(Landroid/os/storage/StorageEventListener;)V -Landroid/os/storage/StorageVolume;->allowMassStorage()Z -Landroid/os/storage/StorageVolume;->getId()Ljava/lang/String; -Landroid/os/storage/StorageVolume;->getMaxFileSize()J -Landroid/os/storage/StorageVolume;->getPath()Ljava/lang/String; -Landroid/os/storage/StorageVolume;->getPathFile()Ljava/io/File; -Landroid/os/storage/StorageVolume;->getUserLabel()Ljava/lang/String; -Landroid/os/storage/StorageVolume;->mPath:Ljava/io/File; -Landroid/os/storage/VolumeInfo;->TYPE_EMULATED:I -Landroid/os/storage/VolumeInfo;->TYPE_PUBLIC:I -Landroid/os/storage/VolumeInfo;->buildStorageVolume(Landroid/content/Context;IZ)Landroid/os/storage/StorageVolume; -Landroid/os/storage/VolumeInfo;->getDisk()Landroid/os/storage/DiskInfo; -Landroid/os/storage/VolumeInfo;->getEnvironmentForState(I)Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getFsUuid()Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getId()Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getPath()Ljava/io/File; -Landroid/os/storage/VolumeInfo;->getState()I -Landroid/os/storage/VolumeInfo;->getType()I -Landroid/os/storage/VolumeInfo;->isPrimary()Z -Landroid/os/storage/VolumeInfo;->isVisible()Z -Landroid/permissionpresenterservice/RuntimePermissionPresenterService;->onRevokeRuntimePermission(Ljava/lang/String;Ljava/lang/String;)V -Landroid/preference/DialogPreference;->mBuilder:Landroid/app/AlertDialog$Builder; -Landroid/preference/DialogPreference;->mDialog:Landroid/app/Dialog; -Landroid/preference/DialogPreference;->mDialogIcon:Landroid/graphics/drawable/Drawable; -Landroid/preference/DialogPreference;->mDialogMessage:Ljava/lang/CharSequence; -Landroid/preference/DialogPreference;->mDialogTitle:Ljava/lang/CharSequence; -Landroid/preference/DialogPreference;->mNegativeButtonText:Ljava/lang/CharSequence; -Landroid/preference/DialogPreference;->mPositiveButtonText:Ljava/lang/CharSequence; -Landroid/preference/DialogPreference;->mWhichButtonClicked:I -Landroid/preference/ListPreference;->mClickedDialogEntryIndex:I -Landroid/preference/Preference;->onKey(Landroid/view/View;ILandroid/view/KeyEvent;)Z -Landroid/preference/Preference;->performClick(Landroid/preference/PreferenceScreen;)V -Landroid/preference/PreferenceActivity;->mPreferenceManager:Landroid/preference/PreferenceManager; -Landroid/preference/PreferenceActivity;->mPrefsContainer:Landroid/view/ViewGroup; -Landroid/preference/PreferenceManager;-><init>(Landroid/app/Activity;I)V -Landroid/preference/PreferenceManager;-><init>(Landroid/content/Context;)V -Landroid/preference/PreferenceManager;->dispatchActivityDestroy()V -Landroid/preference/PreferenceManager;->dispatchActivityResult(IILandroid/content/Intent;)V -Landroid/preference/PreferenceManager;->dispatchActivityStop()V -Landroid/preference/PreferenceManager;->getEditor()Landroid/content/SharedPreferences$Editor; -Landroid/preference/PreferenceManager;->getPreferenceScreen()Landroid/preference/PreferenceScreen; -Landroid/preference/PreferenceManager;->inflateFromIntent(Landroid/content/Intent;Landroid/preference/PreferenceScreen;)Landroid/preference/PreferenceScreen; -Landroid/preference/PreferenceManager;->inflateFromResource(Landroid/content/Context;ILandroid/preference/PreferenceScreen;)Landroid/preference/PreferenceScreen; -Landroid/preference/PreferenceManager;->mActivityDestroyListeners:Ljava/util/List; -Landroid/preference/PreferenceManager;->mOnPreferenceTreeClickListener:Landroid/preference/PreferenceManager$OnPreferenceTreeClickListener; -Landroid/preference/PreferenceManager;->mSharedPreferences:Landroid/content/SharedPreferences; -Landroid/preference/PreferenceManager;->registerOnActivityDestroyListener(Landroid/preference/PreferenceManager$OnActivityDestroyListener;)V -Landroid/preference/PreferenceManager;->registerOnActivityStopListener(Landroid/preference/PreferenceManager$OnActivityStopListener;)V -Landroid/preference/PreferenceManager;->setFragment(Landroid/preference/PreferenceFragment;)V -Landroid/preference/PreferenceManager;->setPreferences(Landroid/preference/PreferenceScreen;)Z -Landroid/preference/PreferenceManager;->shouldCommit()Z -Landroid/preference/PreferenceManager;->unregisterOnActivityDestroyListener(Landroid/preference/PreferenceManager$OnActivityDestroyListener;)V -Landroid/preference/PreferenceManager;->unregisterOnActivityStopListener(Landroid/preference/PreferenceManager$OnActivityStopListener;)V -Landroid/preference/PreferenceScreen;->mRootAdapter:Landroid/widget/ListAdapter; -Landroid/print/PrintDocumentAdapter$LayoutResultCallback;-><init>()V -Landroid/print/PrintDocumentAdapter$WriteResultCallback;-><init>()V -Landroid/print/PrintJobInfo;->getAdvancedOptions()Landroid/os/Bundle; -Landroid/print/PrintJobInfo;->getDocumentInfo()Landroid/print/PrintDocumentInfo; -Landroid/print/PrinterId;->getServiceName()Landroid/content/ComponentName; -Landroid/provider/Browser$BookmarkColumns; -Landroid/provider/Browser$BookmarkColumns;-><init>()V -Landroid/provider/Browser$BookmarkColumns;->BOOKMARK:Ljava/lang/String; -Landroid/provider/Browser$BookmarkColumns;->CREATED:Ljava/lang/String; -Landroid/provider/Browser$BookmarkColumns;->DATE:Ljava/lang/String; -Landroid/provider/Browser$BookmarkColumns;->FAVICON:Ljava/lang/String; -Landroid/provider/Browser$BookmarkColumns;->TITLE:Ljava/lang/String; -Landroid/provider/Browser$BookmarkColumns;->URL:Ljava/lang/String; -Landroid/provider/Browser$BookmarkColumns;->VISITS:Ljava/lang/String; -Landroid/provider/Browser$SearchColumns; -Landroid/provider/Browser$SearchColumns;-><init>()V -Landroid/provider/Browser$SearchColumns;->DATE:Ljava/lang/String; -Landroid/provider/Browser$SearchColumns;->SEARCH:Ljava/lang/String; -Landroid/provider/Browser$SearchColumns;->URL:Ljava/lang/String; -Landroid/provider/Browser;->BOOKMARKS_URI:Landroid/net/Uri; -Landroid/provider/Browser;->HISTORY_PROJECTION:[Ljava/lang/String; -Landroid/provider/Browser;->HISTORY_PROJECTION_BOOKMARK_INDEX:I -Landroid/provider/Browser;->HISTORY_PROJECTION_DATE_INDEX:I -Landroid/provider/Browser;->HISTORY_PROJECTION_FAVICON_INDEX:I -Landroid/provider/Browser;->HISTORY_PROJECTION_ID_INDEX:I -Landroid/provider/Browser;->HISTORY_PROJECTION_TITLE_INDEX:I -Landroid/provider/Browser;->HISTORY_PROJECTION_URL_INDEX:I -Landroid/provider/Browser;->HISTORY_PROJECTION_VISITS_INDEX:I -Landroid/provider/Browser;->SEARCHES_PROJECTION:[Ljava/lang/String; -Landroid/provider/Browser;->SEARCHES_PROJECTION_DATE_INDEX:I -Landroid/provider/Browser;->SEARCHES_PROJECTION_SEARCH_INDEX:I -Landroid/provider/Browser;->SEARCHES_URI:Landroid/net/Uri; -Landroid/provider/Browser;->TRUNCATE_HISTORY_PROJECTION:[Ljava/lang/String; -Landroid/provider/Browser;->TRUNCATE_HISTORY_PROJECTION_ID_INDEX:I -Landroid/provider/Browser;->TRUNCATE_N_OLDEST:I -Landroid/provider/Browser;->addSearchUrl(Landroid/content/ContentResolver;Ljava/lang/String;)V -Landroid/provider/Browser;->canClearHistory(Landroid/content/ContentResolver;)Z -Landroid/provider/Browser;->clearHistory(Landroid/content/ContentResolver;)V -Landroid/provider/Browser;->clearSearches(Landroid/content/ContentResolver;)V -Landroid/provider/Browser;->deleteFromHistory(Landroid/content/ContentResolver;Ljava/lang/String;)V -Landroid/provider/Browser;->deleteHistoryTimeFrame(Landroid/content/ContentResolver;JJ)V -Landroid/provider/Browser;->getAllBookmarks(Landroid/content/ContentResolver;)Landroid/database/Cursor; -Landroid/provider/Browser;->getAllVisitedUrls(Landroid/content/ContentResolver;)Landroid/database/Cursor; -Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;)[Ljava/lang/String; -Landroid/provider/Browser;->requestAllIcons(Landroid/content/ContentResolver;Ljava/lang/String;Landroid/webkit/WebIconDatabase$IconListener;)V -Landroid/provider/Browser;->saveBookmark(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V -Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V -Landroid/provider/Browser;->truncateHistory(Landroid/content/ContentResolver;)V -Landroid/provider/Browser;->updateVisitedHistory(Landroid/content/ContentResolver;Ljava/lang/String;Z)V -Landroid/provider/CalendarContract$CalendarAlerts;->findNextAlarmTime(Landroid/content/ContentResolver;J)J -Landroid/provider/CalendarContract$CalendarAlerts;->rescheduleMissedAlarms(Landroid/content/ContentResolver;Landroid/content/Context;Landroid/app/AlarmManager;)V -Landroid/provider/CalendarContract$Events;->PROVIDER_WRITABLE_COLUMNS:[Ljava/lang/String; -Landroid/provider/ContactsContract$CommonDataKinds$Phone;->getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence; -Landroid/provider/ContactsContract$Contacts$StreamItems; -Landroid/provider/ContactsContract$Contacts$StreamItems;->CONTENT_DIRECTORY:Ljava/lang/String; -Landroid/provider/ContactsContract$RawContacts$StreamItems; -Landroid/provider/ContactsContract$RawContacts$StreamItems;->CONTENT_DIRECTORY:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotos; -Landroid/provider/ContactsContract$StreamItemPhotos;->PHOTO:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->PHOTO_FILE_ID:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->PHOTO_URI:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SORT_INDEX:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->STREAM_ITEM_ID:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC1:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC2:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC3:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemPhotosColumns;->SYNC4:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos; -Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;->CONTENT_DIRECTORY:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;->CONTENT_ITEM_TYPE:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItems$StreamItemPhotos;->CONTENT_TYPE:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItems; -Landroid/provider/ContactsContract$StreamItems;->CONTENT_ITEM_TYPE:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItems;->CONTENT_LIMIT_URI:Landroid/net/Uri; -Landroid/provider/ContactsContract$StreamItems;->CONTENT_PHOTO_URI:Landroid/net/Uri; -Landroid/provider/ContactsContract$StreamItems;->CONTENT_TYPE:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItems;->CONTENT_URI:Landroid/net/Uri; -Landroid/provider/ContactsContract$StreamItems;->MAX_ITEMS:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns; -Landroid/provider/ContactsContract$StreamItemsColumns;->ACCOUNT_NAME:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->ACCOUNT_TYPE:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->COMMENTS:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->CONTACT_ID:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->CONTACT_LOOKUP_KEY:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->DATA_SET:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->RAW_CONTACT_ID:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->RAW_CONTACT_SOURCE_ID:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->RES_ICON:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->RES_LABEL:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->RES_PACKAGE:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC1:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC2:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC3:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->SYNC4:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->TEXT:Ljava/lang/String; -Landroid/provider/ContactsContract$StreamItemsColumns;->TIMESTAMP:Ljava/lang/String; -Landroid/provider/Downloads$Impl$RequestHeaders;->INSERT_KEY_PREFIX:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_ALLOWED_NETWORK_TYPES:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_ALLOW_ROAMING:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_COOKIE_DATA:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_DELETED:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_DESCRIPTION:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_DESTINATION:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_FILE_NAME_HINT:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_IS_PUBLIC_API:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_MEDIA_SCANNED:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_MIME_TYPE:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_NOTIFICATION_CLASS:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_NOTIFICATION_EXTRAS:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_NOTIFICATION_PACKAGE:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_REFERER:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_TITLE:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_URI:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->COLUMN_VISIBILITY:Ljava/lang/String; -Landroid/provider/Downloads$Impl;->CONTENT_URI:Landroid/net/Uri; -Landroid/provider/Downloads$Impl;->DESTINATION_CACHE_PARTITION_PURGEABLE:I -Landroid/provider/Downloads$Impl;->DESTINATION_FILE_URI:I -Landroid/provider/Settings$ContentProviderHolder;->mContentProvider:Landroid/content/IContentProvider; -Landroid/provider/Settings$Global;->CONTACT_METADATA_SYNC:Ljava/lang/String; -Landroid/provider/Settings$Global;->ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED:Ljava/lang/String; -Landroid/provider/Settings$Global;->PACKAGE_VERIFIER_ENABLE:Ljava/lang/String; -Landroid/provider/Settings$Global;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String; -Landroid/provider/Settings$Global;->sNameValueCache:Landroid/provider/Settings$NameValueCache; -Landroid/provider/Settings$NameValueCache;->mProviderHolder:Landroid/provider/Settings$ContentProviderHolder; -Landroid/provider/Settings$Secure;->ACCESSIBILITY_AUTOCLICK_ENABLED:Ljava/lang/String; -Landroid/provider/Settings$Secure;->ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED:Ljava/lang/String; -Landroid/provider/Settings$Secure;->ACCESSIBILITY_LARGE_POINTER_ICON:Ljava/lang/String; -Landroid/provider/Settings$Secure;->ENABLED_NOTIFICATION_LISTENERS:Ljava/lang/String; -Landroid/provider/Settings$Secure;->INCALL_POWER_BUTTON_BEHAVIOR:Ljava/lang/String; -Landroid/provider/Settings$Secure;->LONG_PRESS_TIMEOUT:Ljava/lang/String; -Landroid/provider/Settings$Secure;->PACKAGE_VERIFIER_USER_CONSENT:Ljava/lang/String; -Landroid/provider/Settings$Secure;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String; -Landroid/provider/Settings$Secure;->putIntForUser(Landroid/content/ContentResolver;Ljava/lang/String;II)Z -Landroid/provider/Settings$Secure;->sNameValueCache:Landroid/provider/Settings$NameValueCache; -Landroid/provider/Settings$System;->AIRPLANE_MODE_TOGGLEABLE_RADIOS:Ljava/lang/String; -Landroid/provider/Settings$System;->APPEND_FOR_LAST_AUDIBLE:Ljava/lang/String; -Landroid/provider/Settings$System;->HEARING_AID:Ljava/lang/String; -Landroid/provider/Settings$System;->MASTER_MONO:Ljava/lang/String; -Landroid/provider/Settings$System;->SCREEN_AUTO_BRIGHTNESS_ADJ:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_ALARM:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_BLUETOOTH_SCO:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_MUSIC:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_NOTIFICATION:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_RING:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_SETTINGS:[Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_SYSTEM:Ljava/lang/String; -Landroid/provider/Settings$System;->VOLUME_VOICE:Ljava/lang/String; -Landroid/provider/Settings$System;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String; -Landroid/provider/Settings$System;->putStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;I)Z -Landroid/provider/Settings$System;->sNameValueCache:Landroid/provider/Settings$NameValueCache; -Landroid/provider/Settings;->isCallingPackageAllowedToDrawOverlays(Landroid/content/Context;ILjava/lang/String;Z)Z -Landroid/provider/Settings;->isCallingPackageAllowedToWriteSettings(Landroid/content/Context;ILjava/lang/String;Z)Z -Landroid/provider/Telephony$Mms;->isEmailAddress(Ljava/lang/String;)Z -Landroid/provider/Telephony$Sms$Draft;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri; -Landroid/provider/Telephony$Sms$Inbox;->addMessage(ILandroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Z)Landroid/net/Uri; -Landroid/provider/Telephony$Sms$Inbox;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Z)Landroid/net/Uri; -Landroid/provider/Telephony$Sms$Intents;->SMS_EMERGENCY_CB_RECEIVED_ACTION:Ljava/lang/String; -Landroid/provider/Telephony$Sms$Outbox;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZJ)Landroid/net/Uri; -Landroid/provider/Telephony$Sms$Sent;->addMessage(ILandroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri; -Landroid/provider/Telephony$Sms$Sent;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri; -Landroid/provider/Telephony$Sms;->addMessageToUri(ILandroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZ)Landroid/net/Uri; -Landroid/provider/Telephony$Sms;->addMessageToUri(ILandroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZJ)Landroid/net/Uri; -Landroid/provider/Telephony$Sms;->addMessageToUri(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZ)Landroid/net/Uri; -Landroid/provider/Telephony$Sms;->addMessageToUri(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZZJ)Landroid/net/Uri; -Landroid/renderscript/RenderScript;->create(Landroid/content/Context;I)Landroid/renderscript/RenderScript; -Landroid/renderscript/RenderScript;->create(Landroid/content/Context;ILandroid/renderscript/RenderScript$ContextType;I)Landroid/renderscript/RenderScript; -Landroid/renderscript/RenderScript;->getMinorID()J -Landroid/renderscript/RenderScriptCacheDir;->mCacheDir:Ljava/io/File; -Landroid/renderscript/RenderScriptCacheDir;->setupDiskCache(Ljava/io/File;)V -Landroid/security/KeyStore;->getInstance()Landroid/security/KeyStore; -Landroid/security/keystore/AndroidKeyStoreProvider;->getKeyStoreOperationHandle(Ljava/lang/Object;)J -Landroid/security/keystore/recovery/KeyChainSnapshot;->getTrustedHardwarePublicKey()[B -Landroid/security/keystore/recovery/RecoveryController;->generateAndStoreKey(Ljava/lang/String;[B)[B -Landroid/security/keystore/recovery/RecoveryController;->generateKey(Ljava/lang/String;[B)Ljava/security/Key; -Landroid/security/keystore/recovery/RecoveryController;->getAliases(Ljava/lang/String;)Ljava/util/List; -Landroid/security/keystore/recovery/RecoveryController;->getRecoveryData()Landroid/security/keystore/recovery/KeyChainSnapshot; -Landroid/security/keystore/recovery/RecoveryController;->getRecoveryStatus(Ljava/lang/String;Ljava/lang/String;)I -Landroid/security/keystore/recovery/RecoveryController;->initRecoveryService(Ljava/lang/String;[B)V -Landroid/security/keystore/recovery/RecoveryController;->setRecoveryStatus(Ljava/lang/String;Ljava/lang/String;I)V -Landroid/security/keystore/recovery/RecoverySession;->recoverKeys([BLjava/util/List;)Ljava/util/Map; -Landroid/security/keystore/recovery/RecoverySession;->start(Ljava/security/cert/CertPath;[B[BLjava/util/List;)[B -Landroid/security/keystore/recovery/RecoverySession;->start([B[B[BLjava/util/List;)[B -Landroid/security/keystore/recovery/WrappedApplicationKey$Builder;->setAccount([B)Landroid/security/keystore/recovery/WrappedApplicationKey$Builder; -Landroid/security/keystore/recovery/WrappedApplicationKey;->getAccount()[B -Landroid/security/net/config/RootTrustManager;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List; -Landroid/service/dreams/DreamService;->canDoze()Z -Landroid/service/dreams/DreamService;->isDozing()Z -Landroid/service/dreams/DreamService;->startDozing()V -Landroid/service/dreams/DreamService;->stopDozing()V -Landroid/service/euicc/EuiccProfileInfo;-><init>(Ljava/lang/String;[Landroid/telephony/UiccAccessRule;Ljava/lang/String;)V -Landroid/service/euicc/GetDefaultDownloadableSubscriptionListResult;->result:I -Landroid/service/euicc/GetDownloadableSubscriptionMetadataResult;->result:I -Landroid/service/media/IMediaBrowserServiceCallbacks$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/media/IMediaBrowserServiceCallbacks; -Landroid/service/media/IMediaBrowserServiceCallbacks;->onConnect(Ljava/lang/String;Landroid/media/session/MediaSession$Token;Landroid/os/Bundle;)V -Landroid/service/media/IMediaBrowserServiceCallbacks;->onConnectFailed()V -Landroid/service/media/IMediaBrowserServiceCallbacks;->onLoadChildren(Ljava/lang/String;Landroid/content/pm/ParceledListSlice;)V -Landroid/service/media/IMediaBrowserServiceCallbacks;->onLoadChildrenWithOptions(Ljava/lang/String;Landroid/content/pm/ParceledListSlice;Landroid/os/Bundle;)V -Landroid/service/media/MediaBrowserService$Result;->mFlags:I -Landroid/service/media/MediaBrowserService;->KEY_MEDIA_ITEM:Ljava/lang/String; -Landroid/service/notification/NotificationListenerService$Ranking;->getAdditionalPeople()Ljava/util/List; -Landroid/service/notification/NotificationListenerService$Ranking;->getSnoozeCriteria()Ljava/util/List; -Landroid/service/notification/NotificationListenerService;->TRIM_FULL:I -Landroid/service/notification/NotificationListenerService;->TRIM_LIGHT:I -Landroid/service/notification/NotificationListenerService;->getActiveNotifications(I)[Landroid/service/notification/StatusBarNotification; -Landroid/service/notification/NotificationListenerService;->getActiveNotifications([Ljava/lang/String;I)[Landroid/service/notification/StatusBarNotification; -Landroid/service/notification/NotificationListenerService;->isBound()Z -Landroid/service/notification/NotificationListenerService;->mHandler:Landroid/os/Handler; -Landroid/service/notification/NotificationListenerService;->registerAsSystemService(Landroid/content/Context;Landroid/content/ComponentName;I)V -Landroid/service/notification/NotificationListenerService;->setOnNotificationPostedTrim(I)V -Landroid/service/notification/NotificationListenerService;->snoozeNotification(Ljava/lang/String;Ljava/lang/String;)V -Landroid/service/notification/NotificationListenerService;->unregisterAsSystemService()V -Landroid/service/notification/StatusBarNotification;->getInitialPid()I -Landroid/service/notification/StatusBarNotification;->getUid()I -Landroid/service/persistentdata/IPersistentDataBlockService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/persistentdata/IPersistentDataBlockService; -Landroid/service/voice/AlwaysOnHotwordDetector$EventPayload;->getCaptureSession()Ljava/lang/Integer; -Landroid/service/voice/VoiceInteractionService;->isKeyphraseAndLocaleSupportedForHotword(Ljava/lang/String;Ljava/util/Locale;)Z -Landroid/service/vr/IVrManager;->getVr2dDisplayId()I -Landroid/service/vr/VrListenerService;->onCurrentVrActivityChanged(Landroid/content/ComponentName;ZI)V -Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V -Landroid/speech/tts/TextToSpeech;->getCurrentEngine()Ljava/lang/String; -Landroid/speech/tts/UtteranceProgressListener;->onUtteranceRangeStart(Ljava/lang/String;II)V -Landroid/system/Int32Ref;->value:I -Landroid/system/NetlinkSocketAddress;-><init>(II)V -Landroid/system/Os;->bind(Ljava/io/FileDescriptor;Ljava/net/SocketAddress;)V -Landroid/system/Os;->connect(Ljava/io/FileDescriptor;Ljava/net/SocketAddress;)V -Landroid/system/Os;->sendto(Ljava/io/FileDescriptor;[BIIILjava/net/SocketAddress;)I -Landroid/system/Os;->setsockoptIfreq(Ljava/io/FileDescriptor;IILjava/lang/String;)V -Landroid/system/Os;->setsockoptTimeval(Ljava/io/FileDescriptor;IILandroid/system/StructTimeval;)V -Landroid/system/OsConstants;-><init>()V -Landroid/system/OsConstants;->AF_NETLINK:I -Landroid/system/OsConstants;->AF_PACKET:I -Landroid/system/OsConstants;->ARPHRD_ETHER:I -Landroid/system/OsConstants;->ARPHRD_LOOPBACK:I -Landroid/system/OsConstants;->CAP_TO_INDEX(I)I -Landroid/system/OsConstants;->CAP_TO_MASK(I)I -Landroid/system/OsConstants;->ENONET:I -Landroid/system/OsConstants;->ETH_P_ALL:I -Landroid/system/OsConstants;->ETH_P_ARP:I -Landroid/system/OsConstants;->ETH_P_IP:I -Landroid/system/OsConstants;->ETH_P_IPV6:I -Landroid/system/OsConstants;->EUSERS:I -Landroid/system/OsConstants;->ICMP6_ECHO_REPLY:I -Landroid/system/OsConstants;->ICMP6_ECHO_REQUEST:I -Landroid/system/OsConstants;->ICMP_ECHO:I -Landroid/system/OsConstants;->ICMP_ECHOREPLY:I -Landroid/system/OsConstants;->IP_MULTICAST_ALL:I -Landroid/system/OsConstants;->IP_RECVTOS:I -Landroid/system/OsConstants;->MAP_POPULATE:I -Landroid/system/OsConstants;->NETLINK_NETFILTER:I -Landroid/system/OsConstants;->NETLINK_ROUTE:I -Landroid/system/OsConstants;->O_DIRECT:I -Landroid/system/OsConstants;->PR_CAP_AMBIENT:I -Landroid/system/OsConstants;->PR_CAP_AMBIENT_RAISE:I -Landroid/system/OsConstants;->RLIMIT_NOFILE:I -Landroid/system/OsConstants;->RTMGRP_IPV4_IFADDR:I -Landroid/system/OsConstants;->RTMGRP_IPV4_MROUTE:I -Landroid/system/OsConstants;->RTMGRP_IPV4_ROUTE:I -Landroid/system/OsConstants;->RTMGRP_IPV4_RULE:I -Landroid/system/OsConstants;->RTMGRP_IPV6_IFADDR:I -Landroid/system/OsConstants;->RTMGRP_IPV6_IFINFO:I -Landroid/system/OsConstants;->RTMGRP_IPV6_MROUTE:I -Landroid/system/OsConstants;->RTMGRP_IPV6_PREFIX:I -Landroid/system/OsConstants;->RTMGRP_IPV6_ROUTE:I -Landroid/system/OsConstants;->RTMGRP_LINK:I -Landroid/system/OsConstants;->RTMGRP_NEIGH:I -Landroid/system/OsConstants;->RTMGRP_NOTIFY:I -Landroid/system/OsConstants;->RTMGRP_TC:I -Landroid/system/OsConstants;->SO_DOMAIN:I -Landroid/system/OsConstants;->SO_PROTOCOL:I -Landroid/system/OsConstants;->SPLICE_F_MORE:I -Landroid/system/OsConstants;->SPLICE_F_MOVE:I -Landroid/system/OsConstants;->SPLICE_F_NONBLOCK:I -Landroid/system/OsConstants;->TIOCOUTQ:I -Landroid/system/OsConstants;->UDP_ENCAP:I -Landroid/system/OsConstants;->UDP_ENCAP_ESPINUDP:I -Landroid/system/OsConstants;->UDP_ENCAP_ESPINUDP_NON_IKE:I -Landroid/system/OsConstants;->UNIX_PATH_MAX:I -Landroid/system/OsConstants;->XATTR_CREATE:I -Landroid/system/OsConstants;->XATTR_REPLACE:I -Landroid/system/OsConstants;->_LINUX_CAPABILITY_VERSION_3:I -Landroid/system/OsConstants;->initConstants()V -Landroid/system/OsConstants;->placeholder()I -Landroid/system/PacketSocketAddress;-><init>(I[B)V -Landroid/system/PacketSocketAddress;-><init>(SI)V -Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval; -Landroid/telecom/AudioState;->isMuted:Z -Landroid/telecom/ParcelableCall;->CREATOR:Landroid/os/Parcelable$Creator; -Landroid/telecom/ParcelableCall;->getConnectTimeMillis()J -Landroid/telecom/ParcelableCall;->getDisconnectCause()Landroid/telecom/DisconnectCause; -Landroid/telecom/ParcelableCall;->getHandle()Landroid/net/Uri; -Landroid/telecom/ParcelableCall;->getId()Ljava/lang/String; -Landroid/telecom/TelecomManager;->EXTRA_IS_HANDOVER:Ljava/lang/String; -Landroid/telecom/TelecomManager;->from(Landroid/content/Context;)Landroid/telecom/TelecomManager; -Landroid/telecom/TelecomManager;->getUserSelectedOutgoingPhoneAccount()Landroid/telecom/PhoneAccountHandle; -Landroid/telecom/TelecomManager;->setUserSelectedOutgoingPhoneAccount(Landroid/telecom/PhoneAccountHandle;)V -Landroid/telecom/VideoProfile$CameraCapabilities;-><init>(IIZF)V -Landroid/telephony/CellSignalStrengthLte;->mCqi:I -Landroid/telephony/CellSignalStrengthLte;->mRsrp:I -Landroid/telephony/CellSignalStrengthLte;->mRsrq:I -Landroid/telephony/CellSignalStrengthLte;->mRssnr:I -Landroid/telephony/CellSignalStrengthLte;->mSignalStrength:I -Landroid/telephony/CellSignalStrengthLte;->mTimingAdvance:I -Landroid/telephony/CellSignalStrengthWcdma;->mBitErrorRate:I -Landroid/telephony/CellSignalStrengthWcdma;->mSignalStrength:I -Landroid/telephony/NetworkScan;->stop()V -Landroid/telephony/PhoneNumberUtils;->formatNumber(Ljava/lang/String;I)Ljava/lang/String; -Landroid/telephony/PhoneNumberUtils;->isEmergencyNumber(ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isLocalEmergencyNumber(Landroid/content/Context;ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isPotentialEmergencyNumber(ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isPotentialLocalEmergencyNumber(Landroid/content/Context;ILjava/lang/String;)Z -Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;)V -Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;Landroid/os/Looper;)V -Landroid/telephony/PhoneStateListener;->mSubId:Ljava/lang/Integer; -Landroid/telephony/PreciseCallState;->getBackgroundCallState()I -Landroid/telephony/PreciseCallState;->getForegroundCallState()I -Landroid/telephony/RadioAccessFamily;-><init>(II)V -Landroid/telephony/RadioAccessFamily;->getRafFromNetworkType(I)I -Landroid/telephony/Rlog;->d(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/Rlog;->e(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/Rlog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I -Landroid/telephony/Rlog;->i(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/ServiceState;->bitmaskHasTech(II)Z -Landroid/telephony/ServiceState;->getDataRegState()I -Landroid/telephony/ServiceState;->getDataRoaming()Z -Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I -Landroid/telephony/ServiceState;->getVoiceNetworkType()I -Landroid/telephony/ServiceState;->getVoiceRegState()I -Landroid/telephony/ServiceState;->isCdma(I)Z -Landroid/telephony/ServiceState;->isEmergencyOnly()Z -Landroid/telephony/ServiceState;->isGsm(I)Z -Landroid/telephony/ServiceState;->mergeServiceStates(Landroid/telephony/ServiceState;Landroid/telephony/ServiceState;)Landroid/telephony/ServiceState; -Landroid/telephony/ServiceState;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/ServiceState; -Landroid/telephony/ServiceState;->rilRadioTechnologyToString(I)Ljava/lang/String; -Landroid/telephony/SignalStrength;-><init>()V -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_GOOD:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_GREAT:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_MODERATE:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_NONE_OR_UNKNOWN:I -Landroid/telephony/SignalStrength;->SIGNAL_STRENGTH_POOR:I -Landroid/telephony/SignalStrength;->getAsuLevel()I -Landroid/telephony/SignalStrength;->getCdmaLevel()I -Landroid/telephony/SignalStrength;->getDbm()I -Landroid/telephony/SignalStrength;->getGsmDbm()I -Landroid/telephony/SignalStrength;->getLteDbm()I -Landroid/telephony/SignalStrength;->getLteRsrp()I -Landroid/telephony/SignalStrength;->getLteRsrq()I -Landroid/telephony/SignalStrength;->getLteRssnr()I -Landroid/telephony/SignalStrength;->getLteSignalStrength()I -Landroid/telephony/SignalStrength;->mGsmBitErrorRate:I -Landroid/telephony/SignalStrength;->mGsmSignalStrength:I -Landroid/telephony/SignalStrength;->mLteCqi:I -Landroid/telephony/SignalStrength;->mLteRsrp:I -Landroid/telephony/SignalStrength;->mLteRsrq:I -Landroid/telephony/SignalStrength;->mLteRssnr:I -Landroid/telephony/SignalStrength;->mLteSignalStrength:I -Landroid/telephony/SmsManager;->sendMultipartTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/util/ArrayList;Ljava/util/ArrayList;Ljava/util/ArrayList;IZI)V -Landroid/telephony/SmsManager;->sendTextMessage(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;IZI)V -Landroid/telephony/SmsMessage;->getSubId()I -Landroid/telephony/SmsMessage;->mWrappedSmsMessage:Lcom/android/internal/telephony/SmsMessageBase; -Landroid/telephony/SubscriptionInfo;->setDisplayName(Ljava/lang/CharSequence;)V -Landroid/telephony/SubscriptionInfo;->setIconTint(I)V -Landroid/telephony/SubscriptionManager;->clearDefaultsForInactiveSubIds()V -Landroid/telephony/SubscriptionManager;->getActiveSubscriptionIdList()[I -Landroid/telephony/SubscriptionManager;->getAllSubscriptionInfoCount()I -Landroid/telephony/SubscriptionManager;->getAllSubscriptionInfoList()Ljava/util/List; -Landroid/telephony/SubscriptionManager;->getDefaultDataPhoneId()I -Landroid/telephony/SubscriptionManager;->getDefaultDataSubscriptionInfo()Landroid/telephony/SubscriptionInfo; -Landroid/telephony/SubscriptionManager;->getDefaultSmsPhoneId()I -Landroid/telephony/SubscriptionManager;->getDefaultVoicePhoneId()I -Landroid/telephony/SubscriptionManager;->getDefaultVoiceSubscriptionInfo()Landroid/telephony/SubscriptionInfo; -Landroid/telephony/SubscriptionManager;->getPhoneId(I)I -Landroid/telephony/SubscriptionManager;->getResourcesForSubId(Landroid/content/Context;I)Landroid/content/res/Resources; -Landroid/telephony/SubscriptionManager;->getSlotIndex(I)I -Landroid/telephony/SubscriptionManager;->getSubId(I)[I -Landroid/telephony/SubscriptionManager;->isActiveSubId(I)Z -Landroid/telephony/SubscriptionManager;->isUsableSubIdValue(I)Z -Landroid/telephony/SubscriptionManager;->isValidPhoneId(I)Z -Landroid/telephony/SubscriptionManager;->isValidSlotIndex(I)Z -Landroid/telephony/SubscriptionManager;->isValidSubscriptionId(I)Z -Landroid/telephony/SubscriptionManager;->putPhoneIdAndSubIdExtra(Landroid/content/Intent;I)V -Landroid/telephony/SubscriptionManager;->putPhoneIdAndSubIdExtra(Landroid/content/Intent;II)V -Landroid/telephony/SubscriptionManager;->setDefaultDataSubId(I)V -Landroid/telephony/SubscriptionManager;->setDefaultSmsSubId(I)V -Landroid/telephony/SubscriptionManager;->setDisplayName(Ljava/lang/String;IJ)I -Landroid/telephony/SubscriptionManager;->setIconTint(II)I -Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDA:Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDS:Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager;-><init>()V -Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;)V -Landroid/telephony/TelephonyManager;->from(Landroid/content/Context;)Landroid/telephony/TelephonyManager; -Landroid/telephony/TelephonyManager;->getCallState(I)I -Landroid/telephony/TelephonyManager;->getDataNetworkType(I)I -Landroid/telephony/TelephonyManager;->getDefault()Landroid/telephony/TelephonyManager; -Landroid/telephony/TelephonyManager;->getGroupIdLevel1(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getITelephony()Lcom/android/internal/telephony/ITelephony; -Landroid/telephony/TelephonyManager;->getIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;I)I -Landroid/telephony/TelephonyManager;->getIsimDomain()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getLine1Number(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getMultiSimConfiguration()Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager;->getNetworkClass(I)I -Landroid/telephony/TelephonyManager;->getNetworkCountryIso(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkOperator(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkOperatorForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkOperatorName(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkType(I)I -Landroid/telephony/TelephonyManager;->getNetworkTypeName()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkTypeName(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getPhoneType(I)I -Landroid/telephony/TelephonyManager;->getPreferredNetworkType(I)I -Landroid/telephony/TelephonyManager;->getServiceStateForSubscriber(I)Landroid/telephony/ServiceState; -Landroid/telephony/TelephonyManager;->getSimCount()I -Landroid/telephony/TelephonyManager;->getSimOperator(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorName(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNameForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNumeric(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimOperatorNumericForPhone(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSimSerialNumber(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSubIdForPhoneAccount(Landroid/telecom/PhoneAccount;)I -Landroid/telephony/TelephonyManager;->getSubscriberId(I)Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getSubscriberInfo()Lcom/android/internal/telephony/IPhoneSubInfo; -Landroid/telephony/TelephonyManager;->getVoiceMessageCount()I -Landroid/telephony/TelephonyManager;->getVoiceNetworkType(I)I -Landroid/telephony/TelephonyManager;->hasIccCard(I)Z -Landroid/telephony/TelephonyManager;->isImsRegistered()Z -Landroid/telephony/TelephonyManager;->isMultiSimEnabled()Z -Landroid/telephony/TelephonyManager;->isNetworkRoaming(I)Z -Landroid/telephony/TelephonyManager;->isVideoTelephonyAvailable()Z -Landroid/telephony/TelephonyManager;->isVolteAvailable()Z -Landroid/telephony/TelephonyManager;->isWifiCallingAvailable()Z -Landroid/telephony/TelephonyManager;->mSubscriptionManager:Landroid/telephony/SubscriptionManager; -Landroid/telephony/TelephonyManager;->nvResetConfig(I)Z -Landroid/telephony/TelephonyManager;->putIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;II)Z -Landroid/telephony/TelephonyManager;->requestNetworkScan(Landroid/telephony/NetworkScanRequest;Landroid/telephony/TelephonyScanManager$NetworkScanCallback;)Landroid/telephony/NetworkScan; -Landroid/telephony/TelephonyManager;->setPreferredNetworkType(II)Z -Landroid/telephony/euicc/DownloadableSubscription;->encodedActivationCode:Ljava/lang/String; -Landroid/telephony/euicc/DownloadableSubscription;->setAccessRules([Landroid/telephony/UiccAccessRule;)V -Landroid/telephony/euicc/DownloadableSubscription;->setCarrierName(Ljava/lang/String;)V -Landroid/telephony/ims/ImsCallForwardInfo;-><init>()V -Landroid/telephony/ims/ImsCallForwardInfo;->mCondition:I -Landroid/telephony/ims/ImsCallForwardInfo;->mNumber:Ljava/lang/String; -Landroid/telephony/ims/ImsCallForwardInfo;->mServiceClass:I -Landroid/telephony/ims/ImsCallForwardInfo;->mStatus:I -Landroid/telephony/ims/ImsCallForwardInfo;->mTimeSeconds:I -Landroid/telephony/ims/ImsCallForwardInfo;->mToA:I -Landroid/telephony/ims/ImsCallProfile;->mCallExtras:Landroid/os/Bundle; -Landroid/telephony/ims/ImsCallProfile;->mCallType:I -Landroid/telephony/ims/ImsCallProfile;->mMediaProfile:Landroid/telephony/ims/ImsStreamMediaProfile; -Landroid/telephony/ims/ImsCallProfile;->mRestrictCause:I -Landroid/telephony/ims/ImsCallProfile;->presentationToOIR(I)I -Landroid/telephony/ims/ImsExternalCallState;-><init>(ILandroid/net/Uri;ZIIZ)V -Landroid/telephony/ims/ImsReasonInfo;-><init>(II)V -Landroid/telephony/ims/ImsReasonInfo;->mCode:I -Landroid/telephony/ims/ImsReasonInfo;->mExtraCode:I -Landroid/telephony/ims/ImsReasonInfo;->mExtraMessage:Ljava/lang/String; -Landroid/telephony/ims/ImsSsInfo;->mIcbNum:Ljava/lang/String; -Landroid/telephony/ims/ImsSsInfo;->mStatus:I -Landroid/telephony/ims/ImsStreamMediaProfile;-><init>()V -Landroid/telephony/ims/ImsStreamMediaProfile;->mAudioDirection:I -Landroid/telephony/ims/ImsStreamMediaProfile;->mAudioQuality:I -Landroid/telephony/ims/ImsStreamMediaProfile;->mVideoDirection:I -Landroid/telephony/ims/ImsVideoCallProvider;->getInterface()Lcom/android/ims/internal/IImsVideoCallProvider; -Landroid/telephony/ims/compat/ImsService;-><init>()V -Landroid/telephony/ims/compat/ImsService;->mImsServiceController:Landroid/os/IBinder; -Landroid/telephony/ims/compat/feature/ImsFeature;->getFeatureState()I -Landroid/telephony/ims/compat/feature/ImsFeature;->setFeatureState(I)V -Landroid/telephony/ims/compat/feature/MMTelFeature;-><init>()V -Landroid/telephony/ims/compat/stub/ImsCallSessionImplBase;-><init>()V -Landroid/telephony/ims/compat/stub/ImsConfigImplBase;-><init>(Landroid/content/Context;)V -Landroid/telephony/ims/compat/stub/ImsConfigImplBase;->getIImsConfig()Lcom/android/ims/internal/IImsConfig; -Landroid/telephony/ims/compat/stub/ImsUtListenerImplBase;-><init>()V -Landroid/telephony/mbms/IMbmsStreamingSessionCallback$Stub;-><init>()V -Landroid/telephony/mbms/IStreamingServiceCallback$Stub;-><init>()V -Landroid/telephony/mbms/vendor/IMbmsStreamingService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/telephony/mbms/vendor/IMbmsStreamingService; -Landroid/telephony/mbms/vendor/IMbmsStreamingService;->getPlaybackUri(ILjava/lang/String;)Landroid/net/Uri; -Landroid/telephony/mbms/vendor/IMbmsStreamingService;->initialize(Landroid/telephony/mbms/IMbmsStreamingSessionCallback;I)I -Landroid/telephony/mbms/vendor/IMbmsStreamingService;->requestUpdateStreamingServices(ILjava/util/List;)I -Landroid/telephony/mbms/vendor/IMbmsStreamingService;->startStreaming(ILjava/lang/String;Landroid/telephony/mbms/IStreamingServiceCallback;)I -Landroid/text/AndroidBidi;->bidi(I[C[B)I -Landroid/text/BoringLayout;->isBoring(Ljava/lang/CharSequence;Landroid/text/TextPaint;Landroid/text/TextDirectionHeuristic;Landroid/text/BoringLayout$Metrics;)Landroid/text/BoringLayout$Metrics; -Landroid/text/DynamicLayout;-><init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;Landroid/text/TextDirectionHeuristic;FFZIIILandroid/text/TextUtils$TruncateAt;I)V -Landroid/text/DynamicLayout;->sStaticLayout:Landroid/text/StaticLayout; -Landroid/text/Html;->withinStyle(Ljava/lang/StringBuilder;Ljava/lang/CharSequence;II)V -Landroid/text/Layout$Alignment;->ALIGN_LEFT:Landroid/text/Layout$Alignment; -Landroid/text/Layout$Alignment;->ALIGN_RIGHT:Landroid/text/Layout$Alignment; -Landroid/text/Layout;->DIRS_ALL_LEFT_TO_RIGHT:Landroid/text/Layout$Directions; -Landroid/text/Layout;->getPrimaryHorizontal(IZ)F -Landroid/text/SpanSet;->spans:[Ljava/lang/Object; -Landroid/text/SpannableStringBuilder;->mGapLength:I -Landroid/text/SpannableStringBuilder;->mGapStart:I -Landroid/text/SpannableStringBuilder;->mSpanCount:I -Landroid/text/SpannableStringBuilder;->mSpanEnds:[I -Landroid/text/SpannableStringBuilder;->mSpanFlags:[I -Landroid/text/SpannableStringBuilder;->mSpanStarts:[I -Landroid/text/SpannableStringBuilder;->mSpans:[Ljava/lang/Object; -Landroid/text/SpannableStringInternal;-><init>(Ljava/lang/CharSequence;II)V -Landroid/text/SpannableStringInternal;->COLUMNS:I -Landroid/text/SpannableStringInternal;->EMPTY:[Ljava/lang/Object; -Landroid/text/SpannableStringInternal;->END:I -Landroid/text/SpannableStringInternal;->FLAGS:I -Landroid/text/SpannableStringInternal;->START:I -Landroid/text/SpannableStringInternal;->charAt(I)C -Landroid/text/SpannableStringInternal;->checkRange(Ljava/lang/String;II)V -Landroid/text/SpannableStringInternal;->copySpans(Landroid/text/SpannableStringInternal;II)V -Landroid/text/SpannableStringInternal;->copySpans(Landroid/text/Spanned;II)V -Landroid/text/SpannableStringInternal;->getChars(II[CI)V -Landroid/text/SpannableStringInternal;->getSpanEnd(Ljava/lang/Object;)I -Landroid/text/SpannableStringInternal;->getSpanFlags(Ljava/lang/Object;)I -Landroid/text/SpannableStringInternal;->getSpanStart(Ljava/lang/Object;)I -Landroid/text/SpannableStringInternal;->getSpans(IILjava/lang/Class;)[Ljava/lang/Object; -Landroid/text/SpannableStringInternal;->isIndexFollowsNextLine(I)Z -Landroid/text/SpannableStringInternal;->isOutOfCopyRange(IIII)Z -Landroid/text/SpannableStringInternal;->length()I -Landroid/text/SpannableStringInternal;->mSpanCount:I -Landroid/text/SpannableStringInternal;->mSpanData:[I -Landroid/text/SpannableStringInternal;->mSpans:[Ljava/lang/Object; -Landroid/text/SpannableStringInternal;->mText:Ljava/lang/String; -Landroid/text/SpannableStringInternal;->nextSpanTransition(IILjava/lang/Class;)I -Landroid/text/SpannableStringInternal;->region(II)Ljava/lang/String; -Landroid/text/SpannableStringInternal;->removeSpan(Ljava/lang/Object;)V -Landroid/text/SpannableStringInternal;->sendSpanAdded(Ljava/lang/Object;II)V -Landroid/text/SpannableStringInternal;->sendSpanChanged(Ljava/lang/Object;IIII)V -Landroid/text/SpannableStringInternal;->sendSpanRemoved(Ljava/lang/Object;II)V -Landroid/text/SpannableStringInternal;->setSpan(Ljava/lang/Object;III)V -Landroid/text/SpannableStringInternal;->setSpan(Ljava/lang/Object;IIIZ)V -Landroid/text/StaticLayout$LineBreaks;->ascents:[F -Landroid/text/StaticLayout$LineBreaks;->breaks:[I -Landroid/text/StaticLayout$LineBreaks;->descents:[F -Landroid/text/StaticLayout$LineBreaks;->flags:[I -Landroid/text/StaticLayout$LineBreaks;->widths:[F -Landroid/text/StaticLayout;-><init>(Ljava/lang/CharSequence;IILandroid/text/TextPaint;ILandroid/text/Layout$Alignment;Landroid/text/TextDirectionHeuristic;FFZLandroid/text/TextUtils$TruncateAt;II)V -Landroid/text/StaticLayout;->getHeight(Z)I -Landroid/text/StaticLayout;->mColumns:I -Landroid/text/StaticLayout;->mLineCount:I -Landroid/text/StaticLayout;->mLines:[I -Landroid/text/StaticLayout;->mMaximumVisibleLineCount:I -Landroid/text/TextLine;->mCharacterStyleSpanSet:Landroid/text/SpanSet; -Landroid/text/TextLine;->mMetricAffectingSpanSpanSet:Landroid/text/SpanSet; -Landroid/text/TextLine;->mReplacementSpanSpanSet:Landroid/text/SpanSet; -Landroid/text/TextLine;->mSpanned:Landroid/text/Spanned; -Landroid/text/TextLine;->mText:Ljava/lang/CharSequence; -Landroid/text/TextLine;->obtain()Landroid/text/TextLine; -Landroid/text/TextLine;->sCached:[Landroid/text/TextLine; -Landroid/text/TextPaint;->setUnderlineText(IF)V -Landroid/text/TextUtils$TruncateAt;->END_SMALL:Landroid/text/TextUtils$TruncateAt; -Landroid/text/TextUtils;->isPrintableAsciiOnly(Ljava/lang/CharSequence;)Z -Landroid/text/format/DateFormat;->AM_PM:C -Landroid/text/format/DateFormat;->CAPITAL_AM_PM:C -Landroid/text/format/DateFormat;->DATE:C -Landroid/text/format/DateFormat;->DAY:C -Landroid/text/format/DateFormat;->HOUR:C -Landroid/text/format/DateFormat;->HOUR_OF_DAY:C -Landroid/text/format/DateFormat;->MINUTE:C -Landroid/text/format/DateFormat;->MONTH:C -Landroid/text/format/DateFormat;->QUOTE:C -Landroid/text/format/DateFormat;->SECONDS:C -Landroid/text/format/DateFormat;->STANDALONE_MONTH:C -Landroid/text/format/DateFormat;->TIME_ZONE:C -Landroid/text/format/DateFormat;->YEAR:C -Landroid/text/method/LinkMovementMethod;->sInstance:Landroid/text/method/LinkMovementMethod; -Landroid/text/style/RasterizerSpan; -Landroid/text/style/RasterizerSpan;-><init>(Landroid/graphics/Rasterizer;)V -Landroid/text/style/RasterizerSpan;->getRasterizer()Landroid/graphics/Rasterizer; -Landroid/transition/ChangeBounds;->BOTTOM_RIGHT_ONLY_PROPERTY:Landroid/util/Property; -Landroid/transition/ChangeBounds;->POSITION_PROPERTY:Landroid/util/Property; -Landroid/transition/Scene;->mEnterAction:Ljava/lang/Runnable; -Landroid/transition/Scene;->mExitAction:Ljava/lang/Runnable; -Landroid/transition/Scene;->setCurrentScene(Landroid/view/View;Landroid/transition/Scene;)V -Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal; -Landroid/util/ArrayMap;->append(Ljava/lang/Object;Ljava/lang/Object;)V -Landroid/util/ArrayMap;->mBaseCacheSize:I -Landroid/util/ArrayMap;->mTwiceBaseCacheSize:I -Landroid/util/ArraySet;-><init>(Ljava/util/Collection;)V -Landroid/util/DisplayMetrics;->DENSITY_DEVICE:I -Landroid/util/DisplayMetrics;->noncompatHeightPixels:I -Landroid/util/DisplayMetrics;->noncompatWidthPixels:I -Landroid/util/EventLog$Event;-><init>([B)V -Landroid/util/FloatMath;->ceil(F)F -Landroid/util/FloatMath;->cos(F)F -Landroid/util/FloatMath;->exp(F)F -Landroid/util/FloatMath;->floor(F)F -Landroid/util/FloatMath;->hypot(FF)F -Landroid/util/FloatMath;->pow(FF)F -Landroid/util/FloatMath;->sin(F)F -Landroid/util/FloatMath;->sqrt(F)F -Landroid/util/IconDrawableFactory;->getBadgedIcon(Landroid/content/pm/PackageItemInfo;Landroid/content/pm/ApplicationInfo;I)Landroid/graphics/drawable/Drawable; -Landroid/util/IconDrawableFactory;->newInstance(Landroid/content/Context;)Landroid/util/IconDrawableFactory; -Landroid/util/LocalLog$ReadOnlyLocalLog;->dump(Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V -Landroid/util/LocalLog;-><init>(I)V -Landroid/util/LocalLog;->log(Ljava/lang/String;)V -Landroid/util/LocalLog;->readOnlyLocalLog()Landroid/util/LocalLog$ReadOnlyLocalLog; -Landroid/util/Log;->wtf(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ZZ)I -Landroid/util/LongArray;-><init>()V -Landroid/util/LongArray;->add(IJ)V -Landroid/util/LongArray;->get(I)J -Landroid/util/LongArray;->size()I -Landroid/util/LongSparseLongArray;->mKeys:[J -Landroid/util/LongSparseLongArray;->mSize:I -Landroid/util/LongSparseLongArray;->mValues:[J -Landroid/util/MalformedJsonException;->serialVersionUID:J -Landroid/util/MathUtils;->constrain(III)I -Landroid/util/NtpTrustedTime;->forceRefresh()Z -Landroid/util/NtpTrustedTime;->getCachedNtpTime()J -Landroid/util/NtpTrustedTime;->getCachedNtpTimeReference()J -Landroid/util/NtpTrustedTime;->getInstance(Landroid/content/Context;)Landroid/util/NtpTrustedTime; -Landroid/util/NtpTrustedTime;->hasCache()Z -Landroid/util/PathParser;->createPathFromPathData(Ljava/lang/String;)Landroid/graphics/Path; -Landroid/util/Pools$SimplePool;->mPool:[Ljava/lang/Object; -Landroid/util/Pools$SynchronizedPool;-><init>(I)V -Landroid/util/Pools$SynchronizedPool;->acquire()Ljava/lang/Object; -Landroid/util/Pools$SynchronizedPool;->release(Ljava/lang/Object;)Z -Landroid/util/Rational;->mDenominator:I -Landroid/util/Rational;->mNumerator:I -Landroid/util/Rational;->readObject(Ljava/io/ObjectInputStream;)V -Landroid/util/Rational;->serialVersionUID:J -Landroid/util/RecurrenceRule;->buildRecurringMonthly(ILjava/time/ZoneId;)Landroid/util/RecurrenceRule; -Landroid/util/RecurrenceRule;->start:Ljava/time/ZonedDateTime; -Landroid/util/Singleton;-><init>()V -Landroid/util/Singleton;->get()Ljava/lang/Object; -Landroid/util/Singleton;->mInstance:Ljava/lang/Object; -Landroid/util/Slog;->d(Ljava/lang/String;Ljava/lang/String;)I -Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;)I -Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I -Landroid/util/Slog;->println(ILjava/lang/String;Ljava/lang/String;)I -Landroid/util/Slog;->w(Ljava/lang/String;Ljava/lang/String;)I -Landroid/util/Slog;->wtf(Ljava/lang/String;Ljava/lang/String;)I -Landroid/util/SparseIntArray;->mKeys:[I -Landroid/util/SparseIntArray;->mSize:I -Landroid/util/SparseIntArray;->mValues:[I -Landroid/util/apk/SignatureNotFoundException;->serialVersionUID:J -Landroid/view/AppTransitionAnimationSpec;-><init>(ILandroid/graphics/GraphicBuffer;Landroid/graphics/Rect;)V -Landroid/view/BatchedInputEventReceiver;-><init>(Landroid/view/InputChannel;Landroid/os/Looper;Landroid/view/Choreographer;)V -Landroid/view/Choreographer$CallbackQueue;->addCallbackLocked(JLjava/lang/Object;Ljava/lang/Object;)V -Landroid/view/Choreographer;->USE_VSYNC:Z -Landroid/view/Choreographer;->doFrame(JI)V -Landroid/view/Choreographer;->getFrameTime()J -Landroid/view/Choreographer;->getSfInstance()Landroid/view/Choreographer; -Landroid/view/Choreographer;->mCallbackQueues:[Landroid/view/Choreographer$CallbackQueue; -Landroid/view/Choreographer;->mFrameIntervalNanos:J -Landroid/view/Choreographer;->mLastFrameTimeNanos:J -Landroid/view/Choreographer;->mLock:Ljava/lang/Object; -Landroid/view/Choreographer;->scheduleVsyncLocked()V -Landroid/view/ContextThemeWrapper;->getThemeResId()I -Landroid/view/ContextThemeWrapper;->initializeTheme()V -Landroid/view/ContextThemeWrapper;->mInflater:Landroid/view/LayoutInflater; -Landroid/view/ContextThemeWrapper;->mResources:Landroid/content/res/Resources; -Landroid/view/ContextThemeWrapper;->mTheme:Landroid/content/res/Resources$Theme; -Landroid/view/ContextThemeWrapper;->mThemeResource:I -Landroid/view/Display$HdrCapabilities;-><init>([IFFF)V -Landroid/view/Display;->getDisplayAdjustments()Landroid/view/DisplayAdjustments; -Landroid/view/DisplayAdjustments;->getConfiguration()Landroid/content/res/Configuration; -Landroid/view/DisplayAdjustments;->setCompatibilityInfo(Landroid/content/res/CompatibilityInfo;)V -Landroid/view/DisplayEventReceiver;->dispatchHotplug(JIZ)V -Landroid/view/DisplayEventReceiver;->dispatchVsync(JII)V -Landroid/view/DisplayListCanvas;->callDrawGLFunction2(J)V -Landroid/view/DisplayListCanvas;->drawGLFunctor2(JLjava/lang/Runnable;)V -Landroid/view/DisplayListCanvas;->drawRenderNode(Landroid/view/RenderNode;)V -Landroid/view/FrameMetrics;->mTimingData:[J -Landroid/view/FrameMetricsObserver;->mFrameMetrics:Landroid/view/FrameMetrics; -Landroid/view/FrameMetricsObserver;->mMessageQueue:Landroid/os/MessageQueue; -Landroid/view/FrameMetricsObserver;->notifyDataAvailable(I)V -Landroid/view/GestureDetector;->mMinimumFlingVelocity:I -Landroid/view/GestureDetector;->mTouchSlopSquare:I -Landroid/view/GhostView;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroid/view/GhostView; -Landroid/view/GhostView;->removeGhost(Landroid/view/View;)V -Landroid/view/IAppTransitionAnimationSpecsFuture$Stub;-><init>()V -Landroid/view/IGraphicsStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/view/IGraphicsStats$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IGraphicsStats; -Landroid/view/IRecentsAnimationController;->finish(Z)V -Landroid/view/IRecentsAnimationController;->screenshotTask(I)Landroid/app/ActivityManager$TaskSnapshot; -Landroid/view/IRecentsAnimationController;->setAnimationTargetsBehindSystemBars(Z)V -Landroid/view/IRecentsAnimationController;->setInputConsumerEnabled(Z)V -Landroid/view/IRecentsAnimationRunner$Stub;-><init>()V -Landroid/view/IRecentsAnimationRunner;->onAnimationCanceled()V -Landroid/view/IRecentsAnimationRunner;->onAnimationStart(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;)V -Landroid/view/IRecentsAnimationRunner;->onAnimationStart_New(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;Landroid/graphics/Rect;Landroid/graphics/Rect;)V -Landroid/view/IRemoteAnimationFinishedCallback;->onAnimationFinished()V -Landroid/view/IRemoteAnimationRunner$Stub;-><init>()V -Landroid/view/IRemoteAnimationRunner;->onAnimationCancelled()V -Landroid/view/IRemoteAnimationRunner;->onAnimationStart([Landroid/view/RemoteAnimationTarget;Landroid/view/IRemoteAnimationFinishedCallback;)V -Landroid/view/IWindowManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/view/IWindowManager$Stub$Proxy;->getBaseDisplayDensity(I)I -Landroid/view/IWindowManager$Stub$Proxy;->getDockedStackSide()I -Landroid/view/IWindowManager$Stub$Proxy;->getInitialDisplayDensity(I)I -Landroid/view/IWindowManager$Stub$Proxy;->hasNavigationBar()Z -Landroid/view/IWindowManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/IWindowManager; -Landroid/view/IWindowManager;->createInputConsumer(Landroid/os/IBinder;Ljava/lang/String;Landroid/view/InputChannel;)V -Landroid/view/IWindowManager;->destroyInputConsumer(Ljava/lang/String;)Z -Landroid/view/IWindowManager;->endProlongedAnimations()V -Landroid/view/IWindowManager;->getAnimationScale(I)F -Landroid/view/IWindowManager;->getStableInsets(ILandroid/graphics/Rect;)V -Landroid/view/IWindowManager;->hasNavigationBar()Z -Landroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z)V -Landroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;)V -Landroid/view/IWindowManager;->setAnimationScale(IF)V -Landroid/view/IWindowManager;->setNavBarVirtualKeyHapticFeedbackEnabled(Z)V -Landroid/view/IWindowManager;->setShelfHeight(ZI)V -Landroid/view/IWindowManager;->setStrictModeVisualIndicatorPreference(Ljava/lang/String;)V -Landroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I -Landroid/view/InputChannel;-><init>()V -Landroid/view/InputChannel;->mPtr:J -Landroid/view/InputDevice;-><init>(IIILjava/lang/String;IILjava/lang/String;ZIILandroid/view/KeyCharacterMap;ZZZ)V -Landroid/view/InputDevice;->addMotionRange(IIFFFFF)V -Landroid/view/InputDevice;->isExternal()Z -Landroid/view/InputEvent;->getSequenceNumber()I -Landroid/view/InputEventReceiver;->dispatchBatchedInputEventPending()V -Landroid/view/InputEventReceiver;->dispatchInputEvent(ILandroid/view/InputEvent;I)V -Landroid/view/InputEventReceiver;->onInputEvent(Landroid/view/InputEvent;I)V -Landroid/view/InputEventSender;->dispatchInputEventFinished(IZ)V -Landroid/view/InputQueue;->finishInputEvent(JZ)V -Landroid/view/KeyCharacterMap$FallbackAction;->keyCode:I -Landroid/view/KeyCharacterMap$FallbackAction;->metaState:I -Landroid/view/KeyCharacterMap;-><init>(J)V -Landroid/view/KeyEvent;->isConfirmKey(I)Z -Landroid/view/KeyEvent;->mAction:I -Landroid/view/KeyEvent;->mCharacters:Ljava/lang/String; -Landroid/view/KeyEvent;->mDeviceId:I -Landroid/view/KeyEvent;->mDownTime:J -Landroid/view/KeyEvent;->mEventTime:J -Landroid/view/KeyEvent;->mFlags:I -Landroid/view/KeyEvent;->mKeyCode:I -Landroid/view/KeyEvent;->mMetaState:I -Landroid/view/KeyEvent;->mRepeatCount:I -Landroid/view/KeyEvent;->mScanCode:I -Landroid/view/KeyEvent;->mSource:I -Landroid/view/KeyEvent;->obtain(JJIIIIIIIILjava/lang/String;)Landroid/view/KeyEvent; -Landroid/view/KeyEvent;->recycle()V -Landroid/view/LayoutInflater;->createViewFromTag(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View; -Landroid/view/LayoutInflater;->createViewFromTag(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;Z)Landroid/view/View; -Landroid/view/LayoutInflater;->mConstructorArgs:[Ljava/lang/Object; -Landroid/view/LayoutInflater;->mContext:Landroid/content/Context; -Landroid/view/LayoutInflater;->mFactory2:Landroid/view/LayoutInflater$Factory2; -Landroid/view/LayoutInflater;->mFactory:Landroid/view/LayoutInflater$Factory; -Landroid/view/LayoutInflater;->mFactorySet:Z -Landroid/view/LayoutInflater;->mPrivateFactory:Landroid/view/LayoutInflater$Factory2; -Landroid/view/LayoutInflater;->sConstructorMap:Ljava/util/HashMap; -Landroid/view/LayoutInflater;->setPrivateFactory(Landroid/view/LayoutInflater$Factory2;)V -Landroid/view/MotionEvent$PointerCoords;->mPackedAxisBits:J -Landroid/view/MotionEvent$PointerCoords;->mPackedAxisValues:[F -Landroid/view/MotionEvent;->HISTORY_CURRENT:I -Landroid/view/MotionEvent;->getPointerIdBits()I -Landroid/view/MotionEvent;->mNativePtr:J -Landroid/view/MotionEvent;->nativeGetRawAxisValue(JIII)F -Landroid/view/MotionEvent;->obtain()Landroid/view/MotionEvent; -Landroid/view/MotionEvent;->scale(F)V -Landroid/view/MotionEvent;->split(I)Landroid/view/MotionEvent; -Landroid/view/PointerIcon;->load(Landroid/content/Context;)Landroid/view/PointerIcon; -Landroid/view/PointerIcon;->mBitmap:Landroid/graphics/Bitmap; -Landroid/view/PointerIcon;->mBitmapFrames:[Landroid/graphics/Bitmap; -Landroid/view/PointerIcon;->mDurationPerFrame:I -Landroid/view/PointerIcon;->mHotSpotX:F -Landroid/view/PointerIcon;->mHotSpotY:F -Landroid/view/PointerIcon;->mType:I -Landroid/view/RemoteAnimationAdapter;-><init>(Landroid/view/IRemoteAnimationRunner;JJ)V -Landroid/view/RemoteAnimationDefinition;-><init>()V -Landroid/view/RemoteAnimationDefinition;->addRemoteAnimation(IILandroid/view/RemoteAnimationAdapter;)V -Landroid/view/RemoteAnimationDefinition;->addRemoteAnimation(ILandroid/view/RemoteAnimationAdapter;)V -Landroid/view/RemoteAnimationTarget;->clipRect:Landroid/graphics/Rect; -Landroid/view/RemoteAnimationTarget;->contentInsets:Landroid/graphics/Rect; -Landroid/view/RemoteAnimationTarget;->isNotInRecents:Z -Landroid/view/RemoteAnimationTarget;->isTranslucent:Z -Landroid/view/RemoteAnimationTarget;->leash:Landroid/view/SurfaceControl; -Landroid/view/RemoteAnimationTarget;->mode:I -Landroid/view/RemoteAnimationTarget;->position:Landroid/graphics/Point; -Landroid/view/RemoteAnimationTarget;->prefixOrderIndex:I -Landroid/view/RemoteAnimationTarget;->sourceContainerBounds:Landroid/graphics/Rect; -Landroid/view/RemoteAnimationTarget;->taskId:I -Landroid/view/RemoteAnimationTarget;->windowConfiguration:Landroid/app/WindowConfiguration; -Landroid/view/RenderNode;->create(Ljava/lang/String;Landroid/view/View;)Landroid/view/RenderNode; -Landroid/view/RenderNode;->discardDisplayList()V -Landroid/view/RenderNode;->end(Landroid/view/DisplayListCanvas;)V -Landroid/view/RenderNode;->isValid()Z -Landroid/view/RenderNode;->output()V -Landroid/view/RenderNode;->setClipToBounds(Z)Z -Landroid/view/RenderNode;->setLeftTopRightBottom(IIII)Z -Landroid/view/RenderNode;->start(II)Landroid/view/DisplayListCanvas; -Landroid/view/RenderNodeAnimator;-><init>(IF)V -Landroid/view/RenderNodeAnimator;->callOnFinished(Landroid/view/RenderNodeAnimator;)V -Landroid/view/RenderNodeAnimator;->mapViewPropertyToRenderProperty(I)I -Landroid/view/RenderNodeAnimator;->setTarget(Landroid/view/View;)V -Landroid/view/ScaleGestureDetector;->mListener:Landroid/view/ScaleGestureDetector$OnScaleGestureListener; -Landroid/view/ScaleGestureDetector;->mMinSpan:I -Landroid/view/Surface;-><init>(J)V -Landroid/view/Surface;->getNextFrameNumber()J -Landroid/view/Surface;->mLock:Ljava/lang/Object; -Landroid/view/Surface;->mNativeObject:J -Landroid/view/Surface;->transferFrom(Landroid/view/Surface;)V -Landroid/view/SurfaceControl$PhysicalDisplayInfo;-><init>()V -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->appVsyncOffsetNanos:J -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->density:F -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->height:I -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->presentationDeadlineNanos:J -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->refreshRate:F -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->secure:Z -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->width:I -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->xDpi:F -Landroid/view/SurfaceControl$PhysicalDisplayInfo;->yDpi:F -Landroid/view/SurfaceControl$Transaction;-><init>()V -Landroid/view/SurfaceControl$Transaction;->apply()V -Landroid/view/SurfaceControl$Transaction;->deferTransactionUntil(Landroid/view/SurfaceControl;Landroid/os/IBinder;J)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->deferTransactionUntilSurface(Landroid/view/SurfaceControl;Landroid/view/Surface;J)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->hide(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setAlpha(Landroid/view/SurfaceControl;F)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setColor(Landroid/view/SurfaceControl;[F)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setFinalCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setLayer(Landroid/view/SurfaceControl;I)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;FFFF)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;Landroid/graphics/Matrix;[F)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setPosition(Landroid/view/SurfaceControl;FF)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setSize(Landroid/view/SurfaceControl;II)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->setWindowCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceControl$Transaction;->show(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction; -Landroid/view/SurfaceSession;->mNativeClient:J -Landroid/view/SurfaceView;->isFixedSize()Z -Landroid/view/SurfaceView;->mCallbacks:Ljava/util/ArrayList; -Landroid/view/SurfaceView;->mFormat:I -Landroid/view/SurfaceView;->mRequestedFormat:I -Landroid/view/SurfaceView;->mSurfaceHolder:Landroid/view/SurfaceHolder; -Landroid/view/SurfaceView;->setFrame(IIII)Z -Landroid/view/SurfaceView;->surfacePositionLost_uiRtSync(J)V -Landroid/view/SurfaceView;->updateSurfacePosition_renderWorker(JIIII)V -Landroid/view/TextureView;->destroyHardwareLayer()V -Landroid/view/TextureView;->destroyHardwareResources()V -Landroid/view/TextureView;->mLayer:Landroid/view/TextureLayer; -Landroid/view/TextureView;->mNativeWindow:J -Landroid/view/TextureView;->mSurface:Landroid/graphics/SurfaceTexture; -Landroid/view/TextureView;->mUpdateListener:Landroid/graphics/SurfaceTexture$OnFrameAvailableListener; -Landroid/view/ThreadedRenderer;->createHardwareBitmap(Landroid/view/RenderNode;II)Landroid/graphics/Bitmap; -Landroid/view/ThreadedRenderer;->setupDiskCache(Ljava/io/File;)V -Landroid/view/TouchDelegate;->mDelegateTargeted:Z -Landroid/view/VelocityTracker$Estimator;->confidence:F -Landroid/view/VelocityTracker$Estimator;->degree:I -Landroid/view/VelocityTracker$Estimator;->xCoeff:[F -Landroid/view/VelocityTracker$Estimator;->yCoeff:[F -Landroid/view/VelocityTracker;->obtain(Ljava/lang/String;)Landroid/view/VelocityTracker; -Landroid/view/View$AttachInfo;->mContentInsets:Landroid/graphics/Rect; -Landroid/view/View$AttachInfo;->mDrawingTime:J -Landroid/view/View$AttachInfo;->mStableInsets:Landroid/graphics/Rect; -Landroid/view/View$ListenerInfo;-><init>()V -Landroid/view/View$ListenerInfo;->mOnClickListener:Landroid/view/View$OnClickListener; -Landroid/view/View$ListenerInfo;->mOnDragListener:Landroid/view/View$OnDragListener; -Landroid/view/View$ListenerInfo;->mOnFocusChangeListener:Landroid/view/View$OnFocusChangeListener; -Landroid/view/View$ListenerInfo;->mOnLongClickListener:Landroid/view/View$OnLongClickListener; -Landroid/view/View$ListenerInfo;->mOnTouchListener:Landroid/view/View$OnTouchListener; -Landroid/view/View$ScrollabilityCache;->scrollBar:Landroid/widget/ScrollBarDrawable; -Landroid/view/View;->STATUS_BAR_DISABLE_BACK:I -Landroid/view/View;->STATUS_BAR_DISABLE_EXPAND:I -Landroid/view/View;->STATUS_BAR_DISABLE_HOME:I -Landroid/view/View;->STATUS_BAR_DISABLE_RECENT:I -Landroid/view/View;->applyDrawableToTransparentRegion(Landroid/graphics/drawable/Drawable;Landroid/graphics/Region;)V -Landroid/view/View;->clearAccessibilityFocus()V -Landroid/view/View;->computeFitSystemWindows(Landroid/graphics/Rect;Landroid/graphics/Rect;)Z -Landroid/view/View;->computeOpaqueFlags()V -Landroid/view/View;->createSnapshot(Landroid/view/ViewDebug$CanvasProvider;Z)Landroid/graphics/Bitmap; -Landroid/view/View;->dispatchAttachedToWindow(Landroid/view/View$AttachInfo;I)V -Landroid/view/View;->dispatchDetachedFromWindow()V -Landroid/view/View;->fitsSystemWindows()Z -Landroid/view/View;->getAccessibilityDelegate()Landroid/view/View$AccessibilityDelegate; -Landroid/view/View;->getAccessibilityViewId()I -Landroid/view/View;->getBoundsOnScreen(Landroid/graphics/Rect;)V -Landroid/view/View;->getHorizontalScrollFactor()F -Landroid/view/View;->getInverseMatrix()Landroid/graphics/Matrix; -Landroid/view/View;->getListenerInfo()Landroid/view/View$ListenerInfo; -Landroid/view/View;->getLocationOnScreen()[I -Landroid/view/View;->getRawTextAlignment()I -Landroid/view/View;->getRawTextDirection()I -Landroid/view/View;->getTransitionAlpha()F -Landroid/view/View;->getVerticalScrollFactor()F -Landroid/view/View;->getViewRootImpl()Landroid/view/ViewRootImpl; -Landroid/view/View;->getWindowDisplayFrame(Landroid/graphics/Rect;)V -Landroid/view/View;->hideTooltip()V -Landroid/view/View;->includeForAccessibility()Z -Landroid/view/View;->initializeFadingEdge(Landroid/content/res/TypedArray;)V -Landroid/view/View;->initializeScrollbars(Landroid/content/res/TypedArray;)V -Landroid/view/View;->internalSetPadding(IIII)V -Landroid/view/View;->invalidateParentIfNeeded()V -Landroid/view/View;->isPaddingResolved()Z -Landroid/view/View;->isRootNamespace()Z -Landroid/view/View;->isVisibleToUser()Z -Landroid/view/View;->isVisibleToUser(Landroid/graphics/Rect;)Z -Landroid/view/View;->mAccessibilityDelegate:Landroid/view/View$AccessibilityDelegate; -Landroid/view/View;->mAttachInfo:Landroid/view/View$AttachInfo; -Landroid/view/View;->mBackground:Landroid/graphics/drawable/Drawable; -Landroid/view/View;->mBottom:I -Landroid/view/View;->mContext:Landroid/content/Context; -Landroid/view/View;->mDrawingCache:Landroid/graphics/Bitmap; -Landroid/view/View;->mLayoutParams:Landroid/view/ViewGroup$LayoutParams; -Landroid/view/View;->mLeft:I -Landroid/view/View;->mListenerInfo:Landroid/view/View$ListenerInfo; -Landroid/view/View;->mMinHeight:I -Landroid/view/View;->mMinWidth:I -Landroid/view/View;->mPaddingBottom:I -Landroid/view/View;->mPaddingLeft:I -Landroid/view/View;->mPaddingRight:I -Landroid/view/View;->mPaddingTop:I -Landroid/view/View;->mParent:Landroid/view/ViewParent; -Landroid/view/View;->mPrivateFlags2:I -Landroid/view/View;->mPrivateFlags3:I -Landroid/view/View;->mPrivateFlags:I -Landroid/view/View;->mRecreateDisplayList:Z -Landroid/view/View;->mResources:Landroid/content/res/Resources; -Landroid/view/View;->mRight:I -Landroid/view/View;->mScrollCache:Landroid/view/View$ScrollabilityCache; -Landroid/view/View;->mScrollX:I -Landroid/view/View;->mScrollY:I -Landroid/view/View;->mStartActivityRequestWho:Ljava/lang/String; -Landroid/view/View;->mTag:Ljava/lang/Object; -Landroid/view/View;->mTop:I -Landroid/view/View;->mUnscaledDrawingCache:Landroid/graphics/Bitmap; -Landroid/view/View;->mViewFlags:I -Landroid/view/View;->notifySubtreeAccessibilityStateChangedIfNeeded()V -Landroid/view/View;->onDrawVerticalScrollBar(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIII)V -Landroid/view/View;->performAccessibilityActionInternal(ILandroid/os/Bundle;)Z -Landroid/view/View;->recomputePadding()V -Landroid/view/View;->requestAccessibilityFocus()Z -Landroid/view/View;->resetDisplayList()V -Landroid/view/View;->resetPaddingToInitialValues()V -Landroid/view/View;->resetResolvedDrawables()V -Landroid/view/View;->resetResolvedLayoutDirection()V -Landroid/view/View;->resetResolvedPadding()V -Landroid/view/View;->resetResolvedTextAlignment()V -Landroid/view/View;->resetResolvedTextDirection()V -Landroid/view/View;->resetRtlProperties()V -Landroid/view/View;->setAlphaNoInvalidation(F)Z -Landroid/view/View;->setAnimationMatrix(Landroid/graphics/Matrix;)V -Landroid/view/View;->setAssistBlocked(Z)V -Landroid/view/View;->setFrame(IIII)Z -Landroid/view/View;->setIsRootNamespace(Z)V -Landroid/view/View;->setLeftTopRightBottom(IIII)V -Landroid/view/View;->setTooltip(Ljava/lang/CharSequence;)V -Landroid/view/View;->setTransitionAlpha(F)V -Landroid/view/View;->startActivityForResult(Landroid/content/Intent;I)V -Landroid/view/View;->toGlobalMotionEvent(Landroid/view/MotionEvent;)Z -Landroid/view/View;->toLocalMotionEvent(Landroid/view/MotionEvent;)Z -Landroid/view/View;->transformMatrixToGlobal(Landroid/graphics/Matrix;)V -Landroid/view/View;->transformMatrixToLocal(Landroid/graphics/Matrix;)V -Landroid/view/ViewConfiguration;->getDeviceGlobalActionKeyTimeout()J -Landroid/view/ViewConfiguration;->getDoubleTapMinTime()I -Landroid/view/ViewConfiguration;->getScaledScrollFactor()I -Landroid/view/ViewConfiguration;->mFadingMarqueeEnabled:Z -Landroid/view/ViewConfiguration;->sHasPermanentMenuKey:Z -Landroid/view/ViewConfiguration;->sHasPermanentMenuKeySet:Z -Landroid/view/ViewDebug;->dispatchCommand(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;Ljava/io/OutputStream;)V -Landroid/view/ViewDebug;->dump(Landroid/view/View;ZZLjava/io/OutputStream;)V -Landroid/view/ViewGroup$MarginLayoutParams;->endMargin:I -Landroid/view/ViewGroup$MarginLayoutParams;->startMargin:I -Landroid/view/ViewGroup;->FLAG_SUPPORT_STATIC_TRANSFORMATIONS:I -Landroid/view/ViewGroup;->FLAG_USE_CHILD_DRAWING_ORDER:I -Landroid/view/ViewGroup;->dispatchViewAdded(Landroid/view/View;)V -Landroid/view/ViewGroup;->dispatchViewRemoved(Landroid/view/View;)V -Landroid/view/ViewGroup;->mChildren:[Landroid/view/View; -Landroid/view/ViewGroup;->mChildrenCount:I -Landroid/view/ViewGroup;->mFirstTouchTarget:Landroid/view/ViewGroup$TouchTarget; -Landroid/view/ViewGroup;->mGroupFlags:I -Landroid/view/ViewGroup;->mOnHierarchyChangeListener:Landroid/view/ViewGroup$OnHierarchyChangeListener; -Landroid/view/ViewGroup;->mPersistentDrawingCache:I -Landroid/view/ViewGroup;->makeOptionalFitsSystemWindows()V -Landroid/view/ViewGroup;->offsetChildrenTopAndBottom(I)V -Landroid/view/ViewGroup;->onChildVisibilityChanged(Landroid/view/View;II)V -Landroid/view/ViewGroup;->resetResolvedDrawables()V -Landroid/view/ViewGroup;->resetResolvedLayoutDirection()V -Landroid/view/ViewGroup;->resetResolvedPadding()V -Landroid/view/ViewGroup;->resetResolvedTextAlignment()V -Landroid/view/ViewGroup;->resetResolvedTextDirection()V -Landroid/view/ViewGroup;->suppressLayout(Z)V -Landroid/view/ViewRootImpl;->detachFunctor(J)V -Landroid/view/ViewRootImpl;->dispatchInputEvent(Landroid/view/InputEvent;)V -Landroid/view/ViewRootImpl;->dispatchInputEvent(Landroid/view/InputEvent;Landroid/view/InputEventReceiver;)V -Landroid/view/ViewRootImpl;->enqueueInputEvent(Landroid/view/InputEvent;)V -Landroid/view/ViewRootImpl;->getWindowFlags()I -Landroid/view/ViewRootImpl;->invokeFunctor(JZ)V -Landroid/view/ViewRootImpl;->mStopped:Z -Landroid/view/ViewRootImpl;->mSurface:Landroid/view/Surface; -Landroid/view/ViewRootImpl;->mView:Landroid/view/View; -Landroid/view/ViewTreeObserver$InternalInsetsInfo;->TOUCHABLE_INSETS_REGION:I -Landroid/view/ViewTreeObserver$InternalInsetsInfo;->setTouchableInsets(I)V -Landroid/view/ViewTreeObserver$InternalInsetsInfo;->touchableRegion:Landroid/graphics/Region; -Landroid/view/ViewTreeObserver;->addOnComputeInternalInsetsListener(Landroid/view/ViewTreeObserver$OnComputeInternalInsetsListener;)V -Landroid/view/ViewTreeObserver;->removeOnComputeInternalInsetsListener(Landroid/view/ViewTreeObserver$OnComputeInternalInsetsListener;)V -Landroid/view/Window;->mAppName:Ljava/lang/String; -Landroid/view/Window;->mAppToken:Landroid/os/IBinder; -Landroid/view/Window;->mCallback:Landroid/view/Window$Callback; -Landroid/view/Window;->mContext:Landroid/content/Context; -Landroid/view/Window;->mHardwareAccelerated:Z -Landroid/view/Window;->mWindowStyle:Landroid/content/res/TypedArray; -Landroid/view/Window;->setNeedsMenuKey(I)V -Landroid/view/WindowAnimationFrameStats;->init(J[J)V -Landroid/view/WindowContentFrameStats;->init(J[J[J[J)V -Landroid/view/WindowManager$LayoutParams;->NEEDS_MENU_SET_FALSE:I -Landroid/view/WindowManager$LayoutParams;->NEEDS_MENU_SET_TRUE:I -Landroid/view/WindowManager$LayoutParams;->TYPE_KEYGUARD:I -Landroid/view/WindowManager$LayoutParams;->hideTimeoutMilliseconds:J -Landroid/view/WindowManager$LayoutParams;->needsMenuKey:I -Landroid/view/WindowManager$LayoutParams;->userActivityTimeout:J -Landroid/view/WindowManagerGlobal;->getInstance()Landroid/view/WindowManagerGlobal; -Landroid/view/WindowManagerGlobal;->getRootView(Ljava/lang/String;)Landroid/view/View; -Landroid/view/WindowManagerGlobal;->getViewRootNames()[Ljava/lang/String; -Landroid/view/WindowManagerGlobal;->getWindowManagerService()Landroid/view/IWindowManager; -Landroid/view/WindowManagerGlobal;->initialize()V -Landroid/view/WindowManagerGlobal;->mLock:Ljava/lang/Object; -Landroid/view/WindowManagerGlobal;->mParams:Ljava/util/ArrayList; -Landroid/view/WindowManagerGlobal;->mRoots:Ljava/util/ArrayList; -Landroid/view/WindowManagerGlobal;->mViews:Ljava/util/ArrayList; -Landroid/view/WindowManagerGlobal;->sDefaultWindowManager:Landroid/view/WindowManagerGlobal; -Landroid/view/WindowManagerGlobal;->sWindowManagerService:Landroid/view/IWindowManager; -Landroid/view/WindowManagerGlobal;->sWindowSession:Landroid/view/IWindowSession; -Landroid/view/WindowManagerGlobal;->trimMemory(I)V -Landroid/view/WindowManagerImpl;->mGlobal:Landroid/view/WindowManagerGlobal; -Landroid/view/accessibility/AccessibilityInteractionClient;->clearCache()V -Landroid/view/accessibility/AccessibilityInteractionClient;->getInstance()Landroid/view/accessibility/AccessibilityInteractionClient; -Landroid/view/accessibility/AccessibilityManager;->getInstance(Landroid/content/Context;)Landroid/view/accessibility/AccessibilityManager; -Landroid/view/accessibility/AccessibilityManager;->isHighTextContrastEnabled()Z -Landroid/view/accessibility/AccessibilityManager;->mAccessibilityStateChangeListeners:Landroid/util/ArrayMap; -Landroid/view/accessibility/AccessibilityManager;->mIsEnabled:Z -Landroid/view/accessibility/AccessibilityManager;->mIsHighTextContrastEnabled:Z -Landroid/view/accessibility/AccessibilityManager;->sInstance:Landroid/view/accessibility/AccessibilityManager; -Landroid/view/accessibility/AccessibilityManager;->sInstanceSync:Ljava/lang/Object; -Landroid/view/accessibility/AccessibilityNodeInfo;->isSealed()Z -Landroid/view/accessibility/AccessibilityNodeInfo;->mChildNodeIds:Landroid/util/LongArray; -Landroid/view/accessibility/AccessibilityNodeInfo;->mSealed:Z -Landroid/view/accessibility/AccessibilityNodeInfo;->refresh(Landroid/os/Bundle;Z)Z -Landroid/view/accessibility/AccessibilityNodeInfo;->setSealed(Z)V -Landroid/view/accessibility/AccessibilityRecord;->getSourceNodeId()J -Landroid/view/accessibility/IAccessibilityManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/view/accessibility/IAccessibilityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/accessibility/IAccessibilityManager; -Landroid/view/accessibility/IAccessibilityManager;->getEnabledAccessibilityServiceList(II)Ljava/util/List; -Landroid/view/animation/Animation;->detach()V -Landroid/view/animation/Animation;->initializeInvalidateRegion(IIII)V -Landroid/view/animation/Animation;->mListener:Landroid/view/animation/Animation$AnimationListener; -Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/view/inputmethod/InputMethodInfo;->mSubtypes:Landroid/view/inputmethod/InputMethodSubtypeArray; -Landroid/view/inputmethod/InputMethodManager;->finishInputLocked()V -Landroid/view/inputmethod/InputMethodManager;->focusIn(Landroid/view/View;)V -Landroid/view/inputmethod/InputMethodManager;->focusOut(Landroid/view/View;)V -Landroid/view/inputmethod/InputMethodManager;->getClient()Lcom/android/internal/view/IInputMethodClient; -Landroid/view/inputmethod/InputMethodManager;->getInputMethodWindowVisibleHeight()I -Landroid/view/inputmethod/InputMethodManager;->getInstance()Landroid/view/inputmethod/InputMethodManager; -Landroid/view/inputmethod/InputMethodManager;->mCurId:Ljava/lang/String; -Landroid/view/inputmethod/InputMethodManager;->mCurRootView:Landroid/view/View; -Landroid/view/inputmethod/InputMethodManager;->mH:Landroid/view/inputmethod/InputMethodManager$H; -Landroid/view/inputmethod/InputMethodManager;->mNextServedView:Landroid/view/View; -Landroid/view/inputmethod/InputMethodManager;->mServedInputConnectionWrapper:Landroid/view/inputmethod/InputMethodManager$ControlledInputConnectionWrapper; -Landroid/view/inputmethod/InputMethodManager;->mServedView:Landroid/view/View; -Landroid/view/inputmethod/InputMethodManager;->mService:Lcom/android/internal/view/IInputMethodManager; -Landroid/view/inputmethod/InputMethodManager;->notifyUserAction()V -Landroid/view/inputmethod/InputMethodManager;->peekInstance()Landroid/view/inputmethod/InputMethodManager; -Landroid/view/inputmethod/InputMethodManager;->sInstance:Landroid/view/inputmethod/InputMethodManager; -Landroid/view/inputmethod/InputMethodManager;->showSoftInputUnchecked(ILandroid/os/ResultReceiver;)V -Landroid/view/inputmethod/InputMethodManager;->windowDismissed(Landroid/os/IBinder;)V -Landroid/view/inputmethod/InputMethodSubtypeArray;-><init>(Ljava/util/List;)V -Landroid/view/textclassifier/TextClassificationManager;->getTextClassifier(I)Landroid/view/textclassifier/TextClassifier; -Landroid/view/textclassifier/TextClassifier;->classifyText(Ljava/lang/CharSequence;IILandroid/view/textclassifier/TextClassification$Options;)Landroid/view/textclassifier/TextClassification; -Landroid/view/textclassifier/TextClassifier;->generateLinks(Ljava/lang/CharSequence;Landroid/view/textclassifier/TextLinks$Options;)Landroid/view/textclassifier/TextLinks; -Landroid/view/textclassifier/TextClassifier;->suggestSelection(Ljava/lang/CharSequence;IILandroid/view/textclassifier/TextSelection$Options;)Landroid/view/textclassifier/TextSelection; -Landroid/view/textclassifier/TextLinks$Options;-><init>()V -Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionAction(III)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent; -Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionAction(IIILandroid/view/textclassifier/TextClassification;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent; -Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(II)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent; -Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(IILandroid/view/textclassifier/TextClassification;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent; -Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionModified(IILandroid/view/textclassifier/TextSelection;)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent; -Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;->selectionStarted(I)Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent; -Landroid/view/textclassifier/logging/SmartSelectionEventTracker;-><init>(Landroid/content/Context;I)V -Landroid/view/textclassifier/logging/SmartSelectionEventTracker;->logEvent(Landroid/view/textclassifier/logging/SmartSelectionEventTracker$SelectionEvent;)V -Landroid/view/textservice/TextServicesManager;->isSpellCheckerEnabled()Z -Landroid/webkit/CacheManager$CacheResult;-><init>()V -Landroid/webkit/CacheManager$CacheResult;->getContentDisposition()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getContentLength()J -Landroid/webkit/CacheManager$CacheResult;->getETag()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getEncoding()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getExpires()J -Landroid/webkit/CacheManager$CacheResult;->getExpiresString()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getHttpStatusCode()I -Landroid/webkit/CacheManager$CacheResult;->getInputStream()Ljava/io/InputStream; -Landroid/webkit/CacheManager$CacheResult;->getLastModified()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getLocalPath()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getLocation()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getMimeType()Ljava/lang/String; -Landroid/webkit/CacheManager$CacheResult;->getOutputStream()Ljava/io/OutputStream; -Landroid/webkit/CacheManager$CacheResult;->setEncoding(Ljava/lang/String;)V -Landroid/webkit/CacheManager$CacheResult;->setInputStream(Ljava/io/InputStream;)V -Landroid/webkit/CacheManager;->cacheDisabled()Z -Landroid/webkit/CacheManager;->endCacheTransaction()Z -Landroid/webkit/CacheManager;->getCacheFile(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult; -Landroid/webkit/CacheManager;->getCacheFileBaseDir()Ljava/io/File; -Landroid/webkit/CacheManager;->saveCacheFile(Ljava/lang/String;Landroid/webkit/CacheManager$CacheResult;)V -Landroid/webkit/CacheManager;->startCacheTransaction()Z -Landroid/webkit/IWebViewUpdateService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Landroid/webkit/WebResourceResponse;->mImmutable:Z -Landroid/webkit/WebSettings$TextSize;->value:I -Landroid/webkit/WebSettings;->getPluginsPath()Ljava/lang/String; -Landroid/webkit/WebSettings;->getUseDoubleTree()Z -Landroid/webkit/WebSettings;->setPluginsPath(Ljava/lang/String;)V -Landroid/webkit/WebSettings;->setUseDoubleTree(Z)V -Landroid/webkit/WebSyncManager;->mHandler:Landroid/os/Handler; -Landroid/webkit/WebView;->debugDump()V -Landroid/webkit/WebView;->disablePlatformNotifications()V -Landroid/webkit/WebView;->emulateShiftHeld()V -Landroid/webkit/WebView;->enablePlatformNotifications()V -Landroid/webkit/WebView;->getContentWidth()I -Landroid/webkit/WebView;->getPluginList()Landroid/webkit/PluginList; -Landroid/webkit/WebView;->getTouchIconUrl()Ljava/lang/String; -Landroid/webkit/WebView;->getVisibleTitleHeight()I -Landroid/webkit/WebView;->getZoomControls()Landroid/view/View; -Landroid/webkit/WebView;->isPaused()Z -Landroid/webkit/WebView;->mProvider:Landroid/webkit/WebViewProvider; -Landroid/webkit/WebView;->notifyFindDialogDismissed()V -Landroid/webkit/WebView;->onDrawVerticalScrollBar(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIII)V -Landroid/webkit/WebView;->refreshPlugins(Z)V -Landroid/webkit/WebView;->restorePicture(Landroid/os/Bundle;Ljava/io/File;)Z -Landroid/webkit/WebView;->sEnforceThreadChecking:Z -Landroid/webkit/WebView;->savePicture(Landroid/os/Bundle;Ljava/io/File;)Z -Landroid/webkit/WebViewClient;->onUnhandledInputEvent(Landroid/webkit/WebView;Landroid/view/InputEvent;)V -Landroid/webkit/WebViewDelegate;-><init>()V -Landroid/webkit/WebViewFactory;->getProvider()Landroid/webkit/WebViewFactoryProvider; -Landroid/webkit/WebViewFactory;->getUpdateService()Landroid/webkit/IWebViewUpdateService; -Landroid/webkit/WebViewFactory;->getWebViewContextAndSetProvider()Landroid/content/Context; -Landroid/webkit/WebViewFactory;->sPackageInfo:Landroid/content/pm/PackageInfo; -Landroid/webkit/WebViewFactory;->sProviderInstance:Landroid/webkit/WebViewFactoryProvider; -Landroid/widget/AbsListView$FlingRunnable;->endFling()V -Landroid/widget/AbsListView$FlingRunnable;->mScroller:Landroid/widget/OverScroller; -Landroid/widget/AbsListView$FlingRunnable;->start(I)V -Landroid/widget/AbsListView$RecycleBin;->clear()V -Landroid/widget/AbsListView$RecycleBin;->mRecyclerListener:Landroid/widget/AbsListView$RecyclerListener; -Landroid/widget/AbsListView$SavedState;->firstId:J -Landroid/widget/AbsListView$SavedState;->viewTop:I -Landroid/widget/AbsListView;->invokeOnItemScrollListener()V -Landroid/widget/AbsListView;->isVerticalScrollBarHidden()Z -Landroid/widget/AbsListView;->mAdapter:Landroid/widget/ListAdapter; -Landroid/widget/AbsListView;->mDataSetObserver:Landroid/widget/AbsListView$AdapterDataSetObserver; -Landroid/widget/AbsListView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect; -Landroid/widget/AbsListView;->mEdgeGlowTop:Landroid/widget/EdgeEffect; -Landroid/widget/AbsListView;->mFastScroll:Landroid/widget/FastScroller; -Landroid/widget/AbsListView;->mFlingRunnable:Landroid/widget/AbsListView$FlingRunnable; -Landroid/widget/AbsListView;->mIsChildViewEnabled:Z -Landroid/widget/AbsListView;->mLayoutMode:I -Landroid/widget/AbsListView;->mMaximumVelocity:I -Landroid/widget/AbsListView;->mMotionPosition:I -Landroid/widget/AbsListView;->mOnScrollListener:Landroid/widget/AbsListView$OnScrollListener; -Landroid/widget/AbsListView;->mPendingCheckForLongPress:Landroid/widget/AbsListView$CheckForLongPress; -Landroid/widget/AbsListView;->mPendingCheckForTap:Landroid/widget/AbsListView$CheckForTap; -Landroid/widget/AbsListView;->mRecycler:Landroid/widget/AbsListView$RecycleBin; -Landroid/widget/AbsListView;->mSelectionTopPadding:I -Landroid/widget/AbsListView;->mSelectorPosition:I -Landroid/widget/AbsListView;->mSelectorRect:Landroid/graphics/Rect; -Landroid/widget/AbsListView;->mTouchMode:I -Landroid/widget/AbsListView;->mTouchSlop:I -Landroid/widget/AbsListView;->mVelocityTracker:Landroid/view/VelocityTracker; -Landroid/widget/AbsListView;->performLongPress(Landroid/view/View;IJ)Z -Landroid/widget/AbsListView;->performLongPress(Landroid/view/View;IJFF)Z -Landroid/widget/AbsListView;->reportScrollStateChange(I)V -Landroid/widget/AbsListView;->smoothScrollBy(IIZZ)V -Landroid/widget/AbsListView;->trackMotionScroll(II)Z -Landroid/widget/AbsSeekBar;->mIsDragging:Z -Landroid/widget/AbsSeekBar;->mSplitTrack:Z -Landroid/widget/AbsSeekBar;->mThumb:Landroid/graphics/drawable/Drawable; -Landroid/widget/AbsSeekBar;->mTouchProgressOffset:F -Landroid/widget/ActivityChooserModel;->get(Landroid/content/Context;Ljava/lang/String;)Landroid/widget/ActivityChooserModel; -Landroid/widget/ActivityChooserView;->setExpandActivityOverflowButtonDrawable(Landroid/graphics/drawable/Drawable;)V -Landroid/widget/AdapterView;->mDataChanged:Z -Landroid/widget/AdapterView;->mFirstPosition:I -Landroid/widget/AdapterView;->mNextSelectedPosition:I -Landroid/widget/AdapterView;->mNextSelectedRowId:J -Landroid/widget/AdapterView;->mOldSelectedPosition:I -Landroid/widget/AdapterView;->setNextSelectedPositionInt(I)V -Landroid/widget/AdapterView;->setSelectedPositionInt(I)V -Landroid/widget/AutoCompleteTextView;->doAfterTextChanged()V -Landroid/widget/AutoCompleteTextView;->doBeforeTextChanged()V -Landroid/widget/AutoCompleteTextView;->ensureImeVisible(Z)V -Landroid/widget/AutoCompleteTextView;->mPopup:Landroid/widget/ListPopupWindow; -Landroid/widget/AutoCompleteTextView;->setDropDownAlwaysVisible(Z)V -Landroid/widget/AutoCompleteTextView;->setForceIgnoreOutsideTouch(Z)V -Landroid/widget/BaseAdapter;->mDataSetObservable:Landroid/database/DataSetObservable; -Landroid/widget/CompoundButton;->mBroadcasting:Z -Landroid/widget/CompoundButton;->mButtonDrawable:Landroid/graphics/drawable/Drawable; -Landroid/widget/CompoundButton;->mOnCheckedChangeListener:Landroid/widget/CompoundButton$OnCheckedChangeListener; -Landroid/widget/CursorAdapter;->mChangeObserver:Landroid/widget/CursorAdapter$ChangeObserver; -Landroid/widget/CursorAdapter;->mDataSetObserver:Landroid/database/DataSetObserver; -Landroid/widget/CursorAdapter;->mDataValid:Z -Landroid/widget/CursorAdapter;->mRowIDColumn:I -Landroid/widget/DatePicker;->mDelegate:Landroid/widget/DatePicker$DatePickerDelegate; -Landroid/widget/EdgeEffect;->mPaint:Landroid/graphics/Paint; -Landroid/widget/Editor;->invalidateTextDisplayList()V -Landroid/widget/Editor;->mSelectHandleLeft:Landroid/graphics/drawable/Drawable; -Landroid/widget/Editor;->mShowCursor:J -Landroid/widget/Editor;->mShowSoftInputOnFocus:Z -Landroid/widget/ExpandableListView;->mChildDivider:Landroid/graphics/drawable/Drawable; -Landroid/widget/ExpandableListView;->mGroupIndicator:Landroid/graphics/drawable/Drawable; -Landroid/widget/FastScroller;->mContainerRect:Landroid/graphics/Rect; -Landroid/widget/FastScroller;->mHeaderCount:I -Landroid/widget/FastScroller;->mLongList:Z -Landroid/widget/FastScroller;->mMinimumTouchTarget:I -Landroid/widget/FastScroller;->mThumbDrawable:Landroid/graphics/drawable/Drawable; -Landroid/widget/FastScroller;->mThumbImage:Landroid/widget/ImageView; -Landroid/widget/FastScroller;->mTrackDrawable:Landroid/graphics/drawable/Drawable; -Landroid/widget/FastScroller;->mTrackImage:Landroid/widget/ImageView; -Landroid/widget/Gallery$FlingRunnable;->startUsingVelocity(I)V -Landroid/widget/Gallery;->fillToGalleryLeft()V -Landroid/widget/Gallery;->fillToGalleryRight()V -Landroid/widget/Gallery;->mDownTouchPosition:I -Landroid/widget/Gallery;->mDownTouchView:Landroid/view/View; -Landroid/widget/Gallery;->mFlingRunnable:Landroid/widget/Gallery$FlingRunnable; -Landroid/widget/Gallery;->mSpacing:I -Landroid/widget/Gallery;->makeAndAddView(IIIZ)Landroid/view/View; -Landroid/widget/Gallery;->moveDirection(I)Z -Landroid/widget/GridView;->fillDown(II)Landroid/view/View; -Landroid/widget/GridView;->fillUp(II)Landroid/view/View; -Landroid/widget/GridView;->mColumnWidth:I -Landroid/widget/GridView;->mHorizontalSpacing:I -Landroid/widget/GridView;->mNumColumns:I -Landroid/widget/GridView;->mRequestedNumColumns:I -Landroid/widget/GridView;->mVerticalSpacing:I -Landroid/widget/HorizontalScrollView;->mChildToScrollTo:Landroid/view/View; -Landroid/widget/HorizontalScrollView;->mEdgeGlowLeft:Landroid/widget/EdgeEffect; -Landroid/widget/HorizontalScrollView;->mEdgeGlowRight:Landroid/widget/EdgeEffect; -Landroid/widget/HorizontalScrollView;->mScroller:Landroid/widget/OverScroller; -Landroid/widget/ImageView;->animateTransform(Landroid/graphics/Matrix;)V -Landroid/widget/ImageView;->mAdjustViewBounds:Z -Landroid/widget/ImageView;->mAlpha:I -Landroid/widget/ImageView;->mDrawMatrix:Landroid/graphics/Matrix; -Landroid/widget/ImageView;->mMaxHeight:I -Landroid/widget/ImageView;->mMaxWidth:I -Landroid/widget/ImageView;->mRecycleableBitmapDrawable:Landroid/graphics/drawable/BitmapDrawable; -Landroid/widget/ImageView;->mResource:I -Landroid/widget/ImageView;->mUri:Landroid/net/Uri; -Landroid/widget/ImageView;->updateDrawable(Landroid/graphics/drawable/Drawable;)V -Landroid/widget/LinearLayout;->mGravity:I -Landroid/widget/LinearLayout;->mUseLargestChild:Z -Landroid/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; -Landroid/widget/ListPopupWindow;->setForceIgnoreOutsideTouch(Z)V -Landroid/widget/ListView;->fillDown(II)Landroid/view/View; -Landroid/widget/ListView;->fillSpecific(II)Landroid/view/View; -Landroid/widget/ListView;->fillUp(II)Landroid/view/View; -Landroid/widget/ListView;->findViewTraversal(I)Landroid/view/View; -Landroid/widget/ListView;->findViewWithTagTraversal(Ljava/lang/Object;)Landroid/view/View; -Landroid/widget/ListView;->lookForSelectablePosition(IZ)I -Landroid/widget/ListView;->mAreAllItemsSelectable:Z -Landroid/widget/ListView;->mFooterViewInfos:Ljava/util/ArrayList; -Landroid/widget/ListView;->mHeaderViewInfos:Ljava/util/ArrayList; -Landroid/widget/ListView;->setSelectionInt(I)V -Landroid/widget/MediaController;->mAnchor:Landroid/view/View; -Landroid/widget/MediaController;->mDecor:Landroid/view/View; -Landroid/widget/MediaController;->mDecorLayoutParams:Landroid/view/WindowManager$LayoutParams; -Landroid/widget/MediaController;->mWindowManager:Landroid/view/WindowManager; -Landroid/widget/NumberPicker;->mInputText:Landroid/widget/EditText; -Landroid/widget/NumberPicker;->mSelectionDivider:Landroid/graphics/drawable/Drawable; -Landroid/widget/NumberPicker;->mSelectorWheelPaint:Landroid/graphics/Paint; -Landroid/widget/OverScroller$SplineOverScroller;->mCurrVelocity:F -Landroid/widget/OverScroller;->isScrollingInDirection(FF)Z -Landroid/widget/OverScroller;->mScrollerY:Landroid/widget/OverScroller$SplineOverScroller; -Landroid/widget/PopupMenu;->mPopup:Lcom/android/internal/view/menu/MenuPopupHelper; -Landroid/widget/PopupWindow;->computeAnimationResource()I -Landroid/widget/PopupWindow;->createPopupLayoutParams(Landroid/os/IBinder;)Landroid/view/WindowManager$LayoutParams; -Landroid/widget/PopupWindow;->invokePopup(Landroid/view/WindowManager$LayoutParams;)V -Landroid/widget/PopupWindow;->mAboveAnchor:Z -Landroid/widget/PopupWindow;->mAnchor:Ljava/lang/ref/WeakReference; -Landroid/widget/PopupWindow;->mAnimationStyle:I -Landroid/widget/PopupWindow;->mBackgroundView:Landroid/view/View; -Landroid/widget/PopupWindow;->mContentView:Landroid/view/View; -Landroid/widget/PopupWindow;->mHeightMode:I -Landroid/widget/PopupWindow;->mIsDropdown:Z -Landroid/widget/PopupWindow;->mIsShowing:Z -Landroid/widget/PopupWindow;->mLastHeight:I -Landroid/widget/PopupWindow;->mLastWidth:I -Landroid/widget/PopupWindow;->mOnScrollChangedListener:Landroid/view/ViewTreeObserver$OnScrollChangedListener; -Landroid/widget/PopupWindow;->mOverlapAnchor:Z -Landroid/widget/PopupWindow;->mTouchInterceptor:Landroid/view/View$OnTouchListener; -Landroid/widget/PopupWindow;->mWidthMode:I -Landroid/widget/PopupWindow;->mWindowLayoutType:I -Landroid/widget/PopupWindow;->preparePopup(Landroid/view/WindowManager$LayoutParams;)V -Landroid/widget/PopupWindow;->setClipToScreenEnabled(Z)V -Landroid/widget/PopupWindow;->setEpicenterBounds(Landroid/graphics/Rect;)V -Landroid/widget/PopupWindow;->setLayoutInScreenEnabled(Z)V -Landroid/widget/PopupWindow;->setLayoutInsetDecor(Z)V -Landroid/widget/PopupWindow;->setTouchModal(Z)V -Landroid/widget/PopupWindow;->showAtLocation(Landroid/os/IBinder;III)V -Landroid/widget/ProgressBar;->mCurrentDrawable:Landroid/graphics/drawable/Drawable; -Landroid/widget/ProgressBar;->mDuration:I -Landroid/widget/ProgressBar;->mIndeterminate:Z -Landroid/widget/ProgressBar;->mMaxHeight:I -Landroid/widget/ProgressBar;->mMinHeight:I -Landroid/widget/ProgressBar;->mOnlyIndeterminate:Z -Landroid/widget/ProgressBar;->setProgressInternal(IZZ)Z -Landroid/widget/RelativeLayout$LayoutParams;->mBottom:I -Landroid/widget/RelativeLayout$LayoutParams;->mLeft:I -Landroid/widget/RelativeLayout$LayoutParams;->mRight:I -Landroid/widget/RelativeLayout$LayoutParams;->mTop:I -Landroid/widget/RelativeLayout;->mGravity:I -Landroid/widget/RemoteViews$Action;->mergeBehavior()I -Landroid/widget/RemoteViews$Action;->viewId:I -Landroid/widget/RemoteViews$BitmapCache;->mBitmaps:Ljava/util/ArrayList; -Landroid/widget/RemoteViews$BitmapReflectionAction;->bitmap:Landroid/graphics/Bitmap; -Landroid/widget/RemoteViews$BitmapReflectionAction;->methodName:Ljava/lang/String; -Landroid/widget/RemoteViews$ReflectionAction;->methodName:Ljava/lang/String; -Landroid/widget/RemoteViews$ReflectionAction;->value:Ljava/lang/Object; -Landroid/widget/RemoteViews$SetOnClickPendingIntent;->pendingIntent:Landroid/app/PendingIntent; -Landroid/widget/RemoteViews$SetPendingIntentTemplate;->pendingIntentTemplate:Landroid/app/PendingIntent; -Landroid/widget/RemoteViews$ViewGroupActionAdd;->mNestedViews:Landroid/widget/RemoteViews; -Landroid/widget/RemoteViews;->estimateMemoryUsage()I -Landroid/widget/RemoteViews;->mActions:Ljava/util/ArrayList; -Landroid/widget/RemoteViews;->mApplication:Landroid/content/pm/ApplicationInfo; -Landroid/widget/RemoteViews;->mBitmapCache:Landroid/widget/RemoteViews$BitmapCache; -Landroid/widget/RemoteViews;->mLayoutId:I -Landroid/widget/RemoteViews;->mPortrait:Landroid/widget/RemoteViews; -Landroid/widget/RemoteViews;->mergeRemoteViews(Landroid/widget/RemoteViews;)V -Landroid/widget/RemoteViewsAdapter;->mCache:Landroid/widget/RemoteViewsAdapter$FixedSizeRemoteViewsCache; -Landroid/widget/RemoteViewsAdapter;->mWorkerThread:Landroid/os/HandlerThread; -Landroid/widget/ScrollBarDrawable;->mVerticalThumb:Landroid/graphics/drawable/Drawable; -Landroid/widget/ScrollBarDrawable;->setHorizontalThumbDrawable(Landroid/graphics/drawable/Drawable;)V -Landroid/widget/ScrollBarDrawable;->setVerticalThumbDrawable(Landroid/graphics/drawable/Drawable;)V -Landroid/widget/ScrollView;->mChildToScrollTo:Landroid/view/View; -Landroid/widget/ScrollView;->mEdgeGlowBottom:Landroid/widget/EdgeEffect; -Landroid/widget/ScrollView;->mEdgeGlowTop:Landroid/widget/EdgeEffect; -Landroid/widget/ScrollView;->mIsBeingDragged:Z -Landroid/widget/ScrollView;->mMinimumVelocity:I -Landroid/widget/ScrollView;->mOverflingDistance:I -Landroid/widget/ScrollView;->mOverscrollDistance:I -Landroid/widget/ScrollView;->mScroller:Landroid/widget/OverScroller; -Landroid/widget/Scroller;->mInterpolator:Landroid/view/animation/Interpolator; -Landroid/widget/SearchView;->mCloseButton:Landroid/widget/ImageView; -Landroid/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; -Landroid/widget/SearchView;->mSearchPlate:Landroid/view/View; -Landroid/widget/SearchView;->mSearchSrcTextView:Landroid/widget/SearchView$SearchAutoComplete; -Landroid/widget/SearchView;->onCloseClicked()V -Landroid/widget/SearchView;->setQuery(Ljava/lang/CharSequence;)V -Landroid/widget/SlidingDrawer;->mTopOffset:I -Landroid/widget/Spinner;->mPopup:Landroid/widget/Spinner$SpinnerPopup; -Landroid/widget/Switch;->mThumbDrawable:Landroid/graphics/drawable/Drawable; -Landroid/widget/Switch;->mTrackDrawable:Landroid/graphics/drawable/Drawable; -Landroid/widget/TabHost$IntentContentStrategy;->getContentView()Landroid/view/View; -Landroid/widget/TabHost$IntentContentStrategy;->tabClosed()V -Landroid/widget/TabHost$TabSpec;->mContentStrategy:Landroid/widget/TabHost$ContentStrategy; -Landroid/widget/TabHost$TabSpec;->mIndicatorStrategy:Landroid/widget/TabHost$IndicatorStrategy; -Landroid/widget/TabHost;->mTabSpecs:Ljava/util/List; -Landroid/widget/TabWidget;->mDrawBottomStrips:Z -Landroid/widget/TabWidget;->mSelectedTab:I -Landroid/widget/TabWidget;->setTabSelectionListener(Landroid/widget/TabWidget$OnTabSelectionChanged;)V -Landroid/widget/TextView;->LINES:I -Landroid/widget/TextView;->assumeLayout()V -Landroid/widget/TextView;->createEditorIfNeeded()V -Landroid/widget/TextView;->getHorizontallyScrolling()Z -Landroid/widget/TextView;->getTextColor(Landroid/content/Context;Landroid/content/res/TypedArray;I)I -Landroid/widget/TextView;->getTextColors(Landroid/content/Context;Landroid/content/res/TypedArray;)Landroid/content/res/ColorStateList; -Landroid/widget/TextView;->isSingleLine()Z -Landroid/widget/TextView;->mCurTextColor:I -Landroid/widget/TextView;->mCursorDrawableRes:I -Landroid/widget/TextView;->mEditor:Landroid/widget/Editor; -Landroid/widget/TextView;->mListeners:Ljava/util/ArrayList; -Landroid/widget/TextView;->mMarquee:Landroid/widget/TextView$Marquee; -Landroid/widget/TextView;->mMaxMode:I -Landroid/widget/TextView;->mMaximum:I -Landroid/widget/TextView;->mSingleLine:Z -Landroid/widget/TextView;->mText:Ljava/lang/CharSequence; -Landroid/widget/TextView;->mTextPaint:Landroid/text/TextPaint; -Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextView$BufferType;ZI)V -Landroid/widget/Toast$TN;->mNextView:Landroid/view/View; -Landroid/widget/Toast$TN;->mParams:Landroid/view/WindowManager$LayoutParams; -Landroid/widget/Toast$TN;->mView:Landroid/view/View; -Landroid/widget/Toast;->getService()Landroid/app/INotificationManager; -Landroid/widget/Toast;->getWindowParams()Landroid/view/WindowManager$LayoutParams; -Landroid/widget/Toast;->mDuration:I -Landroid/widget/Toast;->mTN:Landroid/widget/Toast$TN; -Landroid/widget/Toast;->sService:Landroid/app/INotificationManager; -Landroid/widget/VideoView2$OnViewTypeChangedListener;->onViewTypeChanged(Landroid/view/View;I)V -Landroid/widget/VideoView2;->getMediaController()Landroid/media/session/MediaController; -Landroid/widget/VideoView2;->setOnViewTypeChangedListener(Landroid/widget/VideoView2$OnViewTypeChangedListener;)V -Landroid/widget/VideoView2;->setVideoPath(Ljava/lang/String;)V -Landroid/widget/VideoView;->mCurrentBufferPercentage:I -Landroid/widget/VideoView;->mMediaController:Landroid/widget/MediaController; -Landroid/widget/VideoView;->mSHCallback:Landroid/view/SurfaceHolder$Callback; -Landroid/widget/VideoView;->mUri:Landroid/net/Uri; -Landroid/widget/VideoView;->mVideoHeight:I -Landroid/widget/VideoView;->mVideoWidth:I -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->serialVersionUID:J -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->serialVersionUID:J -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadataCollection;->serialVersionUID:J -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneNumberDesc;->serialVersionUID:J -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->serialVersionUID:J -Lcom/android/ims/ImsConfigListener;->onSetFeatureResponse(IIII)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionConferenceStateUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsConferenceState;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHandover(Lcom/android/ims/internal/IImsCallSession;IILandroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHandoverFailed(Lcom/android/ims/internal/IImsCallSession;IILandroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHeld(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHoldFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionHoldReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionInviteParticipantsRequestDelivered(Lcom/android/ims/internal/IImsCallSession;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionInviteParticipantsRequestFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeComplete(Lcom/android/ims/internal/IImsCallSession;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMergeStarted(Lcom/android/ims/internal/IImsCallSession;Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionMultipartyStateChanged(Lcom/android/ims/internal/IImsCallSession;Z)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionProgressing(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsStreamMediaProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumeFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumeReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionResumed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionStartFailed(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionStarted(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionSuppServiceReceived(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsSuppServiceNotification;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionTerminated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionTtyModeReceived(Lcom/android/ims/internal/IImsCallSession;I)V -Lcom/android/ims/internal/IImsCallSessionListener;->callSessionUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsCallProfile;)V -Lcom/android/ims/internal/IImsRegistrationListener;->registrationAssociatedUriChanged([Landroid/net/Uri;)V -Lcom/android/ims/internal/IImsRegistrationListener;->registrationChangeFailed(ILandroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsRegistrationListener;->registrationConnectedWithRadioTech(I)V -Lcom/android/ims/internal/IImsRegistrationListener;->registrationDisconnected(Landroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsRegistrationListener;->registrationFeatureCapabilityChanged(I[I[I)V -Lcom/android/ims/internal/IImsRegistrationListener;->registrationProgressingWithRadioTech(I)V -Lcom/android/ims/internal/IImsRegistrationListener;->voiceMessageCountUpdate(I)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallBarringQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsSsInfo;)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallForwardQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsCallForwardInfo;)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationCallWaitingQueried(Lcom/android/ims/internal/IImsUt;I[Landroid/telephony/ims/ImsSsInfo;)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueried(Lcom/android/ims/internal/IImsUt;ILandroid/os/Bundle;)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationQueryFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdateFailed(Lcom/android/ims/internal/IImsUt;ILandroid/telephony/ims/ImsReasonInfo;)V -Lcom/android/ims/internal/IImsUtListener;->utConfigurationUpdated(Lcom/android/ims/internal/IImsUt;I)V -Lcom/android/ims/internal/uce/common/CapInfo;-><init>()V -Lcom/android/ims/internal/uce/common/CapInfo;->getCapTimestamp()J -Lcom/android/ims/internal/uce/common/CapInfo;->isCdViaPresenceSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtHttpSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtSnFSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFtThumbSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isFullSnFGroupChatSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPullFtSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPullSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isGeoPushSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isImSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isIpVideoSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isIpVoiceSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isIsSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVideoCallSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVideoOnlyCallSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isRcsIpVoiceCallSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isSmSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isSpSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isVsDuringCSSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->isVsSupported()Z -Lcom/android/ims/internal/uce/common/CapInfo;->setCapTimestamp(J)V -Lcom/android/ims/internal/uce/common/CapInfo;->setCdViaPresenceSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setExts([Ljava/lang/String;)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtHttpSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtSnFSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFtThumbSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setFullSnFGroupChatSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPullFtSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPullSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setGeoPushSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setImSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setIpVideoSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setIpVoiceSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setIsSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVideoCallSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVideoOnlyCallSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setRcsIpVoiceCallSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setSmSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setSpSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setVsDuringCSSupported(Z)V -Lcom/android/ims/internal/uce/common/CapInfo;->setVsSupported(Z)V -Lcom/android/ims/internal/uce/common/StatusCode;-><init>()V -Lcom/android/ims/internal/uce/common/StatusCode;->getStatusCode()I -Lcom/android/ims/internal/uce/common/StatusCode;->setStatusCode(I)V -Lcom/android/ims/internal/uce/common/UceLong;-><init>()V -Lcom/android/ims/internal/uce/common/UceLong;->getClientId()I -Lcom/android/ims/internal/uce/common/UceLong;->getUceLong()J -Lcom/android/ims/internal/uce/common/UceLong;->setClientId(I)V -Lcom/android/ims/internal/uce/common/UceLong;->setUceLong(J)V -Lcom/android/ims/internal/uce/options/IOptionsListener;->cmdStatus(Lcom/android/ims/internal/uce/options/OptionsCmdStatus;)V -Lcom/android/ims/internal/uce/options/IOptionsListener;->getVersionCb(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/options/IOptionsListener;->incomingOptions(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;I)V -Lcom/android/ims/internal/uce/options/IOptionsListener;->serviceAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/options/IOptionsListener;->serviceUnavailable(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/options/IOptionsListener;->sipResponseReceived(Ljava/lang/String;Lcom/android/ims/internal/uce/options/OptionsSipResponse;Lcom/android/ims/internal/uce/options/OptionsCapInfo;)V -Lcom/android/ims/internal/uce/options/IOptionsService$Stub;-><init>()V -Lcom/android/ims/internal/uce/options/IOptionsService;->addListener(ILcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->getContactCap(ILjava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->getContactListCap(I[Ljava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->getMyInfo(II)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->getVersion(I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->responseIncomingOptions(IIILjava/lang/String;Lcom/android/ims/internal/uce/options/OptionsCapInfo;Z)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/IOptionsService;->setMyInfo(ILcom/android/ims/internal/uce/common/CapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/options/OptionsCapInfo;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->getCapInfo()Lcom/android/ims/internal/uce/common/CapInfo; -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->getSdp()Ljava/lang/String; -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->setCapInfo(Lcom/android/ims/internal/uce/common/CapInfo;)V -Lcom/android/ims/internal/uce/options/OptionsCapInfo;->setSdp(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/options/OptionsCmdId;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsCmdId;->setCmdId(I)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setCapInfo(Lcom/android/ims/internal/uce/common/CapInfo;)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setCmdId(Lcom/android/ims/internal/uce/options/OptionsCmdId;)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setStatus(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/options/OptionsCmdStatus;->setUserData(I)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;-><init>()V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setCmdId(Lcom/android/ims/internal/uce/options/OptionsCmdId;)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setReasonPhrase(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setRequestId(I)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setRetryAfter(I)V -Lcom/android/ims/internal/uce/options/OptionsSipResponse;->setSipResponseCode(I)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->capInfoReceived(Ljava/lang/String;[Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->cmdStatus(Lcom/android/ims/internal/uce/presence/PresCmdStatus;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->getVersionCb(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->listCapInfoReceived(Lcom/android/ims/internal/uce/presence/PresRlmiInfo;[Lcom/android/ims/internal/uce/presence/PresResInfo;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->publishTriggering(Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->serviceAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->serviceUnAvailable(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->sipResponseReceived(Lcom/android/ims/internal/uce/presence/PresSipResponse;)V -Lcom/android/ims/internal/uce/presence/IPresenceListener;->unpublishMessageSent()V -Lcom/android/ims/internal/uce/presence/IPresenceService$Stub;-><init>()V -Lcom/android/ims/internal/uce/presence/IPresenceService;->addListener(ILcom/android/ims/internal/uce/presence/IPresenceListener;Lcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->getContactCap(ILjava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->getContactListCap(I[Ljava/lang/String;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->getVersion(I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->publishMyCap(ILcom/android/ims/internal/uce/presence/PresCapInfo;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->reenableService(II)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->removeListener(ILcom/android/ims/internal/uce/common/UceLong;)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/IPresenceService;->setNewFeatureTag(ILjava/lang/String;Lcom/android/ims/internal/uce/presence/PresServiceInfo;I)Lcom/android/ims/internal/uce/common/StatusCode; -Lcom/android/ims/internal/uce/presence/PresCapInfo;->getCapInfo()Lcom/android/ims/internal/uce/common/CapInfo; -Lcom/android/ims/internal/uce/presence/PresCapInfo;->getContactUri()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresCapInfo;->mContactUri:Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresCmdId;-><init>()V -Lcom/android/ims/internal/uce/presence/PresCmdId;->setCmdId(I)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;-><init>()V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setCmdId(Lcom/android/ims/internal/uce/presence/PresCmdId;)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setRequestId(I)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setStatus(Lcom/android/ims/internal/uce/common/StatusCode;)V -Lcom/android/ims/internal/uce/presence/PresCmdStatus;->setUserData(I)V -Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;-><init>()V -Lcom/android/ims/internal/uce/presence/PresPublishTriggerType;->setPublishTrigeerType(I)V -Lcom/android/ims/internal/uce/presence/PresResInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresResInfo;->setDisplayName(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInfo;->setInstanceInfo(Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;)V -Lcom/android/ims/internal/uce/presence/PresResInfo;->setResUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setPresentityUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setReason(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setResId(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setResInstanceState(I)V -Lcom/android/ims/internal/uce/presence/PresResInstanceInfo;->setTupleInfo([Lcom/android/ims/internal/uce/presence/PresTupleInfo;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setFullState(Z)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setListName(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setPresSubscriptionState(Lcom/android/ims/internal/uce/presence/PresSubscriptionState;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setRequestId(I)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setSubscriptionExpireTime(I)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setSubscriptionTerminatedReason(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresRlmiInfo;->setVersion(I)V -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getMediaType()I -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceDesc()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceId()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresServiceInfo;->getServiceVer()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresSipResponse;-><init>()V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getCmdId()Lcom/android/ims/internal/uce/presence/PresCmdId; -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getReasonPhrase()Ljava/lang/String; -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getRequestId()I -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getRetryAfter()I -Lcom/android/ims/internal/uce/presence/PresSipResponse;->getSipResponseCode()I -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setCmdId(Lcom/android/ims/internal/uce/presence/PresCmdId;)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setReasonPhrase(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setRequestId(I)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setRetryAfter(I)V -Lcom/android/ims/internal/uce/presence/PresSipResponse;->setSipResponseCode(I)V -Lcom/android/ims/internal/uce/presence/PresSubscriptionState;-><init>()V -Lcom/android/ims/internal/uce/presence/PresSubscriptionState;->setPresSubscriptionState(I)V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;-><init>()V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setContactUri(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setFeatureTag(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/presence/PresTupleInfo;->setTimestamp(Ljava/lang/String;)V -Lcom/android/ims/internal/uce/uceservice/IUceListener$Stub;-><init>()V -Lcom/android/ims/internal/uce/uceservice/IUceListener;->setStatus(I)V -Lcom/android/ims/internal/uce/uceservice/IUceService$Stub;-><init>()V -Lcom/android/ims/internal/uce/uceservice/IUceService;->createOptionsService(Lcom/android/ims/internal/uce/options/IOptionsListener;Lcom/android/ims/internal/uce/common/UceLong;)I -Lcom/android/ims/internal/uce/uceservice/IUceService;->createPresenceService(Lcom/android/ims/internal/uce/presence/IPresenceListener;Lcom/android/ims/internal/uce/common/UceLong;)I -Lcom/android/ims/internal/uce/uceservice/IUceService;->destroyOptionsService(I)V -Lcom/android/ims/internal/uce/uceservice/IUceService;->destroyPresenceService(I)V -Lcom/android/ims/internal/uce/uceservice/IUceService;->getOptionsService()Lcom/android/ims/internal/uce/options/IOptionsService; -Lcom/android/ims/internal/uce/uceservice/IUceService;->getPresenceService()Lcom/android/ims/internal/uce/presence/IPresenceService; -Lcom/android/ims/internal/uce/uceservice/IUceService;->getServiceStatus()Z -Lcom/android/ims/internal/uce/uceservice/IUceService;->isServiceStarted()Z -Lcom/android/ims/internal/uce/uceservice/IUceService;->startService(Lcom/android/ims/internal/uce/uceservice/IUceListener;)Z -Lcom/android/ims/internal/uce/uceservice/IUceService;->stopService()Z -Lcom/android/internal/R$array;->config_mobile_hotspot_provision_app:I -Lcom/android/internal/R$array;->config_tether_wifi_regexs:I -Lcom/android/internal/R$array;->maps_starting_lat_lng:I -Lcom/android/internal/R$array;->maps_starting_zoom:I -Lcom/android/internal/R$attr;->actionBarStyle:I -Lcom/android/internal/R$attr;->mapViewStyle:I -Lcom/android/internal/R$attr;->state_focused:I -Lcom/android/internal/R$attr;->state_pressed:I -Lcom/android/internal/R$attr;->state_selected:I -Lcom/android/internal/R$attr;->switchStyle:I -Lcom/android/internal/R$bool;->config_mms_content_disposition_support:I -Lcom/android/internal/R$bool;->config_showNavigationBar:I -Lcom/android/internal/R$dimen;-><init>()V -Lcom/android/internal/R$dimen;->navigation_bar_height:I -Lcom/android/internal/R$dimen;->navigation_bar_height_landscape:I -Lcom/android/internal/R$dimen;->status_bar_height:I -Lcom/android/internal/R$dimen;->toast_y_offset:I -Lcom/android/internal/R$drawable;->btn_check_off:I -Lcom/android/internal/R$drawable;->compass_arrow:I -Lcom/android/internal/R$drawable;->compass_base:I -Lcom/android/internal/R$drawable;->ic_maps_indicator_current_position_anim:I -Lcom/android/internal/R$drawable;->ic_menu_close_clear_cancel:I -Lcom/android/internal/R$drawable;->loading_tile_android:I -Lcom/android/internal/R$drawable;->maps_google_logo:I -Lcom/android/internal/R$drawable;->no_tile_256:I -Lcom/android/internal/R$drawable;->reticle:I -Lcom/android/internal/R$id;->amPm:I -Lcom/android/internal/R$id;->edittext_container:I -Lcom/android/internal/R$id;->icon:I -Lcom/android/internal/R$id;->message:I -Lcom/android/internal/R$id;->minute:I -Lcom/android/internal/R$id;->shortcut:I -Lcom/android/internal/R$id;->text:I -Lcom/android/internal/R$id;->time:I -Lcom/android/internal/R$id;->timePicker:I -Lcom/android/internal/R$id;->title:I -Lcom/android/internal/R$id;->title_container:I -Lcom/android/internal/R$integer;->config_screenBrightnessDim:I -Lcom/android/internal/R$integer;->config_toastDefaultGravity:I -Lcom/android/internal/R$layout;->screen_title:I -Lcom/android/internal/R$string;->byteShort:I -Lcom/android/internal/R$string;->gigabyteShort:I -Lcom/android/internal/R$string;->kilobyteShort:I -Lcom/android/internal/R$string;->megabyteShort:I -Lcom/android/internal/R$string;->petabyteShort:I -Lcom/android/internal/R$string;->terabyteShort:I -Lcom/android/internal/R$style;->Theme:I -Lcom/android/internal/R$styleable;->AbsListView:[I -Lcom/android/internal/R$styleable;->AbsListView_cacheColorHint:I -Lcom/android/internal/R$styleable;->AbsListView_choiceMode:I -Lcom/android/internal/R$styleable;->AbsListView_drawSelectorOnTop:I -Lcom/android/internal/R$styleable;->AbsListView_fastScrollAlwaysVisible:I -Lcom/android/internal/R$styleable;->AbsListView_fastScrollEnabled:I -Lcom/android/internal/R$styleable;->AbsListView_listSelector:I -Lcom/android/internal/R$styleable;->AbsListView_scrollingCache:I -Lcom/android/internal/R$styleable;->AbsListView_smoothScrollbar:I -Lcom/android/internal/R$styleable;->AbsListView_stackFromBottom:I -Lcom/android/internal/R$styleable;->AbsListView_textFilterEnabled:I -Lcom/android/internal/R$styleable;->AbsListView_transcriptMode:I -Lcom/android/internal/R$styleable;->AccountAuthenticator:[I -Lcom/android/internal/R$styleable;->AccountAuthenticator_accountPreferences:I -Lcom/android/internal/R$styleable;->AccountAuthenticator_accountType:I -Lcom/android/internal/R$styleable;->AccountAuthenticator_customTokens:I -Lcom/android/internal/R$styleable;->AccountAuthenticator_icon:I -Lcom/android/internal/R$styleable;->AccountAuthenticator_label:I -Lcom/android/internal/R$styleable;->AccountAuthenticator_smallIcon:I -Lcom/android/internal/R$styleable;->AndroidManifest:[I -Lcom/android/internal/R$styleable;->AndroidManifestActivity:[I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_allowTaskReparenting:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_configChanges:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_description:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_enabled:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_excludeFromRecents:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_exported:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_hardwareAccelerated:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_icon:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_immersive:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_label:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_launchMode:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_logo:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_name:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_noHistory:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_permission:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_process:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_screenOrientation:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_taskAffinity:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_theme:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_uiOptions:I -Lcom/android/internal/R$styleable;->AndroidManifestActivity_windowSoftInputMode:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication:[I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_enabled:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_hardwareAccelerated:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_label:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_largeHeap:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_name:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_permission:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_process:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_supportsRtl:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_theme:I -Lcom/android/internal/R$styleable;->AndroidManifestApplication_uiOptions:I -Lcom/android/internal/R$styleable;->AndroidManifestData:[I -Lcom/android/internal/R$styleable;->AndroidManifestIntentFilter:[I -Lcom/android/internal/R$styleable;->AndroidManifestIntentFilter_priority:I -Lcom/android/internal/R$styleable;->AndroidManifestMetaData:[I -Lcom/android/internal/R$styleable;->AndroidManifestMetaData_name:I -Lcom/android/internal/R$styleable;->AndroidManifestMetaData_resource:I -Lcom/android/internal/R$styleable;->AndroidManifestMetaData_value:I -Lcom/android/internal/R$styleable;->AndroidManifestService:[I -Lcom/android/internal/R$styleable;->AndroidManifestService_enabled:I -Lcom/android/internal/R$styleable;->AndroidManifestService_exported:I -Lcom/android/internal/R$styleable;->AndroidManifestService_name:I -Lcom/android/internal/R$styleable;->AndroidManifestService_permission:I -Lcom/android/internal/R$styleable;->AndroidManifestService_process:I -Lcom/android/internal/R$styleable;->AndroidManifestUsesPermission:[I -Lcom/android/internal/R$styleable;->AndroidManifestUsesPermission_name:I -Lcom/android/internal/R$styleable;->AndroidManifestUsesSdk:[I -Lcom/android/internal/R$styleable;->AndroidManifestUsesSdk_minSdkVersion:I -Lcom/android/internal/R$styleable;->AndroidManifestUsesSdk_targetSdkVersion:I -Lcom/android/internal/R$styleable;->AndroidManifest_installLocation:I -Lcom/android/internal/R$styleable;->AndroidManifest_sharedUserId:I -Lcom/android/internal/R$styleable;->AndroidManifest_versionCode:I -Lcom/android/internal/R$styleable;->AndroidManifest_versionName:I -Lcom/android/internal/R$styleable;->CheckBoxPreference:[I -Lcom/android/internal/R$styleable;->CheckBoxPreference_disableDependentsState:I -Lcom/android/internal/R$styleable;->CheckBoxPreference_summaryOff:I -Lcom/android/internal/R$styleable;->CheckBoxPreference_summaryOn:I -Lcom/android/internal/R$styleable;->CompoundButton:[I -Lcom/android/internal/R$styleable;->CompoundButton_button:I -Lcom/android/internal/R$styleable;->CompoundButton_checked:I -Lcom/android/internal/R$styleable;->DialogPreference:[I -Lcom/android/internal/R$styleable;->DialogPreference_dialogTitle:I -Lcom/android/internal/R$styleable;->EdgeEffect:[I -Lcom/android/internal/R$styleable;->EdgeEffect_colorEdgeEffect:I -Lcom/android/internal/R$styleable;->GridView:[I -Lcom/android/internal/R$styleable;->IconMenuView:[I -Lcom/android/internal/R$styleable;->ImageView:[I -Lcom/android/internal/R$styleable;->ImageView_scaleType:I -Lcom/android/internal/R$styleable;->ImageView_src:I -Lcom/android/internal/R$styleable;->ListPreference:[I -Lcom/android/internal/R$styleable;->ListPreference_entries:I -Lcom/android/internal/R$styleable;->ListView:[I -Lcom/android/internal/R$styleable;->ListView_divider:I -Lcom/android/internal/R$styleable;->ListView_dividerHeight:I -Lcom/android/internal/R$styleable;->ListView_entries:I -Lcom/android/internal/R$styleable;->ListView_footerDividersEnabled:I -Lcom/android/internal/R$styleable;->ListView_headerDividersEnabled:I -Lcom/android/internal/R$styleable;->ListView_overScrollFooter:I -Lcom/android/internal/R$styleable;->ListView_overScrollHeader:I -Lcom/android/internal/R$styleable;->NumberPicker:[I -Lcom/android/internal/R$styleable;->PopupWindow:[I -Lcom/android/internal/R$styleable;->Preference:[I -Lcom/android/internal/R$styleable;->PreferenceGroup:[I -Lcom/android/internal/R$styleable;->PreferenceGroup_orderingFromXml:I -Lcom/android/internal/R$styleable;->Preference_defaultValue:I -Lcom/android/internal/R$styleable;->Preference_dependency:I -Lcom/android/internal/R$styleable;->Preference_enabled:I -Lcom/android/internal/R$styleable;->Preference_fragment:I -Lcom/android/internal/R$styleable;->Preference_icon:I -Lcom/android/internal/R$styleable;->Preference_key:I -Lcom/android/internal/R$styleable;->Preference_layout:I -Lcom/android/internal/R$styleable;->Preference_order:I -Lcom/android/internal/R$styleable;->Preference_persistent:I -Lcom/android/internal/R$styleable;->Preference_selectable:I -Lcom/android/internal/R$styleable;->Preference_shouldDisableView:I -Lcom/android/internal/R$styleable;->Preference_summary:I -Lcom/android/internal/R$styleable;->Preference_title:I -Lcom/android/internal/R$styleable;->Preference_widgetLayout:I -Lcom/android/internal/R$styleable;->ScrollView:[I -Lcom/android/internal/R$styleable;->ScrollView_fillViewport:I -Lcom/android/internal/R$styleable;->SyncAdapter:[I -Lcom/android/internal/R$styleable;->SyncAdapter_accountType:I -Lcom/android/internal/R$styleable;->SyncAdapter_allowParallelSyncs:I -Lcom/android/internal/R$styleable;->SyncAdapter_contentAuthority:I -Lcom/android/internal/R$styleable;->SyncAdapter_isAlwaysSyncable:I -Lcom/android/internal/R$styleable;->SyncAdapter_settingsActivity:I -Lcom/android/internal/R$styleable;->SyncAdapter_supportsUploading:I -Lcom/android/internal/R$styleable;->SyncAdapter_userVisible:I -Lcom/android/internal/R$styleable;->TabWidget:[I -Lcom/android/internal/R$styleable;->TextAppearance:[I -Lcom/android/internal/R$styleable;->TextView:[I -Lcom/android/internal/R$styleable;->TextViewAppearance:[I -Lcom/android/internal/R$styleable;->TextView_drawableBottom:I -Lcom/android/internal/R$styleable;->TextView_drawableLeft:I -Lcom/android/internal/R$styleable;->TextView_drawableRight:I -Lcom/android/internal/R$styleable;->TextView_drawableTop:I -Lcom/android/internal/R$styleable;->TextView_maxLines:I -Lcom/android/internal/R$styleable;->TextView_textColor:I -Lcom/android/internal/R$styleable;->TextView_textColorHint:I -Lcom/android/internal/R$styleable;->TwoLineListItem:[I -Lcom/android/internal/R$styleable;->View:[I -Lcom/android/internal/R$styleable;->ViewGroup_Layout:[I -Lcom/android/internal/R$styleable;->ViewGroup_Layout_layout_height:I -Lcom/android/internal/R$styleable;->ViewGroup_Layout_layout_width:I -Lcom/android/internal/R$styleable;->ViewStub:[I -Lcom/android/internal/R$styleable;->ViewStub_inflatedId:I -Lcom/android/internal/R$styleable;->ViewStub_layout:I -Lcom/android/internal/R$styleable;->View_background:I -Lcom/android/internal/R$styleable;->View_id:I -Lcom/android/internal/R$styleable;->Window:[I -Lcom/android/internal/R$styleable;->Window_windowActionBarFullscreenDecorLayout:I -Lcom/android/internal/R$styleable;->Window_windowIsFloating:I -Lcom/android/internal/R$styleable;->Window_windowIsTranslucent:I -Lcom/android/internal/R$styleable;->Window_windowShowWallpaper:I -Lcom/android/internal/R$xml;->power_profile:I -Lcom/android/internal/app/AlertController$AlertParams;->mIconId:I -Lcom/android/internal/app/AlertController$AlertParams;->mMessage:Ljava/lang/CharSequence; -Lcom/android/internal/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener; -Lcom/android/internal/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence; -Lcom/android/internal/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener; -Lcom/android/internal/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence; -Lcom/android/internal/app/AlertController$AlertParams;->mTitle:Ljava/lang/CharSequence; -Lcom/android/internal/app/AlertController$AlertParams;->mView:Landroid/view/View; -Lcom/android/internal/app/AlertController$RecycleListView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V -Lcom/android/internal/app/AlertController;->getButton(I)Landroid/widget/Button; -Lcom/android/internal/app/AlertController;->mCustomTitleView:Landroid/view/View; -Lcom/android/internal/app/AlertController;->mForceInverseBackground:Z -Lcom/android/internal/app/AlertController;->mTitle:Ljava/lang/CharSequence; -Lcom/android/internal/app/AlertController;->mView:Landroid/view/View; -Lcom/android/internal/app/IAppOpsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->checkOperation(IILjava/lang/String;)I -Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->setMode(IILjava/lang/String;I)V -Lcom/android/internal/app/IAppOpsService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IAppOpsService; -Lcom/android/internal/app/IAppOpsService;->finishOperation(Landroid/os/IBinder;IILjava/lang/String;)V -Lcom/android/internal/app/IBatteryStats$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/app/IBatteryStats$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IBatteryStats; -Lcom/android/internal/app/IBatteryStats;->getStatistics()[B -Lcom/android/internal/app/IVoiceInteractionManagerService$Stub$Proxy;->showSessionFromSession(Landroid/os/IBinder;Landroid/os/Bundle;I)Z -Lcom/android/internal/app/IVoiceInteractionManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/app/IVoiceInteractionManagerService; -Lcom/android/internal/app/IVoiceInteractionManagerService;->getKeyphraseSoundModel(ILjava/lang/String;)Landroid/hardware/soundtrigger/SoundTrigger$KeyphraseSoundModel; -Lcom/android/internal/appwidget/IAppWidgetService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/appwidget/IAppWidgetService; -Lcom/android/internal/content/PackageMonitor;-><init>()V -Lcom/android/internal/content/PackageMonitor;->register(Landroid/content/Context;Landroid/os/Looper;Landroid/os/UserHandle;Z)V -Lcom/android/internal/content/PackageMonitor;->unregister()V -Lcom/android/internal/content/ReferrerIntent;-><init>(Landroid/content/Intent;Ljava/lang/String;)V -Lcom/android/internal/content/ReferrerIntent;->mReferrer:Ljava/lang/String; -Lcom/android/internal/location/ILocationProvider$Stub;-><init>()V -Lcom/android/internal/location/ILocationProvider$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/location/ILocationProvider; -Lcom/android/internal/location/ILocationProvider;->disable()V -Lcom/android/internal/location/ILocationProvider;->enable()V -Lcom/android/internal/location/ILocationProvider;->getProperties()Lcom/android/internal/location/ProviderProperties; -Lcom/android/internal/location/ILocationProvider;->getStatus(Landroid/os/Bundle;)I -Lcom/android/internal/location/ILocationProvider;->getStatusUpdateTime()J -Lcom/android/internal/location/ILocationProvider;->sendExtraCommand(Ljava/lang/String;Landroid/os/Bundle;)Z -Lcom/android/internal/location/ILocationProvider;->setRequest(Lcom/android/internal/location/ProviderRequest;Landroid/os/WorkSource;)V -Lcom/android/internal/location/ProviderRequest;-><init>()V -Lcom/android/internal/location/ProviderRequest;->interval:J -Lcom/android/internal/location/ProviderRequest;->locationRequests:Ljava/util/List; -Lcom/android/internal/location/ProviderRequest;->reportLocation:Z -Lcom/android/internal/os/BatterySipper;-><init>(Lcom/android/internal/os/BatterySipper$DrainType;Landroid/os/BatteryStats$Uid;D)V -Lcom/android/internal/os/BatterySipper;->add(Lcom/android/internal/os/BatterySipper;)V -Lcom/android/internal/os/BatterySipper;->drainType:Lcom/android/internal/os/BatterySipper$DrainType; -Lcom/android/internal/os/BatterySipper;->getUid()I -Lcom/android/internal/os/BatterySipper;->mPackages:[Ljava/lang/String; -Lcom/android/internal/os/BatterySipper;->packageWithHighestDrain:Ljava/lang/String; -Lcom/android/internal/os/BatterySipper;->totalPowerMah:D -Lcom/android/internal/os/BatterySipper;->uidObj:Landroid/os/BatteryStats$Uid; -Lcom/android/internal/os/BatteryStatsHelper;-><init>(Landroid/content/Context;ZZ)V -Lcom/android/internal/os/BatteryStatsHelper;->getMaxPower()D -Lcom/android/internal/os/BatteryStatsHelper;->getStats()Landroid/os/BatteryStats; -Lcom/android/internal/os/BatteryStatsHelper;->getTotalPower()D -Lcom/android/internal/os/BatteryStatsHelper;->load()V -Lcom/android/internal/os/BatteryStatsHelper;->mBatteryInfo:Lcom/android/internal/app/IBatteryStats; -Lcom/android/internal/os/BatteryStatsHelper;->mPowerProfile:Lcom/android/internal/os/PowerProfile; -Lcom/android/internal/os/BatteryStatsHelper;->mUsageList:Ljava/util/List; -Lcom/android/internal/os/BatteryStatsHelper;->refreshStats(II)V -Lcom/android/internal/os/BatteryStatsImpl$Timer;->getCountLocked(I)I -Lcom/android/internal/os/BatteryStatsImpl$Timer;->getTotalTimeLocked(JI)J -Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getForegroundTime(I)J -Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getStarts(I)I -Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getSystemTime(I)J -Lcom/android/internal/os/BatteryStatsImpl$Uid$Proc;->getUserTime(I)J -Lcom/android/internal/os/BatteryStatsImpl$Uid$Sensor;->getHandle()I -Lcom/android/internal/os/BatteryStatsImpl$Uid$Sensor;->getSensorTime()Lcom/android/internal/os/BatteryStatsImpl$Timer; -Lcom/android/internal/os/BatteryStatsImpl$Uid$Wakelock;->getWakeTime(I)Lcom/android/internal/os/BatteryStatsImpl$Timer; -Lcom/android/internal/os/BatteryStatsImpl$Uid;->getProcessStats()Landroid/util/ArrayMap; -Lcom/android/internal/os/BatteryStatsImpl$Uid;->getSensorStats()Landroid/util/SparseArray; -Lcom/android/internal/os/BatteryStatsImpl$Uid;->getUid()I -Lcom/android/internal/os/BatteryStatsImpl$Uid;->getWakelockStats()Landroid/util/ArrayMap; -Lcom/android/internal/os/BatteryStatsImpl$Uid;->getWifiRunningTime(JI)J -Lcom/android/internal/os/BatteryStatsImpl$Uid;->getWifiScanTime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/os/BatteryStatsImpl;->computeBatteryRealtime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->computeBatteryUptime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->getBatteryRealtime(J)J -Lcom/android/internal/os/BatteryStatsImpl;->getDischargeAmount(I)I -Lcom/android/internal/os/BatteryStatsImpl;->getDischargeCurrentLevel()I -Lcom/android/internal/os/BatteryStatsImpl;->getDischargeStartLevel()I -Lcom/android/internal/os/BatteryStatsImpl;->getGlobalWifiRunningTime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->getPhoneOnTime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->getPhoneSignalScanningTime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->getPhoneSignalStrengthTime(IJI)J -Lcom/android/internal/os/BatteryStatsImpl;->getScreenBrightnessTime(IJI)J -Lcom/android/internal/os/BatteryStatsImpl;->getScreenOnTime(JI)J -Lcom/android/internal/os/BatteryStatsImpl;->getUidStats()Landroid/util/SparseArray; -Lcom/android/internal/os/BatteryStatsImpl;->getUidStatsLocked(I)Lcom/android/internal/os/BatteryStatsImpl$Uid; -Lcom/android/internal/os/BatteryStatsImpl;->getWifiOnTime(JI)J -Lcom/android/internal/os/FuseAppLoop;->onCommand(IJJJI[B)V -Lcom/android/internal/os/FuseAppLoop;->onOpen(JJ)[B -Lcom/android/internal/os/IDropBoxManagerService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/os/IDropBoxManagerService; -Lcom/android/internal/os/PowerProfile;-><init>(Landroid/content/Context;)V -Lcom/android/internal/os/PowerProfile;->getAveragePower(Ljava/lang/String;)D -Lcom/android/internal/os/PowerProfile;->getAveragePower(Ljava/lang/String;I)D -Lcom/android/internal/os/PowerProfile;->getBatteryCapacity()D -Lcom/android/internal/os/SomeArgs;->arg1:Ljava/lang/Object; -Lcom/android/internal/os/SomeArgs;->arg2:Ljava/lang/Object; -Lcom/android/internal/os/SomeArgs;->arg3:Ljava/lang/Object; -Lcom/android/internal/os/SomeArgs;->obtain()Lcom/android/internal/os/SomeArgs; -Lcom/android/internal/os/SomeArgs;->recycle()V -Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPacked(Ljava/lang/String;)[B -Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms; -Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneSubInfo; -Lcom/android/internal/telephony/ISms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISms; -Lcom/android/internal/telephony/ISub$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/telephony/ITelephony$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->endCall()Z -Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->mRemote:Landroid/os/IBinder; -Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_call:I -Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_endCall:I -Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_getDeviceId:I -Lcom/android/internal/telephony/ITelephony$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephony; -Lcom/android/internal/telephony/ITelephony;->answerRingingCall()V -Lcom/android/internal/telephony/ITelephony;->call(Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/ITelephony;->dial(Ljava/lang/String;)V -Lcom/android/internal/telephony/ITelephony;->disableDataConnectivity()Z -Lcom/android/internal/telephony/ITelephony;->enableDataConnectivity()Z -Lcom/android/internal/telephony/ITelephony;->endCall()Z -Lcom/android/internal/telephony/ITelephony;->endCallForSubscriber(I)Z -Lcom/android/internal/telephony/ITelephony;->getCallState()I -Lcom/android/internal/telephony/ITelephony;->getDataEnabled(I)Z -Lcom/android/internal/telephony/ITelephony;->getDataState()I -Lcom/android/internal/telephony/ITelephony;->isIdle(Ljava/lang/String;)Z -Lcom/android/internal/telephony/ITelephony;->setRadio(Z)Z -Lcom/android/internal/telephony/ITelephony;->silenceRinger()V -Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry; -Lcom/android/internal/telephony/ITelephonyRegistry;->notifyCallState(ILjava/lang/String;)V -Lcom/android/internal/telephony/OperatorInfo$State;->CURRENT:Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/OperatorInfo$State;->FORBIDDEN:Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/OperatorInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaLong()Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaShort()Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->getOperatorNumeric()Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->getState()Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/SmsHeader$ConcatRef;->msgCount:I -Lcom/android/internal/telephony/SmsHeader$ConcatRef;->refNumber:I -Lcom/android/internal/telephony/SmsHeader$ConcatRef;->seqNumber:I -Lcom/android/internal/telephony/SmsHeader;->concatRef:Lcom/android/internal/telephony/SmsHeader$ConcatRef; -Lcom/android/internal/telephony/SmsMessageBase;->mUserDataHeader:Lcom/android/internal/telephony/SmsHeader; -Lcom/android/internal/telephony/SmsRawData;-><init>([B)V -Lcom/android/internal/telephony/SmsRawData;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/textservice/ITextServicesManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/util/AsyncChannel;-><init>()V -Lcom/android/internal/util/AsyncChannel;->connect(Landroid/content/Context;Landroid/os/Handler;Landroid/os/Messenger;)V -Lcom/android/internal/util/AsyncChannel;->sendMessage(III)V -Lcom/android/internal/util/AsyncChannel;->sendMessage(Landroid/os/Message;)V -Lcom/android/internal/util/FastPrintWriter;-><init>(Ljava/io/OutputStream;)V -Lcom/android/internal/util/IndentingPrintWriter;-><init>(Ljava/io/Writer;Ljava/lang/String;)V -Lcom/android/internal/util/IndentingPrintWriter;->decreaseIndent()Lcom/android/internal/util/IndentingPrintWriter; -Lcom/android/internal/util/IndentingPrintWriter;->increaseIndent()Lcom/android/internal/util/IndentingPrintWriter; -Lcom/android/internal/util/XmlUtils;->beginDocument(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)V -Lcom/android/internal/util/XmlUtils;->nextElement(Lorg/xmlpull/v1/XmlPullParser;)V -Lcom/android/internal/util/XmlUtils;->readMapXml(Ljava/io/InputStream;)Ljava/util/HashMap; -Lcom/android/internal/util/XmlUtils;->skipCurrentTag(Lorg/xmlpull/v1/XmlPullParser;)V -Lcom/android/internal/util/XmlUtils;->writeMapXml(Ljava/util/Map;Ljava/io/OutputStream;)V -Lcom/android/internal/view/IInputConnectionWrapper;->mInputConnection:Landroid/view/inputmethod/InputConnection; -Lcom/android/internal/view/IInputConnectionWrapper;->mLock:Ljava/lang/Object; -Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V -Lcom/android/internal/view/IInputMethodManager$Stub$Proxy;->getEnabledInputMethodList()Ljava/util/List; -Lcom/android/internal/view/IInputMethodManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/view/IInputMethodManager; -Lcom/android/internal/view/InputBindResult;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/view/menu/MenuBuilder;-><init>(Landroid/content/Context;)V -Lcom/android/internal/view/menu/MenuBuilder;->mContext:Landroid/content/Context; -Lcom/android/internal/view/menu/MenuBuilder;->setCurrentMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V -Lcom/android/internal/view/menu/MenuBuilder;->setOptionalIconsVisible(Z)V -Lcom/android/internal/view/menu/MenuItemImpl;->mIconResId:I -Lcom/android/internal/view/menu/MenuItemImpl;->setMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V -Lcom/android/internal/view/menu/MenuPopupHelper;->mForceShowIcon:Z -Lcom/android/internal/view/menu/MenuPopupHelper;->setForceShowIcon(Z)V -Lcom/android/internal/view/menu/MenuView$ItemView;->getItemData()Lcom/android/internal/view/menu/MenuItemImpl; -Lcom/android/okhttp/ConnectionPool;->keepAliveDurationNs:J -Lcom/android/okhttp/ConnectionPool;->maxIdleConnections:I -Lcom/android/okhttp/ConnectionPool;->systemDefault:Lcom/android/okhttp/ConnectionPool; -Lcom/android/okhttp/HttpUrl;->encodedPath()Ljava/lang/String; -Lcom/android/okhttp/HttpUrl;->query()Ljava/lang/String; -Lcom/android/okhttp/OkHttpClient;->DEFAULT_PROTOCOLS:Ljava/util/List; -Lcom/android/okhttp/OkHttpClient;->connectionPool:Lcom/android/okhttp/ConnectionPool; -Lcom/android/okhttp/OkHttpClient;->dns:Lcom/android/okhttp/Dns; -Lcom/android/okhttp/OkHttpClient;->setProtocols(Ljava/util/List;)Lcom/android/okhttp/OkHttpClient; -Lcom/android/okhttp/OkHttpClient;->setRetryOnConnectionFailure(Z)V -Lcom/android/okhttp/Request;->headers:Lcom/android/okhttp/Headers; -Lcom/android/okhttp/Request;->method:Ljava/lang/String; -Lcom/android/okhttp/Request;->url:Lcom/android/okhttp/HttpUrl; -Lcom/android/okhttp/Response;->code:I -Lcom/android/okhttp/Response;->headers:Lcom/android/okhttp/Headers; -Lcom/android/okhttp/Response;->message:Ljava/lang/String; -Lcom/android/okhttp/Response;->networkResponse:Lcom/android/okhttp/Response; -Lcom/android/okhttp/Response;->protocol:Lcom/android/okhttp/Protocol; -Lcom/android/okhttp/internal/http/HttpEngine;->httpStream:Lcom/android/okhttp/internal/http/HttpStream; -Lcom/android/okhttp/internal/http/HttpEngine;->networkRequest(Lcom/android/okhttp/Request;)Lcom/android/okhttp/Request; -Lcom/android/okhttp/internal/http/HttpEngine;->networkRequest:Lcom/android/okhttp/Request; -Lcom/android/okhttp/internal/http/HttpEngine;->priorResponse:Lcom/android/okhttp/Response; -Lcom/android/okhttp/internal/http/HttpEngine;->userResponse:Lcom/android/okhttp/Response; -Lcom/android/okhttp/okio/ByteString;->readObject(Ljava/io/ObjectInputStream;)V -Lcom/android/okhttp/okio/ByteString;->serialVersionUID:J -Lcom/android/okhttp/okio/ByteString;->writeObject(Ljava/io/ObjectOutputStream;)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getAlpnSelectedProtocol()[B -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocol()Ljava/lang/String; -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getApplicationProtocols()[Ljava/lang/String; -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getChannelId()[B -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHandshakeApplicationProtocol()Ljava/lang/String; -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostname()Ljava/lang/String; -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getHostnameOrIP()Ljava/lang/String; -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getNpnSelectedProtocol()[B -Lcom/android/org/conscrypt/AbstractConscryptSocket;->getSoWriteTimeout()I -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([B)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setAlpnProtocols([Ljava/lang/String;)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setApplicationProtocols([Ljava/lang/String;)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setChannelIdEnabled(Z)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setHandshakeTimeout(I)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setHostname(Ljava/lang/String;)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setNpnProtocols([B)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setSoWriteTimeout(I)V -Lcom/android/org/conscrypt/AbstractConscryptSocket;->setUseSessionTickets(Z)V -Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostname()Ljava/lang/String; -Lcom/android/org/conscrypt/ConscryptSocketBase;->getHostnameOrIP()Ljava/lang/String; -Lcom/android/org/conscrypt/ConscryptSocketBase;->getSoWriteTimeout()I -Lcom/android/org/conscrypt/ConscryptSocketBase;->setHandshakeTimeout(I)V -Lcom/android/org/conscrypt/ConscryptSocketBase;->setHostname(Ljava/lang/String;)V -Lcom/android/org/conscrypt/ConscryptSocketBase;->setSoWriteTimeout(I)V -Lcom/android/org/conscrypt/ConscryptSocketBase;->socket:Ljava/net/Socket; -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String; -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostnameOrIP()Ljava/lang/String; -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getNpnSelectedProtocol()[B -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getSoWriteTimeout()I -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([B)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setAlpnProtocols([Ljava/lang/String;)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdEnabled(Z)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setChannelIdPrivateKey(Ljava/security/PrivateKey;)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHandshakeTimeout(I)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setHostname(Ljava/lang/String;)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setNpnProtocols([B)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setSoWriteTimeout(I)V -Lcom/android/org/conscrypt/OpenSSLSocketImpl;->setUseSessionTickets(Z)V -Lcom/android/org/conscrypt/OpenSSLX509Certificate;->mContext:J -Lcom/android/org/conscrypt/OpenSSLX509Certificate;->serialVersionUID:J -Lcom/android/org/conscrypt/OpenSSLX509CertificateFactory$ParsingException;->serialVersionUID:J -Lcom/android/org/conscrypt/TrustManagerImpl;-><init>(Ljava/security/KeyStore;)V -Ldalvik/system/BaseDexClassLoader;->addDexPath(Ljava/lang/String;)V -Ldalvik/system/BaseDexClassLoader;->getLdLibraryPath()Ljava/lang/String; -Ldalvik/system/BaseDexClassLoader;->pathList:Ldalvik/system/DexPathList; -Ldalvik/system/BlockGuard$Policy;->onNetwork()V -Ldalvik/system/BlockGuard$Policy;->onReadFromDisk()V -Ldalvik/system/BlockGuard;->getThreadPolicy()Ldalvik/system/BlockGuard$Policy; -Ldalvik/system/CloseGuard;->close()V -Ldalvik/system/CloseGuard;->get()Ldalvik/system/CloseGuard; -Ldalvik/system/CloseGuard;->open(Ljava/lang/String;)V -Ldalvik/system/CloseGuard;->warnIfOpen()V -Ldalvik/system/DexFile$DFEnum;->mNameList:[Ljava/lang/String; -Ldalvik/system/DexFile;->getClassNameList(Ljava/lang/Object;)[Ljava/lang/String; -Ldalvik/system/DexFile;->isBackedByOatFile()Z -Ldalvik/system/DexFile;->loadClassBinaryName(Ljava/lang/String;Ljava/lang/ClassLoader;Ljava/util/List;)Ljava/lang/Class; -Ldalvik/system/DexFile;->mCookie:Ljava/lang/Object; -Ldalvik/system/DexFile;->mFileName:Ljava/lang/String; -Ldalvik/system/DexFile;->mInternalCookie:Ljava/lang/Object; -Ldalvik/system/DexFile;->openDexFile(Ljava/lang/String;Ljava/lang/String;ILjava/lang/ClassLoader;[Ldalvik/system/DexPathList$Element;)Ljava/lang/Object; -Ldalvik/system/DexPathList$Element;-><init>(Ldalvik/system/DexFile;Ljava/io/File;)V -Ldalvik/system/DexPathList$Element;-><init>(Ljava/io/File;ZLjava/io/File;Ldalvik/system/DexFile;)V -Ldalvik/system/DexPathList$Element;->dexFile:Ldalvik/system/DexFile; -Ldalvik/system/DexPathList$NativeLibraryElement;-><init>(Ljava/io/File;)V -Ldalvik/system/DexPathList$NativeLibraryElement;->path:Ljava/io/File; -Ldalvik/system/DexPathList;-><init>(Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)V -Ldalvik/system/DexPathList;->addDexPath(Ljava/lang/String;Ljava/io/File;)V -Ldalvik/system/DexPathList;->definingContext:Ljava/lang/ClassLoader; -Ldalvik/system/DexPathList;->dexElements:[Ldalvik/system/DexPathList$Element; -Ldalvik/system/DexPathList;->loadDexFile(Ljava/io/File;Ljava/io/File;Ljava/lang/ClassLoader;[Ldalvik/system/DexPathList$Element;)Ldalvik/system/DexFile; -Ldalvik/system/DexPathList;->makeDexElements(Ljava/util/List;Ljava/io/File;Ljava/util/List;Ljava/lang/ClassLoader;)[Ldalvik/system/DexPathList$Element; -Ldalvik/system/DexPathList;->makeInMemoryDexElements([Ljava/nio/ByteBuffer;Ljava/util/List;)[Ldalvik/system/DexPathList$Element; -Ldalvik/system/DexPathList;->makePathElements(Ljava/util/List;)[Ldalvik/system/DexPathList$NativeLibraryElement; -Ldalvik/system/DexPathList;->makePathElements(Ljava/util/List;Ljava/io/File;Ljava/util/List;)[Ldalvik/system/DexPathList$Element; -Ldalvik/system/DexPathList;->nativeLibraryDirectories:Ljava/util/List; -Ldalvik/system/DexPathList;->nativeLibraryPathElements:[Ldalvik/system/DexPathList$NativeLibraryElement; -Ldalvik/system/DexPathList;->splitPaths(Ljava/lang/String;Z)Ljava/util/List; -Ldalvik/system/DexPathList;->systemNativeLibraryDirectories:Ljava/util/List; -Ldalvik/system/VMDebug;->dumpReferenceTables()V -Ldalvik/system/VMDebug;->isDebuggerConnected()Z -Ldalvik/system/VMRuntime;->addressOf(Ljava/lang/Object;)J -Ldalvik/system/VMRuntime;->clearGrowthLimit()V -Ldalvik/system/VMRuntime;->gcSoftReferences()V -Ldalvik/system/VMRuntime;->getCurrentInstructionSet()Ljava/lang/String; -Ldalvik/system/VMRuntime;->getExternalBytesAllocated()J -Ldalvik/system/VMRuntime;->getInstructionSet(Ljava/lang/String;)Ljava/lang/String; -Ldalvik/system/VMRuntime;->getRuntime()Ldalvik/system/VMRuntime; -Ldalvik/system/VMRuntime;->is64Bit()Z -Ldalvik/system/VMRuntime;->is64BitAbi(Ljava/lang/String;)Z -Ldalvik/system/VMRuntime;->newNonMovableArray(Ljava/lang/Class;I)Ljava/lang/Object; -Ldalvik/system/VMRuntime;->registerNativeAllocation(I)V -Ldalvik/system/VMRuntime;->registerNativeFree(I)V -Ldalvik/system/VMRuntime;->runFinalization(J)V -Ldalvik/system/VMRuntime;->setMinimumHeapSize(J)J -Ldalvik/system/VMRuntime;->setTargetHeapUtilization(F)F -Ldalvik/system/VMRuntime;->setTargetSdkVersion(I)V -Ldalvik/system/VMRuntime;->trackExternalAllocation(J)Z -Ldalvik/system/VMRuntime;->trackExternalFree(J)V -Ldalvik/system/VMRuntime;->vmInstructionSet()Ljava/lang/String; -Ldalvik/system/VMRuntime;->vmLibrary()Ljava/lang/String; -Ldalvik/system/VMStack;->getCallingClassLoader()Ljava/lang/ClassLoader; -Ldalvik/system/VMStack;->getStackClass2()Ljava/lang/Class; -Ljava/awt/font/NumericShaper;->serialVersionUID:J -Ljava/awt/font/NumericShaper;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/awt/font/TextAttribute;->serialVersionUID:J -Ljava/beans/IndexedPropertyChangeEvent;->serialVersionUID:J -Ljava/beans/PropertyChangeEvent;->serialVersionUID:J -Ljava/beans/PropertyChangeSupport;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/beans/PropertyChangeSupport;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/beans/PropertyChangeSupport;->serialVersionUID:J -Ljava/beans/PropertyChangeSupport;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/io/CharConversionException;->serialVersionUID:J -Ljava/io/EOFException;->serialVersionUID:J -Ljava/io/File;->filePath:Ljava/nio/file/Path; -Ljava/io/File;->fs:Ljava/io/FileSystem; -Ljava/io/File;->path:Ljava/lang/String; -Ljava/io/File;->prefixLength:I -Ljava/io/File;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/io/File;->serialVersionUID:J -Ljava/io/File;->status:Ljava/io/File$PathStatus; -Ljava/io/File;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/io/FileDescriptor;->descriptor:I -Ljava/io/FileDescriptor;->getInt$()I -Ljava/io/FileDescriptor;->isSocket$()Z -Ljava/io/FileDescriptor;->setInt$(I)V -Ljava/io/FileInputStream;->fd:Ljava/io/FileDescriptor; -Ljava/io/FileNotFoundException;->serialVersionUID:J -Ljava/io/FileOutputStream;->fd:Ljava/io/FileDescriptor; -Ljava/io/IOError;->serialVersionUID:J -Ljava/io/IOException;->serialVersionUID:J -Ljava/io/InterruptedIOException;->serialVersionUID:J -Ljava/io/InvalidClassException;->serialVersionUID:J -Ljava/io/InvalidObjectException;->serialVersionUID:J -Ljava/io/NotActiveException;->serialVersionUID:J -Ljava/io/NotSerializableException;->serialVersionUID:J -Ljava/io/ObjectStreamClass;->getConstructorId(Ljava/lang/Class;)J -Ljava/io/ObjectStreamClass;->newInstance()Ljava/lang/Object; -Ljava/io/ObjectStreamClass;->newInstance(Ljava/lang/Class;J)Ljava/lang/Object; -Ljava/io/ObjectStreamClass;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/io/ObjectStreamClass;->serialVersionUID:J -Ljava/io/ObjectStreamException;->serialVersionUID:J -Ljava/io/OptionalDataException;->serialVersionUID:J -Ljava/io/StreamCorruptedException;->serialVersionUID:J -Ljava/io/SyncFailedException;->serialVersionUID:J -Ljava/io/UTFDataFormatException;->serialVersionUID:J -Ljava/io/UncheckedIOException;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/io/UncheckedIOException;->serialVersionUID:J -Ljava/io/UnsupportedEncodingException;->serialVersionUID:J -Ljava/io/WriteAbortedException;->serialVersionUID:J -Ljava/lang/AbstractMethodError;->serialVersionUID:J -Ljava/lang/AbstractStringBuilder;->value:[C -Ljava/lang/ArithmeticException;->serialVersionUID:J -Ljava/lang/ArrayIndexOutOfBoundsException;->serialVersionUID:J -Ljava/lang/ArrayStoreException;->serialVersionUID:J -Ljava/lang/AssertionError;->serialVersionUID:J -Ljava/lang/Boolean;->serialVersionUID:J -Ljava/lang/Boolean;->value:Z -Ljava/lang/BootstrapMethodError;->serialVersionUID:J -Ljava/lang/Byte;->serialVersionUID:J -Ljava/lang/Byte;->value:B -Ljava/lang/Character;->serialVersionUID:J -Ljava/lang/Character;->value:C -Ljava/lang/Class;->accessFlags:I -Ljava/lang/Class;->dexCache:Ljava/lang/Object; -Ljava/lang/Class;->dexClassDefIndex:I -Ljava/lang/Class;->ifTable:[Ljava/lang/Object; -Ljava/lang/Class;->serialVersionUID:J -Ljava/lang/ClassCastException;->serialVersionUID:J -Ljava/lang/ClassCircularityError;->serialVersionUID:J -Ljava/lang/ClassFormatError;->serialVersionUID:J -Ljava/lang/ClassLoader;->parent:Ljava/lang/ClassLoader; -Ljava/lang/ClassNotFoundException;->serialVersionUID:J -Ljava/lang/CloneNotSupportedException;->serialVersionUID:J -Ljava/lang/Daemons$Daemon;->isRunning()Z -Ljava/lang/Daemons$Daemon;->start()V -Ljava/lang/Daemons$Daemon;->stop()V -Ljava/lang/Daemons$Daemon;->thread:Ljava/lang/Thread; -Ljava/lang/Daemons$FinalizerDaemon;->INSTANCE:Ljava/lang/Daemons$FinalizerDaemon; -Ljava/lang/Daemons$FinalizerDaemon;->finalizingObject:Ljava/lang/Object; -Ljava/lang/Daemons$FinalizerWatchdogDaemon;->INSTANCE:Ljava/lang/Daemons$FinalizerWatchdogDaemon; -Ljava/lang/Daemons$ReferenceQueueDaemon;->INSTANCE:Ljava/lang/Daemons$ReferenceQueueDaemon; -Ljava/lang/Daemons;->MAX_FINALIZE_NANOS:J -Ljava/lang/Daemons;->requestHeapTrim()V -Ljava/lang/Daemons;->start()V -Ljava/lang/Daemons;->stop()V -Ljava/lang/Double;->serialVersionUID:J -Ljava/lang/Double;->value:D -Ljava/lang/Enum;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/lang/Enum;->readObjectNoData()V -Ljava/lang/EnumConstantNotPresentException;->serialVersionUID:J -Ljava/lang/Error;->serialVersionUID:J -Ljava/lang/Exception;->serialVersionUID:J -Ljava/lang/ExceptionInInitializerError;->serialVersionUID:J -Ljava/lang/Float;->serialVersionUID:J -Ljava/lang/Float;->value:F -Ljava/lang/IllegalAccessError;->serialVersionUID:J -Ljava/lang/IllegalAccessException;->serialVersionUID:J -Ljava/lang/IllegalArgumentException;->serialVersionUID:J -Ljava/lang/IllegalMonitorStateException;->serialVersionUID:J -Ljava/lang/IllegalStateException;->serialVersionUID:J -Ljava/lang/IllegalThreadStateException;->serialVersionUID:J -Ljava/lang/IncompatibleClassChangeError;->serialVersionUID:J -Ljava/lang/IndexOutOfBoundsException;->serialVersionUID:J -Ljava/lang/InstantiationError;->serialVersionUID:J -Ljava/lang/InstantiationException;->serialVersionUID:J -Ljava/lang/Integer;->serialVersionUID:J -Ljava/lang/Integer;->value:I -Ljava/lang/InternalError;->serialVersionUID:J -Ljava/lang/InterruptedException;->serialVersionUID:J -Ljava/lang/LinkageError;->serialVersionUID:J -Ljava/lang/Long;->serialVersionUID:J -Ljava/lang/Long;->value:J -Ljava/lang/NegativeArraySizeException;->serialVersionUID:J -Ljava/lang/NoClassDefFoundError;->serialVersionUID:J -Ljava/lang/NoSuchFieldError;->serialVersionUID:J -Ljava/lang/NoSuchFieldException;->serialVersionUID:J -Ljava/lang/NoSuchMethodError;->serialVersionUID:J -Ljava/lang/NoSuchMethodException;->serialVersionUID:J -Ljava/lang/NullPointerException;->serialVersionUID:J -Ljava/lang/Number;->serialVersionUID:J -Ljava/lang/NumberFormatException;->serialVersionUID:J -Ljava/lang/OutOfMemoryError;->serialVersionUID:J -Ljava/lang/ReflectiveOperationException;->serialVersionUID:J -Ljava/lang/Runtime;->load(Ljava/lang/String;Ljava/lang/ClassLoader;)V -Ljava/lang/Runtime;->loadLibrary(Ljava/lang/String;Ljava/lang/ClassLoader;)V -Ljava/lang/Runtime;->mLibPaths:[Ljava/lang/String; -Ljava/lang/Runtime;->nativeLoad(Ljava/lang/String;Ljava/lang/ClassLoader;)Ljava/lang/String; -Ljava/lang/RuntimeException;->serialVersionUID:J -Ljava/lang/RuntimePermission;->serialVersionUID:J -Ljava/lang/SecurityException;->serialVersionUID:J -Ljava/lang/Short;->serialVersionUID:J -Ljava/lang/Short;->value:S -Ljava/lang/StackOverflowError;->serialVersionUID:J -Ljava/lang/StackTraceElement;->serialVersionUID:J -Ljava/lang/String$CaseInsensitiveComparator;->readResolve()Ljava/lang/Object; -Ljava/lang/String$CaseInsensitiveComparator;->serialVersionUID:J -Ljava/lang/String;-><init>(II[C)V -Ljava/lang/String;->getCharsNoCheck(II[CI)V -Ljava/lang/String;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/lang/String;->serialVersionUID:J -Ljava/lang/StringBuffer;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/lang/StringBuffer;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/lang/StringBuffer;->serialVersionUID:J -Ljava/lang/StringBuffer;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/lang/StringBuilder;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/lang/StringBuilder;->serialVersionUID:J -Ljava/lang/StringBuilder;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/lang/StringIndexOutOfBoundsException;->serialVersionUID:J -Ljava/lang/System;-><init>()V -Ljava/lang/System;->arraycopy([BI[BII)V -Ljava/lang/System;->arraycopy([CI[CII)V -Ljava/lang/System;->arraycopy([II[III)V -Ljava/lang/Thread;-><init>(Ljava/lang/ThreadGroup;Ljava/lang/String;IZ)V -Ljava/lang/Thread;->contextClassLoader:Ljava/lang/ClassLoader; -Ljava/lang/Thread;->daemon:Z -Ljava/lang/Thread;->dispatchUncaughtException(Ljava/lang/Throwable;)V -Ljava/lang/Thread;->group:Ljava/lang/ThreadGroup; -Ljava/lang/Thread;->inheritableThreadLocals:Ljava/lang/ThreadLocal$ThreadLocalMap; -Ljava/lang/Thread;->lock:Ljava/lang/Object; -Ljava/lang/Thread;->name:Ljava/lang/String; -Ljava/lang/Thread;->nativePeer:J -Ljava/lang/Thread;->parkBlocker:Ljava/lang/Object; -Ljava/lang/Thread;->priority:I -Ljava/lang/Thread;->threadLocals:Ljava/lang/ThreadLocal$ThreadLocalMap; -Ljava/lang/ThreadDeath;->serialVersionUID:J -Ljava/lang/ThreadGroup;->add(Ljava/lang/Thread;)V -Ljava/lang/ThreadGroup;->groups:[Ljava/lang/ThreadGroup; -Ljava/lang/ThreadGroup;->mainThreadGroup:Ljava/lang/ThreadGroup; -Ljava/lang/ThreadGroup;->name:Ljava/lang/String; -Ljava/lang/ThreadGroup;->ngroups:I -Ljava/lang/ThreadGroup;->parent:Ljava/lang/ThreadGroup; -Ljava/lang/ThreadGroup;->systemThreadGroup:Ljava/lang/ThreadGroup; -Ljava/lang/ThreadGroup;->threadTerminated(Ljava/lang/Thread;)V -Ljava/lang/Throwable;->backtrace:Ljava/lang/Object; -Ljava/lang/Throwable;->cause:Ljava/lang/Throwable; -Ljava/lang/Throwable;->detailMessage:Ljava/lang/String; -Ljava/lang/Throwable;->nativeFillInStackTrace()Ljava/lang/Object; -Ljava/lang/Throwable;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/lang/Throwable;->serialVersionUID:J -Ljava/lang/Throwable;->stackTrace:[Ljava/lang/StackTraceElement; -Ljava/lang/Throwable;->suppressedExceptions:Ljava/util/List; -Ljava/lang/Throwable;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/lang/TypeNotPresentException;->serialVersionUID:J -Ljava/lang/UnknownError;->serialVersionUID:J -Ljava/lang/UnsatisfiedLinkError;->serialVersionUID:J -Ljava/lang/UnsupportedClassVersionError;->serialVersionUID:J -Ljava/lang/UnsupportedOperationException;->serialVersionUID:J -Ljava/lang/VerifyError;->serialVersionUID:J -Ljava/lang/VirtualMachineError;->serialVersionUID:J -Ljava/lang/Void;-><init>()V -Ljava/lang/annotation/AnnotationFormatError;->serialVersionUID:J -Ljava/lang/annotation/AnnotationTypeMismatchException;->serialVersionUID:J -Ljava/lang/annotation/IncompleteAnnotationException;->serialVersionUID:J -Ljava/lang/invoke/LambdaConversionException;->serialVersionUID:J -Ljava/lang/invoke/MethodHandles$Lookup;-><init>(Ljava/lang/Class;I)V -Ljava/lang/invoke/MethodType;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/lang/invoke/MethodType;->readResolve()Ljava/lang/Object; -Ljava/lang/invoke/MethodType;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/lang/invoke/MethodType;->serialVersionUID:J -Ljava/lang/invoke/MethodType;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/lang/invoke/WrongMethodTypeException;->serialVersionUID:J -Ljava/lang/ref/FinalizerReference;->add(Ljava/lang/Object;)V -Ljava/lang/ref/FinalizerReference;->head:Ljava/lang/ref/FinalizerReference; -Ljava/lang/ref/FinalizerReference;->next:Ljava/lang/ref/FinalizerReference; -Ljava/lang/ref/FinalizerReference;->queue:Ljava/lang/ref/ReferenceQueue; -Ljava/lang/ref/FinalizerReference;->remove(Ljava/lang/ref/FinalizerReference;)V -Ljava/lang/ref/Reference;->getReferent()Ljava/lang/Object; -Ljava/lang/ref/Reference;->referent:Ljava/lang/Object; -Ljava/lang/ref/ReferenceQueue;->add(Ljava/lang/ref/Reference;)V -Ljava/lang/reflect/Executable;->artMethod:J -Ljava/lang/reflect/Field;->accessFlags:I -Ljava/lang/reflect/GenericSignatureFormatError;->serialVersionUID:J -Ljava/lang/reflect/InvocationTargetException;->serialVersionUID:J -Ljava/lang/reflect/MalformedParameterizedTypeException;->serialVersionUID:J -Ljava/lang/reflect/MalformedParametersException;->serialVersionUID:J -Ljava/lang/reflect/Parameter;-><init>(Ljava/lang/String;ILjava/lang/reflect/Executable;I)V -Ljava/lang/reflect/Proxy;->invoke(Ljava/lang/reflect/Proxy;Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object; -Ljava/lang/reflect/Proxy;->serialVersionUID:J -Ljava/lang/reflect/UndeclaredThrowableException;->serialVersionUID:J -Ljava/math/BigDecimal;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/math/BigDecimal;->serialVersionUID:J -Ljava/math/BigDecimal;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/math/BigInteger;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/math/BigInteger;->serialVersionUID:J -Ljava/math/BigInteger;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/math/MathContext;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/math/MathContext;->serialVersionUID:J -Ljava/net/Authenticator;->theAuthenticator:Ljava/net/Authenticator; -Ljava/net/BindException;->serialVersionUID:J -Ljava/net/ConnectException;->serialVersionUID:J -Ljava/net/DatagramSocket;->impl:Ljava/net/DatagramSocketImpl; -Ljava/net/HttpCookie;->assignors:Ljava/util/Map; -Ljava/net/HttpCookie;->comment:Ljava/lang/String; -Ljava/net/HttpCookie;->commentURL:Ljava/lang/String; -Ljava/net/HttpCookie;->domain:Ljava/lang/String; -Ljava/net/HttpCookie;->header:Ljava/lang/String; -Ljava/net/HttpCookie;->httpOnly:Z -Ljava/net/HttpCookie;->maxAge:J -Ljava/net/HttpCookie;->name:Ljava/lang/String; -Ljava/net/HttpCookie;->path:Ljava/lang/String; -Ljava/net/HttpCookie;->portlist:Ljava/lang/String; -Ljava/net/HttpCookie;->secure:Z -Ljava/net/HttpCookie;->toDiscard:Z -Ljava/net/HttpCookie;->tspecials:Ljava/lang/String; -Ljava/net/HttpCookie;->value:Ljava/lang/String; -Ljava/net/HttpCookie;->version:I -Ljava/net/HttpCookie;->whenCreated:J -Ljava/net/HttpRetryException;->serialVersionUID:J -Ljava/net/Inet4Address;-><init>()V -Ljava/net/Inet4Address;->ALL:Ljava/net/InetAddress; -Ljava/net/Inet4Address;->ANY:Ljava/net/InetAddress; -Ljava/net/Inet4Address;->serialVersionUID:J -Ljava/net/Inet4Address;->writeReplace()Ljava/lang/Object; -Ljava/net/Inet6Address$Inet6AddressHolder;->ipaddress:[B -Ljava/net/Inet6Address$Inet6AddressHolder;->scope_id:I -Ljava/net/Inet6Address$Inet6AddressHolder;->scope_id_set:Z -Ljava/net/Inet6Address$Inet6AddressHolder;->scope_ifname:Ljava/net/NetworkInterface; -Ljava/net/Inet6Address;-><init>()V -Ljava/net/Inet6Address;->ANY:Ljava/net/InetAddress; -Ljava/net/Inet6Address;->holder6:Ljava/net/Inet6Address$Inet6AddressHolder; -Ljava/net/Inet6Address;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/net/Inet6Address;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/net/Inet6Address;->serialVersionUID:J -Ljava/net/Inet6Address;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/net/InetAddress$InetAddressHolder;->address:I -Ljava/net/InetAddress$InetAddressHolder;->family:I -Ljava/net/InetAddress$InetAddressHolder;->hostName:Ljava/lang/String; -Ljava/net/InetAddress$InetAddressHolder;->originalHostName:Ljava/lang/String; -Ljava/net/InetAddress;->clearDnsCache()V -Ljava/net/InetAddress;->holder()Ljava/net/InetAddress$InetAddressHolder; -Ljava/net/InetAddress;->holder:Ljava/net/InetAddress$InetAddressHolder; -Ljava/net/InetAddress;->isNumeric(Ljava/lang/String;)Z -Ljava/net/InetAddress;->parseNumericAddress(Ljava/lang/String;)Ljava/net/InetAddress; -Ljava/net/InetAddress;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/net/InetAddress;->readResolve()Ljava/lang/Object; -Ljava/net/InetAddress;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/net/InetAddress;->serialVersionUID:J -Ljava/net/InetAddress;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/net/InetSocketAddress;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/net/InetSocketAddress;->readObjectNoData()V -Ljava/net/InetSocketAddress;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/net/InetSocketAddress;->serialVersionUID:J -Ljava/net/InetSocketAddress;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/net/MalformedURLException;->serialVersionUID:J -Ljava/net/NoRouteToHostException;->serialVersionUID:J -Ljava/net/PortUnreachableException;->serialVersionUID:J -Ljava/net/ProtocolException;->serialVersionUID:J -Ljava/net/Socket;->getFileDescriptor$()Ljava/io/FileDescriptor; -Ljava/net/Socket;->impl:Ljava/net/SocketImpl; -Ljava/net/SocketAddress;->serialVersionUID:J -Ljava/net/SocketException;->serialVersionUID:J -Ljava/net/SocketImpl;->serverSocket:Ljava/net/ServerSocket; -Ljava/net/SocketImpl;->socket:Ljava/net/Socket; -Ljava/net/SocketTimeoutException;->serialVersionUID:J -Ljava/net/URI;->fragment:Ljava/lang/String; -Ljava/net/URI;->host:Ljava/lang/String; -Ljava/net/URI;->port:I -Ljava/net/URI;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/net/URI;->serialVersionUID:J -Ljava/net/URI;->string:Ljava/lang/String; -Ljava/net/URI;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/net/URISyntaxException;->serialVersionUID:J -Ljava/net/URL;->handler:Ljava/net/URLStreamHandler; -Ljava/net/URL;->handlers:Ljava/util/Hashtable; -Ljava/net/URL;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/net/URL;->readResolve()Ljava/lang/Object; -Ljava/net/URL;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/net/URL;->serialVersionUID:J -Ljava/net/URL;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/net/UnknownHostException;->serialVersionUID:J -Ljava/net/UnknownServiceException;->serialVersionUID:J -Ljava/nio/Buffer;->_elementSizeShift:I -Ljava/nio/Buffer;->address:J -Ljava/nio/Buffer;->capacity:I -Ljava/nio/Buffer;->limit:I -Ljava/nio/Buffer;->position:I -Ljava/nio/BufferOverflowException;->serialVersionUID:J -Ljava/nio/BufferUnderflowException;->serialVersionUID:J -Ljava/nio/ByteBuffer;->hb:[B -Ljava/nio/ByteBuffer;->isReadOnly:Z -Ljava/nio/ByteBuffer;->offset:I -Ljava/nio/DirectByteBuffer;-><init>(JI)V -Ljava/nio/InvalidMarkException;->serialVersionUID:J -Ljava/nio/NIOAccess;->getBaseArray(Ljava/nio/Buffer;)Ljava/lang/Object; -Ljava/nio/NIOAccess;->getBaseArrayOffset(Ljava/nio/Buffer;)I -Ljava/nio/NIOAccess;->getBasePointer(Ljava/nio/Buffer;)J -Ljava/nio/ReadOnlyBufferException;->serialVersionUID:J -Ljava/nio/channels/AcceptPendingException;->serialVersionUID:J -Ljava/nio/channels/AlreadyBoundException;->serialVersionUID:J -Ljava/nio/channels/AlreadyConnectedException;->serialVersionUID:J -Ljava/nio/channels/AsynchronousCloseException;->serialVersionUID:J -Ljava/nio/channels/CancelledKeyException;->serialVersionUID:J -Ljava/nio/channels/ClosedByInterruptException;->serialVersionUID:J -Ljava/nio/channels/ClosedChannelException;->serialVersionUID:J -Ljava/nio/channels/ClosedSelectorException;->serialVersionUID:J -Ljava/nio/channels/ConnectionPendingException;->serialVersionUID:J -Ljava/nio/channels/FileLockInterruptionException;->serialVersionUID:J -Ljava/nio/channels/IllegalBlockingModeException;->serialVersionUID:J -Ljava/nio/channels/IllegalChannelGroupException;->serialVersionUID:J -Ljava/nio/channels/IllegalSelectorException;->serialVersionUID:J -Ljava/nio/channels/InterruptedByTimeoutException;->serialVersionUID:J -Ljava/nio/channels/NoConnectionPendingException;->serialVersionUID:J -Ljava/nio/channels/NonReadableChannelException;->serialVersionUID:J -Ljava/nio/channels/NonWritableChannelException;->serialVersionUID:J -Ljava/nio/channels/NotYetBoundException;->serialVersionUID:J -Ljava/nio/channels/NotYetConnectedException;->serialVersionUID:J -Ljava/nio/channels/OverlappingFileLockException;->serialVersionUID:J -Ljava/nio/channels/ReadPendingException;->serialVersionUID:J -Ljava/nio/channels/ShutdownChannelGroupException;->serialVersionUID:J -Ljava/nio/channels/UnresolvedAddressException;->serialVersionUID:J -Ljava/nio/channels/UnsupportedAddressTypeException;->serialVersionUID:J -Ljava/nio/channels/WritePendingException;->serialVersionUID:J -Ljava/nio/charset/CharacterCodingException;->serialVersionUID:J -Ljava/nio/charset/CharsetEncoder;->canEncode(Ljava/nio/CharBuffer;)Z -Ljava/nio/charset/CoderMalfunctionError;->serialVersionUID:J -Ljava/nio/charset/IllegalCharsetNameException;->serialVersionUID:J -Ljava/nio/charset/MalformedInputException;->serialVersionUID:J -Ljava/nio/charset/UnmappableCharacterException;->serialVersionUID:J -Ljava/nio/charset/UnsupportedCharsetException;->serialVersionUID:J -Ljava/nio/file/AccessDeniedException;->serialVersionUID:J -Ljava/nio/file/AtomicMoveNotSupportedException;->serialVersionUID:J -Ljava/nio/file/ClosedDirectoryStreamException;->serialVersionUID:J -Ljava/nio/file/ClosedFileSystemException;->serialVersionUID:J -Ljava/nio/file/ClosedWatchServiceException;->serialVersionUID:J -Ljava/nio/file/DirectoryIteratorException;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/nio/file/DirectoryIteratorException;->serialVersionUID:J -Ljava/nio/file/DirectoryNotEmptyException;->serialVersionUID:J -Ljava/nio/file/FileAlreadyExistsException;->serialVersionUID:J -Ljava/nio/file/FileSystemAlreadyExistsException;->serialVersionUID:J -Ljava/nio/file/FileSystemException;->serialVersionUID:J -Ljava/nio/file/FileSystemLoopException;->serialVersionUID:J -Ljava/nio/file/FileSystemNotFoundException;->serialVersionUID:J -Ljava/nio/file/InvalidPathException;->serialVersionUID:J -Ljava/nio/file/LinkPermission;->serialVersionUID:J -Ljava/nio/file/NoSuchFileException;->serialVersionUID:J -Ljava/nio/file/NotDirectoryException;->serialVersionUID:J -Ljava/nio/file/NotLinkException;->serialVersionUID:J -Ljava/nio/file/ProviderMismatchException;->serialVersionUID:J -Ljava/nio/file/ProviderNotFoundException;->serialVersionUID:J -Ljava/nio/file/ReadOnlyFileSystemException;->serialVersionUID:J -Ljava/nio/file/attribute/UserPrincipalNotFoundException;->serialVersionUID:J -Ljava/security/AccessControlException;->serialVersionUID:J -Ljava/security/CodeSigner;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/security/CodeSigner;->serialVersionUID:J -Ljava/security/DigestException;->serialVersionUID:J -Ljava/security/GeneralSecurityException;->serialVersionUID:J -Ljava/security/GuardedObject;->serialVersionUID:J -Ljava/security/GuardedObject;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/security/Identity;->serialVersionUID:J -Ljava/security/IdentityScope;->serialVersionUID:J -Ljava/security/InvalidAlgorithmParameterException;->serialVersionUID:J -Ljava/security/InvalidKeyException;->serialVersionUID:J -Ljava/security/InvalidParameterException;->serialVersionUID:J -Ljava/security/KeyException;->serialVersionUID:J -Ljava/security/KeyManagementException;->serialVersionUID:J -Ljava/security/KeyPair;->serialVersionUID:J -Ljava/security/KeyRep;->serialVersionUID:J -Ljava/security/KeyStoreException;->serialVersionUID:J -Ljava/security/NoSuchAlgorithmException;->serialVersionUID:J -Ljava/security/NoSuchProviderException;->serialVersionUID:J -Ljava/security/PrivilegedActionException;->serialVersionUID:J -Ljava/security/Provider;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/security/Provider;->serialVersionUID:J -Ljava/security/ProviderException;->serialVersionUID:J -Ljava/security/SecureRandom;->serialVersionUID:J -Ljava/security/SecureRandomSpi;->serialVersionUID:J -Ljava/security/SignatureException;->serialVersionUID:J -Ljava/security/SignedObject;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/security/SignedObject;->serialVersionUID:J -Ljava/security/Signer;->serialVersionUID:J -Ljava/security/Timestamp;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/security/Timestamp;->serialVersionUID:J -Ljava/security/UnrecoverableEntryException;->serialVersionUID:J -Ljava/security/UnrecoverableKeyException;->serialVersionUID:J -Ljava/security/acl/AclNotFoundException;->serialVersionUID:J -Ljava/security/acl/LastOwnerException;->serialVersionUID:J -Ljava/security/acl/NotOwnerException;->serialVersionUID:J -Ljava/security/cert/CRLException;->serialVersionUID:J -Ljava/security/cert/CertPath$CertPathRep;->serialVersionUID:J -Ljava/security/cert/CertPath;->serialVersionUID:J -Ljava/security/cert/CertPathBuilderException;->serialVersionUID:J -Ljava/security/cert/CertPathValidatorException;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/security/cert/CertPathValidatorException;->serialVersionUID:J -Ljava/security/cert/CertStoreException;->serialVersionUID:J -Ljava/security/cert/Certificate$CertificateRep;->serialVersionUID:J -Ljava/security/cert/Certificate;->serialVersionUID:J -Ljava/security/cert/CertificateEncodingException;->serialVersionUID:J -Ljava/security/cert/CertificateException;->serialVersionUID:J -Ljava/security/cert/CertificateExpiredException;->serialVersionUID:J -Ljava/security/cert/CertificateNotYetValidException;->serialVersionUID:J -Ljava/security/cert/CertificateParsingException;->serialVersionUID:J -Ljava/security/cert/CertificateRevokedException;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/security/cert/CertificateRevokedException;->serialVersionUID:J -Ljava/security/cert/CertificateRevokedException;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/security/cert/X509Certificate;->serialVersionUID:J -Ljava/security/spec/ECParameterSpec;->getCurveName()Ljava/lang/String; -Ljava/security/spec/ECParameterSpec;->setCurveName(Ljava/lang/String;)V -Ljava/security/spec/InvalidKeySpecException;->serialVersionUID:J -Ljava/security/spec/InvalidParameterSpecException;->serialVersionUID:J -Ljava/sql/BatchUpdateException;->serialVersionUID:J -Ljava/sql/DataTruncation;->serialVersionUID:J -Ljava/sql/Date;->serialVersionUID:J -Ljava/sql/SQLClientInfoException;->serialVersionUID:J -Ljava/sql/SQLDataException;->serialVersionUID:J -Ljava/sql/SQLException;->serialVersionUID:J -Ljava/sql/SQLFeatureNotSupportedException;->serialVersionUID:J -Ljava/sql/SQLIntegrityConstraintViolationException;->serialVersionUID:J -Ljava/sql/SQLInvalidAuthorizationSpecException;->serialVersionUID:J -Ljava/sql/SQLNonTransientConnectionException;->serialVersionUID:J -Ljava/sql/SQLNonTransientException;->serialVersionUID:J -Ljava/sql/SQLRecoverableException;->serialVersionUID:J -Ljava/sql/SQLSyntaxErrorException;->serialVersionUID:J -Ljava/sql/SQLTimeoutException;->serialVersionUID:J -Ljava/sql/SQLTransactionRollbackException;->serialVersionUID:J -Ljava/sql/SQLTransientConnectionException;->serialVersionUID:J -Ljava/sql/SQLTransientException;->serialVersionUID:J -Ljava/sql/SQLWarning;->serialVersionUID:J -Ljava/sql/Time;->serialVersionUID:J -Ljava/sql/Timestamp;->serialVersionUID:J -Ljava/text/AttributedCharacterIterator$Attribute;->serialVersionUID:J -Ljava/text/ChoiceFormat;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/ChoiceFormat;->serialVersionUID:J -Ljava/text/DateFormat$Field;->serialVersionUID:J -Ljava/text/DateFormat;->is24Hour:Ljava/lang/Boolean; -Ljava/text/DateFormat;->serialVersionUID:J -Ljava/text/DateFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/DateFormatSymbols;->serialVersionUID:J -Ljava/text/DateFormatSymbols;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/text/DecimalFormat;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/DecimalFormat;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/text/DecimalFormat;->serialVersionUID:J -Ljava/text/DecimalFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/text/DecimalFormatSymbols;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/DecimalFormatSymbols;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/text/DecimalFormatSymbols;->serialVersionUID:J -Ljava/text/DecimalFormatSymbols;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/text/Format$Field;->serialVersionUID:J -Ljava/text/Format;->serialVersionUID:J -Ljava/text/MessageFormat$Field;->serialVersionUID:J -Ljava/text/MessageFormat;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/MessageFormat;->serialVersionUID:J -Ljava/text/NumberFormat$Field;->serialVersionUID:J -Ljava/text/NumberFormat;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/NumberFormat;->serialVersionUID:J -Ljava/text/NumberFormat;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/text/ParseException;->serialVersionUID:J -Ljava/text/SimpleDateFormat;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/text/SimpleDateFormat;->serialVersionUID:J -Ljava/time/Clock$FixedClock;->serialVersionUID:J -Ljava/time/Clock$OffsetClock;->serialVersionUID:J -Ljava/time/Clock$SystemClock;->serialVersionUID:J -Ljava/time/Clock$TickClock;->serialVersionUID:J -Ljava/time/DateTimeException;->serialVersionUID:J -Ljava/time/Duration;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/Duration;->serialVersionUID:J -Ljava/time/Duration;->toSeconds()Ljava/math/BigDecimal; -Ljava/time/Duration;->writeReplace()Ljava/lang/Object; -Ljava/time/Instant;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/Instant;->serialVersionUID:J -Ljava/time/Instant;->writeReplace()Ljava/lang/Object; -Ljava/time/LocalDate;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/LocalDate;->serialVersionUID:J -Ljava/time/LocalDate;->writeReplace()Ljava/lang/Object; -Ljava/time/LocalDateTime;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/LocalDateTime;->serialVersionUID:J -Ljava/time/LocalDateTime;->writeReplace()Ljava/lang/Object; -Ljava/time/LocalTime;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/LocalTime;->serialVersionUID:J -Ljava/time/LocalTime;->writeReplace()Ljava/lang/Object; -Ljava/time/MonthDay;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/MonthDay;->serialVersionUID:J -Ljava/time/MonthDay;->writeReplace()Ljava/lang/Object; -Ljava/time/OffsetDateTime;-><init>(Ljava/time/LocalDateTime;Ljava/time/ZoneOffset;)V -Ljava/time/OffsetDateTime;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/OffsetDateTime;->serialVersionUID:J -Ljava/time/OffsetDateTime;->writeReplace()Ljava/lang/Object; -Ljava/time/OffsetTime;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/OffsetTime;->serialVersionUID:J -Ljava/time/OffsetTime;->writeReplace()Ljava/lang/Object; -Ljava/time/Period;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/Period;->serialVersionUID:J -Ljava/time/Period;->writeReplace()Ljava/lang/Object; -Ljava/time/Year;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/Year;->serialVersionUID:J -Ljava/time/Year;->writeReplace()Ljava/lang/Object; -Ljava/time/YearMonth;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/YearMonth;->serialVersionUID:J -Ljava/time/YearMonth;->writeReplace()Ljava/lang/Object; -Ljava/time/ZoneId;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/ZoneId;->serialVersionUID:J -Ljava/time/ZoneId;->writeReplace()Ljava/lang/Object; -Ljava/time/ZoneOffset;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/ZoneOffset;->serialVersionUID:J -Ljava/time/ZoneOffset;->writeReplace()Ljava/lang/Object; -Ljava/time/ZonedDateTime;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/ZonedDateTime;->serialVersionUID:J -Ljava/time/ZonedDateTime;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/AbstractChronology;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/AbstractChronology;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/ChronoLocalDateImpl;->serialVersionUID:J -Ljava/time/chrono/HijrahChronology;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/HijrahChronology;->serialVersionUID:J -Ljava/time/chrono/HijrahChronology;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/HijrahDate;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/HijrahDate;->serialVersionUID:J -Ljava/time/chrono/HijrahDate;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/IsoChronology;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/IsoChronology;->serialVersionUID:J -Ljava/time/chrono/IsoChronology;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/JapaneseChronology;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/JapaneseChronology;->serialVersionUID:J -Ljava/time/chrono/JapaneseChronology;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/JapaneseDate;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/JapaneseDate;->serialVersionUID:J -Ljava/time/chrono/JapaneseDate;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/JapaneseEra;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/JapaneseEra;->serialVersionUID:J -Ljava/time/chrono/JapaneseEra;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/MinguoChronology;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/MinguoChronology;->serialVersionUID:J -Ljava/time/chrono/MinguoChronology;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/MinguoDate;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/MinguoDate;->serialVersionUID:J -Ljava/time/chrono/MinguoDate;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/ThaiBuddhistChronology;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/ThaiBuddhistChronology;->serialVersionUID:J -Ljava/time/chrono/ThaiBuddhistChronology;->writeReplace()Ljava/lang/Object; -Ljava/time/chrono/ThaiBuddhistDate;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/chrono/ThaiBuddhistDate;->serialVersionUID:J -Ljava/time/chrono/ThaiBuddhistDate;->writeReplace()Ljava/lang/Object; -Ljava/time/format/DateTimeParseException;->serialVersionUID:J -Ljava/time/temporal/JulianFields$Field;->serialVersionUID:J -Ljava/time/temporal/UnsupportedTemporalTypeException;->serialVersionUID:J -Ljava/time/temporal/ValueRange;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/temporal/ValueRange;->serialVersionUID:J -Ljava/time/temporal/WeekFields;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/temporal/WeekFields;->readResolve()Ljava/lang/Object; -Ljava/time/temporal/WeekFields;->serialVersionUID:J -Ljava/time/zone/ZoneOffsetTransition;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/zone/ZoneOffsetTransition;->serialVersionUID:J -Ljava/time/zone/ZoneOffsetTransition;->writeReplace()Ljava/lang/Object; -Ljava/time/zone/ZoneOffsetTransitionRule;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/zone/ZoneOffsetTransitionRule;->serialVersionUID:J -Ljava/time/zone/ZoneOffsetTransitionRule;->writeReplace()Ljava/lang/Object; -Ljava/time/zone/ZoneRules;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/time/zone/ZoneRules;->serialVersionUID:J -Ljava/time/zone/ZoneRules;->writeReplace()Ljava/lang/Object; -Ljava/time/zone/ZoneRulesException;->serialVersionUID:J -Ljava/util/AbstractMap$SimpleEntry;->serialVersionUID:J -Ljava/util/AbstractMap$SimpleImmutableEntry;->serialVersionUID:J -Ljava/util/ArrayDeque;->elements:[Ljava/lang/Object; -Ljava/util/ArrayDeque;->head:I -Ljava/util/ArrayDeque;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/ArrayDeque;->serialVersionUID:J -Ljava/util/ArrayDeque;->tail:I -Ljava/util/ArrayDeque;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/ArrayList$SubList;->parent:Ljava/util/AbstractList; -Ljava/util/ArrayList$SubList;->parentOffset:I -Ljava/util/ArrayList$SubList;->size:I -Ljava/util/ArrayList;->elementData:[Ljava/lang/Object; -Ljava/util/ArrayList;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/ArrayList;->serialVersionUID:J -Ljava/util/ArrayList;->size:I -Ljava/util/ArrayList;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Arrays$ArrayList;->a:[Ljava/lang/Object; -Ljava/util/Arrays$ArrayList;->serialVersionUID:J -Ljava/util/BitSet;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/BitSet;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/util/BitSet;->serialVersionUID:J -Ljava/util/BitSet;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Calendar;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/Calendar;->serialVersionUID:J -Ljava/util/Calendar;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Calendar;->zone:Ljava/util/TimeZone; -Ljava/util/Collections$AsLIFOQueue;->serialVersionUID:J -Ljava/util/Collections$CheckedCollection;->serialVersionUID:J -Ljava/util/Collections$CheckedList;->serialVersionUID:J -Ljava/util/Collections$CheckedMap;->serialVersionUID:J -Ljava/util/Collections$CheckedNavigableMap;->serialVersionUID:J -Ljava/util/Collections$CheckedNavigableSet;->serialVersionUID:J -Ljava/util/Collections$CheckedQueue;->serialVersionUID:J -Ljava/util/Collections$CheckedRandomAccessList;->serialVersionUID:J -Ljava/util/Collections$CheckedSet;->serialVersionUID:J -Ljava/util/Collections$CheckedSortedMap;->serialVersionUID:J -Ljava/util/Collections$CheckedSortedSet;->serialVersionUID:J -Ljava/util/Collections$CopiesList;->serialVersionUID:J -Ljava/util/Collections$EmptyList;-><init>()V -Ljava/util/Collections$EmptyList;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$EmptyList;->serialVersionUID:J -Ljava/util/Collections$EmptyMap;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$EmptyMap;->serialVersionUID:J -Ljava/util/Collections$EmptySet;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$EmptySet;->serialVersionUID:J -Ljava/util/Collections$ReverseComparator2;->serialVersionUID:J -Ljava/util/Collections$ReverseComparator;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$ReverseComparator;->serialVersionUID:J -Ljava/util/Collections$SetFromMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/Collections$SetFromMap;->serialVersionUID:J -Ljava/util/Collections$SingletonList;->serialVersionUID:J -Ljava/util/Collections$SingletonMap;->serialVersionUID:J -Ljava/util/Collections$SingletonSet;->serialVersionUID:J -Ljava/util/Collections$SynchronizedCollection;->c:Ljava/util/Collection; -Ljava/util/Collections$SynchronizedCollection;->serialVersionUID:J -Ljava/util/Collections$SynchronizedCollection;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Collections$SynchronizedList;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$SynchronizedList;->serialVersionUID:J -Ljava/util/Collections$SynchronizedMap;->m:Ljava/util/Map; -Ljava/util/Collections$SynchronizedMap;->serialVersionUID:J -Ljava/util/Collections$SynchronizedMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Collections$SynchronizedNavigableMap;->serialVersionUID:J -Ljava/util/Collections$SynchronizedNavigableSet;->serialVersionUID:J -Ljava/util/Collections$SynchronizedRandomAccessList;->serialVersionUID:J -Ljava/util/Collections$SynchronizedRandomAccessList;->writeReplace()Ljava/lang/Object; -Ljava/util/Collections$SynchronizedSet;->serialVersionUID:J -Ljava/util/Collections$SynchronizedSortedMap;->serialVersionUID:J -Ljava/util/Collections$SynchronizedSortedSet;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableCollection;->c:Ljava/util/Collection; -Ljava/util/Collections$UnmodifiableCollection;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableList;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$UnmodifiableList;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableMap$UnmodifiableEntrySet;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableMap;->m:Ljava/util/Map; -Ljava/util/Collections$UnmodifiableMap;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableNavigableMap$EmptyNavigableMap;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$UnmodifiableNavigableMap$EmptyNavigableMap;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableNavigableMap;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableNavigableSet$EmptyNavigableSet;->readResolve()Ljava/lang/Object; -Ljava/util/Collections$UnmodifiableNavigableSet$EmptyNavigableSet;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableNavigableSet;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableRandomAccessList;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableRandomAccessList;->writeReplace()Ljava/lang/Object; -Ljava/util/Collections$UnmodifiableSet;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableSortedMap;->serialVersionUID:J -Ljava/util/Collections$UnmodifiableSortedSet;->serialVersionUID:J -Ljava/util/ConcurrentModificationException;->serialVersionUID:J -Ljava/util/Currency;->readResolve()Ljava/lang/Object; -Ljava/util/Currency;->serialVersionUID:J -Ljava/util/Date;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/Date;->serialVersionUID:J -Ljava/util/Date;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/DuplicateFormatFlagsException;->serialVersionUID:J -Ljava/util/EmptyStackException;->serialVersionUID:J -Ljava/util/EnumMap;->keyType:Ljava/lang/Class; -Ljava/util/EnumMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/EnumMap;->serialVersionUID:J -Ljava/util/EnumMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/EnumSet$SerializationProxy;->readResolve()Ljava/lang/Object; -Ljava/util/EnumSet$SerializationProxy;->serialVersionUID:J -Ljava/util/EnumSet;->elementType:Ljava/lang/Class; -Ljava/util/EnumSet;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/EnumSet;->writeReplace()Ljava/lang/Object; -Ljava/util/EventObject;->serialVersionUID:J -Ljava/util/FormatFlagsConversionMismatchException;->serialVersionUID:J -Ljava/util/FormatterClosedException;->serialVersionUID:J -Ljava/util/GregorianCalendar;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/GregorianCalendar;->serialVersionUID:J -Ljava/util/HashMap$HashIterator;->hasNext()Z -Ljava/util/HashMap;->modCount:I -Ljava/util/HashMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/HashMap;->serialVersionUID:J -Ljava/util/HashMap;->table:[Ljava/util/HashMap$Node; -Ljava/util/HashMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/HashSet;->map:Ljava/util/HashMap; -Ljava/util/HashSet;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/HashSet;->serialVersionUID:J -Ljava/util/HashSet;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Hashtable;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/Hashtable;->serialVersionUID:J -Ljava/util/Hashtable;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/IdentityHashMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/IdentityHashMap;->serialVersionUID:J -Ljava/util/IdentityHashMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/IllegalFormatCodePointException;->serialVersionUID:J -Ljava/util/IllegalFormatConversionException;->serialVersionUID:J -Ljava/util/IllegalFormatException;->serialVersionUID:J -Ljava/util/IllegalFormatFlagsException;->serialVersionUID:J -Ljava/util/IllegalFormatPrecisionException;->serialVersionUID:J -Ljava/util/IllegalFormatWidthException;->serialVersionUID:J -Ljava/util/IllformedLocaleException;->serialVersionUID:J -Ljava/util/InputMismatchException;->serialVersionUID:J -Ljava/util/InvalidPropertiesFormatException;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/InvalidPropertiesFormatException;->serialVersionUID:J -Ljava/util/InvalidPropertiesFormatException;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/LinkedHashMap$LinkedHashIterator;->hasNext()Z -Ljava/util/LinkedHashMap;->eldest()Ljava/util/Map$Entry; -Ljava/util/LinkedHashMap;->serialVersionUID:J -Ljava/util/LinkedHashSet;->serialVersionUID:J -Ljava/util/LinkedList;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/LinkedList;->serialVersionUID:J -Ljava/util/LinkedList;->size:I -Ljava/util/LinkedList;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Locale;->createConstant(Ljava/lang/String;Ljava/lang/String;)Ljava/util/Locale; -Ljava/util/Locale;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/Locale;->readResolve()Ljava/lang/Object; -Ljava/util/Locale;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/util/Locale;->serialVersionUID:J -Ljava/util/Locale;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/MissingFormatArgumentException;->serialVersionUID:J -Ljava/util/MissingFormatWidthException;->serialVersionUID:J -Ljava/util/MissingResourceException;->serialVersionUID:J -Ljava/util/NoSuchElementException;->serialVersionUID:J -Ljava/util/PriorityQueue;->modCount:I -Ljava/util/PriorityQueue;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/PriorityQueue;->serialVersionUID:J -Ljava/util/PriorityQueue;->size:I -Ljava/util/PriorityQueue;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Properties;->serialVersionUID:J -Ljava/util/Random;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/Random;->seedUniquifier()J -Ljava/util/Random;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/util/Random;->serialVersionUID:J -Ljava/util/Random;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/ServiceConfigurationError;->serialVersionUID:J -Ljava/util/SimpleTimeZone;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/SimpleTimeZone;->serialVersionUID:J -Ljava/util/SimpleTimeZone;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/Stack;->serialVersionUID:J -Ljava/util/TimeZone;->serialVersionUID:J -Ljava/util/TooManyListenersException;->serialVersionUID:J -Ljava/util/TreeMap$AscendingSubMap;->serialVersionUID:J -Ljava/util/TreeMap$DescendingSubMap;->serialVersionUID:J -Ljava/util/TreeMap$NavigableSubMap;->serialVersionUID:J -Ljava/util/TreeMap$SubMap;->readResolve()Ljava/lang/Object; -Ljava/util/TreeMap$SubMap;->serialVersionUID:J -Ljava/util/TreeMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/TreeMap;->serialVersionUID:J -Ljava/util/TreeMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/TreeSet;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/TreeSet;->serialVersionUID:J -Ljava/util/TreeSet;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/UUID;->leastSigBits:J -Ljava/util/UUID;->mostSigBits:J -Ljava/util/UUID;->serialVersionUID:J -Ljava/util/UnknownFormatConversionException;->serialVersionUID:J -Ljava/util/UnknownFormatFlagsException;->serialVersionUID:J -Ljava/util/Vector;->elementData(I)Ljava/lang/Object; -Ljava/util/Vector;->serialVersionUID:J -Ljava/util/Vector;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ArrayBlockingQueue;->serialVersionUID:J -Ljava/util/concurrent/BrokenBarrierException;->serialVersionUID:J -Ljava/util/concurrent/CancellationException;->serialVersionUID:J -Ljava/util/concurrent/CompletionException;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap$BaseIterator;->hasMoreElements()Z -Ljava/util/concurrent/ConcurrentHashMap$CollectionView;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap$EntrySetView;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap$KeySetView;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap$Segment;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap$ValuesView;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/ConcurrentHashMap;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/util/concurrent/ConcurrentHashMap;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentHashMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ConcurrentLinkedDeque;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/ConcurrentLinkedDeque;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentLinkedDeque;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ConcurrentLinkedQueue;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/ConcurrentLinkedQueue;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentLinkedQueue;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ConcurrentSkipListMap$SubMap;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentSkipListMap;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/ConcurrentSkipListMap;->serialVersionUID:J -Ljava/util/concurrent/ConcurrentSkipListMap;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ConcurrentSkipListSet;->serialVersionUID:J -Ljava/util/concurrent/CopyOnWriteArrayList;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/CopyOnWriteArrayList;->serialVersionUID:J -Ljava/util/concurrent/CopyOnWriteArrayList;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/CopyOnWriteArraySet;->al:Ljava/util/concurrent/CopyOnWriteArrayList; -Ljava/util/concurrent/CopyOnWriteArraySet;->serialVersionUID:J -Ljava/util/concurrent/CountDownLatch$Sync;->serialVersionUID:J -Ljava/util/concurrent/CountedCompleter;->serialVersionUID:J -Ljava/util/concurrent/ExecutionException;->serialVersionUID:J -Ljava/util/concurrent/Executors$RunnableAdapter;->task:Ljava/lang/Runnable; -Ljava/util/concurrent/ForkJoinPool$AuxState;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinPool$EmptyTask;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinTask$AdaptedCallable;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinTask$AdaptedRunnable;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinTask$AdaptedRunnableAction;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinTask$RunnableExecuteAction;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinTask;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/ForkJoinTask;->serialVersionUID:J -Ljava/util/concurrent/ForkJoinTask;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/FutureTask;->EXCEPTIONAL:I -Ljava/util/concurrent/FutureTask;->callable:Ljava/util/concurrent/Callable; -Ljava/util/concurrent/FutureTask;->outcome:Ljava/lang/Object; -Ljava/util/concurrent/FutureTask;->state:I -Ljava/util/concurrent/LinkedBlockingDeque;->first:Ljava/util/concurrent/LinkedBlockingDeque$Node; -Ljava/util/concurrent/LinkedBlockingDeque;->lock:Ljava/util/concurrent/locks/ReentrantLock; -Ljava/util/concurrent/LinkedBlockingDeque;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/LinkedBlockingDeque;->serialVersionUID:J -Ljava/util/concurrent/LinkedBlockingDeque;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/LinkedBlockingQueue;->capacity:I -Ljava/util/concurrent/LinkedBlockingQueue;->head:Ljava/util/concurrent/LinkedBlockingQueue$Node; -Ljava/util/concurrent/LinkedBlockingQueue;->putLock:Ljava/util/concurrent/locks/ReentrantLock; -Ljava/util/concurrent/LinkedBlockingQueue;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/LinkedBlockingQueue;->serialVersionUID:J -Ljava/util/concurrent/LinkedBlockingQueue;->takeLock:Ljava/util/concurrent/locks/ReentrantLock; -Ljava/util/concurrent/LinkedBlockingQueue;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/LinkedTransferQueue$Node;->serialVersionUID:J -Ljava/util/concurrent/LinkedTransferQueue;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/LinkedTransferQueue;->serialVersionUID:J -Ljava/util/concurrent/LinkedTransferQueue;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/PriorityBlockingQueue;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/PriorityBlockingQueue;->serialVersionUID:J -Ljava/util/concurrent/PriorityBlockingQueue;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/RecursiveAction;->serialVersionUID:J -Ljava/util/concurrent/RecursiveTask;->serialVersionUID:J -Ljava/util/concurrent/RejectedExecutionException;->serialVersionUID:J -Ljava/util/concurrent/Semaphore$FairSync;->serialVersionUID:J -Ljava/util/concurrent/Semaphore$NonfairSync;->serialVersionUID:J -Ljava/util/concurrent/Semaphore$Sync;->serialVersionUID:J -Ljava/util/concurrent/Semaphore;->serialVersionUID:J -Ljava/util/concurrent/SynchronousQueue$FifoWaitQueue;->serialVersionUID:J -Ljava/util/concurrent/SynchronousQueue$LifoWaitQueue;->serialVersionUID:J -Ljava/util/concurrent/SynchronousQueue;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/SynchronousQueue;->serialVersionUID:J -Ljava/util/concurrent/SynchronousQueue;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ThreadLocalRandom;->readResolve()Ljava/lang/Object; -Ljava/util/concurrent/ThreadLocalRandom;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljava/util/concurrent/ThreadLocalRandom;->serialVersionUID:J -Ljava/util/concurrent/ThreadLocalRandom;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/concurrent/ThreadPoolExecutor$Worker;->serialVersionUID:J -Ljava/util/concurrent/ThreadPoolExecutor;->allowCoreThreadTimeOut:Z -Ljava/util/concurrent/TimeoutException;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicBoolean;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicInteger;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicInteger;->value:I -Ljava/util/concurrent/atomic/AtomicIntegerArray;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicLong;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicLongArray;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicReference;->serialVersionUID:J -Ljava/util/concurrent/atomic/AtomicReferenceArray;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/atomic/AtomicReferenceArray;->serialVersionUID:J -Ljava/util/concurrent/atomic/DoubleAccumulator$SerializationProxy;->readResolve()Ljava/lang/Object; -Ljava/util/concurrent/atomic/DoubleAccumulator$SerializationProxy;->serialVersionUID:J -Ljava/util/concurrent/atomic/DoubleAccumulator;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/atomic/DoubleAccumulator;->serialVersionUID:J -Ljava/util/concurrent/atomic/DoubleAccumulator;->writeReplace()Ljava/lang/Object; -Ljava/util/concurrent/atomic/DoubleAdder$SerializationProxy;->readResolve()Ljava/lang/Object; -Ljava/util/concurrent/atomic/DoubleAdder$SerializationProxy;->serialVersionUID:J -Ljava/util/concurrent/atomic/DoubleAdder;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/atomic/DoubleAdder;->serialVersionUID:J -Ljava/util/concurrent/atomic/DoubleAdder;->writeReplace()Ljava/lang/Object; -Ljava/util/concurrent/atomic/LongAccumulator$SerializationProxy;->readResolve()Ljava/lang/Object; -Ljava/util/concurrent/atomic/LongAccumulator$SerializationProxy;->serialVersionUID:J -Ljava/util/concurrent/atomic/LongAccumulator;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/atomic/LongAccumulator;->serialVersionUID:J -Ljava/util/concurrent/atomic/LongAccumulator;->writeReplace()Ljava/lang/Object; -Ljava/util/concurrent/atomic/LongAdder$SerializationProxy;->readResolve()Ljava/lang/Object; -Ljava/util/concurrent/atomic/LongAdder$SerializationProxy;->serialVersionUID:J -Ljava/util/concurrent/atomic/LongAdder;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/atomic/LongAdder;->serialVersionUID:J -Ljava/util/concurrent/atomic/LongAdder;->writeReplace()Ljava/lang/Object; -Ljava/util/concurrent/locks/AbstractOwnableSynchronizer;->serialVersionUID:J -Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer$ConditionObject;->serialVersionUID:J -Ljava/util/concurrent/locks/AbstractQueuedLongSynchronizer;->serialVersionUID:J -Ljava/util/concurrent/locks/AbstractQueuedSynchronizer$ConditionObject;->serialVersionUID:J -Ljava/util/concurrent/locks/AbstractQueuedSynchronizer;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantLock$FairSync;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantLock$NonfairSync;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantLock$Sync;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/locks/ReentrantLock$Sync;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantLock;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantReadWriteLock$FairSync;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantReadWriteLock$NonfairSync;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantReadWriteLock$ReadLock;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantReadWriteLock$Sync;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/locks/ReentrantReadWriteLock$Sync;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantReadWriteLock$WriteLock;->serialVersionUID:J -Ljava/util/concurrent/locks/ReentrantReadWriteLock;->serialVersionUID:J -Ljava/util/concurrent/locks/StampedLock;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/concurrent/locks/StampedLock;->serialVersionUID:J -Ljava/util/jar/JarException;->serialVersionUID:J -Ljava/util/jar/JarFile;->manifest:Ljava/util/jar/Manifest; -Ljava/util/jar/JarVerifier$VerifierCodeSource;->serialVersionUID:J -Ljava/util/logging/Level;->readResolve()Ljava/lang/Object; -Ljava/util/logging/Level;->serialVersionUID:J -Ljava/util/logging/LogRecord;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/logging/LogRecord;->serialVersionUID:J -Ljava/util/logging/LogRecord;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/prefs/AbstractPreferences$NodeAddedEvent;->serialVersionUID:J -Ljava/util/prefs/AbstractPreferences$NodeRemovedEvent;->serialVersionUID:J -Ljava/util/prefs/BackingStoreException;->serialVersionUID:J -Ljava/util/prefs/InvalidPreferencesFormatException;->serialVersionUID:J -Ljava/util/prefs/NodeChangeEvent;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/prefs/NodeChangeEvent;->serialVersionUID:J -Ljava/util/prefs/NodeChangeEvent;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/prefs/PreferenceChangeEvent;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/prefs/PreferenceChangeEvent;->serialVersionUID:J -Ljava/util/prefs/PreferenceChangeEvent;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljava/util/regex/Matcher;->appendPos:I -Ljava/util/regex/Pattern;->readObject(Ljava/io/ObjectInputStream;)V -Ljava/util/regex/Pattern;->serialVersionUID:J -Ljava/util/regex/PatternSyntaxException;->serialVersionUID:J -Ljava/util/zip/DataFormatException;->serialVersionUID:J -Ljava/util/zip/Deflater;->buf:[B -Ljava/util/zip/Deflater;->finish:Z -Ljava/util/zip/Deflater;->finished:Z -Ljava/util/zip/Deflater;->len:I -Ljava/util/zip/Deflater;->level:I -Ljava/util/zip/Deflater;->off:I -Ljava/util/zip/Deflater;->setParams:Z -Ljava/util/zip/Deflater;->strategy:I -Ljava/util/zip/Inflater;->buf:[B -Ljava/util/zip/Inflater;->finished:Z -Ljava/util/zip/Inflater;->len:I -Ljava/util/zip/Inflater;->needDict:Z -Ljava/util/zip/Inflater;->off:I -Ljava/util/zip/ZipEntry;-><init>(Ljava/lang/String;Ljava/lang/String;JJJII[BJ)V -Ljava/util/zip/ZipError;->serialVersionUID:J -Ljava/util/zip/ZipException;->serialVersionUID:J -Ljava/util/zip/ZipFile;->jzfile:J -Ljavax/crypto/AEADBadTagException;->serialVersionUID:J -Ljavax/crypto/BadPaddingException;->serialVersionUID:J -Ljavax/crypto/ExemptionMechanismException;->serialVersionUID:J -Ljavax/crypto/IllegalBlockSizeException;->serialVersionUID:J -Ljavax/crypto/NoSuchPaddingException;->serialVersionUID:J -Ljavax/crypto/SealedObject;->readObject(Ljava/io/ObjectInputStream;)V -Ljavax/crypto/SealedObject;->serialVersionUID:J -Ljavax/crypto/ShortBufferException;->serialVersionUID:J -Ljavax/crypto/spec/SecretKeySpec;->serialVersionUID:J -Ljavax/net/ssl/HandshakeCompletedEvent;->serialVersionUID:J -Ljavax/net/ssl/SSLException;->serialVersionUID:J -Ljavax/net/ssl/SSLHandshakeException;->serialVersionUID:J -Ljavax/net/ssl/SSLKeyException;->serialVersionUID:J -Ljavax/net/ssl/SSLPeerUnverifiedException;->serialVersionUID:J -Ljavax/net/ssl/SSLProtocolException;->serialVersionUID:J -Ljavax/net/ssl/SSLServerSocketFactory;->defaultServerSocketFactory:Ljavax/net/ssl/SSLServerSocketFactory; -Ljavax/net/ssl/SSLSessionBindingEvent;->serialVersionUID:J -Ljavax/net/ssl/SSLSocketFactory;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory; -Ljavax/security/auth/DestroyFailedException;->serialVersionUID:J -Ljavax/security/auth/Subject$SecureSet;->readObject(Ljava/io/ObjectInputStream;)V -Ljavax/security/auth/Subject$SecureSet;->serialPersistentFields:[Ljava/io/ObjectStreamField; -Ljavax/security/auth/Subject$SecureSet;->serialVersionUID:J -Ljavax/security/auth/Subject$SecureSet;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljavax/security/auth/Subject;->readObject(Ljava/io/ObjectInputStream;)V -Ljavax/security/auth/Subject;->serialVersionUID:J -Ljavax/security/auth/Subject;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljavax/security/auth/callback/PasswordCallback;->serialVersionUID:J -Ljavax/security/auth/callback/UnsupportedCallbackException;->serialVersionUID:J -Ljavax/security/auth/login/LoginException;->serialVersionUID:J -Ljavax/security/auth/x500/X500Principal;->readObject(Ljava/io/ObjectInputStream;)V -Ljavax/security/auth/x500/X500Principal;->serialVersionUID:J -Ljavax/security/auth/x500/X500Principal;->writeObject(Ljava/io/ObjectOutputStream;)V -Ljavax/security/cert/CertificateEncodingException;->serialVersionUID:J -Ljavax/security/cert/CertificateException;->serialVersionUID:J -Ljavax/security/cert/CertificateExpiredException;->serialVersionUID:J -Ljavax/security/cert/CertificateNotYetValidException;->serialVersionUID:J -Ljavax/security/cert/CertificateParsingException;->serialVersionUID:J -Ljavax/sql/ConnectionEvent;->serialVersionUID:J -Ljavax/sql/RowSetEvent;->serialVersionUID:J -Ljavax/xml/datatype/DatatypeConfigurationException;->readObject(Ljava/io/ObjectInputStream;)V -Ljavax/xml/datatype/DatatypeConfigurationException;->serialVersionUID:J -Ljavax/xml/namespace/QName;->readObject(Ljava/io/ObjectInputStream;)V -Ljavax/xml/namespace/QName;->serialVersionUID:J -Ljavax/xml/transform/TransformerException;->serialVersionUID:J -Ljavax/xml/xpath/XPathException;->serialVersionUID:J -Ljavax/xml/xpath/XPathExpressionException;->serialVersionUID:J -Ljavax/xml/xpath/XPathFactoryConfigurationException;->serialVersionUID:J -Ljavax/xml/xpath/XPathFunctionException;->serialVersionUID:J -Llibcore/util/BasicLruCache;->map:Ljava/util/LinkedHashMap; -Llibcore/util/ZoneInfo;->mTransitions:[J -Llibcore/util/ZoneInfo;->readObject(Ljava/io/ObjectInputStream;)V -Llibcore/util/ZoneInfo;->serialVersionUID:J -Lorg/apache/http/conn/ConnectTimeoutException;->serialVersionUID:J -Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>()V -Lorg/apache/http/conn/ssl/SSLSocketFactory;-><init>(Ljavax/net/ssl/SSLSocketFactory;)V -Lorg/ccil/cowan/tagsoup/AttributesImpl;->data:[Ljava/lang/String; -Lorg/ccil/cowan/tagsoup/AttributesImpl;->length:I -Lorg/json/JSONArray;->values:Ljava/util/List; -Lorg/json/JSONObject;->append(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject; -Lorg/json/JSONObject;->keySet()Ljava/util/Set; -Lorg/json/JSONObject;->writeTo(Lorg/json/JSONStringer;)V -Lorg/w3c/dom/traversal/NodeIterator;->nextNode()Lorg/w3c/dom/Node; -Lsun/misc/Unsafe;->theUnsafe:Lsun/misc/Unsafe; -Lsun/security/pkcs/ParsingException;->serialVersionUID:J -Lsun/security/util/ObjectIdentifier$HugeOidNotSupportedByOldJDK;->serialVersionUID:J -Lsun/security/util/ObjectIdentifier;->readObject(Ljava/io/ObjectInputStream;)V -Lsun/security/util/ObjectIdentifier;->serialVersionUID:J -Lsun/security/util/ObjectIdentifier;->writeObject(Ljava/io/ObjectOutputStream;)V -Lsun/security/x509/AlgorithmId;->serialVersionUID:J -Lsun/util/locale/LocaleSyntaxException;->serialVersionUID:J diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt index 3c38da87353c..f808bcbfd18e 100644 --- a/config/hiddenapi-vendor-list.txt +++ b/config/hiddenapi-vendor-list.txt @@ -114,14 +114,7 @@ Landroid/os/RegistrantList;->remove(Landroid/os/Handler;)V Landroid/os/RegistrantList;->removeCleared()V Landroid/os/RemoteException;->rethrowFromSystemServer()Ljava/lang/RuntimeException; Landroid/os/ServiceSpecificException;->errorCode:I -Landroid/os/storage/DiskInfo;->getId()Ljava/lang/String; Landroid/os/storage/StorageEventListener;-><init>()V -Landroid/os/storage/StorageManager;->findVolumeById(Ljava/lang/String;)Landroid/os/storage/VolumeInfo; -Landroid/os/storage/StorageManager;->from(Landroid/content/Context;)Landroid/os/storage/StorageManager; -Landroid/os/storage/StorageManager;->registerListener(Landroid/os/storage/StorageEventListener;)V -Landroid/os/storage/StorageManager;->unregisterListener(Landroid/os/storage/StorageEventListener;)V -Landroid/os/storage/StorageVolume;->getId()Ljava/lang/String; -Landroid/os/storage/VolumeInfo;->getId()Ljava/lang/String; Landroid/os/SystemProperties;->reportSyspropChanged()V Landroid/os/SystemService;->start(Ljava/lang/String;)V Landroid/os/SystemService;->stop(Ljava/lang/String;)V @@ -138,42 +131,10 @@ Landroid/system/Os;->setsockoptIfreq(Ljava/io/FileDescriptor;IILjava/lang/String Landroid/system/Os;->setsockoptTimeval(Ljava/io/FileDescriptor;IILandroid/system/StructTimeval;)V Landroid/system/PacketSocketAddress;-><init>(I[B)V Landroid/system/PacketSocketAddress;-><init>(SI)V -Landroid/telephony/euicc/DownloadableSubscription;->encodedActivationCode:Ljava/lang/String; -Landroid/telephony/euicc/DownloadableSubscription;->setAccessRules([Landroid/telephony/UiccAccessRule;)V -Landroid/telephony/euicc/DownloadableSubscription;->setCarrierName(Ljava/lang/String;)V -Landroid/telephony/ims/compat/feature/ImsFeature;->getFeatureState()I -Landroid/telephony/ims/compat/feature/ImsFeature;->setFeatureState(I)V Landroid/telephony/ims/compat/feature/MMTelFeature;-><init>()V Landroid/telephony/ims/compat/ImsService;-><init>()V -Landroid/telephony/ims/compat/ImsService;->mImsServiceController:Landroid/os/IBinder; Landroid/telephony/ims/compat/stub/ImsCallSessionImplBase;-><init>()V -Landroid/telephony/ims/compat/stub/ImsConfigImplBase;-><init>(Landroid/content/Context;)V -Landroid/telephony/ims/compat/stub/ImsConfigImplBase;->getIImsConfig()Lcom/android/ims/internal/IImsConfig; Landroid/telephony/ims/compat/stub/ImsUtListenerImplBase;-><init>()V -Landroid/telephony/ims/ImsCallForwardInfo;-><init>()V -Landroid/telephony/ims/ImsCallForwardInfo;->mCondition:I -Landroid/telephony/ims/ImsCallForwardInfo;->mNumber:Ljava/lang/String; -Landroid/telephony/ims/ImsCallForwardInfo;->mServiceClass:I -Landroid/telephony/ims/ImsCallForwardInfo;->mStatus:I -Landroid/telephony/ims/ImsCallForwardInfo;->mTimeSeconds:I -Landroid/telephony/ims/ImsCallForwardInfo;->mToA:I -Landroid/telephony/ims/ImsCallProfile;->mCallExtras:Landroid/os/Bundle; -Landroid/telephony/ims/ImsCallProfile;->mCallType:I -Landroid/telephony/ims/ImsCallProfile;->mMediaProfile:Landroid/telephony/ims/ImsStreamMediaProfile; -Landroid/telephony/ims/ImsCallProfile;->mRestrictCause:I -Landroid/telephony/ims/ImsCallProfile;->presentationToOIR(I)I -Landroid/telephony/ims/ImsExternalCallState;-><init>(ILandroid/net/Uri;ZIIZ)V -Landroid/telephony/ims/ImsReasonInfo;-><init>(II)V -Landroid/telephony/ims/ImsReasonInfo;->mCode:I -Landroid/telephony/ims/ImsReasonInfo;->mExtraCode:I -Landroid/telephony/ims/ImsReasonInfo;->mExtraMessage:Ljava/lang/String; -Landroid/telephony/ims/ImsSsInfo;->mIcbNum:Ljava/lang/String; -Landroid/telephony/ims/ImsSsInfo;->mStatus:I -Landroid/telephony/ims/ImsStreamMediaProfile;-><init>()V -Landroid/telephony/ims/ImsStreamMediaProfile;->mAudioDirection:I -Landroid/telephony/ims/ImsStreamMediaProfile;->mAudioQuality:I -Landroid/telephony/ims/ImsStreamMediaProfile;->mVideoDirection:I -Landroid/telephony/ims/ImsVideoCallProvider;->getInterface()Lcom/android/ims/internal/IImsVideoCallProvider; Landroid/telephony/mbms/IMbmsStreamingSessionCallback$Stub;-><init>()V Landroid/telephony/mbms/IStreamingServiceCallback$Stub;-><init>()V Landroid/telephony/mbms/vendor/IMbmsStreamingService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/telephony/mbms/vendor/IMbmsStreamingService; @@ -181,58 +142,6 @@ Landroid/telephony/mbms/vendor/IMbmsStreamingService;->getPlaybackUri(ILjava/lan Landroid/telephony/mbms/vendor/IMbmsStreamingService;->initialize(Landroid/telephony/mbms/IMbmsStreamingSessionCallback;I)I Landroid/telephony/mbms/vendor/IMbmsStreamingService;->requestUpdateStreamingServices(ILjava/util/List;)I Landroid/telephony/mbms/vendor/IMbmsStreamingService;->startStreaming(ILjava/lang/String;Landroid/telephony/mbms/IStreamingServiceCallback;)I -Landroid/telephony/PhoneNumberUtils;->formatNumber(Ljava/lang/String;I)Ljava/lang/String; -Landroid/telephony/PhoneNumberUtils;->isEmergencyNumber(ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isPotentialEmergencyNumber(ILjava/lang/String;)Z -Landroid/telephony/PhoneNumberUtils;->isPotentialLocalEmergencyNumber(Landroid/content/Context;ILjava/lang/String;)Z -Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;)V -Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;Landroid/os/Looper;)V -Landroid/telephony/PreciseCallState;->getBackgroundCallState()I -Landroid/telephony/PreciseCallState;->getForegroundCallState()I -Landroid/telephony/RadioAccessFamily;-><init>(II)V -Landroid/telephony/RadioAccessFamily;->getRafFromNetworkType(I)I -Landroid/telephony/Rlog;->d(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/Rlog;->e(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/Rlog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I -Landroid/telephony/Rlog;->i(Ljava/lang/String;Ljava/lang/String;)I -Landroid/telephony/ServiceState;->bitmaskHasTech(II)Z -Landroid/telephony/ServiceState;->getDataRegState()I -Landroid/telephony/ServiceState;->getDataRoaming()Z -Landroid/telephony/ServiceState;->getRilDataRadioTechnology()I -Landroid/telephony/ServiceState;->getVoiceNetworkType()I -Landroid/telephony/ServiceState;->getVoiceRegState()I -Landroid/telephony/ServiceState;->isCdma(I)Z -Landroid/telephony/ServiceState;->isEmergencyOnly()Z -Landroid/telephony/ServiceState;->isGsm(I)Z -Landroid/telephony/ServiceState;->mergeServiceStates(Landroid/telephony/ServiceState;Landroid/telephony/ServiceState;)Landroid/telephony/ServiceState; -Landroid/telephony/ServiceState;->rilRadioTechnologyToString(I)Ljava/lang/String; -Landroid/telephony/SubscriptionInfo;->setDisplayName(Ljava/lang/CharSequence;)V -Landroid/telephony/SubscriptionInfo;->setIconTint(I)V -Landroid/telephony/SubscriptionManager;->clearDefaultsForInactiveSubIds()V -Landroid/telephony/SubscriptionManager;->getDefaultVoicePhoneId()I -Landroid/telephony/SubscriptionManager;->getResourcesForSubId(Landroid/content/Context;I)Landroid/content/res/Resources; -Landroid/telephony/SubscriptionManager;->isActiveSubId(I)Z -Landroid/telephony/SubscriptionManager;->isUsableSubIdValue(I)Z -Landroid/telephony/SubscriptionManager;->isValidPhoneId(I)Z -Landroid/telephony/SubscriptionManager;->isValidSlotIndex(I)Z -Landroid/telephony/SubscriptionManager;->isValidSubscriptionId(I)Z -Landroid/telephony/SubscriptionManager;->putPhoneIdAndSubIdExtra(Landroid/content/Intent;I)V -Landroid/telephony/SubscriptionManager;->putPhoneIdAndSubIdExtra(Landroid/content/Intent;II)V -Landroid/telephony/SubscriptionManager;->setDisplayName(Ljava/lang/String;IJ)I -Landroid/telephony/SubscriptionManager;->setIconTint(II)I -Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDA:Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDS:Landroid/telephony/TelephonyManager$MultiSimVariants; -Landroid/telephony/TelephonyManager;->getIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;I)I -Landroid/telephony/TelephonyManager;->getIsimDomain()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getNetworkTypeName()Ljava/lang/String; -Landroid/telephony/TelephonyManager;->getPreferredNetworkType(I)I -Landroid/telephony/TelephonyManager;->getServiceStateForSubscriber(I)Landroid/telephony/ServiceState; -Landroid/telephony/TelephonyManager;->getVoiceMessageCount()I -Landroid/telephony/TelephonyManager;->getVoiceNetworkType(I)I -Landroid/telephony/TelephonyManager;->isImsRegistered()Z -Landroid/telephony/TelephonyManager;->nvResetConfig(I)Z -Landroid/telephony/TelephonyManager;->putIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;II)Z -Landroid/telephony/TelephonyManager;->setPreferredNetworkType(II)Z Landroid/view/IAppTransitionAnimationSpecsFuture$Stub;-><init>()V Landroid/view/IRecentsAnimationController;->finish(Z)V Landroid/view/IRecentsAnimationController;->screenshotTask(I)Landroid/app/ActivityManager$TaskSnapshot; @@ -345,17 +254,7 @@ Lcom/android/internal/location/ILocationProvider;->sendExtraCommand(Ljava/lang/S Lcom/android/internal/location/ILocationProvider;->setRequest(Lcom/android/internal/location/ProviderRequest;Landroid/os/WorkSource;)V Lcom/android/internal/R$styleable;->NumberPicker:[I Lcom/android/internal/R$styleable;->TwoLineListItem:[I -Lcom/android/internal/telephony/GsmAlphabet;->gsm7BitPackedToString([BII)Ljava/lang/String; -Lcom/android/internal/telephony/GsmAlphabet;->stringToGsm7BitPacked(Ljava/lang/String;)[B Lcom/android/internal/telephony/ITelephony;->getDataEnabled(I)Z -Lcom/android/internal/telephony/OperatorInfo$State;->CURRENT:Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/OperatorInfo$State;->FORBIDDEN:Lcom/android/internal/telephony/OperatorInfo$State; -Lcom/android/internal/telephony/OperatorInfo;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/OperatorInfo;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaLong()Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->getOperatorAlphaShort()Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->getOperatorNumeric()Ljava/lang/String; -Lcom/android/internal/telephony/OperatorInfo;->getState()Lcom/android/internal/telephony/OperatorInfo$State; Ljava/lang/System;->arraycopy([BI[BII)V Ljava/net/Inet4Address;->ALL:Ljava/net/InetAddress; Ljava/net/Inet4Address;->ANY:Ljava/net/InetAddress; diff --git a/core/java/android/annotation/OWNERS b/core/java/android/annotation/OWNERS index d6bb71b50e34..85adfa747022 100644 --- a/core/java/android/annotation/OWNERS +++ b/core/java/android/annotation/OWNERS @@ -1 +1,2 @@ tnorbye@google.com +per-file UnsupportedAppUsage.java = mathewi@google.com diff --git a/core/java/android/annotation/UnsupportedAppUsage.java b/core/java/android/annotation/UnsupportedAppUsage.java index 05de3e8caa3f..28145a06ecf2 100644 --- a/core/java/android/annotation/UnsupportedAppUsage.java +++ b/core/java/android/annotation/UnsupportedAppUsage.java @@ -27,15 +27,15 @@ import java.lang.annotation.Target; * Indicates that a class member, that is not part of the SDK, is used by apps. * Since the member is not part of the SDK, such use is not supported. * - * This annotation acts as a heads up that changing a given method or field + * <p>This annotation acts as a heads up that changing a given method or field * may affect apps, potentially breaking them when the next Android version is * released. In some cases, for members that are heavily used, this annotation * may imply restrictions on changes to the member. * - * This annotation also results in access to the member being permitted by the + * <p>This annotation also results in access to the member being permitted by the * runtime, with a warning being generated in debug builds. * - * For more details, see go/UnsupportedAppUsage. + * <p>For more details, see go/UnsupportedAppUsage. * * {@hide} */ @@ -51,6 +51,39 @@ public @interface UnsupportedAppUsage { long trackingBug() default 0; /** + * Indicates that usage of this API is limited to apps based on their target SDK version. + * + * <p>Access to the API is allowed if the targetSdkVersion in the apps manifest is no greater + * than this value. Access checks are performed at runtime. + * + * <p>This is used to give app developers a grace period to migrate off a non-SDK interface. + * When making Android version N, existing APIs can have a maxTargetSdk of N-1 added to them. + * Developers must then migrate off the API when their app is updated in future, but it will + * continue working in the meantime. + * + * <p>Possible values are: + * <ul> + * <li> + * {@link android.os.Build.VERSION_CODES#O} or {@link android.os.Build.VERSION_CODES#P}, + * to limit access to apps targeting these SDKs (or earlier). + * </li> + * <li> + * absent (default value) - All apps can access this API, but doing so may result in + * warnings in the log, UI warnings (on developer builds) and/or strictmode violations. + * The API is likely to be further restricted in future. + * </li> + * + * </ul> + * + * Note, if this is set to {@link android.os.Build.VERSION_CODES#O}, apps targeting O + * maintenance releases will also be allowed to use the API, and similarly for any future + * maintenance releases of P. + * + * @return The maximum value for an apps targetSdkVersion in order to access this API. + */ + int maxTargetSdk() default Integer.MAX_VALUE; + + /** * For debug use only. The expected dex signature to be generated for this API, used to verify * parts of the build process. * diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java index e57f585d2022..bab17dc6b80f 100644 --- a/core/java/android/app/servertransaction/ActivityResultItem.java +++ b/core/java/android/app/servertransaction/ActivityResultItem.java @@ -18,6 +18,7 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.annotation.UnsupportedAppUsage; import android.app.ClientTransactionHandler; import android.app.ResultInfo; import android.os.IBinder; @@ -34,6 +35,7 @@ import java.util.Objects; */ public class ActivityResultItem extends ClientTransactionItem { + @UnsupportedAppUsage private List<ResultInfo> mResultInfoList; /* TODO(b/78294732) diff --git a/core/java/android/app/servertransaction/ClientTransaction.java b/core/java/android/app/servertransaction/ClientTransaction.java index 08ad2f055774..c38a133b239d 100644 --- a/core/java/android/app/servertransaction/ClientTransaction.java +++ b/core/java/android/app/servertransaction/ClientTransaction.java @@ -17,6 +17,7 @@ package android.app.servertransaction; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.app.ClientTransactionHandler; import android.app.IApplicationThread; import android.os.IBinder; @@ -42,6 +43,7 @@ import java.util.Objects; public class ClientTransaction implements Parcelable, ObjectPoolItem { /** A list of individual callbacks to a client. */ + @UnsupportedAppUsage private List<ClientTransactionItem> mActivityCallbacks; /** @@ -74,18 +76,21 @@ public class ClientTransaction implements Parcelable, ObjectPoolItem { /** Get the list of callbacks. */ @Nullable + @UnsupportedAppUsage List<ClientTransactionItem> getCallbacks() { return mActivityCallbacks; } /** Get the target activity. */ @Nullable + @UnsupportedAppUsage public IBinder getActivityToken() { return mActivityToken; } /** Get the target state lifecycle request. */ @VisibleForTesting + @UnsupportedAppUsage public ActivityLifecycleItem getLifecycleStateRequest() { return mLifecycleStateRequest; } diff --git a/core/java/android/app/servertransaction/LaunchActivityItem.java b/core/java/android/app/servertransaction/LaunchActivityItem.java index 6bae3595be4d..ed793bfae41a 100644 --- a/core/java/android/app/servertransaction/LaunchActivityItem.java +++ b/core/java/android/app/servertransaction/LaunchActivityItem.java @@ -18,6 +18,7 @@ package android.app.servertransaction; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; +import android.annotation.UnsupportedAppUsage; import android.app.ActivityThread.ActivityClientRecord; import android.app.ClientTransactionHandler; import android.app.ProfilerInfo; @@ -45,8 +46,10 @@ import java.util.Objects; */ public class LaunchActivityItem extends ClientTransactionItem { + @UnsupportedAppUsage private Intent mIntent; private int mIdent; + @UnsupportedAppUsage private ActivityInfo mInfo; private Configuration mCurConfig; private Configuration mOverrideConfig; diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java index e5ce3b00c0fd..4f28cd2d58d7 100644 --- a/core/java/android/app/servertransaction/NewIntentItem.java +++ b/core/java/android/app/servertransaction/NewIntentItem.java @@ -16,6 +16,7 @@ package android.app.servertransaction; +import android.annotation.UnsupportedAppUsage; import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; @@ -33,6 +34,7 @@ import java.util.Objects; */ public class NewIntentItem extends ClientTransactionItem { + @UnsupportedAppUsage private List<ReferrerIntent> mIntents; private boolean mPause; diff --git a/core/java/android/bluetooth/le/ScanFilter.java b/core/java/android/bluetooth/le/ScanFilter.java index c3fae7d470a3..c5d435b76139 100644 --- a/core/java/android/bluetooth/le/ScanFilter.java +++ b/core/java/android/bluetooth/le/ScanFilter.java @@ -58,6 +58,11 @@ public final class ScanFilter implements Parcelable { private final ParcelUuid mServiceUuidMask; @Nullable + private final ParcelUuid mServiceSolicitationUuid; + @Nullable + private final ParcelUuid mServiceSolicitationUuidMask; + + @Nullable private final ParcelUuid mServiceDataUuid; @Nullable private final byte[] mServiceData; @@ -75,12 +80,15 @@ public final class ScanFilter implements Parcelable { private ScanFilter(String name, String deviceAddress, ParcelUuid uuid, - ParcelUuid uuidMask, ParcelUuid serviceDataUuid, + ParcelUuid uuidMask, ParcelUuid solicitationUuid, + ParcelUuid solicitationUuidMask, ParcelUuid serviceDataUuid, byte[] serviceData, byte[] serviceDataMask, int manufacturerId, byte[] manufacturerData, byte[] manufacturerDataMask) { mDeviceName = name; mServiceUuid = uuid; mServiceUuidMask = uuidMask; + mServiceSolicitationUuid = solicitationUuid; + mServiceSolicitationUuidMask = solicitationUuidMask; mDeviceAddress = deviceAddress; mServiceDataUuid = serviceDataUuid; mServiceData = serviceData; @@ -113,6 +121,14 @@ public final class ScanFilter implements Parcelable { dest.writeParcelable(mServiceUuidMask, flags); } } + dest.writeInt(mServiceSolicitationUuid == null ? 0 : 1); + if (mServiceSolicitationUuid != null) { + dest.writeParcelable(mServiceSolicitationUuid, flags); + dest.writeInt(mServiceSolicitationUuidMask == null ? 0 : 1); + if (mServiceSolicitationUuidMask != null) { + dest.writeParcelable(mServiceSolicitationUuidMask, flags); + } + } dest.writeInt(mServiceDataUuid == null ? 0 : 1); if (mServiceDataUuid != null) { dest.writeParcelable(mServiceDataUuid, flags); @@ -172,6 +188,17 @@ public final class ScanFilter implements Parcelable { } } if (in.readInt() == 1) { + ParcelUuid solicitationUuid = in.readParcelable( + ParcelUuid.class.getClassLoader()); + builder.setServiceSolicitationUuid(solicitationUuid); + if (in.readInt() == 1) { + ParcelUuid solicitationUuidMask = in.readParcelable( + ParcelUuid.class.getClassLoader()); + builder.setServiceSolicitationUuid(solicitationUuid, + solicitationUuidMask); + } + } + if (in.readInt() == 1) { ParcelUuid servcieDataUuid = in.readParcelable(ParcelUuid.class.getClassLoader()); if (in.readInt() == 1) { @@ -231,6 +258,22 @@ public final class ScanFilter implements Parcelable { return mServiceUuidMask; } + /** + * Returns the filter set on the service Solicitation uuid. + */ + @Nullable + public ParcelUuid getServiceSolicitationUuid() { + return mServiceSolicitationUuid; + } + + /** + * Returns the filter set on the service Solicitation uuid mask. + */ + @Nullable + public ParcelUuid getServiceSolicitationUuidMask() { + return mServiceSolicitationUuidMask; + } + @Nullable public String getDeviceAddress() { return mDeviceAddress; @@ -288,7 +331,7 @@ public final class ScanFilter implements Parcelable { // Scan record is null but there exist filters on it. if (scanRecord == null && (mDeviceName != null || mServiceUuid != null || mManufacturerData != null - || mServiceData != null)) { + || mServiceData != null || mServiceSolicitationUuid != null)) { return false; } @@ -303,6 +346,13 @@ public final class ScanFilter implements Parcelable { return false; } + // solicitation UUID match. + if (mServiceSolicitationUuid != null && !matchesServiceSolicitationUuids( + mServiceSolicitationUuid, mServiceSolicitationUuidMask, + scanRecord.getServiceSolicitationUuids())) { + return false; + } + // Service data match if (mServiceDataUuid != null) { if (!matchesPartialData(mServiceData, mServiceDataMask, @@ -350,6 +400,36 @@ public final class ScanFilter implements Parcelable { return BitUtils.maskedEquals(data, uuid, mask); } + /** + * Check if the solicitation uuid pattern is contained in a list of parcel uuids. + * + */ + private static boolean matchesServiceSolicitationUuids(ParcelUuid solicitationUuid, + ParcelUuid parcelSolicitationUuidMask, List<ParcelUuid> solicitationUuids) { + if (solicitationUuid == null) { + return true; + } + if (solicitationUuids == null) { + return false; + } + + for (ParcelUuid parcelSolicitationUuid : solicitationUuids) { + UUID solicitationUuidMask = parcelSolicitationUuidMask == null + ? null : parcelSolicitationUuidMask.getUuid(); + if (matchesServiceUuid(solicitationUuid.getUuid(), solicitationUuidMask, + parcelSolicitationUuid.getUuid())) { + return true; + } + } + return false; + } + + // Check if the solicitation uuid pattern matches the particular service solicitation uuid. + private static boolean matchesServiceSolicitationUuid(UUID solicitationUuid, + UUID solicitationUuidMask, UUID data) { + return BitUtils.maskedEquals(data, solicitationUuid, solicitationUuidMask); + } + // Check whether the data pattern matches the parsed data. private boolean matchesPartialData(byte[] data, byte[] dataMask, byte[] parsedData) { if (parsedData == null || parsedData.length < data.length) { @@ -376,6 +456,8 @@ public final class ScanFilter implements Parcelable { return "BluetoothLeScanFilter [mDeviceName=" + mDeviceName + ", mDeviceAddress=" + mDeviceAddress + ", mUuid=" + mServiceUuid + ", mUuidMask=" + mServiceUuidMask + + ", mServiceSolicitationUuid=" + mServiceSolicitationUuid + + ", mServiceSolicitationUuidMask=" + mServiceSolicitationUuidMask + ", mServiceDataUuid=" + Objects.toString(mServiceDataUuid) + ", mServiceData=" + Arrays.toString(mServiceData) + ", mServiceDataMask=" + Arrays.toString(mServiceDataMask) + ", mManufacturerId=" + mManufacturerId @@ -391,7 +473,8 @@ public final class ScanFilter implements Parcelable { mServiceDataUuid, Arrays.hashCode(mServiceData), Arrays.hashCode(mServiceDataMask), - mServiceUuid, mServiceUuidMask); + mServiceUuid, mServiceUuidMask, + mServiceSolicitationUuid, mServiceSolicitationUuidMask); } @Override @@ -412,7 +495,10 @@ public final class ScanFilter implements Parcelable { && Objects.deepEquals(mServiceData, other.mServiceData) && Objects.deepEquals(mServiceDataMask, other.mServiceDataMask) && Objects.equals(mServiceUuid, other.mServiceUuid) - && Objects.equals(mServiceUuidMask, other.mServiceUuidMask); + && Objects.equals(mServiceUuidMask, other.mServiceUuidMask) + && Objects.equals(mServiceSolicitationUuid, other.mServiceSolicitationUuid) + && Objects.equals(mServiceSolicitationUuidMask, + other.mServiceSolicitationUuidMask); } /** @@ -435,6 +521,9 @@ public final class ScanFilter implements Parcelable { private ParcelUuid mServiceUuid; private ParcelUuid mUuidMask; + private ParcelUuid mServiceSolicitationUuid; + private ParcelUuid mServiceSolicitationUuidMask; + private ParcelUuid mServiceDataUuid; private byte[] mServiceData; private byte[] mServiceDataMask; @@ -493,6 +582,36 @@ public final class ScanFilter implements Parcelable { return this; } + + /** + * Set filter on service solicitation uuid. + */ + public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid) { + mServiceSolicitationUuid = serviceSolicitationUuid; + return this; + } + + + /** + * Set filter on partial service Solicitation uuid. The {@code SolicitationUuidMask} is the + * bit mask for the {@code serviceSolicitationUuid}. Set any bit in the mask to 1 to + * indicate a match is needed for the bit in {@code serviceSolicitationUuid}, and 0 to + * ignore that bit. + * + * @throws IllegalArgumentException If {@code serviceSolicitationUuid} is {@code null} but + * {@code serviceSolicitationUuidMask} is not {@code null}. + */ + public Builder setServiceSolicitationUuid(ParcelUuid serviceSolicitationUuid, + ParcelUuid solicitationUuidMask) { + if (mServiceSolicitationUuidMask != null && mServiceSolicitationUuid == null) { + throw new IllegalArgumentException( + "SolicitationUuid is null while SolicitationUuidMask is not null!"); + } + mServiceSolicitationUuid = serviceSolicitationUuid; + mServiceSolicitationUuidMask = solicitationUuidMask; + return this; + } + /** * Set filtering on service data. * @@ -598,7 +717,8 @@ public final class ScanFilter implements Parcelable { */ public ScanFilter build() { return new ScanFilter(mDeviceName, mDeviceAddress, - mServiceUuid, mUuidMask, + mServiceUuid, mUuidMask, mServiceSolicitationUuid, + mServiceSolicitationUuidMask, mServiceDataUuid, mServiceData, mServiceDataMask, mManufacturerId, mManufacturerData, mManufacturerDataMask); } diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index 07ed18d90ee6..7988008f03c0 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java @@ -51,6 +51,9 @@ public final class ScanRecord { private static final int DATA_TYPE_SERVICE_DATA_16_BIT = 0x16; private static final int DATA_TYPE_SERVICE_DATA_32_BIT = 0x20; private static final int DATA_TYPE_SERVICE_DATA_128_BIT = 0x21; + private static final int DATA_TYPE_SERVICE_SOLICITATION_UUIDS_16_BIT = 0x14; + private static final int DATA_TYPE_SERVICE_SOLICITATION_UUIDS_32_BIT = 0x1F; + private static final int DATA_TYPE_SERVICE_SOLICITATION_UUIDS_128_BIT = 0x15; private static final int DATA_TYPE_MANUFACTURER_SPECIFIC_DATA = 0xFF; // Flags of the advertising data. @@ -58,6 +61,8 @@ public final class ScanRecord { @Nullable private final List<ParcelUuid> mServiceUuids; + @Nullable + private final List<ParcelUuid> mServiceSolicitationUuids; private final SparseArray<byte[]> mManufacturerSpecificData; @@ -89,6 +94,15 @@ public final class ScanRecord { } /** + * Returns a list of service solicitation UUIDs within the advertisement that are used to + * identify the Bluetooth GATT services. + */ + @Nullable + public List<ParcelUuid> getServiceSolicitationUuids() { + return mServiceSolicitationUuids; + } + + /** * Returns a sparse array of manufacturer identifier and its corresponding manufacturer specific * data. */ @@ -151,10 +165,12 @@ public final class ScanRecord { } private ScanRecord(List<ParcelUuid> serviceUuids, + List<ParcelUuid> serviceSolicitationUuids, SparseArray<byte[]> manufacturerData, Map<ParcelUuid, byte[]> serviceData, int advertiseFlags, int txPowerLevel, String localName, byte[] bytes) { + mServiceSolicitationUuids = serviceSolicitationUuids; mServiceUuids = serviceUuids; mManufacturerSpecificData = manufacturerData; mServiceData = serviceData; @@ -184,6 +200,7 @@ public final class ScanRecord { int currentPos = 0; int advertiseFlag = -1; List<ParcelUuid> serviceUuids = new ArrayList<ParcelUuid>(); + List<ParcelUuid> serviceSolicitationUuids = new ArrayList<ParcelUuid>(); String localName = null; int txPowerLevel = Integer.MIN_VALUE; @@ -220,6 +237,18 @@ public final class ScanRecord { parseServiceUuid(scanRecord, currentPos, dataLength, BluetoothUuid.UUID_BYTES_128_BIT, serviceUuids); break; + case DATA_TYPE_SERVICE_SOLICITATION_UUIDS_16_BIT: + parseServiceSolicitationUuid(scanRecord, currentPos, dataLength, + BluetoothUuid.UUID_BYTES_16_BIT, serviceSolicitationUuids); + break; + case DATA_TYPE_SERVICE_SOLICITATION_UUIDS_32_BIT: + parseServiceSolicitationUuid(scanRecord, currentPos, dataLength, + BluetoothUuid.UUID_BYTES_32_BIT, serviceSolicitationUuids); + break; + case DATA_TYPE_SERVICE_SOLICITATION_UUIDS_128_BIT: + parseServiceSolicitationUuid(scanRecord, currentPos, dataLength, + BluetoothUuid.UUID_BYTES_128_BIT, serviceSolicitationUuids); + break; case DATA_TYPE_LOCAL_NAME_SHORT: case DATA_TYPE_LOCAL_NAME_COMPLETE: localName = new String( @@ -265,19 +294,23 @@ public final class ScanRecord { if (serviceUuids.isEmpty()) { serviceUuids = null; } - return new ScanRecord(serviceUuids, manufacturerData, serviceData, - advertiseFlag, txPowerLevel, localName, scanRecord); + if (serviceSolicitationUuids.isEmpty()) { + serviceSolicitationUuids = null; + } + return new ScanRecord(serviceUuids, serviceSolicitationUuids, manufacturerData, + serviceData, advertiseFlag, txPowerLevel, localName, scanRecord); } catch (Exception e) { Log.e(TAG, "unable to parse scan record: " + Arrays.toString(scanRecord)); // As the record is invalid, ignore all the parsed results for this packet // and return an empty record with raw scanRecord bytes in results - return new ScanRecord(null, null, null, -1, Integer.MIN_VALUE, null, scanRecord); + return new ScanRecord(null, null, null, null, -1, Integer.MIN_VALUE, null, scanRecord); } } @Override public String toString() { return "ScanRecord [mAdvertiseFlags=" + mAdvertiseFlags + ", mServiceUuids=" + mServiceUuids + + ", mServiceSolicitationUuids=" + mServiceSolicitationUuids + ", mManufacturerSpecificData=" + BluetoothLeUtils.toString( mManufacturerSpecificData) + ", mServiceData=" + BluetoothLeUtils.toString(mServiceData) @@ -297,6 +330,20 @@ public final class ScanRecord { return currentPos; } + /** + * Parse service Solicitation UUIDs. + */ + private static int parseServiceSolicitationUuid(byte[] scanRecord, int currentPos, + int dataLength, int uuidLength, List<ParcelUuid> serviceSolicitationUuids) { + while (dataLength > 0) { + byte[] uuidBytes = extractBytes(scanRecord, currentPos, uuidLength); + serviceSolicitationUuids.add(BluetoothUuid.parseUuidFrom(uuidBytes)); + dataLength -= uuidLength; + currentPos += uuidLength; + } + return currentPos; + } + // Helper method to extract bytes from byte array. private static byte[] extractBytes(byte[] scanRecord, int start, int length) { byte[] bytes = new byte[length]; diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index d2611563d0aa..243d7d8121c0 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -1001,6 +1001,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { public String appComponentFactory; /** + * Indicates whether this package requires access to non-SDK APIs. Only system apps + * and tests are allowed to use this property. + * @hide + */ + public boolean usesNonSdkApi; + + /** * 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 @@ -1698,8 +1705,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { } private boolean isAllowedToUseHiddenApis() { - return isSignedWithPlatformKey() - || (isPackageWhitelistedForHiddenApis() && (isSystemApp() || isUpdatedSystemApp())); + if (isSignedWithPlatformKey()) { + return true; + } else if (isSystemApp() || isUpdatedSystemApp()) { + return usesNonSdkApi || isPackageWhitelistedForHiddenApis(); + } else { + return false; + } } /** diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 89a72c96ec64..b7be5a7ced2d 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3580,6 +3580,9 @@ public class PackageParser { ai.appComponentFactory = buildClassName(ai.packageName, factory, outError); } + ai.usesNonSdkApi = sa.getBoolean( + com.android.internal.R.styleable.AndroidManifestApplication_usesNonSdkApi, false); + if (outError[0] == null) { CharSequence pname; if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) { diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index 19e399a50724..7d9af00066aa 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -1343,9 +1343,11 @@ public class ResourcesImpl { @StyleableRes int[] attrs, @AttrRes int defStyleAttr, @StyleRes int defStyleRes) { + Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, "obtainStyledAttributes"); + TypedArray array; synchronized (mKey) { final int len = attrs.length; - final TypedArray array = TypedArray.obtain(wrapper.getResources(), len); + array = TypedArray.obtain(wrapper.getResources(), len); // XXX note that for now we only work with compiled XML files. // To support generic XML files we will need to manually parse @@ -1356,8 +1358,9 @@ public class ResourcesImpl { array.mDataAddress, array.mIndicesAddress); array.mTheme = wrapper; array.mXml = parser; - return array; } + Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); + return array; } @NonNull diff --git a/core/java/android/database/OWNERS b/core/java/android/database/OWNERS index 84e81e4285d1..7e19942ba332 100644 --- a/core/java/android/database/OWNERS +++ b/core/java/android/database/OWNERS @@ -1,2 +1,3 @@ -fkupolov@google.com -omakoto@google.com
\ No newline at end of file +omakoto@google.com +jsharkey@android.com +yamasani@google.com diff --git a/core/java/android/hardware/OWNERS b/core/java/android/hardware/OWNERS index b8fea556e4c5..29a339a7d286 100644 --- a/core/java/android/hardware/OWNERS +++ b/core/java/android/hardware/OWNERS @@ -1,7 +1,2 @@ # Camera -per-file *Camera* = cychen@google.com -per-file *Camera* = epeev@google.com -per-file *Camera* = etalvala@google.com -per-file *Camera* = shuzhenwang@google.com -per-file *Camera* = yinchiayeh@google.com -per-file *Camera* = zhijunhe@google.com +per-file *Camera* = cychen@google.com,epeev@google.com,etalvala@google.com,shuzhenwang@google.com,yinchiayeh@google.com,zhijunhe@google.com diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index c3a57070c440..9b18e9a12969 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -2371,13 +2371,25 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, is defined relative to the active array rectangle given in * this field, with <code>(0, 0)</code> being the top-left of this rectangle.</p> * <p>The active array may be smaller than the full pixel array, since the full array may - * include black calibration pixels or other inactive regions, and geometric correction - * resulting in scaling or cropping may have been applied.</p> + * include black calibration pixels or other inactive regions.</p> + * <p>For devices that do not support {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the active + * array must be the same as {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.</p> + * <p>For devices that support {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the active array must + * be enclosed by {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}. The difference between + * pre-correction active array and active array accounts for scaling or cropping caused + * by lens geometric distortion correction.</p> + * <p>In general, application should always refer to active array size for controls like + * metering regions or crop region. Two exceptions are when the application is dealing with + * RAW image buffers (RAW_SENSOR, RAW10, RAW12 etc), or when application explicitly set + * {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} to OFF. In these cases, application should refer + * to {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.</p> * <p><b>Units</b>: Pixel coordinates on the image sensor</p> * <p>This key is available on all devices.</p> * + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.graphics.Rect> SENSOR_INFO_ACTIVE_ARRAY_SIZE = @@ -2622,9 +2634,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <ol> * <li>{@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}.</li> * </ol> - * <p>If all of the geometric distortion fields are no-ops, this rectangle will be the same - * as the post-distortion-corrected rectangle given in - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p> + * <p>If the camera device doesn't support geometric distortion correction, or all of the + * geometric distortion fields are no-ops, this rectangle will be the same as the + * post-distortion-corrected rectangle given in {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p> * <p>This rectangle is defined relative to the full pixel array; (0,0) is the top-left of * the full pixel array, and the size of the full pixel array is given by * {@link CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE android.sensor.info.pixelArraySize}.</p> @@ -3130,12 +3142,26 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * the following code snippet can be used:</p> * <pre><code>// Returns true if the device supports the required hardware level, or better. * boolean isHardwareLevelSupported(CameraCharacteristics c, int requiredLevel) { + * final int[] sortedHwLevels = { + * CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY, + * CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL, + * CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED, + * CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL, + * CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_3 + * }; * int deviceLevel = c.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL); - * if (deviceLevel == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) { - * return requiredLevel == deviceLevel; + * if (requiredLevel == deviceLevel) { + * return true; + * } + * + * for (int sortedlevel : sortedHwLevels) { + * if (sortedlevel == requiredLevel) { + * return true; + * } else if (sortedlevel == deviceLevel) { + * return false; + * } * } - * // deviceLevel is not LEGACY, can use numerical sort - * return requiredLevel <= deviceLevel; + * return false; // Should never reach here * } * </code></pre> * <p>At a high level, the levels are:</p> @@ -3149,6 +3175,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * post-processing settings, and image capture at a high rate.</li> * <li><code>LEVEL_3</code> devices additionally support YUV reprocessing and RAW image capture, along * with additional output stream configurations.</li> + * <li><code>EXTERNAL</code> devices are similar to <code>LIMITED</code> devices with exceptions like some sensor or + * lens information not reorted or less stable framerates.</li> * </ul> * <p>See the individual level enums for full descriptions of the supported capabilities. The * {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} entry describes the device's capabilities at a diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java index f47d4640c09c..ce88697fa8db 100644 --- a/core/java/android/hardware/camera2/CameraDevice.java +++ b/core/java/android/hardware/camera2/CameraDevice.java @@ -44,19 +44,27 @@ import java.lang.annotation.RetentionPolicy; * {@link android.Manifest.permission#CAMERA Camera} permission in its manifest * in order to access camera devices.</p> * - * <p>A given camera device may provide support at one of two levels: limited or - * full. If a device only supports the limited level, then Camera2 exposes a - * feature set that is roughly equivalent to the older + * <p>A given camera device may provide support at one of several levels defined + * in {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}. + * If a device supports {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY} level, + * the camera device is running in backward compatibility mode and has minimum camera2 API support. + * If a device supports the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} + * level, then Camera2 exposes a feature set that is roughly equivalent to the older * {@link android.hardware.Camera Camera} API, although with a cleaner and more - * efficient interface. Devices that implement the full level of support + * efficient interface. + * If a device supports the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL EXTERNAL} + * level, then the device is a removable camera that provides similar but slightly less features + * as the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} level. + * Devices that implement the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL} or + * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_3 LEVEL3} level of support * provide substantially improved capabilities over the older camera - * API. Applications that target the limited level devices will run unchanged on - * the full-level devices; if your application requires a full-level device for + * API. If your application requires a full-level device for * proper operation, declare the "android.hardware.camera.level.full" feature in your * manifest.</p> * * @see CameraManager#openCamera * @see android.Manifest.permission#CAMERA + * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL */ public abstract class CameraDevice implements AutoCloseable { diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index ec51ba56c571..0b92b0cbef15 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -1277,11 +1277,26 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * Otherwise will always be present.</p> * <p>The maximum number of regions supported by the device is determined by the value * of {@link CameraCharacteristics#CONTROL_MAX_REGIONS_AE android.control.maxRegionsAe}.</p> - * <p>The coordinate system is based on the active pixel array, - * with (0,0) being the top-left pixel in the active pixel array, and + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with (0,0) being + * the top-left pixel in the active pixel array, and * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the - * bottom-right pixel in the active pixel array.</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.height - 1) being the bottom-right + * pixel in the pre-correction active pixel array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> * <p>The weight must be within <code>[0, 1000]</code>, and represents a weight * for every pixel in the area. This means that a large metering area * with the same weight as a smaller area will have more effect in @@ -1297,15 +1312,20 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * region and output only the intersection rectangle as the metering region in the result * metadata. If the region is entirely outside the crop region, it will be ignored and * not reported in the result metadata.</p> - * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on + * distortion correction capability and mode</p> * <p><b>Range of valid values:</b><br> * Coordinates must be between <code>[(0,0), (width, height))</code> of - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} + * depending on distortion correction capability and mode</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CameraCharacteristics#CONTROL_MAX_REGIONS_AE + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AE_REGIONS = @@ -1451,11 +1471,26 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * Otherwise will always be present.</p> * <p>The maximum number of focus areas supported by the device is determined by the value * of {@link CameraCharacteristics#CONTROL_MAX_REGIONS_AF android.control.maxRegionsAf}.</p> - * <p>The coordinate system is based on the active pixel array, - * with (0,0) being the top-left pixel in the active pixel array, and + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with (0,0) being + * the top-left pixel in the active pixel array, and + * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.height - 1) being the bottom-right + * pixel in the pre-correction active pixel array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array, and * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the - * bottom-right pixel in the active pixel array.</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> * <p>The weight must be within <code>[0, 1000]</code>, and represents a weight * for every pixel in the area. This means that a large metering area * with the same weight as a smaller area will have more effect in @@ -1472,15 +1507,20 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * region and output only the intersection rectangle as the metering region in the result * metadata. If the region is entirely outside the crop region, it will be ignored and * not reported in the result metadata.</p> - * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on + * distortion correction capability and mode</p> * <p><b>Range of valid values:</b><br> * Coordinates must be between <code>[(0,0), (width, height))</code> of - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} + * depending on distortion correction capability and mode</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CameraCharacteristics#CONTROL_MAX_REGIONS_AF + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AF_REGIONS = @@ -1620,11 +1660,26 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * Otherwise will always be present.</p> * <p>The maximum number of regions supported by the device is determined by the value * of {@link CameraCharacteristics#CONTROL_MAX_REGIONS_AWB android.control.maxRegionsAwb}.</p> - * <p>The coordinate system is based on the active pixel array, - * with (0,0) being the top-left pixel in the active pixel array, and + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with (0,0) being + * the top-left pixel in the active pixel array, and * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the - * bottom-right pixel in the active pixel array.</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.height - 1) being the bottom-right + * pixel in the pre-correction active pixel array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> * <p>The weight must range from 0 to 1000, and represents a weight * for every pixel in the area. This means that a large metering area * with the same weight as a smaller area will have more effect in @@ -1640,15 +1695,20 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * region and output only the intersection rectangle as the metering region in the result * metadata. If the region is entirely outside the crop region, it will be ignored and * not reported in the result metadata.</p> - * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on + * distortion correction capability and mode</p> * <p><b>Range of valid values:</b><br> * Coordinates must be between <code>[(0,0), (width, height))</code> of - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} + * depending on distortion correction capability and mode</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CameraCharacteristics#CONTROL_MAX_REGIONS_AWB + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AWB_REGIONS = @@ -2441,9 +2501,17 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> /** * <p>The desired region of the sensor to read out for this capture.</p> * <p>This control can be used to implement digital zoom.</p> - * <p>The crop region coordinate system is based off - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with <code>(0, 0)</code> being the - * top-left corner of the sensor active array.</p> + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with <code>(0, 0)</code> being + * the top-left pixel of the active array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array.</p> * <p>Output streams use this rectangle to produce their output, * cropping to a smaller region if necessary to maintain the * stream's aspect ratio, then scaling the sensor input to @@ -2462,20 +2530,30 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * outputs will crop horizontally (pillarbox), and 16:9 * streams will match exactly. These additional crops will * be centered within the crop region.</p> - * <p>The width and height of the crop region cannot - * be set to be smaller than + * <p>If the coordinate system is android.sensor.info.activeArraysSize, the width and height + * of the crop region cannot be set to be smaller than * <code>floor( activeArraySize.width / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code> and * <code>floor( activeArraySize.height / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code>, respectively.</p> + * <p>If the coordinate system is {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, the width + * and height of the crop region cannot be set to be smaller than + * <code>floor( preCorrectionActiveArraySize.width / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code> + * and + * <code>floor( preCorrectionActiveArraySize.height / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code>, + * respectively.</p> * <p>The camera device may adjust the crop region to account * for rounding and other hardware requirements; the final * crop region used will be included in the output capture * result.</p> * <p><b>Units</b>: Pixel coordinates relative to - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on distortion correction + * capability and mode</p> * <p>This key is available on all devices.</p> * + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.graphics.Rect> SCALER_CROP_REGION = @@ -3194,15 +3272,14 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * any correction at all would slow down capture rate. Every output stream will have a * similar amount of enhancement applied.</p> * <p>The correction only applies to processed outputs such as YUV, JPEG, or DEPTH16; it is not - * applied to any RAW output. Metadata coordinates such as face rectangles or metering + * applied to any RAW output. Metadata coordinates such as face rectangles or metering * regions are also not affected by correction.</p> - * <p>Applications enabling distortion correction need to pay extra attention when converting - * image coordinates between corrected output buffers and the sensor array. For example, if - * the app supports tap-to-focus and enables correction, it then has to apply the distortion - * model described in {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion} to the image buffer tap coordinates to properly - * calculate the tap position on the sensor active array to be used with - * {@link CaptureRequest#CONTROL_AF_REGIONS android.control.afRegions}. The same applies in reverse to detected face rectangles if - * they need to be drawn on top of the corrected output buffers.</p> + * <p>This control will be on by default on devices that support this control. Applications + * disabling distortion correction need to pay extra attention with the coordinate system of + * metering regions, crop region, and face rectangles. When distortion correction is OFF, + * metadata coordinates follow the coordinate system of + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}. When distortion is not OFF, metadata + * coordinates follow the coordinate system of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p> * <p><b>Possible values:</b> * <ul> * <li>{@link #DISTORTION_CORRECTION_MODE_OFF OFF}</li> @@ -3213,9 +3290,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> * {@link CameraCharacteristics#DISTORTION_CORRECTION_AVAILABLE_MODES android.distortionCorrection.availableModes}</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * - * @see CaptureRequest#CONTROL_AF_REGIONS * @see CameraCharacteristics#DISTORTION_CORRECTION_AVAILABLE_MODES * @see CameraCharacteristics#LENS_DISTORTION + * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE * @see #DISTORTION_CORRECTION_MODE_OFF * @see #DISTORTION_CORRECTION_MODE_FAST * @see #DISTORTION_CORRECTION_MODE_HIGH_QUALITY diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index a49064f8fb71..e007d282ad04 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -736,11 +736,26 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * Otherwise will always be present.</p> * <p>The maximum number of regions supported by the device is determined by the value * of {@link CameraCharacteristics#CONTROL_MAX_REGIONS_AE android.control.maxRegionsAe}.</p> - * <p>The coordinate system is based on the active pixel array, - * with (0,0) being the top-left pixel in the active pixel array, and + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with (0,0) being + * the top-left pixel in the active pixel array, and * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the - * bottom-right pixel in the active pixel array.</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.height - 1) being the bottom-right + * pixel in the pre-correction active pixel array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> * <p>The weight must be within <code>[0, 1000]</code>, and represents a weight * for every pixel in the area. This means that a large metering area * with the same weight as a smaller area will have more effect in @@ -756,15 +771,20 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * region and output only the intersection rectangle as the metering region in the result * metadata. If the region is entirely outside the crop region, it will be ignored and * not reported in the result metadata.</p> - * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on + * distortion correction capability and mode</p> * <p><b>Range of valid values:</b><br> * Coordinates must be between <code>[(0,0), (width, height))</code> of - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} + * depending on distortion correction capability and mode</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CameraCharacteristics#CONTROL_MAX_REGIONS_AE + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AE_REGIONS = @@ -1158,11 +1178,26 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * Otherwise will always be present.</p> * <p>The maximum number of focus areas supported by the device is determined by the value * of {@link CameraCharacteristics#CONTROL_MAX_REGIONS_AF android.control.maxRegionsAf}.</p> - * <p>The coordinate system is based on the active pixel array, - * with (0,0) being the top-left pixel in the active pixel array, and + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with (0,0) being + * the top-left pixel in the active pixel array, and + * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.height - 1) being the bottom-right + * pixel in the pre-correction active pixel array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array, and * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the - * bottom-right pixel in the active pixel array.</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> * <p>The weight must be within <code>[0, 1000]</code>, and represents a weight * for every pixel in the area. This means that a large metering area * with the same weight as a smaller area will have more effect in @@ -1179,15 +1214,20 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * region and output only the intersection rectangle as the metering region in the result * metadata. If the region is entirely outside the crop region, it will be ignored and * not reported in the result metadata.</p> - * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on + * distortion correction capability and mode</p> * <p><b>Range of valid values:</b><br> * Coordinates must be between <code>[(0,0), (width, height))</code> of - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} + * depending on distortion correction capability and mode</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CameraCharacteristics#CONTROL_MAX_REGIONS_AF + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AF_REGIONS = @@ -1736,11 +1776,26 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * Otherwise will always be present.</p> * <p>The maximum number of regions supported by the device is determined by the value * of {@link CameraCharacteristics#CONTROL_MAX_REGIONS_AWB android.control.maxRegionsAwb}.</p> - * <p>The coordinate system is based on the active pixel array, - * with (0,0) being the top-left pixel in the active pixel array, and + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with (0,0) being + * the top-left pixel in the active pixel array, and + * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array, and + * ({@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.width - 1, + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.height - 1) being the bottom-right + * pixel in the pre-correction active pixel array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array, and * ({@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.width - 1, - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the - * bottom-right pixel in the active pixel array.</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.height - 1) being the bottom-right pixel in the + * active pixel array.</p> * <p>The weight must range from 0 to 1000, and represents a weight * for every pixel in the area. This means that a large metering area * with the same weight as a smaller area will have more effect in @@ -1756,15 +1811,20 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * region and output only the intersection rectangle as the metering region in the result * metadata. If the region is entirely outside the crop region, it will be ignored and * not reported in the result metadata.</p> - * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * <p><b>Units</b>: Pixel coordinates within {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on + * distortion correction capability and mode</p> * <p><b>Range of valid values:</b><br> * Coordinates must be between <code>[(0,0), (width, height))</code> of - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} + * depending on distortion correction capability and mode</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * * @see CameraCharacteristics#CONTROL_MAX_REGIONS_AWB + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CaptureRequest#SCALER_CROP_REGION * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.hardware.camera2.params.MeteringRectangle[]> CONTROL_AWB_REGIONS = @@ -3105,9 +3165,17 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { /** * <p>The desired region of the sensor to read out for this capture.</p> * <p>This control can be used to implement digital zoom.</p> - * <p>The crop region coordinate system is based off - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with <code>(0, 0)</code> being the - * top-left corner of the sensor active array.</p> + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with <code>(0, 0)</code> being + * the top-left pixel of the active array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the active array.</p> * <p>Output streams use this rectangle to produce their output, * cropping to a smaller region if necessary to maintain the * stream's aspect ratio, then scaling the sensor input to @@ -3126,20 +3194,30 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * outputs will crop horizontally (pillarbox), and 16:9 * streams will match exactly. These additional crops will * be centered within the crop region.</p> - * <p>The width and height of the crop region cannot - * be set to be smaller than + * <p>If the coordinate system is android.sensor.info.activeArraysSize, the width and height + * of the crop region cannot be set to be smaller than * <code>floor( activeArraySize.width / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code> and * <code>floor( activeArraySize.height / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code>, respectively.</p> + * <p>If the coordinate system is {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, the width + * and height of the crop region cannot be set to be smaller than + * <code>floor( preCorrectionActiveArraySize.width / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code> + * and + * <code>floor( preCorrectionActiveArraySize.height / {@link CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM android.scaler.availableMaxDigitalZoom} )</code>, + * respectively.</p> * <p>The camera device may adjust the crop region to account * for rounding and other hardware requirements; the final * crop region used will be included in the output capture * result.</p> * <p><b>Units</b>: Pixel coordinates relative to - * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}</p> + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} or + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize} depending on distortion correction + * capability and mode</p> * <p>This key is available on all devices.</p> * + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CameraCharacteristics#SCALER_AVAILABLE_MAX_DIGITAL_ZOOM * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE */ @PublicKey public static final Key<android.graphics.Rect> SCALER_CROP_REGION = @@ -3630,12 +3708,23 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { /** * <p>List of landmarks for detected * faces.</p> - * <p>The coordinate system is that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with <code>(0, 0)</code> being + * the top-left pixel of the active array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with * <code>(0, 0)</code> being the top-left pixel of the active array.</p> * <p>Only available if {@link CaptureRequest#STATISTICS_FACE_DETECT_MODE android.statistics.faceDetectMode} == FULL * This key is available on all devices.</p> * + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE * @hide */ @@ -3645,12 +3734,23 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { /** * <p>List of the bounding rectangles for detected * faces.</p> - * <p>The coordinate system is that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with + * <p>For devices not supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system always follows that of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with <code>(0, 0)</code> being + * the top-left pixel of the active array.</p> + * <p>For devices supporting {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the coordinate + * system depends on the mode being set. + * When the distortion correction mode is OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}, with + * <code>(0, 0)</code> being the top-left pixel of the pre-correction active array. + * When the distortion correction mode is not OFF, the coordinate system follows + * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}, with * <code>(0, 0)</code> being the top-left pixel of the active array.</p> * <p>Only available if {@link CaptureRequest#STATISTICS_FACE_DETECT_MODE android.statistics.faceDetectMode} != OFF * This key is available on all devices.</p> * + * @see CaptureRequest#DISTORTION_CORRECTION_MODE * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE * @see CaptureRequest#STATISTICS_FACE_DETECT_MODE * @hide */ @@ -4484,15 +4584,14 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * any correction at all would slow down capture rate. Every output stream will have a * similar amount of enhancement applied.</p> * <p>The correction only applies to processed outputs such as YUV, JPEG, or DEPTH16; it is not - * applied to any RAW output. Metadata coordinates such as face rectangles or metering + * applied to any RAW output. Metadata coordinates such as face rectangles or metering * regions are also not affected by correction.</p> - * <p>Applications enabling distortion correction need to pay extra attention when converting - * image coordinates between corrected output buffers and the sensor array. For example, if - * the app supports tap-to-focus and enables correction, it then has to apply the distortion - * model described in {@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion} to the image buffer tap coordinates to properly - * calculate the tap position on the sensor active array to be used with - * {@link CaptureRequest#CONTROL_AF_REGIONS android.control.afRegions}. The same applies in reverse to detected face rectangles if - * they need to be drawn on top of the corrected output buffers.</p> + * <p>This control will be on by default on devices that support this control. Applications + * disabling distortion correction need to pay extra attention with the coordinate system of + * metering regions, crop region, and face rectangles. When distortion correction is OFF, + * metadata coordinates follow the coordinate system of + * {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}. When distortion is not OFF, metadata + * coordinates follow the coordinate system of {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p> * <p><b>Possible values:</b> * <ul> * <li>{@link #DISTORTION_CORRECTION_MODE_OFF OFF}</li> @@ -4503,9 +4602,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * {@link CameraCharacteristics#DISTORTION_CORRECTION_AVAILABLE_MODES android.distortionCorrection.availableModes}</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> * - * @see CaptureRequest#CONTROL_AF_REGIONS * @see CameraCharacteristics#DISTORTION_CORRECTION_AVAILABLE_MODES * @see CameraCharacteristics#LENS_DISTORTION + * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE + * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE * @see #DISTORTION_CORRECTION_MODE_OFF * @see #DISTORTION_CORRECTION_MODE_FAST * @see #DISTORTION_CORRECTION_MODE_HIGH_QUALITY diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index acaaf07984f0..d165889e8325 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -62,7 +62,6 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.Window; import android.view.WindowManager; -import android.view.WindowManager.BadTokenException; import android.view.animation.AnimationUtils; import android.view.inputmethod.CompletionInfo; import android.view.inputmethod.CursorAnchorInfo; @@ -354,7 +353,6 @@ public class InputMethodService extends AbstractInputMethodService { SoftInputWindow mWindow; boolean mInitialized; boolean mWindowCreated; - boolean mWindowAdded; boolean mWindowVisible; boolean mWindowWasVisible; boolean mInShowWindow; @@ -572,16 +570,7 @@ public class InputMethodService extends AbstractInputMethodService { if (DEBUG) Log.v(TAG, "showSoftInput()"); boolean wasVis = isInputViewShown(); if (dispatchOnShowInputRequested(flags, false)) { - try { - showWindow(true); - } catch (BadTokenException e) { - // We have ignored BadTokenException here since Jelly Bean MR-2 (API Level 18). - // We could ignore BadTokenException in InputMethodService#showWindow() instead, - // but it may break assumptions for those who override #showWindow() that we can - // detect errors in #showWindow() by checking BadTokenException. - // TODO: Investigate its feasibility. Update JavaDoc of #showWindow() of - // whether it's OK to override #showWindow() or not. - } + showWindow(true); } clearInsetOfPreviousIme(); // If user uses hard keyboard, IME button should always be shown. @@ -999,13 +988,7 @@ public class InputMethodService extends AbstractInputMethodService { mRootView.getViewTreeObserver().removeOnComputeInternalInsetsListener( mInsetsComputer); doFinishInput(); - if (mWindowAdded) { - // Disable exit animation for the current IME window - // to avoid the race condition between the exit and enter animations - // when the current IME is being switched to another one. - mWindow.getWindow().setWindowAnimations(0); - mWindow.dismiss(); - } + mWindow.dismissForDestroyIfNecessary(); if (mSettingsObserver != null) { mSettingsObserver.unregister(); mSettingsObserver = null; @@ -1792,7 +1775,6 @@ public class InputMethodService extends AbstractInputMethodService { public void showWindow(boolean showInput) { if (DEBUG) Log.v(TAG, "Showing window: showInput=" + showInput + " mShowInputRequested=" + mShowInputRequested - + " mWindowAdded=" + mWindowAdded + " mWindowCreated=" + mWindowCreated + " mWindowVisible=" + mWindowVisible + " mInputStarted=" + mInputStarted @@ -1802,27 +1784,12 @@ public class InputMethodService extends AbstractInputMethodService { Log.w(TAG, "Re-entrance in to showWindow"); return; } - - try { - mWindowWasVisible = mWindowVisible; - mInShowWindow = true; - showWindowInner(showInput); - } catch (BadTokenException e) { - // BadTokenException is a normal consequence in certain situations, e.g., swapping IMEs - // while there is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. - if (DEBUG) Log.v(TAG, "BadTokenException: IME is done."); - mWindowVisible = false; - mWindowAdded = false; - // Rethrow the exception to preserve the existing behavior. Some IMEs may have directly - // called this method and relied on this exception for some clean-up tasks. - // TODO: Give developers a clear guideline of whether it's OK to call this method or - // InputMethodService#requestShowSelf(int) should always be used instead. - throw e; - } finally { - // TODO: Is it OK to set true when we get BadTokenException? - mWindowWasVisible = true; - mInShowWindow = false; - } + + mWindowWasVisible = mWindowVisible; + mInShowWindow = true; + showWindowInner(showInput); + mWindowWasVisible = true; + mInShowWindow = false; } void showWindowInner(boolean showInput) { @@ -1839,9 +1806,8 @@ public class InputMethodService extends AbstractInputMethodService { initialize(); updateFullscreenMode(); updateInputViewShown(); - - if (!mWindowAdded || !mWindowCreated) { - mWindowAdded = true; + + if (!mWindowCreated) { mWindowCreated = true; initialize(); if (DEBUG) Log.v(TAG, "CALL: onCreateCandidatesView"); @@ -2867,8 +2833,7 @@ public class InputMethodService extends AbstractInputMethodService { @Override protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) { final Printer p = new PrintWriterPrinter(fout); p.println("Input method service state for " + this + ":"); - p.println(" mWindowCreated=" + mWindowCreated - + " mWindowAdded=" + mWindowAdded); + p.println(" mWindowCreated=" + mWindowCreated); p.println(" mWindowVisible=" + mWindowVisible + " mWindowWasVisible=" + mWindowWasVisible + " mInShowWindow=" + mInShowWindow); diff --git a/core/java/android/inputmethodservice/SoftInputWindow.java b/core/java/android/inputmethodservice/SoftInputWindow.java index 795117e493b6..b4b88871d251 100644 --- a/core/java/android/inputmethodservice/SoftInputWindow.java +++ b/core/java/android/inputmethodservice/SoftInputWindow.java @@ -16,15 +16,22 @@ package android.inputmethodservice; +import static java.lang.annotation.RetentionPolicy.SOURCE; + +import android.annotation.IntDef; import android.app.Dialog; import android.content.Context; import android.graphics.Rect; +import android.os.Debug; import android.os.IBinder; +import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.WindowManager; +import java.lang.annotation.Retention; + /** * A SoftInputWindow is a Dialog that is intended to be used for a top-level input * method window. It will be displayed along the edge of the screen, moving @@ -33,6 +40,9 @@ import android.view.WindowManager; * @hide */ public class SoftInputWindow extends Dialog { + private static final boolean DEBUG = false; + private static final String TAG = "SoftInputWindow"; + final String mName; final Callback mCallback; final KeyEvent.Callback mKeyEventCallback; @@ -42,16 +52,65 @@ public class SoftInputWindow extends Dialog { final boolean mTakesFocus; private final Rect mBounds = new Rect(); + @Retention(SOURCE) + @IntDef(value = {SoftInputWindowState.TOKEN_PENDING, SoftInputWindowState.TOKEN_SET, + SoftInputWindowState.SHOWN_AT_LEAST_ONCE, SoftInputWindowState.REJECTED_AT_LEAST_ONCE}) + private @interface SoftInputWindowState { + /** + * The window token is not set yet. + */ + int TOKEN_PENDING = 0; + /** + * The window token was set, but the window is not shown yet. + */ + int TOKEN_SET = 1; + /** + * The window was shown at least once. + */ + int SHOWN_AT_LEAST_ONCE = 2; + /** + * {@link android.view.WindowManager.BadTokenException} was sent when calling + * {@link Dialog#show()} at least once. + */ + int REJECTED_AT_LEAST_ONCE = 3; + /** + * The window is considered destroyed. Any incoming request should be ignored. + */ + int DESTROYED = 4; + } + + @SoftInputWindowState + private int mWindowState = SoftInputWindowState.TOKEN_PENDING; + public interface Callback { public void onBackPressed(); } public void setToken(IBinder token) { - WindowManager.LayoutParams lp = getWindow().getAttributes(); - lp.token = token; - getWindow().setAttributes(lp); + switch (mWindowState) { + case SoftInputWindowState.TOKEN_PENDING: + // Normal scenario. Nothing to worry about. + WindowManager.LayoutParams lp = getWindow().getAttributes(); + lp.token = token; + getWindow().setAttributes(lp); + updateWindowState(SoftInputWindowState.TOKEN_SET); + return; + case SoftInputWindowState.TOKEN_SET: + case SoftInputWindowState.SHOWN_AT_LEAST_ONCE: + case SoftInputWindowState.REJECTED_AT_LEAST_ONCE: + throw new IllegalStateException("setToken can be called only once"); + case SoftInputWindowState.DESTROYED: + // Just ignore. Since there are multiple event queues from the token is issued + // in the system server to the timing when it arrives here, it can be delivered + // after the is already destroyed. No one should be blamed because of such an + // unfortunate but possible scenario. + Log.i(TAG, "Ignoring setToken() because window is already destroyed."); + return; + default: + throw new IllegalStateException("Unexpected state=" + mWindowState); + } } - + /** * Create a SoftInputWindow that uses a custom style. * @@ -190,4 +249,109 @@ public class SoftInputWindow extends Dialog { getWindow().setFlags(windowSetFlags, windowModFlags); } + + @Override + public final void show() { + switch (mWindowState) { + case SoftInputWindowState.TOKEN_PENDING: + throw new IllegalStateException("Window token is not set yet."); + case SoftInputWindowState.TOKEN_SET: + case SoftInputWindowState.SHOWN_AT_LEAST_ONCE: + // Normal scenario. Nothing to worry about. + try { + super.show(); + updateWindowState(SoftInputWindowState.SHOWN_AT_LEAST_ONCE); + } catch (WindowManager.BadTokenException e) { + // Just ignore this exception. Since show() can be requested from other + // components such as the system and there could be multiple event queues before + // the request finally arrives here, the system may have already invalidated the + // window token attached to our window. In such a scenario, receiving + // BadTokenException here is an expected behavior. We just ignore it and update + // the state so that we do not touch this window later. + Log.i(TAG, "Probably the IME window token is already invalidated." + + " show() does nothing."); + updateWindowState(SoftInputWindowState.REJECTED_AT_LEAST_ONCE); + } + return; + case SoftInputWindowState.REJECTED_AT_LEAST_ONCE: + // Just ignore. In general we cannot completely avoid this kind of race condition. + Log.i(TAG, "Not trying to call show() because it was already rejected once."); + return; + case SoftInputWindowState.DESTROYED: + // Just ignore. In general we cannot completely avoid this kind of race condition. + Log.i(TAG, "Ignoring show() because the window is already destroyed."); + return; + default: + throw new IllegalStateException("Unexpected state=" + mWindowState); + } + } + + final void dismissForDestroyIfNecessary() { + switch (mWindowState) { + case SoftInputWindowState.TOKEN_PENDING: + case SoftInputWindowState.TOKEN_SET: + // nothing to do because the window has never been shown. + updateWindowState(SoftInputWindowState.DESTROYED); + return; + case SoftInputWindowState.SHOWN_AT_LEAST_ONCE: + // Disable exit animation for the current IME window + // to avoid the race condition between the exit and enter animations + // when the current IME is being switched to another one. + try { + getWindow().setWindowAnimations(0); + dismiss(); + } catch (WindowManager.BadTokenException e) { + // Just ignore this exception. Since show() can be requested from other + // components such as the system and there could be multiple event queues before + // the request finally arrives here, the system may have already invalidated the + // window token attached to our window. In such a scenario, receiving + // BadTokenException here is an expected behavior. We just ignore it and update + // the state so that we do not touch this window later. + Log.i(TAG, "Probably the IME window token is already invalidated. " + + "No need to dismiss it."); + } + // Either way, consider that the window is destroyed. + updateWindowState(SoftInputWindowState.DESTROYED); + return; + case SoftInputWindowState.REJECTED_AT_LEAST_ONCE: + // Just ignore. In general we cannot completely avoid this kind of race condition. + Log.i(TAG, + "Not trying to dismiss the window because it is most likely unnecessary."); + // Anyway, consider that the window is destroyed. + updateWindowState(SoftInputWindowState.DESTROYED); + return; + case SoftInputWindowState.DESTROYED: + throw new IllegalStateException( + "dismissForDestroyIfNecessary can be called only once"); + default: + throw new IllegalStateException("Unexpected state=" + mWindowState); + } + } + + private void updateWindowState(@SoftInputWindowState int newState) { + if (DEBUG) { + if (mWindowState != newState) { + Log.d(TAG, "WindowState: " + stateToString(mWindowState) + " -> " + + stateToString(newState) + " @ " + Debug.getCaller()); + } + } + mWindowState = newState; + } + + private static String stateToString(@SoftInputWindowState int state) { + switch (state) { + case SoftInputWindowState.TOKEN_PENDING: + return "TOKEN_PENDING"; + case SoftInputWindowState.TOKEN_SET: + return "TOKEN_SET"; + case SoftInputWindowState.SHOWN_AT_LEAST_ONCE: + return "SHOWN_AT_LEAST_ONCE"; + case SoftInputWindowState.REJECTED_AT_LEAST_ONCE: + return "REJECTED_AT_LEAST_ONCE"; + case SoftInputWindowState.DESTROYED: + return "DESTROYED"; + default: + throw new IllegalStateException("Unknown state=" + state); + } + } } diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index fb916d38f3ba..ce1879620ce3 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -3840,7 +3840,7 @@ public class ConnectivityManager { @UnsupportedAppUsage public static boolean setProcessDefaultNetworkForHostResolution(Network network) { return NetworkUtils.bindProcessToNetworkForHostResolution( - network == null ? NETID_UNSET : network.netId); + (network == null) ? NETID_UNSET : network.getNetIdForResolv()); } /** diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java index 7543920e363f..3319f33878c1 100644 --- a/core/java/android/net/IpConfiguration.java +++ b/core/java/android/net/IpConfiguration.java @@ -35,7 +35,7 @@ public class IpConfiguration implements Parcelable { * with staticIpConfiguration */ @UnsupportedAppUsage STATIC, - /* Use dynamically configured IP settigns */ + /* Use dynamically configured IP settings */ DHCP, /* no IP details are assigned, this is used to indicate * that any existing IP settings should be retained */ diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 142023d40c0e..bf2344d4a9f6 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -100,21 +100,29 @@ public class Network implements Parcelable { // anytime and (b) receivers should be explicit about attempts to bypass // Private DNS so that the intent of the code is easily determined and // code search audits are possible. - private boolean mPrivateDnsBypass = false; + private final transient boolean mPrivateDnsBypass; /** * @hide */ @UnsupportedAppUsage public Network(int netId) { + this(netId, false); + } + + /** + * @hide + */ + public Network(int netId, boolean privateDnsBypass) { this.netId = netId; + this.mPrivateDnsBypass = privateDnsBypass; } /** * @hide */ public Network(Network that) { - this.netId = that.netId; + this(that.netId, that.mPrivateDnsBypass); } /** @@ -133,8 +141,7 @@ public class Network implements Parcelable { * Operates the same as {@code InetAddress.getByName} except that host * resolution is done on this network. * - * @param host - * the hostName to be resolved to an address or {@code null}. + * @param host the hostname to be resolved to an address or {@code null}. * @return the {@code InetAddress} instance representing the host. * @throws UnknownHostException * if the address lookup fails. @@ -144,14 +151,14 @@ public class Network implements Parcelable { } /** - * Specify whether or not Private DNS should be bypassed when attempting + * Obtain a Network object for which Private DNS is to be bypassed when attempting * to use {@link #getAllByName(String)}/{@link #getByName(String)} methods on the given * instance for hostname resolution. * * @hide */ - public void setPrivateDnsBypass(boolean bypass) { - mPrivateDnsBypass = bypass; + public Network getPrivateDnsBypassingCopy() { + return new Network(netId, true); } /** diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 599ccb287a26..34e9476b3e08 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -22,6 +22,7 @@ import android.util.Log; import android.util.Pair; import java.io.FileDescriptor; +import java.io.IOException; import java.math.BigInteger; import java.net.Inet4Address; import java.net.Inet6Address; @@ -131,6 +132,17 @@ public class NetworkUtils { public native static boolean queryUserAccess(int uid, int netId); /** + * Add an entry into the ARP cache. + */ + public static void addArpEntry(Inet4Address ipv4Addr, MacAddress ethAddr, String ifname, + FileDescriptor fd) throws IOException { + addArpEntry(ethAddr.toByteArray(), ipv4Addr.getAddress(), ifname, fd); + } + + private static native void addArpEntry(byte[] ethAddr, byte[] netAddr, String ifname, + FileDescriptor fd) throws IOException; + + /** * @see #intToInet4AddressHTL(int) * @deprecated Use either {@link #intToInet4AddressHTH(int)} * or {@link #intToInet4AddressHTL(int)} @@ -149,7 +161,7 @@ public class NetworkUtils { * @param hostAddress an int coding for an IPv4 address, where higher-order int byte is * lower-order IPv4 address byte */ - public static InetAddress intToInet4AddressHTL(int hostAddress) { + public static Inet4Address intToInet4AddressHTL(int hostAddress) { return intToInet4AddressHTH(Integer.reverseBytes(hostAddress)); } @@ -157,14 +169,14 @@ public class NetworkUtils { * Convert a IPv4 address from an integer to an InetAddress (0x01020304 -> 1.2.3.4) * @param hostAddress an int coding for an IPv4 address */ - public static InetAddress intToInet4AddressHTH(int hostAddress) { + public static Inet4Address intToInet4AddressHTH(int hostAddress) { byte[] addressBytes = { (byte) (0xff & (hostAddress >> 24)), (byte) (0xff & (hostAddress >> 16)), (byte) (0xff & (hostAddress >> 8)), (byte) (0xff & hostAddress) }; try { - return InetAddress.getByAddress(addressBytes); + return (Inet4Address) InetAddress.getByAddress(addressBytes); } catch (UnknownHostException e) { throw new AssertionError(); } @@ -397,6 +409,28 @@ public class NetworkUtils { } /** + * Get a prefix mask as Inet4Address for a given prefix length. + * + * <p>For example 20 -> 255.255.240.0 + */ + public static Inet4Address getPrefixMaskAsInet4Address(int prefixLength) + throws IllegalArgumentException { + return intToInet4AddressHTH(prefixLengthToV4NetmaskIntHTH(prefixLength)); + } + + /** + * Get the broadcast address for a given prefix. + * + * <p>For example 192.168.0.1/24 -> 192.168.0.255 + */ + public static Inet4Address getBroadcastAddress(Inet4Address addr, int prefixLength) + throws IllegalArgumentException { + final int intBroadcastAddr = inet4AddressToIntHTH(addr) + | ~prefixLengthToV4NetmaskIntHTH(prefixLength); + return intToInet4AddressHTH(intBroadcastAddr); + } + + /** * Check if IP address type is consistent between two InetAddress. * @return true if both are the same type. False otherwise. */ diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index fee91fbbec42..15f4913c5419 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS @@ -9,12 +9,4 @@ reminv@google.com satk@google.com silberst@google.com -per-file SSL*=flooey@google.com -per-file SSL*=narayan@google.com -per-file SSL*=tobiast@google.com -per-file Uri*=flooey@google.com -per-file Uri*=narayan@google.com -per-file Uri*=tobiast@google.com -per-file Url*=flooey@google.com -per-file Url*=narayan@google.com -per-file Url*=tobiast@google.com +per-file SSL*, Uri*, Url* = flooey@google.com, narayan@google.com, tobiast@google.com diff --git a/core/java/android/net/SntpClient.java b/core/java/android/net/SntpClient.java index 10c0ce25e97b..b8d7cf167ca8 100644 --- a/core/java/android/net/SntpClient.java +++ b/core/java/android/net/SntpClient.java @@ -85,19 +85,16 @@ public class SntpClient { * @return true if the transaction was successful. */ public boolean requestTime(String host, int timeout, Network network) { - // This flag only affects DNS resolution and not other socket semantics, - // therefore it's safe to set unilaterally rather than take more - // defensive measures like making a copy. - network.setPrivateDnsBypass(true); + final Network networkForResolv = network.getPrivateDnsBypassingCopy(); InetAddress address = null; try { - address = network.getByName(host); + address = networkForResolv.getByName(host); } catch (Exception e) { EventLogTags.writeNtpFailure(host, e.toString()); if (DBG) Log.d(TAG, "request time failed: " + e); return false; } - return requestTime(address, NTP_PORT, timeout, network); + return requestTime(address, NTP_PORT, timeout, networkForResolv); } public boolean requestTime(InetAddress address, int port, int timeout, Network network) { diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index 44f7e48edabc..1b22911f0cdc 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -139,6 +139,8 @@ public class TrafficStats { public static final int TAG_SYSTEM_GPS = 0xFFFFFF44; /** @hide */ public static final int TAG_SYSTEM_PAC = 0xFFFFFF45; + /** @hide */ + public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFF46; private static INetworkStatsService sStatsService; diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 66f940801a2e..91888949829f 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -916,6 +916,15 @@ public class Build { * </ul> */ public static final int P = 28; + + /** + * Q. + * <p> + * <em>Why? Why, to give you a taste of your future, a preview of things + * to come. Con permiso, Capitan. The hall is rented, the orchestra + * engaged. It's now time to see if you can dance.</em> + */ + public static final int Q = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */ diff --git a/core/java/android/os/health/HealthKeys.java b/core/java/android/os/health/HealthKeys.java index 842def3d256b..8c22eff01699 100644 --- a/core/java/android/os/health/HealthKeys.java +++ b/core/java/android/os/health/HealthKeys.java @@ -16,6 +16,7 @@ package android.os.health; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -89,6 +90,7 @@ public class HealthKeys { * Pass in a class to gather the public static final int fields that are * tagged with the @Constant annotation. */ + @UnsupportedAppUsage public Constants(Class clazz) { // Save the class name for debugging mDataType = clazz.getSimpleName(); diff --git a/core/java/android/os/health/HealthStats.java b/core/java/android/os/health/HealthStats.java index 90d89c5ced8c..5939812b7501 100644 --- a/core/java/android/os/health/HealthStats.java +++ b/core/java/android/os/health/HealthStats.java @@ -16,6 +16,7 @@ package android.os.health; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.ArrayMap; @@ -126,6 +127,7 @@ public class HealthStats { * * @hide */ + @UnsupportedAppUsage public HealthStats(Parcel in) { int count; diff --git a/core/java/android/os/health/HealthStatsParceler.java b/core/java/android/os/health/HealthStatsParceler.java index 28b36940fb2e..c8ba8e13aa8d 100644 --- a/core/java/android/os/health/HealthStatsParceler.java +++ b/core/java/android/os/health/HealthStatsParceler.java @@ -16,6 +16,7 @@ package android.os.health; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.ArrayMap; @@ -50,10 +51,12 @@ public class HealthStatsParceler implements Parcelable { } }; + @UnsupportedAppUsage public HealthStatsParceler(HealthStatsWriter writer) { mWriter = writer; } + @UnsupportedAppUsage public HealthStatsParceler(Parcel in) { mHealthStats = new HealthStats(in); } @@ -72,6 +75,7 @@ public class HealthStatsParceler implements Parcelable { } } + @UnsupportedAppUsage public HealthStats getHealthStats() { if (mWriter != null) { final Parcel parcel = Parcel.obtain(); diff --git a/core/java/android/os/health/HealthStatsWriter.java b/core/java/android/os/health/HealthStatsWriter.java index 351836bad7c9..0bd4f60fd361 100644 --- a/core/java/android/os/health/HealthStatsWriter.java +++ b/core/java/android/os/health/HealthStatsWriter.java @@ -16,6 +16,7 @@ package android.os.health; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.ArrayMap; @@ -59,6 +60,7 @@ public class HealthStatsWriter { * short name of the java class that the Constants object was initalized * with. */ + @UnsupportedAppUsage public HealthStatsWriter(HealthKeys.Constants constants) { mConstants = constants; @@ -89,6 +91,7 @@ public class HealthStatsWriter { /** * Add a timer for the given key. */ + @UnsupportedAppUsage public void addTimer(int timerId, int count, long time) { final int index = mConstants.getIndex(HealthKeys.TYPE_TIMER, timerId); @@ -100,6 +103,7 @@ public class HealthStatsWriter { /** * Add a measurement for the given key. */ + @UnsupportedAppUsage public void addMeasurement(int measurementId, long value) { final int index = mConstants.getIndex(HealthKeys.TYPE_MEASUREMENT, measurementId); @@ -114,6 +118,7 @@ public class HealthStatsWriter { * * The value field should not be null. */ + @UnsupportedAppUsage public void addStats(int key, String name, HealthStatsWriter value) { final int index = mConstants.getIndex(HealthKeys.TYPE_STATS, key); @@ -129,6 +134,7 @@ public class HealthStatsWriter { * * The value field should not be null. */ + @UnsupportedAppUsage public void addTimers(int key, String name, TimerStat value) { final int index = mConstants.getIndex(HealthKeys.TYPE_TIMERS, key); @@ -142,6 +148,7 @@ public class HealthStatsWriter { /** * Add a measurement for the given key and string name. */ + @UnsupportedAppUsage public void addMeasurements(int key, String name, long value) { final int index = mConstants.getIndex(HealthKeys.TYPE_MEASUREMENTS, key); @@ -160,6 +167,7 @@ public class HealthStatsWriter { * not parcelable and we don't flatten all the business about the * HealthKeys.Constants, only the values that were actually supplied) */ + @UnsupportedAppUsage public void flattenToParcel(Parcel out) { int[] keys; diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java index bba4cd1fb8e4..f303674ce055 100644 --- a/core/java/android/os/health/SystemHealthManager.java +++ b/core/java/android/os/health/SystemHealthManager.java @@ -17,6 +17,7 @@ package android.os.health; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.BatteryStats; import android.os.Process; @@ -49,6 +50,7 @@ public class SystemHealthManager { * Construct a new SystemHealthManager object. * @hide */ + @UnsupportedAppUsage public SystemHealthManager() { this(IBatteryStats.Stub.asInterface(ServiceManager.getService(BatteryStats.SERVICE_NAME))); } @@ -63,6 +65,7 @@ public class SystemHealthManager { * * @hide */ + @UnsupportedAppUsage public static SystemHealthManager from(Context context) { return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE); } diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java index d493ccebf531..7b6c97132b5c 100644 --- a/core/java/android/os/storage/DiskInfo.java +++ b/core/java/android/os/storage/DiskInfo.java @@ -18,6 +18,7 @@ package android.os.storage; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; @@ -50,8 +51,11 @@ public class DiskInfo implements Parcelable { public static final int FLAG_USB = 1 << 3; public final String id; + @UnsupportedAppUsage public final int flags; + @UnsupportedAppUsage public long size; + @UnsupportedAppUsage public String label; /** Hacky; don't rely on this count */ public int volumeCount; @@ -62,6 +66,7 @@ public class DiskInfo implements Parcelable { this.flags = flags; } + @UnsupportedAppUsage public DiskInfo(Parcel parcel) { id = parcel.readString(); flags = parcel.readInt(); @@ -71,6 +76,7 @@ public class DiskInfo implements Parcelable { sysPath = parcel.readString(); } + @UnsupportedAppUsage public @NonNull String getId() { return id; } @@ -94,6 +100,7 @@ public class DiskInfo implements Parcelable { return true; } + @UnsupportedAppUsage public @Nullable String getDescription() { final Resources res = Resources.getSystem(); if ((flags & FLAG_SD) != 0) { @@ -124,18 +131,22 @@ public class DiskInfo implements Parcelable { } } + @UnsupportedAppUsage public boolean isAdoptable() { return (flags & FLAG_ADOPTABLE) != 0; } + @UnsupportedAppUsage public boolean isDefaultPrimary() { return (flags & FLAG_DEFAULT_PRIMARY) != 0; } + @UnsupportedAppUsage public boolean isSd() { return (flags & FLAG_SD) != 0; } + @UnsupportedAppUsage public boolean isUsb() { return (flags & FLAG_USB) != 0; } @@ -185,6 +196,7 @@ public class DiskInfo implements Parcelable { return id.hashCode(); } + @UnsupportedAppUsage public static final Creator<DiskInfo> CREATOR = new Creator<DiskInfo>() { @Override public DiskInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java index 4cf83fda4e39..4aa0b08ae358 100644 --- a/core/java/android/os/storage/StorageEventListener.java +++ b/core/java/android/os/storage/StorageEventListener.java @@ -16,6 +16,8 @@ package android.os.storage; +import android.annotation.UnsupportedAppUsage; + /** * Used for receiving notifications from the StorageManager * @@ -26,6 +28,7 @@ public class StorageEventListener { * Called when the detection state of a USB Mass Storage host has changed. * @param connected true if the USB mass storage is connected. */ + @UnsupportedAppUsage public void onUsbMassStorageConnectionChanged(boolean connected) { } @@ -35,21 +38,27 @@ public class StorageEventListener { * @param oldState the old state as returned by {@link android.os.Environment#getExternalStorageState()}. * @param newState the old state as returned by {@link android.os.Environment#getExternalStorageState()}. */ + @UnsupportedAppUsage public void onStorageStateChanged(String path, String oldState, String newState) { } + @UnsupportedAppUsage public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) { } + @UnsupportedAppUsage public void onVolumeRecordChanged(VolumeRecord rec) { } + @UnsupportedAppUsage public void onVolumeForgotten(String fsUuid) { } + @UnsupportedAppUsage public void onDiskScanned(DiskInfo disk, int volumeCount) { } + @UnsupportedAppUsage public void onDiskDestroyed(DiskInfo disk) { } } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 2d1bb2f25d88..d9eb7754ef7b 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -25,6 +25,7 @@ import android.annotation.SdkConstant; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.annotation.WorkerThread; import android.app.Activity; import android.app.ActivityThread; @@ -226,6 +227,7 @@ public class StorageManager { public static final int FSTRIM_FLAG_DEEP = IVold.FSTRIM_FLAG_DEEP_TRIM; /** @hide The volume is not encrypted. */ + @UnsupportedAppUsage public static final int ENCRYPTION_STATE_NONE = IVold.ENCRYPTION_STATE_NONE; @@ -442,6 +444,7 @@ public class StorageManager { /** {@hide} */ @Deprecated + @UnsupportedAppUsage public static StorageManager from(Context context) { return context.getSystemService(StorageManager.class); } @@ -458,6 +461,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public StorageManager(Context context, Looper looper) throws ServiceNotFoundException { mContext = context; mResolver = context.getContentResolver(); @@ -472,6 +476,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public void registerListener(StorageEventListener listener) { synchronized (mDelegates) { final StorageEventListenerDelegate delegate = new StorageEventListenerDelegate(listener, @@ -492,6 +497,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public void unregisterListener(StorageEventListener listener) { synchronized (mDelegates) { for (Iterator<StorageEventListenerDelegate> i = mDelegates.iterator(); i.hasNext();) { @@ -514,6 +520,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public void enableUsbMassStorage() { } @@ -523,6 +530,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public void disableUsbMassStorage() { } @@ -533,6 +541,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public boolean isUsbMassStorageConnected() { return false; } @@ -544,6 +553,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public boolean isUsbMassStorageEnabled() { return false; } @@ -654,6 +664,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @NonNull List<DiskInfo> getDisks() { try { return Arrays.asList(mStorageManager.getDisks()); @@ -663,6 +674,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable DiskInfo findDiskById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -675,6 +687,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo findVolumeById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -687,6 +700,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo findVolumeByUuid(String fsUuid) { Preconditions.checkNotNull(fsUuid); // TODO; go directly to service to make this faster @@ -720,6 +734,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo findEmulatedForPrivate(VolumeInfo privateVol) { if (privateVol != null) { return findVolumeById(privateVol.getId().replace("private", "emulated")); @@ -798,6 +813,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @NonNull List<VolumeInfo> getVolumes() { try { return Arrays.asList(mStorageManager.getVolumes(0)); @@ -831,6 +847,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable String getBestVolumeDescription(VolumeInfo vol) { if (vol == null) return null; @@ -854,6 +871,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo getPrimaryPhysicalVolume() { final List<VolumeInfo> vols = getVolumes(); for (VolumeInfo vol : vols) { @@ -874,6 +892,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public void unmount(String volId) { try { mStorageManager.unmount(volId); @@ -883,6 +902,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public void format(String volId) { try { mStorageManager.format(volId); @@ -924,6 +944,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public void partitionPublic(String diskId) { try { mStorageManager.partitionPublic(diskId); @@ -1053,6 +1074,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) { if (file == null) { return null; @@ -1082,6 +1104,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public @NonNull String getVolumeState(String mountPoint) { final StorageVolume vol = getStorageVolume(new File(mountPoint)); if (vol != null) { @@ -1144,6 +1167,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public static @NonNull StorageVolume[] getVolumeList(int userId, int flags) { final IStorageManager storageManager = IStorageManager.Stub.asInterface( ServiceManager.getService("mount")); @@ -1177,6 +1201,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public @NonNull String[] getVolumePaths() { StorageVolume[] volumes = getVolumeList(); int count = volumes.length; @@ -1216,6 +1241,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public long getStorageBytesUntilLow(File path) { return path.getUsableSpace() - getStorageFullBytes(path); } @@ -1226,6 +1252,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public long getStorageLowBytes(File path) { final long lowPercent = Settings.Global.getInt(mResolver, Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE, DEFAULT_THRESHOLD_PERCENTAGE); @@ -1269,6 +1296,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public long getStorageFullBytes(File path) { return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES, DEFAULT_FULL_THRESHOLD_BYTES); @@ -1385,6 +1413,7 @@ public class StorageManager { * @return true for file encrypted. (Implies isEncrypted() == true) * false not encrypted or block encrypted */ + @UnsupportedAppUsage public static boolean isFileEncryptedNativeOnly() { if (!isEncrypted()) { return false; @@ -2016,8 +2045,10 @@ public class StorageManager { /// Consts to match the password types in cryptfs.h /** @hide */ + @UnsupportedAppUsage public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD; /** @hide */ + @UnsupportedAppUsage public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT; /** @hide */ public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN; diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index fd5a22a9c551..5ef1d232ebe4 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -17,6 +17,7 @@ package android.os.storage; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -76,11 +77,16 @@ import java.io.File; // user, but is now part of the public API. public final class StorageVolume implements Parcelable { + @UnsupportedAppUsage private final String mId; + @UnsupportedAppUsage private final File mPath; private final File mInternalPath; + @UnsupportedAppUsage private final String mDescription; + @UnsupportedAppUsage private final boolean mPrimary; + @UnsupportedAppUsage private final boolean mRemovable; private final boolean mEmulated; private final boolean mAllowMassStorage; @@ -152,6 +158,7 @@ public final class StorageVolume implements Parcelable { } /** {@hide} */ + @UnsupportedAppUsage public String getId() { return mId; } @@ -162,6 +169,7 @@ public final class StorageVolume implements Parcelable { * @return the mount path * @hide */ + @UnsupportedAppUsage public String getPath() { return mPath.toString(); } @@ -177,6 +185,7 @@ public final class StorageVolume implements Parcelable { } /** {@hide} */ + @UnsupportedAppUsage public File getPathFile() { return mPath; } @@ -222,6 +231,7 @@ public final class StorageVolume implements Parcelable { * @return whether mass storage is allowed * @hide */ + @UnsupportedAppUsage public boolean allowMassStorage() { return mAllowMassStorage; } @@ -232,11 +242,13 @@ public final class StorageVolume implements Parcelable { * @return maximum file size * @hide */ + @UnsupportedAppUsage public long getMaxFileSize() { return mMaxFileSize; } /** {@hide} */ + @UnsupportedAppUsage public UserHandle getOwner() { return mOwner; } @@ -253,6 +265,7 @@ public final class StorageVolume implements Parcelable { * parse or UUID is unknown. * @hide */ + @UnsupportedAppUsage public int getFatVolumeId() { if (mFsUuid == null || mFsUuid.length() != 9) { return -1; @@ -265,6 +278,7 @@ public final class StorageVolume implements Parcelable { } /** {@hide} */ + @UnsupportedAppUsage public String getUserLabel() { return mDescription; } diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 8c7750242ef3..afd383691300 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -18,6 +18,7 @@ package android.os.storage; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -76,8 +77,10 @@ public class VolumeInfo implements Parcelable { /** Real volume representing internal emulated storage */ public static final String ID_EMULATED_INTERNAL = "emulated"; + @UnsupportedAppUsage public static final int TYPE_PUBLIC = IVold.VOLUME_TYPE_PUBLIC; public static final int TYPE_PRIVATE = IVold.VOLUME_TYPE_PRIVATE; + @UnsupportedAppUsage public static final int TYPE_EMULATED = IVold.VOLUME_TYPE_EMULATED; public static final int TYPE_ASEC = IVold.VOLUME_TYPE_ASEC; public static final int TYPE_OBB = IVold.VOLUME_TYPE_OBB; @@ -148,16 +151,23 @@ public class VolumeInfo implements Parcelable { /** vold state */ public final String id; + @UnsupportedAppUsage public final int type; + @UnsupportedAppUsage public final DiskInfo disk; public final String partGuid; public int mountFlags = 0; public int mountUserId = -1; + @UnsupportedAppUsage public int state = STATE_UNMOUNTED; public String fsType; + @UnsupportedAppUsage public String fsUuid; + @UnsupportedAppUsage public String fsLabel; + @UnsupportedAppUsage public String path; + @UnsupportedAppUsage public String internalPath; public VolumeInfo(String id, int type, DiskInfo disk, String partGuid) { @@ -167,6 +177,7 @@ public class VolumeInfo implements Parcelable { this.partGuid = partGuid; } + @UnsupportedAppUsage public VolumeInfo(Parcel parcel) { id = parcel.readString(); type = parcel.readInt(); @@ -186,6 +197,7 @@ public class VolumeInfo implements Parcelable { internalPath = parcel.readString(); } + @UnsupportedAppUsage public static @NonNull String getEnvironmentForState(int state) { final String envState = sStateToEnvironment.get(state); if (envState != null) { @@ -207,22 +219,27 @@ public class VolumeInfo implements Parcelable { return sDescriptionComparator; } + @UnsupportedAppUsage public @NonNull String getId() { return id; } + @UnsupportedAppUsage public @Nullable DiskInfo getDisk() { return disk; } + @UnsupportedAppUsage public @Nullable String getDiskId() { return (disk != null) ? disk.id : null; } + @UnsupportedAppUsage public int getType() { return type; } + @UnsupportedAppUsage public int getState() { return state; } @@ -231,14 +248,17 @@ public class VolumeInfo implements Parcelable { return sStateToDescrip.get(state, 0); } + @UnsupportedAppUsage public @Nullable String getFsUuid() { return fsUuid; } + @UnsupportedAppUsage public int getMountUserId() { return mountUserId; } + @UnsupportedAppUsage public @Nullable String getDescription() { if (ID_PRIVATE_INTERNAL.equals(id) || ID_EMULATED_INTERNAL.equals(id)) { return Resources.getSystem().getString(com.android.internal.R.string.storage_internal); @@ -249,22 +269,27 @@ public class VolumeInfo implements Parcelable { } } + @UnsupportedAppUsage public boolean isMountedReadable() { return state == STATE_MOUNTED || state == STATE_MOUNTED_READ_ONLY; } + @UnsupportedAppUsage public boolean isMountedWritable() { return state == STATE_MOUNTED; } + @UnsupportedAppUsage public boolean isPrimary() { return (mountFlags & MOUNT_FLAG_PRIMARY) != 0; } + @UnsupportedAppUsage public boolean isPrimaryPhysical() { return isPrimary() && (getType() == TYPE_PUBLIC); } + @UnsupportedAppUsage public boolean isVisible() { return (mountFlags & MOUNT_FLAG_VISIBLE) != 0; } @@ -283,18 +308,22 @@ public class VolumeInfo implements Parcelable { return isVisibleForUser(userId); } + @UnsupportedAppUsage public boolean isVisibleForWrite(int userId) { return isVisibleForUser(userId); } + @UnsupportedAppUsage public File getPath() { return (path != null) ? new File(path) : null; } + @UnsupportedAppUsage public File getInternalPath() { return (internalPath != null) ? new File(internalPath) : null; } + @UnsupportedAppUsage public File getPathForUser(int userId) { if (path == null) { return null; @@ -311,6 +340,7 @@ public class VolumeInfo implements Parcelable { * Path which is accessible to apps holding * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}. */ + @UnsupportedAppUsage public File getInternalPathForUser(int userId) { if (path == null) { return null; @@ -322,6 +352,7 @@ public class VolumeInfo implements Parcelable { } } + @UnsupportedAppUsage public StorageVolume buildStorageVolume(Context context, int userId, boolean reportUnmounted) { final StorageManager storage = context.getSystemService(StorageManager.class); @@ -382,6 +413,7 @@ public class VolumeInfo implements Parcelable { derivedFsUuid, envState); } + @UnsupportedAppUsage public static int buildStableMtpStorageId(String fsUuid) { if (TextUtils.isEmpty(fsUuid)) { return StorageVolume.STORAGE_ID_INVALID; @@ -408,6 +440,7 @@ public class VolumeInfo implements Parcelable { * Build an intent to browse the contents of this volume. Only valid for * {@link #TYPE_EMULATED} or {@link #TYPE_PUBLIC}. */ + @UnsupportedAppUsage public @Nullable Intent buildBrowseIntent() { return buildBrowseIntentForUser(UserHandle.myUserId()); } @@ -486,6 +519,7 @@ public class VolumeInfo implements Parcelable { return id.hashCode(); } + @UnsupportedAppUsage public static final Creator<VolumeInfo> CREATOR = new Creator<VolumeInfo>() { @Override public VolumeInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/VolumeRecord.java b/core/java/android/os/storage/VolumeRecord.java index 7b2022385f0e..bc2d55a92b90 100644 --- a/core/java/android/os/storage/VolumeRecord.java +++ b/core/java/android/os/storage/VolumeRecord.java @@ -16,6 +16,7 @@ package android.os.storage; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.DebugUtils; @@ -52,6 +53,7 @@ public class VolumeRecord implements Parcelable { this.fsUuid = Preconditions.checkNotNull(fsUuid); } + @UnsupportedAppUsage public VolumeRecord(Parcel parcel) { type = parcel.readInt(); fsUuid = parcel.readString(); @@ -127,6 +129,7 @@ public class VolumeRecord implements Parcelable { return fsUuid.hashCode(); } + @UnsupportedAppUsage public static final Creator<VolumeRecord> CREATOR = new Creator<VolumeRecord>() { @Override public VolumeRecord createFromParcel(Parcel in) { diff --git a/core/java/android/provider/BlockedNumberContract.java b/core/java/android/provider/BlockedNumberContract.java index 67c6fb98aa6b..6427af6cb175 100644 --- a/core/java/android/provider/BlockedNumberContract.java +++ b/core/java/android/provider/BlockedNumberContract.java @@ -15,12 +15,16 @@ */ package android.provider; +import android.annotation.IntDef; import android.annotation.WorkerThread; import android.content.Context; import android.net.Uri; import android.os.Bundle; import android.telecom.Log; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * <p> * The contract between the blockednumber provider and applications. Contains definitions for @@ -220,6 +224,63 @@ public class BlockedNumberContract { public static final String RES_NUMBER_IS_BLOCKED = "blocked"; /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef( + prefix = { "STATUS_" }, + value = {STATUS_NOT_BLOCKED, STATUS_BLOCKED_IN_LIST, STATUS_BLOCKED_RESTRICTED, + STATUS_BLOCKED_UNKNOWN_NUMBER, STATUS_BLOCKED_PAYPHONE, + STATUS_BLOCKED_NOT_IN_CONTACTS}) + public @interface BlockStatus {} + + /** + * Integer reason code used with {@link #RES_BLOCK_STATUS} to indicate that a call was not + * blocked. + * @hide + */ + public static final int STATUS_NOT_BLOCKED = 0; + + /** + * Integer reason code used with {@link #RES_BLOCK_STATUS} to indicate that a call was blocked + * because it is in the list of blocked numbers maintained by the provider. + * @hide + */ + public static final int STATUS_BLOCKED_IN_LIST = 1; + + /** + * Integer reason code used with {@link #RES_BLOCK_STATUS} to indicate that a call was blocked + * because it is from a restricted number. + * @hide + */ + public static final int STATUS_BLOCKED_RESTRICTED = 2; + + /** + * Integer reason code used with {@link #RES_BLOCK_STATUS} to indicate that a call was blocked + * because it is from an unknown number. + * @hide + */ + public static final int STATUS_BLOCKED_UNKNOWN_NUMBER = 3; + + /** + * Integer reason code used with {@link #RES_BLOCK_STATUS} to indicate that a call was blocked + * because it is from a pay phone. + * @hide + */ + public static final int STATUS_BLOCKED_PAYPHONE = 4; + + /** + * Integer reason code used with {@link #RES_BLOCK_STATUS} to indicate that a call was blocked + * because it is from a number not in the users contacts. + * @hide + */ + public static final int STATUS_BLOCKED_NOT_IN_CONTACTS = 5; + + /** + * Integer reason indicating whether a call was blocked, and if so why. + * @hide + */ + public static final String RES_BLOCK_STATUS = "block_status"; + + /** @hide */ public static final String RES_NUM_ROWS_DELETED = "num_deleted"; /** @hide */ @@ -411,19 +472,23 @@ public class BlockedNumberContract { * @param context the context of the caller. * @param phoneNumber the number to check. * @param extras the extra attribute of the number. - * @return {@code true} if should block the number. {@code false} otherwise. + * @return result code indicating if the number should be blocked, and if so why. + * Valid values are: {@link #STATUS_NOT_BLOCKED}, {@link #STATUS_BLOCKED_IN_LIST}, + * {@link #STATUS_BLOCKED_NOT_IN_CONTACTS}, {@link #STATUS_BLOCKED_PAYPHONE}, + * {@link #STATUS_BLOCKED_RESTRICTED}, {@link #STATUS_BLOCKED_UNKNOWN_NUMBER}. */ - public static boolean shouldSystemBlockNumber(Context context, String phoneNumber, + public static int shouldSystemBlockNumber(Context context, String phoneNumber, Bundle extras) { try { final Bundle res = context.getContentResolver().call( AUTHORITY_URI, METHOD_SHOULD_SYSTEM_BLOCK_NUMBER, phoneNumber, extras); - return res != null && res.getBoolean(RES_NUMBER_IS_BLOCKED, false); + return res != null ? res.getInt(RES_BLOCK_STATUS, STATUS_NOT_BLOCKED) : + BlockedNumberContract.STATUS_NOT_BLOCKED; } catch (NullPointerException | IllegalArgumentException ex) { // The content resolver can throw an NPE or IAE; we don't want to crash Telecom if // either of these happen. Log.w(null, "shouldSystemBlockNumber: provider not ready."); - return false; + return BlockedNumberContract.STATUS_NOT_BLOCKED; } } @@ -504,6 +569,28 @@ public class BlockedNumberContract { } /** + * Converts a block status constant to a string equivalent for logging. + * @hide + */ + public static String blockStatusToString(int blockStatus) { + switch (blockStatus) { + case STATUS_NOT_BLOCKED: + return "not blocked"; + case STATUS_BLOCKED_IN_LIST: + return "blocked - in list"; + case STATUS_BLOCKED_RESTRICTED: + return "blocked - restricted"; + case STATUS_BLOCKED_UNKNOWN_NUMBER: + return "blocked - unknown"; + case STATUS_BLOCKED_PAYPHONE: + return "blocked - payphone"; + case STATUS_BLOCKED_NOT_IN_CONTACTS: + return "blocked - not in contacts"; + } + return "unknown"; + } + + /** * Represents the current status of * {@link #shouldSystemBlockNumber(Context, String, Bundle)}. If emergency services * have been contacted recently, {@link #isSuppressed} is {@code true}, and blocking diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 88d09af6e511..7a4ef5d6bb37 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9466,6 +9466,17 @@ public final class Settings { public static final String TETHER_OFFLOAD_DISABLED = "tether_offload_disabled"; /** + * Use the old dnsmasq DHCP server for tethering instead of the framework implementation. + * + * Integer values are interpreted as boolean, and the absence of an explicit setting + * is interpreted as |true|. + * TODO: make the default |false| + * @hide + */ + public static final String TETHER_ENABLE_LEGACY_DHCP_SERVER = + "tether_enable_legacy_dhcp_server"; + + /** * List of certificate (hex string representation of the application's certificate - SHA-1 * or SHA-256) and carrier app package pairs which are whitelisted to prompt the user for * install when a sim card with matching UICC carrier privilege rules is inserted. The diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java index 56af3ac0f3c9..c8228326b8e4 100644 --- a/core/java/android/transition/ChangeBounds.java +++ b/core/java/android/transition/ChangeBounds.java @@ -22,6 +22,7 @@ import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.RectEvaluator; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Bitmap; @@ -108,6 +109,7 @@ public class ChangeBounds extends Transition { } }; + @UnsupportedAppUsage private static final Property<View, PointF> BOTTOM_RIGHT_ONLY_PROPERTY = new Property<View, PointF>(PointF.class, "bottomRight") { @Override @@ -142,6 +144,7 @@ public class ChangeBounds extends Transition { } }; + @UnsupportedAppUsage private static final Property<View, PointF> POSITION_PROPERTY = new Property<View, PointF>(PointF.class, "position") { @Override diff --git a/core/java/android/transition/Scene.java b/core/java/android/transition/Scene.java index 44b6e1f3269c..fb0a4b4ccb39 100644 --- a/core/java/android/transition/Scene.java +++ b/core/java/android/transition/Scene.java @@ -16,6 +16,7 @@ package android.transition; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.util.SparseArray; import android.view.LayoutInflater; @@ -35,7 +36,9 @@ public final class Scene { private int mLayoutId = -1; private ViewGroup mSceneRoot; private View mLayout; // alternative to layoutId + @UnsupportedAppUsage Runnable mEnterAction; + @UnsupportedAppUsage Runnable mExitAction; /** @@ -195,6 +198,7 @@ public final class Scene { * * @param view The view on which the current scene is being set */ + @UnsupportedAppUsage static void setCurrentScene(View view, Scene scene) { view.setTagInternal(com.android.internal.R.id.current_scene, scene); } diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index 255a02938c32..b79228d45a92 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Path; @@ -848,6 +849,7 @@ public abstract class Transition implements Cloneable { return false; } + @UnsupportedAppUsage private static ArrayMap<Animator, AnimationInfo> getRunningAnimators() { ArrayMap<Animator, AnimationInfo> runningAnimators = sRunningAnimators.get(); if (runningAnimators == null) { @@ -1915,6 +1917,7 @@ public abstract class Transition implements Cloneable { * * @hide */ + @UnsupportedAppUsage protected void end() { --mNumInstances; if (mNumInstances == 0) { @@ -1967,6 +1970,7 @@ public abstract class Transition implements Cloneable { * * @hide */ + @UnsupportedAppUsage protected void cancel() { int numAnimators = mCurrentAnimators.size(); for (int i = numAnimators - 1; i >= 0; i--) { diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 325ff38e7d40..7e82132f566f 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -17,6 +17,7 @@ package android.transition; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.util.ArrayMap; import android.util.Log; @@ -73,9 +74,11 @@ public class TransitionManager { ArrayMap<Scene, Transition> mSceneTransitions = new ArrayMap<Scene, Transition>(); ArrayMap<Scene, ArrayMap<Scene, Transition>> mScenePairTransitions = new ArrayMap<Scene, ArrayMap<Scene, Transition>>(); + @UnsupportedAppUsage private static ThreadLocal<WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>> sRunningTransitions = new ThreadLocal<WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>>(); + @UnsupportedAppUsage private static ArrayList<ViewGroup> sPendingTransitions = new ArrayList<ViewGroup>(); @@ -207,6 +210,7 @@ public class TransitionManager { } } + @UnsupportedAppUsage private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() { WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions = sRunningTransitions.get(); diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index b092fcf4fc50..f2747cf426fa 100644..100755 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -142,6 +142,14 @@ public class DisplayMetrics { public static final int DENSITY_560 = 560; /** + * Intermediate density for screens that sit somewhere between + * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (640 dpi). + * This is not a density that applications should target, instead relying + * on the system to scale their {@link #DENSITY_XXXHIGH} assets for them. + */ + public static final int DENSITY_600 = 600; + + /** * Standard quantized DPI for extra-extra-extra-high-density screens. Applications * should not generally worry about this density; relying on XHIGH graphics * being scaled up to it should be sufficient for almost all cases. A typical diff --git a/core/java/android/widget/OWNERS b/core/java/android/widget/OWNERS index e4b2930a23cb..5c79d21791e3 100644 --- a/core/java/android/widget/OWNERS +++ b/core/java/android/widget/OWNERS @@ -1,11 +1 @@ -per-file TextView.java = siyamed@google.com -per-file TextView.java = nona@google.com -per-file TextView.java = clarabayarri@google.com - -per-file EditText.java = siyamed@google.com -per-file EditText.java = nona@google.com -per-file EditText.java = clarabayarri@google.com - -per-file Editor.java = siyamed@google.com -per-file Editor.java = nona@google.com -per-file Editor.java = clarabayarri@google.com +per-file TextView.java, EditText.java, Editor.java = siyamed@google.com, nona@google.com, clarabayarri@google.com diff --git a/core/jni/OWNERS b/core/jni/OWNERS index ce79049a195d..a365a566f038 100644 --- a/core/jni/OWNERS +++ b/core/jni/OWNERS @@ -1,12 +1,6 @@ # Camera -per-file *Camera*,*camera* = cychen@google.com -per-file *Camera*,*camera* = epeev@google.com -per-file *Camera*,*camera* = etalvala@google.com -per-file *Camera*,*camera* = shuzhenwang@google.com -per-file *Camera*,*camera* = yinchiayeh@google.com -per-file *Camera*,*camera* = zhijunhe@google.com +per-file *Camera*,*camera* = cychen@google.com, epeev@google.com, etalvala@google.com +per-file *Camera*,*camera* = shuzhenwang@google.com, yinchiayeh@google.com, zhijunhe@google.com # Connectivity -per-file android_net_*=ek@google.com -per-file android_net_*=lorenzo@google.com -per-file android_net_*=satk@google.com +per-file android_net_* = ek@google.com, lorenzo@google.com, satk@google.com diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 823f1cc36225..9b138ebb760a 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -323,6 +323,55 @@ static jboolean android_net_utils_queryUserAccess(JNIEnv *env, jobject thiz, jin return (jboolean) !queryUserAccess(uid, netId); } +static bool checkLenAndCopy(JNIEnv* env, const jbyteArray& addr, int len, void* dst) +{ + if (env->GetArrayLength(addr) != len) { + return false; + } + env->GetByteArrayRegion(addr, 0, len, reinterpret_cast<jbyte*>(dst)); + return true; +} + +static void android_net_utils_addArpEntry(JNIEnv *env, jobject thiz, jbyteArray ethAddr, + jbyteArray ipv4Addr, jstring ifname, jobject javaFd) +{ + struct arpreq req = {}; + struct sockaddr_in& netAddrStruct = *reinterpret_cast<sockaddr_in*>(&req.arp_pa); + struct sockaddr& ethAddrStruct = req.arp_ha; + + ethAddrStruct.sa_family = ARPHRD_ETHER; + if (!checkLenAndCopy(env, ethAddr, ETH_ALEN, ethAddrStruct.sa_data)) { + jniThrowException(env, "java/io/IOException", "Invalid ethAddr length"); + return; + } + + netAddrStruct.sin_family = AF_INET; + if (!checkLenAndCopy(env, ipv4Addr, sizeof(in_addr), &netAddrStruct.sin_addr)) { + jniThrowException(env, "java/io/IOException", "Invalid ipv4Addr length"); + return; + } + + int ifLen = env->GetStringLength(ifname); + // IFNAMSIZ includes the terminating NULL character + if (ifLen >= IFNAMSIZ) { + jniThrowException(env, "java/io/IOException", "ifname too long"); + return; + } + env->GetStringUTFRegion(ifname, 0, ifLen, req.arp_dev); + + req.arp_flags = ATF_COM; // Completed entry (ha valid) + int fd = jniGetFDFromFileDescriptor(env, javaFd); + if (fd < 0) { + jniThrowExceptionFmt(env, "java/io/IOException", "Invalid file descriptor"); + return; + } + // See also: man 7 arp + if (ioctl(fd, SIOCSARP, &req)) { + jniThrowExceptionFmt(env, "java/io/IOException", "ioctl error: %s", strerror(errno)); + return; + } +} + // ---------------------------------------------------------------------------- @@ -337,6 +386,7 @@ static const JNINativeMethod gNetworkUtilMethods[] = { { "bindSocketToNetwork", "(II)I", (void*) android_net_utils_bindSocketToNetwork }, { "protectFromVpn", "(I)Z", (void*)android_net_utils_protectFromVpn }, { "queryUserAccess", "(II)Z", (void*)android_net_utils_queryUserAccess }, + { "addArpEntry", "([B[BLjava/lang/String;Ljava/io/FileDescriptor;)V", (void*) android_net_utils_addArpEntry }, { "attachDhcpFilter", "(Ljava/io/FileDescriptor;)V", (void*) android_net_utils_attachDhcpFilter }, { "attachRaFilter", "(Ljava/io/FileDescriptor;I)V", (void*) android_net_utils_attachRaFilter }, { "attachControlPacketFilter", "(Ljava/io/FileDescriptor;I)V", (void*) android_net_utils_attachControlPacketFilter }, diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 638b3ea71d83..8df028a6af65 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -343,51 +343,47 @@ static void read_mapinfo(FILE *fp, stats_t* stats, bool* foundSwapPss) } is_swappable = true; } else if (strncmp(name, "/dev/", 5) == 0) { + whichHeap = HEAP_UNKNOWN_DEV; if (strncmp(name, "/dev/kgsl-3d0", 13) == 0) { whichHeap = HEAP_GL_DEV; - } else if (strncmp(name, "/dev/ashmem", 11) == 0) { - if (strncmp(name, "/dev/ashmem/dalvik-", 19) == 0) { - whichHeap = HEAP_DALVIK_OTHER; - if (strstr(name, "/dev/ashmem/dalvik-LinearAlloc") == name) { - subHeap = HEAP_DALVIK_OTHER_LINEARALLOC; - } else if ((strstr(name, "/dev/ashmem/dalvik-alloc space") == name) || - (strstr(name, "/dev/ashmem/dalvik-main space") == name)) { - // This is the regular Dalvik heap. - whichHeap = HEAP_DALVIK; - subHeap = HEAP_DALVIK_NORMAL; - } else if (strstr(name, "/dev/ashmem/dalvik-large object space") == name || - strstr(name, "/dev/ashmem/dalvik-free list large object space") - == name) { - whichHeap = HEAP_DALVIK; - subHeap = HEAP_DALVIK_LARGE; - } else if (strstr(name, "/dev/ashmem/dalvik-non moving space") == name) { - whichHeap = HEAP_DALVIK; - subHeap = HEAP_DALVIK_NON_MOVING; - } else if (strstr(name, "/dev/ashmem/dalvik-zygote space") == name) { - whichHeap = HEAP_DALVIK; - subHeap = HEAP_DALVIK_ZYGOTE; - } else if (strstr(name, "/dev/ashmem/dalvik-indirect ref") == name) { - subHeap = HEAP_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE; - } else if (strstr(name, "/dev/ashmem/dalvik-jit-code-cache") == name || - strstr(name, "/dev/ashmem/dalvik-data-code-cache") == name) { - subHeap = HEAP_DALVIK_OTHER_CODE_CACHE; - } else if (strstr(name, "/dev/ashmem/dalvik-CompilerMetadata") == name) { - subHeap = HEAP_DALVIK_OTHER_COMPILER_METADATA; - } else { - subHeap = HEAP_DALVIK_OTHER_ACCOUNTING; // Default to accounting. - } - } else if (strncmp(name, "/dev/ashmem/CursorWindow", 24) == 0) { - whichHeap = HEAP_CURSOR; - } else if (strncmp(name, "/dev/ashmem/libc malloc", 23) == 0) { - whichHeap = HEAP_NATIVE; - } else { - whichHeap = HEAP_ASHMEM; - } - } else { - whichHeap = HEAP_UNKNOWN_DEV; + } else if (strncmp(name, "/dev/ashmem/CursorWindow", 24) == 0) { + whichHeap = HEAP_CURSOR; + } else if (strncmp(name, "/dev/ashmem", 11)) { + whichHeap = HEAP_ASHMEM; } } else if (strncmp(name, "[anon:", 6) == 0) { whichHeap = HEAP_UNKNOWN; + if (strncmp(name, "[anon:dalvik-", 13) == 0) { + whichHeap = HEAP_DALVIK_OTHER; + if (strstr(name, "[anon:dalvik-LinearAlloc") == name) { + subHeap = HEAP_DALVIK_OTHER_LINEARALLOC; + } else if ((strstr(name, "[anon:dalvik-alloc space") == name) || + (strstr(name, "[anon:dalvik-main space") == name)) { + // This is the regular Dalvik heap. + whichHeap = HEAP_DALVIK; + subHeap = HEAP_DALVIK_NORMAL; + } else if (strstr(name, "[anon:dalvik-large object space") == name || + strstr(name, "[anon:dalvik-free list large object space") + == name) { + whichHeap = HEAP_DALVIK; + subHeap = HEAP_DALVIK_LARGE; + } else if (strstr(name, "[anon:dalvik-non moving space") == name) { + whichHeap = HEAP_DALVIK; + subHeap = HEAP_DALVIK_NON_MOVING; + } else if (strstr(name, "[anon:dalvik-zygote space") == name) { + whichHeap = HEAP_DALVIK; + subHeap = HEAP_DALVIK_ZYGOTE; + } else if (strstr(name, "[anon:dalvik-indirect ref") == name) { + subHeap = HEAP_DALVIK_OTHER_INDIRECT_REFERENCE_TABLE; + } else if (strstr(name, "[anon:dalvik-jit-code-cache") == name || + strstr(name, "[anon:dalvik-data-code-cache") == name) { + subHeap = HEAP_DALVIK_OTHER_CODE_CACHE; + } else if (strstr(name, "[anon:dalvik-CompilerMetadata") == name) { + subHeap = HEAP_DALVIK_OTHER_COMPILER_METADATA; + } else { + subHeap = HEAP_DALVIK_OTHER_ACCOUNTING; // Default to accounting. + } + } } else if (nameLen > 0) { whichHeap = HEAP_UNKNOWN_MAP; } else if (start == prevEnd && prevHeap == HEAP_SO) { diff --git a/core/jni/android_os_GraphicsEnvironment.cpp b/core/jni/android_os_GraphicsEnvironment.cpp index 4ecfd4bdc217..dfa5de6b65c6 100644 --- a/core/jni/android_os_GraphicsEnvironment.cpp +++ b/core/jni/android_os_GraphicsEnvironment.cpp @@ -29,7 +29,8 @@ void setDriverPath(JNIEnv* env, jobject clazz, jstring path) { } void setLayerPaths_native(JNIEnv* env, jobject clazz, jobject classLoader, jstring layerPaths) { - android_namespace_t* appNamespace = android::FindNamespaceByClassLoader(env, classLoader); + android::NativeLoaderNamespace* appNamespace = android::FindNativeLoaderNamespaceByClassLoader( + env, classLoader); ScopedUtfChars layerPathsChars(env, layerPaths); android::GraphicsEnv::getInstance().setLayerPaths(appNamespace, layerPathsChars.c_str()); } diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 9aa0111cb5df..0022cf889098 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -46,6 +46,7 @@ #include <unistd.h> #include "android-base/logging.h" +#include <android-base/properties.h> #include <android-base/file.h> #include <android-base/stringprintf.h> #include <cutils/fs.h> @@ -71,6 +72,7 @@ namespace { using android::String8; using android::base::StringPrintf; using android::base::WriteStringToFile; +using android::base::GetBoolProperty; #define CREATE_ERROR(...) StringPrintf("%s:%d: ", __FILE__, __LINE__). \ append(StringPrintf(__VA_ARGS__)) @@ -937,12 +939,16 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer( RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!"); } - // Assign system_server to the correct memory cgroup. - // Not all devices mount /dev/memcg so check for the file first - // to avoid unnecessarily printing errors and denials in the logs. - if (!access("/dev/memcg/system/tasks", F_OK) && + bool low_ram_device = GetBoolProperty("ro.config.low_ram", false); + bool per_app_memcg = GetBoolProperty("ro.config.per_app_memcg", low_ram_device); + if (per_app_memcg) { + // Assign system_server to the correct memory cgroup. + // Not all devices mount /dev/memcg so check for the file first + // to avoid unnecessarily printing errors and denials in the logs. + if (!access("/dev/memcg/system/tasks", F_OK) && !WriteStringToFile(StringPrintf("%d", pid), "/dev/memcg/system/tasks")) { - ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid); + ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid); + } } } return pid; diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index c4fa190b228d..9e0cff3c4728 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1385,6 +1385,8 @@ instantiates items without it.--> <attr name="appComponentFactory" format="string" /> + <attr name="usesNonSdkApi" format="boolean" /> + <!-- 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 @@ -1558,6 +1560,9 @@ <attr name="appComponentFactory" /> + <!-- Declares that this application should be invoked without non-SDK API enforcement --> + <attr name="usesNonSdkApi" /> + </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 ca204ecda027..632e4396fab0 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3446,6 +3446,9 @@ empty string is passed in --> <string name="config_wlan_network_service_package" translatable="false"></string> + <!-- Telephony qualified networks service package name to bind to by default. --> + <string name="config_qualified_networks_service_package" translatable="false"></string> + <!-- Wear devices: Controls the radios affected by Activity Mode. --> <string-array name="config_wearActivityModeRadios"> <item>"wifi"</item> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 997575fc4743..48ba0676c753 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2905,6 +2905,11 @@ <public-group type="attr" first-id="0x01010587"> </public-group> + <public-group type="attr" first-id="0x0101058d"> + <!-- @hide For use by platform and tools only. Developers should not specify this value. --> + <public name="usesNonSdkApi" /> + </public-group> + <public-group type="style" first-id="0x010302e2"> </public-group> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f2539e78d971..de5dc43d6843 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -273,6 +273,7 @@ <java-symbol type="string" name="config_wlan_network_service_package" /> <java-symbol type="string" name="config_wwan_data_service_package" /> <java-symbol type="string" name="config_wlan_data_service_package" /> + <java-symbol type="string" name="config_qualified_networks_service_package" /> <java-symbol type="bool" name="config_networkSamplingWakesDevice" /> <java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" /> <java-symbol type="bool" name="config_sip_wifi_only" /> diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 815294c0c98d..02e0d02a1a0e 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -423,6 +423,7 @@ public class SettingsBackupTest { Settings.Global.TETHER_DUN_REQUIRED, Settings.Global.TETHER_OFFLOAD_DISABLED, Settings.Global.TETHER_SUPPORTED, + Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER, Settings.Global.TEXT_CLASSIFIER_CONSTANTS, Settings.Global.THEATER_MODE_ON, Settings.Global.TIME_ONLY_MODE_CONSTANTS, diff --git a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java index 15dbbc8de150..c98e6460c189 100644 --- a/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java +++ b/core/tests/coretests/src/android/text/method/ForwardDeleteTest.java @@ -20,6 +20,7 @@ import android.platform.test.annotations.Presubmit; import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import android.test.suitebuilder.annotation.Suppress; import android.text.InputType; import android.util.KeyUtils; import android.view.KeyEvent; @@ -238,6 +239,7 @@ public class ForwardDeleteTest { } @Test + @Suppress public void testEmojiModifier() { EditorState state = new EditorState(); @@ -267,6 +269,7 @@ public class ForwardDeleteTest { } @Test + @Suppress public void testMixedEdgeCases() { EditorState state = new EditorState(); diff --git a/data/etc/OWNERS b/data/etc/OWNERS index f7a3e1ae8959..bbec474c20fd 100644 --- a/data/etc/OWNERS +++ b/data/etc/OWNERS @@ -1,7 +1 @@ -per-file privapp-permissions-platform.xml = bpoiesz@google.com -per-file privapp-permissions-platform.xml = fkupolov@google.com -per-file privapp-permissions-platform.xml = hackbod@android.com -per-file privapp-permissions-platform.xml = jsharkey@android.com -per-file privapp-permissions-platform.xml = svetoslavganov@google.com -per-file privapp-permissions-platform.xml = toddke@google.com -per-file privapp-permissions-platform.xml = yamasani@google.com +per-file privapp-permissions-platform.xml = hackbod@android.com, jsharkey@android.com, svetoslavganov@google.com, toddke@google.com, yamasani@google.com diff --git a/data/keyboards/Generic.kcm b/data/keyboards/Generic.kcm index d0565ca7e876..1ab4c6385ac1 100644 --- a/data/keyboards/Generic.kcm +++ b/data/keyboards/Generic.kcm @@ -540,7 +540,7 @@ key BUTTON_SELECT { } key BUTTON_MODE { - base: fallback MENU + base: fallback HOME } key BUTTON_1 { diff --git a/data/keyboards/Vendor_045e_Product_02e0.kl b/data/keyboards/Vendor_045e_Product_02e0.kl index 1012fb1eb28d..1dd8e157c5a7 100644 --- a/data/keyboards/Vendor_045e_Product_02e0.kl +++ b/data/keyboards/Vendor_045e_Product_02e0.kl @@ -56,4 +56,4 @@ key 0x136 BUTTON_SELECT key 0x137 BUTTON_START # Xbox key -key 0x8b HOME
\ No newline at end of file +key 0x8b BUTTON_MODE
\ No newline at end of file diff --git a/data/keyboards/Vendor_054c_Product_0268.kl b/data/keyboards/Vendor_054c_Product_0268.kl index 7c601373c2d0..522db3c9235e 100644 --- a/data/keyboards/Vendor_054c_Product_0268.kl +++ b/data/keyboards/Vendor_054c_Product_0268.kl @@ -35,7 +35,7 @@ key 0x121 BUTTON_THUMBL key 0x122 BUTTON_THUMBR # PS key -key 0x2d0 HOME +key 0x2d0 BUTTON_MODE # Left Analog Stick axis 0x00 X diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index 01911359a1e3..0f7980cc32e4 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -107,6 +107,7 @@ public class ColorMatrixColorFilter extends ColorFilter { * * @hide */ + @UnsupportedAppUsage public void setColorMatrixArray(@Nullable float[] array) { // called '...Array' so that passing null isn't ambiguous discardNativeInstance(); diff --git a/graphics/java/android/graphics/FontFamily.java b/graphics/java/android/graphics/FontFamily.java index 640e7b1e2f35..06469153c3ac 100644 --- a/graphics/java/android/graphics/FontFamily.java +++ b/graphics/java/android/graphics/FontFamily.java @@ -52,6 +52,7 @@ public class FontFamily { /** * @hide */ + @UnsupportedAppUsage public long mNativePtr; // Points native font family builder. Must be zero after freezing this family. diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index 431d0e0eb7b4..e3e8380716f3 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.graphics.fonts.FontVariationAxis; import android.text.FontConfig; import android.util.Xml; @@ -37,6 +38,7 @@ import java.util.regex.Pattern; public class FontListParser { /* Parse fallback list (no names) */ + @UnsupportedAppUsage public static FontConfig parse(InputStream in) throws XmlPullParserException, IOException { try { XmlPullParser parser = Xml.newPullParser(); diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h index b37f2cfe7fee..f2766d6a5b6e 100644 --- a/libs/hwui/TreeInfo.h +++ b/libs/hwui/TreeInfo.h @@ -39,7 +39,7 @@ public: virtual void onError(const std::string& message) = 0; protected: - ~ErrorHandler() {} + virtual ~ErrorHandler() {} }; class TreeObserver { diff --git a/libs/hwui/pipeline/skia/LayerDrawable.cpp b/libs/hwui/pipeline/skia/LayerDrawable.cpp index 4f16ddb9881b..6e7511da07ff 100644 --- a/libs/hwui/pipeline/skia/LayerDrawable.cpp +++ b/libs/hwui/pipeline/skia/LayerDrawable.cpp @@ -82,7 +82,14 @@ bool LayerDrawable::DrawLayer(GrContext* context, SkCanvas* canvas, Layer* layer textureMatrix = textureMatrixInv; } - SkMatrix matrix = SkMatrix::Concat(layerTransform, textureMatrix); + SkMatrix matrix; + if (dstRect) { + // Destination rectangle is set only when we are trying to read back the content + // of the layer. In this case we don't want to apply layer transform. + matrix = textureMatrix; + } else { + matrix = SkMatrix::Concat(layerTransform, textureMatrix); + } SkPaint paint; paint.setAlpha(layer->getAlpha()); diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLReadback.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLReadback.cpp index 107890e57a19..0760f1610891 100644 --- a/libs/hwui/pipeline/skia/SkiaOpenGLReadback.cpp +++ b/libs/hwui/pipeline/skia/SkiaOpenGLReadback.cpp @@ -26,6 +26,7 @@ #include "DeviceInfo.h" #include "Matrix.h" #include "Properties.h" +#include "utils/MathUtils.h" using namespace android::uirenderer::renderthread; @@ -116,9 +117,9 @@ CopyResult SkiaOpenGLReadback::copyImageInto(EGLImageKHR eglImage, const Matrix4 paint.setBlendMode(SkBlendMode::kSrc); // Apply a filter, which is matching OpenGL pipeline readback behaviour. Filter usage // is codified by tests using golden images like DecodeAccuracyTest. - if (skiaSrcRect.width() != bitmap->width() || - skiaSrcRect.height() != bitmap->height()) { - // TODO: apply filter always, but check if tests will be fine + bool disableFilter = MathUtils::areEqual(skiaSrcRect.width(), skiaDestRect.width()) + && MathUtils::areEqual(skiaSrcRect.height(), skiaDestRect.height()); + if (!disableFilter) { paint.setFilterQuality(kLow_SkFilterQuality); } scaledSurface->getCanvas()->concat(textureMatrix); diff --git a/libs/hwui/renderthread/RenderThread.h b/libs/hwui/renderthread/RenderThread.h index 689f518bad1b..e9c264917905 100644 --- a/libs/hwui/renderthread/RenderThread.h +++ b/libs/hwui/renderthread/RenderThread.h @@ -59,7 +59,7 @@ public: virtual void doFrame() = 0; protected: - ~IFrameCallback() {} + virtual ~IFrameCallback() {} }; struct VsyncSource { diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 54541f02f575..7cf8828c0623 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -43,27 +43,27 @@ namespace android { #define FIND_CLASS(var, className) \ var = env->FindClass(className); \ - LOG_FATAL_IF(! (var), "Unable to find class " className); + LOG_FATAL_IF(! (var), "Unable to find class %s", className); #define GET_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find field " fieldName); + LOG_FATAL_IF(! (var), "Unable to find field %s", fieldName); #define GET_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetMethodID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find method " fieldName); + LOG_FATAL_IF(! (var), "Unable to find method %s", fieldName); #define GET_STATIC_FIELD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetStaticFieldID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find field " fieldName); + LOG_FATAL_IF(! (var), "Unable to find field %s", fieldName); #define GET_STATIC_METHOD_ID(var, clazz, fieldName, fieldDescriptor) \ var = env->GetStaticMethodID(clazz, fieldName, fieldDescriptor); \ - LOG_FATAL_IF(! (var), "Unable to find static method " fieldName); + LOG_FATAL_IF(! (var), "Unable to find static method %s", fieldName); -#define GET_STATIC_OBJECT_FIELD(var, clazz, fieldName) \ - var = env->GetStaticObjectField(clazz, fieldName); \ - LOG_FATAL_IF(! (var), "Unable to find static object field " fieldName); +#define GET_STATIC_OBJECT_FIELD(var, clazz, fieldId) \ + var = env->GetStaticObjectField(clazz, fieldId); \ + LOG_FATAL_IF(! (var), "Unable to find static object field %p", fieldId); struct RequestFields { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ImageReaderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ImageReaderTest.java index f6cd9901cd39..2cb5704f5c2d 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ImageReaderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ImageReaderTest.java @@ -41,6 +41,7 @@ public class ImageReaderTest extends AndroidTestCase { private Image mImage3; @Override + @SuppressWarnings("CheckReturnValue") protected void setUp() throws Exception { super.setUp(); diff --git a/native/android/OWNERS b/native/android/OWNERS index 067cdf8eb983..b3f50aab7503 100644 --- a/native/android/OWNERS +++ b/native/android/OWNERS @@ -1,15 +1,4 @@ set noparent -per-file libandroid_net.map.txt=codewiz@google.com -per-file libandroid_net.map.txt=ek@google.com -per-file libandroid_net.map.txt=jchalard@google.com -per-file libandroid_net.map.txt=lorenzo@google.com -per-file libandroid_net.map.txt=reminv@google.com -per-file libandroid_net.map.txt=satk@google.com - -per-file net.c=codewiz@google.com -per-file net.c=ek@google.com -per-file net.c=jchalard@google.com -per-file net.c=lorenzo@google.com -per-file net.c=reminv@google.com -per-file net.c=satk@google.com +per-file libandroid_net.map.txt, net.c = codewiz@google.com, ek@google.com, jchalard@google.com +per-file libandroid_net.map.txt, net.c = lorenzo@google.com, reminv@google.com, satk@google.com diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 3630005416be..fd1212af3cfa 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -33,7 +33,6 @@ import android.net.NetworkRequest; import android.net.Proxy; import android.net.Uri; import android.net.captiveportal.CaptivePortalProbeSpec; -import android.net.dns.ResolvUtil; import android.net.http.SslError; import android.net.wifi.WifiInfo; import android.os.Build; @@ -132,9 +131,9 @@ public class CaptivePortalLoginActivity extends Activity { } // Also initializes proxy system properties. + mNetwork = mNetwork.getPrivateDnsBypassingCopy(); mCm.bindProcessToNetwork(mNetwork); - mCm.setProcessDefaultNetworkForHostResolution( - ResolvUtil.getNetworkWithUseLocalNameserversFlag(mNetwork)); + mCm.setProcessDefaultNetworkForHostResolution(mNetwork); // Proxy system properties must be initialized before setContentView is called because // setContentView initializes the WebView logic which in turn reads the system properties. @@ -334,7 +333,6 @@ public class CaptivePortalLoginActivity extends Activity { // TODO: reuse NetworkMonitor facilities for consistent captive portal detection. new Thread(new Runnable() { public void run() { - final Network network = ResolvUtil.makeNetworkWithPrivateDnsBypass(mNetwork); // Give time for captive portal to open. try { Thread.sleep(1000); @@ -344,7 +342,7 @@ public class CaptivePortalLoginActivity extends Activity { int httpResponseCode = 500; String locationHeader = null; try { - urlConnection = (HttpURLConnection) network.openConnection(mUrl); + urlConnection = (HttpURLConnection) mNetwork.openConnection(mUrl); urlConnection.setInstanceFollowRedirects(false); urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS); urlConnection.setReadTimeout(SOCKET_TIMEOUT_MS); diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp new file mode 100644 index 000000000000..4791517d9273 --- /dev/null +++ b/packages/SettingsLib/Android.bp @@ -0,0 +1,25 @@ +android_library { + + name: "SettingsLib", + + libs: [ + "androidx.annotation_annotation", + "androidx.legacy_legacy-support-v4", + "androidx.recyclerview_recyclerview", + "androidx.preference_preference", + "androidx.appcompat_appcompat", + "androidx.lifecycle_lifecycle-runtime", + ], + + // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES + // LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common + + resource_dirs: ["res"], + + srcs: ["src/**/*.java"], + + min_sdk_version: "21", + +} + +// For the test package. diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk deleted file mode 100644 index 7b89fb243d38..000000000000 --- a/packages/SettingsLib/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_AAPT2_ONLY := true - -LOCAL_MODULE := SettingsLib - -LOCAL_JAVA_LIBRARIES := \ - android-support-annotations - -LOCAL_SHARED_ANDROID_LIBRARIES := \ - android-support-v4 \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-arch-lifecycle-runtime - -LOCAL_SHARED_JAVA_LIBRARIES := \ - android-arch-lifecycle-common - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_JAR_EXCLUDE_FILES := none - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_MIN_SDK_VERSION := 21 - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# For the test package. -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 5de3a6e99440..834b83b49ada 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -14,15 +14,15 @@ # LOCAL_STATIC_JAVA_LIBRARIES += \ - android-support-annotations \ - android-arch-lifecycle-common + androidx.annotation_annotation \ + androidx.lifecycle_lifecycle-common LOCAL_STATIC_ANDROID_LIBRARIES += \ - android-support-v4 \ - android-arch-lifecycle-runtime \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-support-v14-preference \ + androidx.legacy_legacy-support-v4 \ + androidx.lifecycle_lifecycle-runtime \ + androidx.recyclerview_recyclerview \ + androidx.preference_preference \ + androidx.appcompat_appcompat \ + androidx.legacy_legacy-preference-v14 \ SettingsLib diff --git a/packages/SettingsLib/res/layout/preference_access_point.xml b/packages/SettingsLib/res/layout/preference_access_point.xml index 62173da5b7eb..472a6e3d0dd4 100644 --- a/packages/SettingsLib/res/layout/preference_access_point.xml +++ b/packages/SettingsLib/res/layout/preference_access_point.xml @@ -45,7 +45,7 @@ android:clipToPadding="false" android:paddingTop="4dp" android:paddingBottom="4dp"> - <android.support.v7.internal.widget.PreferenceImageView + <androidx.preference.internal.PreferenceImageView android:id="@android:id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/packages/SettingsLib/res/layout/preference_two_target.xml b/packages/SettingsLib/res/layout/preference_two_target.xml index 4658924477a0..ff6a22d5523c 100644 --- a/packages/SettingsLib/res/layout/preference_two_target.xml +++ b/packages/SettingsLib/res/layout/preference_two_target.xml @@ -46,7 +46,7 @@ android:clipToPadding="false" android:paddingTop="4dp" android:paddingBottom="4dp"> - <android.support.v7.internal.widget.PreferenceImageView + <androidx.preference.internal.PreferenceImageView android:id="@android:id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java b/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java index 95a8f1d9782e..3bade25b712a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java @@ -20,11 +20,12 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v14.preference.PreferenceDialogFragment; -import android.support.v7.preference.DialogPreference; import android.util.AttributeSet; import android.view.View; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragment; + public class CustomDialogPreference extends DialogPreference { private CustomPreferenceDialogFragment mFragment; diff --git a/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java b/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java index d39ec4b43151..dfaff6108c89 100644 --- a/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java @@ -23,13 +23,14 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.v14.preference.EditTextPreferenceDialogFragment; -import android.support.v7.preference.EditTextPreference; import android.util.AttributeSet; import android.view.View; import android.widget.EditText; +import androidx.annotation.CallSuper; +import androidx.preference.EditTextPreference; +import androidx.preference.EditTextPreferenceDialogFragment; + public class CustomEditTextPreference extends EditTextPreference { private CustomPreferenceDialogFragment mFragment; diff --git a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java index f2cd1033cd38..bc5a2c05e379 100644 --- a/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java @@ -16,6 +16,8 @@ package com.android.settingslib; +import static android.content.Context.TELEPHONY_SERVICE; + import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -30,7 +32,8 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.text.format.DateFormat; import android.util.Log; -import android.support.annotation.VisibleForTesting; + +import androidx.annotation.VisibleForTesting; import java.io.BufferedReader; import java.io.FileReader; @@ -43,8 +46,6 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static android.content.Context.TELEPHONY_SERVICE; - public class DeviceInfoUtils { private static final String TAG = "DeviceInfoUtils"; diff --git a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java index 8055caaad536..4cbeb8a48f8f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/HelpUtils.java @@ -24,16 +24,15 @@ import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; -import android.content.res.Resources.Theme; import android.content.res.TypedArray; import android.net.Uri; import android.provider.Settings.Global; import android.text.TextUtils; import android.util.Log; -import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.MenuItem.OnMenuItemClickListener; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java index 8bab3ca05dd6..bd54edd80697 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java @@ -35,7 +35,6 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; @@ -43,6 +42,8 @@ import android.text.style.ImageSpan; import android.view.MenuItem; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.widget.LockPatternUtils; import java.util.List; diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java index b4a3b51809ce..ad7e995412aa 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java @@ -16,15 +16,16 @@ package com.android.settingslib; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.content.Context; import android.os.UserHandle; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; /** * Preference class that supports being disabled by a user restriction diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java index 8e3a6c51ddda..4b84920e7884 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java @@ -16,19 +16,18 @@ package com.android.settingslib; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.content.Context; import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.os.UserHandle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.util.TypedValue; -import android.view.View; import android.widget.TextView; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; /** * Helper class for managing settings preferences that can be disabled diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java index 42b3156559e0..0ed507c46372 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java @@ -21,15 +21,16 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.content.Context; import android.content.res.TypedArray; import android.os.UserHandle; -import android.support.v14.preference.SwitchPreference; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + /** * Version of SwitchPreference that can be disabled by a device admin * using a user restriction. diff --git a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java index abbef702bd9f..dc02f266b39a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/TetherUtil.java @@ -17,9 +17,10 @@ package com.android.settingslib; import android.content.Context; import android.os.SystemProperties; -import android.support.annotation.VisibleForTesting; import android.telephony.CarrierConfigManager; +import androidx.annotation.VisibleForTesting; + public class TetherUtil { @VisibleForTesting diff --git a/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java b/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java index 02b68d8ccbc5..02895a479352 100644 --- a/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/TwoTargetPreference.java @@ -18,13 +18,14 @@ package com.android.settingslib; import android.annotation.IntDef; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 505cfeac220c..aa8cae50ae95 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -27,7 +27,7 @@ import android.provider.Settings; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.UserIcons; import com.android.settingslib.drawable.UserIconDrawable; -import com.android.settingslib.wrapper.LocationManagerWrapper; + import java.text.NumberFormat; public class Utils { @@ -69,8 +69,7 @@ public class Utils { intent, UserHandle.of(userId), android.Manifest.permission.WRITE_SECURE_SETTINGS); LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); - LocationManagerWrapper wrapper = new LocationManagerWrapper(locationManager); - wrapper.setLocationEnabledForUser(enabled, UserHandle.of(userId)); + locationManager.setLocationEnabledForUser(enabled, UserHandle.of(userId)); } public static boolean updateLocationMode(Context context, int oldMode, int newMode, int userId, diff --git a/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java b/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java index df76125a99f2..efac6bc3572d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java @@ -19,15 +19,12 @@ package com.android.settingslib.animation; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.content.Context; import android.view.RenderNodeAnimator; import android.view.View; -import android.view.ViewPropertyAnimator; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; -import com.android.internal.widget.LockPatternView; import com.android.settingslib.R; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java index 093b1bd2b8f8..452f1fc8c624 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -22,9 +22,6 @@ import android.app.AppGlobals; import android.app.Application; import android.app.usage.StorageStats; import android.app.usage.StorageStatsManager; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.OnLifecycleEvent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -49,12 +46,16 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; -import android.support.annotation.VisibleForTesting; import android.text.format.Formatter; import android.util.IconDrawableFactory; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; + import com.android.internal.R; import com.android.internal.util.ArrayUtils; diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java b/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java index 9fbadee3075a..b457406dda03 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java @@ -21,7 +21,8 @@ import android.app.usage.StorageStatsManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; + +import androidx.annotation.VisibleForTesting; import java.io.IOException; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java index 65535b58fae7..541877cc28ca 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java @@ -20,7 +20,6 @@ import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothCodecConfig; -import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothUuid; @@ -28,9 +27,7 @@ import android.content.Context; import android.os.ParcelUuid; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.R; -import com.android.settingslib.wrapper.BluetoothA2dpWrapper; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +40,6 @@ public class A2dpProfile implements LocalBluetoothProfile { private Context mContext; private BluetoothA2dp mService; - private BluetoothA2dpWrapper mServiceWrapper; private boolean mIsProfileReady; private final LocalBluetoothAdapter mLocalAdapter; @@ -67,7 +63,6 @@ public class A2dpProfile implements LocalBluetoothProfile { public void onServiceConnected(int profile, BluetoothProfile proxy) { if (V) Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothA2dp) proxy; - mServiceWrapper = new BluetoothA2dpWrapper(mService); // We just bound to the service, so refresh the UI for any connected A2DP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); while (!deviceList.isEmpty()) { @@ -110,11 +105,6 @@ public class A2dpProfile implements LocalBluetoothProfile { BluetoothProfile.A2DP); } - @VisibleForTesting - void setBluetoothA2dpWrapper(BluetoothA2dpWrapper wrapper) { - mServiceWrapper = wrapper; - } - public boolean isConnectable() { return true; } @@ -194,12 +184,12 @@ public class A2dpProfile implements LocalBluetoothProfile { } public boolean supportsHighQualityAudio(BluetoothDevice device) { - int support = mServiceWrapper.supportsOptionalCodecs(device); + int support = mService.supportsOptionalCodecs(device); return support == BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED; } public boolean isHighQualityAudioEnabled(BluetoothDevice device) { - int enabled = mServiceWrapper.getOptionalCodecsEnabled(device); + int enabled = mService.getOptionalCodecsEnabled(device); if (enabled != BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN) { return enabled == BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED; } else if (getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED && @@ -210,8 +200,8 @@ public class A2dpProfile implements LocalBluetoothProfile { return true; } BluetoothCodecConfig codecConfig = null; - if (mServiceWrapper.getCodecStatus(device) != null) { - codecConfig = mServiceWrapper.getCodecStatus(device).getCodecConfig(); + if (mService.getCodecStatus(device) != null) { + codecConfig = mService.getCodecStatus(device).getCodecConfig(); } if (codecConfig != null) { return !codecConfig.isMandatoryCodec(); @@ -224,7 +214,7 @@ public class A2dpProfile implements LocalBluetoothProfile { int prefValue = enabled ? BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED : BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED; - mServiceWrapper.setOptionalCodecsEnabled(device, prefValue); + mService.setOptionalCodecsEnabled(device, prefValue); if (getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) { return; } @@ -244,8 +234,8 @@ public class A2dpProfile implements LocalBluetoothProfile { // We want to get the highest priority codec, since that's the one that will be used with // this device, and see if it is high-quality (ie non-mandatory). BluetoothCodecConfig[] selectable = null; - if (mServiceWrapper.getCodecStatus(device) != null) { - selectable = mServiceWrapper.getCodecStatus(device).getCodecsSelectableCapabilities(); + if (mService.getCodecStatus(device) != null) { + selectable = mService.getCodecStatus(device).getCodecsSelectableCapabilities(); // To get the highest priority, we sort in reverse. Arrays.sort(selectable, (a, b) -> { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java index bb8fbe2da9c9..e96c44db695b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java @@ -16,6 +16,7 @@ package com.android.settingslib.bluetooth; +import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHearingAid; @@ -28,8 +29,8 @@ import android.os.ParcelUuid; import android.os.SystemClock; import android.text.TextUtils; import android.util.Log; -import android.bluetooth.BluetoothAdapter; -import android.support.annotation.VisibleForTesting; + +import androidx.annotation.VisibleForTesting; import com.android.settingslib.R; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java index e9d96ae0310f..b360faabcbb0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java @@ -31,8 +31,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Objects; +import java.util.Set; /** * CachedBluetoothDeviceManager manages the set of remote Bluetooth devices. diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java index f7518cd63c5c..7f838600c5ee 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java @@ -36,7 +36,6 @@ import java.util.List; */ public class HeadsetProfile implements LocalBluetoothProfile { private static final String TAG = "HeadsetProfile"; - private static boolean V = true; private BluetoothHeadset mService; private boolean mIsProfileReady; @@ -60,7 +59,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { implements BluetoothProfile.ServiceListener { public void onServiceConnected(int profile, BluetoothProfile proxy) { - if (V) Log.d(TAG,"Bluetooth service connected"); + Log.d(TAG,"Bluetooth service connected"); mService = (BluetoothHeadset) proxy; // We just bound to the service, so refresh the UI for any connected HFP devices. List<BluetoothDevice> deviceList = mService.getConnectedDevices(); @@ -82,7 +81,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { } public void onServiceDisconnected(int profile) { - if (V) Log.d(TAG,"Bluetooth service disconnected"); + Log.d(TAG,"Bluetooth service disconnected"); mProfileManager.callServiceDisconnectedListeners(); mIsProfileReady=false; } @@ -116,80 +115,76 @@ public class HeadsetProfile implements LocalBluetoothProfile { } public boolean connect(BluetoothDevice device) { - if (mService == null) return false; - List<BluetoothDevice> sinks = mService.getConnectedDevices(); - if (sinks != null) { - for (BluetoothDevice sink : sinks) { - Log.d(TAG,"Not disconnecting device = " + sink); - } + if (mService == null) { + return false; } return mService.connect(device); } public boolean disconnect(BluetoothDevice device) { - if (mService == null) return false; - List<BluetoothDevice> deviceList = mService.getConnectedDevices(); - if (!deviceList.isEmpty()) { - for (BluetoothDevice dev : deviceList) { - if (dev.equals(device)) { - if (V) Log.d(TAG,"Downgrade priority as user" + - "is disconnecting the headset"); - // Downgrade priority as user is disconnecting the headset. - if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) { - mService.setPriority(device, BluetoothProfile.PRIORITY_ON); - } - return mService.disconnect(device); - } - } + if (mService == null) { + return false; + } + // Downgrade priority as user is disconnecting the headset. + if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON) { + mService.setPriority(device, BluetoothProfile.PRIORITY_ON); } - return false; + return mService.disconnect(device); } public int getConnectionStatus(BluetoothDevice device) { - if (mService == null) return BluetoothProfile.STATE_DISCONNECTED; - List<BluetoothDevice> deviceList = mService.getConnectedDevices(); - if (!deviceList.isEmpty()){ - for (BluetoothDevice dev : deviceList) { - if (dev.equals(device)) { - return mService.getConnectionState(device); - } - } + if (mService == null) { + return BluetoothProfile.STATE_DISCONNECTED; } - return BluetoothProfile.STATE_DISCONNECTED; + return mService.getConnectionState(device); } public boolean setActiveDevice(BluetoothDevice device) { - if (mService == null) return false; + if (mService == null) { + return false; + } return mService.setActiveDevice(device); } public BluetoothDevice getActiveDevice() { - if (mService == null) return null; + if (mService == null) { + return null; + } return mService.getActiveDevice(); } public boolean isAudioOn() { - if (mService == null) return false; + if (mService == null) { + return false; + } return mService.isAudioOn(); } public int getAudioState(BluetoothDevice device) { - if (mService == null) return BluetoothHeadset.STATE_AUDIO_DISCONNECTED; + if (mService == null) { + return BluetoothHeadset.STATE_AUDIO_DISCONNECTED; + } return mService.getAudioState(device); } public boolean isPreferred(BluetoothDevice device) { - if (mService == null) return false; + if (mService == null) { + return false; + } return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF; } public int getPreferred(BluetoothDevice device) { - if (mService == null) return BluetoothProfile.PRIORITY_OFF; + if (mService == null) { + return BluetoothProfile.PRIORITY_OFF; + } return mService.getPriority(device); } public void setPreferred(BluetoothDevice device, boolean preferred) { - if (mService == null) return; + if (mService == null) { + return; + } if (preferred) { if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) { mService.setPriority(device, BluetoothProfile.PRIORITY_ON); @@ -200,7 +195,9 @@ public class HeadsetProfile implements LocalBluetoothProfile { } public List<BluetoothDevice> getConnectedDevices() { - if (mService == null) return new ArrayList<BluetoothDevice>(0); + if (mService == null) { + return new ArrayList<BluetoothDevice>(0); + } return mService.getDevicesMatchingConnectionStates( new int[] {BluetoothProfile.STATE_CONNECTED, BluetoothProfile.STATE_CONNECTING, @@ -238,7 +235,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { } protected void finalize() { - if (V) Log.d(TAG, "finalize()"); + Log.d(TAG, "finalize()"); if (mService != null) { try { BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET, diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java index 4c21e61eb47b..1d2fda94deaa 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java @@ -16,23 +16,17 @@ package com.android.settingslib.bluetooth; -import android.bluetooth.BluetoothHearingAid; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; -import android.bluetooth.BluetoothCodecConfig; -import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothHearingAid; import android.bluetooth.BluetoothProfile; -import android.bluetooth.BluetoothUuid; import android.content.Context; -import android.os.ParcelUuid; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.R; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class HearingAidProfile implements LocalBluetoothProfile { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java index d0819098deb1..03f6afb39613 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java @@ -16,10 +16,10 @@ package com.android.settingslib.bluetooth; -import android.bluetooth.BluetoothHeadsetClient; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothHeadsetClient; import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothUuid; import android.content.Context; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java index 45ec4a1e554d..ca1eea522cd0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidDeviceProfile.java @@ -26,7 +26,6 @@ import android.util.Log; import com.android.settingslib.R; -import java.util.Collection; import java.util.List; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java index 93e562179399..dc17e44cb08d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HidProfile.java @@ -29,7 +29,7 @@ import com.android.settingslib.R; import java.util.List; /** - * HidProfile handles Bluetooth HID profile. + * HidProfile handles Bluetooth HID Host role. */ public class HidProfile implements LocalBluetoothProfile { private static final String TAG = "HidProfile"; @@ -117,11 +117,7 @@ public class HidProfile implements LocalBluetoothProfile { if (mService == null) { return BluetoothProfile.STATE_DISCONNECTED; } - List<BluetoothDevice> deviceList = mService.getConnectedDevices(); - - return !deviceList.isEmpty() && deviceList.get(0).equals(device) - ? mService.getConnectionState(device) - : BluetoothProfile.STATE_DISCONNECTED; + return mService.getConnectionState(device); } public boolean isPreferred(BluetoothDevice device) { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java index 62f8724870e3..08fbbedac19c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java @@ -34,9 +34,12 @@ import android.bluetooth.BluetoothUuid; import android.content.Context; import android.content.Intent; import android.os.ParcelUuid; -import android.support.annotation.VisibleForTesting; import android.util.Log; + +import androidx.annotation.VisibleForTesting; + import com.android.internal.R; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java index e5c0b147f97b..dfd16224ef8f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/OppProfile.java @@ -16,12 +16,12 @@ package com.android.settingslib.bluetooth; -import com.android.settingslib.R; - import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; +import com.android.settingslib.R; + /** * OppProfile handles Bluetooth OPP. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java index b735c23e966f..bdbfc9df59dd 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java @@ -16,10 +16,10 @@ package com.android.settingslib.bluetooth; -import android.bluetooth.BluetoothPbapClient; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothPbapClient; import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothUuid; import android.content.Context; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java index 93e6be6559f6..2c455d5f4c32 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java @@ -19,8 +19,8 @@ package com.android.settingslib.bluetooth; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothSap; import android.bluetooth.BluetoothProfile; +import android.bluetooth.BluetoothSap; import android.bluetooth.BluetoothUuid; import android.content.Context; import android.os.ParcelUuid; diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/Utils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/Utils.java index 0ee1dad9d744..bcb417c5e912 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/Utils.java @@ -5,9 +5,10 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; import android.util.Pair; +import androidx.annotation.DrawableRes; + import com.android.settingslib.R; import com.android.settingslib.graph.BluetoothDeviceLayerDrawable; diff --git a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java index 573504a96141..9572fb3c629d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java @@ -1,9 +1,10 @@ package com.android.settingslib.core; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; /** * A controller that manages event for preference. diff --git a/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java b/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java index 72ab8c3848c5..1d3a909df55b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/ConfirmationDialogController.java @@ -16,8 +16,8 @@ package com.android.settingslib.core; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.preference.Preference; /** * Interface for {@link AbstractPreferenceController} objects which manage confirmation dialogs diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java index 72273046ef29..78963f3e1bfa 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java @@ -18,7 +18,6 @@ package com.android.settingslib.core.instrumentation; import android.content.Context; import android.metrics.LogMaker; -import android.util.Log; import android.util.Pair; import com.android.internal.logging.MetricsLogger; diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java index facce4e0bcbb..a28e45ce08f7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/SharedPreferencesLogger.java @@ -20,11 +20,12 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.os.AsyncTask; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import java.util.Map; diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java index c23f22648764..06d7c4d9cbc3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixin.java @@ -16,16 +16,17 @@ package com.android.settingslib.core.instrumentation; +import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN; + import android.app.Activity; -import android.arch.lifecycle.Lifecycle.Event; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.OnLifecycleEvent; import android.content.Intent; - import android.os.SystemClock; -import com.android.internal.logging.nano.MetricsProto; -import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN; +import androidx.lifecycle.Lifecycle.Event; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; + +import com.android.internal.logging.nano.MetricsProto; /** * Logs visibility change of a fragment. diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java index 451e5611979a..56de280a0049 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/Lifecycle.java @@ -15,22 +15,23 @@ */ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_ANY; +import static androidx.lifecycle.Lifecycle.Event.ON_ANY; import android.annotation.UiThread; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.LifecycleRegistry; -import android.arch.lifecycle.OnLifecycleEvent; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.preference.PreferenceScreen; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.core.lifecycle.events.OnAttach; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; @@ -75,7 +76,7 @@ public class Lifecycle extends LifecycleRegistry { */ @UiThread @Override - public void addObserver(android.arch.lifecycle.LifecycleObserver observer) { + public void addObserver(androidx.lifecycle.LifecycleObserver observer) { ThreadUtils.ensureMainThread(); super.addObserver(observer); if (observer instanceof LifecycleObserver) { @@ -85,7 +86,7 @@ public class Lifecycle extends LifecycleRegistry { @UiThread @Override - public void removeObserver(android.arch.lifecycle.LifecycleObserver observer) { + public void removeObserver(androidx.lifecycle.LifecycleObserver observer) { ThreadUtils.ensureMainThread(); super.removeObserver(observer); if (observer instanceof LifecycleObserver) { @@ -207,7 +208,7 @@ public class Lifecycle extends LifecycleRegistry { } private class LifecycleProxy - implements android.arch.lifecycle.LifecycleObserver { + implements androidx.lifecycle.LifecycleObserver { @OnLifecycleEvent(ON_ANY) public void onLifecycleEvent(LifecycleOwner owner, Event event) { switch (event) { diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/LifecycleObserver.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/LifecycleObserver.java index ec8a8b537f48..9eb25806263f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/LifecycleObserver.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/LifecycleObserver.java @@ -17,9 +17,9 @@ package com.android.settingslib.core.lifecycle; /** * Observer of lifecycle events. - * @deprecated use {@link android.arch.lifecycle.LifecycleObserver} instead + * @deprecated use {@link androidx.lifecycle.LifecycleObserver} instead */ @Deprecated public interface LifecycleObserver extends - android.arch.lifecycle.LifecycleObserver { + androidx.lifecycle.LifecycleObserver { } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableActivity.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableActivity.java index 8b062f8447b0..a3b4a08eafa8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableActivity.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableActivity.java @@ -15,21 +15,22 @@ */ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE; -import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; +import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; +import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; +import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import android.annotation.Nullable; import android.app.Activity; -import android.arch.lifecycle.LifecycleOwner; import android.os.Bundle; import android.os.PersistableBundle; import android.view.Menu; import android.view.MenuItem; +import androidx.lifecycle.LifecycleOwner; + /** * {@link Activity} that has hooks to observe activity lifecycle events. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableDialogFragment.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableDialogFragment.java index dc95384b26a5..03727d6ba6de 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableDialogFragment.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableDialogFragment.java @@ -15,21 +15,22 @@ */ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE; -import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; +import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; +import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; +import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import android.app.DialogFragment; -import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.lifecycle.LifecycleOwner; + /** * {@link DialogFragment} that has hooks to observe fragment lifecycle events. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableFragment.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableFragment.java index 925eda6ef9d5..db3f8e860903 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableFragment.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservableFragment.java @@ -16,22 +16,23 @@ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE; -import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; +import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; +import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; +import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import android.annotation.CallSuper; import android.app.Fragment; -import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Bundle; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.lifecycle.LifecycleOwner; + public class ObservableFragment extends Fragment implements LifecycleOwner { private final Lifecycle mLifecycle = new Lifecycle(this); diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java index abd77559612e..3f3a02b1c16e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/ObservablePreferenceFragment.java @@ -16,23 +16,24 @@ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_CREATE; -import static android.arch.lifecycle.Lifecycle.Event.ON_DESTROY; -import static android.arch.lifecycle.Lifecycle.Event.ON_PAUSE; -import static android.arch.lifecycle.Lifecycle.Event.ON_RESUME; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +import static androidx.lifecycle.Lifecycle.Event.ON_CREATE; +import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY; +import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; +import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import android.annotation.CallSuper; -import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + /** * {@link PreferenceFragment} that has hooks to observe fragment lifecycle events. */ diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java index ad7068e2f9fb..4f6d00157b72 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnCreate.java @@ -16,10 +16,11 @@ package com.android.settingslib.core.lifecycle.events; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.OnLifecycleEvent; import android.os.Bundle; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.OnLifecycleEvent; + /** * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event) } */ diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnDestroy.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnDestroy.java index c37286e1efaa..938374832d38 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnDestroy.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnDestroy.java @@ -15,8 +15,8 @@ */ package com.android.settingslib.core.lifecycle.events; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.OnLifecycleEvent; /** * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event) } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPause.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPause.java index a5ab39c46ab1..b75d6d9d8438 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPause.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPause.java @@ -15,8 +15,8 @@ */ package com.android.settingslib.core.lifecycle.events; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.OnLifecycleEvent; /** * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event) } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java index b9f13713c59f..92ae9fdd50a9 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnPrepareOptionsMenu.java @@ -17,7 +17,6 @@ package com.android.settingslib.core.lifecycle.events; import android.view.Menu; -import android.view.MenuInflater; public interface OnPrepareOptionsMenu { void onPrepareOptionsMenu(Menu menu); diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnResume.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnResume.java index 1effba4a750d..5b0ff60b793d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnResume.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnResume.java @@ -15,8 +15,8 @@ */ package com.android.settingslib.core.lifecycle.events; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.OnLifecycleEvent; /** * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event)} diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStart.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStart.java index 07b8460367c1..7994dfd182f9 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStart.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStart.java @@ -15,8 +15,8 @@ */ package com.android.settingslib.core.lifecycle.events; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.OnLifecycleEvent; /** * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event) } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStop.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStop.java index d6a5967116be..52a13978d956 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStop.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/OnStop.java @@ -15,8 +15,8 @@ */ package com.android.settingslib.core.lifecycle.events; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.OnLifecycleEvent; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.OnLifecycleEvent; /** * @deprecated use {@link OnLifecycleEvent(Lifecycle.Event) } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/SetPreferenceScreen.java b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/SetPreferenceScreen.java index cdd72fbc883f..87be3481eaa7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/SetPreferenceScreen.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/lifecycle/events/SetPreferenceScreen.java @@ -16,7 +16,7 @@ package com.android.settingslib.core.lifecycle.events; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceScreen; public interface SetPreferenceScreen { diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java index 974b2a4389e2..7e165d09ec64 100644 --- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java +++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java @@ -20,9 +20,6 @@ import android.content.Context; import android.content.res.XmlResourceParser; import android.icu.text.TimeZoneFormat; import android.icu.text.TimeZoneNames; -import android.support.annotation.VisibleForTesting; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -31,6 +28,10 @@ import android.text.style.TtsSpan; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; + import com.android.settingslib.R; import libcore.util.TimeZoneFinder; diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java index 2d3dfe4511e0..6076dd30f0bd 100644 --- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java @@ -22,14 +22,15 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v14.preference.SwitchPreference; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settingslib.core.ConfirmationDialogController; public abstract class AbstractEnableAdbPreferenceController extends diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java index f79be7eaddb1..5a823976cd0e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogdSizePreferenceController.java @@ -19,11 +19,12 @@ package com.android.settingslib.development; import android.content.Context; import android.content.Intent; import android.os.SystemProperties; -import android.support.annotation.VisibleForTesting; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.R; diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java index 77b2d86c445f..87226746668e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java @@ -22,13 +22,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.SystemProperties; -import android.support.annotation.VisibleForTesting; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.R; import com.android.settingslib.core.ConfirmationDialogController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java index d3dc8aa13482..f757aa4e4dab 100644 --- a/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/development/DeveloperOptionsPreferenceController.java @@ -17,8 +17,9 @@ package com.android.settingslib.development; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java b/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java index d21da4e1cd0e..7f1f185615a1 100644 --- a/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java +++ b/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java @@ -21,7 +21,8 @@ import android.content.Intent; import android.os.Build; import android.os.UserManager; import android.provider.Settings; -import android.support.v4.content.LocalBroadcastManager; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; public class DevelopmentSettingsEnabler { diff --git a/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java b/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java index 628d0d08b526..3f16be184c41 100644 --- a/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java +++ b/packages/SettingsLib/src/com/android/settingslib/development/SystemPropPoker.java @@ -21,10 +21,11 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class SystemPropPoker { private static final String TAG = "SystemPropPoker"; diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java index ba358f83c9d5..745591235dbb 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractBluetoothAddressPreferenceController.java @@ -19,11 +19,12 @@ package com.android.settingslib.deviceinfo; import android.annotation.SuppressLint; import android.bluetooth.BluetoothAdapter; import android.content.Context; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.R; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java index bb8404b0abd5..a5f403690dab 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractImsStatusPreferenceController.java @@ -21,13 +21,14 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; import android.os.PersistableBundle; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.R; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java index ded30226e2ae..24da72ea611a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java @@ -20,9 +20,10 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.LinkProperties; import android.net.wifi.WifiManager; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java index 90f14ef4c32c..d28792ef30de 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractSerialNumberPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settingslib.deviceinfo; import android.content.Context; import android.os.Build; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.core.AbstractPreferenceController; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java index ac61ade19222..4045b81cc07c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractUptimePreferenceController.java @@ -20,11 +20,12 @@ import android.content.Context; import android.os.Handler; import android.os.Message; import android.os.SystemClock; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.text.format.DateUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java index 2a86993124f6..c209f232b39e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractWifiMacAddressPreferenceController.java @@ -22,11 +22,12 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.R; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java b/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java index af8fd4c46a64..e0ca1ab0c07c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java @@ -16,11 +16,8 @@ package com.android.settingslib.display; -import com.android.settingslib.R; - import android.content.Context; import android.content.res.Resources; -import android.hardware.display.DisplayManager; import android.os.AsyncTask; import android.os.RemoteException; import android.os.UserHandle; @@ -31,6 +28,8 @@ import android.view.Display; import android.view.IWindowManager; import android.view.WindowManagerGlobal; +import com.android.settingslib.R; + import java.util.Arrays; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java index 07033304653c..a980e4f5bb22 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/CategoryManager.java @@ -17,12 +17,13 @@ package com.android.settingslib.drawer; import android.content.ComponentName; import android.content.Context; -import android.support.annotation.VisibleForTesting; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.InterestingConfigChanges; import java.util.ArrayList; @@ -32,8 +33,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import static java.lang.String.CASE_INSENSITIVE_ORDER; - public class CategoryManager { private static final String TAG = "CategoryManager"; diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java index 0f0e4e57886c..3549abc49340 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java @@ -34,7 +34,6 @@ import android.provider.Settings.Global; import android.text.TextUtils; import android.util.Log; import android.util.Pair; -import android.widget.RemoteViews; import java.util.ArrayList; import java.util.Collections; @@ -96,11 +95,7 @@ public class TileUtils { /** * The key used to get the category from metadata of activities of action * {@link #EXTRA_SETTINGS_ACTION} - * The value must be one of: - * <li>com.android.settings.category.wireless</li> - * <li>com.android.settings.category.device</li> - * <li>com.android.settings.category.personal</li> - * <li>com.android.settings.category.system</li> + * The value must be from {@link CategoryKey}. */ private static final String EXTRA_CATEGORY_KEY = "com.android.settings.category"; @@ -171,17 +166,6 @@ public class TileUtils { public static final String META_DATA_PREFERENCE_SUMMARY_URI = "com.android.settings.summary_uri"; - /** - * Name of the meta-data item that should be set in the AndroidManifest.xml to specify the - * custom view which should be displayed for the preference. The custom view will be inflated - * as a remote view. - * - * This also can be used with {@link #META_DATA_PREFERENCE_SUMMARY_URI}, by setting the id - * of the summary TextView to '@android:id/summary'. - */ - public static final String META_DATA_PREFERENCE_CUSTOM_VIEW = - "com.android.settings.custom_view"; - public static final String SETTING_PKG = "com.android.settings"; /** @@ -442,11 +426,6 @@ public class TileUtils { keyHint = metaData.getString(META_DATA_PREFERENCE_KEYHINT); } } - if (metaData.containsKey(META_DATA_PREFERENCE_CUSTOM_VIEW)) { - int layoutId = metaData.getInt(META_DATA_PREFERENCE_CUSTOM_VIEW); - tile.remoteViews = new RemoteViews(applicationInfo.packageName, layoutId); - updateSummaryAndTitle(context, providerMap, tile); - } } } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) { if (DEBUG) Log.d(LOG_TAG, "Couldn't find info", e); diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/UserAdapter.java b/packages/SettingsLib/src/com/android/settingslib/drawer/UserAdapter.java index 8a09df2849c9..a1f314d92b3a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/drawer/UserAdapter.java +++ b/packages/SettingsLib/src/com/android/settingslib/drawer/UserAdapter.java @@ -17,7 +17,6 @@ package com.android.settingslib.drawer; import android.app.ActivityManager; - import android.content.Context; import android.content.pm.UserInfo; import android.database.DataSetObserver; @@ -32,10 +31,10 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.SpinnerAdapter; import android.widget.TextView; -import com.android.internal.util.UserIcons; -import com.android.settingslib.drawable.UserIconDrawable; +import com.android.internal.util.UserIcons; import com.android.settingslib.R; +import com.android.settingslib.drawable.UserIconDrawable; import java.util.ArrayList; import java.util.List; diff --git a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java index 988060eac64d..5db5f526f10c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java +++ b/packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java @@ -36,12 +36,12 @@ import android.util.AttributeSet; import android.util.Log; import android.util.Xml; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java index 7234788b2e04..dc9e4586fe2c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java +++ b/packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java @@ -22,12 +22,13 @@ import android.content.pm.PackageManager; import android.os.IDeviceIdleController; import android.os.RemoteException; import android.os.ServiceManager; -import android.support.annotation.VisibleForTesting; import android.telecom.DefaultDialerManager; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.telephony.SmsApplication; import com.android.internal.util.ArrayUtils; diff --git a/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java b/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java index 3c5ac8dff0af..a7c7d52a8d7e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java +++ b/packages/SettingsLib/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawable.java @@ -19,18 +19,13 @@ package com.android.settingslib.graph; import android.annotation.NonNull; import android.content.Context; import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Matrix; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import android.graphics.Rect; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import android.support.annotation.VisibleForTesting; import android.view.Gravity; -import android.view.View; + +import androidx.annotation.VisibleForTesting; import com.android.settingslib.R; import com.android.settingslib.Utils; diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java index c9e3475eafd6..117b48ff852d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeEnablerManager.java @@ -19,16 +19,17 @@ package com.android.settingslib.inputmethod; import android.content.Context; import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.settingslib.R; import java.text.Collator; diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java index 55be13761a97..4691c4c10d8e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtil.java @@ -25,15 +25,16 @@ import android.content.res.Configuration; import android.icu.text.ListFormatter; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; import android.text.TextUtils; import android.util.Log; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + import com.android.internal.app.LocaleHelper; import com.android.internal.inputmethod.InputMethodUtils; diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java index 5e25f519a130..3d7bb507ae91 100644 --- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodPreference.java @@ -24,9 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.os.UserHandle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.text.TextUtils; import android.util.Log; import android.view.inputmethod.InputMethodInfo; @@ -34,6 +31,10 @@ import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.inputmethod.InputMethodUtils; import com.android.settingslib.R; diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java index f824ec75968b..f261d29fd0f3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/InputMethodSubtypePreference.java @@ -17,11 +17,12 @@ package com.android.settingslib.inputmethod; import android.content.Context; -import android.support.v7.preference.Preference; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; +import androidx.preference.Preference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.inputmethod.InputMethodUtils; diff --git a/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java b/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java index 798f8fe73b24..2360298822ba 100644 --- a/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/inputmethod/SwitchWithNoTextPreference.java @@ -17,7 +17,8 @@ package com.android.settingslib.inputmethod; import android.content.Context; -import android.support.v14.preference.SwitchPreference; + +import androidx.preference.SwitchPreference; public class SwitchWithNoTextPreference extends SwitchPreference { private static final String EMPTY_TEXT = ""; diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java index e3e27ce17c9a..42306f6d46d0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXml.java @@ -16,11 +16,12 @@ package com.android.settingslib.license; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.util.Xml; +import androidx.annotation.VisibleForTesting; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java index a9fb20ca9e17..2aaea657d29f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java +++ b/packages/SettingsLib/src/com/android/settingslib/license/LicenseHtmlLoader.java @@ -17,9 +17,10 @@ package com.android.settingslib.license; import android.content.Context; -import android.support.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.utils.AsyncLoader; import java.io.File; @@ -36,7 +37,9 @@ public class LicenseHtmlLoader extends AsyncLoader<File> { "/system/etc/NOTICE.xml.gz", "/vendor/etc/NOTICE.xml.gz", "/odm/etc/NOTICE.xml.gz", - "/oem/etc/NOTICE.xml.gz"}; + "/oem/etc/NOTICE.xml.gz", + "/product/etc/NOTICE.xml.gz", + "/product_services/etc/NOTICE.xml.gz"}; private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html"; private Context mContext; diff --git a/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java b/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java index 13364aba00fd..b8e1251dd79a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java +++ b/packages/SettingsLib/src/com/android/settingslib/location/RecentLocationApps.java @@ -25,10 +25,12 @@ import android.graphics.drawable.Drawable; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import android.support.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.IconDrawableFactory; import android.util.Log; + +import androidx.annotation.VisibleForTesting; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java b/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java index 224b9679a9a2..c14f5588cddf 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java @@ -28,9 +28,9 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; import android.net.TrafficStats; -import android.os.UserManager; -import android.os.UserHandle; import android.os.RemoteException; +import android.os.UserHandle; +import android.os.UserManager; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; diff --git a/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java b/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java index adf49aaf4e68..027860ca2a46 100644 --- a/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java +++ b/packages/SettingsLib/src/com/android/settingslib/notification/ZenDurationDialog.java @@ -24,7 +24,6 @@ import android.content.DialogInterface; import android.provider.Settings; import android.service.notification.Condition; import android.service.notification.ZenModeConfig; -import android.support.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.View; import android.widget.CompoundButton; @@ -35,6 +34,8 @@ import android.widget.RadioGroup; import android.widget.ScrollView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.policy.PhoneWindow; diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java index b0451b7ad2ea..ec774872ce67 100644 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java +++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionController.java @@ -24,10 +24,11 @@ import android.os.IBinder; import android.os.RemoteException; import android.service.settings.suggestions.ISuggestionService; import android.service.settings.suggestions.Suggestion; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; import android.util.Log; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; + import java.util.List; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java index 46fc32fa43cc..6597daa9acaf 100644 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java +++ b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionControllerMixin.java @@ -17,15 +17,16 @@ package com.android.settingslib.suggestions; import android.app.LoaderManager; -import android.arch.lifecycle.OnLifecycleEvent; import android.content.ComponentName; import android.content.Context; import android.content.Loader; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import android.support.annotation.Nullable; import android.util.Log; +import androidx.annotation.Nullable; +import androidx.lifecycle.OnLifecycleEvent; + import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.List; @@ -34,7 +35,7 @@ import java.util.List; * Manages IPC communication to SettingsIntelligence for suggestion related services. */ public class SuggestionControllerMixin implements SuggestionController.ServiceConnectionListener, - android.arch.lifecycle.LifecycleObserver, LoaderManager.LoaderCallbacks<List<Suggestion>> { + androidx.lifecycle.LifecycleObserver, LoaderManager.LoaderCallbacks<List<Suggestion>> { public interface SuggestionControllerHost { /** diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionList.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionList.java deleted file mode 100644 index a89092040e71..000000000000 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionList.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settingslib.suggestions; - -import android.content.Intent; -import android.util.ArrayMap; -import android.util.ArraySet; - -import com.android.settingslib.drawer.Tile; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class SuggestionList { - // Category -> list of suggestion map - private final Map<SuggestionCategory, List<Tile>> mSuggestions; - - // A flatten list of all suggestions. - private List<Tile> mSuggestionList; - - public SuggestionList() { - mSuggestions = new ArrayMap<>(); - } - - public void addSuggestions(SuggestionCategory category, List<Tile> suggestions) { - mSuggestions.put(category, suggestions); - } - - public List<Tile> getSuggestions() { - if (mSuggestionList != null) { - return mSuggestionList; - } - mSuggestionList = new ArrayList<>(); - for (List<Tile> suggestions : mSuggestions.values()) { - mSuggestionList.addAll(suggestions); - } - dedupeSuggestions(mSuggestionList); - return mSuggestionList; - } - - public boolean isExclusiveSuggestionCategory() { - if (mSuggestions.size() != 1) { - // If there is no category, or more than 1 category, it's not exclusive by definition. - return false; - } - for (SuggestionCategory category : mSuggestions.keySet()) { - if (category.exclusive) { - return true; - } - } - return false; - } - - /** - * Filter suggestions list so they are all unique. - */ - private void dedupeSuggestions(List<Tile> suggestions) { - final Set<String> intents = new ArraySet<>(); - for (int i = suggestions.size() - 1; i >= 0; i--) { - final Tile suggestion = suggestions.get(i); - final String intentUri = suggestion.intent.toUri(Intent.URI_INTENT_SCHEME); - if (intents.contains(intentUri)) { - suggestions.remove(i); - } else { - intents.add(intentUri); - } - } - } -} diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java b/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java deleted file mode 100644 index 9c347631d817..000000000000 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionParser.java +++ /dev/null @@ -1,498 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settingslib.suggestions; - -import android.Manifest; -import android.accounts.Account; -import android.accounts.AccountManager; -import android.annotation.RequiresPermission; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.PackageManager; -import android.content.pm.UserInfo; -import android.content.res.Resources; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; -import android.os.UserHandle; -import android.os.UserManager; -import android.provider.Settings; -import android.support.annotation.VisibleForTesting; -import android.text.TextUtils; -import android.text.format.DateUtils; -import android.util.ArrayMap; -import android.util.AttributeSet; -import android.util.Log; -import android.util.Pair; -import android.util.Xml; -import android.view.InflateException; - -import com.android.settingslib.drawer.Tile; -import com.android.settingslib.drawer.TileUtils; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public class SuggestionParser { - - private static final String TAG = "SuggestionParser"; - - // If defined, only returns this suggestion if the feature is supported. - public static final String META_DATA_REQUIRE_FEATURE = "com.android.settings.require_feature"; - - // If defined, only display this optional step if an account of that type exists. - private static final String META_DATA_REQUIRE_ACCOUNT = "com.android.settings.require_account"; - - // If defined and not true, do not should optional step. - private static final String META_DATA_IS_SUPPORTED = "com.android.settings.is_supported"; - - // If defined, only display this optional step if the current user is of that type. - private static final String META_DATA_REQUIRE_USER_TYPE = - "com.android.settings.require_user_type"; - - // If defined, only display this optional step if a connection is available. - private static final String META_DATA_IS_CONNECTION_REQUIRED = - "com.android.settings.require_connection"; - - // The valid values that setup wizard recognizes for differentiating user types. - private static final String META_DATA_PRIMARY_USER_TYPE_VALUE = "primary"; - private static final String META_DATA_ADMIN_USER_TYPE_VALUE = "admin"; - private static final String META_DATA_GUEST_USER_TYPE_VALUE = "guest"; - private static final String META_DATA_RESTRICTED_USER_TYPE_VALUE = "restricted"; - - /** - * Allows suggestions to appear after a certain number of days, and to re-appear if dismissed. - * For instance: - * 0,10 - * Will appear immediately, but if the user removes it, it will come back after 10 days. - * - * Another example: - * 10,30 - * Will only show up after 10 days, and then again after 30. - */ - public static final String META_DATA_DISMISS_CONTROL = "com.android.settings.dismiss"; - - // Shared prefs keys for storing dismissed state. - // Index into current dismissed state. - public static final String SETUP_TIME = "_setup_time"; - private static final String IS_DISMISSED = "_is_dismissed"; - - // Default dismiss control for smart suggestions. - private static final String DEFAULT_SMART_DISMISS_CONTROL = "0"; - - private final Context mContext; - private final List<SuggestionCategory> mSuggestionList; - private final ArrayMap<Pair<String, String>, Tile> mAddCache = new ArrayMap<>(); - private final SharedPreferences mSharedPrefs; - private final String mDefaultDismissControl; - - public SuggestionParser(Context context, SharedPreferences sharedPrefs, int orderXml, - String defaultDismissControl) { - this( - context, - sharedPrefs, - (List<SuggestionCategory>) new SuggestionOrderInflater(context).parse(orderXml), - defaultDismissControl); - } - - public SuggestionParser(Context context, SharedPreferences sharedPrefs, int orderXml) { - this(context, sharedPrefs, orderXml, DEFAULT_SMART_DISMISS_CONTROL); - } - - @VisibleForTesting - public SuggestionParser( - Context context, - SharedPreferences sharedPrefs, - List<SuggestionCategory> suggestionList, - String defaultDismissControl) { - mContext = context; - mSuggestionList = suggestionList; - mSharedPrefs = sharedPrefs; - mDefaultDismissControl = defaultDismissControl; - } - - public SuggestionList getSuggestions(boolean isSmartSuggestionEnabled) { - final SuggestionList suggestionList = new SuggestionList(); - final int N = mSuggestionList.size(); - for (int i = 0; i < N; i++) { - final SuggestionCategory category = mSuggestionList.get(i); - if (category.exclusive && !isExclusiveCategoryExpired(category)) { - // If suggestions from an exclusive category are present, parsing is stopped - // and only suggestions from that category are displayed. Note that subsequent - // exclusive categories are also ignored. - final List<Tile> exclusiveSuggestions = new ArrayList<>(); - - // Read suggestion and force isSmartSuggestion to be false so the rule defined - // from each suggestion itself is used. - readSuggestions(category, exclusiveSuggestions, false /* isSmartSuggestion */); - if (!exclusiveSuggestions.isEmpty()) { - final SuggestionList exclusiveList = new SuggestionList(); - exclusiveList.addSuggestions(category, exclusiveSuggestions); - return exclusiveList; - } - } else { - // Either the category is not exclusive, or the exclusiveness expired so we should - // treat it as a normal category. - final List<Tile> suggestions = new ArrayList<>(); - readSuggestions(category, suggestions, isSmartSuggestionEnabled); - suggestionList.addSuggestions(category, suggestions); - } - } - return suggestionList; - } - - /** - * Dismisses a suggestion, returns true if the suggestion has no more dismisses left and should - * be disabled. - */ - public boolean dismissSuggestion(Tile suggestion) { - final String keyBase = suggestion.intent.getComponent().flattenToShortString(); - mSharedPrefs.edit() - .putBoolean(keyBase + IS_DISMISSED, true) - .commit(); - return true; - } - - @VisibleForTesting - public void filterSuggestions( - List<Tile> suggestions, int countBefore, boolean isSmartSuggestionEnabled) { - for (int i = countBefore; i < suggestions.size(); i++) { - if (!isAvailable(suggestions.get(i)) || - !isSupported(suggestions.get(i)) || - !satisifesRequiredUserType(suggestions.get(i)) || - !satisfiesRequiredAccount(suggestions.get(i)) || - !satisfiesConnectivity(suggestions.get(i)) || - isDismissed(suggestions.get(i), isSmartSuggestionEnabled)) { - suggestions.remove(i--); - } - } - } - - @VisibleForTesting - void readSuggestions( - SuggestionCategory category, List<Tile> suggestions, boolean isSmartSuggestionEnabled) { - int countBefore = suggestions.size(); - Intent intent = new Intent(Intent.ACTION_MAIN); - intent.addCategory(category.category); - if (category.pkg != null) { - intent.setPackage(category.pkg); - } - TileUtils.getTilesForIntent(mContext, new UserHandle(UserHandle.myUserId()), intent, - mAddCache, null, suggestions, true, false, false, true /* shouldUpdateTiles */); - filterSuggestions(suggestions, countBefore, isSmartSuggestionEnabled); - if (!category.multiple && suggestions.size() > (countBefore + 1)) { - // If there are too many, remove them all and only re-add the one with the highest - // priority. - Tile item = suggestions.remove(suggestions.size() - 1); - while (suggestions.size() > countBefore) { - Tile last = suggestions.remove(suggestions.size() - 1); - if (last.priority > item.priority) { - item = last; - } - } - // If category is marked as done, do not add any item. - if (!isCategoryDone(category.category)) { - suggestions.add(item); - } - } - } - - private boolean isAvailable(Tile suggestion) { - final String featuresRequired = suggestion.metaData.getString(META_DATA_REQUIRE_FEATURE); - if (featuresRequired != null) { - for (String feature : featuresRequired.split(",")) { - if (TextUtils.isEmpty(feature)) { - Log.w(TAG, "Found empty substring when parsing required features: " - + featuresRequired); - } else if (!mContext.getPackageManager().hasSystemFeature(feature)) { - Log.i(TAG, suggestion.title + " requires unavailable feature " + feature); - return false; - } - } - } - return true; - } - - @RequiresPermission(Manifest.permission.MANAGE_USERS) - private boolean satisifesRequiredUserType(Tile suggestion) { - final String requiredUser = suggestion.metaData.getString(META_DATA_REQUIRE_USER_TYPE); - if (requiredUser != null) { - final UserManager userManager = mContext.getSystemService(UserManager.class); - UserInfo userInfo = userManager.getUserInfo(UserHandle.myUserId()); - for (String userType : requiredUser.split("\\|")) { - final boolean primaryUserCondtionMet = userInfo.isPrimary() - && META_DATA_PRIMARY_USER_TYPE_VALUE.equals(userType); - final boolean adminUserConditionMet = userInfo.isAdmin() - && META_DATA_ADMIN_USER_TYPE_VALUE.equals(userType); - final boolean guestUserCondtionMet = userInfo.isGuest() - && META_DATA_GUEST_USER_TYPE_VALUE.equals(userType); - final boolean restrictedUserCondtionMet = userInfo.isRestricted() - && META_DATA_RESTRICTED_USER_TYPE_VALUE.equals(userType); - if (primaryUserCondtionMet || adminUserConditionMet || guestUserCondtionMet - || restrictedUserCondtionMet) { - return true; - } - } - Log.i(TAG, suggestion.title + " requires user type " + requiredUser); - return false; - } - return true; - } - - public boolean satisfiesRequiredAccount(Tile suggestion) { - final String requiredAccountType = suggestion.metaData.getString(META_DATA_REQUIRE_ACCOUNT); - if (requiredAccountType == null) { - return true; - } - AccountManager accountManager = mContext.getSystemService(AccountManager.class); - Account[] accounts = accountManager.getAccountsByType(requiredAccountType); - boolean satisfiesRequiredAccount = accounts.length > 0; - if (!satisfiesRequiredAccount) { - Log.i(TAG, suggestion.title + " requires unavailable account type " - + requiredAccountType); - } - return satisfiesRequiredAccount; - } - - public boolean isSupported(Tile suggestion) { - final int isSupportedResource = suggestion.metaData.getInt(META_DATA_IS_SUPPORTED); - try { - if (suggestion.intent == null) { - return false; - } - final Resources res = mContext.getPackageManager().getResourcesForActivity( - suggestion.intent.getComponent()); - boolean isSupported = - isSupportedResource != 0 ? res.getBoolean(isSupportedResource) : true; - if (!isSupported) { - Log.i(TAG, suggestion.title + " requires unsupported resource " - + isSupportedResource); - } - return isSupported; - } catch (PackageManager.NameNotFoundException e) { - Log.w(TAG, "Cannot find resources for " + suggestion.intent.getComponent()); - return false; - } catch (Resources.NotFoundException e) { - Log.w(TAG, "Cannot find resources for " + suggestion.intent.getComponent(), e); - return false; - } - } - - private boolean satisfiesConnectivity(Tile suggestion) { - final boolean isConnectionRequired = - suggestion.metaData.getBoolean(META_DATA_IS_CONNECTION_REQUIRED); - if (!isConnectionRequired) { - return true; - } - ConnectivityManager cm = - (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo netInfo = cm.getActiveNetworkInfo(); - boolean satisfiesConnectivity = netInfo != null && netInfo.isConnectedOrConnecting(); - if (!satisfiesConnectivity) { - Log.i(TAG, suggestion.title + " is missing required connection."); - } - return satisfiesConnectivity; - } - - public boolean isCategoryDone(String category) { - String name = Settings.Secure.COMPLETED_CATEGORY_PREFIX + category; - return Settings.Secure.getInt(mContext.getContentResolver(), name, 0) != 0; - } - - public void markCategoryDone(String category) { - String name = Settings.Secure.COMPLETED_CATEGORY_PREFIX + category; - Settings.Secure.putInt(mContext.getContentResolver(), name, 1); - } - - /** - * Whether or not the category's exclusiveness has expired. - */ - private boolean isExclusiveCategoryExpired(SuggestionCategory category) { - final String keySetupTime = category.category + SETUP_TIME; - final long currentTime = System.currentTimeMillis(); - if (!mSharedPrefs.contains(keySetupTime)) { - mSharedPrefs.edit() - .putLong(keySetupTime, currentTime) - .commit(); - } - if (category.exclusiveExpireDaysInMillis < 0) { - // negative means never expires - return false; - } - final long setupTime = mSharedPrefs.getLong(keySetupTime, 0); - final long elapsedTime = currentTime - setupTime; - Log.d(TAG, "Day " + elapsedTime / DateUtils.DAY_IN_MILLIS + " for " + category.category); - return elapsedTime > category.exclusiveExpireDaysInMillis; - } - - @VisibleForTesting - boolean isDismissed(Tile suggestion, boolean isSmartSuggestionEnabled) { - String dismissControl = getDismissControl(suggestion, isSmartSuggestionEnabled); - String keyBase = suggestion.intent.getComponent().flattenToShortString(); - if (!mSharedPrefs.contains(keyBase + SETUP_TIME)) { - mSharedPrefs.edit() - .putLong(keyBase + SETUP_TIME, System.currentTimeMillis()) - .commit(); - } - // Check if it's already manually dismissed - final boolean isDismissed = mSharedPrefs.getBoolean(keyBase + IS_DISMISSED, false); - if (isDismissed) { - return true; - } - if (dismissControl == null) { - return false; - } - // Parse when suggestion should first appear. return true to artificially hide suggestion - // before then. - int firstAppearDay = parseDismissString(dismissControl); - long firstAppearDayInMs = getEndTime(mSharedPrefs.getLong(keyBase + SETUP_TIME, 0), - firstAppearDay); - if (System.currentTimeMillis() >= firstAppearDayInMs) { - // Dismiss timeout has passed, undismiss it. - mSharedPrefs.edit() - .putBoolean(keyBase + IS_DISMISSED, false) - .commit(); - return false; - } - return true; - } - - private long getEndTime(long startTime, int daysDelay) { - long days = daysDelay * DateUtils.DAY_IN_MILLIS; - return startTime + days; - } - - /** - * Parse the first int from a string formatted as "0,1,2..." - * The value means suggestion should first appear on Day X. - */ - private int parseDismissString(String dismissControl) { - final String[] dismissStrs = dismissControl.split(","); - return Integer.parseInt(dismissStrs[0]); - } - - private String getDismissControl(Tile suggestion, boolean isSmartSuggestionEnabled) { - if (isSmartSuggestionEnabled) { - return mDefaultDismissControl; - } else { - return suggestion.metaData.getString(META_DATA_DISMISS_CONTROL); - } - } - - private static class SuggestionOrderInflater { - private static final String TAG_LIST = "optional-steps"; - private static final String TAG_ITEM = "step"; - - private static final String ATTR_CATEGORY = "category"; - private static final String ATTR_PACKAGE = "package"; - private static final String ATTR_MULTIPLE = "multiple"; - private static final String ATTR_EXCLUSIVE = "exclusive"; - private static final String ATTR_EXCLUSIVE_EXPIRE_DAYS = "exclusiveExpireDays"; - - private final Context mContext; - - public SuggestionOrderInflater(Context context) { - mContext = context; - } - - public Object parse(int resource) { - XmlPullParser parser = mContext.getResources().getXml(resource); - final AttributeSet attrs = Xml.asAttributeSet(parser); - try { - // Look for the root node. - int type; - do { - type = parser.next(); - } while (type != XmlPullParser.START_TAG && type != XmlPullParser.END_DOCUMENT); - - if (type != XmlPullParser.START_TAG) { - throw new InflateException(parser.getPositionDescription() - + ": No start tag found!"); - } - - // Temp is the root that was found in the xml - Object xmlRoot = onCreateItem(parser.getName(), attrs); - - // Inflate all children under temp - rParse(parser, xmlRoot, attrs); - return xmlRoot; - } catch (XmlPullParserException | IOException e) { - Log.w(TAG, "Problem parser resource " + resource, e); - return null; - } - } - - /** - * Recursive method used to descend down the xml hierarchy and instantiate - * items, instantiate their children. - */ - private void rParse(XmlPullParser parser, Object parent, final AttributeSet attrs) - throws XmlPullParserException, IOException { - final int depth = parser.getDepth(); - - int type; - while (((type = parser.next()) != XmlPullParser.END_TAG || - parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) { - if (type != XmlPullParser.START_TAG) { - continue; - } - - final String name = parser.getName(); - - Object item = onCreateItem(name, attrs); - onAddChildItem(parent, item); - rParse(parser, item, attrs); - } - } - - protected void onAddChildItem(Object parent, Object child) { - if (parent instanceof List<?> && child instanceof SuggestionCategory) { - ((List<SuggestionCategory>) parent).add((SuggestionCategory) child); - } else { - throw new IllegalArgumentException("Parent was not a list"); - } - } - - protected Object onCreateItem(String name, AttributeSet attrs) { - if (name.equals(TAG_LIST)) { - return new ArrayList<SuggestionCategory>(); - } else if (name.equals(TAG_ITEM)) { - SuggestionCategory category = new SuggestionCategory(); - category.category = attrs.getAttributeValue(null, ATTR_CATEGORY); - category.pkg = attrs.getAttributeValue(null, ATTR_PACKAGE); - String multiple = attrs.getAttributeValue(null, ATTR_MULTIPLE); - category.multiple = !TextUtils.isEmpty(multiple) && Boolean.parseBoolean(multiple); - String exclusive = attrs.getAttributeValue(null, ATTR_EXCLUSIVE); - category.exclusive = - !TextUtils.isEmpty(exclusive) && Boolean.parseBoolean(exclusive); - String expireDaysAttr = attrs.getAttributeValue(null, - ATTR_EXCLUSIVE_EXPIRE_DAYS); - long expireDays = !TextUtils.isEmpty(expireDaysAttr) - ? Integer.parseInt(expireDaysAttr) - : -1; - category.exclusiveExpireDaysInMillis = DateUtils.DAY_IN_MILLIS * expireDays; - return category; - } else { - throw new IllegalArgumentException("Unknown item " + name); - } - } - } -} - diff --git a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java index 0fc9a4d6e408..9451b3620418 100644 --- a/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java +++ b/packages/SettingsLib/src/com/android/settingslib/users/AppRestrictionsHelper.java @@ -31,12 +31,13 @@ import android.graphics.drawable.Drawable; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.annotation.VisibleForTesting; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java b/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java index 3d55c4fee358..c8c8ac22089a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/IconCache.java @@ -19,8 +19,9 @@ package com.android.settingslib.utils; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; -import android.support.annotation.VisibleForTesting; -import android.support.v4.util.ArrayMap; + +import androidx.annotation.VisibleForTesting; +import androidx.collection.ArrayMap; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java index a53ff3904346..fa59688d1523 100644 --- a/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java +++ b/packages/SettingsLib/src/com/android/settingslib/utils/PowerUtil.java @@ -22,9 +22,10 @@ import android.icu.text.MeasureFormat; import android.icu.text.MeasureFormat.FormatWidth; import android.icu.util.Measure; import android.icu.util.MeasureUnit; -import android.support.annotation.Nullable; import android.text.TextUtils; +import androidx.annotation.Nullable; + import com.android.settingslib.R; import java.time.Instant; diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java index e6935516f401..f02044dc52e0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreference.java @@ -17,13 +17,14 @@ package com.android.settingslib.widget; import android.content.Context; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; import android.util.AttributeSet; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.R; /** diff --git a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java index 2edcd9e2c066..2987c1597193 100644 --- a/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java +++ b/packages/SettingsLib/src/com/android/settingslib/widget/FooterPreferenceMixin.java @@ -17,8 +17,9 @@ package com.android.settingslib.widget; import android.content.Context; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 50dfc26d6a2b..d62605dd3362 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -48,7 +48,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; -import android.support.annotation.NonNull; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -56,6 +55,8 @@ import android.text.style.TtsSpan; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.NonNull; + import com.android.internal.annotations.VisibleForTesting; import com.android.settingslib.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java index 26f3683f92b4..468b6753c311 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java @@ -25,9 +25,6 @@ import android.graphics.drawable.StateListDrawable; import android.net.wifi.WifiConfiguration; import android.os.Looper; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.util.SparseArray; @@ -35,9 +32,12 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.R; import com.android.settingslib.TronUtils; -import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.Utils; import com.android.settingslib.wifi.AccessPoint.Speed; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java index 2993a0de0658..afea5d2078b0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/TestAccessPointBuilder.java @@ -24,7 +24,8 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.Keep; + +import androidx.annotation.Keep; import com.android.settingslib.wifi.AccessPoint.Speed; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index d8f0886730d8..9050b4b0a15b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -41,15 +41,16 @@ import android.os.Message; import android.os.Process; import android.os.SystemClock; import android.provider.Settings; -import android.support.annotation.GuardedBy; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; import android.widget.Toast; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.R; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java index 8b5863aee91f..93e4fce6e74b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTrackerFactory.java @@ -16,8 +16,9 @@ package com.android.settingslib.wifi; import android.content.Context; -import android.support.annotation.Keep; -import android.support.annotation.NonNull; + +import androidx.annotation.Keep; +import androidx.annotation.NonNull; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java index bee2fa135957..4e6c005457c0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java @@ -21,7 +21,8 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.os.SystemClock; -import android.support.annotation.VisibleForTesting; + +import androidx.annotation.VisibleForTesting; import com.android.settingslib.R; diff --git a/packages/SettingsLib/src/com/android/settingslib/wrapper/BluetoothA2dpWrapper.java b/packages/SettingsLib/src/com/android/settingslib/wrapper/BluetoothA2dpWrapper.java deleted file mode 100644 index 17e34016a53b..000000000000 --- a/packages/SettingsLib/src/com/android/settingslib/wrapper/BluetoothA2dpWrapper.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settingslib.wrapper; - -import android.bluetooth.BluetoothA2dp; -import android.bluetooth.BluetoothCodecStatus; -import android.bluetooth.BluetoothDevice; - -/** - * This class replicates some methods of android.bluetooth.BluetoothA2dp that are new and not - * yet available in our current version of Robolectric. It provides a thin wrapper to call the real - * methods in production and a mock in tests. - */ -public class BluetoothA2dpWrapper { - - private BluetoothA2dp mService; - - public BluetoothA2dpWrapper(BluetoothA2dp service) { - mService = service; - } - - /** - * @return the real {@code BluetoothA2dp} object - */ - public BluetoothA2dp getService() { - return mService; - } - - /** - * Wraps {@code BluetoothA2dp.getCodecStatus} - */ - public BluetoothCodecStatus getCodecStatus(BluetoothDevice device) { - return mService.getCodecStatus(device); - } - - /** - * Wraps {@code BluetoothA2dp.supportsOptionalCodecs} - */ - public int supportsOptionalCodecs(BluetoothDevice device) { - return mService.supportsOptionalCodecs(device); - } - - /** - * Wraps {@code BluetoothA2dp.getOptionalCodecsEnabled} - */ - public int getOptionalCodecsEnabled(BluetoothDevice device) { - return mService.getOptionalCodecsEnabled(device); - } - - /** - * Wraps {@code BluetoothA2dp.setOptionalCodecsEnabled} - */ - public void setOptionalCodecsEnabled(BluetoothDevice device, int value) { - mService.setOptionalCodecsEnabled(device, value); - } -} diff --git a/packages/SettingsLib/src/com/android/settingslib/wrapper/LocationManagerWrapper.java b/packages/SettingsLib/src/com/android/settingslib/wrapper/LocationManagerWrapper.java deleted file mode 100644 index 1a268a608e5d..000000000000 --- a/packages/SettingsLib/src/com/android/settingslib/wrapper/LocationManagerWrapper.java +++ /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. - */ - -package com.android.settingslib.wrapper; - -import android.location.LocationManager; -import android.os.UserHandle; - -/** - * This class replicates some methods of android.location.LocationManager that are new and not - * yet available in our current version of Robolectric. It provides a thin wrapper to call the real - * methods in production and a mock in tests. - */ -public class LocationManagerWrapper { - - private LocationManager mLocationManager; - - public LocationManagerWrapper(LocationManager locationManager) { - mLocationManager = locationManager; - } - - /** Returns the real {@code LocationManager} object */ - public LocationManager getLocationManager() { - return mLocationManager; - } - - /** Wraps {@code LocationManager.isProviderEnabled} method */ - public boolean isProviderEnabled(String provider) { - return mLocationManager.isProviderEnabled(provider); - } - - /** Wraps {@code LocationManager.setProviderEnabledForUser} method */ - public void setProviderEnabledForUser(String provider, boolean enabled, UserHandle userHandle) { - mLocationManager.setProviderEnabledForUser(provider, enabled, userHandle); - } - - /** Wraps {@code LocationManager.isLocationEnabled} method */ - public boolean isLocationEnabled() { - return mLocationManager.isLocationEnabled(); - } - - /** Wraps {@code LocationManager.isLocationEnabledForUser} method */ - public boolean isLocationEnabledForUser(UserHandle userHandle) { - return mLocationManager.isLocationEnabledForUser(userHandle); - } - - /** Wraps {@code LocationManager.setLocationEnabledForUser} method */ - public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { - mLocationManager.setLocationEnabledForUser(enabled, userHandle); - } -} diff --git a/packages/SettingsLib/tests/robotests/res/xml/suggestion_ordering.xml b/packages/SettingsLib/tests/robotests/res/xml/suggestion_ordering.xml deleted file mode 100644 index f02ac15fbd19..000000000000 --- a/packages/SettingsLib/tests/robotests/res/xml/suggestion_ordering.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<optional-steps> - <step category="com.android.settings.suggested.category.DEFERRED_SETUP" - exclusive="true" /> - <step category="com.android.settings.suggested.category.LOCK_SCREEN" /> - <step category="com.android.settings.suggested.category.TRUST_AGENT" /> - <step category="com.android.settings.suggested.category.EMAIL" /> - <step category="com.android.settings.suggested.category.PARTNER_ACCOUNT" - multiple="true" /> - <step category="com.android.settings.suggested.category.GESTURE" /> - <step category="com.android.settings.suggested.category.HOTWORD" /> - <step category="com.android.settings.suggested.category.DEFAULT" - multiple="true" /> - <step category="com.android.settings.suggested.category.SETTINGS_ONLY" - multiple="true" /> -</optional-steps> diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java index e153c3ed1edf..12aee6f813fb 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settingslib; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java index 710dbc221f07..bf49ef3615ba 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java @@ -20,8 +20,11 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_NO import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; + import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java index a8821ba60785..79d682d67a4a 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java @@ -24,11 +24,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; import android.view.View; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java index 0109f48e0c5d..69193b77565e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java @@ -17,6 +17,7 @@ package com.android.settingslib; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java index 480143a79410..c0b69f2260eb 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java @@ -19,16 +19,19 @@ package com.android.settingslib; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_DEFAULT; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_SMALL; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java index a79f841e70c6..967d4520303c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java @@ -20,6 +20,7 @@ import static android.Manifest.permission.WRITE_SECURE_SETTINGS; import static com.android.settingslib.Utils.STORAGE_MANAGER_SHOW_OPT_IN_PROPERTY; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -41,8 +42,6 @@ import android.provider.Settings; import android.provider.Settings.Secure; import android.text.TextUtils; -import com.android.settingslib.wrapper.LocationManagerWrapper; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,7 +62,7 @@ import java.util.Map; @RunWith(SettingsLibRobolectricTestRunner.class) @Config(shadows = { UtilsTest.ShadowSecure.class, - UtilsTest.ShadowLocationManagerWrapper.class}) + UtilsTest.ShadowLocationManager.class}) public class UtilsTest { private static final double[] TEST_PERCENTAGES = {0, 0.4, 0.5, 0.6, 49, 49.3, 49.8, 50, 100}; private static final String PERCENTAGE_0 = "0%"; @@ -192,8 +191,8 @@ public class UtilsTest { } } - @Implements(value = LocationManagerWrapper.class) - public static class ShadowLocationManagerWrapper { + @Implements(value = LocationManager.class) + public static class ShadowLocationManager { @Implementation public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java index 2dbabe0b76cc..19ce424257ac 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ApplicationsStateRoboTest.java @@ -25,7 +25,6 @@ import static org.robolectric.shadow.api.Shadow.extract; import android.annotation.UserIdInt; import android.app.ApplicationPackageManager; -import android.app.usage.IStorageStatsManager; import android.app.usage.StorageStats; import android.app.usage.StorageStatsManager; import android.content.ComponentName; @@ -42,10 +41,10 @@ import android.os.Handler; import android.os.UserHandle; import android.util.IconDrawableFactory; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.Callbacks; import com.android.settingslib.applications.ApplicationsState.Session; -import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.testutils.shadow.ShadowUserManager; import org.junit.Before; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java index 6a161d0a645c..815cb3a2f828 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/DefaultAppInfoTest.java @@ -41,7 +41,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsLibRobolectricTestRunner.class) public class DefaultAppInfoTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java index 060b716bb435..d8c459c07b75 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/applications/ServiceListingTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java index 334ea16d608e..afd738ea307d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java @@ -16,6 +16,7 @@ package com.android.settingslib.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; @@ -31,7 +32,6 @@ import android.content.Context; import android.content.res.Resources; import com.android.settingslib.R; -import com.android.settingslib.wrapper.BluetoothA2dpWrapper; import org.junit.Before; import org.junit.Test; @@ -49,7 +49,6 @@ public class A2dpProfileTest { @Mock LocalBluetoothProfileManager mProfileManager; @Mock BluetoothDevice mDevice; @Mock BluetoothA2dp mBluetoothA2dp; - @Mock BluetoothA2dpWrapper mBluetoothA2dpWrapper; BluetoothProfile.ServiceListener mServiceListener; A2dpProfile mProfile; @@ -68,31 +67,30 @@ public class A2dpProfileTest { mProfile = new A2dpProfile(mContext, mAdapter, mDeviceManager, mProfileManager); mServiceListener.onServiceConnected(BluetoothProfile.A2DP, mBluetoothA2dp); - mProfile.setBluetoothA2dpWrapper(mBluetoothA2dpWrapper); } @Test public void supportsHighQualityAudio() { - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED); assertThat(mProfile.supportsHighQualityAudio(mDevice)).isTrue(); - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED); assertThat(mProfile.supportsHighQualityAudio(mDevice)).isFalse(); - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_SUPPORT_UNKNOWN); assertThat(mProfile.supportsHighQualityAudio(mDevice)).isFalse(); } @Test public void isHighQualityAudioEnabled() { - when(mBluetoothA2dpWrapper.getOptionalCodecsEnabled(any())).thenReturn( + when(mBluetoothA2dp.getOptionalCodecsEnabled(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED); assertThat(mProfile.isHighQualityAudioEnabled(mDevice)).isTrue(); - when(mBluetoothA2dpWrapper.getOptionalCodecsEnabled(any())).thenReturn( + when(mBluetoothA2dp.getOptionalCodecsEnabled(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED); assertThat(mProfile.isHighQualityAudioEnabled(mDevice)).isFalse(); @@ -100,23 +98,23 @@ public class A2dpProfileTest { // then isHighQualityAudioEnabled() should return true or false based on whether optional // codecs are supported. If the device is connected then we should ask it directly, but if // the device isn't connected then rely on the stored pref about such support. - when(mBluetoothA2dpWrapper.getOptionalCodecsEnabled(any())).thenReturn( + when(mBluetoothA2dp.getOptionalCodecsEnabled(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN); when(mBluetoothA2dp.getConnectionState(any())).thenReturn( BluetoothProfile.STATE_DISCONNECTED); - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED); assertThat(mProfile.isHighQualityAudioEnabled(mDevice)).isFalse(); - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED); assertThat(mProfile.isHighQualityAudioEnabled(mDevice)).isTrue(); when(mBluetoothA2dp.getConnectionState(any())).thenReturn( BluetoothProfile.STATE_CONNECTED); BluetoothCodecStatus status = mock(BluetoothCodecStatus.class); - when(mBluetoothA2dpWrapper.getCodecStatus(mDevice)).thenReturn(status); + when(mBluetoothA2dp.getCodecStatus(mDevice)).thenReturn(status); BluetoothCodecConfig config = mock(BluetoothCodecConfig.class); when(status.getCodecConfig()).thenReturn(config); when(config.isMandatoryCodec()).thenReturn(false); @@ -151,14 +149,14 @@ public class A2dpProfileTest { // Most tests want to simulate optional codecs being supported by the device, so do that // by default here. - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED); } @Test public void getLableCodecsNotSupported() { setupLabelTest(); - when(mBluetoothA2dpWrapper.supportsOptionalCodecs(any())).thenReturn( + when(mBluetoothA2dp.supportsOptionalCodecs(any())).thenReturn( BluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED); assertThat(mProfile.getHighQualityAudioOptionLabel(mDevice)).isEqualTo(UNKNOWN_CODEC_LABEL); } @@ -179,7 +177,7 @@ public class A2dpProfileTest { BluetoothCodecStatus status = mock(BluetoothCodecStatus.class); BluetoothCodecConfig config = mock(BluetoothCodecConfig.class); BluetoothCodecConfig[] configs = {config}; - when(mBluetoothA2dpWrapper.getCodecStatus(mDevice)).thenReturn(status); + when(mBluetoothA2dp.getCodecStatus(mDevice)).thenReturn(status); when(status.getCodecsSelectableCapabilities()).thenReturn(configs); when(config.isMandatoryCodec()).thenReturn(true); @@ -194,7 +192,7 @@ public class A2dpProfileTest { BluetoothCodecStatus status = mock(BluetoothCodecStatus.class); BluetoothCodecConfig config = mock(BluetoothCodecConfig.class); BluetoothCodecConfig[] configs = {config}; - when(mBluetoothA2dpWrapper.getCodecStatus(mDevice)).thenReturn(status); + when(mBluetoothA2dp.getCodecStatus(mDevice)).thenReturn(status); when(status.getCodecsSelectableCapabilities()).thenReturn(configs); when(config.isMandatoryCodec()).thenReturn(false); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java index 108069022567..26230bd1e891 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java @@ -15,15 +15,12 @@ */ package com.android.settingslib.bluetooth; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothHeadset; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.Intent; - import android.telephony.TelephonyManager; import org.junit.Before; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java index 16ed85cf5afa..6d6a13284a80 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java @@ -17,12 +17,8 @@ package com.android.settingslib.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; @@ -31,8 +27,6 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import com.android.settingslib.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,7 +34,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.util.Collection; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java index d342bc878477..ca997bf8d27f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,9 +36,6 @@ import android.content.Context; import android.content.Intent; import android.os.ParcelUuid; -import java.util.ArrayList; -import java.util.List; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,6 +45,9 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; +import java.util.List; + @RunWith(RobolectricTestRunner.class) @Config(resourceDir = "../../res") public class LocalBluetoothProfileManagerTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java index 393fd029e6da..28de1914838f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java @@ -16,11 +16,13 @@ package com.android.settingslib.core; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import org.junit.Before; import org.junit.Test; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java index 5c19e61d44dc..f4fd77930506 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/MetricsFeatureProviderTest.java @@ -16,6 +16,7 @@ package com.android.settingslib.core.instrumentation; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java index 017d37388340..be671e6d4e22 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/SharedPreferenceLoggerTest.java @@ -15,10 +15,15 @@ */ package com.android.settingslib.core.instrumentation; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_SETTINGS_PREFERENCE_CHANGE; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent + .ACTION_SETTINGS_PREFERENCE_CHANGE; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent + .FIELD_SETTINGS_PREFERENCE_CHANGE_FLOAT_VALUE; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent + .FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE; +import static com.android.internal.logging.nano.MetricsProto.MetricsEvent + .FIELD_SETTINGS_PREFERENCE_CHANGE_NAME; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java index 8b31450f8a3f..f78573a79f1c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/instrumentation/VisibilityLoggerMixinTest.java @@ -16,6 +16,7 @@ package com.android.settingslib.core.instrumentation; import static com.android.settingslib.core.instrumentation.Instrumentable.METRICS_CATEGORY_UNKNOWN; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -30,7 +31,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; + +import androidx.fragment.app.FragmentActivity; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java index 2b2bf5b6cc8b..301c493e062f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java @@ -15,15 +15,17 @@ */ package com.android.settingslib.core.lifecycle; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; -import android.arch.lifecycle.LifecycleOwner; import android.content.Context; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.lifecycle.LifecycleOwner; + import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.events.OnAttach; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java index 7820fd2fe340..9dd93b3af390 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DeveloperOptionsPreferenceControllerTest.java @@ -19,8 +19,8 @@ package com.android.settingslib.development; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java index 475e7d8c2209..2a60839990c4 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -26,9 +27,10 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java index 72c8d1ad3642..2f78899ff92d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogdSizePreferenceControllerTest.java @@ -40,8 +40,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java index 4b9bfc3f37ca..ed128e098c6f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/LogpersistPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settingslib.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -import android.arch.lifecycle.LifecycleOwner; import android.os.SystemProperties; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java index 0385f4bd29af..234b4d5ac604 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/BluetoothAddressPreferenceControllerTest.java @@ -22,8 +22,9 @@ import static org.mockito.Mockito.doReturn; import android.bluetooth.BluetoothAdapter; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java index 7c127e5cd5b7..aee956cf5518 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ConnectivityPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertWithMessage; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doReturn; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java index d600c2093c77..2b490ee63856 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/ImsStatusPreferenceControllerTest.java @@ -17,17 +17,19 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertWithMessage; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import android.content.Context; import android.os.PersistableBundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java index 99e582cae60a..1d957c3b5e5b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/IpAddressPreferenceControllerTest.java @@ -23,8 +23,9 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java index a4fa7aa29bef..dc77400e2547 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SerialNumberPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java index eaae40553d6e..eb77cb6271e9 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.shadow.api.Shadow.extract; import android.net.ConnectivityManager; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java index 39e05faddc1a..aea4d57356a4 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/UptimePreferenceControllerTest.java @@ -23,10 +23,11 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.SystemClock; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; import android.text.format.DateUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java index b7bc661116e9..5aa00efbb2d8 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/WifiMacAddressPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.deviceinfo; import static com.google.common.truth.Truth.assertWithMessage; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -28,8 +29,9 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java index eb7ad6d919cf..ca621ca66829 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/display/BrightnessUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.display; import static com.android.settingslib.display.BrightnessUtils.GAMMA_SPACE_MAX; + import static com.google.common.truth.Truth.assertThat; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java index fc1b22385b49..fef569362a8a 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.drawer; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -28,7 +29,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.RuntimeEnvironment.application; -import static org.robolectric.shadow.api.Shadow.extract; import android.app.ActivityManager; import android.content.ContentResolver; @@ -52,9 +52,6 @@ import android.util.ArrayMap; import android.util.Pair; import android.widget.RemoteViews; -import com.android.settingslib.R; -import com.android.settingslib.suggestions.SuggestionParser; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,7 +64,6 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -164,35 +160,6 @@ public class TileUtilsTest { } @Test - public void getTilesForIntent_shouldSkipFilteredApps() { - Intent intent = new Intent(); - Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>(); - List<Tile> outTiles = new ArrayList<>(); - List<ResolveInfo> info = new ArrayList<>(); - ResolveInfo resolveInfo = newInfo(true, null /* category */, null, URI_GET_ICON, - URI_GET_SUMMARY); - addMetadataToInfo(resolveInfo, "com.android.settings.require_account", "com.google"); - addMetadataToInfo(resolveInfo, "com.android.settings.require_connection", "true"); - info.add(resolveInfo); - - when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt())) - .thenReturn(info); - - TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache, - null /* defaultCategory */, outTiles, false /* usePriority */, - false /* checkCategory */, true /* forceTintExternalIcon */); - - assertThat(outTiles.size()).isEqualTo(1); - SuggestionParser parser = new SuggestionParser( - mContext, - null, - Collections.emptyList(), - "0,10"); - parser.filterSuggestions(outTiles, 0, false); - assertThat(outTiles.size()).isEqualTo(0); - } - - @Test public void getCategories_shouldHandleExtraIntentAction() { final String testCategory = "category1"; final String testAction = "action1"; @@ -392,108 +359,6 @@ public class TileUtilsTest { assertThat(outTiles.size()).isEqualTo(1); } - @Test - public void getTilesForIntent_shouldShowRemoteViewIfSpecified() { - Intent intent = new Intent(); - Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>(); - List<Tile> outTiles = new ArrayList<>(); - List<ResolveInfo> info = new ArrayList<>(); - ResolveInfo resolveInfo = newInfo(true, null /* category */); - resolveInfo.activityInfo.metaData.putInt("com.android.settings.custom_view", - R.layout.user_preference); - info.add(resolveInfo); - - when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt())) - .thenReturn(info); - - TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache, - null /* defaultCategory */, outTiles, false /* usePriority */, - false /* checkCategory */, true /* forceTintExternalIcon */); - - assertThat(outTiles.size()).isEqualTo(1); - Tile tile = outTiles.get(0); - assertThat(tile.remoteViews).isNotNull(); - assertThat(tile.remoteViews.getLayoutId()).isEqualTo(R.layout.user_preference); - } - - @Test - public void getTilesForIntent_summaryUriSpecified_shouldOverrideRemoteViewSummary() - throws RemoteException { - Intent intent = new Intent(); - Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>(); - List<Tile> outTiles = new ArrayList<>(); - List<ResolveInfo> info = new ArrayList<>(); - ResolveInfo resolveInfo = newInfo(true, null /* category */, null, - null, URI_GET_SUMMARY); - resolveInfo.activityInfo.metaData.putInt("com.android.settings.custom_view", - R.layout.user_preference); - info.add(resolveInfo); - - when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt())) - .thenReturn(info); - - // Mock the content provider interaction. - Bundle bundle = new Bundle(); - bundle.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY, "new summary text"); - when(mIContentProvider.call(anyString(), - eq(TileUtils.getMethodFromUri(Uri.parse(URI_GET_SUMMARY))), eq(URI_GET_SUMMARY), - any())).thenReturn(bundle); - when(mContentResolver.acquireUnstableProvider(anyString())) - .thenReturn(mIContentProvider); - when(mContentResolver.acquireUnstableProvider(any(Uri.class))) - .thenReturn(mIContentProvider); - - TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache, - null /* defaultCategory */, outTiles, false /* usePriority */, - false /* checkCategory */, true /* forceTintExternalIcon */); - - assertThat(outTiles.size()).isEqualTo(1); - Tile tile = outTiles.get(0); - assertThat(tile.remoteViews).isNotNull(); - assertThat(tile.remoteViews.getLayoutId()).isEqualTo(R.layout.user_preference); - // Make sure the summary TextView got a new text string. - TileUtilsShadowRemoteViews shadowRemoteViews = extract(tile.remoteViews); - assertThat(shadowRemoteViews.overrideViewId).isEqualTo(android.R.id.summary); - assertThat(shadowRemoteViews.overrideText).isEqualTo("new summary text"); - } - - @Test - public void getTilesForIntent_providerUnavailable_shouldNotOverrideRemoteViewSummary() - throws RemoteException { - Intent intent = new Intent(); - Map<Pair<String, String>, Tile> addedCache = new ArrayMap<>(); - List<Tile> outTiles = new ArrayList<>(); - List<ResolveInfo> info = new ArrayList<>(); - ResolveInfo resolveInfo = newInfo(true, null /* category */, null, - null, URI_GET_SUMMARY); - resolveInfo.activityInfo.metaData.putInt("com.android.settings.custom_view", - R.layout.user_preference); - info.add(resolveInfo); - - when(mPackageManager.queryIntentActivitiesAsUser(eq(intent), anyInt(), anyInt())) - .thenReturn(info); - - // Mock the content provider interaction. - Bundle bundle = new Bundle(); - bundle.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY, "new summary text"); - when(mIContentProvider.call(anyString(), - eq(TileUtils.getMethodFromUri(Uri.parse(URI_GET_SUMMARY))), eq(URI_GET_SUMMARY), - any())).thenReturn(bundle); - - TileUtils.getTilesForIntent(mContext, UserHandle.CURRENT, intent, addedCache, - null /* defaultCategory */, outTiles, false /* usePriority */, - false /* checkCategory */, true /* forceTintExternalIcon */); - - assertThat(outTiles.size()).isEqualTo(1); - Tile tile = outTiles.get(0); - assertThat(tile.remoteViews).isNotNull(); - assertThat(tile.remoteViews.getLayoutId()).isEqualTo(R.layout.user_preference); - // Make sure the summary TextView didn't get any text view updates. - TileUtilsShadowRemoteViews shadowRemoteViews = extract(tile.remoteViews); - assertThat(shadowRemoteViews.overrideViewId).isNull(); - assertThat(shadowRemoteViews.overrideText).isNull(); - } - public static ResolveInfo newInfo(boolean systemApp, String category) { return newInfo(systemApp, category, null); } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java index ba5a2c5e5fe7..de96af4fa6a1 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/BatterySaverUtilsTest.java @@ -17,8 +17,8 @@ package com.android.settingslib.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java index a23eebcce797..a0d53f29f319 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java index 5095f508997e..0a3cb44ad76d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.license; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java index 8a54aeec6d79..9c168f7b1a45 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/location/RecentLocationAppsTest.java @@ -1,6 +1,7 @@ package com.android.settingslib.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.isA; import static org.mockito.Mockito.when; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java index ccd2f538c731..89c319a7e483 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/EnableZenModeDialogTest.java @@ -20,6 +20,7 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java index 9b491c200cdc..d500ec2e7649 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/notification/ZenDurationDialogTest.java @@ -19,34 +19,22 @@ package com.android.settingslib.notification; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyObject; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; + import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import android.app.AlertDialog; -import android.app.Fragment; -import android.app.NotificationManager; -import android.content.Context; import android.content.ContentResolver; -import android.content.DialogInterface; -import android.content.res.Resources; -import android.net.Uri; +import android.content.Context; import android.provider.Settings; import android.service.notification.Condition; import android.view.LayoutInflater; import android.view.View; -import android.widget.Button; import com.android.settingslib.SettingsLibRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; @RunWith(SettingsLibRobolectricTestRunner.class) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java index cfa16b8a952a..aac582f9b3ac 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionControllerMixinTest.java @@ -16,18 +16,21 @@ package com.android.settingslib.suggestions; -import static android.arch.lifecycle.Lifecycle.Event.ON_START; -import static android.arch.lifecycle.Lifecycle.Event.ON_STOP; +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.LoaderManager; -import android.arch.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; + import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java deleted file mode 100644 index d05bcfd31685..000000000000 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settingslib.suggestions; - -import static com.google.common.truth.Truth.assertThat; -import static org.robolectric.RuntimeEnvironment.application; -import static org.robolectric.shadow.api.Shadow.extract; - -import android.content.ComponentName; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.pm.ResolveInfo; -import android.os.Bundle; -import android.preference.PreferenceManager; - -import com.android.settingslib.SettingsLibRobolectricTestRunner; -import com.android.settingslib.drawer.Tile; -import com.android.settingslib.drawer.TileUtilsTest; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.shadows.ShadowPackageManager; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@RunWith(SettingsLibRobolectricTestRunner.class) -public class SuggestionParserTest { - - private ShadowPackageManager mPackageManager; - private SuggestionParser mSuggestionParser; - private SuggestionCategory mMultipleCategory; - private SuggestionCategory mExclusiveCategory; - private SuggestionCategory mExpiredExclusiveCategory; - private List<Tile> mSuggestionsBeforeDismiss; - private List<Tile> mSuggestionsAfterDismiss; - private SharedPreferences mPrefs; - private Tile mSuggestion; - - @Before - public void setUp() { - mPackageManager = extract(application.getPackageManager()); - mPrefs = PreferenceManager.getDefaultSharedPreferences(application); - mSuggestion = new Tile(); - mSuggestion.intent = new Intent("action"); - mSuggestion.intent.setComponent(new ComponentName("pkg", "cls")); - mSuggestion.metaData = new Bundle(); - mMultipleCategory = new SuggestionCategory(); - mMultipleCategory.category = "category1"; - mMultipleCategory.multiple = true; - mExclusiveCategory = new SuggestionCategory(); - mExclusiveCategory.category = "category2"; - mExclusiveCategory.exclusive = true; - mExpiredExclusiveCategory = new SuggestionCategory(); - mExpiredExclusiveCategory.category = "category3"; - mExpiredExclusiveCategory.exclusive = true; - mExpiredExclusiveCategory.exclusiveExpireDaysInMillis = 0; - - mSuggestionParser = new SuggestionParser(application, mPrefs, - Arrays.asList(mMultipleCategory, mExclusiveCategory, mExpiredExclusiveCategory), - "0"); - - ResolveInfo info1 = TileUtilsTest.newInfo(true, null); - info1.activityInfo.packageName = "pkg"; - ResolveInfo infoDupe1 = TileUtilsTest.newInfo(true, null); - infoDupe1.activityInfo.packageName = "pkg"; - - ResolveInfo info2 = TileUtilsTest.newInfo(true, null); - info2.activityInfo.packageName = "pkg2"; - ResolveInfo info3 = TileUtilsTest.newInfo(true, null); - info3.activityInfo.packageName = "pkg3"; - ResolveInfo info4 = TileUtilsTest.newInfo(true, null); - info4.activityInfo.packageName = "pkg4"; - - Intent intent1 = new Intent(Intent.ACTION_MAIN).addCategory("category1"); - Intent intent2 = new Intent(Intent.ACTION_MAIN).addCategory("category2"); - Intent intent3 = new Intent(Intent.ACTION_MAIN).addCategory("category3"); - - mPackageManager.addResolveInfoForIntent(intent1, info1); - mPackageManager.addResolveInfoForIntent(intent1, info2); - mPackageManager.addResolveInfoForIntent(intent1, infoDupe1); - mPackageManager.addResolveInfoForIntent(intent2, info3); - mPackageManager.addResolveInfoForIntent(intent3, info4); - } - - @Test - public void dismissSuggestion_shouldDismiss() { - assertThat(mSuggestionParser.dismissSuggestion(mSuggestion)).isTrue(); - } - - @Test - public void testGetSuggestions_withoutSmartSuggestions_shouldDismiss() { - readAndDismissSuggestion(false); - mSuggestionParser.readSuggestions(mMultipleCategory, mSuggestionsAfterDismiss, false); - assertThat(mSuggestionsBeforeDismiss).hasSize(2); - assertThat(mSuggestionsAfterDismiss).hasSize(1); - assertThat(mSuggestionsBeforeDismiss.get(1)).isEqualTo(mSuggestionsAfterDismiss.get(0)); - } - - @Test - public void testGetSuggestions_withSmartSuggestions_shouldDismiss() { - readAndDismissSuggestion(true); - assertThat(mSuggestionsBeforeDismiss).hasSize(2); - assertThat(mSuggestionsAfterDismiss).hasSize(1); - } - - @Test - public void testGetSuggestion_exclusiveNotAvailable_onlyRegularCategoryAndNoDupe() { - mPackageManager.removeResolveInfosForIntent( - new Intent(Intent.ACTION_MAIN).addCategory("category2"), - "pkg3"); - mPackageManager.removeResolveInfosForIntent( - new Intent(Intent.ACTION_MAIN).addCategory("category3"), - "pkg4"); - - // If exclusive item is not available, the other categories should be shown - final SuggestionList sl = - mSuggestionParser.getSuggestions(false /* isSmartSuggestionEnabled */); - final List<Tile> suggestions = sl.getSuggestions(); - assertThat(suggestions).hasSize(2); - - assertThat(suggestions.get(0).intent.getComponent().getPackageName()).isEqualTo("pkg"); - assertThat(suggestions.get(1).intent.getComponent().getPackageName()).isEqualTo("pkg2"); - } - - @Test - public void testGetSuggestion_exclusiveExpiredAvailable_shouldLoadWithRegularCategory() { - // First remove permanent exclusive - mPackageManager.removeResolveInfosForIntent( - new Intent(Intent.ACTION_MAIN).addCategory("category2"), - "pkg3"); - // Set the other exclusive to be expired. - mPrefs.edit() - .putLong(mExpiredExclusiveCategory.category + "_setup_time", - System.currentTimeMillis() - 1000) - .commit(); - - // If exclusive is expired, they should be shown together with the other categories - final SuggestionList sl = - mSuggestionParser.getSuggestions(true /* isSmartSuggestionEnabled */); - final List<Tile> suggestions = sl.getSuggestions(); - - assertThat(suggestions).hasSize(3); - } - - @Test - public void testGetSuggestions_exclusive() { - final SuggestionList sl = - mSuggestionParser.getSuggestions(false /* isSmartSuggestionEnabled */); - final List<Tile> suggestions = sl.getSuggestions(); - - assertThat(suggestions).hasSize(1); - } - - @Test - public void isSuggestionDismissed_dismissedSuggestion_shouldReturnTrue() { - final Tile suggestion = new Tile(); - suggestion.metaData = new Bundle(); - suggestion.metaData.putString(SuggestionParser.META_DATA_DISMISS_CONTROL, "1,2,3"); - suggestion.intent = new Intent().setComponent(new ComponentName("pkg", "cls")); - - // Dismiss suggestion when smart suggestion is not enabled. - mSuggestionParser.dismissSuggestion(suggestion); - - assertThat(mSuggestionParser.isDismissed(suggestion, true /* isSmartSuggestionEnabled */)) - .isTrue(); - } - - private void readAndDismissSuggestion(boolean isSmartSuggestionEnabled) { - mSuggestionsBeforeDismiss = new ArrayList<>(); - mSuggestionsAfterDismiss = new ArrayList<>(); - mSuggestionParser.readSuggestions( - mMultipleCategory, mSuggestionsBeforeDismiss, isSmartSuggestionEnabled); - - final Tile suggestion = mSuggestionsBeforeDismiss.get(0); - if (mSuggestionParser.dismissSuggestion(suggestion)) { - mPackageManager.removeResolveInfosForIntent( - new Intent(Intent.ACTION_MAIN).addCategory(mMultipleCategory.category), - suggestion.intent.getComponent().getPackageName()); - } - mSuggestionParser.readSuggestions( - mMultipleCategory, mSuggestionsAfterDismiss, isSmartSuggestionEnabled); - } -} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java index 890abefddd73..4705cd2b183b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/users/UserManagerHelperRoboTest.java @@ -22,14 +22,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; - import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import com.android.settingslib.testutils.shadow.ShadowActivityManager; import com.android.settingslib.SettingsLibRobolectricTestRunner; +import com.android.settingslib.testutils.shadow.ShadowActivityManager; import org.junit.After; import org.junit.Before; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java index f2ef99c42df5..6a9579b770ce 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.utils; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java index 743951a6ed7a..e4bbbcb0b207 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.utils; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java index 83a9d5be0ae7..63248a0d370c 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settingslib.utils; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.fail; import org.junit.Test; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java index 8071c6db4cfd..366b720fc87b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java @@ -17,16 +17,17 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.arch.lifecycle.LifecycleOwner; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.PreferenceManager; -import android.support.v7.preference.PreferenceScreen; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java index ff11b803c053..84a043e15eb5 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java @@ -19,11 +19,12 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.R; import com.android.settingslib.SettingsLibRobolectricTestRunner; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java index ee2c2ffc4b4b..86443bde4667 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settingslib.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java index d25adde98694..07c50fde00fa 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiUtilsTest.java @@ -16,6 +16,7 @@ package com.android.settingslib.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; diff --git a/packages/Shell/Android.mk b/packages/Shell/Android.mk index 5713dc679341..b738d7771465 100644 --- a/packages/Shell/Android.mk +++ b/packages/Shell/Android.mk @@ -12,7 +12,8 @@ LOCAL_SRC_FILES += \ LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 +LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4 +LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := Shell LOCAL_PRIVATE_PLATFORM_APIS := true diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index b4f331d89074..8a5cb4a6d643 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -157,7 +157,7 @@ android:defaultToDeviceProtectedStorage="true" android:directBootAware="true"> <provider - android:name="android.support.v4.content.FileProvider" + android:name="androidx.core.content.FileProvider" android:authorities="com.android.shell" android:grantUriPermissions="true" android:exported="false"> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 600f0dc37775..4fc190d43056 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -88,7 +88,7 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.os.Vibrator; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp new file mode 100644 index 000000000000..c9ba26804e89 --- /dev/null +++ b/packages/SystemUI/Android.bp @@ -0,0 +1,101 @@ +// +// Copyright (C) 2018 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. +// + +java_library { + name: "SystemUI-proto", + + srcs: ["src/**/*.proto"], + + proto: { + type: "nano", + }, +} + +java_library { + name: "SystemUI-tags", + srcs: ["src/com/android/systemui/EventLogTags.logtags"], +} + +android_library { + name: "SystemUI-core", + srcs: [ + "src/**/*.java", + "src/**/I*.aidl", + ], + resource_dirs: [ + "res-keyguard", + "res", + ], + static_libs: [ + "SystemUIPluginLib", + "SystemUISharedLib", + "SettingsLib", + "androidx.car_car", + "androidx.legacy_legacy-support-v4", + "androidx.recyclerview_recyclerview", + "androidx.preference_preference", + "androidx.appcompat_appcompat", + "androidx.mediarouter_mediarouter", + "androidx.palette_palette", + "androidx.legacy_legacy-preference-v14", + "androidx.leanback_leanback", + "androidx.slice_slice-core", + "androidx.slice_slice-view", + "androidx.slice_slice-builders", + "androidx.arch.core_core-runtime", + "androidx.lifecycle_lifecycle-extensions", + "SystemUI-tags", + "SystemUI-proto", + ], + manifest: "AndroidManifest.xml", + + libs: [ + "telephony-common", + "android.car", + ], + + aaptflags: [ + "--extra-packages", + "com.android.keyguard", + ], +} + +android_app { + name: "SystemUI", + static_libs: [ + "SystemUI-core", + ], + + platform_apis: true, + certificate: "platform", + privileged: true, + + optimize: { + proguard_flags_files: ["proguard.flags"], + }, + + libs: [ + "telephony-common", + "android.car", + ], + + dxflags: ["--multi-dex"], + aaptflags: [ + "--extra-packages", + "com.android.keyguard", + ], + +} diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk deleted file mode 100644 index df2115147fb2..000000000000 --- a/packages/SystemUI/Android.mk +++ /dev/null @@ -1,83 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := SystemUI-proto - -LOCAL_SRC_FILES := $(call all-proto-files-under,src) - -LOCAL_PROTOC_OPTIMIZE_TYPE := nano -LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_MODULE := SystemUI-tags - -LOCAL_SRC_FILES := src/com/android/systemui/EventLogTags.logtags - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# ------------------ - -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_MODULE_TAGS := optional - -RELATIVE_FINGERPRINT_PATH := ../../core/java/android/hardware/fingerprint - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-Iaidl-files-under, src) \ - $(call all-Iaidl-files-under, $(RELATIVE_FINGERPRINT_PATH)) - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - SystemUIPluginLib \ - SystemUISharedLib \ - android-support-car \ - android-support-v4 \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-support-v7-mediarouter \ - android-support-v7-palette \ - android-support-v14-preference \ - android-support-v17-leanback \ - android-slices-core \ - android-slices-view \ - android-slices-builders \ - android-arch-core-runtime \ - android-arch-lifecycle-extensions \ - -LOCAL_STATIC_JAVA_LIBRARIES := \ - SystemUI-tags \ - SystemUI-proto - -LOCAL_JAVA_LIBRARIES := telephony-common \ - android.car - -LOCAL_PACKAGE_NAME := SystemUI -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_CERTIFICATE := platform -LOCAL_PRIVILEGED_MODULE := true - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res-keyguard $(LOCAL_PATH)/res - -ifneq ($(INCREMENTAL_BUILDS),) - LOCAL_PROGUARD_ENABLED := disabled - LOCAL_JACK_ENABLED := incremental - LOCAL_DX_FLAGS := --multi-dex - LOCAL_JACK_FLAGS := --multi-dex native -endif - -include frameworks/base/packages/SettingsLib/common.mk - -LOCAL_AAPT_FLAGS := --extra-packages com.android.keyguard - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 5599b5a2837a..beb4e9e5ba9c 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -229,7 +229,7 @@ android:theme="@style/Theme.SystemUI" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" - android:appComponentFactory="android.support.v4.app.CoreComponentFactory"> + android:appComponentFactory="androidx.core.app.CoreComponentFactory"> <!-- Keep theme in sync with SystemUIApplication.onCreate(). Setting the theme on the application does not affect views inflated by services. The application theme is set again from onCreate to take effect for those views. --> @@ -594,7 +594,7 @@ </receiver> <provider - android:name="android.support.v4.content.FileProvider" + android:name="androidx.core.content.FileProvider" android:authorities="com.android.systemui.fileprovider" android:exported="false" android:grantUriPermissions="true"> diff --git a/packages/SystemUI/plugin/Android.bp b/packages/SystemUI/plugin/Android.bp new file mode 100644 index 000000000000..b38059de0f8d --- /dev/null +++ b/packages/SystemUI/plugin/Android.bp @@ -0,0 +1,37 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +java_library { + + name: "SystemUIPluginLib", + + srcs: ["src/**/*.java"], + + +} + +android_app { + + // Dummy to generate .toc files. + name: "PluginDummyLib", + platform_apis: true, + srcs: ["src/**/*.java"], + + libs: ["SystemUIPluginLib"], + + optimize: { + enabled: false, + }, + +} diff --git a/packages/SystemUI/plugin/Android.mk b/packages/SystemUI/plugin/Android.mk deleted file mode 100644 index 8634684087e2..000000000000 --- a/packages/SystemUI/plugin/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE := SystemUIPluginLib - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_JAR_EXCLUDE_FILES := none - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) - -# Dummy to generate .toc files. -LOCAL_PACKAGE_NAME := PluginDummyLib -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := SystemUIPluginLib - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) diff --git a/packages/SystemUI/plugin/ExamplePlugin/Android.bp b/packages/SystemUI/plugin/ExamplePlugin/Android.bp new file mode 100644 index 000000000000..a0eaf14f4a06 --- /dev/null +++ b/packages/SystemUI/plugin/ExamplePlugin/Android.bp @@ -0,0 +1,14 @@ +android_app { + + name: "ExamplePlugin", + + libs: ["SystemUIPluginLib"], + + certificate: "platform", + optimize: { + enabled: false, + }, + + srcs: ["src/**/*.java"], + +} diff --git a/packages/SystemUI/plugin/ExamplePlugin/Android.mk b/packages/SystemUI/plugin/ExamplePlugin/Android.mk deleted file mode 100644 index 4c82c7505ad3..000000000000 --- a/packages/SystemUI/plugin/ExamplePlugin/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_PACKAGE_NAME := ExamplePlugin - -LOCAL_JAVA_LIBRARIES := SystemUIPluginLib - -LOCAL_CERTIFICATE := platform -LOCAL_PROGUARD_ENABLED := disabled - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -include $(BUILD_PACKAGE) diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags index 4b5d10e8d190..e6452e717d5e 100644 --- a/packages/SystemUI/proguard.flags +++ b/packages/SystemUI/proguard.flags @@ -36,9 +36,9 @@ public <init>(android.content.Context, android.util.AttributeSet); } --keep class ** extends android.support.v14.preference.PreferenceFragment +-keep class ** extends androidx.preference.PreferenceFragment -keep class com.android.systemui.tuner.* -keep class com.android.systemui.plugins.** { public protected *; } --keep class android.support.v4.app.CoreComponentFactory +-keep class androidx.core.app.CoreComponentFactory diff --git a/packages/SystemUI/res-keyguard/values/alias.xml b/packages/SystemUI/res-keyguard/values/alias.xml index f06b450c7dbe..1c63c7933faf 100644 --- a/packages/SystemUI/res-keyguard/values/alias.xml +++ b/packages/SystemUI/res-keyguard/values/alias.xml @@ -25,9 +25,6 @@ <!-- Alias used to reference framework "OK" string in keyguard. --> <item type="string" name="ok">@*android:string/ok</item> - <!-- Alias used to reference framework "OK" string in keyguard. --> - <item type="string" name="system_ui_date_pattern">@*android:string/system_ui_date_pattern</item> - <!-- Alias used to reference framework configuration for screen rotation. --> <item type="bool" name="config_enableLockScreenRotation">@*android:bool/config_enableLockScreenRotation</item> diff --git a/packages/SystemUI/res/layout/qs_customize_panel_content.xml b/packages/SystemUI/res/layout/qs_customize_panel_content.xml index d70a37ae15b2..4ce6ef6ed31d 100644 --- a/packages/SystemUI/res/layout/qs_customize_panel_content.xml +++ b/packages/SystemUI/res/layout/qs_customize_panel_content.xml @@ -38,7 +38,7 @@ android:navigationContentDescription="@*android:string/action_bar_up_description" style="?android:attr/toolbarStyle" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="0dp" diff --git a/packages/SystemUI/res/layout/tuner_shortcut_list.xml b/packages/SystemUI/res/layout/tuner_shortcut_list.xml index 9aaffb49e652..b4165cf89bda 100644 --- a/packages/SystemUI/res/layout/tuner_shortcut_list.xml +++ b/packages/SystemUI/res/layout/tuner_shortcut_list.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<android.support.v7.widget.RecyclerView +<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/packages/SystemUI/res/values-bg/donottranslate.xml b/packages/SystemUI/res/values-bg/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-bg/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-hu/donottranslate.xml b/packages/SystemUI/res/values-hu/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-hu/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-ja/donottranslate.xml b/packages/SystemUI/res/values-ja/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-ja/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-ko/donottranslate.xml b/packages/SystemUI/res/values-ko/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-ko/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-lt/donottranslate.xml b/packages/SystemUI/res/values-lt/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-lt/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-sw720dp/donottranslate.xml b/packages/SystemUI/res/values-sw720dp/donottranslate.xml deleted file mode 100644 index 09960673a53e..000000000000 --- a/packages/SystemUI/res/values-sw720dp/donottranslate.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2011, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. %1$s is DOW, %2$s is date. - We show both (DOW on one line, then the date) but this can be overridden for locales as - necessary. - --> - <string name="status_bar_date_formatter">%1$s\n%2$s</string> - -</resources> - diff --git a/packages/SystemUI/res/values-tr/donottranslate.xml b/packages/SystemUI/res/values-tr/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-tr/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-zh-rCN/donottranslate.xml b/packages/SystemUI/res/values-zh-rCN/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-zh-rCN/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/res/values-zh-rTW/donottranslate.xml b/packages/SystemUI/res/values-zh-rTW/donottranslate.xml deleted file mode 100644 index dcf434db111b..000000000000 --- a/packages/SystemUI/res/values-zh-rTW/donottranslate.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/** - * Copyright (c) 2009, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%2$s\n%1$s</string> - -</resources> diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp new file mode 100644 index 000000000000..0fb12009e2cb --- /dev/null +++ b/packages/SystemUI/shared/Android.bp @@ -0,0 +1,40 @@ +// 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. + +android_library { + + name: "SystemUISharedLib", + srcs: [ + "src/**/*.java", + "src/**/I*.aidl", + ], + +} + +android_app { + + name: "SysUISharedLib", + platform_apis: true, + srcs: [ + "src/**/*.java", + "src/**/I*.aidl", + ], + + static_libs: ["SystemUISharedLib"], + + optimize: { + enabled: false, + }, + +} diff --git a/packages/SystemUI/shared/Android.mk b/packages/SystemUI/shared/Android.mk deleted file mode 100644 index f20df0cebc8d..000000000000 --- a/packages/SystemUI/shared/Android.mk +++ /dev/null @@ -1,43 +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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE := SystemUISharedLib - -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_JAR_EXCLUDE_FILES := none - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := SysUISharedLib -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := SystemUISharedLib - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/packages/SystemUI/shared/tests/Android.mk b/packages/SystemUI/shared/tests/Android.mk index 4e7cbbfede2b..02774c946596 100644 --- a/packages/SystemUI/shared/tests/Android.mk +++ b/packages/SystemUI/shared/tests/Android.mk @@ -30,10 +30,10 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests # Add local path sources as well as shared lib sources -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-java-files-under, ../src) +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ + SystemUISharedLib \ metrics-helper-lib \ android-support-test \ mockito-target-inline-minus-junit4 \ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index cb5a0507815b..9e4810cb08ca 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -21,7 +21,7 @@ import android.app.AlertDialog; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java index 67bdd216b13b..3dee0ff04e5f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java @@ -21,8 +21,8 @@ import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.annotation.ColorInt; import android.app.PendingIntent; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.Observer; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.Observer; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.Drawable; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index 41df196c62b0..4e060f652eb4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -28,7 +28,7 @@ import android.os.Handler; import android.os.Looper; import android.os.RemoteException; import android.os.UserHandle; -import android.support.v4.graphics.ColorUtils; +import androidx.core.graphics.ColorUtils; import android.text.TextUtils; import android.text.format.DateFormat; import android.util.ArraySet; diff --git a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java index efaf557660d2..049765f2824b 100644 --- a/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java +++ b/packages/SystemUI/src/com/android/systemui/ScreenDecorations.java @@ -41,7 +41,7 @@ import android.graphics.Region; import android.hardware.display.DisplayManager; import android.os.SystemProperties; import android.provider.Settings.Secure; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.DisplayMetrics; import android.view.DisplayCutout; import android.view.DisplayInfo; diff --git a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java index f8b73a172516..d6472b7ddbb9 100644 --- a/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java +++ b/packages/SystemUI/src/com/android/systemui/analytics/SensorLoggerSession.java @@ -101,31 +101,31 @@ public class SensorLoggerSession { public Session toProto() { Session proto = new Session(); - proto.setStartTimestampMillis(mStartTimestampMillis); - proto.setDurationMillis(mEndTimestampMillis - mStartTimestampMillis); - proto.setBuild(Build.FINGERPRINT); - proto.setResult(mResult); - proto.setType(mType); + proto.startTimestampMillis = mStartTimestampMillis; + proto.durationMillis = mEndTimestampMillis - mStartTimestampMillis; + proto.build = Build.FINGERPRINT; + proto.result = mResult; + proto.type = mType; proto.sensorEvents = mSensorEvents.toArray(proto.sensorEvents); proto.touchEvents = mMotionEvents.toArray(proto.touchEvents); proto.phoneEvents = mPhoneEvents.toArray(proto.phoneEvents); - proto.setTouchAreaWidth(mTouchAreaWidth); - proto.setTouchAreaHeight(mTouchAreaHeight); + proto.touchAreaWidth = mTouchAreaWidth; + proto.touchAreaHeight = mTouchAreaHeight; return proto; } private PhoneEvent phoneEventToProto(int eventType, long sysTimeNanos) { PhoneEvent proto = new PhoneEvent(); - proto.setType(eventType); - proto.setTimeOffsetNanos(sysTimeNanos - mStartSystemTimeNanos); + proto.type = eventType; + proto.timeOffsetNanos = sysTimeNanos - mStartSystemTimeNanos; return proto; } private SensorEvent sensorEventToProto(android.hardware.SensorEvent ev, long sysTimeNanos) { SensorEvent proto = new SensorEvent(); - proto.setType(ev.sensor.getType()); - proto.setTimeOffsetNanos(sysTimeNanos - mStartSystemTimeNanos); - proto.setTimestamp(ev.timestamp); + proto.type = ev.sensor.getType(); + proto.timeOffsetNanos = sysTimeNanos - mStartSystemTimeNanos; + proto.timestamp = ev.timestamp; proto.values = ev.values.clone(); return proto; } @@ -133,17 +133,17 @@ public class SensorLoggerSession { private TouchEvent motionEventToProto(MotionEvent ev) { int count = ev.getPointerCount(); TouchEvent proto = new TouchEvent(); - proto.setTimeOffsetNanos(ev.getEventTimeNano() - mStartSystemTimeNanos); - proto.setAction(ev.getActionMasked()); - proto.setActionIndex(ev.getActionIndex()); + proto.timeOffsetNanos = ev.getEventTimeNano() - mStartSystemTimeNanos; + proto.action = ev.getActionMasked(); + proto.actionIndex = ev.getActionIndex(); proto.pointers = new TouchEvent.Pointer[count]; for (int i = 0; i < count; i++) { TouchEvent.Pointer p = new TouchEvent.Pointer(); - p.setX(ev.getX(i)); - p.setY(ev.getY(i)); - p.setSize(ev.getSize(i)); - p.setPressure(ev.getPressure(i)); - p.setId(ev.getPointerId(i)); + p.x = ev.getX(i); + p.y = ev.getY(i); + p.size = ev.getSize(i); + p.pressure = ev.getPressure(i); + p.id = ev.getPointerId(i); proto.pointers[i] = p; } return proto; diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java index 03b0082b96e7..4fc2d9bd344b 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeScreenStatePreventingAdapter.java @@ -16,7 +16,7 @@ package com.android.systemui.doze; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.view.Display; import com.android.systemui.statusbar.phone.DozeParameters; diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java b/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java index 1c6521f641bf..3013b969c74b 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeSuspendScreenStatePreventingAdapter.java @@ -16,7 +16,7 @@ package com.android.systemui.doze; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.view.Display; import com.android.systemui.statusbar.phone.DozeParameters; diff --git a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java index f8f364da089b..f422737bb9af 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java @@ -28,7 +28,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 065e9cc2d1d3..da41136767aa 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -30,7 +30,7 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.os.UserHandle; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.Annotation; import android.text.Layout; import android.text.SpannableString; diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index ab822696d382..100751cce947 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java @@ -8,8 +8,8 @@ import android.animation.PropertyValuesHolder; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; diff --git a/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java b/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java index a1c25772234e..87c64c78edc8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PseudoGridView.java @@ -47,16 +47,12 @@ public class PseudoGridView extends ViewGroup { final int N = a.getIndexCount(); for (int i = 0; i < N; i++) { int attr = a.getIndex(i); - switch (attr) { - case R.styleable.PseudoGridView_numColumns: - mNumColumns = a.getInt(attr, 3); - break; - case R.styleable.PseudoGridView_verticalSpacing: - mVerticalSpacing = a.getDimensionPixelSize(attr, 0); - break; - case R.styleable.PseudoGridView_horizontalSpacing: - mHorizontalSpacing = a.getDimensionPixelSize(attr, 0); - break; + if (attr == R.styleable.PseudoGridView_numColumns) { + mNumColumns = a.getInt(attr, 3); + } else if (attr == R.styleable.PseudoGridView_verticalSpacing) { + mVerticalSpacing = a.getDimensionPixelSize(attr, 0); + } else if (attr == R.styleable.PseudoGridView_horizontalSpacing) { + mHorizontalSpacing = a.getDimensionPixelSize(attr, 0); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java index 5ae43c660b12..84eb3da51bcf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java @@ -15,7 +15,7 @@ */ package com.android.systemui.qs; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.View; /** diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index b7907a605ca5..64b3904428f1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java @@ -28,8 +28,8 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.os.Bundle; import android.os.UserManager; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index b146cfccf180..bd89ad166520 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -23,8 +23,8 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java index 7b1509dcd173..7ebab0bfce24 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java @@ -17,7 +17,7 @@ package com.android.systemui.qs; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Canvas; -import android.support.v4.widget.NestedScrollView; +import androidx.core.widget.NestedScrollView; import android.util.Property; import android.view.MotionEvent; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index a9bfa45b6a73..199e11112566 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -33,7 +33,7 @@ import android.media.AudioManager; import android.os.Handler; import android.provider.AlarmClock; import android.service.notification.ZenModeConfig; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.AttributeSet; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java index 2ea21c66240f..f6b08b05bf38 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFooter.java @@ -16,7 +16,7 @@ package com.android.systemui.qs.car; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java index 608a2364662e..2d9e4d7fc22b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarQSFragment.java @@ -22,9 +22,9 @@ import android.animation.ValueAnimator; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; -import android.support.v7.widget.GridLayoutManager; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.GridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java index 31c455d880d6..a9ab8915ac92 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/car/CarStatusBarHeader.java @@ -16,7 +16,7 @@ package com.android.systemui.qs.car; import android.content.Context; import android.graphics.Color; import android.graphics.Rect; -import android.support.annotation.IdRes; +import androidx.annotation.IdRes; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index 394c3225bceb..482298886d71 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -22,9 +22,9 @@ import android.content.Context; import android.content.res.Configuration; import android.graphics.Point; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.util.TypedValue; import android.view.ContextThemeWrapper; diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index 5adeec3cbab4..78e9f36d69aa 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -23,13 +23,13 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.ColorDrawable; import android.os.Handler; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.GridLayoutManager.SpanSizeLookup; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ItemDecoration; -import android.support.v7.widget.RecyclerView.State; -import android.support.v7.widget.RecyclerView.ViewHolder; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ItemDecoration; +import androidx.recyclerview.widget.RecyclerView.State; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java index 0cc17ff37241..75dd0d9e565d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileColorPicker.java @@ -18,7 +18,7 @@ package com.android.systemui.qs.external; import android.content.Context; import android.content.res.ColorStateList; import android.service.quicksettings.Tile; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.systemui.R; public class TileColorPicker { diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java index 1170d7b6e8a9..4e0f38fc4662 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java @@ -34,7 +34,7 @@ import android.service.quicksettings.IQSService; import android.service.quicksettings.IQSTileService; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.ArraySet; import android.util.Log; import com.android.systemui.qs.external.PackageManagerAdapter; diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java index f5f8ffa7f641..9f9fe39bab6c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java @@ -30,7 +30,7 @@ import android.os.UserHandle; import android.service.quicksettings.IQSTileService; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.android.systemui.qs.external.TileLifecycleManager.TileChangeListener; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java index 63d6f82ce9e6..a3e9afd366fd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/SlashImageView.java @@ -17,7 +17,7 @@ package com.android.systemui.qs.tileimpl; import android.annotation.Nullable; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.ImageView; import com.android.internal.annotations.VisibleForTesting; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java index c7191f81620c..e3c59861310c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.metrics.LogMaker; import android.provider.Settings; import android.service.quicksettings.Tile; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.util.Log; import android.widget.Switch; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java index 1e9a618c3324..ad7d1b6b4689 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailItemView.java @@ -69,13 +69,10 @@ public class UserDetailItemView extends LinearLayout { final int N = a.getIndexCount(); for (int i = 0; i < N; i++) { int attr = a.getIndex(i); - switch (attr) { - case R.styleable.UserDetailItemView_regularFontFamily: - mRegularTypeface = Typeface.create(a.getString(attr), 0 /* style */); - break; - case R.styleable.UserDetailItemView_activatedFontFamily: - mActivatedTypeface = Typeface.create(a.getString(attr), 0 /* style */); - break; + if (attr == R.styleable.UserDetailItemView_regularFontFamily) { + mRegularTypeface = Typeface.create(a.getString(attr), 0 /* style */); + } else if (attr == R.styleable.UserDetailItemView_activatedFontFamily) { + mActivatedTypeface = Typeface.create(a.getString(attr), 0 /* style */); } } a.recycle(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java b/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java index 252205201e5d..911bea67b8b4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java +++ b/packages/SystemUI/src/com/android/systemui/qs/touch/SwipeDetector.java @@ -19,8 +19,8 @@ import static android.view.MotionEvent.INVALID_POINTER_ID; import android.content.Context; import android.graphics.PointF; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.MotionEvent; import android.view.ViewConfiguration; diff --git a/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java b/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java index de85c0f9a726..af8c2d08f4b4 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java +++ b/packages/SystemUI/src/com/android/systemui/recents/TriangleShape.java @@ -19,7 +19,7 @@ package com.android.systemui.recents; import android.graphics.Outline; import android.graphics.Path; import android.graphics.drawable.shapes.PathShape; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Wrapper around {@link android.graphics.drawable.shapes.PathShape} diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java index 842899b62635..de4291446e7c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java @@ -36,7 +36,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.os.CountDownTimer; -import android.support.v4.graphics.ColorUtils; +import androidx.core.graphics.ColorUtils; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.view.Gravity; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index 3eb3160b028f..98925b9ba9e5 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -226,22 +226,16 @@ public class DividerView extends FrameLayout implements OnTouchListener, public boolean performAccessibilityAction(View host, int action, Bundle args) { int currentPosition = getCurrentPosition(); SnapTarget nextTarget = null; - switch (action) { - case R.id.action_move_tl_full: - nextTarget = mSnapAlgorithm.getDismissEndTarget(); - break; - case R.id.action_move_tl_70: - nextTarget = mSnapAlgorithm.getLastSplitTarget(); - break; - case R.id.action_move_tl_50: - nextTarget = mSnapAlgorithm.getMiddleTarget(); - break; - case R.id.action_move_tl_30: - nextTarget = mSnapAlgorithm.getFirstSplitTarget(); - break; - case R.id.action_move_rb_full: - nextTarget = mSnapAlgorithm.getDismissStartTarget(); - break; + if (action == R.id.action_move_tl_full) { + nextTarget = mSnapAlgorithm.getDismissEndTarget(); + } else if (action == R.id.action_move_tl_70) { + nextTarget = mSnapAlgorithm.getLastSplitTarget(); + } else if (action == R.id.action_move_tl_50) { + nextTarget = mSnapAlgorithm.getMiddleTarget(); + } else if (action == R.id.action_move_tl_30) { + nextTarget = mSnapAlgorithm.getFirstSplitTarget(); + } else if (action == R.id.action_move_rb_full) { + nextTarget = mSnapAlgorithm.getDismissStartTarget(); } if (nextTarget != null) { startDragging(true /* animate */, false /* touching */); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index 6fd0aa6330f5..145a2466f7d2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -25,7 +25,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.Message; import android.os.RemoteException; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Pair; import com.android.internal.os.SomeArgs; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index d647e21888dd..29687228902f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -2747,16 +2747,18 @@ public class ExpandableNotificationRow extends ActivatableNotificationView case AccessibilityNodeInfo.ACTION_LONG_CLICK: doLongClickCallback(); return true; - case R.id.action_snooze: - NotificationMenuRowPlugin provider = getProvider(); - if (provider == null) { - provider = createMenu(); + default: + if (action == R.id.action_snooze) { + NotificationMenuRowPlugin provider = getProvider(); + if (provider == null) { + provider = createMenu(); + } + MenuItem snoozeMenu = provider.getSnoozeMenuItem(getContext()); + if (snoozeMenu != null) { + doLongClickCallback(getWidth() / 2, getHeight() / 2, snoozeMenu); + } + return true; } - MenuItem snoozeMenu = provider.getSnoozeMenuItem(getContext()); - if (snoozeMenu != null) { - doLongClickCallback(getWidth() / 2, getHeight() / 2, snoozeMenu); - } - return true; } return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java index 1b613cbcaa41..6f5e8cb3e8d8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationBlockingHelperManager.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.service.notification.StatusBarNotification; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.android.internal.logging.MetricsLogger; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java index cfd5d83c87b9..4a8f4bbfff03 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java @@ -23,7 +23,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java index 8d7668ad6f66..91a381fe13b0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java @@ -33,7 +33,7 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.provider.Settings; import android.service.notification.StatusBarNotification; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.ArraySet; import android.util.Log; import android.view.HapticFeedbackConstants; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java index 1807465004c6..16b50b15bb3e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java @@ -30,7 +30,7 @@ import android.graphics.PorterDuffColorFilter; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v4.graphics.ColorUtils; +import androidx.core.graphics.ColorUtils; import android.util.AttributeSet; import android.util.Log; import android.view.Display; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 27cb077394b1..23fa34a0f680 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -38,7 +38,7 @@ import android.graphics.drawable.Icon; import android.os.Parcelable; import android.os.UserHandle; import android.service.notification.StatusBarNotification; -import android.support.v4.graphics.ColorUtils; +import androidx.core.graphics.ColorUtils; import android.text.TextUtils; import android.util.AttributeSet; import android.util.FloatProperty; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java index f78e3912ad91..d720aef3a138 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/FullscreenUserSwitcher.java @@ -24,7 +24,7 @@ import android.util.Log; import android.view.View; import android.view.ViewStub; -import android.support.v7.widget.GridLayoutManager; +import androidx.recyclerview.widget.GridLayoutManager; import com.android.settingslib.users.UserManagerHelper; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java index a49d507aa21a..7790f32584fd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java @@ -28,9 +28,9 @@ import android.content.pm.UserInfo; import android.content.res.Resources; import android.graphics.Bitmap; import android.os.AsyncTask; -import android.support.v4.graphics.drawable.RoundedBitmapDrawable; -import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; -import android.support.v7.widget.RecyclerView; +import androidx.core.graphics.drawable.RoundedBitmapDrawable; +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java index 2b7949b1de54..535ec076aa3b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/MediaNotificationProcessor.java @@ -23,8 +23,8 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; -import android.support.annotation.VisibleForTesting; -import android.support.v7.graphics.Palette; +import androidx.annotation.VisibleForTesting; +import androidx.palette.graphics.Palette; import android.util.LayoutDirection; import com.android.internal.util.NotificationColorUtil; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RowInflaterTask.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RowInflaterTask.java index c2141714b391..9b9dfc96ccff 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/RowInflaterTask.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/RowInflaterTask.java @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.notification; import android.content.Context; -import android.support.v4.view.AsyncLayoutInflater; +import androidx.asynclayoutinflater.view.AsyncLayoutInflater; import android.util.Log; import android.view.View; import android.view.ViewGroup; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java index 09aff1b97305..7fe01c0ff0c1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/VisualStabilityManager.java @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.notification; -import android.support.v4.util.ArraySet; +import androidx.collection.ArraySet; import android.view.View; import com.android.systemui.statusbar.ExpandableNotificationRow; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java index fa0a774c249e..a4bf6ea3b224 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java @@ -21,7 +21,7 @@ import android.annotation.Nullable; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; -import android.support.v4.util.ArraySet; +import androidx.collection.ArraySet; import android.util.Log; import android.util.Pools; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java index 9acac22c9e90..f9a540c7b0ca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java @@ -57,7 +57,7 @@ import android.os.Message; import android.os.RemoteException; import android.os.UserHandle; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.telecom.TelecomManager; import android.text.TextUtils; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 2a1f92f5edda..1177c4f222ac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -40,7 +40,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.SystemProperties; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.util.AttributeSet; import android.util.Log; import android.util.SparseArray; @@ -255,13 +255,11 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav @Override public boolean performAccessibilityAction(View host, int action, Bundle args) { - switch (action) { - case R.id.action_toggle_overview: - SysUiServiceProvider.getComponent(getContext(), Recents.class) - .toggleRecentApps(); - break; - default: - return super.performAccessibilityAction(host, action, args); + if (action == R.id.action_toggle_overview) { + SysUiServiceProvider.getComponent(getContext(), Recents.class) + .toggleRecentApps(); + } else { + return super.performAccessibilityAction(host, action, args); } return true; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java index e5083c144114..09833d44915d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NearestTouchFrame.java @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.Log; import android.util.Pair; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java index 55ffb3e62e53..8858381af668 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java @@ -19,7 +19,7 @@ package com.android.systemui.statusbar.phone; import android.app.Notification; import android.os.SystemClock; import android.service.notification.StatusBarNotification; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.android.systemui.statusbar.ExpandableNotificationRow; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java index 44d666eb0d65..a78dd25ecab2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.v4.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.collection.ArrayMap; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java index 5dee2a6000c7..653471d8a220 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconContainer.java @@ -26,7 +26,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Icon; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.util.AttributeSet; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java index 76cc0ff2a2e1..641f485690f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java @@ -20,7 +20,7 @@ import android.app.Fragment; import android.content.Context; import android.content.res.Configuration; import android.graphics.Canvas; -import android.support.annotation.DimenRes; +import androidx.annotation.DimenRes; import android.util.AttributeSet; import android.view.View; import android.view.ViewStub; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java index 860b77e1b251..ea1b98089598 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java @@ -46,7 +46,7 @@ import android.view.View; import android.view.WindowManagerGlobal; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; -import android.support.annotation.DimenRes; +import androidx.annotation.DimenRes; import com.android.systemui.Dependency; import com.android.systemui.OverviewProxyService; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 3b9ee8bcd378..0d6cb5c50077 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -22,7 +22,7 @@ import static com.android.systemui.statusbar.phone.StatusBarIconHolder.TYPE_WIFI import android.content.Context; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java index dc1b35d6c701..2ed2edb969bd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/UserAvatarView.java @@ -45,25 +45,18 @@ public class UserAvatarView extends View { final int N = a.getIndexCount(); for (int i = 0; i < N; i++) { int attr = a.getIndex(i); - switch (attr) { - case R.styleable.UserAvatarView_avatarPadding: - setAvatarPadding(a.getDimension(attr, 0)); - break; - case R.styleable.UserAvatarView_frameWidth: - setFrameWidth(a.getDimension(attr, 0)); - break; - case R.styleable.UserAvatarView_framePadding: - setFramePadding(a.getDimension(attr, 0)); - break; - case R.styleable.UserAvatarView_frameColor: - setFrameColor(a.getColorStateList(attr)); - break; - case R.styleable.UserAvatarView_badgeDiameter: - setBadgeDiameter(a.getDimension(attr, 0)); - break; - case R.styleable.UserAvatarView_badgeMargin: - setBadgeMargin(a.getDimension(attr, 0)); - break; + if (attr == R.styleable.UserAvatarView_avatarPadding) { + setAvatarPadding(a.getDimension(attr, 0)); + } else if (attr == R.styleable.UserAvatarView_frameWidth) { + setFrameWidth(a.getDimension(attr, 0)); + } else if (attr == R.styleable.UserAvatarView_framePadding) { + setFramePadding(a.getDimension(attr, 0)); + } else if (attr == R.styleable.UserAvatarView_frameColor) { + setFrameColor(a.getColorStateList(attr)); + } else if (attr == R.styleable.UserAvatarView_badgeDiameter) { + setBadgeDiameter(a.getDimension(attr, 0)); + } else if (attr == R.styleable.UserAvatarView_badgeMargin) { + setBadgeMargin(a.getDimension(attr, 0)); } } a.recycle(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java index 0c201c3d8660..5fd79a4bb342 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/IconLoggerImpl.java @@ -23,7 +23,7 @@ import android.content.Context; import android.metrics.LogMaker; import android.os.Handler; import android.os.Looper; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.ArraySet; import com.android.internal.logging.MetricsLogger; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java index 3febdfdfbe7e..fcd7e0953825 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LocationControllerImpl.java @@ -33,7 +33,7 @@ import android.os.Process; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.android.systemui.util.Utils; import java.util.ArrayList; import java.util.List; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java index 924aa0120c94..d43dc810cfb5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java @@ -127,19 +127,14 @@ public class SmartReplyView extends ViewGroup { final int length = arr.getIndexCount(); for (int i = 0; i < length; i++) { int attr = arr.getIndex(i); - switch (attr) { - case R.styleable.SmartReplyView_spacing: - spacing = arr.getDimensionPixelSize(i, 0); - break; - case R.styleable.SmartReplyView_singleLineButtonPaddingHorizontal: - singleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0); - break; - case R.styleable.SmartReplyView_doubleLineButtonPaddingHorizontal: - doubleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0); - break; - case R.styleable.SmartReplyView_buttonStrokeWidth: - strokeWidth = arr.getDimensionPixelSize(i, 0); - break; + if (attr == R.styleable.SmartReplyView_spacing) { + spacing = arr.getDimensionPixelSize(i, 0); + } else if (attr == R.styleable.SmartReplyView_singleLineButtonPaddingHorizontal) { + singleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0); + } else if (attr == R.styleable.SmartReplyView_doubleLineButtonPaddingHorizontal) { + doubleLineButtonPaddingHorizontal = arr.getDimensionPixelSize(i, 0); + } else if (attr == R.styleable.SmartReplyView_buttonStrokeWidth) { + strokeWidth = arr.getDimensionPixelSize(i, 0); } } arr.recycle(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/AnimationFilter.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/AnimationFilter.java index c26568ea00b3..a8464b31d685 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/AnimationFilter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/AnimationFilter.java @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.stack; -import android.support.v4.util.ArraySet; +import androidx.collection.ArraySet; import android.util.Property; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 9c26c69045d5..48ea77b2f027 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -42,9 +42,9 @@ import android.graphics.Rect; import android.os.Bundle; import android.os.Handler; import android.service.notification.StatusBarNotification; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; -import android.support.v4.graphics.ColorUtils; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.ColorUtils; import android.util.AttributeSet; import android.util.FloatProperty; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java index 1a51dabe209a..499be42b0b8c 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java @@ -16,7 +16,7 @@ package com.android.systemui.tuner; import android.content.Context; import android.provider.Settings; -import android.support.v7.preference.DropDownPreference; +import androidx.preference.DropDownPreference; import android.text.TextUtils; import android.util.ArraySet; import android.util.AttributeSet; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java index c9c780aa6a70..702abeabc136 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/BetterListPreference.java @@ -15,7 +15,7 @@ package com.android.systemui.tuner; import android.content.Context; -import android.support.v7.preference.ListPreference; +import androidx.preference.ListPreference; import android.util.AttributeSet; public class BetterListPreference extends ListPreference { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java index 014ec9279395..16ab65c341ca 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java @@ -14,7 +14,7 @@ package com.android.systemui.tuner; import android.content.Context; -import android.support.v7.preference.DropDownPreference; +import androidx.preference.DropDownPreference; import android.text.TextUtils; import android.util.ArraySet; import android.util.AttributeSet; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java index e50fd5e2c5c5..8da0043bf439 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/CustomListPreference.java @@ -22,8 +22,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; -import android.support.v14.preference.ListPreferenceDialogFragment; -import android.support.v7.preference.ListPreference; +import androidx.preference.ListPreferenceDialogFragment; +import androidx.preference.ListPreference; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java index b3c86c6c6a7b..a0f278bfbb8a 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/DemoModeFragment.java @@ -23,11 +23,11 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import android.support.v14.preference.PreferenceFragment; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; import android.view.MenuItem; import com.android.internal.logging.MetricsLogger; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java index 2df1793acb47..d63235ca8d26 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java @@ -30,13 +30,13 @@ import android.graphics.drawable.ScaleDrawable; import android.os.Bundle; import android.os.Handler; import android.os.Process; -import android.support.v14.preference.PreferenceFragment; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceGroup; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java index eb0c89b06528..e3a452a0786a 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java @@ -34,9 +34,9 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.Handler; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import android.text.SpannableStringBuilder; import android.text.style.ImageSpan; import android.util.Log; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java b/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java index 205db323ba41..d766145f27db 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/OtherPrefs.java @@ -15,7 +15,7 @@ package com.android.systemui.tuner; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; +import androidx.preference.PreferenceFragment; import com.android.systemui.R; public class OtherPrefs extends PreferenceFragment { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java index 27bf534c290e..c2948060d6bf 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/PluginFragment.java @@ -25,10 +25,10 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.v14.preference.PreferenceFragment; -import android.support.v14.preference.SwitchPreference; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceFragment; +import androidx.preference.SwitchPreference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; import android.util.ArrayMap; import android.util.ArraySet; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java index 3a2a6c3c4b64..d80c649be1ba 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/RadioListPreference.java @@ -21,9 +21,9 @@ import android.app.Fragment; import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.AttributeSet; import android.util.Log; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java b/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java index 1d1570846a4f..dded464901ac 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/SelectablePreference.java @@ -16,7 +16,7 @@ package com.android.systemui.tuner; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v7.preference.CheckBoxPreference; +import androidx.preference.CheckBoxPreference; import android.util.TypedValue; import com.android.systemui.statusbar.ScalingDrawableWrapper; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java b/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java index 533388a1a5d8..3c9d25d13350 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ShortcutPicker.java @@ -23,11 +23,11 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Process; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; import com.android.systemui.Dependency; import com.android.systemui.R; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java index 8a2407ac1d08..670fcc2a4d15 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java @@ -19,7 +19,7 @@ import android.app.ActivityManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java index 474a9a46c326..526e69bba795 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java @@ -18,9 +18,9 @@ package com.android.systemui.tuner; import android.app.Fragment; import android.app.FragmentTransaction; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.MenuItem; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java index df2be489b886..088630fa3f56 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerFragment.java @@ -22,8 +22,8 @@ import android.content.DialogInterface; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java index 06d40da4557e..a22277eea05b 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerPreferenceFragment.java @@ -16,8 +16,8 @@ package com.android.systemui.tuner; import android.app.DialogFragment; import android.os.Bundle; -import android.support.v14.preference.PreferenceFragment; -import android.support.v7.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.Preference; public abstract class TunerPreferenceFragment extends PreferenceFragment { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java index d5b6ccdeb320..f53d51690712 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java @@ -3,7 +3,7 @@ package com.android.systemui.tuner; import android.content.Context; import android.content.res.TypedArray; import android.provider.Settings; -import android.support.v14.preference.SwitchPreference; +import androidx.preference.SwitchPreference; import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java index 2995eba2b8a7..9b15b00b9242 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/DumpTruck.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.util.Log; import com.android.systemui.Dependency; diff --git a/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java b/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java index a247f3fe15dd..8ea5fd4ee93c 100644 --- a/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java +++ b/packages/SystemUI/src/com/android/systemui/util/leak/LeakReporter.java @@ -27,7 +27,7 @@ import android.net.Uri; import android.os.Debug; import android.os.SystemProperties; import android.os.UserHandle; -import android.support.v4.content.FileProvider; +import androidx.core.content.FileProvider; import android.util.Log; import com.google.android.collect.Lists; diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java index edf294e772f7..16ce35c50ea2 100644 --- a/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java +++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java @@ -18,7 +18,7 @@ package com.android.systemui.util.wakelock; import android.content.Context; import android.os.PowerManager; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; /** WakeLock wrapper for testability */ public interface WakeLock { diff --git a/packages/SystemUI/src/com/android/systemui/volume/MediaRouterWrapper.java b/packages/SystemUI/src/com/android/systemui/volume/MediaRouterWrapper.java index 3423452c2a27..9965b0459b9a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/MediaRouterWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/volume/MediaRouterWrapper.java @@ -16,8 +16,8 @@ package com.android.systemui.volume; -import android.support.v7.media.MediaRouteSelector; -import android.support.v7.media.MediaRouter; +import androidx.mediarouter.media.MediaRouteSelector; +import androidx.mediarouter.media.MediaRouter; import java.util.List; diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index a6b09ced2d81..9ee55324efa2 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -30,37 +30,17 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-Iaidl-files-under, src) \ - $(call all-java-files-under, ../src) + $(call all-Iaidl-files-under, src) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ - frameworks/base/packages/SystemUI/res \ - frameworks/base/packages/SystemUI/res-keyguard \ +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_STATIC_ANDROID_LIBRARIES := \ - SystemUIPluginLib \ - SystemUISharedLib \ - android-support-car \ - android-support-v4 \ - android-support-v7-recyclerview \ - android-support-v7-preference \ - android-support-v7-appcompat \ - android-support-v7-mediarouter \ - android-support-v7-palette \ - android-support-v14-preference \ - android-support-v17-leanback \ - android-slices-core \ - android-slices-view \ - android-slices-builders \ - android-arch-core-runtime \ - android-arch-lifecycle-extensions \ + SystemUI-core LOCAL_STATIC_JAVA_LIBRARIES := \ metrics-helper-lib \ android-support-test \ mockito-target-inline-minus-junit4 \ - SystemUI-proto \ - SystemUI-tags \ testables \ truth-prebuilt \ @@ -70,7 +50,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \ libdexmakerjvmtiagent \ libmultiplejvmtiagentsinterferenceagent - LOCAL_JAVA_LIBRARIES := \ android.test.runner \ telephony-common \ @@ -112,8 +91,6 @@ jacoco_exclude := $(subst $(space),$(comma),$(patsubst %,%*,$(local_classes))) LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.systemui.* LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := com.android.systemui.tests.*,$(jacoco_exclude) -include frameworks/base/packages/SettingsLib/common.mk - ifeq ($(EXCLUDE_SYSTEMUI_TESTS),) include $(BUILD_PACKAGE) endif diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml index 1be83229cf22..36ffebaef564 100644 --- a/packages/SystemUI/tests/AndroidManifest.xml +++ b/packages/SystemUI/tests/AndroidManifest.xml @@ -15,6 +15,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" + xmlns:tools="http://schemas.android.com/tools" package="com.android.systemui.tests"> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> @@ -63,6 +65,19 @@ <action android:name="com.android.systemui.action.TEST_ACTION" /> </intent-filter> </receiver> + + <provider android:name="com.android.systemui.keyguard.KeyguardSliceProvider" + android:authorities="com.android.systemui.test.keyguard.disabled" + android:enabled="false" + tools:replace="android:authorities" + tools:node="remove" /> + + <provider + android:name="androidx.core.content.FileProvider" + android:authorities="com.android.systemui.test.fileprovider" + android:exported="false" + tools:replace="android:authorities" + android:grantUriPermissions="true" /> </application> <instrumentation android:name="android.testing.TestableInstrumentation" diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 4328d94275e9..16585efe92af 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -6117,6 +6117,60 @@ message MetricsEvent { FIELD_AUTOFILL_SESSION_ID = 1456; // ---- End P Constants, all P constants go above this line ---- + + // OPEN: Emergency dialer opened + // CLOSE: Emergency dialer closed + // SUBTYPE: The entry type that user opened emergency dialer + // CATEGORY: EMERGENCY_DIALER + // OS: Q + EMERGENCY_DIALER = 1558; + + // FIELD: The screen is currently locked + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_IS_SCREEN_LOCKED = 1559; + + // FIELD: Bit flag indicating the actions performed by user + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_USER_ACTIONS = 1560; + + // FIELD: The duration user stayed at emergency dialer + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_DURATION_MS = 1561; + + // ACTION: Making call via emergency dialer + // SUBTYPE: The UI that user made phone call + // CATEGORY: EMERGENCY_DIALER + // OS: Q + EMERGENCY_DIALER_MAKE_CALL = 1562; + + // FIELD: The phone number type of a call user made + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_PHONE_NUMBER_TYPE = 1563; + + // FIELD: There is a shortcut for the phone number + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_PHONE_NUMBER_HAS_SHORTCUT = 1564; + + // FIELD: The phone is in pocket while using emergency dialer + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_IN_POCKET = 1565; + + // ACTION: The second tap on emergency shortcut to make a phone call + // CATEGORY: EMERGENCY_DIALER + // OS: Q + EMERGENCY_DIALER_SHORTCUT_CONFIRM_TAP = 1566; + + // FIELD: The time in milliseconds of second tap on shortcut since first tap + // CATEGORY: EMERGENCY_DIALER + // OS: Q + FIELD_EMERGENCY_DIALER_SHORTCUT_TAPS_INTERVAL = 1567; + // Add new aosp constants above this line. // END OF AOSP CONSTANTS } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index ba5f32308a30..760209024c57 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -183,6 +183,7 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -202,6 +203,8 @@ public class ConnectivityService extends IConnectivityManager.Stub private static final String DIAG_ARG = "--diag"; public static final String SHORT_ARG = "--short"; private static final String TETHERING_ARG = "tethering"; + private static final String NETWORK_ARG = "networks"; + private static final String REQUEST_ARG = "requests"; private static final boolean DBG = true; private static final boolean VDBG = false; @@ -1978,7 +1981,7 @@ public class ConnectivityService extends IConnectivityManager.Stub private void dumpNetworkDiagnostics(IndentingPrintWriter pw) { final List<NetworkDiagnostics> netDiags = new ArrayList<NetworkDiagnostics>(); final long DIAG_TIME_MS = 5000; - for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) { + for (NetworkAgentInfo nai : networksSortedById()) { // Start gathering diagnostic information. netDiags.add(new NetworkDiagnostics( nai.network, @@ -2009,6 +2012,12 @@ public class ConnectivityService extends IConnectivityManager.Stub } else if (ArrayUtils.contains(args, TETHERING_ARG)) { mTethering.dump(fd, pw, args); return; + } else if (ArrayUtils.contains(args, NETWORK_ARG)) { + dumpNetworks(pw); + return; + } else if (ArrayUtils.contains(args, REQUEST_ARG)) { + dumpNetworkRequests(pw); + return; } pw.print("NetworkFactories for:"); @@ -2029,36 +2038,15 @@ public class ConnectivityService extends IConnectivityManager.Stub pw.println("Current Networks:"); pw.increaseIndent(); - for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) { - pw.println(nai.toString()); - pw.increaseIndent(); - pw.println(String.format( - "Requests: REQUEST:%d LISTEN:%d BACKGROUND_REQUEST:%d total:%d", - nai.numForegroundNetworkRequests(), - nai.numNetworkRequests() - nai.numRequestNetworkRequests(), - nai.numBackgroundNetworkRequests(), - nai.numNetworkRequests())); - pw.increaseIndent(); - for (int i = 0; i < nai.numNetworkRequests(); i++) { - pw.println(nai.requestAt(i).toString()); - } - pw.decreaseIndent(); - pw.println("Lingered:"); - pw.increaseIndent(); - nai.dumpLingerTimers(pw); - pw.decreaseIndent(); - pw.decreaseIndent(); - } + dumpNetworks(pw); pw.decreaseIndent(); pw.println(); pw.println("Network Requests:"); pw.increaseIndent(); - for (NetworkRequestInfo nri : mNetworkRequests.values()) { - pw.println(nri.toString()); - } - pw.println(); + dumpNetworkRequests(pw); pw.decreaseIndent(); + pw.println(); mLegacyTypeTracker.dump(pw); @@ -2126,6 +2114,55 @@ public class ConnectivityService extends IConnectivityManager.Stub } } + private void dumpNetworks(IndentingPrintWriter pw) { + for (NetworkAgentInfo nai : networksSortedById()) { + pw.println(nai.toString()); + pw.increaseIndent(); + pw.println(String.format( + "Requests: REQUEST:%d LISTEN:%d BACKGROUND_REQUEST:%d total:%d", + nai.numForegroundNetworkRequests(), + nai.numNetworkRequests() - nai.numRequestNetworkRequests(), + nai.numBackgroundNetworkRequests(), + nai.numNetworkRequests())); + pw.increaseIndent(); + for (int i = 0; i < nai.numNetworkRequests(); i++) { + pw.println(nai.requestAt(i).toString()); + } + pw.decreaseIndent(); + pw.println("Lingered:"); + pw.increaseIndent(); + nai.dumpLingerTimers(pw); + pw.decreaseIndent(); + pw.decreaseIndent(); + } + } + + private void dumpNetworkRequests(IndentingPrintWriter pw) { + for (NetworkRequestInfo nri : requestsSortedById()) { + pw.println(nri.toString()); + } + } + + /** + * Return an array of all current NetworkAgentInfos sorted by network id. + */ + private NetworkAgentInfo[] networksSortedById() { + NetworkAgentInfo[] networks = new NetworkAgentInfo[0]; + networks = mNetworkAgentInfos.values().toArray(networks); + Arrays.sort(networks, Comparator.comparingInt(nai -> nai.network.netId)); + return networks; + } + + /** + * Return an array of all current NetworkRequest sorted by request id. + */ + private NetworkRequestInfo[] requestsSortedById() { + NetworkRequestInfo[] requests = new NetworkRequestInfo[0]; + requests = mNetworkRequests.values().toArray(requests); + Arrays.sort(requests, Comparator.comparingInt(nri -> nri.request.requestId)); + return requests; + } + private boolean isLiveNetworkAgent(NetworkAgentInfo nai, int what) { if (nai.network == null) return false; final NetworkAgentInfo officialNai = getNetworkAgentInfoForNetwork(nai.network); @@ -2916,7 +2953,7 @@ public class ConnectivityService extends IConnectivityManager.Stub pw.println("User setting: " + description); pw.println("Network overrides:"); pw.increaseIndent(); - for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) { + for (NetworkAgentInfo nai : networksSortedById()) { if (nai.avoidUnvalidated) { pw.println(nai.name()); } diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 9367a835e5f1..44bf2a57912e 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -1544,7 +1544,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub final String defaultImiId = mSettings.getSelectedInputMethod(); final boolean imeSelectedOnBoot = !TextUtils.isEmpty(defaultImiId); buildInputMethodListLocked(!imeSelectedOnBoot /* resetDefaultEnabledIme */); - resetDefaultImeLocked(mContext); updateFromSettingsLocked(true); InputMethodUtils.setNonSelectedSystemImesDisabledUntilUsed(mIPackageManager, mSettings.getEnabledInputMethodListLocked(), currentUserId, diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java index 744ed25f160f..01e81525d5b5 100644 --- a/services/core/java/com/android/server/IpSecService.java +++ b/services/core/java/com/android/server/IpSecService.java @@ -27,7 +27,6 @@ import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.NonNull; import android.app.AppOpsManager; import android.content.Context; -import android.net.ConnectivityManager; import android.net.IIpSecService; import android.net.INetd; import android.net.IpSecAlgorithm; @@ -44,7 +43,6 @@ import android.net.NetworkUtils; import android.net.TrafficStats; import android.net.util.NetdService; import android.os.Binder; -import android.os.DeadSystemException; import android.os.IBinder; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -89,9 +87,8 @@ public class IpSecService extends IIpSecService.Stub { private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG); private static final String NETD_SERVICE_NAME = "netd"; - private static final int[] DIRECTIONS = - new int[] {IpSecManager.DIRECTION_OUT, IpSecManager.DIRECTION_IN}; - private static final String[] WILDCARD_ADDRESSES = new String[]{"0.0.0.0", "::"}; + private static final int[] ADDRESS_FAMILIES = + new int[] {OsConstants.AF_INET, OsConstants.AF_INET6}; private static final int NETD_FETCH_TIMEOUT_MS = 5000; // ms private static final int MAX_PORT_BIND_ATTEMPTS = 10; @@ -819,16 +816,22 @@ public class IpSecService extends IIpSecService.Stub { // Teardown VTI // Delete global policies try { - mSrvConfig.getNetdInstance().removeVirtualTunnelInterface(mInterfaceName); - - for(String wildcardAddr : WILDCARD_ADDRESSES) { - for (int direction : DIRECTIONS) { - int mark = (direction == IpSecManager.DIRECTION_IN) ? mIkey : mOkey; - mSrvConfig - .getNetdInstance() - .ipSecDeleteSecurityPolicy( - 0, direction, wildcardAddr, wildcardAddr, mark, 0xffffffff); - } + final INetd netd = mSrvConfig.getNetdInstance(); + netd.removeVirtualTunnelInterface(mInterfaceName); + + for (int selAddrFamily : ADDRESS_FAMILIES) { + netd.ipSecDeleteSecurityPolicy( + 0, + selAddrFamily, + IpSecManager.DIRECTION_OUT, + mOkey, + 0xffffffff); + netd.ipSecDeleteSecurityPolicy( + 0, + selAddrFamily, + IpSecManager.DIRECTION_IN, + mIkey, + 0xffffffff); } } catch (ServiceSpecificException | RemoteException e) { Log.e( @@ -1276,25 +1279,29 @@ public class IpSecService extends IIpSecService.Stub { // Create VTI // Add inbound/outbound global policies // (use reqid = 0) - mSrvConfig - .getNetdInstance() - .addVirtualTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey); - - for(String wildcardAddr : WILDCARD_ADDRESSES) { - for (int direction : DIRECTIONS) { - int mark = (direction == IpSecManager.DIRECTION_OUT) ? okey : ikey; - - mSrvConfig - .getNetdInstance() - .ipSecAddSecurityPolicy( - 0, // Use 0 for reqId - direction, - wildcardAddr, - wildcardAddr, - 0, - mark, - 0xffffffff); - } + final INetd netd = mSrvConfig.getNetdInstance(); + netd.addVirtualTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey); + + for (int selAddrFamily : ADDRESS_FAMILIES) { + // Always send down correct local/remote addresses for template. + netd.ipSecAddSecurityPolicy( + 0, // Use 0 for reqId + selAddrFamily, + IpSecManager.DIRECTION_OUT, + localAddr, + remoteAddr, + 0, + okey, + 0xffffffff); + netd.ipSecAddSecurityPolicy( + 0, // Use 0 for reqId + selAddrFamily, + IpSecManager.DIRECTION_IN, + remoteAddr, + localAddr, + 0, + ikey, + 0xffffffff); } userRecord.mTunnelInterfaceRecords.put( @@ -1693,9 +1700,9 @@ public class IpSecService extends IIpSecService.Stub { SpiRecord spiRecord = userRecord.mSpiRecords.getResourceOrThrow(c.getSpiResourceId()); int mark = - (direction == IpSecManager.DIRECTION_IN) - ? tunnelInterfaceInfo.getIkey() - : tunnelInterfaceInfo.getOkey(); + (direction == IpSecManager.DIRECTION_OUT) + ? tunnelInterfaceInfo.getOkey() + : tunnelInterfaceInfo.getIkey(); try { c.setMarkValue(mark); @@ -1706,14 +1713,15 @@ public class IpSecService extends IIpSecService.Stub { c.setNetwork(tunnelInterfaceInfo.getUnderlyingNetwork()); // If outbound, also add SPI to the policy. - for(String wildcardAddr : WILDCARD_ADDRESSES) { + for (int selAddrFamily : ADDRESS_FAMILIES) { mSrvConfig .getNetdInstance() .ipSecUpdateSecurityPolicy( 0, // Use 0 for reqId + selAddrFamily, direction, - wildcardAddr, - wildcardAddr, + tunnelInterfaceInfo.getLocalAddress(), + tunnelInterfaceInfo.getRemoteAddress(), transformInfo.getSpiRecord().getSpi(), mark, 0xffffffff); diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS index 4fa0c07dcef5..fe9f1b5e82d6 100644 --- a/services/core/java/com/android/server/OWNERS +++ b/services/core/java/com/android/server/OWNERS @@ -1,25 +1,5 @@ # Connectivity / Networking -per-file ConnectivityService.java=codewiz@google.com -per-file ConnectivityService.java=ek@google.com -per-file ConnectivityService.java=jchalard@google.com -per-file ConnectivityService.java=lorenzo@google.com -per-file ConnectivityService.java=reminv@google.com -per-file ConnectivityService.java=satk@google.com -per-file NetworkManagementService.java=codewiz@google.com -per-file NetworkManagementService.java=ek@google.com -per-file NetworkManagementService.java=jchalard@google.com -per-file NetworkManagementService.java=lorenzo@google.com -per-file NetworkManagementService.java=reminv@google.com -per-file NetworkManagementService.java=satk@google.com -per-file NsdService.java=codewiz@google.com -per-file NsdService.java=ek@google.com -per-file NsdService.java=jchalard@google.com -per-file NsdService.java=lorenzo@google.com -per-file NsdService.java=reminv@google.com -per-file NsdService.java=satk@google.com +per-file ConnectivityService.java,NetworkManagementService.java,NsdService.java = codewiz@google.com, ek@google.com, jchalard@google.com, lorenzo@google.com, reminv@google.com, satk@google.com -# Vibrator -per-file VibratorService.java=michaelwr@google.com - -# Threads -per-file DisplayThread.java=michaelwr@google.com +# Vibrator / Threads +per-file VibratorService.java, DisplayThread.java = michaelwr@google.com diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index ad9fa40e0ab8..566ce4f48e25 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -36,6 +36,7 @@ import android.telephony.CellInfo; import android.telephony.CellLocation; import android.telephony.DisconnectCause; import android.telephony.LocationAccessPolicy; +import android.telephony.PhoneCapability; import android.telephony.PhoneStateListener; import android.telephony.PhysicalChannelConfig; import android.telephony.PreciseCallState; @@ -47,7 +48,6 @@ import android.telephony.SignalStrength; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.telephony.VoLteServiceState; -import android.text.TextUtils; import android.util.LocalLog; import com.android.internal.app.IBatteryStats; @@ -200,6 +200,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { private boolean mCarrierNetworkChangeState = false; + private PhoneCapability mPhoneCapability = null; + private final LocalLog mLocalLog = new LocalLog(100); private PreciseDataConnectionState mPreciseDataConnectionState = @@ -658,6 +660,13 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { remove(r.binder); } } + if ((events & PhoneStateListener.LISTEN_PHONE_CAPABILITY_CHANGE) != 0) { + try { + r.callback.onPhoneCapabilityChanged(mPhoneCapability); + } catch (RemoteException ex) { + remove(r.binder); + } + } } } } else { @@ -1453,6 +1462,33 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { } } + public void notifyPhoneCapabilityChanged(PhoneCapability capability) { + if (!checkNotifyPermission("notifyPhoneCapabilityChanged()")) { + return; + } + + if (VDBG) { + log("notifyPhoneCapabilityChanged: capability=" + capability); + } + + synchronized (mRecords) { + mPhoneCapability = capability; + + for (Record r : mRecords) { + if (r.matchPhoneStateListenerEvent( + PhoneStateListener.LISTEN_PHONE_CAPABILITY_CHANGE)) { + try { + r.callback.onPhoneCapabilityChanged(capability); + } catch (RemoteException ex) { + mRemoveList.add(r.binder); + } + } + } + handleRemoveListLocked(); + } + } + + @Override public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); @@ -1488,6 +1524,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { pw.println("mForegroundCallState=" + mForegroundCallState); pw.println("mBackgroundCallState=" + mBackgroundCallState); pw.println("mVoLteServiceState=" + mVoLteServiceState); + pw.println("mPhoneCapability=" + mPhoneCapability); pw.decreaseIndent(); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index f7cb8345e43f..2447a03bc25f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -21996,8 +21996,8 @@ public class ActivityManagerService extends IActivityManager.Stub activeInstr.mUiAutomationConnection = uiAutomationConnection; activeInstr.mResultClass = className; - boolean disableHiddenApiChecks = - (flags & INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0; + boolean disableHiddenApiChecks = ai.usesNonSdkApi + || (flags & INSTRUMENTATION_FLAG_DISABLE_HIDDEN_API_CHECKS) != 0; if (disableHiddenApiChecks) { enforceCallingPermission(android.Manifest.permission.DISABLE_HIDDEN_API_CHECKS, "disable hidden API checks"); diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS index f60c5c3208d9..79c98e550774 100644 --- a/services/core/java/com/android/server/am/OWNERS +++ b/services/core/java/com/android/server/am/OWNERS @@ -4,7 +4,6 @@ yamasani@google.com jsharkey@google.com hackbod@google.com omakoto@google.com -fkupolov@google.com ctate@google.com huiyu@google.com mwachens@google.com @@ -28,7 +27,4 @@ toddke@google.com michaelwr@google.com narayan@google.com -per-file GlobalSettingsToPropertiesMapper.java=fkupolov@google.com -per-file GlobalSettingsToPropertiesMapper.java=omakoto@google.com -per-file GlobalSettingsToPropertiesMapper.java=svetoslavganov@google.com -per-file GlobalSettingsToPropertiesMapper.java=yamasani@google.com +per-file GlobalSettingsToPropertiesMapper.java = omakoto@google.com, svetoslavganov@google.com, yamasani@google.com diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java index c0beb37577fc..b8f057db290a 100644 --- a/services/core/java/com/android/server/connectivity/DnsManager.java +++ b/services/core/java/com/android/server/connectivity/DnsManager.java @@ -35,7 +35,6 @@ import android.net.LinkProperties; import android.net.Network; import android.net.NetworkUtils; import android.net.Uri; -import android.net.dns.ResolvUtil; import android.os.Binder; import android.os.INetworkManagementService; import android.os.UserHandle; @@ -174,15 +173,6 @@ public class DnsManager { return new PrivateDnsConfig(useTls); } - public static PrivateDnsConfig tryBlockingResolveOf(Network network, String name) { - try { - final InetAddress[] ips = ResolvUtil.blockingResolveAllLocally(network, name); - return new PrivateDnsConfig(name, ips); - } catch (UnknownHostException uhe) { - return new PrivateDnsConfig(name, null); - } - } - public static Uri[] getPrivateDnsSettingsUris() { return new Uri[]{ Settings.Global.getUriFor(PRIVATE_DNS_DEFAULT_MODE), diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index 843ba2e23224..ca9b25699c1c 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -43,7 +43,6 @@ import android.net.TrafficStats; import android.net.Uri; import android.net.captiveportal.CaptivePortalProbeResult; import android.net.captiveportal.CaptivePortalProbeSpec; -import android.net.dns.ResolvUtil; import android.net.metrics.IpConnectivityLog; import android.net.metrics.NetworkEvent; import android.net.metrics.ValidationProbeEvent; @@ -326,7 +325,7 @@ public class NetworkMonitor extends StateMachine { mConnectivityServiceHandler = handler; mDependencies = deps; mNetworkAgentInfo = networkAgentInfo; - mNetwork = deps.getNetwork(networkAgentInfo); + mNetwork = deps.getNetwork(networkAgentInfo).getPrivateDnsBypassingCopy(); mNetId = mNetwork.netId; mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); @@ -800,9 +799,7 @@ public class NetworkMonitor extends StateMachine { private void resolveStrictModeHostname() { try { // Do a blocking DNS resolution using the network-assigned nameservers. - // Do not set AI_ADDRCONFIG in ai_flags so we get all address families in advance. - final InetAddress[] ips = ResolvUtil.blockingResolveAllLocally( - mNetwork, mPrivateDnsProviderHostname, 0 /* aiFlags */); + final InetAddress[] ips = mNetwork.getAllByName(mPrivateDnsProviderHostname); mPrivateDnsConfig = new PrivateDnsConfig(mPrivateDnsProviderHostname, ips); validationLog("Strict mode hostname resolved: " + mPrivateDnsConfig); } catch (UnknownHostException uhe) { @@ -860,14 +857,13 @@ public class NetworkMonitor extends StateMachine { // to complete, regardless of how many IP addresses a host has. private static class OneAddressPerFamilyNetwork extends Network { public OneAddressPerFamilyNetwork(Network network) { - super(network); + // Always bypass Private DNS. + super(network.getPrivateDnsBypassingCopy()); } @Override public InetAddress[] getAllByName(String host) throws UnknownHostException { - // Always bypass Private DNS. - final List<InetAddress> addrs = Arrays.asList( - ResolvUtil.blockingResolveAllLocally(this, host)); + final List<InetAddress> addrs = Arrays.asList(super.getAllByName(host)); // Ensure the address family of the first address is tried first. LinkedHashMap<Class, InetAddress> addressByFamily = new LinkedHashMap<>(); diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java index e471c7d84b56..7b8571c131b6 100644 --- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java +++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java @@ -24,6 +24,7 @@ import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; import static android.content.pm.ApplicationInfo.FLAG_UPDATED_SYSTEM_APP; import static android.content.pm.PackageManager.GET_PERMISSIONS; +import android.annotation.NonNull; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -34,6 +35,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.UserInfo; import android.net.Uri; +import android.os.Build; import android.os.INetworkManagementService; import android.os.RemoteException; import android.os.UserHandle; @@ -155,9 +157,8 @@ public class PermissionMonitor { } @VisibleForTesting - boolean isPreinstalledSystemApp(PackageInfo app) { - int flags = app.applicationInfo != null ? app.applicationInfo.flags : 0; - return (flags & (FLAG_SYSTEM | FLAG_UPDATED_SYSTEM_APP)) != 0; + static boolean isVendorApp(@NonNull ApplicationInfo appInfo) { + return appInfo.isVendor() || appInfo.isOem() || appInfo.isProduct(); } @VisibleForTesting @@ -177,7 +178,13 @@ public class PermissionMonitor { } private boolean hasRestrictedNetworkPermission(PackageInfo app) { - if (isPreinstalledSystemApp(app)) return true; + // TODO : remove this check in the future(b/31479477). All apps should just + // request the appropriate permission for their use case since android Q. + if (app.applicationInfo != null + && app.applicationInfo.targetSdkVersion < Build.VERSION_CODES.Q + && isVendorApp(app.applicationInfo)) { + return true; + } return hasPermission(app, CONNECTIVITY_INTERNAL) || hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS); } @@ -186,13 +193,8 @@ public class PermissionMonitor { // This function defines what it means to hold the permission to use // background networks. return hasPermission(app, CHANGE_NETWORK_STATE) - || hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS) - || hasPermission(app, CONNECTIVITY_INTERNAL) || hasPermission(app, NETWORK_STACK) - // TODO : remove this check (b/31479477). Not all preinstalled apps should - // have access to background networks, they should just request the appropriate - // permission for their use case from the list above. - || isPreinstalledSystemApp(app); + || hasRestrictedNetworkPermission(app); } public boolean hasUseBackgroundNetworksPermission(int uid) { diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java index 84bdbba54098..d16c2776dc3b 100644 --- a/services/core/java/com/android/server/connectivity/Tethering.java +++ b/services/core/java/com/android/server/connectivity/Tethering.java @@ -1126,7 +1126,9 @@ public class Tethering extends BaseNetworkObserver { } public String[] getTetheredDhcpRanges() { - return mConfig.dhcpRanges; + // TODO: this is only valid for the old DHCP server. Latest search suggests it is only used + // by WifiP2pServiceImpl to start dnsmasq: remove/deprecate after migrating callers. + return mConfig.legacyDhcpRanges; } public String[] getErroredIfaces() { @@ -1297,13 +1299,17 @@ public class Tethering extends BaseNetworkObserver { return false; } // TODO: Randomize DHCPv4 ranges, especially in hotspot mode. + // Legacy DHCP server is disabled if passed an empty ranges array + final String[] dhcpRanges = cfg.enableLegacyDhcpServer + ? cfg.legacyDhcpRanges + : new String[0]; try { // TODO: Find a more accurate method name (startDHCPv4()?). - mNMService.startTethering(cfg.dhcpRanges); + mNMService.startTethering(dhcpRanges); } catch (Exception e) { try { mNMService.stopTethering(); - mNMService.startTethering(cfg.dhcpRanges); + mNMService.startTethering(dhcpRanges); } catch (Exception ee) { mLog.e(ee); transitionTo(mStartTetheringErrorState); @@ -1972,7 +1978,7 @@ public class Tethering extends BaseNetworkObserver { final TetherState tetherState = new TetherState( new TetherInterfaceStateMachine( iface, mLooper, interfaceType, mLog, mNMService, mStatsService, - makeControlCallback(iface), mDeps)); + makeControlCallback(iface), mConfig.enableLegacyDhcpServer, mDeps)); mTetherStates.put(iface, tetherState); tetherState.stateMachine.start(); } diff --git a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java index 9e6b659dbf93..5accb452d10a 100644 --- a/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java +++ b/services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java @@ -16,6 +16,7 @@ package com.android.server.connectivity.tethering; +import static android.net.NetworkUtils.numericToInetAddress; import static android.net.util.NetworkConstants.asByte; import static android.net.util.NetworkConstants.FF; import static android.net.util.NetworkConstants.RFC7421_PREFIX_LENGTH; @@ -27,8 +28,9 @@ import android.net.InterfaceConfiguration; import android.net.IpPrefix; import android.net.LinkAddress; import android.net.LinkProperties; -import android.net.NetworkUtils; import android.net.RouteInfo; +import android.net.dhcp.DhcpServer; +import android.net.dhcp.DhcpServingParams; import android.net.ip.InterfaceController; import android.net.ip.RouterAdvertisementDaemon; import android.net.ip.RouterAdvertisementDaemon.RaParams; @@ -49,6 +51,7 @@ import com.android.internal.util.Protocol; import com.android.internal.util.State; import com.android.internal.util.StateMachine; +import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; @@ -73,6 +76,13 @@ public class TetherInterfaceStateMachine extends StateMachine { private static final String WIFI_HOST_IFACE_ADDR = "192.168.43.1"; private static final int WIFI_HOST_IFACE_PREFIX_LENGTH = 24; + // TODO: have PanService use some visible version of this constant + private static final String BLUETOOTH_IFACE_ADDR = "192.168.44.1"; + private static final int BLUETOOTH_DHCP_PREFIX_LENGTH = 24; + + // TODO: have this configurable + private static final int DHCP_LEASE_TIME_SECS = 3600; + private final static String TAG = "TetherInterfaceSM"; private final static boolean DBG = false; private final static boolean VDBG = false; @@ -119,6 +129,7 @@ public class TetherInterfaceStateMachine extends StateMachine { private final String mIfaceName; private final int mInterfaceType; private final LinkProperties mLinkProperties; + private final boolean mUsingLegacyDhcp; private final TetheringDependencies mDeps; @@ -134,12 +145,13 @@ public class TetherInterfaceStateMachine extends StateMachine { // Advertisements (otherwise, we do not add them to mLinkProperties at all). private LinkProperties mLastIPv6LinkProperties; private RouterAdvertisementDaemon mRaDaemon; + private DhcpServer mDhcpServer; private RaParams mLastRaParams; public TetherInterfaceStateMachine( String ifaceName, Looper looper, int interfaceType, SharedLog log, INetworkManagementService nMService, INetworkStatsService statsService, - IControlsTethering tetherController, + IControlsTethering tetherController, boolean usingLegacyDhcp, TetheringDependencies deps) { super(ifaceName, looper); mLog = log.forSubComponent(ifaceName); @@ -151,6 +163,7 @@ public class TetherInterfaceStateMachine extends StateMachine { mIfaceName = ifaceName; mInterfaceType = interfaceType; mLinkProperties = new LinkProperties(); + mUsingLegacyDhcp = usingLegacyDhcp; mDeps = deps; resetLinkProperties(); mLastError = ConnectivityManager.TETHER_ERROR_NO_ERROR; @@ -188,6 +201,53 @@ public class TetherInterfaceStateMachine extends StateMachine { private boolean startIPv4() { return configureIPv4(true); } + private boolean startDhcp(Inet4Address addr, int prefixLen) { + if (mUsingLegacyDhcp) { + return true; + } + + final InterfaceParams ifaceParams = mDeps.getInterfaceParams(mIfaceName); + if (ifaceParams == null) { + Log.e(TAG, "Failed to find interface params for DHCPv4"); + return false; + } + final DhcpServingParams params; + try { + params = new DhcpServingParams.Builder() + .setDefaultRouters(addr) + .setDhcpLeaseTimeSecs(DHCP_LEASE_TIME_SECS) + .setDnsServers(addr) + .setServerAddr(new LinkAddress(addr, prefixLen)) + .setMetered(true) + .build(); + // TODO: also advertise link MTU + } catch (DhcpServingParams.InvalidParameterException e) { + Log.e(TAG, "Invalid DHCP parameters", e); + return false; + } + + mDhcpServer = mDeps.makeDhcpServer(getHandler().getLooper(), ifaceParams, params, + mLog.forSubComponent("DHCP")); + mDhcpServer.start(); + return true; + } + + private void stopDhcp() { + if (mDhcpServer != null) { + mDhcpServer.stop(); + mDhcpServer = null; + } + } + + private boolean configureDhcp(boolean enable, Inet4Address addr, int prefixLen) { + if (enable) { + return startDhcp(addr, prefixLen); + } else { + stopDhcp(); + return true; + } + } + private void stopIPv4() { configureIPv4(false); // NOTE: All of configureIPv4() will be refactored out of existence @@ -210,8 +270,9 @@ public class TetherInterfaceStateMachine extends StateMachine { ipAsString = getRandomWifiIPv4Address(); prefixLen = WIFI_HOST_IFACE_PREFIX_LENGTH; } else { - // Nothing to do, BT does this elsewhere. - return true; + // BT configures the interface elsewhere: only start DHCP. + final Inet4Address srvAddr = (Inet4Address) numericToInetAddress(BLUETOOTH_IFACE_ADDR); + return configureDhcp(enabled, srvAddr, BLUETOOTH_DHCP_PREFIX_LENGTH); } final LinkAddress linkAddr; @@ -222,7 +283,7 @@ public class TetherInterfaceStateMachine extends StateMachine { return false; } - InetAddress addr = NetworkUtils.numericToInetAddress(ipAsString); + InetAddress addr = numericToInetAddress(ipAsString); linkAddr = new LinkAddress(addr, prefixLen); ifcg.setLinkAddress(linkAddr); if (mInterfaceType == ConnectivityManager.TETHERING_WIFI) { @@ -239,6 +300,10 @@ public class TetherInterfaceStateMachine extends StateMachine { } ifcg.clearFlag("running"); mNMService.setInterfaceConfig(mIfaceName, ifcg); + + if (!configureDhcp(enabled, (Inet4Address) addr, prefixLen)) { + return false; + } } catch (Exception e) { mLog.e("Error configuring interface " + e); return false; @@ -258,7 +323,7 @@ public class TetherInterfaceStateMachine extends StateMachine { private String getRandomWifiIPv4Address() { try { - byte[] bytes = NetworkUtils.numericToInetAddress(WIFI_HOST_IFACE_ADDR).getAddress(); + byte[] bytes = numericToInetAddress(WIFI_HOST_IFACE_ADDR).getAddress(); bytes[3] = getRandomSanitizedByte(DOUG_ADAMS, asByte(0), asByte(1), FF); return InetAddress.getByAddress(bytes).getHostAddress(); } catch (Exception e) { diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java index dd9fe05b50ff..2b1d9196fe18 100644 --- a/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java +++ b/services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java @@ -21,6 +21,8 @@ import static android.net.ConnectivityManager.TYPE_ETHERNET; import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE_DUN; import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI; +import static android.provider.Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER; + import static com.android.internal.R.array.config_mobile_hotspot_provision_app; import static com.android.internal.R.array.config_tether_bluetooth_regexs; import static com.android.internal.R.array.config_tether_dhcp_range; @@ -30,15 +32,16 @@ import static com.android.internal.R.array.config_tether_wifi_regexs; import static com.android.internal.R.bool.config_tether_upstream_automatic; import static com.android.internal.R.string.config_mobile_hotspot_provision_app_no_ui; +import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.util.SharedLog; +import android.provider.Settings; import android.telephony.TelephonyManager; import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.R; import java.io.PrintWriter; import java.util.ArrayList; @@ -68,12 +71,13 @@ public class TetheringConfiguration { public static final int DUN_REQUIRED = 1; public static final int DUN_UNSPECIFIED = 2; + // Default ranges used for the legacy DHCP server. // USB is 192.168.42.1 and 255.255.255.0 // Wifi is 192.168.43.1 and 255.255.255.0 // BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1 // with 255.255.255.0 // P2P is 192.168.49.1 and 255.255.255.0 - private static final String[] DHCP_DEFAULT_RANGE = { + private static final String[] LEGACY_DHCP_DEFAULT_RANGE = { "192.168.42.2", "192.168.42.254", "192.168.43.2", "192.168.43.254", "192.168.44.2", "192.168.44.254", "192.168.45.2", "192.168.45.254", "192.168.46.2", "192.168.46.254", "192.168.47.2", "192.168.47.254", @@ -89,8 +93,9 @@ public class TetheringConfiguration { public final boolean isDunRequired; public final boolean chooseUpstreamAutomatically; public final Collection<Integer> preferredUpstreamIfaceTypes; - public final String[] dhcpRanges; + public final String[] legacyDhcpRanges; public final String[] defaultIPv4DNS; + public final boolean enableLegacyDhcpServer; public final String[] provisioningApp; public final String provisioningAppNoUi; @@ -112,8 +117,9 @@ public class TetheringConfiguration { preferredUpstreamIfaceTypes = getUpstreamIfaceTypes(ctx, dunCheck); isDunRequired = preferredUpstreamIfaceTypes.contains(TYPE_MOBILE_DUN); - dhcpRanges = getDhcpRanges(ctx); + legacyDhcpRanges = getLegacyDhcpRanges(ctx); defaultIPv4DNS = copy(DEFAULT_IPV4_DNS); + enableLegacyDhcpServer = getEnableLegacyDhcpServer(ctx); provisioningApp = getResourceStringArray(ctx, config_mobile_hotspot_provision_app); provisioningAppNoUi = getProvisioningAppNoUi(ctx); @@ -150,12 +156,15 @@ public class TetheringConfiguration { dumpStringArray(pw, "preferredUpstreamIfaceTypes", preferredUpstreamNames(preferredUpstreamIfaceTypes)); - dumpStringArray(pw, "dhcpRanges", dhcpRanges); + dumpStringArray(pw, "legacyDhcpRanges", legacyDhcpRanges); dumpStringArray(pw, "defaultIPv4DNS", defaultIPv4DNS); dumpStringArray(pw, "provisioningApp", provisioningApp); pw.print("provisioningAppNoUi: "); pw.println(provisioningAppNoUi); + + pw.print("enableLegacyDhcpServer: "); + pw.println(enableLegacyDhcpServer); } public String toString() { @@ -170,6 +179,7 @@ public class TetheringConfiguration { makeString(preferredUpstreamNames(preferredUpstreamIfaceTypes)))); sj.add(String.format("provisioningApp:%s", makeString(provisioningApp))); sj.add(String.format("provisioningAppNoUi:%s", provisioningAppNoUi)); + sj.add(String.format("enableLegacyDhcpServer:%s", enableLegacyDhcpServer)); return String.format("TetheringConfiguration{%s}", sj.toString()); } @@ -276,12 +286,12 @@ public class TetheringConfiguration { return false; } - private static String[] getDhcpRanges(Context ctx) { + private static String[] getLegacyDhcpRanges(Context ctx) { final String[] fromResource = getResourceStringArray(ctx, config_tether_dhcp_range); if ((fromResource.length > 0) && (fromResource.length % 2 == 0)) { return fromResource; } - return copy(DHCP_DEFAULT_RANGE); + return copy(LEGACY_DHCP_DEFAULT_RANGE); } private static String getProvisioningAppNoUi(Context ctx) { @@ -309,6 +319,13 @@ public class TetheringConfiguration { } } + private static boolean getEnableLegacyDhcpServer(Context ctx) { + // TODO: make the default false (0) and update javadoc in Settings.java + final ContentResolver cr = ctx.getContentResolver(); + final int intVal = Settings.Global.getInt(cr, TETHER_ENABLE_LEGACY_DHCP_SERVER, 1); + return intVal != 0; + } + private static String[] copy(String[] strarray) { return Arrays.copyOf(strarray, strarray.length); } diff --git a/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java b/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java index 605ee9c8ee2e..caa867c616b8 100644 --- a/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java +++ b/services/core/java/com/android/server/connectivity/tethering/TetheringDependencies.java @@ -19,11 +19,14 @@ package com.android.server.connectivity.tethering; import android.content.Context; import android.net.INetd; import android.net.NetworkRequest; +import android.net.dhcp.DhcpServer; +import android.net.dhcp.DhcpServingParams; import android.net.ip.RouterAdvertisementDaemon; import android.net.util.InterfaceParams; import android.net.util.NetdService; import android.os.Handler; import android.net.util.SharedLog; +import android.os.Looper; import com.android.internal.util.StateMachine; @@ -69,4 +72,9 @@ public class TetheringDependencies { public NetworkRequest getDefaultNetworkRequest() { return null; } + + public DhcpServer makeDhcpServer(Looper looper, InterfaceParams iface, DhcpServingParams params, + SharedLog log) { + return new DhcpServer(looper, iface, params, log); + } } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 9eb9ab9a1cec..96bf44ac6d5a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -546,6 +546,9 @@ class PackageManagerShellCommand extends ShellCommand { case "-e": listEnabled = true; break; + case "-a": + getFlags |= PackageManager.MATCH_KNOWN_PACKAGES; + break; case "-f": showSourceDir = true; break; @@ -2687,6 +2690,7 @@ class PackageManagerShellCommand extends ShellCommand { pw.println(" Prints all packages; optionally only those whose name contains"); pw.println(" the text in FILTER. Options are:"); pw.println(" -f: see their associated file"); + pw.println(" -a: all known packages"); pw.println(" -d: filter to only show disabled packages"); pw.println(" -e: filter to only show enabled packages"); pw.println(" -s: filter to only show system packages"); diff --git a/services/net/java/android/net/dhcp/DhcpAckPacket.java b/services/net/java/android/net/dhcp/DhcpAckPacket.java index df44b11fffa5..b2eb4e21b591 100644 --- a/services/net/java/android/net/dhcp/DhcpAckPacket.java +++ b/services/net/java/android/net/dhcp/DhcpAckPacket.java @@ -30,8 +30,8 @@ class DhcpAckPacket extends DhcpPacket { private final Inet4Address mSrcIp; DhcpAckPacket(int transId, short secs, boolean broadcast, Inet4Address serverAddress, - Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) { - super(transId, secs, clientIp, yourIp, serverAddress, INADDR_ANY, clientMac, broadcast); + Inet4Address relayIp, Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) { + super(transId, secs, clientIp, yourIp, serverAddress, relayIp, clientMac, broadcast); mBroadcast = broadcast; mSrcIp = serverAddress; } @@ -70,19 +70,8 @@ class DhcpAckPacket extends DhcpPacket { void finishPacket(ByteBuffer buffer) { addTlv(buffer, DHCP_MESSAGE_TYPE, DHCP_MESSAGE_TYPE_ACK); addTlv(buffer, DHCP_SERVER_IDENTIFIER, mServerIdentifier); - addTlv(buffer, DHCP_LEASE_TIME, mLeaseTime); - // the client should renew at 1/2 the lease-expiry interval - if (mLeaseTime != null) { - addTlv(buffer, DHCP_RENEWAL_TIME, - Integer.valueOf(mLeaseTime.intValue() / 2)); - } - - addTlv(buffer, DHCP_SUBNET_MASK, mSubnetMask); - addTlv(buffer, DHCP_ROUTER, mGateways); - addTlv(buffer, DHCP_DOMAIN_NAME, mDomainName); - addTlv(buffer, DHCP_BROADCAST_ADDRESS, mBroadcastAddress); - addTlv(buffer, DHCP_DNS_SERVER, mDnsServers); + addCommonServerTlvs(buffer); addTlvEnd(buffer); } diff --git a/services/net/java/android/net/dhcp/DhcpDiscoverPacket.java b/services/net/java/android/net/dhcp/DhcpDiscoverPacket.java index 91e6bd6469d8..11f2b6118e24 100644 --- a/services/net/java/android/net/dhcp/DhcpDiscoverPacket.java +++ b/services/net/java/android/net/dhcp/DhcpDiscoverPacket.java @@ -24,10 +24,17 @@ import java.nio.ByteBuffer; */ class DhcpDiscoverPacket extends DhcpPacket { /** + * The IP address of the client which sent this packet. + */ + final Inet4Address mSrcIp; + + /** * Generates a DISCOVER packet with the specified parameters. */ - DhcpDiscoverPacket(int transId, short secs, byte[] clientMac, boolean broadcast) { - super(transId, secs, INADDR_ANY, INADDR_ANY, INADDR_ANY, INADDR_ANY, clientMac, broadcast); + DhcpDiscoverPacket(int transId, short secs, Inet4Address relayIp, byte[] clientMac, + boolean broadcast, Inet4Address srcIp) { + super(transId, secs, INADDR_ANY, INADDR_ANY, INADDR_ANY, relayIp, clientMac, broadcast); + mSrcIp = srcIp; } public String toString() { @@ -41,8 +48,8 @@ class DhcpDiscoverPacket extends DhcpPacket { */ public ByteBuffer buildPacket(int encap, short destUdp, short srcUdp) { ByteBuffer result = ByteBuffer.allocate(MAX_LENGTH); - fillInPacket(encap, INADDR_BROADCAST, INADDR_ANY, destUdp, - srcUdp, result, DHCP_BOOTREQUEST, mBroadcast); + fillInPacket(encap, INADDR_BROADCAST, mSrcIp, destUdp, srcUdp, result, DHCP_BOOTREQUEST, + mBroadcast); result.flip(); return result; } diff --git a/services/net/java/android/net/dhcp/DhcpLease.java b/services/net/java/android/net/dhcp/DhcpLease.java new file mode 100644 index 000000000000..6cdd2aa8579d --- /dev/null +++ b/services/net/java/android/net/dhcp/DhcpLease.java @@ -0,0 +1,143 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.MacAddress; +import android.os.SystemClock; +import android.text.TextUtils; + +import com.android.internal.util.HexDump; + +import java.net.Inet4Address; +import java.util.Arrays; +import java.util.Objects; + +/** + * An IPv4 address assignment done through DHCPv4. + * @hide + */ +public class DhcpLease { + public static final long EXPIRATION_NEVER = Long.MAX_VALUE; + public static final String HOSTNAME_NONE = null; + + @Nullable + private final byte[] mClientId; + @NonNull + private final MacAddress mHwAddr; + @NonNull + private final Inet4Address mNetAddr; + /** + * Expiration time for the lease, to compare with {@link SystemClock#elapsedRealtime()}. + */ + private final long mExpTime; + @Nullable + private final String mHostname; + + public DhcpLease(@Nullable byte[] clientId, @NonNull MacAddress hwAddr, + @NonNull Inet4Address netAddr, long expTime, @Nullable String hostname) { + mClientId = (clientId == null ? null : Arrays.copyOf(clientId, clientId.length)); + mHwAddr = hwAddr; + mNetAddr = netAddr; + mExpTime = expTime; + mHostname = hostname; + } + + @Nullable + public byte[] getClientId() { + if (mClientId == null) { + return null; + } + return Arrays.copyOf(mClientId, mClientId.length); + } + + @NonNull + public MacAddress getHwAddr() { + return mHwAddr; + } + + @Nullable + public String getHostname() { + return mHostname; + } + + @NonNull + public Inet4Address getNetAddr() { + return mNetAddr; + } + + public long getExpTime() { + return mExpTime; + } + + /** + * Push back the expiration time of this lease. If the provided time is sooner than the original + * expiration time, the lease time will not be updated. + * + * <p>The lease hostname is updated with the provided one if set. + * @return A {@link DhcpLease} with expiration time set to max(expTime, currentExpTime) + */ + public DhcpLease renewedLease(long expTime, @Nullable String hostname) { + return new DhcpLease(mClientId, mHwAddr, mNetAddr, Math.max(expTime, mExpTime), + (hostname == null ? mHostname : hostname)); + } + + public boolean matchesClient(@Nullable byte[] clientId, @NonNull MacAddress hwAddr) { + if (mClientId != null) { + return Arrays.equals(mClientId, clientId); + } else { + return clientId == null && mHwAddr.equals(hwAddr); + } + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof DhcpLease)) { + return false; + } + final DhcpLease other = (DhcpLease)obj; + return Arrays.equals(mClientId, other.mClientId) + && mHwAddr.equals(other.mHwAddr) + && mNetAddr.equals(other.mNetAddr) + && mExpTime == other.mExpTime + && TextUtils.equals(mHostname, other.mHostname); + } + + @Override + public int hashCode() { + return Objects.hash(mClientId, mHwAddr, mNetAddr, mHostname, mExpTime); + } + + static String clientIdToString(byte[] bytes) { + if (bytes == null) { + return "null"; + } + return HexDump.toHexString(bytes); + } + + static String inet4AddrToString(@Nullable Inet4Address addr) { + return (addr == null) ? "null" : addr.getHostAddress(); + } + + @Override + public String toString() { + return String.format("clientId: %s, hwAddr: %s, netAddr: %s, expTime: %d, hostname: %s", + clientIdToString(mClientId), mHwAddr.toString(), inet4AddrToString(mNetAddr), + mExpTime, mHostname); + } +} diff --git a/services/net/java/android/net/dhcp/DhcpLeaseRepository.java b/services/net/java/android/net/dhcp/DhcpLeaseRepository.java new file mode 100644 index 000000000000..2dda42124c75 --- /dev/null +++ b/services/net/java/android/net/dhcp/DhcpLeaseRepository.java @@ -0,0 +1,544 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import static android.net.NetworkUtils.inet4AddressToIntHTH; +import static android.net.NetworkUtils.intToInet4AddressHTH; +import static android.net.NetworkUtils.prefixLengthToV4NetmaskIntHTH; +import static android.net.dhcp.DhcpLease.EXPIRATION_NEVER; +import static android.net.dhcp.DhcpLease.inet4AddrToString; +import static android.net.util.NetworkConstants.IPV4_ADDR_BITS; + +import static java.lang.Math.min; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.IpPrefix; +import android.net.MacAddress; +import android.net.util.SharedLog; +import android.net.dhcp.DhcpServer.Clock; +import android.util.ArrayMap; + +import java.net.Inet4Address; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.function.Function; + +/** + * A repository managing IPv4 address assignments through DHCPv4. + * + * <p>This class is not thread-safe. All public methods should be called on a common thread or + * use some synchronization mechanism. + * + * <p>Methods are optimized for a small number of allocated leases, assuming that most of the time + * only 2~10 addresses will be allocated, which is the common case. Managing a large number of + * addresses is supported but will be slower: some operations have complexity in O(num_leases). + * @hide + */ +class DhcpLeaseRepository { + public static final byte[] CLIENTID_UNSPEC = null; + public static final Inet4Address INETADDR_UNSPEC = null; + + @NonNull + private final SharedLog mLog; + @NonNull + private final Clock mClock; + + @NonNull + private IpPrefix mPrefix; + @NonNull + private Set<Inet4Address> mReservedAddrs; + private int mSubnetAddr; + private int mSubnetMask; + private int mNumAddresses; + private long mLeaseTimeMs; + + /** + * Next timestamp when committed or declined leases should be checked for expired ones. This + * will always be lower than or equal to the time for the first lease to expire: it's OK not to + * update this when removing entries, but it must always be updated when adding/updating. + */ + private long mNextExpirationCheck = EXPIRATION_NEVER; + + static class DhcpLeaseException extends Exception { + DhcpLeaseException(String message) { + super(message); + } + } + + static class OutOfAddressesException extends DhcpLeaseException { + OutOfAddressesException(String message) { + super(message); + } + } + + static class InvalidAddressException extends DhcpLeaseException { + InvalidAddressException(String message) { + super(message); + } + } + + static class InvalidSubnetException extends DhcpLeaseException { + InvalidSubnetException(String message) { + super(message); + } + } + + /** + * Leases by IP address + */ + private final ArrayMap<Inet4Address, DhcpLease> mCommittedLeases = new ArrayMap<>(); + + /** + * Map address -> expiration timestamp in ms. Addresses are guaranteed to be valid as defined + * by {@link #isValidAddress(Inet4Address)}, but are not necessarily otherwise available for + * assignment. + */ + private final LinkedHashMap<Inet4Address, Long> mDeclinedAddrs = new LinkedHashMap<>(); + + public DhcpLeaseRepository(@NonNull IpPrefix prefix, @NonNull Set<Inet4Address> reservedAddrs, + long leaseTimeMs, @NonNull SharedLog log, @NonNull Clock clock) { + updateParams(prefix, reservedAddrs, leaseTimeMs); + mLog = log; + mClock = clock; + } + + public void updateParams(@NonNull IpPrefix prefix, @NonNull Set<Inet4Address> reservedAddrs, + long leaseTimeMs) { + mPrefix = prefix; + mReservedAddrs = Collections.unmodifiableSet(new HashSet<>(reservedAddrs)); + mSubnetMask = prefixLengthToV4NetmaskIntHTH(prefix.getPrefixLength()); + mSubnetAddr = inet4AddressToIntHTH((Inet4Address) prefix.getAddress()) & mSubnetMask; + mNumAddresses = 1 << (IPV4_ADDR_BITS - prefix.getPrefixLength()); + mLeaseTimeMs = leaseTimeMs; + + cleanMap(mCommittedLeases); + cleanMap(mDeclinedAddrs); + } + + /** + * From a map keyed by {@link Inet4Address}, remove entries where the key is invalid (as + * specified by {@link #isValidAddress(Inet4Address)}), or is a reserved address. + */ + private <T> void cleanMap(Map<Inet4Address, T> map) { + final Iterator<Entry<Inet4Address, T>> it = map.entrySet().iterator(); + while (it.hasNext()) { + final Inet4Address addr = it.next().getKey(); + if (!isValidAddress(addr) || mReservedAddrs.contains(addr)) { + it.remove(); + } + } + } + + /** + * Get a DHCP offer, to reply to a DHCPDISCOVER. Follows RFC2131 #4.3.1. + * + * @param clientId Client identifier option if specified, or {@link #CLIENTID_UNSPEC} + * @param relayAddr Internet address of the relay (giaddr), can be {@link Inet4Address#ANY} + * @param reqAddr Requested address by the client (option 50), or {@link #INETADDR_UNSPEC} + * @param hostname Client-provided hostname, or {@link DhcpLease#HOSTNAME_NONE} + * @throws OutOfAddressesException The server does not have any available address + * @throws InvalidSubnetException The lease was requested from an unsupported subnet + */ + @NonNull + public DhcpLease getOffer(@Nullable byte[] clientId, @NonNull MacAddress hwAddr, + @NonNull Inet4Address relayAddr, @Nullable Inet4Address reqAddr, + @Nullable String hostname) throws OutOfAddressesException, InvalidSubnetException { + final long currentTime = mClock.elapsedRealtime(); + final long expTime = currentTime + mLeaseTimeMs; + + removeExpiredLeases(currentTime); + checkValidRelayAddr(relayAddr); + + final DhcpLease currentLease = findByClient(clientId, hwAddr); + final DhcpLease newLease; + if (currentLease != null) { + newLease = currentLease.renewedLease(expTime, hostname); + mLog.log("Offering extended lease " + newLease); + // Do not update lease time in the map: the offer is not committed yet. + } else if (reqAddr != null && isValidAddress(reqAddr) && isAvailable(reqAddr)) { + newLease = new DhcpLease(clientId, hwAddr, reqAddr, expTime, hostname); + mLog.log("Offering requested lease " + newLease); + } else { + newLease = makeNewOffer(clientId, hwAddr, expTime, hostname); + mLog.log("Offering new generated lease " + newLease); + } + return newLease; + } + + private void checkValidRelayAddr(@Nullable Inet4Address relayAddr) + throws InvalidSubnetException { + // As per #4.3.1, addresses are assigned based on the relay address if present. This + // implementation only assigns addresses if the relayAddr is inside our configured subnet. + // This also applies when the client requested a specific address for consistency between + // requests, and with older behavior. + if (isIpAddrOutsidePrefix(mPrefix, relayAddr)) { + throw new InvalidSubnetException("Lease requested by relay from outside of subnet"); + } + } + + private static boolean isIpAddrOutsidePrefix(@NonNull IpPrefix prefix, + @Nullable Inet4Address addr) { + return addr != null && !addr.equals(Inet4Address.ANY) && !prefix.contains(addr); + } + + @Nullable + private DhcpLease findByClient(@Nullable byte[] clientId, @NonNull MacAddress hwAddr) { + for (DhcpLease lease : mCommittedLeases.values()) { + if (lease.matchesClient(clientId, hwAddr)) { + return lease; + } + } + + // Note this differs from dnsmasq behavior, which would match by hwAddr if clientId was + // given but no lease keyed on clientId matched. This would prevent one interface from + // obtaining multiple leases with different clientId. + return null; + } + + /** + * Make a lease conformant to a client DHCPREQUEST or renew the client's existing lease, + * commit it to the repository and return it. + * + * <p>This method always succeeds and commits the lease if it does not throw, and has no side + * effects if it throws. + * + * @param clientId Client identifier option if specified, or {@link #CLIENTID_UNSPEC} + * @param reqAddr Requested address by the client (option 50), or {@link #INETADDR_UNSPEC} + * @param sidSet Whether the server identifier was set in the request + * @return The newly created or renewed lease + * @throws InvalidAddressException The client provided an address that conflicts with its + * current configuration, or other committed/reserved leases. + */ + @NonNull + public DhcpLease requestLease(@Nullable byte[] clientId, @NonNull MacAddress hwAddr, + @NonNull Inet4Address clientAddr, @NonNull Inet4Address relayAddr, + @Nullable Inet4Address reqAddr, boolean sidSet, @Nullable String hostname) + throws InvalidAddressException, InvalidSubnetException { + final long currentTime = mClock.elapsedRealtime(); + removeExpiredLeases(currentTime); + checkValidRelayAddr(relayAddr); + final DhcpLease assignedLease = findByClient(clientId, hwAddr); + + final Inet4Address leaseAddr = reqAddr != null ? reqAddr : clientAddr; + if (assignedLease != null) { + if (sidSet && reqAddr != null) { + // Client in SELECTING state; remove any current lease before creating a new one. + mCommittedLeases.remove(assignedLease.getNetAddr()); + } else if (!assignedLease.getNetAddr().equals(leaseAddr)) { + // reqAddr null (RENEWING/REBINDING): client renewing its own lease for clientAddr. + // reqAddr set with sid not set (INIT-REBOOT): client verifying configuration. + // In both cases, throw if clientAddr or reqAddr does not match the known lease. + throw new InvalidAddressException("Incorrect address for client in " + + (reqAddr != null ? "INIT-REBOOT" : "RENEWING/REBINDING")); + } + } + + // In the init-reboot case, RFC2131 #4.3.2 says that the server must not reply if + // assignedLease == null, but dnsmasq will let the client use the requested address if + // available, when configured with --dhcp-authoritative. This is preferable to avoid issues + // if the server lost the lease DB: the client would not get a reply because the server + // does not know their lease. + // Similarly in RENEWING/REBINDING state, create a lease when possible if the + // client-provided lease is unknown. + final DhcpLease lease = + checkClientAndMakeLease(clientId, hwAddr, leaseAddr, hostname, currentTime); + mLog.logf("DHCPREQUEST assignedLease %s, reqAddr=%s, sidSet=%s: created/renewed lease %s", + assignedLease, inet4AddrToString(reqAddr), sidSet, lease); + return lease; + } + + /** + * Check that the client can request the specified address, make or renew the lease if yes, and + * commit it. + * + * <p>This method always succeeds and returns the lease if it does not throw, and has no + * side-effect if it throws. + * + * @return The newly created or renewed, committed lease + * @throws InvalidAddressException The client provided an address that conflicts with its + * current configuration, or other committed/reserved leases. + */ + private DhcpLease checkClientAndMakeLease(@Nullable byte[] clientId, @NonNull MacAddress hwAddr, + @NonNull Inet4Address addr, @Nullable String hostname, long currentTime) + throws InvalidAddressException { + final long expTime = currentTime + mLeaseTimeMs; + final DhcpLease currentLease = mCommittedLeases.getOrDefault(addr, null); + if (currentLease != null && !currentLease.matchesClient(clientId, hwAddr)) { + throw new InvalidAddressException("Address in use"); + } + + final DhcpLease lease; + if (currentLease == null) { + if (isValidAddress(addr) && !mReservedAddrs.contains(addr)) { + lease = new DhcpLease(clientId, hwAddr, addr, expTime, hostname); + } else { + throw new InvalidAddressException("Lease not found and address unavailable"); + } + } else { + lease = currentLease.renewedLease(expTime, hostname); + } + commitLease(lease); + return lease; + } + + private void commitLease(@NonNull DhcpLease lease) { + mCommittedLeases.put(lease.getNetAddr(), lease); + maybeUpdateEarliestExpiration(lease.getExpTime()); + } + + /** + * Delete a committed lease from the repository. + * + * @return true if a lease matching parameters was found. + */ + public boolean releaseLease(@Nullable byte[] clientId, @NonNull MacAddress hwAddr, + @NonNull Inet4Address addr) { + final DhcpLease currentLease = mCommittedLeases.getOrDefault(addr, null); + if (currentLease == null) { + mLog.w("Could not release unknown lease for " + inet4AddrToString(addr)); + return false; + } + if (currentLease.matchesClient(clientId, hwAddr)) { + mCommittedLeases.remove(addr); + mLog.log("Released lease " + currentLease); + return true; + } + mLog.w(String.format("Not releasing lease %s: does not match client (cid %s, hwAddr %s)", + currentLease, DhcpLease.clientIdToString(clientId), hwAddr)); + return false; + } + + public void markLeaseDeclined(@NonNull Inet4Address addr) { + if (mDeclinedAddrs.containsKey(addr) || !isValidAddress(addr)) { + mLog.logf("Not marking %s as declined: already declined or not assignable", + inet4AddrToString(addr)); + return; + } + final long expTime = mClock.elapsedRealtime() + mLeaseTimeMs; + mDeclinedAddrs.put(addr, expTime); + mLog.logf("Marked %s as declined expiring %d", inet4AddrToString(addr), expTime); + maybeUpdateEarliestExpiration(expTime); + } + + /** + * Get the list of currently valid committed leases in the repository. + */ + @NonNull + public List<DhcpLease> getCommittedLeases() { + removeExpiredLeases(mClock.elapsedRealtime()); + return new ArrayList<>(mCommittedLeases.values()); + } + + /** + * Get the set of addresses that have been marked as declined in the repository. + */ + @NonNull + public Set<Inet4Address> getDeclinedAddresses() { + removeExpiredLeases(mClock.elapsedRealtime()); + return new HashSet<>(mDeclinedAddrs.keySet()); + } + + /** + * Given the expiration time of a new committed lease or declined address, update + * {@link #mNextExpirationCheck} so it stays lower than or equal to the time for the first lease + * to expire. + */ + private void maybeUpdateEarliestExpiration(long expTime) { + if (expTime < mNextExpirationCheck) { + mNextExpirationCheck = expTime; + } + } + + /** + * Remove expired entries from a map keyed by {@link Inet4Address}. + * + * @param tag Type of lease in the map, for logging + * @param getExpTime Functor returning the expiration time for an object in the map. + * Must not return null. + * @return The lowest expiration time among entries remaining in the map + */ + private <T> long removeExpired(long currentTime, @NonNull Map<Inet4Address, T> map, + @NonNull String tag, @NonNull Function<T, Long> getExpTime) { + final Iterator<Entry<Inet4Address, T>> it = map.entrySet().iterator(); + long firstExpiration = EXPIRATION_NEVER; + while (it.hasNext()) { + final Entry<Inet4Address, T> lease = it.next(); + final long expTime = getExpTime.apply(lease.getValue()); + if (expTime <= currentTime) { + mLog.logf("Removing expired %s lease for %s (expTime=%s, currentTime=%s)", + tag, lease.getKey(), expTime, currentTime); + it.remove(); + } else { + firstExpiration = min(firstExpiration, expTime); + } + } + return firstExpiration; + } + + /** + * Go through committed and declined leases and remove the expired ones. + */ + private void removeExpiredLeases(long currentTime) { + if (currentTime < mNextExpirationCheck) { + return; + } + + final long commExp = removeExpired( + currentTime, mCommittedLeases, "committed", DhcpLease::getExpTime); + final long declExp = removeExpired( + currentTime, mDeclinedAddrs, "declined", Function.identity()); + + mNextExpirationCheck = min(commExp, declExp); + } + + private boolean isAvailable(@NonNull Inet4Address addr) { + return !mReservedAddrs.contains(addr) && !mCommittedLeases.containsKey(addr); + } + + /** + * Get the 0-based index of an address in the subnet. + * + * <p>Given ordering of addresses 5.6.7.8 < 5.6.7.9 < 5.6.8.0, the index on a subnet is defined + * so that the first address is 0, the second 1, etc. For example on a /16, 192.168.0.0 -> 0, + * 192.168.0.1 -> 1, 192.168.1.0 -> 256 + * + */ + private int getAddrIndex(int addr) { + return addr & ~mSubnetMask; + } + + private int getAddrByIndex(int index) { + return mSubnetAddr | index; + } + + /** + * Get a valid address starting from the supplied one. + * + * <p>This only checks that the address is numerically valid for assignment, not whether it is + * already in use. The return value is always inside the configured prefix, even if the supplied + * address is not. + * + * <p>If the provided address is valid, it is returned as-is. Otherwise, the next valid + * address (with the ordering in {@link #getAddrIndex(int)}) is returned. + */ + private int getValidAddress(int addr) { + final int lastByteMask = 0xff; + int addrIndex = getAddrIndex(addr); // 0-based index of the address in the subnet + + // Some OSes do not handle addresses in .255 or .0 correctly: avoid those. + final int lastByte = getAddrByIndex(addrIndex) & lastByteMask; + if (lastByte == lastByteMask) { + // Avoid .255 address, and .0 address that follows + addrIndex = (addrIndex + 2) % mNumAddresses; + } else if (lastByte == 0) { + // Avoid .0 address + addrIndex = (addrIndex + 1) % mNumAddresses; + } + + // Do not use first or last address of range + if (addrIndex == 0 || addrIndex == mNumAddresses - 1) { + // Always valid and not end of range since prefixLength is at most 30 in serving params + addrIndex = 1; + } + return getAddrByIndex(addrIndex); + } + + /** + * Returns whether the address is in the configured subnet and part of the assignable range. + */ + private boolean isValidAddress(Inet4Address addr) { + final int intAddr = inet4AddressToIntHTH(addr); + return getValidAddress(intAddr) == intAddr; + } + + private int getNextAddress(int addr) { + final int addrIndex = getAddrIndex(addr); + final int nextAddress = getAddrByIndex((addrIndex + 1) % mNumAddresses); + return getValidAddress(nextAddress); + } + + /** + * Calculate a first candidate address for a client by hashing the hardware address. + * + * <p>This will be a valid address as checked by {@link #getValidAddress(int)}, but may be + * in use. + * + * @return An IPv4 address encoded as 32-bit int + */ + private int getFirstClientAddress(MacAddress hwAddr) { + // This follows dnsmasq behavior. Advantages are: clients will often get the same + // offers for different DISCOVER even if the lease was not yet accepted or has expired, + // and address generation will generally not need to loop through many allocated addresses + // until it finds a free one. + int hash = 0; + for (byte b : hwAddr.toByteArray()) { + hash += b + (b << 8) + (b << 16); + } + // This implementation will not always result in the same IPs as dnsmasq would give out in + // Android <= P, because it includes invalid and reserved addresses in mNumAddresses while + // the configured ranges for dnsmasq did not. + final int addrIndex = hash % mNumAddresses; + return getValidAddress(getAddrByIndex(addrIndex)); + } + + /** + * Create a lease that can be offered to respond to a client DISCOVER. + * + * <p>This method always succeeds and returns the lease if it does not throw. If no non-declined + * address is available, it will try to offer the oldest declined address if valid. + * + * @throws OutOfAddressesException The server has no address left to offer + */ + private DhcpLease makeNewOffer(@Nullable byte[] clientId, @NonNull MacAddress hwAddr, + long expTime, @Nullable String hostname) throws OutOfAddressesException { + int intAddr = getFirstClientAddress(hwAddr); + // Loop until a free address is found, or there are no more addresses. + // There is slightly less than this many usable addresses, but some extra looping is OK + for (int i = 0; i < mNumAddresses; i++) { + final Inet4Address addr = intToInet4AddressHTH(intAddr); + if (isAvailable(addr) && !mDeclinedAddrs.containsKey(addr)) { + return new DhcpLease(clientId, hwAddr, addr, expTime, hostname); + } + intAddr = getNextAddress(intAddr); + } + + // Try freeing DECLINEd addresses if out of addresses. + final Iterator<Inet4Address> it = mDeclinedAddrs.keySet().iterator(); + while (it.hasNext()) { + final Inet4Address addr = it.next(); + it.remove(); + mLog.logf("Out of addresses in address pool: dropped declined addr %s", + inet4AddrToString(addr)); + // isValidAddress() is always verified for entries in mDeclinedAddrs. + // However declined addresses may have been requested (typically by the machine that was + // already using the address) after being declined. + if (isAvailable(addr)) { + return new DhcpLease(clientId, hwAddr, addr, expTime, hostname); + } + } + + throw new OutOfAddressesException("No address available for offer"); + } +} diff --git a/services/net/java/android/net/dhcp/DhcpNakPacket.java b/services/net/java/android/net/dhcp/DhcpNakPacket.java index 6458232b8fa0..1da0b7300559 100644 --- a/services/net/java/android/net/dhcp/DhcpNakPacket.java +++ b/services/net/java/android/net/dhcp/DhcpNakPacket.java @@ -26,11 +26,10 @@ class DhcpNakPacket extends DhcpPacket { /** * Generates a NAK packet with the specified parameters. */ - DhcpNakPacket(int transId, short secs, Inet4Address clientIp, Inet4Address yourIp, - Inet4Address nextIp, Inet4Address relayIp, - byte[] clientMac) { - super(transId, secs, INADDR_ANY, INADDR_ANY, nextIp, relayIp, - clientMac, false); + DhcpNakPacket(int transId, short secs, Inet4Address relayIp, byte[] clientMac, + boolean broadcast) { + super(transId, secs, INADDR_ANY /* clientIp */, INADDR_ANY /* yourIp */, + INADDR_ANY /* nextIp */, relayIp, clientMac, broadcast); } public String toString() { @@ -43,11 +42,11 @@ class DhcpNakPacket extends DhcpPacket { */ public ByteBuffer buildPacket(int encap, short destUdp, short srcUdp) { ByteBuffer result = ByteBuffer.allocate(MAX_LENGTH); - Inet4Address destIp = mClientIp; - Inet4Address srcIp = mYourIp; + // Constructor does not set values for layers <= 3: use empty values + Inet4Address destIp = INADDR_ANY; + Inet4Address srcIp = INADDR_ANY; - fillInPacket(encap, destIp, srcIp, destUdp, srcUdp, result, - DHCP_BOOTREPLY, mBroadcast); + fillInPacket(encap, destIp, srcIp, destUdp, srcUdp, result, DHCP_BOOTREPLY, mBroadcast); result.flip(); return result; } diff --git a/services/net/java/android/net/dhcp/DhcpOfferPacket.java b/services/net/java/android/net/dhcp/DhcpOfferPacket.java index 99154ef0498c..0eba77e4a682 100644 --- a/services/net/java/android/net/dhcp/DhcpOfferPacket.java +++ b/services/net/java/android/net/dhcp/DhcpOfferPacket.java @@ -32,8 +32,8 @@ class DhcpOfferPacket extends DhcpPacket { * Generates a OFFER packet with the specified parameters. */ DhcpOfferPacket(int transId, short secs, boolean broadcast, Inet4Address serverAddress, - Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) { - super(transId, secs, clientIp, yourIp, INADDR_ANY, INADDR_ANY, clientMac, broadcast); + Inet4Address relayIp, Inet4Address clientIp, Inet4Address yourIp, byte[] clientMac) { + super(transId, secs, clientIp, yourIp, serverAddress, relayIp, clientMac, broadcast); mSrcIp = serverAddress; } @@ -72,19 +72,8 @@ class DhcpOfferPacket extends DhcpPacket { void finishPacket(ByteBuffer buffer) { addTlv(buffer, DHCP_MESSAGE_TYPE, DHCP_MESSAGE_TYPE_OFFER); addTlv(buffer, DHCP_SERVER_IDENTIFIER, mServerIdentifier); - addTlv(buffer, DHCP_LEASE_TIME, mLeaseTime); - // the client should renew at 1/2 the lease-expiry interval - if (mLeaseTime != null) { - addTlv(buffer, DHCP_RENEWAL_TIME, - Integer.valueOf(mLeaseTime.intValue() / 2)); - } - - addTlv(buffer, DHCP_SUBNET_MASK, mSubnetMask); - addTlv(buffer, DHCP_ROUTER, mGateways); - addTlv(buffer, DHCP_DOMAIN_NAME, mDomainName); - addTlv(buffer, DHCP_BROADCAST_ADDRESS, mBroadcastAddress); - addTlv(buffer, DHCP_DNS_SERVER, mDnsServers); + addCommonServerTlvs(buffer); addTlvEnd(buffer); } } diff --git a/services/net/java/android/net/dhcp/DhcpPacket.java b/services/net/java/android/net/dhcp/DhcpPacket.java index d90a4a235972..77a3e2102452 100644 --- a/services/net/java/android/net/dhcp/DhcpPacket.java +++ b/services/net/java/android/net/dhcp/DhcpPacket.java @@ -1,5 +1,6 @@ package android.net.dhcp; +import android.annotation.Nullable; import android.net.DhcpResults; import android.net.LinkAddress; import android.net.NetworkUtils; @@ -8,6 +9,7 @@ import android.os.Build; import android.os.SystemProperties; import android.system.OsConstants; import android.text.TextUtils; + import com.android.internal.annotations.VisibleForTesting; import java.io.UnsupportedEncodingException; @@ -182,6 +184,11 @@ public abstract class DhcpPacket { protected String mVendorInfo; /** + * Value of the vendor specific option used to indicate that the network is metered + */ + public static final String VENDOR_INFO_ANDROID_METERED = "ANDROID_METERED"; + + /** * DHCP Optional Type: DHCP Requested IP Address */ protected static final byte DHCP_REQUESTED_IP = 50; @@ -204,6 +211,7 @@ public abstract class DhcpPacket { protected static final byte DHCP_MESSAGE_TYPE_DECLINE = 4; protected static final byte DHCP_MESSAGE_TYPE_ACK = 5; protected static final byte DHCP_MESSAGE_TYPE_NAK = 6; + protected static final byte DHCP_MESSAGE_TYPE_RELEASE = 7; protected static final byte DHCP_MESSAGE_TYPE_INFORM = 8; /** @@ -252,6 +260,7 @@ public abstract class DhcpPacket { * DHCP Optional Type: DHCP Client Identifier */ protected static final byte DHCP_CLIENT_IDENTIFIER = 61; + protected byte[] mClientId; /** * DHCP zero-length option code: pad @@ -281,7 +290,7 @@ public abstract class DhcpPacket { protected final Inet4Address mClientIp; protected final Inet4Address mYourIp; private final Inet4Address mNextIp; - private final Inet4Address mRelayIp; + protected final Inet4Address mRelayIp; /** * Does the client request a broadcast response? @@ -338,13 +347,36 @@ public abstract class DhcpPacket { return mClientMac; } + // TODO: refactor DhcpClient to set clientId when constructing packets and remove + // hasExplicitClientId logic + /** + * Returns whether a client ID was set in the options for this packet. + */ + public boolean hasExplicitClientId() { + return mClientId != null; + } + /** - * Returns the client ID. This follows RFC 2132 and is based on the hardware address. + * Convenience method to return the client ID if it was set explicitly, or null otherwise. + */ + @Nullable + public byte[] getExplicitClientIdOrNull() { + return hasExplicitClientId() ? getClientId() : null; + } + + /** + * Returns the client ID. If not set explicitly, this follows RFC 2132 and creates a client ID + * based on the hardware address. */ public byte[] getClientId() { - byte[] clientId = new byte[mClientMac.length + 1]; - clientId[0] = CLIENT_ID_ETHER; - System.arraycopy(mClientMac, 0, clientId, 1, mClientMac.length); + final byte[] clientId; + if (hasExplicitClientId()) { + clientId = Arrays.copyOf(mClientId, mClientId.length); + } else { + clientId = new byte[mClientMac.length + 1]; + clientId[0] = CLIENT_ID_ETHER; + System.arraycopy(mClientMac, 0, clientId, 1, mClientMac.length); + } return clientId; } @@ -531,8 +563,10 @@ public abstract class DhcpPacket { /** * Adds an optional parameter containing an array of bytes. + * + * <p>This method is a no-op if the payload argument is null. */ - protected static void addTlv(ByteBuffer buf, byte type, byte[] payload) { + protected static void addTlv(ByteBuffer buf, byte type, @Nullable byte[] payload) { if (payload != null) { if (payload.length > MAX_OPTION_LEN) { throw new IllegalArgumentException("DHCP option too long: " @@ -546,8 +580,10 @@ public abstract class DhcpPacket { /** * Adds an optional parameter containing an IP address. + * + * <p>This method is a no-op if the address argument is null. */ - protected static void addTlv(ByteBuffer buf, byte type, Inet4Address addr) { + protected static void addTlv(ByteBuffer buf, byte type, @Nullable Inet4Address addr) { if (addr != null) { addTlv(buf, type, addr.getAddress()); } @@ -555,8 +591,10 @@ public abstract class DhcpPacket { /** * Adds an optional parameter containing a list of IP addresses. + * + * <p>This method is a no-op if the addresses argument is null or empty. */ - protected static void addTlv(ByteBuffer buf, byte type, List<Inet4Address> addrs) { + protected static void addTlv(ByteBuffer buf, byte type, @Nullable List<Inet4Address> addrs) { if (addrs == null || addrs.size() == 0) return; int optionLen = 4 * addrs.size(); @@ -574,9 +612,11 @@ public abstract class DhcpPacket { } /** - * Adds an optional parameter containing a short integer + * Adds an optional parameter containing a short integer. + * + * <p>This method is a no-op if the value argument is null. */ - protected static void addTlv(ByteBuffer buf, byte type, Short value) { + protected static void addTlv(ByteBuffer buf, byte type, @Nullable Short value) { if (value != null) { buf.put(type); buf.put((byte) 2); @@ -585,9 +625,11 @@ public abstract class DhcpPacket { } /** - * Adds an optional parameter containing a simple integer + * Adds an optional parameter containing a simple integer. + * + * <p>This method is a no-op if the value argument is null. */ - protected static void addTlv(ByteBuffer buf, byte type, Integer value) { + protected static void addTlv(ByteBuffer buf, byte type, @Nullable Integer value) { if (value != null) { buf.put(type); buf.put((byte) 4); @@ -597,12 +639,16 @@ public abstract class DhcpPacket { /** * Adds an optional parameter containing an ASCII string. + * + * <p>This method is a no-op if the string argument is null. */ - protected static void addTlv(ByteBuffer buf, byte type, String str) { - try { - addTlv(buf, type, str.getBytes("US-ASCII")); - } catch (UnsupportedEncodingException e) { - throw new IllegalArgumentException("String is not US-ASCII: " + str); + protected static void addTlv(ByteBuffer buf, byte type, @Nullable String str) { + if (str != null) { + try { + addTlv(buf, type, str.getBytes("US-ASCII")); + } catch (UnsupportedEncodingException e) { + throw new IllegalArgumentException("String is not US-ASCII: " + str); + } } } @@ -636,6 +682,23 @@ public abstract class DhcpPacket { if (!TextUtils.isEmpty(hn)) addTlv(buf, DHCP_HOST_NAME, hn); } + protected void addCommonServerTlvs(ByteBuffer buf) { + addTlv(buf, DHCP_LEASE_TIME, mLeaseTime); + if (mLeaseTime != null && mLeaseTime != INFINITE_LEASE) { + // The client should renew at 1/2 the lease-expiry interval + addTlv(buf, DHCP_RENEWAL_TIME, (int) (Integer.toUnsignedLong(mLeaseTime) / 2)); + // Default rebinding time is set as below by RFC2131 + addTlv(buf, DHCP_REBINDING_TIME, + (int) (Integer.toUnsignedLong(mLeaseTime) * 875L / 1000L)); + } + addTlv(buf, DHCP_SUBNET_MASK, mSubnetMask); + addTlv(buf, DHCP_BROADCAST_ADDRESS, mBroadcastAddress); + addTlv(buf, DHCP_ROUTER, mGateways); + addTlv(buf, DHCP_DNS_SERVER, mDnsServers); + addTlv(buf, DHCP_DOMAIN_NAME, mDomainName); + addTlv(buf, DHCP_VENDOR_INFO, mVendorInfo); + } + /** * Converts a MAC from an array of octets to an ASCII string. */ @@ -740,6 +803,7 @@ public abstract class DhcpPacket { Inet4Address nextIp; Inet4Address relayIp; byte[] clientMac; + byte[] clientId = null; List<Inet4Address> dnsServers = new ArrayList<>(); List<Inet4Address> gateways = new ArrayList<>(); // aka router Inet4Address serverIdentifier = null; @@ -1038,16 +1102,16 @@ public abstract class DhcpPacket { throw new ParseException(DhcpErrorEvent.DHCP_NO_MSG_TYPE, "No DHCP message type option"); case DHCP_MESSAGE_TYPE_DISCOVER: - newPacket = new DhcpDiscoverPacket( - transactionId, secs, clientMac, broadcast); + newPacket = new DhcpDiscoverPacket(transactionId, secs, relayIp, clientMac, + broadcast, ipSrc); break; case DHCP_MESSAGE_TYPE_OFFER: newPacket = new DhcpOfferPacket( - transactionId, secs, broadcast, ipSrc, clientIp, yourIp, clientMac); + transactionId, secs, broadcast, ipSrc, relayIp, clientIp, yourIp, clientMac); break; case DHCP_MESSAGE_TYPE_REQUEST: newPacket = new DhcpRequestPacket( - transactionId, secs, clientIp, clientMac, broadcast); + transactionId, secs, clientIp, relayIp, clientMac, broadcast); break; case DHCP_MESSAGE_TYPE_DECLINE: newPacket = new DhcpDeclinePacket( @@ -1056,12 +1120,19 @@ public abstract class DhcpPacket { break; case DHCP_MESSAGE_TYPE_ACK: newPacket = new DhcpAckPacket( - transactionId, secs, broadcast, ipSrc, clientIp, yourIp, clientMac); + transactionId, secs, broadcast, ipSrc, relayIp, clientIp, yourIp, clientMac); break; case DHCP_MESSAGE_TYPE_NAK: newPacket = new DhcpNakPacket( - transactionId, secs, clientIp, yourIp, nextIp, relayIp, - clientMac); + transactionId, secs, relayIp, clientMac, broadcast); + break; + case DHCP_MESSAGE_TYPE_RELEASE: + if (serverIdentifier == null) { + throw new ParseException(DhcpErrorEvent.MISC_ERROR, + "DHCPRELEASE without server identifier"); + } + newPacket = new DhcpReleasePacket( + transactionId, serverIdentifier, clientIp, relayIp, clientMac); break; case DHCP_MESSAGE_TYPE_INFORM: newPacket = new DhcpInformPacket( @@ -1074,6 +1145,7 @@ public abstract class DhcpPacket { } newPacket.mBroadcastAddress = bcAddr; + newPacket.mClientId = clientId; newPacket.mDnsServers = dnsServers; newPacket.mDomainName = domainName; newPacket.mGateways = gateways; @@ -1173,8 +1245,8 @@ public abstract class DhcpPacket { */ public static ByteBuffer buildDiscoverPacket(int encap, int transactionId, short secs, byte[] clientMac, boolean broadcast, byte[] expectedParams) { - DhcpPacket pkt = new DhcpDiscoverPacket( - transactionId, secs, clientMac, broadcast); + DhcpPacket pkt = new DhcpDiscoverPacket(transactionId, secs, INADDR_ANY /* relayIp */, + clientMac, broadcast, INADDR_ANY /* srcIp */); pkt.mRequestedParams = expectedParams; return pkt.buildPacket(encap, DHCP_SERVER, DHCP_CLIENT); } @@ -1184,12 +1256,13 @@ public abstract class DhcpPacket { * parameters. */ public static ByteBuffer buildOfferPacket(int encap, int transactionId, - boolean broadcast, Inet4Address serverIpAddr, Inet4Address clientIpAddr, - byte[] mac, Integer timeout, Inet4Address netMask, Inet4Address bcAddr, - List<Inet4Address> gateways, List<Inet4Address> dnsServers, - Inet4Address dhcpServerIdentifier, String domainName) { + boolean broadcast, Inet4Address serverIpAddr, Inet4Address relayIp, + Inet4Address yourIp, byte[] mac, Integer timeout, Inet4Address netMask, + Inet4Address bcAddr, List<Inet4Address> gateways, List<Inet4Address> dnsServers, + Inet4Address dhcpServerIdentifier, String domainName, boolean metered) { DhcpPacket pkt = new DhcpOfferPacket( - transactionId, (short) 0, broadcast, serverIpAddr, INADDR_ANY, clientIpAddr, mac); + transactionId, (short) 0, broadcast, serverIpAddr, relayIp, + INADDR_ANY /* clientIp */, yourIp, mac); pkt.mGateways = gateways; pkt.mDnsServers = dnsServers; pkt.mLeaseTime = timeout; @@ -1197,6 +1270,9 @@ public abstract class DhcpPacket { pkt.mServerIdentifier = dhcpServerIdentifier; pkt.mSubnetMask = netMask; pkt.mBroadcastAddress = bcAddr; + if (metered) { + pkt.mVendorInfo = VENDOR_INFO_ANDROID_METERED; + } return pkt.buildPacket(encap, DHCP_CLIENT, DHCP_SERVER); } @@ -1204,12 +1280,13 @@ public abstract class DhcpPacket { * Builds a DHCP-ACK packet from the required specified parameters. */ public static ByteBuffer buildAckPacket(int encap, int transactionId, - boolean broadcast, Inet4Address serverIpAddr, Inet4Address clientIpAddr, - byte[] mac, Integer timeout, Inet4Address netMask, Inet4Address bcAddr, - List<Inet4Address> gateways, List<Inet4Address> dnsServers, - Inet4Address dhcpServerIdentifier, String domainName) { + boolean broadcast, Inet4Address serverIpAddr, Inet4Address relayIp, Inet4Address yourIp, + Inet4Address requestClientIp, byte[] mac, Integer timeout, Inet4Address netMask, + Inet4Address bcAddr, List<Inet4Address> gateways, List<Inet4Address> dnsServers, + Inet4Address dhcpServerIdentifier, String domainName, boolean metered) { DhcpPacket pkt = new DhcpAckPacket( - transactionId, (short) 0, broadcast, serverIpAddr, INADDR_ANY, clientIpAddr, mac); + transactionId, (short) 0, broadcast, serverIpAddr, relayIp, requestClientIp, yourIp, + mac); pkt.mGateways = gateways; pkt.mDnsServers = dnsServers; pkt.mLeaseTime = timeout; @@ -1217,18 +1294,21 @@ public abstract class DhcpPacket { pkt.mSubnetMask = netMask; pkt.mServerIdentifier = dhcpServerIdentifier; pkt.mBroadcastAddress = bcAddr; + if (metered) { + pkt.mVendorInfo = VENDOR_INFO_ANDROID_METERED; + } return pkt.buildPacket(encap, DHCP_CLIENT, DHCP_SERVER); } /** * Builds a DHCP-NAK packet from the required specified parameters. */ - public static ByteBuffer buildNakPacket(int encap, int transactionId, - Inet4Address serverIpAddr, Inet4Address clientIpAddr, byte[] mac) { - DhcpPacket pkt = new DhcpNakPacket(transactionId, (short) 0, clientIpAddr, - serverIpAddr, serverIpAddr, serverIpAddr, mac); - pkt.mMessage = "requested address not available"; - pkt.mRequestedIp = clientIpAddr; + public static ByteBuffer buildNakPacket(int encap, int transactionId, Inet4Address serverIpAddr, + Inet4Address relayIp, byte[] mac, boolean broadcast, String message) { + DhcpPacket pkt = new DhcpNakPacket( + transactionId, (short) 0, relayIp, mac, broadcast); + pkt.mMessage = message; + pkt.mServerIdentifier = serverIpAddr; return pkt.buildPacket(encap, DHCP_CLIENT, DHCP_SERVER); } @@ -1240,7 +1320,7 @@ public abstract class DhcpPacket { byte[] clientMac, Inet4Address requestedIpAddress, Inet4Address serverIdentifier, byte[] requestedParams, String hostName) { DhcpPacket pkt = new DhcpRequestPacket(transactionId, secs, clientIp, - clientMac, broadcast); + INADDR_ANY /* relayIp */, clientMac, broadcast); pkt.mRequestedIp = requestedIpAddress; pkt.mServerIdentifier = serverIdentifier; pkt.mHostName = hostName; diff --git a/services/net/java/android/net/dhcp/DhcpPacketListener.java b/services/net/java/android/net/dhcp/DhcpPacketListener.java new file mode 100644 index 000000000000..6f620c5ce30e --- /dev/null +++ b/services/net/java/android/net/dhcp/DhcpPacketListener.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.util.FdEventsReader; +import android.os.Handler; +import android.system.Os; + +import java.io.FileDescriptor; +import java.net.Inet4Address; +import java.net.InetSocketAddress; + +/** + * A {@link FdEventsReader} to receive and parse {@link DhcpPacket}. + * @hide + */ +abstract class DhcpPacketListener extends FdEventsReader<DhcpPacketListener.Payload> { + static final class Payload { + final byte[] bytes = new byte[DhcpPacket.MAX_LENGTH]; + Inet4Address srcAddr; + int srcPort; + } + + public DhcpPacketListener(@NonNull Handler handler) { + super(handler, new Payload()); + } + + @Override + protected int recvBufSize(@NonNull Payload buffer) { + return buffer.bytes.length; + } + + @Override + protected final void handlePacket(@NonNull Payload recvbuf, int length) { + if (recvbuf.srcAddr == null) { + return; + } + + try { + final DhcpPacket packet = DhcpPacket.decodeFullPacket(recvbuf.bytes, length, + DhcpPacket.ENCAP_BOOTP); + onReceive(packet, recvbuf.srcAddr, recvbuf.srcPort); + } catch (DhcpPacket.ParseException e) { + logParseError(recvbuf.bytes, length, e); + } + } + + @Override + protected int readPacket(@NonNull FileDescriptor fd, @NonNull Payload packetBuffer) + throws Exception { + final InetSocketAddress addr = new InetSocketAddress(); + final int read = Os.recvfrom( + fd, packetBuffer.bytes, 0, packetBuffer.bytes.length, 0 /* flags */, addr); + + // Buffers with null srcAddr will be dropped in handlePacket() + packetBuffer.srcAddr = inet4AddrOrNull(addr); + packetBuffer.srcPort = addr.getPort(); + return read; + } + + @Nullable + private static Inet4Address inet4AddrOrNull(@NonNull InetSocketAddress addr) { + return addr.getAddress() instanceof Inet4Address + ? (Inet4Address) addr.getAddress() + : null; + } + + protected abstract void onReceive(@NonNull DhcpPacket packet, @NonNull Inet4Address srcAddr, + int srcPort); + protected abstract void logParseError(@NonNull byte[] packet, int length, + @NonNull DhcpPacket.ParseException e); +} diff --git a/services/net/java/android/net/dhcp/DhcpReleasePacket.java b/services/net/java/android/net/dhcp/DhcpReleasePacket.java new file mode 100644 index 000000000000..39583032c20d --- /dev/null +++ b/services/net/java/android/net/dhcp/DhcpReleasePacket.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import java.net.Inet4Address; +import java.nio.ByteBuffer; + +/** + * Implements DHCP-RELEASE + */ +class DhcpReleasePacket extends DhcpPacket { + + final Inet4Address mClientAddr; + + /** + * Generates a RELEASE packet with the specified parameters. + */ + public DhcpReleasePacket(int transId, Inet4Address serverId, Inet4Address clientAddr, + Inet4Address relayIp, byte[] clientMac) { + super(transId, (short)0, clientAddr, INADDR_ANY /* yourIp */, INADDR_ANY /* nextIp */, + relayIp, clientMac, false /* broadcast */); + mServerIdentifier = serverId; + mClientAddr = clientAddr; + } + + + @Override + public ByteBuffer buildPacket(int encap, short destUdp, short srcUdp) { + ByteBuffer result = ByteBuffer.allocate(MAX_LENGTH); + fillInPacket(encap, mServerIdentifier /* destIp */, mClientIp /* srcIp */, destUdp, srcUdp, + result, DHCP_BOOTREPLY, mBroadcast); + result.flip(); + return result; + } + + @Override + void finishPacket(ByteBuffer buffer) { + addTlv(buffer, DHCP_MESSAGE_TYPE, DHCP_MESSAGE_TYPE_RELEASE); + addTlv(buffer, DHCP_CLIENT_IDENTIFIER, getClientId()); + addTlv(buffer, DHCP_SERVER_IDENTIFIER, mServerIdentifier); + addCommonClientTlvs(buffer); + addTlvEnd(buffer); + } +} diff --git a/services/net/java/android/net/dhcp/DhcpRequestPacket.java b/services/net/java/android/net/dhcp/DhcpRequestPacket.java index 4f9aa01151ca..231d04576c28 100644 --- a/services/net/java/android/net/dhcp/DhcpRequestPacket.java +++ b/services/net/java/android/net/dhcp/DhcpRequestPacket.java @@ -28,9 +28,9 @@ class DhcpRequestPacket extends DhcpPacket { /** * Generates a REQUEST packet with the specified parameters. */ - DhcpRequestPacket(int transId, short secs, Inet4Address clientIp, byte[] clientMac, - boolean broadcast) { - super(transId, secs, clientIp, INADDR_ANY, INADDR_ANY, INADDR_ANY, clientMac, broadcast); + DhcpRequestPacket(int transId, short secs, Inet4Address clientIp, Inet4Address relayIp, + byte[] clientMac, boolean broadcast) { + super(transId, secs, clientIp, INADDR_ANY, INADDR_ANY, relayIp, clientMac, broadcast); } public String toString() { diff --git a/services/net/java/android/net/dhcp/DhcpServer.java b/services/net/java/android/net/dhcp/DhcpServer.java new file mode 100644 index 000000000000..2b3d577b0eae --- /dev/null +++ b/services/net/java/android/net/dhcp/DhcpServer.java @@ -0,0 +1,525 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import static android.net.NetworkUtils.getBroadcastAddress; +import static android.net.NetworkUtils.getPrefixMaskAsInet4Address; +import static android.net.TrafficStats.TAG_SYSTEM_DHCP_SERVER; +import static android.net.dhcp.DhcpPacket.DHCP_CLIENT; +import static android.net.dhcp.DhcpPacket.DHCP_SERVER; +import static android.net.dhcp.DhcpPacket.ENCAP_BOOTP; +import static android.net.dhcp.DhcpPacket.INFINITE_LEASE; +import static android.system.OsConstants.AF_INET; +import static android.system.OsConstants.IPPROTO_UDP; +import static android.system.OsConstants.SOCK_DGRAM; +import static android.system.OsConstants.SOL_SOCKET; +import static android.system.OsConstants.SO_BINDTODEVICE; +import static android.system.OsConstants.SO_BROADCAST; +import static android.system.OsConstants.SO_REUSEADDR; + +import static java.lang.Integer.toUnsignedLong; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.MacAddress; +import android.net.NetworkUtils; +import android.net.TrafficStats; +import android.net.util.InterfaceParams; +import android.net.util.SharedLog; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.os.SystemClock; +import android.system.ErrnoException; +import android.system.Os; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.HexDump; + +import java.io.FileDescriptor; +import java.io.IOException; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.nio.ByteBuffer; +import java.util.ArrayList; + +/** + * A DHCPv4 server. + * + * <p>This server listens for and responds to packets on a single interface. It considers itself + * authoritative for all leases on the subnet, which means that DHCP requests for unknown leases of + * unknown hosts receive a reply instead of being ignored. + * + * <p>The server is single-threaded (including send/receive operations): all internal operations are + * done on the provided {@link Looper}. Public methods are thread-safe and will schedule operations + * on the looper asynchronously. + * @hide + */ +public class DhcpServer { + private static final String REPO_TAG = "Repository"; + + // Lease time to transmit to client instead of a negative time in case a lease expired before + // the server could send it (if the server process is suspended for example). + private static final int EXPIRED_FALLBACK_LEASE_TIME_SECS = 120; + + private static final int CMD_START_DHCP_SERVER = 1; + private static final int CMD_STOP_DHCP_SERVER = 2; + private static final int CMD_UPDATE_PARAMS = 3; + + @NonNull + private final ServerHandler mHandler; + @NonNull + private final InterfaceParams mIface; + @NonNull + private final DhcpLeaseRepository mLeaseRepo; + @NonNull + private final SharedLog mLog; + @NonNull + private final Dependencies mDeps; + @NonNull + private final Clock mClock; + @NonNull + private final DhcpPacketListener mPacketListener; + + @Nullable + private FileDescriptor mSocket; + @NonNull + private DhcpServingParams mServingParams; + + public static class Clock { + /** + * @see SystemClock#elapsedRealtime() + */ + public long elapsedRealtime() { + return SystemClock.elapsedRealtime(); + } + } + + public interface Dependencies { + void sendPacket(@NonNull FileDescriptor fd, @NonNull ByteBuffer buffer, + @NonNull InetAddress dst) throws ErrnoException, IOException; + DhcpLeaseRepository makeLeaseRepository(@NonNull DhcpServingParams servingParams, + @NonNull SharedLog log, @NonNull Clock clock); + DhcpPacketListener makePacketListener(); + Clock makeClock(); + void addArpEntry(@NonNull Inet4Address ipv4Addr, @NonNull MacAddress ethAddr, + @NonNull String ifname, @NonNull FileDescriptor fd) throws IOException; + } + + private class DependenciesImpl implements Dependencies { + @Override + public void sendPacket(@NonNull FileDescriptor fd, @NonNull ByteBuffer buffer, + @NonNull InetAddress dst) throws ErrnoException, IOException { + Os.sendto(fd, buffer, 0, dst, DhcpPacket.DHCP_CLIENT); + } + + @Override + public DhcpLeaseRepository makeLeaseRepository(@NonNull DhcpServingParams servingParams, + @NonNull SharedLog log, @NonNull Clock clock) { + return new DhcpLeaseRepository( + DhcpServingParams.makeIpPrefix(servingParams.serverAddr), + servingParams.excludedAddrs, + servingParams.dhcpLeaseTimeSecs*1000, log.forSubComponent(REPO_TAG), clock); + } + + @Override + public DhcpPacketListener makePacketListener() { + return new PacketListener(); + } + + @Override + public Clock makeClock() { + return new Clock(); + } + + @Override + public void addArpEntry(@NonNull Inet4Address ipv4Addr, @NonNull MacAddress ethAddr, + @NonNull String ifname, @NonNull FileDescriptor fd) throws IOException { + NetworkUtils.addArpEntry(ipv4Addr, ethAddr, ifname, fd); + } + } + + private static class MalformedPacketException extends Exception { + MalformedPacketException(String message, Throwable t) { + super(message, t); + } + } + + public DhcpServer(@NonNull Looper looper, @NonNull InterfaceParams iface, + @NonNull DhcpServingParams params, @NonNull SharedLog log) { + this(looper, iface, params, log, null); + } + + @VisibleForTesting + DhcpServer(@NonNull Looper looper, @NonNull InterfaceParams iface, + @NonNull DhcpServingParams params, @NonNull SharedLog log, + @Nullable Dependencies deps) { + if (deps == null) { + deps = new DependenciesImpl(); + } + mHandler = new ServerHandler(looper); + mIface = iface; + mServingParams = params; + mLog = log; + mDeps = deps; + mClock = deps.makeClock(); + mPacketListener = deps.makePacketListener(); + mLeaseRepo = deps.makeLeaseRepository(mServingParams, mLog, mClock); + } + + /** + * Start listening for and responding to packets. + */ + public void start() { + mHandler.sendEmptyMessage(CMD_START_DHCP_SERVER); + } + + /** + * Update serving parameters. All subsequently received requests will be handled with the new + * parameters, and current leases that are incompatible with the new parameters are dropped. + */ + public void updateParams(@NonNull DhcpServingParams params) { + sendMessage(CMD_UPDATE_PARAMS, params); + } + + /** + * Stop listening for packets. + * + * <p>As the server is stopped asynchronously, some packets may still be processed shortly after + * calling this method. + */ + public void stop() { + mHandler.sendEmptyMessage(CMD_STOP_DHCP_SERVER); + } + + private void sendMessage(int what, @Nullable Object obj) { + mHandler.sendMessage(mHandler.obtainMessage(what, obj)); + } + + private class ServerHandler extends Handler { + public ServerHandler(@NonNull Looper looper) { + super(looper); + } + + @Override + public void handleMessage(@NonNull Message msg) { + switch (msg.what) { + case CMD_UPDATE_PARAMS: + final DhcpServingParams params = (DhcpServingParams) msg.obj; + mServingParams = params; + mLeaseRepo.updateParams( + DhcpServingParams.makeIpPrefix(mServingParams.serverAddr), + params.excludedAddrs, + params.dhcpLeaseTimeSecs); + break; + case CMD_START_DHCP_SERVER: + // This is a no-op if the listener is already started + mPacketListener.start(); + break; + case CMD_STOP_DHCP_SERVER: + // This is a no-op if the listener was not started + mPacketListener.stop(); + break; + } + } + } + + @VisibleForTesting + void processPacket(@NonNull DhcpPacket packet, int srcPort) { + final String packetType = packet.getClass().getSimpleName(); + if (srcPort != DHCP_CLIENT) { + mLog.logf("Ignored packet of type %s sent from client port %d", packetType, srcPort); + return; + } + + mLog.log("Received packet of type " + packetType); + final Inet4Address sid = packet.mServerIdentifier; + if (sid != null && !sid.equals(mServingParams.serverAddr.getAddress())) { + mLog.log("Packet ignored due to wrong server identifier: " + sid); + return; + } + + try { + if (packet instanceof DhcpDiscoverPacket) { + processDiscover((DhcpDiscoverPacket) packet); + } else if (packet instanceof DhcpRequestPacket) { + processRequest((DhcpRequestPacket) packet); + } else if (packet instanceof DhcpReleasePacket) { + processRelease((DhcpReleasePacket) packet); + } else { + mLog.e("Unknown packet type: " + packet.getClass().getSimpleName()); + } + } catch (MalformedPacketException e) { + // Not an internal error: only logging exception message, not stacktrace + mLog.e("Ignored malformed packet: " + e.getMessage()); + } + } + + private void logIgnoredPacketInvalidSubnet(DhcpLeaseRepository.InvalidSubnetException e) { + // Not an internal error: only logging exception message, not stacktrace + mLog.e("Ignored packet from invalid subnet: " + e.getMessage()); + } + + private void processDiscover(@NonNull DhcpDiscoverPacket packet) + throws MalformedPacketException { + final DhcpLease lease; + final MacAddress clientMac = getMacAddr(packet); + try { + lease = mLeaseRepo.getOffer(packet.getExplicitClientIdOrNull(), clientMac, + packet.mRelayIp, packet.mRequestedIp, packet.mHostName); + } catch (DhcpLeaseRepository.OutOfAddressesException e) { + transmitNak(packet, "Out of addresses to offer"); + return; + } catch (DhcpLeaseRepository.InvalidSubnetException e) { + logIgnoredPacketInvalidSubnet(e); + return; + } + + transmitOffer(packet, lease, clientMac); + } + + private void processRequest(@NonNull DhcpRequestPacket packet) throws MalformedPacketException { + // If set, packet SID matches with this server's ID as checked in processPacket(). + final boolean sidSet = packet.mServerIdentifier != null; + final DhcpLease lease; + final MacAddress clientMac = getMacAddr(packet); + try { + lease = mLeaseRepo.requestLease(packet.getExplicitClientIdOrNull(), clientMac, + packet.mClientIp, packet.mRelayIp, packet.mRequestedIp, sidSet, + packet.mHostName); + } catch (DhcpLeaseRepository.InvalidAddressException e) { + transmitNak(packet, "Invalid requested address"); + return; + } catch (DhcpLeaseRepository.InvalidSubnetException e) { + logIgnoredPacketInvalidSubnet(e); + return; + } + + transmitAck(packet, lease, clientMac); + } + + private void processRelease(@NonNull DhcpReleasePacket packet) + throws MalformedPacketException { + final byte[] clientId = packet.getExplicitClientIdOrNull(); + final MacAddress macAddr = getMacAddr(packet); + // Don't care about success (there is no ACK/NAK); logging is already done in the repository + mLeaseRepo.releaseLease(clientId, macAddr, packet.mClientIp); + } + + private Inet4Address getAckOrOfferDst(@NonNull DhcpPacket request, @NonNull DhcpLease lease, + boolean broadcastFlag) { + // Unless relayed or broadcast, send to client IP if already configured on the client, or to + // the lease address if the client has no configured address + if (!isEmpty(request.mRelayIp)) { + return request.mRelayIp; + } else if (broadcastFlag) { + return (Inet4Address) Inet4Address.ALL; + } else if (!isEmpty(request.mClientIp)) { + return request.mClientIp; + } else { + return lease.getNetAddr(); + } + } + + /** + * Determine whether the broadcast flag should be set in the BOOTP packet flags. This does not + * apply to NAK responses, which should always have it set. + */ + private static boolean getBroadcastFlag(@NonNull DhcpPacket request, @NonNull DhcpLease lease) { + // No broadcast flag if the client already has a configured IP to unicast to. RFC2131 #4.1 + // has some contradictions regarding broadcast behavior if a client already has an IP + // configured and sends a request with both ciaddr (renew/rebind) and the broadcast flag + // set. Sending a unicast response to ciaddr matches previous behavior and is more + // efficient. + // If the client has no configured IP, broadcast if requested by the client or if the lease + // address cannot be used to send a unicast reply either. + return isEmpty(request.mClientIp) && (request.mBroadcast || isEmpty(lease.getNetAddr())); + } + + private boolean transmitOffer(@NonNull DhcpPacket request, @NonNull DhcpLease lease, + @NonNull MacAddress clientMac) { + final boolean broadcastFlag = getBroadcastFlag(request, lease); + final int timeout = getLeaseTimeout(lease); + final Inet4Address prefixMask = + getPrefixMaskAsInet4Address(mServingParams.serverAddr.getPrefixLength()); + final Inet4Address broadcastAddr = getBroadcastAddress( + mServingParams.getServerInet4Addr(), mServingParams.serverAddr.getPrefixLength()); + final ByteBuffer offerPacket = DhcpPacket.buildOfferPacket( + ENCAP_BOOTP, request.mTransId, broadcastFlag, mServingParams.getServerInet4Addr(), + request.mRelayIp, lease.getNetAddr(), request.mClientMac, timeout, prefixMask, + broadcastAddr, new ArrayList<>(mServingParams.defaultRouters), + new ArrayList<>(mServingParams.dnsServers), + mServingParams.getServerInet4Addr(), null /* domainName */, mServingParams.metered); + + return transmitOfferOrAckPacket(offerPacket, request, lease, clientMac, broadcastFlag); + } + + private boolean transmitAck(@NonNull DhcpPacket request, @NonNull DhcpLease lease, + @NonNull MacAddress clientMac) { + // TODO: replace DhcpPacket's build methods with real builders and use common code with + // transmitOffer above + final boolean broadcastFlag = getBroadcastFlag(request, lease); + final int timeout = getLeaseTimeout(lease); + final ByteBuffer ackPacket = DhcpPacket.buildAckPacket(ENCAP_BOOTP, request.mTransId, + broadcastFlag, mServingParams.getServerInet4Addr(), request.mRelayIp, + lease.getNetAddr(), request.mClientIp, request.mClientMac, timeout, + mServingParams.getPrefixMaskAsAddress(), mServingParams.getBroadcastAddress(), + new ArrayList<>(mServingParams.defaultRouters), + new ArrayList<>(mServingParams.dnsServers), + mServingParams.getServerInet4Addr(), null /* domainName */, mServingParams.metered); + + return transmitOfferOrAckPacket(ackPacket, request, lease, clientMac, broadcastFlag); + } + + private boolean transmitNak(DhcpPacket request, String message) { + mLog.w("Transmitting NAK: " + message); + // Always set broadcast flag for NAK: client may not have a correct IP + final ByteBuffer nakPacket = DhcpPacket.buildNakPacket( + ENCAP_BOOTP, request.mTransId, mServingParams.getServerInet4Addr(), + request.mRelayIp, request.mClientMac, true /* broadcast */, message); + + final Inet4Address dst = isEmpty(request.mRelayIp) + ? (Inet4Address) Inet4Address.ALL + : request.mRelayIp; + return transmitPacket(nakPacket, DhcpNakPacket.class.getSimpleName(), dst); + } + + private boolean transmitOfferOrAckPacket(@NonNull ByteBuffer buf, @NonNull DhcpPacket request, + @NonNull DhcpLease lease, @NonNull MacAddress clientMac, boolean broadcastFlag) { + mLog.logf("Transmitting %s with lease %s", request.getClass().getSimpleName(), lease); + // Client may not yet respond to ARP for the lease address, which may be the destination + // address. Add an entry to the ARP cache to save future ARP probes and make sure the + // packet reaches its destination. + if (!addArpEntry(clientMac, lease.getNetAddr())) { + // Logging for error already done + return false; + } + final Inet4Address dst = getAckOrOfferDst(request, lease, broadcastFlag); + return transmitPacket(buf, request.getClass().getSimpleName(), dst); + } + + private boolean transmitPacket(@NonNull ByteBuffer buf, @NonNull String packetTypeTag, + @NonNull Inet4Address dst) { + try { + mDeps.sendPacket(mSocket, buf, dst); + } catch (ErrnoException | IOException e) { + mLog.e("Can't send packet " + packetTypeTag, e); + return false; + } + return true; + } + + private boolean addArpEntry(@NonNull MacAddress macAddr, @NonNull Inet4Address inetAddr) { + try { + mDeps.addArpEntry(inetAddr, macAddr, mIface.name, mSocket); + return true; + } catch (IOException e) { + mLog.e("Error adding client to ARP table", e); + return false; + } + } + + /** + * Get the remaining lease time in seconds, starting from {@link Clock#elapsedRealtime()}. + * + * <p>This is an unsigned 32-bit integer, so it cannot be read as a standard (signed) Java int. + * The return value is only intended to be used to populate the lease time field in a DHCP + * response, considering that lease time is an unsigned 32-bit integer field in DHCP packets. + * + * <p>Lease expiration times are tracked internally with millisecond precision: this method + * returns a rounded down value. + */ + private int getLeaseTimeout(@NonNull DhcpLease lease) { + final long remainingTimeSecs = (lease.getExpTime() - mClock.elapsedRealtime()) / 1000; + if (remainingTimeSecs < 0) { + mLog.e("Processing expired lease " + lease); + return EXPIRED_FALLBACK_LEASE_TIME_SECS; + } + + if (remainingTimeSecs >= toUnsignedLong(INFINITE_LEASE)) { + return INFINITE_LEASE; + } + + return (int) remainingTimeSecs; + } + + /** + * Get the client MAC address from a packet. + * + * @throws MalformedPacketException The address in the packet uses an unsupported format. + */ + @NonNull + private MacAddress getMacAddr(@NonNull DhcpPacket packet) throws MalformedPacketException { + try { + return MacAddress.fromBytes(packet.getClientMac()); + } catch (IllegalArgumentException e) { + final String message = "Invalid MAC address in packet: " + + HexDump.dumpHexString(packet.getClientMac()); + throw new MalformedPacketException(message, e); + } + } + + private static boolean isEmpty(@Nullable Inet4Address address) { + return address == null || Inet4Address.ANY.equals(address); + } + + private class PacketListener extends DhcpPacketListener { + public PacketListener() { + super(mHandler); + } + + @Override + protected void onReceive(DhcpPacket packet, Inet4Address srcAddr, int srcPort) { + processPacket(packet, srcPort); + } + + @Override + protected void logError(String msg, Exception e) { + mLog.e("Error receiving packet: " + msg, e); + } + + @Override + protected void logParseError(byte[] packet, int length, DhcpPacket.ParseException e) { + mLog.e("Error parsing packet", e); + } + + @Override + protected FileDescriptor createFd() { + // TODO: have and use an API to set a socket tag without going through the thread tag + final int oldTag = TrafficStats.getAndSetThreadStatsTag(TAG_SYSTEM_DHCP_SERVER); + try { + mSocket = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + Os.setsockoptInt(mSocket, SOL_SOCKET, SO_REUSEADDR, 1); + // SO_BINDTODEVICE actually takes a string. This works because the first member + // of struct ifreq is a NULL-terminated interface name. + // TODO: add a setsockoptString() + Os.setsockoptIfreq(mSocket, SOL_SOCKET, SO_BINDTODEVICE, mIface.name); + Os.setsockoptInt(mSocket, SOL_SOCKET, SO_BROADCAST, 1); + Os.bind(mSocket, Inet4Address.ANY, DHCP_SERVER); + NetworkUtils.protectFromVpn(mSocket); + + return mSocket; + } catch (IOException | ErrnoException e) { + mLog.e("Error creating UDP socket", e); + DhcpServer.this.stop(); + return null; + } finally { + TrafficStats.setThreadStatsTag(oldTag); + } + } + } +} diff --git a/services/net/java/android/net/dhcp/DhcpServingParams.java b/services/net/java/android/net/dhcp/DhcpServingParams.java new file mode 100644 index 000000000000..df15ba1c5507 --- /dev/null +++ b/services/net/java/android/net/dhcp/DhcpServingParams.java @@ -0,0 +1,329 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import static android.net.NetworkUtils.getPrefixMaskAsInet4Address; +import static android.net.dhcp.DhcpPacket.INFINITE_LEASE; +import static android.net.util.NetworkConstants.IPV4_MAX_MTU; +import static android.net.util.NetworkConstants.IPV4_MIN_MTU; + +import static java.lang.Integer.toUnsignedLong; + +import android.annotation.NonNull; +import android.net.IpPrefix; +import android.net.LinkAddress; +import android.net.NetworkUtils; + +import com.google.android.collect.Sets; + +import java.net.Inet4Address; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * Parameters used by the DhcpServer to serve requests. + * + * <p>Instances are immutable. Use {@link DhcpServingParams.Builder} to instantiate. + * @hide + */ +public class DhcpServingParams { + public static final int MTU_UNSET = 0; + public static final int MIN_PREFIX_LENGTH = 16; + public static final int MAX_PREFIX_LENGTH = 30; + + /** Server inet address and prefix to serve */ + @NonNull + public final LinkAddress serverAddr; + + /** + * Default routers to be advertised to DHCP clients. May be empty. + * This set is provided by {@link DhcpServingParams.Builder} and is immutable. + */ + @NonNull + public final Set<Inet4Address> defaultRouters; + + /** + * DNS servers to be advertised to DHCP clients. May be empty. + * This set is provided by {@link DhcpServingParams.Builder} and is immutable. + */ + @NonNull + public final Set<Inet4Address> dnsServers; + + /** + * Excluded addresses that the DHCP server is not allowed to assign to clients. + * This set is provided by {@link DhcpServingParams.Builder} and is immutable. + */ + @NonNull + public final Set<Inet4Address> excludedAddrs; + + // DHCP uses uint32. Use long for clearer code, and check range when building. + public final long dhcpLeaseTimeSecs; + public final int linkMtu; + + /** + * Indicates whether the DHCP server should send the ANDROID_METERED vendor-specific option. + */ + public final boolean metered; + + /** + * Checked exception thrown when some parameters used to build {@link DhcpServingParams} are + * missing or invalid. + */ + public static class InvalidParameterException extends Exception { + public InvalidParameterException(String message) { + super(message); + } + } + + private DhcpServingParams(@NonNull LinkAddress serverAddr, + @NonNull Set<Inet4Address> defaultRouters, + @NonNull Set<Inet4Address> dnsServers, @NonNull Set<Inet4Address> excludedAddrs, + long dhcpLeaseTimeSecs, int linkMtu, boolean metered) { + this.serverAddr = serverAddr; + this.defaultRouters = defaultRouters; + this.dnsServers = dnsServers; + this.excludedAddrs = excludedAddrs; + this.dhcpLeaseTimeSecs = dhcpLeaseTimeSecs; + this.linkMtu = linkMtu; + this.metered = metered; + } + + @NonNull + public Inet4Address getServerInet4Addr() { + return (Inet4Address) serverAddr.getAddress(); + } + + /** + * Get the served prefix mask as an IPv4 address. + * + * <p>For example, if the served prefix is 192.168.42.0/24, this will return 255.255.255.0. + */ + @NonNull + public Inet4Address getPrefixMaskAsAddress() { + return getPrefixMaskAsInet4Address(serverAddr.getPrefixLength()); + } + + /** + * Get the server broadcast address. + * + * <p>For example, if the server {@link LinkAddress} is 192.168.42.1/24, this will return + * 192.168.42.255. + */ + @NonNull + public Inet4Address getBroadcastAddress() { + return NetworkUtils.getBroadcastAddress(getServerInet4Addr(), serverAddr.getPrefixLength()); + } + + /** + * Utility class to create new instances of {@link DhcpServingParams} while checking validity + * of the parameters. + */ + public static class Builder { + private LinkAddress serverAddr; + private Set<Inet4Address> defaultRouters; + private Set<Inet4Address> dnsServers; + private Set<Inet4Address> excludedAddrs; + private long dhcpLeaseTimeSecs; + private int linkMtu = MTU_UNSET; + private boolean metered; + + /** + * Set the server address and served prefix for the DHCP server. + * + * <p>This parameter is required. + */ + public Builder setServerAddr(@NonNull LinkAddress serverAddr) { + this.serverAddr = serverAddr; + return this; + } + + /** + * Set the default routers to be advertised to DHCP clients. + * + * <p>Each router must be inside the served prefix. This may be an empty set, but it must + * always be set explicitly before building the {@link DhcpServingParams}. + */ + public Builder setDefaultRouters(@NonNull Set<Inet4Address> defaultRouters) { + this.defaultRouters = defaultRouters; + return this; + } + + /** + * Set the default routers to be advertised to DHCP clients. + * + * <p>Each router must be inside the served prefix. This may be an empty list of routers, + * but it must always be set explicitly before building the {@link DhcpServingParams}. + */ + public Builder setDefaultRouters(@NonNull Inet4Address... defaultRouters) { + return setDefaultRouters(Sets.newArraySet(defaultRouters)); + } + + /** + * Convenience method to build the parameters with no default router. + * + * <p>Equivalent to calling {@link #setDefaultRouters(Inet4Address...)} with no address. + */ + public Builder withNoDefaultRouter() { + return setDefaultRouters(); + } + + /** + * Set the DNS servers to be advertised to DHCP clients. + * + * <p>This may be an empty set, but it must always be set explicitly before building the + * {@link DhcpServingParams}. + */ + public Builder setDnsServers(@NonNull Set<Inet4Address> dnsServers) { + this.dnsServers = dnsServers; + return this; + } + + /** + * Set the DNS servers to be advertised to DHCP clients. + * + * <p>This may be an empty list of servers, but it must always be set explicitly before + * building the {@link DhcpServingParams}. + */ + public Builder setDnsServers(@NonNull Inet4Address... dnsServers) { + return setDnsServers(Sets.newArraySet(dnsServers)); + } + + /** + * Convenience method to build the parameters with no DNS server. + * + * <p>Equivalent to calling {@link #setDnsServers(Inet4Address...)} with no address. + */ + public Builder withNoDnsServer() { + return setDnsServers(); + } + + /** + * Set excluded addresses that the DHCP server is not allowed to assign to clients. + * + * <p>This parameter is optional. DNS servers and default routers are always excluded + * and do not need to be set here. + */ + public Builder setExcludedAddrs(@NonNull Set<Inet4Address> excludedAddrs) { + this.excludedAddrs = excludedAddrs; + return this; + } + + /** + * Set excluded addresses that the DHCP server is not allowed to assign to clients. + * + * <p>This parameter is optional. DNS servers and default routers are always excluded + * and do not need to be set here. + */ + public Builder setExcludedAddrs(@NonNull Inet4Address... excludedAddrs) { + return setExcludedAddrs(Sets.newArraySet(excludedAddrs)); + } + + /** + * Set the lease time for leases assigned by the DHCP server. + * + * <p>This parameter is required. + */ + public Builder setDhcpLeaseTimeSecs(long dhcpLeaseTimeSecs) { + this.dhcpLeaseTimeSecs = dhcpLeaseTimeSecs; + return this; + } + + /** + * Set the link MTU to be advertised to DHCP clients. + * + * <p>If set to {@link #MTU_UNSET}, no MTU will be advertised to clients. This parameter + * is optional and defaults to {@link #MTU_UNSET}. + */ + public Builder setLinkMtu(int linkMtu) { + this.linkMtu = linkMtu; + return this; + } + + /** + * Set whether the DHCP server should send the ANDROID_METERED vendor-specific option. + * + * <p>If not set, the default value is false. + */ + public Builder setMetered(boolean metered) { + this.metered = metered; + return this; + } + + /** + * Create a new {@link DhcpServingParams} instance based on parameters set in the builder. + * + * <p>This method has no side-effects. If it does not throw, a valid + * {@link DhcpServingParams} is returned. + * @return The constructed parameters. + * @throws InvalidParameterException At least one parameter is missing or invalid. + */ + @NonNull + public DhcpServingParams build() throws InvalidParameterException { + if (serverAddr == null) { + throw new InvalidParameterException("Missing serverAddr"); + } + if (defaultRouters == null) { + throw new InvalidParameterException("Missing defaultRouters"); + } + if (dnsServers == null) { + // Empty set is OK, but enforce explicitly setting it + throw new InvalidParameterException("Missing dnsServers"); + } + if (dhcpLeaseTimeSecs <= 0 || dhcpLeaseTimeSecs > toUnsignedLong(INFINITE_LEASE)) { + throw new InvalidParameterException("Invalid lease time: " + dhcpLeaseTimeSecs); + } + if (linkMtu != MTU_UNSET && (linkMtu < IPV4_MIN_MTU || linkMtu > IPV4_MAX_MTU)) { + throw new InvalidParameterException("Invalid link MTU: " + linkMtu); + } + if (!serverAddr.isIPv4()) { + throw new InvalidParameterException("serverAddr must be IPv4"); + } + if (serverAddr.getPrefixLength() < MIN_PREFIX_LENGTH + || serverAddr.getPrefixLength() > MAX_PREFIX_LENGTH) { + throw new InvalidParameterException("Prefix length is not in supported range"); + } + + final IpPrefix prefix = makeIpPrefix(serverAddr); + for (Inet4Address addr : defaultRouters) { + if (!prefix.contains(addr)) { + throw new InvalidParameterException(String.format( + "Default router %s is not in server prefix %s", addr, serverAddr)); + } + } + + final Set<Inet4Address> excl = new HashSet<>(); + if (excludedAddrs != null) { + excl.addAll(excludedAddrs); + } + excl.add((Inet4Address) serverAddr.getAddress()); + excl.addAll(defaultRouters); + excl.addAll(dnsServers); + + return new DhcpServingParams(serverAddr, + Collections.unmodifiableSet(new HashSet<>(defaultRouters)), + Collections.unmodifiableSet(new HashSet<>(dnsServers)), + Collections.unmodifiableSet(excl), + dhcpLeaseTimeSecs, linkMtu, metered); + } + } + + @NonNull + static IpPrefix makeIpPrefix(@NonNull LinkAddress addr) { + return new IpPrefix(addr.getAddress(), addr.getPrefixLength()); + } +} diff --git a/services/net/java/android/net/ip/IpClient.java b/services/net/java/android/net/ip/IpClient.java index 7f821ffd369a..3cdef1e73ae4 100644 --- a/services/net/java/android/net/ip/IpClient.java +++ b/services/net/java/android/net/ip/IpClient.java @@ -431,6 +431,7 @@ public class IpClient extends StateMachine { public ProvisioningConfiguration(ProvisioningConfiguration other) { mEnableIPv4 = other.mEnableIPv4; mEnableIPv6 = other.mEnableIPv6; + mUsingMultinetworkPolicyTracker = other.mUsingMultinetworkPolicyTracker; mUsingIpReachabilityMonitor = other.mUsingIpReachabilityMonitor; mRequestedPreDhcpActionMs = other.mRequestedPreDhcpActionMs; mInitialConfig = InitialConfiguration.copy(other.mInitialConfig); @@ -524,7 +525,7 @@ public class IpClient extends StateMachine { return false; } // There no more than one IPv4 address - if (ipAddresses.stream().filter(Inet4Address.class::isInstance).count() > 1) { + if (ipAddresses.stream().filter(LinkAddress::isIPv4).count() > 1) { return false; } diff --git a/services/net/java/android/net/util/FdEventsReader.java b/services/net/java/android/net/util/FdEventsReader.java new file mode 100644 index 000000000000..8bbf449f6374 --- /dev/null +++ b/services/net/java/android/net/util/FdEventsReader.java @@ -0,0 +1,254 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.util; + +import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT; +import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.os.Handler; +import android.os.Looper; +import android.os.MessageQueue; +import android.system.ErrnoException; +import android.system.OsConstants; + +import libcore.io.IoUtils; + +import java.io.FileDescriptor; + + +/** + * This class encapsulates the mechanics of registering a file descriptor + * with a thread's Looper and handling read events (and errors). + * + * Subclasses MUST implement createFd() and SHOULD override handlePacket(). They MAY override + * onStop() and onStart(). + * + * Subclasses can expect a call life-cycle like the following: + * + * [1] when a client calls start(), createFd() is called, followed by the onStart() hook if all + * goes well. Implementations may override onStart() for additional initialization. + * + * [2] yield, waiting for read event or error notification: + * + * [a] readPacket() && handlePacket() + * + * [b] if (no error): + * goto 2 + * else: + * goto 3 + * + * [3] when a client calls stop(), the onStop() hook is called (unless already stopped or never + * started). Implementations may override onStop() for additional cleanup. + * + * The packet receive buffer is recycled on every read call, so subclasses + * should make any copies they would like inside their handlePacket() + * implementation. + * + * All public methods MUST only be called from the same thread with which + * the Handler constructor argument is associated. + * + * @hide + */ +public abstract class FdEventsReader<BufferType> { + private static final int FD_EVENTS = EVENT_INPUT | EVENT_ERROR; + private static final int UNREGISTER_THIS_FD = 0; + + @NonNull + private final Handler mHandler; + @NonNull + private final MessageQueue mQueue; + @NonNull + private final BufferType mBuffer; + @Nullable + private FileDescriptor mFd; + private long mPacketsReceived; + + protected static void closeFd(FileDescriptor fd) { + IoUtils.closeQuietly(fd); + } + + protected FdEventsReader(@NonNull Handler h, @NonNull BufferType buffer) { + mHandler = h; + mQueue = mHandler.getLooper().getQueue(); + mBuffer = buffer; + } + + public void start() { + if (onCorrectThread()) { + createAndRegisterFd(); + } else { + mHandler.post(() -> { + logError("start() called from off-thread", null); + createAndRegisterFd(); + }); + } + } + + public void stop() { + if (onCorrectThread()) { + unregisterAndDestroyFd(); + } else { + mHandler.post(() -> { + logError("stop() called from off-thread", null); + unregisterAndDestroyFd(); + }); + } + } + + @NonNull + public Handler getHandler() { return mHandler; } + + protected abstract int recvBufSize(@NonNull BufferType buffer); + + public int recvBufSize() { return recvBufSize(mBuffer); } + + /** + * Get the number of successful calls to {@link #readPacket(FileDescriptor, Object)}. + * + * <p>A call was successful if {@link #readPacket(FileDescriptor, Object)} returned a value > 0. + */ + public final long numPacketsReceived() { return mPacketsReceived; } + + /** + * Subclasses MUST create the listening socket here, including setting + * all desired socket options, interface or address/port binding, etc. + */ + @Nullable + protected abstract FileDescriptor createFd(); + + /** + * Implementations MUST return the bytes read or throw an Exception. + * + * <p>The caller may throw a {@link ErrnoException} with {@link OsConstants#EAGAIN} or + * {@link OsConstants#EINTR}, in which case {@link FdEventsReader} will ignore the buffer + * contents and respectively wait for further input or retry the read immediately. For all other + * exceptions, the {@link FdEventsReader} will be stopped with no more interactions with this + * method. + */ + protected abstract int readPacket(@NonNull FileDescriptor fd, @NonNull BufferType buffer) + throws Exception; + + /** + * Called by the main loop for every packet. Any desired copies of + * |recvbuf| should be made in here, as the underlying byte array is + * reused across all reads. + */ + protected void handlePacket(@NonNull BufferType recvbuf, int length) {} + + /** + * Called by the main loop to log errors. In some cases |e| may be null. + */ + protected void logError(@NonNull String msg, @Nullable Exception e) {} + + /** + * Called by start(), if successful, just prior to returning. + */ + protected void onStart() {} + + /** + * Called by stop() just prior to returning. + */ + protected void onStop() {} + + private void createAndRegisterFd() { + if (mFd != null) return; + + try { + mFd = createFd(); + if (mFd != null) { + // Force the socket to be non-blocking. + IoUtils.setBlocking(mFd, false); + } + } catch (Exception e) { + logError("Failed to create socket: ", e); + closeFd(mFd); + mFd = null; + } + + if (mFd == null) return; + + mQueue.addOnFileDescriptorEventListener( + mFd, + FD_EVENTS, + (fd, events) -> { + // Always call handleInput() so read/recvfrom are given + // a proper chance to encounter a meaningful errno and + // perhaps log a useful error message. + if (!isRunning() || !handleInput()) { + unregisterAndDestroyFd(); + return UNREGISTER_THIS_FD; + } + return FD_EVENTS; + }); + onStart(); + } + + private boolean isRunning() { return (mFd != null) && mFd.valid(); } + + // Keep trying to read until we get EAGAIN/EWOULDBLOCK or some fatal error. + private boolean handleInput() { + while (isRunning()) { + final int bytesRead; + + try { + bytesRead = readPacket(mFd, mBuffer); + if (bytesRead < 1) { + if (isRunning()) logError("Socket closed, exiting", null); + break; + } + mPacketsReceived++; + } catch (ErrnoException e) { + if (e.errno == OsConstants.EAGAIN) { + // We've read everything there is to read this time around. + return true; + } else if (e.errno == OsConstants.EINTR) { + continue; + } else { + if (isRunning()) logError("readPacket error: ", e); + break; + } + } catch (Exception e) { + if (isRunning()) logError("readPacket error: ", e); + break; + } + + try { + handlePacket(mBuffer, bytesRead); + } catch (Exception e) { + logError("handlePacket error: ", e); + break; + } + } + + return false; + } + + private void unregisterAndDestroyFd() { + if (mFd == null) return; + + mQueue.removeOnFileDescriptorEventListener(mFd); + closeFd(mFd); + mFd = null; + onStop(); + } + + private boolean onCorrectThread() { + return (mHandler.getLooper() == Looper.myLooper()); + } +} diff --git a/services/net/java/android/net/util/NetworkConstants.java b/services/net/java/android/net/util/NetworkConstants.java index de04fd0ced04..3defe56939f5 100644 --- a/services/net/java/android/net/util/NetworkConstants.java +++ b/services/net/java/android/net/util/NetworkConstants.java @@ -77,10 +77,12 @@ public final class NetworkConstants { /** * IPv4 constants. * - * See als: + * See also: * - https://tools.ietf.org/html/rfc791 */ public static final int IPV4_HEADER_MIN_LEN = 20; + public static final int IPV4_MIN_MTU = 68; + public static final int IPV4_MAX_MTU = 65_535; public static final int IPV4_IHL_MASK = 0xf; public static final int IPV4_FLAGS_OFFSET = 6; public static final int IPV4_FRAGMENT_MASK = 0x1fff; diff --git a/services/net/java/android/net/util/PacketReader.java b/services/net/java/android/net/util/PacketReader.java index 10da2a551e21..4aec6b6753a6 100644 --- a/services/net/java/android/net/util/PacketReader.java +++ b/services/net/java/android/net/util/PacketReader.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 The Android Open Source Project + * Copyright (C) 2018 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. @@ -16,236 +16,46 @@ package android.net.util; -import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT; -import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR; +import static java.lang.Math.max; -import android.annotation.Nullable; import android.os.Handler; -import android.os.Looper; -import android.os.MessageQueue; -import android.os.MessageQueue.OnFileDescriptorEventListener; -import android.system.ErrnoException; import android.system.Os; -import android.system.OsConstants; - -import libcore.io.IoUtils; import java.io.FileDescriptor; -import java.io.IOException; - /** - * This class encapsulates the mechanics of registering a file descriptor - * with a thread's Looper and handling read events (and errors). - * - * Subclasses MUST implement createFd() and SHOULD override handlePacket(). - - * Subclasses can expect a call life-cycle like the following: - * - * [1] start() calls createFd() and (if all goes well) onStart() - * - * [2] yield, waiting for read event or error notification: - * - * [a] readPacket() && handlePacket() - * - * [b] if (no error): - * goto 2 - * else: - * goto 3 - * - * [3] stop() calls onStop() if not previously stopped - * - * The packet receive buffer is recycled on every read call, so subclasses - * should make any copies they would like inside their handlePacket() - * implementation. - * - * All public methods MUST only be called from the same thread with which - * the Handler constructor argument is associated. + * Specialization of {@link FdEventsReader} that reads packets into a byte array. * * TODO: rename this class to something more correctly descriptive (something * like [or less horrible than] FdReadEventsHandler?). * * @hide */ -public abstract class PacketReader { - private static final int FD_EVENTS = EVENT_INPUT | EVENT_ERROR; - private static final int UNREGISTER_THIS_FD = 0; +public abstract class PacketReader extends FdEventsReader<byte[]> { public static final int DEFAULT_RECV_BUF_SIZE = 2 * 1024; - private final Handler mHandler; - private final MessageQueue mQueue; - private final byte[] mPacket; - private FileDescriptor mFd; - private long mPacketsReceived; - - protected static void closeFd(FileDescriptor fd) { - IoUtils.closeQuietly(fd); - } - protected PacketReader(Handler h) { this(h, DEFAULT_RECV_BUF_SIZE); } - protected PacketReader(Handler h, int recvbufsize) { - mHandler = h; - mQueue = mHandler.getLooper().getQueue(); - mPacket = new byte[Math.max(recvbufsize, DEFAULT_RECV_BUF_SIZE)]; - } - - public final void start() { - if (onCorrectThread()) { - createAndRegisterFd(); - } else { - mHandler.post(() -> { - logError("start() called from off-thread", null); - createAndRegisterFd(); - }); - } + protected PacketReader(Handler h, int recvBufSize) { + super(h, new byte[max(recvBufSize, DEFAULT_RECV_BUF_SIZE)]); } - public final void stop() { - if (onCorrectThread()) { - unregisterAndDestroyFd(); - } else { - mHandler.post(() -> { - logError("stop() called from off-thread", null); - unregisterAndDestroyFd(); - }); - } + @Override + protected final int recvBufSize(byte[] buffer) { + return buffer.length; } - public Handler getHandler() { return mHandler; } - - public final int recvBufSize() { return mPacket.length; } - - public final long numPacketsReceived() { return mPacketsReceived; } - - /** - * Subclasses MUST create the listening socket here, including setting - * all desired socket options, interface or address/port binding, etc. - */ - protected abstract FileDescriptor createFd(); - /** * Subclasses MAY override this to change the default read() implementation * in favour of, say, recvfrom(). * * Implementations MUST return the bytes read or throw an Exception. */ + @Override protected int readPacket(FileDescriptor fd, byte[] packetBuffer) throws Exception { return Os.read(fd, packetBuffer, 0, packetBuffer.length); } - - /** - * Called by the main loop for every packet. Any desired copies of - * |recvbuf| should be made in here, as the underlying byte array is - * reused across all reads. - */ - protected void handlePacket(byte[] recvbuf, int length) {} - - /** - * Called by the main loop to log errors. In some cases |e| may be null. - */ - protected void logError(String msg, Exception e) {} - - /** - * Called by start(), if successful, just prior to returning. - */ - protected void onStart() {} - - /** - * Called by stop() just prior to returning. - */ - protected void onStop() {} - - private void createAndRegisterFd() { - if (mFd != null) return; - - try { - mFd = createFd(); - if (mFd != null) { - // Force the socket to be non-blocking. - IoUtils.setBlocking(mFd, false); - } - } catch (Exception e) { - logError("Failed to create socket: ", e); - closeFd(mFd); - mFd = null; - return; - } - - if (mFd == null) return; - - mQueue.addOnFileDescriptorEventListener( - mFd, - FD_EVENTS, - new OnFileDescriptorEventListener() { - @Override - public int onFileDescriptorEvents(FileDescriptor fd, int events) { - // Always call handleInput() so read/recvfrom are given - // a proper chance to encounter a meaningful errno and - // perhaps log a useful error message. - if (!isRunning() || !handleInput()) { - unregisterAndDestroyFd(); - return UNREGISTER_THIS_FD; - } - return FD_EVENTS; - } - }); - onStart(); - } - - private boolean isRunning() { return (mFd != null) && mFd.valid(); } - - // Keep trying to read until we get EAGAIN/EWOULDBLOCK or some fatal error. - private boolean handleInput() { - while (isRunning()) { - final int bytesRead; - - try { - bytesRead = readPacket(mFd, mPacket); - if (bytesRead < 1) { - if (isRunning()) logError("Socket closed, exiting", null); - break; - } - mPacketsReceived++; - } catch (ErrnoException e) { - if (e.errno == OsConstants.EAGAIN) { - // We've read everything there is to read this time around. - return true; - } else if (e.errno == OsConstants.EINTR) { - continue; - } else { - if (isRunning()) logError("readPacket error: ", e); - break; - } - } catch (Exception e) { - if (isRunning()) logError("readPacket error: ", e); - break; - } - - try { - handlePacket(mPacket, bytesRead); - } catch (Exception e) { - logError("handlePacket error: ", e); - break; - } - } - - return false; - } - - private void unregisterAndDestroyFd() { - if (mFd == null) return; - - mQueue.removeOnFileDescriptorEventListener(mFd); - closeFd(mFd); - mFd = null; - onStop(); - } - - private boolean onCorrectThread() { - return (mHandler.getLooper() == Looper.myLooper()); - } } diff --git a/services/net/java/android/net/util/SharedLog.java b/services/net/java/android/net/util/SharedLog.java index bbd3d13efbd6..f7bf393f367b 100644 --- a/services/net/java/android/net/util/SharedLog.java +++ b/services/net/java/android/net/util/SharedLog.java @@ -16,6 +16,7 @@ package android.net.util; +import android.annotation.NonNull; import android.text.TextUtils; import android.util.LocalLog; import android.util.Log; @@ -90,6 +91,13 @@ public class SharedLog { Log.e(mTag, record(Category.ERROR, msg)); } + /** + * Log an error due to an exception, with the exception stacktrace. + */ + public void e(@NonNull String msg, @NonNull Throwable e) { + Log.e(mTag, record(Category.ERROR, msg + ": " + e.getMessage()), e); + } + public void i(String msg) { Log.i(mTag, record(Category.NONE, msg)); } diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index e6584c51ebd6..1d5eeced44b9 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -207,8 +207,8 @@ public class UsageStatsService extends SystemService implements @Override public void onBootPhase(int phase) { + mAppStandby.onBootPhase(phase); if (phase == PHASE_SYSTEM_SERVICES_READY) { - mAppStandby.onBootPhase(phase); // initialize mDpmInternal getDpmInternal(); diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 9f8042c844de..36f8063cca52 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -279,8 +279,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver } mControlFds.put(UsbManager.FUNCTION_MTP, mtpFd); FileDescriptor ptpFd = nativeOpenControl(UsbManager.USB_FUNCTION_PTP); - if (mtpFd == null) { - Slog.e(TAG, "Failed to open control for mtp"); + if (ptpFd == null) { + Slog.e(TAG, "Failed to open control for ptp"); } mControlFds.put(UsbManager.FUNCTION_PTP, ptpFd); diff --git a/telecomm/OWNERS b/telecomm/OWNERS index a3bcfb2cbcfa..673a0a9b558e 100644 --- a/telecomm/OWNERS +++ b/telecomm/OWNERS @@ -4,3 +4,4 @@ tgunn@google.com breadley@google.com hallliu@google.com rgreenwalt@google.com +paulye@google.com diff --git a/telecomm/java/android/telecom/CallRedirectionService.java b/telecomm/java/android/telecom/CallRedirectionService.java new file mode 100644 index 000000000000..9c874bf305b1 --- /dev/null +++ b/telecomm/java/android/telecom/CallRedirectionService.java @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2018 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.telecom; + +import android.annotation.SdkConstant; +import android.app.Service; +import android.content.Intent; +import android.net.Uri; +import android.os.Handler; +import android.os.IBinder; +import android.os.Looper; +import android.os.Message; +import android.os.RemoteException; + +import com.android.internal.os.SomeArgs; +import com.android.internal.telecom.ICallRedirectionService; +import com.android.internal.telecom.ICallRedirectionAdapter; + +/** + * This service can be implemented to interact between Telecom and its implementor + * for making outgoing call with optional redirection/cancellation purposes. + * + * <p> + * Below is an example manifest registration for a {@code CallRedirectionService}. + * <pre> + * {@code + * <service android:name="your.package.YourCallRedirectionServiceImplementation" + * android:permission="android.permission.BIND_REDIRECTION_SERVICE"> + * <intent-filter> + * <action android:name="android.telecom.CallRedirectionService"/> + * </intent-filter> + * </service> + * } + * </pre> + */ +public abstract class CallRedirectionService extends Service { + /** + * The {@link Intent} that must be declared as handled by the service. + */ + @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) + public static final String SERVICE_INTERFACE = "android.telecom.CallRedirectionService"; + + /** + * An adapter to inform Telecom the response from the implementor of the Call + * Redirection service + */ + private ICallRedirectionAdapter mCallRedirectionAdapter; + + /** + * Telecom calls this method to inform the implemented {@link CallRedirectionService} of + * a new outgoing call which is being placed. + * @param handle the phone number dialed by the user + * @param targetPhoneAccount the {@link PhoneAccountHandle} on which the call will be placed. + */ + public abstract void onPlaceCall(Uri handle, PhoneAccountHandle targetPhoneAccount); + + /** + * The implemented {@link CallRedirectionService} calls this method to response a request + * received via {@link #onPlaceCall(Uri, PhoneAccountHandle)} to inform Telecom that no changes + * are required to the outgoing call, and that the call should be placed as-is. + */ + public final void placeCallUnmodified() { + try { + mCallRedirectionAdapter.placeCallUnmodified(); + } catch (RemoteException e) { + } + } + + /** + * The implemented {@link CallRedirectionService} calls this method to response a request + * received via {@link #onPlaceCall(Uri, PhoneAccountHandle)} to inform Telecom that changes + * are required to the phone number or/and {@link PhoneAccountHandle} for the outgoing call. + * @param handle the new phone number to dial + * @param targetPhoneAccount the {@link PhoneAccountHandle} to use when placing the call. + * If {@code null}, no change will be made to the + * {@link PhoneAccountHandle} used to place the call. + */ + public final void redirectCall(Uri handle, PhoneAccountHandle targetPhoneAccount) { + try { + mCallRedirectionAdapter.redirectCall(handle, targetPhoneAccount); + } catch (RemoteException e) { + } + } + + /** + * The implemented {@link CallRedirectionService} calls this method to response a request + * received via {@link #onPlaceCall(Uri, PhoneAccountHandle)} to inform Telecom that an outgoing + * call should be canceled entirely. + */ + public final void cancelCall() { + try { + mCallRedirectionAdapter.cancelCall(); + } catch (RemoteException e) { + } + } + + /** + * A handler message to process the attempt to place call with redirection service from Telecom + */ + private static final int MSG_PLACE_CALL = 1; + + /** + * A handler to process the attempt to place call with redirection service from Telecom + */ + private final Handler mHandler = new Handler(Looper.getMainLooper()) { + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MSG_PLACE_CALL: + SomeArgs args = (SomeArgs) msg.obj; + try { + mCallRedirectionAdapter = (ICallRedirectionAdapter) args.arg1; + onPlaceCall((Uri) args.arg2, (PhoneAccountHandle) args.arg3); + } finally { + args.recycle(); + } + break; + } + } + }; + + private final class CallRedirectionBinder extends ICallRedirectionService.Stub { + + /** + * Telecom calls this method to inform the CallRedirectionService of a new outgoing call + * which is about to be placed. + * @param handle the phone number dialed by the user + * @param targetPhoneAccount the URI of the number the user dialed + */ + @Override + public void placeCall(ICallRedirectionAdapter adapter, Uri handle, + PhoneAccountHandle targetPhoneAccount) { + Log.v(this, "placeCall"); + SomeArgs args = SomeArgs.obtain(); + args.arg1 = adapter; + args.arg2 = handle; + args.arg3 = targetPhoneAccount; + mHandler.obtainMessage(MSG_PLACE_CALL, args).sendToTarget(); + } + } + + @Override + public IBinder onBind(Intent intent) { + Log.v(this, "onBind"); + return new CallRedirectionBinder(); + } + + @Override + public boolean onUnbind(Intent intent) { + Log.v(this, "onUnbind"); + return false; + } +} diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index b3a3bf21cd8b..9a4ea9e7f4bd 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -28,6 +28,7 @@ import java.lang.String; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; /** * Represents a distinct method to place or receive a phone call. Apps which can place calls and @@ -156,6 +157,18 @@ public final class PhoneAccount implements Parcelable { "android.telecom.extra.PLAY_CALL_RECORDING_TONE"; /** + * Boolean {@link PhoneAccount} extras key (see {@link PhoneAccount#getExtras()} which + * indicates whether calls for a {@link PhoneAccount} should skip call filtering. + * <p> + * If not specified, this will default to false; all calls will undergo call filtering unless + * specifically exempted (e.g. {@link Connection#PROPERTY_EMERGENCY_CALLBACK_MODE}.) However, + * this may be used to skip call filtering when it has already been performed on another device. + * @hide + */ + public static final String EXTRA_SKIP_CALL_FILTERING = + "android.telecom.extra.SKIP_CALL_FILTERING"; + + /** * Flag indicating that this {@code PhoneAccount} can act as a connection manager for * other connections. The {@link ConnectionService} associated with this {@code PhoneAccount} * will be allowed to manage phone calls including using its own proprietary phone-call @@ -348,6 +361,33 @@ public final class PhoneAccount implements Parcelable { private boolean mIsEnabled; private String mGroupId; + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + PhoneAccount that = (PhoneAccount) o; + return mCapabilities == that.mCapabilities && + mHighlightColor == that.mHighlightColor && + mSupportedAudioRoutes == that.mSupportedAudioRoutes && + mIsEnabled == that.mIsEnabled && + Objects.equals(mAccountHandle, that.mAccountHandle) && + Objects.equals(mAddress, that.mAddress) && + Objects.equals(mSubscriptionAddress, that.mSubscriptionAddress) && + Objects.equals(mLabel, that.mLabel) && + Objects.equals(mShortDescription, that.mShortDescription) && + Objects.equals(mSupportedUriSchemes, that.mSupportedUriSchemes) && + areBundlesEqual(mExtras, that.mExtras) && + Objects.equals(mGroupId, that.mGroupId); + } + + @Override + public int hashCode() { + return Objects.hash(mAccountHandle, mAddress, mSubscriptionAddress, mCapabilities, + mHighlightColor, mLabel, mShortDescription, mSupportedUriSchemes, + mSupportedAudioRoutes, + mExtras, mIsEnabled, mGroupId); + } + /** * Helper class for creating a {@link PhoneAccount}. */ @@ -1010,4 +1050,31 @@ public final class PhoneAccount implements Parcelable { return sb.toString(); } + + /** + * Determines if two {@link Bundle}s are equal. + * @param extras First {@link Bundle} to check. + * @param newExtras {@link Bundle} to compare against. + * @return {@code true} if the {@link Bundle}s are equal, {@code false} otherwise. + */ + private static boolean areBundlesEqual(Bundle extras, Bundle newExtras) { + if (extras == null || newExtras == null) { + return extras == newExtras; + } + + if (extras.size() != newExtras.size()) { + return false; + } + + for(String key : extras.keySet()) { + if (key != null) { + final Object value = extras.get(key); + final Object newValue = newExtras.get(key); + if (!Objects.equals(value, newValue)) { + return false; + } + } + } + return true; + } } diff --git a/telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl b/telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl new file mode 100644 index 000000000000..46bf983f52a2 --- /dev/null +++ b/telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2018 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.internal.telecom; + +import android.net.Uri; +import android.telecom.PhoneAccountHandle; + +/** + * Internal remote callback interface for call redirection services. + * + * @see android.telecom.CallRedirectionService + * + * {@hide} + */ +oneway interface ICallRedirectionAdapter { + void cancelCall(); + + void placeCallUnmodified(); + + void redirectCall(in Uri handle, in PhoneAccountHandle targetPhoneAccount); +} diff --git a/telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl b/telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl new file mode 100644 index 000000000000..d8d360beb64d --- /dev/null +++ b/telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2018 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.internal.telecom; + +import android.net.Uri; +import android.telecom.PhoneAccountHandle; + +import com.android.internal.telecom.ICallRedirectionAdapter; + +/** + * Internal remote interface for a call redirection service. + * + * @see android.telecom.CallRedirectionService + * + * @hide + */ +oneway interface ICallRedirectionService { + void placeCall(in ICallRedirectionAdapter adapter, in Uri handle, + in PhoneAccountHandle targetPhoneAccount); +} diff --git a/telephony/OWNERS b/telephony/OWNERS index 6f67bc25f879..054288b85ba6 100644 --- a/telephony/OWNERS +++ b/telephony/OWNERS @@ -12,3 +12,4 @@ jminjie@google.com satk@google.com shuoq@google.com refuhoo@google.com +paulye@google.com diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index f68aeae87647..7e63230b9abc 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -26,8 +26,8 @@ import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; import android.content.Intent; -import android.database.Cursor; import android.database.ContentObserver; +import android.database.Cursor; import android.database.sqlite.SqliteWrapper; import android.net.Uri; import android.telephony.Rlog; @@ -41,7 +41,6 @@ import android.util.Patterns; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.SmsApplication; - import java.util.HashSet; import java.util.Set; import java.util.regex.Matcher; @@ -1127,7 +1126,10 @@ public final class Telephony { * * <p>Requires {@code android.Manifest.permission#CONTROL_INCALL_EXPERIENCE} to * send and receive.</p> + * @deprecated it is no longer supported, use {@link + * TelephonyManager#ACTION_SECRET_CODE} instead */ + @Deprecated @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index d7376691dd66..9319750a7a93 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -22,6 +22,7 @@ import android.annotation.RequiresPermission; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.PersistableBundle; import android.os.RemoteException; @@ -80,15 +81,60 @@ public class CarrierConfigManager { public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool"; + /** + * Boolean indicating if the "Call forwarding" item is visible in the Call Settings menu. + * true means visible. false means gone. + * @hide + */ + public static final String KEY_CALL_FORWARDING_VISIBILITY_BOOL = + "call_forwarding_visibility_bool"; + + /** + * Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu. + * true means visible. false means gone. + * @hide + */ + public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = + "additional_settings_caller_id_visibility_bool"; + + /** + * Boolean indicating if the "Call Waiting" item is visible in the Additional Settings menu. + * true means visible. false means gone. + * @hide + */ + public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = + "additional_settings_call_waiting_visibility_bool"; + /** * Boolean indicating if the "Call barring" item is visible in the Call Settings menu. - * true means visible. false means gone. - * @hide + * If true, the "Call Barring" menu will be visible. If false, the menu will be gone. + * + * Disabled by default. */ public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool"; /** + * Flag indicating whether or not changing the call barring password via the "Call Barring" + * settings menu is supported. If true, the option will be visible in the "Call + * Barring" settings menu. If false, the option will not be visible. + * + * Enabled by default. + */ + public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = + "call_barring_supports_password_change_bool"; + + /** + * Flag indicating whether or not deactivating all call barring features via the "Call Barring" + * settings menu is supported. If true, the option will be visible in the "Call + * Barring" settings menu. If false, the option will not be visible. + * + * Enabled by default. + */ + public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = + "call_barring_supports_deactivate_all_bool"; + + /** * Flag indicating whether the Phone app should ignore EVENT_SIM_NETWORK_LOCKED * events from the Sim. * If true, this will prevent the IccNetworkDepersonalizationPanel from being shown, and @@ -138,10 +184,20 @@ public class CarrierConfigManager { /** * Flag indicating whether radio is to be restarted on error PDP_FAIL_REGULAR_DEACTIVATION * This is false by default. + * + * @deprecated Use {@link #KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY} instead */ - public static final String - KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = - "restart_radio_on_pdp_fail_regular_deactivation_bool"; + @Deprecated + public static final String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = + "restart_radio_on_pdp_fail_regular_deactivation_bool"; + + /** + * A list of failure cause codes that will trigger a modem restart when telephony receiving + * one of those during data setup. The cause codes are defined in 3GPP TS 24.008 Annex I and + * TS 24.301 Annex B. + */ + public static final String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY = + "radio_restart_failure_causes_int_array"; /** * If true, enable vibration (haptic feedback) for key presses in the EmergencyDialer activity. @@ -485,19 +541,19 @@ public class CarrierConfigManager { "carrier_wfc_supports_wifi_only_bool"; /** - * Default WFC_IMS_MODE for home network 0: WIFI_ONLY - * 1: CELLULAR_PREFERRED - * 2: WIFI_PREFERRED - * @hide + * Default mode for WFC over IMS on home network: + * <ul> + * <li>0: Wi-Fi only + * <li>1: prefer mobile network + * <li>2: prefer Wi-Fi + * </ul> */ public static final String KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT = "carrier_default_wfc_ims_mode_int"; /** - * Default WFC_IMS_MODE for roaming - * See {@link KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for valid values. - * - * @hide + * Default mode for WFC over IMS on roaming network. + * See {@link #KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT} for meaning of values. */ public static final String KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT = "carrier_default_wfc_ims_roaming_mode_int"; @@ -1188,6 +1244,7 @@ public class CarrierConfigManager { * disable_metered_apns} * @hide */ + @UnsupportedAppUsage public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY = "carrier_default_actions_on_redirection_string_array"; @@ -1800,6 +1857,7 @@ public class CarrierConfigManager { * Key identifying if voice call barring notification is required to be shown to the user. * @hide */ + @UnsupportedAppUsage public static final String KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL = "disable_voice_barring_notification_bool"; @@ -1957,18 +2015,25 @@ public class CarrierConfigManager { * the binding intent go to. * @hide */ - public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING - = "carrier_network_service_wlan_package_override_string"; + public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING = + "carrier_network_service_wlan_package_override_string"; /** * Decides when clients try to bind to wwan (cellular) network service, which package name will * the binding intent go to. * @hide */ - public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING - = "carrier_network_service_wwan_package_override_string"; + public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING = + "carrier_network_service_wwan_package_override_string"; /** + * The package name of qualified networks service that telephony binds to. + * + * @hide + */ + public static final String KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING = + "carrier_qualified_networks_service_package_override_string"; + /** * A list of 4 LTE RSCP thresholds above which a signal level is considered POOR, * MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting. * @@ -2004,6 +2069,23 @@ public class CarrierConfigManager { public static final String KEY_UNDELIVERED_SMS_MESSAGE_EXPIRATION_TIME = "undelivered_sms_message_expiration_time"; + /** + * Support for the original string display of CDMA MO call. + * By default, it is disabled. + * @hide + */ + public static final String KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL = + "config_show_orig_dial_string_for_cdma"; + + /** + * Specifies a carrier-defined {@link CallRedirectionService} which Telecom will bind + * to for outgoing calls. An empty string indicates that no carrier-defined + * {@link CallRedirectionService} is specified. + * @hide + */ + public static final String KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING = + "call_redirection_service_component_name_string"; + /** The default value for every variable. */ private final static PersistableBundle sDefaults; @@ -2048,6 +2130,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true); sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, ""); + sDefaults.putString(KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, ""); @@ -2064,6 +2147,11 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false); sDefaults.putBoolean(KEY_CALL_BARRING_VISIBILITY_BOOL, false); + sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true); + sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true); + sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true); + sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true); + sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true); sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false); sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true); @@ -2085,6 +2173,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false); sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true); sDefaults.putBoolean(KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL, false); + sDefaults.putIntArray(KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY, new int[]{}); sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0); sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, ""); sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, ""); @@ -2332,6 +2421,7 @@ public class CarrierConfigManager { -85 /* SIGNAL_STRENGTH_GREAT */ }); sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, ""); + sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false); } /** diff --git a/telephony/java/android/telephony/CellIdentity.java b/telephony/java/android/telephony/CellIdentity.java index c240dbb684e6..76a002681710 100644 --- a/telephony/java/android/telephony/CellIdentity.java +++ b/telephony/java/android/telephony/CellIdentity.java @@ -129,6 +129,12 @@ public abstract class CellIdentity implements Parcelable { return mAlphaShort; } + /** + * @return a CellLocation object for this CellIdentity + * @hide + */ + public abstract CellLocation asCellLocation(); + @Override public boolean equals(Object other) { if (!(other instanceof CellIdentity)) { diff --git a/telephony/java/android/telephony/CellIdentityCdma.java b/telephony/java/android/telephony/CellIdentityCdma.java index 28090666ea68..9218bdc31fa8 100644 --- a/telephony/java/android/telephony/CellIdentityCdma.java +++ b/telephony/java/android/telephony/CellIdentityCdma.java @@ -17,8 +17,9 @@ package android.telephony; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; -import android.text.TextUtils; +import android.telephony.cdma.CdmaCellLocation; import java.util.Objects; @@ -74,6 +75,7 @@ public final class CellIdentityCdma extends CellIdentity { * * @hide */ + @UnsupportedAppUsage public CellIdentityCdma(int nid, int sid, int bid, int lon, int lat) { this(nid, sid, bid, lon, lat, null, null); } @@ -176,6 +178,18 @@ public final class CellIdentityCdma extends CellIdentity { super.hashCode()); } + /** @hide */ + @Override + public CdmaCellLocation asCellLocation() { + CdmaCellLocation cl = new CdmaCellLocation(); + int bsid = mBasestationId != Integer.MAX_VALUE ? mBasestationId : -1; + int sid = mSystemId != Integer.MAX_VALUE ? mSystemId : -1; + int nid = mNetworkId != Integer.MAX_VALUE ? mNetworkId : -1; + // lat and long already use Integer.MAX_VALUE for invalid/unknown + cl.setCellLocationData(bsid, mLatitude, mLongitude, sid, nid); + return cl; + } + @Override public boolean equals(Object other) { if (this == other) { diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index 4031254ab071..cb9dbf369d7e 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -17,7 +17,9 @@ package android.telephony; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; +import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; import java.util.Objects; @@ -34,13 +36,16 @@ public final class CellIdentityGsm extends CellIdentity { // 16-bit GSM Cell Identity described in TS 27.007, 0..65535 private final int mCid; // 16-bit GSM Absolute RF Channel Number + @UnsupportedAppUsage private final int mArfcn; // 6-bit Base Station Identity Code + @UnsupportedAppUsage private final int mBsic; /** * @hide */ + @UnsupportedAppUsage public CellIdentityGsm() { super(TAG, CellInfo.TYPE_GSM, null, null, null, null); mLac = Integer.MAX_VALUE; @@ -194,6 +199,17 @@ public final class CellIdentityGsm extends CellIdentity { return Integer.MAX_VALUE; } + /** @hide */ + @Override + public GsmCellLocation asCellLocation() { + GsmCellLocation cl = new GsmCellLocation(); + int lac = mLac != Integer.MAX_VALUE ? mLac : -1; + int cid = mCid != Integer.MAX_VALUE ? mCid : -1; + cl.setLacAndCid(lac, cid); + cl.setPsc(-1); + return cl; + } + @Override public int hashCode() { return Objects.hash(mLac, mCid, super.hashCode()); diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index 52573727e1c6..b44e891fa870 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -17,7 +17,9 @@ package android.telephony; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; +import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; import java.util.Objects; @@ -36,6 +38,7 @@ public final class CellIdentityLte extends CellIdentity { // 16-bit tracking area code private final int mTac; // 18-bit Absolute RF Channel Number + @UnsupportedAppUsage private final int mEarfcn; // cell bandwidth, in kHz private final int mBandwidth; @@ -43,6 +46,7 @@ public final class CellIdentityLte extends CellIdentity { /** * @hide */ + @UnsupportedAppUsage public CellIdentityLte() { super(TAG, CellInfo.TYPE_LTE, null, null, null, null); mCi = Integer.MAX_VALUE; @@ -62,6 +66,7 @@ public final class CellIdentityLte extends CellIdentity { * * @hide */ + @UnsupportedAppUsage public CellIdentityLte(int mcc, int mnc, int ci, int pci, int tac) { this(ci, pci, tac, Integer.MAX_VALUE, Integer.MAX_VALUE, String.valueOf(mcc), String.valueOf(mnc), null, null); @@ -196,6 +201,28 @@ public final class CellIdentityLte extends CellIdentity { return mEarfcn; } + /** + * A hack to allow tunneling of LTE information via GsmCellLocation + * so that older Network Location Providers can return some information + * on LTE only networks, see bug 9228974. + * + * The tunnel'd LTE information is returned as follows: + * LAC = TAC field + * CID = CI field + * PSC = 0. + * + * @hide + */ + @Override + public GsmCellLocation asCellLocation() { + GsmCellLocation cl = new GsmCellLocation(); + int tac = mTac != Integer.MAX_VALUE ? mTac : -1; + int cid = mCi != Integer.MAX_VALUE ? mCi : -1; + cl.setLacAndCid(tac, cid); + cl.setPsc(0); + return cl; + } + @Override public int hashCode() { return Objects.hash(mCi, mPci, mTac, super.hashCode()); diff --git a/telephony/java/android/telephony/CellIdentityTdscdma.java b/telephony/java/android/telephony/CellIdentityTdscdma.java index 21b9601bcad9..5a9e474806a3 100644 --- a/telephony/java/android/telephony/CellIdentityTdscdma.java +++ b/telephony/java/android/telephony/CellIdentityTdscdma.java @@ -17,6 +17,7 @@ package android.telephony; import android.os.Parcel; +import android.telephony.gsm.GsmCellLocation; import java.util.Objects; @@ -134,6 +135,17 @@ public final class CellIdentityTdscdma extends CellIdentity { return mUarfcn; } + /** @hide */ + @Override + public GsmCellLocation asCellLocation() { + GsmCellLocation cl = new GsmCellLocation(); + int lac = mLac != Integer.MAX_VALUE ? mLac : -1; + int cid = mCid != Integer.MAX_VALUE ? mCid : -1; + cl.setLacAndCid(lac, cid); + cl.setPsc(-1); // There is no PSC for TD-SCDMA; not using this for CPI to stem shenanigans + return cl; + } + @Override public boolean equals(Object other) { if (this == other) { diff --git a/telephony/java/android/telephony/CellIdentityWcdma.java b/telephony/java/android/telephony/CellIdentityWcdma.java index a4ac8e30d02e..727d9908b9b1 100644 --- a/telephony/java/android/telephony/CellIdentityWcdma.java +++ b/telephony/java/android/telephony/CellIdentityWcdma.java @@ -17,7 +17,9 @@ package android.telephony; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; +import android.telephony.gsm.GsmCellLocation; import android.text.TextUtils; import java.util.Objects; @@ -36,6 +38,7 @@ public final class CellIdentityWcdma extends CellIdentity { // 9-bit UMTS Primary Scrambling Code described in TS 25.331, 0..511 private final int mPsc; // 16-bit UMTS Absolute RF Channel Number described in TS 25.101 sec. 5.4.4 + @UnsupportedAppUsage private final int mUarfcn; /** @@ -189,6 +192,19 @@ public final class CellIdentityWcdma extends CellIdentity { return mUarfcn; } + /** @hide */ + @Override + public GsmCellLocation asCellLocation() { + GsmCellLocation cl = new GsmCellLocation(); + int lac = mLac != Integer.MAX_VALUE ? mLac : -1; + int cid = mCid != Integer.MAX_VALUE ? mCid : -1; + int psc = mPsc != Integer.MAX_VALUE ? mPsc : -1; + cl.setLacAndCid(lac, cid); + cl.setPsc(psc); + + return cl; + } + @Override public boolean equals(Object other) { if (this == other) { diff --git a/telephony/java/android/telephony/CellInfo.java b/telephony/java/android/telephony/CellInfo.java index 6b320f4352cc..4fe1b01007a7 100644 --- a/telephony/java/android/telephony/CellInfo.java +++ b/telephony/java/android/telephony/CellInfo.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -70,14 +71,19 @@ public abstract class CellInfo implements Parcelable { // Type to distinguish where time stamp gets recorded. /** @hide */ + @UnsupportedAppUsage public static final int TIMESTAMP_TYPE_UNKNOWN = 0; /** @hide */ + @UnsupportedAppUsage public static final int TIMESTAMP_TYPE_ANTENNA = 1; /** @hide */ + @UnsupportedAppUsage public static final int TIMESTAMP_TYPE_MODEM = 2; /** @hide */ + @UnsupportedAppUsage public static final int TIMESTAMP_TYPE_OEM_RIL = 3; /** @hide */ + @UnsupportedAppUsage public static final int TIMESTAMP_TYPE_JAVA_RIL = 4; /** @hide */ @@ -184,6 +190,7 @@ public abstract class CellInfo implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getTimeStampType() { return mTimeStampType; } @@ -223,6 +230,7 @@ public abstract class CellInfo implements Parcelable { } } + @UnsupportedAppUsage private static String timeStampTypeToString(int type) { switch (type) { case 1: diff --git a/telephony/java/android/telephony/CellInfoCdma.java b/telephony/java/android/telephony/CellInfoCdma.java index 8b8d1bbe3fc6..f67733d63ef2 100644 --- a/telephony/java/android/telephony/CellInfoCdma.java +++ b/telephony/java/android/telephony/CellInfoCdma.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -32,6 +33,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { private CellSignalStrengthCdma mCellSignalStrengthCdma; /** @hide */ + @UnsupportedAppUsage public CellInfoCdma() { super(); mCellIdentityCdma = new CellIdentityCdma(); @@ -39,6 +41,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public CellInfoCdma(CellInfoCdma ci) { super(ci); this.mCellIdentityCdma = ci.mCellIdentityCdma.copy(); @@ -50,6 +53,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { return mCellIdentityCdma; } /** @hide */ + @UnsupportedAppUsage public void setCellIdentity(CellIdentityCdma cid) { mCellIdentityCdma = cid; } diff --git a/telephony/java/android/telephony/CellInfoGsm.java b/telephony/java/android/telephony/CellInfoGsm.java index f7af1b201698..7211de1798da 100644 --- a/telephony/java/android/telephony/CellInfoGsm.java +++ b/telephony/java/android/telephony/CellInfoGsm.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -32,6 +33,7 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { private CellSignalStrengthGsm mCellSignalStrengthGsm; /** @hide */ + @UnsupportedAppUsage public CellInfoGsm() { super(); mCellIdentityGsm = new CellIdentityGsm(); diff --git a/telephony/java/android/telephony/CellInfoLte.java b/telephony/java/android/telephony/CellInfoLte.java index 97d856e39c80..389f643e05a4 100644 --- a/telephony/java/android/telephony/CellInfoLte.java +++ b/telephony/java/android/telephony/CellInfoLte.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -32,6 +33,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { private CellSignalStrengthLte mCellSignalStrengthLte; /** @hide */ + @UnsupportedAppUsage public CellInfoLte() { super(); mCellIdentityLte = new CellIdentityLte(); @@ -51,6 +53,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { return mCellIdentityLte; } /** @hide */ + @UnsupportedAppUsage public void setCellIdentity(CellIdentityLte cid) { if (DBG) log("setCellIdentity: " + cid); mCellIdentityLte = cid; @@ -62,6 +65,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { return mCellSignalStrengthLte; } /** @hide */ + @UnsupportedAppUsage public void setCellSignalStrength(CellSignalStrengthLte css) { if (DBG) log("setCellSignalStrength: " + css); mCellSignalStrengthLte = css; diff --git a/telephony/java/android/telephony/CellLocation.java b/telephony/java/android/telephony/CellLocation.java index 5bcaa6e74531..01331535205c 100644 --- a/telephony/java/android/telephony/CellLocation.java +++ b/telephony/java/android/telephony/CellLocation.java @@ -20,6 +20,7 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; +import android.annotation.UnsupportedAppUsage; import android.telephony.cdma.CdmaCellLocation; import android.telephony.gsm.GsmCellLocation; import com.android.internal.telephony.ITelephony; @@ -57,6 +58,7 @@ public abstract class CellLocation { * * @hide */ + @UnsupportedAppUsage public static CellLocation newFromBundle(Bundle bundle) { // TelephonyManager.getDefault().getCurrentPhoneType() handles the case when // ITelephony interface is not up yet. @@ -73,11 +75,13 @@ public abstract class CellLocation { /** * @hide */ + @UnsupportedAppUsage public abstract void fillInNotifierBundle(Bundle bundle); /** * @hide */ + @UnsupportedAppUsage public abstract boolean isEmpty(); /** diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java index cff159b991c0..1e8d119c96c7 100644 --- a/telephony/java/android/telephony/CellSignalStrengthGsm.java +++ b/telephony/java/android/telephony/CellSignalStrengthGsm.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -34,11 +35,15 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P private static final int GSM_SIGNAL_STRENGTH_GOOD = 8; private static final int GSM_SIGNAL_STRENGTH_MODERATE = 5; + @UnsupportedAppUsage private int mSignalStrength; // in ASU; Valid values are (0-31, 99) as defined in TS 27.007 8.5 + @UnsupportedAppUsage private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5 + @UnsupportedAppUsage private int mTimingAdvance; // range from 0-219 or Integer.MAX_VALUE if unknown /** @hide */ + @UnsupportedAppUsage public CellSignalStrengthGsm() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/CellSignalStrengthLte.java b/telephony/java/android/telephony/CellSignalStrengthLte.java index 2f059f412b64..ed7d4b2331da 100644 --- a/telephony/java/android/telephony/CellSignalStrengthLte.java +++ b/telephony/java/android/telephony/CellSignalStrengthLte.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -30,14 +31,21 @@ public final class CellSignalStrengthLte extends CellSignalStrength implements P private static final String LOG_TAG = "CellSignalStrengthLte"; private static final boolean DBG = false; + @UnsupportedAppUsage private int mSignalStrength; + @UnsupportedAppUsage private int mRsrp; + @UnsupportedAppUsage private int mRsrq; + @UnsupportedAppUsage private int mRssnr; + @UnsupportedAppUsage private int mCqi; + @UnsupportedAppUsage private int mTimingAdvance; /** @hide */ + @UnsupportedAppUsage public CellSignalStrengthLte() { setDefaultValues(); } diff --git a/telephony/java/android/telephony/CellSignalStrengthWcdma.java b/telephony/java/android/telephony/CellSignalStrengthWcdma.java index 21cf0be96931..66e08822dfa7 100644 --- a/telephony/java/android/telephony/CellSignalStrengthWcdma.java +++ b/telephony/java/android/telephony/CellSignalStrengthWcdma.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Rlog; @@ -34,8 +35,10 @@ public final class CellSignalStrengthWcdma extends CellSignalStrength implements private static final int WCDMA_SIGNAL_STRENGTH_GOOD = 8; private static final int WCDMA_SIGNAL_STRENGTH_MODERATE = 5; + @UnsupportedAppUsage private int mSignalStrength; // in ASU; Valid values are (0-31, 99) as defined in TS 27.007 8.5 // or Integer.MAX_VALUE if unknown + @UnsupportedAppUsage private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5 or // Integer.MAX_VALUE if unknown private int mRscp; // bit error rate (0-96, 255) as defined in TS 27.007 8.69 or diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index 4fa304ae3b97..ee5cdc2780db 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -16,6 +16,8 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; + /** * Contains disconnect call causes generated by the framework and the RIL. * @hide @@ -329,6 +331,7 @@ public class DisconnectCause { } /** Returns descriptive string for the specified disconnect cause. */ + @UnsupportedAppUsage public static String toString(int cause) { switch (cause) { case NOT_DISCONNECTED: diff --git a/telephony/java/android/telephony/ModemInfo.java b/telephony/java/android/telephony/ModemInfo.java new file mode 100644 index 000000000000..564effe05e38 --- /dev/null +++ b/telephony/java/android/telephony/ModemInfo.java @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2018 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.telephony; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.Objects; + +/** + * Information of a single logical modem indicating + * its id, supported rats and whether it supports voice or data, etc. + * @hide + */ +public class ModemInfo implements Parcelable { + public final int modemId; + public final int rat; /* bitset */ + public final boolean isVoiceSupported; + public final boolean isDataSupported; + + public ModemInfo(int modemId, int rat, boolean isVoiceSupported, boolean isDataSupported) { + this.modemId = modemId; + this.rat = rat; + this.isVoiceSupported = isVoiceSupported; + this.isDataSupported = isDataSupported; + } + + public ModemInfo(Parcel in) { + modemId = in.readInt(); + rat = in.readInt(); + isVoiceSupported = in.readBoolean(); + isDataSupported = in.readBoolean(); + } + + @Override + public String toString() { + return "modemId=" + modemId + " rat=" + rat + " isVoiceSupported:" + isVoiceSupported + + " isDataSupported:" + isDataSupported; + } + + @Override + public int hashCode() { + return Objects.hash(modemId, rat, isVoiceSupported, isDataSupported); + } + + @Override + public boolean equals(Object o) { + if (o == null || !(o instanceof ModemInfo) || hashCode() != o.hashCode()) { + return false; + } + + if (this == o) { + return true; + } + + ModemInfo s = (ModemInfo) o; + + return (modemId == s.modemId + && rat == s.rat + && isVoiceSupported == s.isVoiceSupported + && isDataSupported == s.isDataSupported); + } + + /** + * {@link Parcelable#describeContents} + */ + public @ContentsFlags int describeContents() { + return 0; + } + + /** + * {@link Parcelable#writeToParcel} + */ + public void writeToParcel(Parcel dest, @WriteFlags int flags) { + dest.writeInt(modemId); + dest.writeInt(rat); + dest.writeBoolean(isVoiceSupported); + dest.writeBoolean(isDataSupported); + } + + public static final Parcelable.Creator<ModemInfo> CREATOR = new Parcelable.Creator() { + public ModemInfo createFromParcel(Parcel in) { + return new ModemInfo(in); + } + + public ModemInfo[] newArray(int size) { + return new ModemInfo[size]; + } + }; +} diff --git a/telephony/java/android/telephony/NeighboringCellInfo.java b/telephony/java/android/telephony/NeighboringCellInfo.java index b7ccee5871d0..8e99518d78b8 100644 --- a/telephony/java/android/telephony/NeighboringCellInfo.java +++ b/telephony/java/android/telephony/NeighboringCellInfo.java @@ -24,6 +24,7 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA; import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS; import static android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -47,24 +48,29 @@ public class NeighboringCellInfo implements Parcelable * In GSM, mRssi is the Received RSSI; * In UMTS, mRssi is the Level index of CPICH Received Signal Code Power */ + @UnsupportedAppUsage private int mRssi; /** * CID in 16 bits format in GSM. Return UNKNOWN_CID in UMTS and CMDA. */ + @UnsupportedAppUsage private int mCid; /** * LAC in 16 bits format in GSM. Return UNKNOWN_CID in UMTS and CMDA. */ + @UnsupportedAppUsage private int mLac; /** * Primary Scrambling Code in 9 bits format in UMTS * Return UNKNOWN_CID in GSM and CMDA. */ + @UnsupportedAppUsage private int mPsc; /** * Radio network type, value is one of following * TelephonyManager.NETWORK_TYPE_XXXXXX. */ + @UnsupportedAppUsage private int mNetworkType; /** diff --git a/telephony/java/android/telephony/PhoneCapability.aidl b/telephony/java/android/telephony/PhoneCapability.aidl new file mode 100644 index 000000000000..5de8d4a2c9e5 --- /dev/null +++ b/telephony/java/android/telephony/PhoneCapability.aidl @@ -0,0 +1,20 @@ +/* +** +** Copyright 2018, 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.telephony; + +parcelable PhoneCapability;
\ No newline at end of file diff --git a/telephony/java/android/telephony/PhoneCapability.java b/telephony/java/android/telephony/PhoneCapability.java new file mode 100644 index 000000000000..2ebfa53ead23 --- /dev/null +++ b/telephony/java/android/telephony/PhoneCapability.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2018 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.telephony; + +import android.os.Parcel; +import android.os.Parcelable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * Define capability of a modem group. That is, the capabilities + * are shared between those modems defined by list of modem IDs. + * @hide + */ +public class PhoneCapability implements Parcelable { + public final int maxActiveVoiceCalls; + public final int maxActiveData; + public final int max5G; + public final List<ModemInfo> logicalModemList; + + public PhoneCapability(int maxActiveVoiceCalls, int maxActiveData, int max5G, + List<ModemInfo> logicalModemList) { + this.maxActiveVoiceCalls = maxActiveVoiceCalls; + this.maxActiveData = maxActiveData; + this.max5G = max5G; + // Make sure it's not null. + this.logicalModemList = logicalModemList == null ? new ArrayList<>() : logicalModemList; + } + + @Override + public String toString() { + return "maxActiveVoiceCalls=" + maxActiveVoiceCalls + " maxActiveData=" + maxActiveData + + " max5G=" + max5G + "logicalModemList:" + + Arrays.toString(logicalModemList.toArray()); + } + + private PhoneCapability(Parcel in) { + maxActiveVoiceCalls = in.readInt(); + maxActiveData = in.readInt(); + max5G = in.readInt(); + logicalModemList = new ArrayList<>(); + in.readList(logicalModemList, ModemInfo.class.getClassLoader()); + } + + @Override + public int hashCode() { + return Objects.hash(maxActiveVoiceCalls, maxActiveData, max5G, logicalModemList); + } + + @Override + public boolean equals(Object o) { + if (o == null || !(o instanceof PhoneCapability) || hashCode() != o.hashCode()) { + return false; + } + + if (this == o) { + return true; + } + + PhoneCapability s = (PhoneCapability) o; + + return (maxActiveVoiceCalls == s.maxActiveVoiceCalls + && maxActiveData == s.maxActiveData + && max5G == s.max5G + && logicalModemList.equals(s.logicalModemList)); + } + + /** + * {@link Parcelable#describeContents} + */ + public @Parcelable.ContentsFlags int describeContents() { + return 0; + } + + /** + * {@link Parcelable#writeToParcel} + */ + public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) { + dest.writeInt(maxActiveVoiceCalls); + dest.writeInt(maxActiveData); + dest.writeInt(max5G); + dest.writeList(logicalModemList); + } + + public static final Parcelable.Creator<PhoneCapability> CREATOR = new Parcelable.Creator() { + public PhoneCapability createFromParcel(Parcel in) { + return new PhoneCapability(in); + } + + public PhoneCapability[] newArray(int size) { + return new PhoneCapability[size]; + } + }; +} diff --git a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java index f7dee99fe613..ac6bcaa61997 100644 --- a/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java +++ b/telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java @@ -19,6 +19,7 @@ package android.telephony; import com.android.i18n.phonenumbers.AsYouTypeFormatter; import com.android.i18n.phonenumbers.PhoneNumberUtil; +import android.annotation.UnsupportedAppUsage; import android.telephony.PhoneNumberUtils; import android.text.Editable; import android.text.Selection; @@ -50,6 +51,7 @@ public class PhoneNumberFormattingTextWatcher implements TextWatcher { */ private boolean mStopFormatting; + @UnsupportedAppUsage private AsYouTypeFormatter mFormatter; /** diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index fadfc91bcdef..f6e8d3422eca 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -23,6 +23,7 @@ import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.android.i18n.phonenumbers.ShortNumberInfo; import android.annotation.IntDef; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -279,6 +280,7 @@ public class PhoneNumberUtils { * * @hide */ + @UnsupportedAppUsage public static String extractNetworkPortionAlt(String phoneNumber) { if (phoneNumber == null) { return null; @@ -352,6 +354,7 @@ public class PhoneNumberUtils { * RFC 3601 says pause is 'p' and tonewait is 'w'. * @hide */ + @UnsupportedAppUsage public static String convertPreDial(String phoneNumber) { if (phoneNumber == null) { return null; @@ -464,6 +467,7 @@ public class PhoneNumberUtils { /** * @hide only for testing. */ + @UnsupportedAppUsage public static boolean compare(String a, String b, boolean useStrictComparation) { return (useStrictComparation ? compareStrictly(a, b) : compareLoosely(a, b)); } @@ -482,6 +486,7 @@ public class PhoneNumberUtils { * * @hide */ + @UnsupportedAppUsage public static boolean compareLoosely(String a, String b) { int ia, ib; @@ -579,6 +584,7 @@ public class PhoneNumberUtils { /** * @hide */ + @UnsupportedAppUsage public static boolean compareStrictly(String a, String b) { return compareStrictly(a, b, true); @@ -587,6 +593,7 @@ public class PhoneNumberUtils { /** * @hide */ + @UnsupportedAppUsage public static boolean compareStrictly(String a, String b, boolean acceptInvalidCCCPrefix) { if (a == null || b == null) { @@ -1260,6 +1267,7 @@ public class PhoneNumberUtils { * @deprecated Use link #formatNumber(String phoneNumber, String defaultCountryIso) instead */ @Deprecated + @UnsupportedAppUsage public static String formatNumber(String source, int defaultFormattingType) { SpannableStringBuilder text = new SpannableStringBuilder(source); formatNumber(text, defaultFormattingType); @@ -1720,6 +1728,7 @@ public class PhoneNumberUtils { // // However, in order to loose match 650-555-1212 and 555-1212, we need to set the min match // to 7. + @UnsupportedAppUsage static final int MIN_MATCH = 7; /** @@ -1744,6 +1753,7 @@ public class PhoneNumberUtils { * listed in the RIL / SIM, otherwise return false. * @hide */ + @UnsupportedAppUsage public static boolean isEmergencyNumber(int subId, String number) { // Return true only if the specified number *exactly* matches // one of the emergency numbers listed by the RIL / SIM. @@ -1794,6 +1804,7 @@ public class PhoneNumberUtils { * same digits as any of those emergency numbers. * @hide */ + @UnsupportedAppUsage public static boolean isPotentialEmergencyNumber(int subId, String number) { // Check against the emergency numbers listed by the RIL / SIM, // and *don't* require an exact match. @@ -1858,6 +1869,7 @@ public class PhoneNumberUtils { * * @hide */ + @UnsupportedAppUsage public static boolean isEmergencyNumber(String number, String defaultCountryIso) { return isEmergencyNumber(getDefaultVoiceSubId(), number, defaultCountryIso); } @@ -2081,6 +2093,7 @@ public class PhoneNumberUtils { * is currently in. * @hide */ + @UnsupportedAppUsage public static boolean isLocalEmergencyNumber(Context context, int subId, String number) { return isLocalEmergencyNumberInternal(subId, number, context, @@ -2109,6 +2122,7 @@ public class PhoneNumberUtils { * @see android.location.CountryDetector * @hide */ + @UnsupportedAppUsage public static boolean isPotentialLocalEmergencyNumber(Context context, String number) { return isPotentialLocalEmergencyNumber(context, getDefaultVoiceSubId(), number); } @@ -2135,6 +2149,7 @@ public class PhoneNumberUtils { * * @hide */ + @UnsupportedAppUsage public static boolean isPotentialLocalEmergencyNumber(Context context, int subId, String number) { return isLocalEmergencyNumberInternal(subId, number, @@ -2244,6 +2259,7 @@ public class PhoneNumberUtils { * to read the VM number. * @hide */ + @UnsupportedAppUsage public static boolean isVoiceMailNumber(Context context, int subId, String number) { String vmNumber, mdn; try { @@ -2390,6 +2406,7 @@ public class PhoneNumberUtils { * * @hide TODO: pending API Council approval */ + @UnsupportedAppUsage public static String cdmaCheckAndProcessPlusCode(String dialStr) { if (!TextUtils.isEmpty(dialStr)) { if (isReallyDialable(dialStr.charAt(0)) && @@ -2569,6 +2586,7 @@ public class PhoneNumberUtils { * @hide */ @Deprecated + @UnsupportedAppUsage public static CharSequence ttsSpanAsPhoneNumber(CharSequence phoneNumber) { return createTtsSpannable(phoneNumber); } @@ -2680,6 +2698,7 @@ public class PhoneNumberUtils { * i.e. NXX-NXX-XXXX, N is any digit 2-9 and X is any digit 0-9 * @hide */ + @UnsupportedAppUsage public static boolean isNanp (String dialStr) { boolean retVal = false; if (dialStr != null) { @@ -2727,6 +2746,7 @@ public class PhoneNumberUtils { * @param number * @return true if number contains @ */ + @UnsupportedAppUsage public static boolean isUriNumber(String number) { // Note we allow either "@" or "%40" to indicate a URI, in case // the passed-in string is URI-escaped. (Neither "@" nor "%40" @@ -2744,6 +2764,7 @@ public class PhoneNumberUtils { * * @hide */ + @UnsupportedAppUsage public static String getUsernameFromUriNumber(String number) { // The delimiter between username and domain name can be // either "@" or "%40" (the URI-escaped equivalent.) diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index 842016511d39..bd6a59d7492c 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -17,16 +17,16 @@ package android.telephony; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.telecom.TelecomManager; import com.android.internal.telephony.IPhoneStateListener; -import java.util.List; import java.lang.ref.WeakReference; +import java.util.List; /** * A listener class for monitoring changes in specific telephony states @@ -171,6 +171,7 @@ public class PhoneStateListener { * * @hide */ + @UnsupportedAppUsage public static final int LISTEN_PRECISE_CALL_STATE = 0x00000800; /** @@ -271,11 +272,20 @@ public class PhoneStateListener { */ public static final int LISTEN_PHYSICAL_CHANNEL_CONFIGURATION = 0x00100000; + /** + * Listen for changes to the phone capability. + * + * @see #onPhoneCapabilityChanged + * @hide + */ + public static final int LISTEN_PHONE_CAPABILITY_CHANGE = 0x00200000; + /* * Subscription used to listen to the phone state changes * @hide */ /** @hide */ + @UnsupportedAppUsage protected Integer mSubId; private final Handler mHandler; @@ -293,6 +303,7 @@ public class PhoneStateListener { * using a particular non-null Looper. * @hide */ + @UnsupportedAppUsage public PhoneStateListener(Looper looper) { this(null, looper); } @@ -303,6 +314,7 @@ public class PhoneStateListener { * own non-null Looper use PhoneStateListener(int subId, Looper looper) below. * @hide */ + @UnsupportedAppUsage public PhoneStateListener(Integer subId) { this(subId, Looper.myLooper()); } @@ -312,6 +324,7 @@ public class PhoneStateListener { * and non-null Looper. * @hide */ + @UnsupportedAppUsage public PhoneStateListener(Integer subId, Looper looper) { if (DBG) log("ctor: subId=" + subId + " looper=" + looper); mSubId = subId; @@ -389,6 +402,10 @@ public class PhoneStateListener { PhoneStateListener.this.onPhysicalChannelConfigurationChanged( (List<PhysicalChannelConfig>)msg.obj); break; + case LISTEN_PHONE_CAPABILITY_CHANGE: + PhoneStateListener.this.onPhoneCapabilityChanged( + (PhoneCapability) msg.obj); + break; } } }; @@ -515,6 +532,7 @@ public class PhoneStateListener { * * @hide */ + @UnsupportedAppUsage public void onOtaspChanged(int otaspMode) { // default implementation empty } @@ -532,6 +550,7 @@ public class PhoneStateListener { * * @hide */ + @UnsupportedAppUsage public void onPreciseCallStateChanged(PreciseCallState callState) { // default implementation empty } @@ -541,6 +560,7 @@ public class PhoneStateListener { * * @hide */ + @UnsupportedAppUsage public void onPreciseDataConnectionStateChanged( PreciseDataConnectionState dataConnectionState) { // default implementation empty @@ -551,6 +571,7 @@ public class PhoneStateListener { * * @hide */ + @UnsupportedAppUsage public void onDataConnectionRealTimeInfoChanged( DataConnectionRealTimeInfo dcRtInfo) { // default implementation empty @@ -562,6 +583,7 @@ public class PhoneStateListener { * @param stateInfo is the current LTE network information * @hide */ + @UnsupportedAppUsage public void onVoLteServiceStateChanged(VoLteServiceState stateInfo) { } @@ -608,11 +630,22 @@ public class PhoneStateListener { * @param rawData is the byte array of the OEM hook raw data. * @hide */ + @UnsupportedAppUsage public void onOemHookRawEvent(byte[] rawData) { // default implementation empty } /** + * Callback invoked when phone capability changes. Requires + * the READ_PRIVILEGED_PHONE_STATE permission. + * @param capability the new phone capability + * @hide + */ + public void onPhoneCapabilityChanged(PhoneCapability capability) { + // default implementation empty + } + + /** * Callback invoked when telephony has received notice from a carrier * app that a network action that could result in connectivity loss * has been requested by an app using @@ -739,8 +772,13 @@ public class PhoneStateListener { public void onPhysicalChannelConfigurationChanged(List<PhysicalChannelConfig> configs) { send(LISTEN_PHYSICAL_CHANNEL_CONFIGURATION, 0, 0, configs); } + + public void onPhoneCapabilityChanged(PhoneCapability capability) { + send(LISTEN_PHONE_CAPABILITY_CHANGE, 0, 0, capability); + } } + @UnsupportedAppUsage IPhoneStateListener callback = new IPhoneStateListenerStub(this); private void log(String s) { diff --git a/telephony/java/android/telephony/PreciseCallState.java b/telephony/java/android/telephony/PreciseCallState.java index f246416df765..ed5c26ac5cf2 100644 --- a/telephony/java/android/telephony/PreciseCallState.java +++ b/telephony/java/android/telephony/PreciseCallState.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.DisconnectCause; @@ -71,6 +72,7 @@ public class PreciseCallState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public PreciseCallState(int ringingCall, int foregroundCall, int backgroundCall, int disconnectCause, int preciseDisconnectCause) { mRingingCallState = ringingCall; @@ -113,6 +115,7 @@ public class PreciseCallState implements Parcelable { * @see PreciseCallState#PRECISE_CALL_STATE_DISCONNECTED * @see PreciseCallState#PRECISE_CALL_STATE_DISCONNECTING */ + @UnsupportedAppUsage public int getRingingCallState() { return mRingingCallState; } @@ -131,6 +134,7 @@ public class PreciseCallState implements Parcelable { * @see PreciseCallState#PRECISE_CALL_STATE_DISCONNECTED * @see PreciseCallState#PRECISE_CALL_STATE_DISCONNECTING */ + @UnsupportedAppUsage public int getForegroundCallState() { return mForegroundCallState; } @@ -149,6 +153,7 @@ public class PreciseCallState implements Parcelable { * @see PreciseCallState#PRECISE_CALL_STATE_DISCONNECTED * @see PreciseCallState#PRECISE_CALL_STATE_DISCONNECTING */ + @UnsupportedAppUsage public int getBackgroundCallState() { return mBackgroundCallState; } @@ -195,6 +200,7 @@ public class PreciseCallState implements Parcelable { * @see DisconnectCause#CDMA_ACCESS_BLOCKED * @see DisconnectCause#ERROR_UNSPECIFIED */ + @UnsupportedAppUsage public int getDisconnectCause() { return mDisconnectCause; } @@ -233,6 +239,7 @@ public class PreciseCallState implements Parcelable { * @see PreciseDisconnectCause#CDMA_ACCESS_BLOCKED * @see PreciseDisconnectCause#ERROR_UNSPECIFIED */ + @UnsupportedAppUsage public int getPreciseDisconnectCause() { return mPreciseDisconnectCause; } diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index 31c9a9e5316b..b258f52d58ec 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.telephony.TelephonyManager; @@ -53,6 +54,7 @@ public class PreciseDataConnectionState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public PreciseDataConnectionState(int state, int networkType, String apnType, String apn, String reason, LinkProperties linkProperties, String failCause) { @@ -95,6 +97,7 @@ public class PreciseDataConnectionState implements Parcelable { * @see TelephonyManager#DATA_CONNECTED * @see TelephonyManager#DATA_SUSPENDED */ + @UnsupportedAppUsage public int getDataConnectionState() { return mState; } @@ -119,6 +122,7 @@ public class PreciseDataConnectionState implements Parcelable { * @see TelephonyManager#NETWORK_TYPE_EHRPD * @see TelephonyManager#NETWORK_TYPE_HSPAP */ + @UnsupportedAppUsage public int getDataConnectionNetworkType() { return mNetworkType; } @@ -126,6 +130,7 @@ public class PreciseDataConnectionState implements Parcelable { /** * Get data connection APN type */ + @UnsupportedAppUsage public String getDataConnectionAPNType() { return mAPNType; } @@ -133,6 +138,7 @@ public class PreciseDataConnectionState implements Parcelable { /** * Get data connection APN. */ + @UnsupportedAppUsage public String getDataConnectionAPN() { return mAPN; } @@ -140,6 +146,7 @@ public class PreciseDataConnectionState implements Parcelable { /** * Get data connection change reason. */ + @UnsupportedAppUsage public String getDataConnectionChangeReason() { return mReason; } @@ -147,6 +154,7 @@ public class PreciseDataConnectionState implements Parcelable { /** * Get the properties of the network link. */ + @UnsupportedAppUsage public LinkProperties getDataConnectionLinkProperties() { return mLinkProperties; } @@ -154,6 +162,7 @@ public class PreciseDataConnectionState implements Parcelable { /** * Get data connection fail cause, in case there was a failure. */ + @UnsupportedAppUsage public String getDataConnectionFailCause() { return mFailCause; } diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index d657bae0981e..1d79988fecb3 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -77,6 +78,7 @@ public class RadioAccessFamily implements Parcelable { * in RadioAccessFamily. It's a bit mask value to represent * the support type. */ + @UnsupportedAppUsage public RadioAccessFamily(int phoneId, int radioAccessFamily) { mPhoneId = phoneId; mRadioAccessFamily = radioAccessFamily; @@ -87,6 +89,7 @@ public class RadioAccessFamily implements Parcelable { * * @return phone ID */ + @UnsupportedAppUsage public int getPhoneId() { return mPhoneId; } @@ -96,6 +99,7 @@ public class RadioAccessFamily implements Parcelable { * * @return radio access family */ + @UnsupportedAppUsage public int getRadioAccessFamily() { return mRadioAccessFamily; } @@ -150,6 +154,7 @@ public class RadioAccessFamily implements Parcelable { } }; + @UnsupportedAppUsage public static int getRafFromNetworkType(int type) { int raf; @@ -263,6 +268,7 @@ public class RadioAccessFamily implements Parcelable { return TelephonyManager.NETWORK_CLASS_UNKNOWN; } + @UnsupportedAppUsage public static int getNetworkTypeFromRaf(int raf) { int type; diff --git a/telephony/java/android/telephony/Rlog.java b/telephony/java/android/telephony/Rlog.java index e0b46e10eab5..5f2fa335135f 100644 --- a/telephony/java/android/telephony/Rlog.java +++ b/telephony/java/android/telephony/Rlog.java @@ -20,6 +20,7 @@ import android.os.Build; import android.text.TextUtils; import android.util.Log; +import android.annotation.UnsupportedAppUsage; import android.util.Base64; import java.security.MessageDigest; @@ -38,6 +39,7 @@ public final class Rlog { private Rlog() { } + @UnsupportedAppUsage public static int v(String tag, String msg) { return Log.println_native(Log.LOG_ID_RADIO, Log.VERBOSE, tag, msg); } @@ -47,28 +49,34 @@ public final class Rlog { msg + '\n' + Log.getStackTraceString(tr)); } + @UnsupportedAppUsage public static int d(String tag, String msg) { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg); } + @UnsupportedAppUsage public static int d(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.DEBUG, tag, msg + '\n' + Log.getStackTraceString(tr)); } + @UnsupportedAppUsage public static int i(String tag, String msg) { return Log.println_native(Log.LOG_ID_RADIO, Log.INFO, tag, msg); } + @UnsupportedAppUsage public static int i(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.INFO, tag, msg + '\n' + Log.getStackTraceString(tr)); } + @UnsupportedAppUsage public static int w(String tag, String msg) { return Log.println_native(Log.LOG_ID_RADIO, Log.WARN, tag, msg); } + @UnsupportedAppUsage public static int w(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.WARN, tag, msg + '\n' + Log.getStackTraceString(tr)); @@ -78,10 +86,12 @@ public final class Rlog { return Log.println_native(Log.LOG_ID_RADIO, Log.WARN, tag, Log.getStackTraceString(tr)); } + @UnsupportedAppUsage public static int e(String tag, String msg) { return Log.println_native(Log.LOG_ID_RADIO, Log.ERROR, tag, msg); } + @UnsupportedAppUsage public static int e(String tag, String msg, Throwable tr) { return Log.println_native(Log.LOG_ID_RADIO, Log.ERROR, tag, msg + '\n' + Log.getStackTraceString(tr)); diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 9e8529e20a7b..f2b73dccee2d 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -19,6 +19,7 @@ package android.telephony; import android.annotation.IntDef; import android.annotation.SystemApi; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -169,6 +170,7 @@ public class ServiceState implements Parcelable { * IWLAN * @hide */ + @UnsupportedAppUsage public static final int RIL_RADIO_TECHNOLOGY_IWLAN = 18; /** @@ -233,6 +235,7 @@ public class ServiceState implements Parcelable { private String mDataOperatorAlphaLong; private String mDataOperatorAlphaShort; private String mDataOperatorNumeric; + @UnsupportedAppUsage private boolean mIsManualNetworkSelection; private boolean mIsEmergencyOnly; @@ -240,16 +243,24 @@ public class ServiceState implements Parcelable { private int mRilVoiceRadioTechnology; private int mRilDataRadioTechnology; + @UnsupportedAppUsage private boolean mCssIndicator; + @UnsupportedAppUsage private int mNetworkId; + @UnsupportedAppUsage private int mSystemId; + @UnsupportedAppUsage private int mCdmaRoamingIndicator; + @UnsupportedAppUsage private int mCdmaDefaultRoamingIndicator; + @UnsupportedAppUsage private int mCdmaEriIconIndex; + @UnsupportedAppUsage private int mCdmaEriIconMode; private boolean mIsDataRoamingFromRegistration; + @UnsupportedAppUsage private boolean mIsUsingCarrierAggregation; private int mChannelNumber; @@ -294,6 +305,7 @@ public class ServiceState implements Parcelable { * @return newly created ServiceState * @hide */ + @UnsupportedAppUsage public static ServiceState newFromBundle(Bundle m) { ServiceState ret; ret = new ServiceState(); @@ -341,9 +353,11 @@ public class ServiceState implements Parcelable { mIsDataRoamingFromRegistration = s.mIsDataRoamingFromRegistration; mIsUsingCarrierAggregation = s.mIsUsingCarrierAggregation; mChannelNumber = s.mChannelNumber; - mCellBandwidths = Arrays.copyOf(s.mCellBandwidths, s.mCellBandwidths.length); + mCellBandwidths = s.mCellBandwidths == null ? null : + Arrays.copyOf(s.mCellBandwidths, s.mCellBandwidths.length); mLteEarfcnRsrpBoost = s.mLteEarfcnRsrpBoost; - mNetworkRegistrationStates = new ArrayList<>(s.mNetworkRegistrationStates); + mNetworkRegistrationStates = s.mNetworkRegistrationStates == null ? null : + new ArrayList<>(s.mNetworkRegistrationStates); } /** @@ -442,6 +456,7 @@ public class ServiceState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getVoiceRegState() { return mVoiceRegState; } @@ -456,6 +471,7 @@ public class ServiceState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getDataRegState() { return mDataRegState; } @@ -516,6 +532,7 @@ public class ServiceState implements Parcelable { * @return roaming status * @hide */ + @UnsupportedAppUsage public boolean getVoiceRoaming() { return mVoiceRoamingType != ROAMING_TYPE_NOT_ROAMING; } @@ -525,6 +542,7 @@ public class ServiceState implements Parcelable { * @return roaming type * @hide */ + @UnsupportedAppUsage public int getVoiceRoamingType() { return mVoiceRoamingType; } @@ -534,6 +552,7 @@ public class ServiceState implements Parcelable { * @return roaming type * @hide */ + @UnsupportedAppUsage public boolean getDataRoaming() { return mDataRoamingType != ROAMING_TYPE_NOT_ROAMING; } @@ -545,6 +564,7 @@ public class ServiceState implements Parcelable { * once the data registration phase has completed. * @hide */ + @UnsupportedAppUsage public void setDataRoamingFromRegistration(boolean dataRoaming) { mIsDataRoamingFromRegistration = dataRoaming; } @@ -563,6 +583,7 @@ public class ServiceState implements Parcelable { * @return roaming type * @hide */ + @UnsupportedAppUsage public int getDataRoamingType() { return mDataRoamingType; } @@ -570,6 +591,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public boolean isEmergencyOnly() { return mIsEmergencyOnly; } @@ -577,6 +599,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public int getCdmaRoamingIndicator(){ return this.mCdmaRoamingIndicator; } @@ -584,6 +607,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public int getCdmaDefaultRoamingIndicator(){ return this.mCdmaDefaultRoamingIndicator; } @@ -591,6 +615,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public int getCdmaEriIconIndex() { return this.mCdmaEriIconIndex; } @@ -598,6 +623,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public int getCdmaEriIconMode() { return this.mCdmaEriIconMode; } @@ -619,6 +645,7 @@ public class ServiceState implements Parcelable { * @return long name of operator * @hide */ + @UnsupportedAppUsage public String getVoiceOperatorAlphaLong() { return mVoiceOperatorAlphaLong; } @@ -648,6 +675,7 @@ public class ServiceState implements Parcelable { * @return short name of operator, null if unregistered or unknown * @hide */ + @UnsupportedAppUsage public String getVoiceOperatorAlphaShort() { return mVoiceOperatorAlphaShort; } @@ -657,6 +685,7 @@ public class ServiceState implements Parcelable { * @return short name of operator, null if unregistered or unknown * @hide */ + @UnsupportedAppUsage public String getDataOperatorAlphaShort() { return mDataOperatorAlphaShort; } @@ -700,6 +729,7 @@ public class ServiceState implements Parcelable { * @return numeric format of operator, null if unregistered or unknown * @hide */ + @UnsupportedAppUsage public String getVoiceOperatorNumeric() { return mVoiceOperatorNumeric; } @@ -709,6 +739,7 @@ public class ServiceState implements Parcelable { * @return numeric format of operator, null if unregistered or unknown * @hide */ + @UnsupportedAppUsage public String getDataOperatorNumeric() { return mDataOperatorNumeric; } @@ -783,7 +814,9 @@ public class ServiceState implements Parcelable { && mIsEmergencyOnly == s.mIsEmergencyOnly && mIsDataRoamingFromRegistration == s.mIsDataRoamingFromRegistration && mIsUsingCarrierAggregation == s.mIsUsingCarrierAggregation) - && mNetworkRegistrationStates.containsAll(s.mNetworkRegistrationStates); + && (mNetworkRegistrationStates == null ? s.mNetworkRegistrationStates == null : + s.mNetworkRegistrationStates != null && + mNetworkRegistrationStates.containsAll(s.mNetworkRegistrationStates)); } /** @@ -794,6 +827,7 @@ public class ServiceState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public static String rilRadioTechnologyToString(int rt) { String rtString; @@ -968,12 +1002,14 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public void setVoiceRegState(int state) { mVoiceRegState = state; if (DBG) Rlog.d(LOG_TAG, "[ServiceState] setVoiceRegState=" + mVoiceRegState); } /** @hide */ + @UnsupportedAppUsage public void setDataRegState(int state) { mDataRegState = state; if (VDBG) Rlog.d(LOG_TAG, "[ServiceState] setDataRegState=" + mDataRegState); @@ -997,21 +1033,25 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public void setVoiceRoaming(boolean roaming) { mVoiceRoamingType = (roaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } /** @hide */ + @UnsupportedAppUsage public void setVoiceRoamingType(int type) { mVoiceRoamingType = type; } /** @hide */ + @UnsupportedAppUsage public void setDataRoaming(boolean dataRoaming) { mDataRoamingType = (dataRoaming ? ROAMING_TYPE_UNKNOWN : ROAMING_TYPE_NOT_ROAMING); } /** @hide */ + @UnsupportedAppUsage public void setDataRoamingType(int type) { mDataRoamingType = type; } @@ -1019,6 +1059,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public void setEmergencyOnly(boolean emergencyOnly) { mIsEmergencyOnly = emergencyOnly; } @@ -1026,6 +1067,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public void setCdmaRoamingIndicator(int roaming) { this.mCdmaRoamingIndicator = roaming; } @@ -1033,6 +1075,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public void setCdmaDefaultRoamingIndicator (int roaming) { this.mCdmaDefaultRoamingIndicator = roaming; } @@ -1040,6 +1083,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public void setCdmaEriIconIndex(int index) { this.mCdmaEriIconIndex = index; } @@ -1047,6 +1091,7 @@ public class ServiceState implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public void setCdmaEriIconMode(int mode) { this.mCdmaEriIconMode = mode; } @@ -1080,6 +1125,7 @@ public class ServiceState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public void setOperatorAlphaLong(String longName) { mVoiceOperatorAlphaLong = longName; mDataOperatorAlphaLong = longName; @@ -1106,6 +1152,7 @@ public class ServiceState implements Parcelable { * @param b second obj * @return true if two objects equal or both are null */ + @UnsupportedAppUsage private static boolean equalsHandlesNulls (Object a, Object b) { return (a == null) ? (b == null) : a.equals (b); } @@ -1116,6 +1163,7 @@ public class ServiceState implements Parcelable { * @param m intent notifier map * @hide */ + @UnsupportedAppUsage private void setFromNotifierBundle(Bundle m) { mVoiceRegState = m.getInt("voiceRegState"); mDataRegState = m.getInt("dataRegState"); @@ -1149,6 +1197,7 @@ public class ServiceState implements Parcelable { * @param m intent notifier Bundle * @hide */ + @UnsupportedAppUsage public void fillInNotifierBundle(Bundle m) { m.putInt("voiceRegState", mVoiceRegState); m.putInt("dataRegState", mDataRegState); @@ -1221,6 +1270,7 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public void setCssIndicator(int css) { this.mCssIndicator = (css != 0); } @@ -1233,10 +1283,12 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public int getRilVoiceRadioTechnology() { return this.mRilVoiceRadioTechnology; } /** @hide */ + @UnsupportedAppUsage public int getRilDataRadioTechnology() { return this.mRilDataRadioTechnology; } @@ -1245,6 +1297,7 @@ public class ServiceState implements Parcelable { * @Deprecated to be removed Q3 2013 use {@link #getRilDataRadioTechnology} or * {@link #getRilVoiceRadioTechnology} */ + @UnsupportedAppUsage public int getRadioTechnology() { Rlog.e(LOG_TAG, "ServiceState.getRadioTechnology() DEPRECATED will be removed *******"); return getRilDataRadioTechnology(); @@ -1374,16 +1427,19 @@ public class ServiceState implements Parcelable { /** @hide */ + @UnsupportedAppUsage public int getDataNetworkType() { return rilRadioTechnologyToNetworkType(mRilDataRadioTechnology); } /** @hide */ + @UnsupportedAppUsage public int getVoiceNetworkType() { return rilRadioTechnologyToNetworkType(mRilVoiceRadioTechnology); } /** @hide */ + @UnsupportedAppUsage public int getCssIndicator() { return this.mCssIndicator ? 1 : 0; } @@ -1407,6 +1463,7 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public static boolean isGsm(int radioTechnology) { return radioTechnology == RIL_RADIO_TECHNOLOGY_GPRS || radioTechnology == RIL_RADIO_TECHNOLOGY_EDGE @@ -1424,6 +1481,7 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public static boolean isCdma(int radioTechnology) { return radioTechnology == RIL_RADIO_TECHNOLOGY_IS95A || radioTechnology == RIL_RADIO_TECHNOLOGY_IS95B @@ -1441,11 +1499,13 @@ public class ServiceState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public static boolean bearerBitmapHasCdma(int radioTechnologyBitmap) { return (RIL_RADIO_CDMA_TECHNOLOGY_BITMASK & radioTechnologyBitmap) != 0; } /** @hide */ + @UnsupportedAppUsage public static boolean bitmaskHasTech(int bearerBitmask, int radioTech) { if (bearerBitmask == 0) { return true; @@ -1517,6 +1577,7 @@ public class ServiceState implements Parcelable { * voice SS. The voice SS is only used if it is IN_SERVICE (otherwise the base SS is returned). * @hide * */ + @UnsupportedAppUsage public static ServiceState mergeServiceStates(ServiceState baseSs, ServiceState voiceSs) { if (voiceSs.mVoiceRegState != STATE_IN_SERVICE) { return baseSs; diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java index 95abb910e273..ed758a98a04c 100644 --- a/telephony/java/android/telephony/SignalStrength.java +++ b/telephony/java/android/telephony/SignalStrength.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -36,21 +37,27 @@ public class SignalStrength implements Parcelable { private static final boolean DBG = false; /** @hide */ + @UnsupportedAppUsage public static final int SIGNAL_STRENGTH_NONE_OR_UNKNOWN = TelephonyProtoEnums.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; // = 0 /** @hide */ + @UnsupportedAppUsage public static final int SIGNAL_STRENGTH_POOR = TelephonyProtoEnums.SIGNAL_STRENGTH_POOR; // = 1 /** @hide */ + @UnsupportedAppUsage public static final int SIGNAL_STRENGTH_MODERATE = TelephonyProtoEnums.SIGNAL_STRENGTH_MODERATE; // = 2 /** @hide */ + @UnsupportedAppUsage public static final int SIGNAL_STRENGTH_GOOD = TelephonyProtoEnums.SIGNAL_STRENGTH_GOOD; // = 3 /** @hide */ + @UnsupportedAppUsage public static final int SIGNAL_STRENGTH_GREAT = TelephonyProtoEnums.SIGNAL_STRENGTH_GREAT; // = 4 /** @hide */ + @UnsupportedAppUsage public static final int NUM_SIGNAL_STRENGTH_BINS = 5; /** @hide */ public static final String[] SIGNAL_STRENGTH_NAMES = { @@ -75,24 +82,39 @@ public class SignalStrength implements Parcelable { private static final String MEASUMENT_TYPE_RSCP = "rscp"; /** Parameters reported by the Radio */ + @UnsupportedAppUsage private int mGsmSignalStrength; // Valid values are (0-31, 99) as defined in TS 27.007 8.5 + @UnsupportedAppUsage private int mGsmBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5 + @UnsupportedAppUsage private int mCdmaDbm; // This value is the RSSI value + @UnsupportedAppUsage private int mCdmaEcio; // This value is the Ec/Io + @UnsupportedAppUsage private int mEvdoDbm; // This value is the EVDO RSSI value + @UnsupportedAppUsage private int mEvdoEcio; // This value is the EVDO Ec/Io + @UnsupportedAppUsage private int mEvdoSnr; // Valid values are 0-8. 8 is the highest signal to noise ratio + @UnsupportedAppUsage private int mLteSignalStrength; + @UnsupportedAppUsage private int mLteRsrp; + @UnsupportedAppUsage private int mLteRsrq; + @UnsupportedAppUsage private int mLteRssnr; + @UnsupportedAppUsage private int mLteCqi; + @UnsupportedAppUsage private int mTdScdmaRscp; // Valid values are -24...-120dBm or INVALID if unknown private int mWcdmaSignalStrength; private int mWcdmaRscpAsu; // the WCDMA RSCP in ASU as reported from the HAL + @UnsupportedAppUsage private int mWcdmaRscp; // the WCDMA RSCP in dBm /** Parameters from the framework */ + @UnsupportedAppUsage private int mLteRsrpBoost; // offset to be reduced from the rsrp threshold while calculating // signal strength level private boolean mIsGsm; // This value is set by the ServiceStateTracker @@ -121,6 +143,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public static SignalStrength newFromBundle(Bundle m) { SignalStrength ret; ret = new SignalStrength(); @@ -133,6 +156,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public SignalStrength() { this(true); } @@ -145,6 +169,7 @@ public class SignalStrength implements Parcelable { * @return newly created SignalStrength * @hide */ + @UnsupportedAppUsage public SignalStrength(boolean gsmFlag) { mGsmSignalStrength = 99; mGsmBitErrorRate = -1; @@ -247,6 +272,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public SignalStrength(SignalStrength s) { copyFrom(s); } @@ -254,6 +280,7 @@ public class SignalStrength implements Parcelable { /** * @hide */ + @UnsupportedAppUsage protected void copyFrom(SignalStrength s) { mGsmSignalStrength = s.mGsmSignalStrength; mGsmBitErrorRate = s.mGsmBitErrorRate; @@ -284,6 +311,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public SignalStrength(Parcel in) { if (DBG) log("Size of signalstrength parcel:" + in.dataSize()); @@ -351,6 +379,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public static final Parcelable.Creator<SignalStrength> CREATOR = new Parcelable.Creator() { public SignalStrength createFromParcel(Parcel in) { return new SignalStrength(in); @@ -372,6 +401,7 @@ public class SignalStrength implements Parcelable { * Valid values for all signalstrength fields * @hide */ + @UnsupportedAppUsage public void validateInput() { if (DBG) log("Signal before validate=" + this); // TS 27.007 8.5 @@ -546,26 +576,31 @@ public class SignalStrength implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public int getLteSignalStrength() { return mLteSignalStrength; } /** @hide */ + @UnsupportedAppUsage public int getLteRsrp() { return mLteRsrp; } /** @hide */ + @UnsupportedAppUsage public int getLteRsrq() { return mLteRsrq; } /** @hide */ + @UnsupportedAppUsage public int getLteRssnr() { return mLteRssnr; } /** @hide */ + @UnsupportedAppUsage public int getLteCqi() { return mLteCqi; } @@ -594,6 +629,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getAsuLevel() { int asuLevel = 0; if (mIsGsm) { @@ -629,6 +665,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getDbm() { int dBm = INVALID; @@ -661,6 +698,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getGsmDbm() { int dBm; @@ -680,6 +718,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getGsmLevel() { int level; @@ -702,6 +741,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getGsmAsuLevel() { // ASU ranges from 0 to 31 - TS 27.007 Sec 8.5 // asu = 0 (-113dB or less) is very weak @@ -717,6 +757,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getCdmaLevel() { final int cdmaDbm = getCdmaDbm(); final int cdmaEcio = getCdmaEcio(); @@ -746,6 +787,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getCdmaAsuLevel() { final int cdmaDbm = getCdmaDbm(); final int cdmaEcio = getCdmaEcio(); @@ -777,6 +819,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getEvdoLevel() { int evdoDbm = getEvdoDbm(); int evdoSnr = getEvdoSnr(); @@ -805,6 +848,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getEvdoAsuLevel() { int evdoDbm = getEvdoDbm(); int evdoSnr = getEvdoSnr(); @@ -835,6 +879,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getLteDbm() { return mLteRsrp; } @@ -844,6 +889,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getLteLevel() { /* * TS 36.214 Physical Layer Section 5.1.3 @@ -930,6 +976,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getLteAsuLevel() { int lteAsuLevel = 99; int lteDbm = getLteDbm(); @@ -973,6 +1020,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getTdScdmaDbm() { return this.mTdScdmaRscp; } @@ -985,6 +1033,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getTdScdmaLevel() { final int tdScdmaDbm = getTdScdmaDbm(); int level; @@ -1006,6 +1055,7 @@ public class SignalStrength implements Parcelable { * * @hide */ + @UnsupportedAppUsage public int getTdScdmaAsuLevel() { final int tdScdmaDbm = getTdScdmaDbm(); int tdScdmaAsuLevel; @@ -1245,6 +1295,7 @@ public class SignalStrength implements Parcelable { * @param m intent notifier map * @hide */ + @UnsupportedAppUsage private void setFromNotifierBundle(Bundle m) { mGsmSignalStrength = m.getInt("GsmSignalStrength"); mGsmBitErrorRate = m.getInt("GsmBitErrorRate"); @@ -1282,6 +1333,7 @@ public class SignalStrength implements Parcelable { * @param m intent notifier Bundle * @hide */ + @UnsupportedAppUsage public void fillInNotifierBundle(Bundle m) { m.putInt("GsmSignalStrength", mGsmSignalStrength); m.putInt("GsmBitErrorRate", mGsmBitErrorRate); diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 6cec9771a27d..ea408bf8ff59 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -19,6 +19,7 @@ package android.telephony; import android.annotation.RequiresPermission; import android.annotation.SuppressAutoDoc; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.app.ActivityThread; import android.app.PendingIntent; import android.content.ActivityNotFoundException; @@ -88,6 +89,7 @@ public final class SmsManager { new ArrayMap<Integer, SmsManager>(); /** A concrete subscription id, or the pseudo DEFAULT_SUBSCRIPTION_ID */ + @UnsupportedAppUsage private int mSubId; /* @@ -451,6 +453,7 @@ public final class SmsManager { * @throws IllegalArgumentException if destinationAddress or text are empty * {@hide} */ + @UnsupportedAppUsage public void sendTextMessage( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent, @@ -504,6 +507,7 @@ public final class SmsManager { * PendingIntent, int, boolean, int) * @hide */ + @UnsupportedAppUsage public void sendTextMessageWithoutPersisting( String destinationAddress, String scAddress, String text, PendingIntent sentIntent, PendingIntent deliveryIntent, int priority, @@ -729,6 +733,7 @@ public final class SmsManager { * @throws IllegalArgumentException if destinationAddress or data are empty * {@hide} */ + @UnsupportedAppUsage public void sendMultipartTextMessage( String destinationAddress, String scAddress, ArrayList<String> parts, ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents, @@ -997,6 +1002,7 @@ public final class SmsManager { * @throws IllegalArgumentException if pdu is NULL * {@hide} */ + @UnsupportedAppUsage public boolean copyMessageToIcc(byte[] smsc, byte[] pdu,int status) { boolean success = false; @@ -1027,6 +1033,7 @@ public final class SmsManager { * * {@hide} */ + @UnsupportedAppUsage public boolean deleteMessageFromIcc(int messageIndex) { boolean success = false; @@ -1061,6 +1068,7 @@ public final class SmsManager { * * {@hide} */ + @UnsupportedAppUsage public boolean updateMessageOnIcc(int messageIndex, int newStatus, byte[] pdu) { boolean success = false; @@ -1087,6 +1095,7 @@ public final class SmsManager { * * {@hide} */ + @UnsupportedAppUsage public ArrayList<SmsMessage> getAllMessagesFromIcc() { List<SmsRawData> records = null; @@ -1199,6 +1208,7 @@ public final class SmsManager { * @throws IllegalArgumentException if endMessageId < startMessageId * {@hide} */ + @UnsupportedAppUsage public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) { boolean success = false; @@ -1241,6 +1251,7 @@ public final class SmsManager { * @throws IllegalArgumentException if endMessageId < startMessageId * {@hide} */ + @UnsupportedAppUsage public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) { boolean success = false; @@ -1358,6 +1369,7 @@ public final class SmsManager { * @return true if enabled, false otherwise * @hide */ + @UnsupportedAppUsage public boolean isSMSPromptEnabled() { ISms iccISms = null; try { diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index 57f89e316e1c..91e24a955013 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -20,6 +20,7 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.annotation.Nullable; import android.annotation.StringDef; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Binder; import android.text.TextUtils; @@ -107,18 +108,21 @@ public class SmsMessage { * * @hide */ + @UnsupportedAppUsage public SmsMessageBase mWrappedSmsMessage; /** Indicates the subId * * @hide */ + @UnsupportedAppUsage private int mSubId = 0; /** set Subscription information * * @hide */ + @UnsupportedAppUsage public void setSubId(int subId) { mSubId = subId; } @@ -127,6 +131,7 @@ public class SmsMessage { * * @hide */ + @UnsupportedAppUsage public int getSubId() { return mSubId; } @@ -368,6 +373,7 @@ public class SmsMessage { * * @hide */ + @UnsupportedAppUsage public static ArrayList<String> fragmentText(String text) { // This function is for MO SMS TextEncodingDetails ted = (useCdmaFormatForMoSms()) ? @@ -822,6 +828,7 @@ public class SmsMessage { * * @return true if Cdma format should be used for MO SMS, false otherwise. */ + @UnsupportedAppUsage private static boolean useCdmaFormatForMoSms() { // IMS is registered with SMS support, check the SMS format supported return useCdmaFormatForMoSms(SubscriptionManager.getDefaultSmsSubscriptionId()); @@ -836,6 +843,7 @@ public class SmsMessage { * * @return true if Cdma format should be used for MO SMS, false otherwise. */ + @UnsupportedAppUsage private static boolean useCdmaFormatForMoSms(int subId) { SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId); if (!smsManager.isImsSmsSupported()) { diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 2bc43d410174..ec266229b83a 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -18,6 +18,7 @@ package android.telephony; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -216,6 +217,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the name displayed to the user that identifies this subscription * @hide */ + @UnsupportedAppUsage public void setDisplayName(CharSequence name) { this.mDisplayName = name; } @@ -240,6 +242,7 @@ public class SubscriptionInfo implements Parcelable { * NAME_SOURCE_SIM_SOURCE or NAME_SOURCE_USER_INPUT. * @hide */ + @UnsupportedAppUsage public int getNameSource() { return this.mNameSource; } @@ -298,6 +301,7 @@ public class SubscriptionInfo implements Parcelable { * Sets the color displayed to the user that identifies this subscription * @hide */ + @UnsupportedAppUsage public void setIconTint(int iconTint) { this.mIconTint = iconTint; } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 151b936604fd..119733e6a3d1 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -28,6 +28,7 @@ import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SuppressAutoDoc; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.app.BroadcastOptions; import android.app.PendingIntent; import android.content.Context; @@ -86,6 +87,7 @@ public class SubscriptionManager { /** Indicates the caller wants the default sub id. */ /** @hide */ + @UnsupportedAppUsage public static final int DEFAULT_SUBSCRIPTION_ID = Integer.MAX_VALUE; /** @@ -108,6 +110,7 @@ public class SubscriptionManager { public static final int MAX_SUBSCRIPTION_ID_VALUE = DEFAULT_SUBSCRIPTION_ID - 1; /** @hide */ + @UnsupportedAppUsage public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo"); /** @@ -185,6 +188,7 @@ public class SubscriptionManager { * The name_source is from the user * @hide */ + @UnsupportedAppUsage public static final int NAME_SOURCE_USER_INPUT = 2; /** @@ -615,6 +619,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public SubscriptionManager(Context context) { if (DBG) logd("SubscriptionManager created"); mContext = context; @@ -793,6 +798,7 @@ public class SubscriptionManager { * include those that were inserted before, maybe empty but not null. * @hide */ + @UnsupportedAppUsage public List<SubscriptionInfo> getAllSubscriptionInfoList() { if (VDBG) logd("[getAllSubscriptionInfoList]+"); @@ -964,6 +970,7 @@ public class SubscriptionManager { * all subscriptions that have been seen. * @hide */ + @UnsupportedAppUsage public int getAllSubscriptionInfoCount() { if (VDBG) logd("[getAllSubscriptionInfoCount]+"); @@ -1069,6 +1076,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ + @UnsupportedAppUsage public int setIconTint(int tint, int subId) { if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId); return setSubscriptionPropertyHelper(subId, "setIconTint", @@ -1096,6 +1104,7 @@ public class SubscriptionManager { * @return the number of records updated or < 0 if invalid subId * @hide */ + @UnsupportedAppUsage public int setDisplayName(String displayName, int subId, long nameSource) { if (VDBG) { logd("[setDisplayName]+ displayName:" + displayName + " subId:" + subId @@ -1113,6 +1122,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ + @UnsupportedAppUsage public int setDisplayNumber(String number, int subId) { if (number == null) { logd("[setDisplayNumber]- fail"); @@ -1130,6 +1140,7 @@ public class SubscriptionManager { * @return the number of records updated * @hide */ + @UnsupportedAppUsage public int setDataRoaming(int roaming, int subId) { if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId); return setSubscriptionPropertyHelper(subId, "setDataRoaming", @@ -1143,6 +1154,7 @@ public class SubscriptionManager { * SIM_NOT_INSERTED or < 0 if an invalid slot index * @hide */ + @UnsupportedAppUsage public static int getSlotIndex(int subId) { if (!isValidSubscriptionId(subId)) { if (DBG) { @@ -1166,6 +1178,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public static int[] getSubId(int slotIndex) { if (!isValidSlotIndex(slotIndex)) { logd("[getSubId]- fail"); @@ -1187,6 +1200,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public static int getPhoneId(int subId) { if (!isValidSubscriptionId(subId)) { if (DBG) { @@ -1284,11 +1298,13 @@ public class SubscriptionManager { * @return the SubscriptionInfo for the default voice subscription. * @hide */ + @UnsupportedAppUsage public SubscriptionInfo getDefaultVoiceSubscriptionInfo() { return getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId()); } /** @hide */ + @UnsupportedAppUsage public static int getDefaultVoicePhoneId() { return getPhoneId(getDefaultVoiceSubscriptionId()); } @@ -1317,6 +1333,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public void setDefaultSmsSubId(int subId) { if (VDBG) logd("setDefaultSmsSubId sub id = " + subId); try { @@ -1342,6 +1359,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public int getDefaultSmsPhoneId() { return getPhoneId(getDefaultSmsSubscriptionId()); } @@ -1370,6 +1388,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public void setDefaultDataSubId(int subId) { if (VDBG) logd("setDataSubscription sub id = " + subId); try { @@ -1390,11 +1409,13 @@ public class SubscriptionManager { * @return the SubscriptionInfo for the default data subscription. * @hide */ + @UnsupportedAppUsage public SubscriptionInfo getDefaultDataSubscriptionInfo() { return getActiveSubscriptionInfo(getDefaultDataSubscriptionId()); } /** @hide */ + @UnsupportedAppUsage public int getDefaultDataPhoneId() { return getPhoneId(getDefaultDataSubscriptionId()); } @@ -1433,6 +1454,7 @@ public class SubscriptionManager { * an invalid subscription id, i.e. < 0. * @hide */ + @UnsupportedAppUsage public void clearDefaultsForInactiveSubIds() { if (VDBG) logd("clearDefaultsForInactiveSubIds"); try { @@ -1449,6 +1471,7 @@ public class SubscriptionManager { * @return true if a valid subId else false * @hide */ + @UnsupportedAppUsage public static boolean isValidSubscriptionId(int subId) { return subId > INVALID_SUBSCRIPTION_ID ; } @@ -1458,21 +1481,25 @@ public class SubscriptionManager { * usable subId means its neither a INVALID_SUBSCRIPTION_ID nor a DEFAULT_SUB_ID. * @hide */ + @UnsupportedAppUsage public static boolean isUsableSubIdValue(int subId) { return subId >= MIN_SUBSCRIPTION_ID_VALUE && subId <= MAX_SUBSCRIPTION_ID_VALUE; } /** @hide */ + @UnsupportedAppUsage public static boolean isValidSlotIndex(int slotIndex) { return slotIndex >= 0 && slotIndex < TelephonyManager.getDefault().getSimCount(); } /** @hide */ + @UnsupportedAppUsage public static boolean isValidPhoneId(int phoneId) { return phoneId >= 0 && phoneId < TelephonyManager.getDefault().getPhoneCount(); } /** @hide */ + @UnsupportedAppUsage public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) { int[] subIds = SubscriptionManager.getSubId(phoneId); if (subIds != null && subIds.length > 0) { @@ -1483,6 +1510,7 @@ public class SubscriptionManager { } /** @hide */ + @UnsupportedAppUsage public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId, int subId) { if (VDBG) logd("putPhoneIdAndSubIdExtra: phoneId=" + phoneId + " subId=" + subId); intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId); @@ -1498,6 +1526,7 @@ public class SubscriptionManager { * is never null but the length maybe 0. * @hide */ + @UnsupportedAppUsage public @NonNull int[] getActiveSubscriptionIdList() { int[] subId = null; @@ -1656,6 +1685,7 @@ public class SubscriptionManager { * @return Resources associated with Subscription. * @hide */ + @UnsupportedAppUsage public static Resources getResourcesForSubId(Context context, int subId) { final SubscriptionInfo subInfo = SubscriptionManager.from(context).getActiveSubscriptionInfo(subId); @@ -1679,6 +1709,7 @@ public class SubscriptionManager { * and the SIM providing the subscription is present in a slot and in "LOADED" state. * @hide */ + @UnsupportedAppUsage public boolean isActiveSubId(int subId) { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 59f3f1ab78e0..e3c0b308a3d9 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -28,6 +28,7 @@ import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.annotation.WorkerThread; import android.app.ActivityThread; import android.app.PendingIntent; @@ -155,6 +156,7 @@ public class TelephonyManager { private final Context mContext; private final int mSubId; + @UnsupportedAppUsage private SubscriptionManager mSubscriptionManager; private TelephonyScanManager mTelephonyScanManager; @@ -168,18 +170,24 @@ public class TelephonyManager { **/ /** @hide */ public enum MultiSimVariants { + @UnsupportedAppUsage DSDS, + @UnsupportedAppUsage DSDA, + @UnsupportedAppUsage TSTS, + @UnsupportedAppUsage UNKNOWN }; /** @hide */ + @UnsupportedAppUsage public TelephonyManager(Context context) { this(context, SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); } /** @hide */ + @UnsupportedAppUsage public TelephonyManager(Context context, int subId) { mSubId = subId; Context appContext = context.getApplicationContext(); @@ -192,6 +200,7 @@ public class TelephonyManager { } /** @hide */ + @UnsupportedAppUsage private TelephonyManager() { mContext = null; mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; @@ -201,6 +210,7 @@ public class TelephonyManager { /** @hide /* @deprecated - use getSystemService as described above */ + @UnsupportedAppUsage public static TelephonyManager getDefault() { return sInstance; } @@ -228,6 +238,7 @@ public class TelephonyManager { * Returns UNKNOWN for others */ /** {@hide} */ + @UnsupportedAppUsage public MultiSimVariants getMultiSimConfiguration() { String mSimConfig = SystemProperties.get(TelephonyProperties.PROPERTY_MULTI_SIM_CONFIG); @@ -288,6 +299,7 @@ public class TelephonyManager { } /** {@hide} */ + @UnsupportedAppUsage public static TelephonyManager from(Context context) { return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); } @@ -319,6 +331,7 @@ public class TelephonyManager { } /** {@hide} */ + @UnsupportedAppUsage public boolean isMultiSimEnabled() { return (multiSimConfig.equals("dsds") || multiSimConfig.equals("dsda") || multiSimConfig.equals("tsts")); @@ -672,6 +685,7 @@ public class TelephonyManager { */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @Deprecated + @UnsupportedAppUsage public static final String ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED = "android.intent.action.PRECISE_DATA_CONNECTION_STATE_CHANGED"; @@ -1206,6 +1220,7 @@ public class TelephonyManager { */ /** {@hide} */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getDeviceSoftwareVersion(int slotIndex) { ITelephony telephony = getITelephony(); if (telephony == null) return null; @@ -1418,6 +1433,7 @@ public class TelephonyManager { * @param slotIndex of which Nai is returned */ /** {@hide}*/ + @UnsupportedAppUsage public String getNai(int slotIndex) { int[] subId = SubscriptionManager.getSubId(slotIndex); if (subId == null) { @@ -1657,6 +1673,7 @@ public class TelephonyManager { } /** {@hide} */ + @UnsupportedAppUsage private int getPhoneTypeFromProperty(int phoneId) { String type = getTelephonyProperty(phoneId, TelephonyProperties.CURRENT_ACTIVE_PHONE, null); @@ -1691,6 +1708,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public static int getPhoneType(int networkMode) { switch(networkMode) { case RILConstants.NETWORK_MODE_CDMA: @@ -1736,6 +1754,7 @@ public class TelephonyManager { /** * The contents of the /proc/cmdline file */ + @UnsupportedAppUsage private static String getProcCmdLine() { String cmdline = ""; @@ -1782,6 +1801,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public static int getLteOnCdmaModeStatic() { int retVal; int curVal; @@ -1837,6 +1857,7 @@ public class TelephonyManager { * @param subId * @hide */ + @UnsupportedAppUsage public String getNetworkOperatorName(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, ""); @@ -1864,6 +1885,7 @@ public class TelephonyManager { * @param subId * @hide */ + @UnsupportedAppUsage public String getNetworkOperator(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return getNetworkOperatorForPhone(phoneId); @@ -1880,6 +1902,7 @@ public class TelephonyManager { * @param phoneId * @hide **/ + @UnsupportedAppUsage public String getNetworkOperatorForPhone(int phoneId) { return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_NUMERIC, ""); } @@ -1942,6 +1965,7 @@ public class TelephonyManager { * @param subId * @hide */ + @UnsupportedAppUsage public boolean isNetworkRoaming(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return Boolean.parseBoolean(getTelephonyProperty(phoneId, @@ -1970,6 +1994,7 @@ public class TelephonyManager { * @param subId for which Network CountryIso is returned * @hide */ + @UnsupportedAppUsage public String getNetworkCountryIso(int subId) { return getNetworkCountryIsoForPhone(getPhoneId(subId)); } @@ -1985,6 +2010,7 @@ public class TelephonyManager { * @param phoneId for which Network CountryIso is returned */ /** {@hide} */ + @UnsupportedAppUsage public String getNetworkCountryIsoForPhone(int phoneId) { try { ITelephony telephony = getITelephony(); @@ -2040,6 +2066,7 @@ public class TelephonyManager { /** Current network is IWLAN */ public static final int NETWORK_TYPE_IWLAN = TelephonyProtoEnums.NETWORK_TYPE_IWLAN; // = 18. /** Current network is LTE_CA {@hide} */ + @UnsupportedAppUsage public static final int NETWORK_TYPE_LTE_CA = TelephonyProtoEnums.NETWORK_TYPE_LTE_CA; // = 19. /** Max network type number. Update as new types are added. Don't add negative types. {@hide} */ @@ -2092,6 +2119,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getNetworkType(int subId) { try { ITelephony telephony = getITelephony(); @@ -2154,6 +2182,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getDataNetworkType(int subId) { try{ ITelephony telephony = getITelephony(); @@ -2189,6 +2218,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getVoiceNetworkType(int subId) { try{ ITelephony telephony = getITelephony(); @@ -2216,10 +2246,13 @@ public class TelephonyManager { /** Unknown network class. {@hide} */ public static final int NETWORK_CLASS_UNKNOWN = 0; /** Class of broadly defined "2G" networks. {@hide} */ + @UnsupportedAppUsage public static final int NETWORK_CLASS_2_G = 1; /** Class of broadly defined "3G" networks. {@hide} */ + @UnsupportedAppUsage public static final int NETWORK_CLASS_3_G = 2; /** Class of broadly defined "4G" networks. {@hide} */ + @UnsupportedAppUsage public static final int NETWORK_CLASS_4_G = 3; /** @@ -2228,6 +2261,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public static int getNetworkClass(int networkType) { switch (networkType) { case NETWORK_TYPE_GPRS: @@ -2264,6 +2298,7 @@ public class TelephonyManager { * * @hide pending API council review */ + @UnsupportedAppUsage public String getNetworkTypeName() { return getNetworkTypeName(getNetworkType()); } @@ -2276,6 +2311,7 @@ public class TelephonyManager { * */ /** {@hide} */ + @UnsupportedAppUsage public static String getNetworkTypeName(int type) { switch (type) { case NETWORK_TYPE_GPRS: @@ -2462,6 +2498,25 @@ public class TelephonyManager { "android.telephony.action.SIM_SLOT_STATUS_CHANGED"; /** + * Broadcast Action: A debug code has been entered in the dialer. + * <p> + * This intent is broadcast by the system and OEM telephony apps may need to receive these + * broadcasts. And it requires the sender to be default dialer or has carrier privileges + * (see {@link #hasCarrierPrivileges}). + * <p> + * These "secret codes" are used to activate developer menus by dialing certain codes. + * And they are of the form {@code *#*#<code>#*#*}. The intent will have the data + * URI: {@code android_secret_code://<code>}. It is possible that a manifest + * receiver would be woken up even if it is not currently running. + * <p> + * It is supposed to replace {@link android.provider.Telephony.Sms.Intents#SECRET_CODE_ACTION} + * in the next Android version. + * Before that both of these two actions will be broadcast. + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_SECRET_CODE = "android.telephony.action.SECRET_CODE"; + + /** * @return true if a ICC card is present */ public boolean hasIccCard() { @@ -2475,6 +2530,7 @@ public class TelephonyManager { */ /** {@hide} */ // FIXME Input argument slotIndex should be of type int + @UnsupportedAppUsage public boolean hasIccCard(int slotIndex) { try { @@ -2638,6 +2694,7 @@ public class TelephonyManager { * @param subId for which SimOperator is returned * @hide */ + @UnsupportedAppUsage public String getSimOperator(int subId) { return getSimOperatorNumeric(subId); } @@ -2651,6 +2708,7 @@ public class TelephonyManager { * @see #getSimState * @hide */ + @UnsupportedAppUsage public String getSimOperatorNumeric() { int subId = mSubId; if (!SubscriptionManager.isUsableSubIdValue(subId)) { @@ -2679,6 +2737,7 @@ public class TelephonyManager { * @param subId for which SimOperator is returned * @hide */ + @UnsupportedAppUsage public String getSimOperatorNumeric(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return getSimOperatorNumericForPhone(phoneId); @@ -2692,6 +2751,7 @@ public class TelephonyManager { * @param phoneId for which SimOperator is returned * @hide */ + @UnsupportedAppUsage public String getSimOperatorNumericForPhone(int phoneId) { return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, ""); @@ -2718,6 +2778,7 @@ public class TelephonyManager { * @param subId for which SimOperatorName is returned * @hide */ + @UnsupportedAppUsage public String getSimOperatorName(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return getSimOperatorNameForPhone(phoneId); @@ -2728,6 +2789,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public String getSimOperatorNameForPhone(int phoneId) { return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, ""); @@ -2746,6 +2808,7 @@ public class TelephonyManager { * @param subId for which SimCountryIso is returned * @hide */ + @UnsupportedAppUsage public String getSimCountryIso(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return getSimCountryIsoForPhone(phoneId); @@ -2756,6 +2819,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public String getSimCountryIsoForPhone(int phoneId) { return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY, ""); @@ -2782,6 +2846,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getSimSerialNumber(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -2807,6 +2872,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getLteOnCdmaMode() { return getLteOnCdmaMode(getSubId()); } @@ -2822,6 +2888,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getLteOnCdmaMode(int subId) { try { ITelephony telephony = getITelephony(); @@ -2929,6 +2996,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getSubscriberId(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -3109,6 +3177,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getGroupIdLevel1(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -3158,6 +3227,7 @@ public class TelephonyManager { android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS }) + @UnsupportedAppUsage public String getLine1Number(int subId) { String number = null; try { @@ -3244,6 +3314,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getLine1AlphaTag(int subId) { String alphaTag = null; try { @@ -3278,6 +3349,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public @Nullable String[] getMergedSubscriberIds() { try { ITelephony telephony = getITelephony(); @@ -3296,6 +3368,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getMsisdn() { return getMsisdn(getSubId()); } @@ -3308,6 +3381,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getMsisdn(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -3341,6 +3415,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getVoiceMailNumber(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -3361,6 +3436,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.CALL_PRIVILEGED) + @UnsupportedAppUsage public String getCompleteVoiceMailNumber() { return getCompleteVoiceMailNumber(getSubId()); } @@ -3372,6 +3448,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.CALL_PRIVILEGED) + @UnsupportedAppUsage public String getCompleteVoiceMailNumber(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -3931,6 +4008,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getVoiceMessageCount() { return getVoiceMessageCount(getSubId()); } @@ -3941,6 +4019,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getVoiceMessageCount(int subId) { try { ITelephony telephony = getITelephony(); @@ -3976,6 +4055,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getVoiceMailAlphaTag(int subId) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -4022,6 +4102,7 @@ public class TelephonyManager { * @return the IMPI, or null if not present or not loaded * @hide */ + @UnsupportedAppUsage public String getIsimImpi() { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -4042,6 +4123,7 @@ public class TelephonyManager { * @return the IMS domain name, or null if not present or not loaded * @hide */ + @UnsupportedAppUsage public String getIsimDomain() { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -4063,6 +4145,7 @@ public class TelephonyManager { * not present or not loaded * @hide */ + @UnsupportedAppUsage public String[] getIsimImpu() { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -4081,6 +4164,7 @@ public class TelephonyManager { /** * @hide */ + @UnsupportedAppUsage private IPhoneSubInfo getSubscriberInfo() { // get it each time because that process crashes a lot return IPhoneSubInfo.Stub.asInterface(ServiceManager.getService("iphonesubinfo")); @@ -4146,6 +4230,7 @@ public class TelephonyManager { * @param subId the subscription to check call state for. * @hide */ + @UnsupportedAppUsage public @CallState int getCallState(int subId) { int phoneId = SubscriptionManager.getPhoneId(subId); return getCallStateForSlot(phoneId); @@ -4257,6 +4342,7 @@ public class TelephonyManager { /** * @hide */ + @UnsupportedAppUsage private ITelephony getITelephony() { return ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE)); } @@ -4341,6 +4427,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getCdmaEriIconIndex(int subId) { try { ITelephony telephony = getITelephony(); @@ -4375,6 +4462,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public int getCdmaEriIconMode(int subId) { try { ITelephony telephony = getITelephony(); @@ -4405,6 +4493,7 @@ public class TelephonyManager { * @hide */ @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + @UnsupportedAppUsage public String getCdmaEriText(int subId) { try { ITelephony telephony = getITelephony(); @@ -4877,6 +4966,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public String nvReadItem(int itemID) { try { ITelephony telephony = getITelephony(); @@ -4957,6 +5047,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public boolean nvResetConfig(int resetType) { try { ITelephony telephony = getITelephony(); @@ -4993,6 +5084,7 @@ public class TelephonyManager { * {@see SubscriptionManager#getDefaultVoiceSubscriptionId()} * {@see SubscriptionManager#getDefaultSmsSubscriptionId()} */ + @UnsupportedAppUsage private int getSubId(int preferredSubId) { if (SubscriptionManager.isUsableSubIdValue(mSubId)) { return mSubId; @@ -5021,6 +5113,7 @@ public class TelephonyManager { * {@see SubscriptionManager#getDefaultVoiceSubscriptionId()} * {@see SubscriptionManager#getDefaultSmsSubscriptionId()} */ + @UnsupportedAppUsage private int getPhoneId(int preferredSubId) { return SubscriptionManager.getPhoneId(getSubId(preferredSubId)); } @@ -5036,6 +5129,7 @@ public class TelephonyManager { * {@hide} */ @VisibleForTesting + @UnsupportedAppUsage public int getSlotIndex() { int slotIndex = SubscriptionManager.getSlotIndex(getSubId()); if (slotIndex == SubscriptionManager.SIM_NOT_INSERTED) { @@ -5049,6 +5143,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public static void setTelephonyProperty(int phoneId, String property, String value) { String propVal = ""; String p[] = null; @@ -5126,6 +5221,7 @@ public class TelephonyManager { * @return The value at the given index of settings. * @hide */ + @UnsupportedAppUsage public static int getIntAtIndex(android.content.ContentResolver cr, String name, int index) throws android.provider.Settings.SettingNotFoundException { @@ -5158,6 +5254,7 @@ public class TelephonyManager { * @return true if the value was set, false on database errors * @hide */ + @UnsupportedAppUsage public static boolean putIntAtIndex(android.content.ContentResolver cr, String name, int index, int value) { String data = ""; @@ -5199,6 +5296,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public static String getTelephonyProperty(int phoneId, String property, String defaultVal) { String propVal = null; String prop = SystemProperties.get(property); @@ -5219,12 +5317,14 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public static String getTelephonyProperty(String property, String defaultVal) { String propVal = SystemProperties.get(property); return propVal == null ? defaultVal : propVal; } /** @hide */ + @UnsupportedAppUsage public int getSimCount() { // FIXME Need to get it from Telephony Dev Controller when that gets implemented! // and then this method shouldn't be used at all! @@ -5261,6 +5361,7 @@ public class TelephonyManager { * not present or not loaded * @hide */ + @UnsupportedAppUsage public String[] getIsimPcscf() { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -5341,6 +5442,7 @@ public class TelephonyManager { * Authentication error, no memory space available in EFMUK * @hide */ + @UnsupportedAppUsage public String getIccAuthentication(int subId, int appType, int authType, String data) { try { IPhoneSubInfo info = getSubscriberInfo(); @@ -5503,6 +5605,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ + @UnsupportedAppUsage public @Nullable IImsRegistration getImsRegistration(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -5522,6 +5625,7 @@ public class TelephonyManager { * Corresponds to features defined in ImsFeature. * @hide */ + @UnsupportedAppUsage public @Nullable IImsConfig getImsConfig(int slotIndex, int feature) { try { ITelephony telephony = getITelephony(); @@ -5557,6 +5661,7 @@ public class TelephonyManager { * @param Registration state * @hide */ + @UnsupportedAppUsage public void setImsRegistrationState(boolean registered) { try { ITelephony telephony = getITelephony(); @@ -5577,6 +5682,7 @@ public class TelephonyManager { * @return the preferred network type, defined in RILConstants.java. * @hide */ + @UnsupportedAppUsage public int getPreferredNetworkType(int subId) { try { ITelephony telephony = getITelephony(); @@ -5725,6 +5831,7 @@ public class TelephonyManager { * @return true on success; false on any failure. * @hide */ + @UnsupportedAppUsage public boolean setPreferredNetworkType(int subId, int networkType) { try { ITelephony telephony = getITelephony(); @@ -5899,6 +6006,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public boolean setRoamingOverride(List<String> gsmRoamingList, List<String> gsmNonRoamingList, List<String> cdmaRoamingList, List<String> cdmaNonRoamingList) { @@ -6141,7 +6249,11 @@ public class TelephonyManager { } } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6158,7 +6270,11 @@ public class TelephonyManager { return false; } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#isRinging} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6175,7 +6291,11 @@ public class TelephonyManager { return false; } - /** @hide */ + /** + * @deprecated Use {@link android.telecom.TelecomManager#isInCall} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6192,7 +6312,11 @@ public class TelephonyManager { return true; } - /** @hide */ + /** + * @deprecated Use {@link android.telephony.TelephonyManager#getServiceState} instead + * @hide + */ + @Deprecated @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, @@ -6562,9 +6686,9 @@ public class TelephonyManager { * subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()} * * <p>Requires one of the following permissions: - * {@link android.Manifest.permission#ACCESS_NETWORK_STATE ACCESS_NETWORK_STATE}, - * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}, or that the - * calling app has carrier privileges (see {@link #hasCarrierPrivileges}). + * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}, + * {@link android.Manifest.permission#MODIFY_PHONE_STATE}, or that the calling app has carrier + * privileges (see {@link #hasCarrierPrivileges}). * * <p>Note that this does not take into account any data restrictions that may be present on the * calling app. Such restrictions may be inspected with @@ -6572,11 +6696,69 @@ public class TelephonyManager { * * @return true if mobile data is enabled. */ + @RequiresPermission(anyOf = {android.Manifest.permission.ACCESS_NETWORK_STATE, + android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean isDataEnabled() { return getDataEnabled(getSubId(SubscriptionManager.getDefaultDataSubscriptionId())); } /** + * Returns whether mobile data roaming is enabled on the subscription. + * + * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the + * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()} + * + * <p>Requires one of the following permissions: + * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}, + * {@link android.Manifest.permission#READ_PHONE_STATE} or that the calling app + * has carrier privileges (see {@link #hasCarrierPrivileges}). + * + * @return {@code true} if the data roaming is enabled on the subscription, otherwise return + * {@code false}. + */ + @RequiresPermission(anyOf = {android.Manifest.permission.ACCESS_NETWORK_STATE, + android.Manifest.permission.READ_PHONE_STATE}) + public boolean isDataRoamingEnabled() { + boolean isDataRoamingEnabled = false; + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + isDataRoamingEnabled = telephony.isDataRoamingEnabled(getSubId()); + } + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelephony#isDataRoamingEnabled", e); + } + return isDataRoamingEnabled; + } + + /** + * Enables/Disables the data roaming on the subscription. + * + * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the + * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultDataSubscriptionId()} + * + * <p> Requires permission: + * {@link android.Manifest.permission#MODIFY_PHONE_STATE} or that the calling app has carrier + * privileges (see {@link #hasCarrierPrivileges}). + * + * @param isEnabled {@code true} to enable mobile data roaming, otherwise disable it. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) + public void setDataRoamingEnabled(boolean isEnabled) { + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + telephony.setDataRoamingEnabled(getSubId(), isEnabled); + } + } catch (RemoteException e) { + Log.e(TAG, "Error calling ITelephony#setDataRoamingEnabled", e); + } + } + + /** * @deprecated use {@link #isDataEnabled()} instead. * @hide */ @@ -6753,6 +6935,7 @@ public class TelephonyManager { * @see SubscriptionManager#getDefaultSubscriptionId() * @hide */ + @UnsupportedAppUsage public boolean isImsRegistered() { try { return getITelephony().isImsRegistered(getSubId()); @@ -6769,6 +6952,7 @@ public class TelephonyManager { * @see SubscriptionManager#getDefaultSubscriptionId() * @hide */ + @UnsupportedAppUsage public boolean isVolteAvailable() { try { return getITelephony().isVolteAvailable(getSubId()); @@ -6785,6 +6969,7 @@ public class TelephonyManager { * @return true if VT is available, or false if it is unavailable or unknown. * @hide */ + @UnsupportedAppUsage public boolean isVideoTelephonyAvailable() { try { return getITelephony().isVideoTelephonyAvailable(getSubId()); @@ -6799,6 +6984,7 @@ public class TelephonyManager { * @return true if VoWiFi is available, or false if it is unavailable or unknown. * @hide */ + @UnsupportedAppUsage public boolean isWifiCallingAvailable() { try { return getITelephony().isWifiCallingAvailable(getSubId()); @@ -6841,6 +7027,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public void setSimOperatorNumericForPhone(int phoneId, String numeric) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, numeric); @@ -6861,6 +7048,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public void setSimOperatorNameForPhone(int phoneId, String name) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA, name); @@ -6881,6 +7069,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public void setSimCountryIsoForPhone(int phoneId, String iso) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY, iso); @@ -6901,6 +7090,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public void setSimStateForPhone(int phoneId, String state) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_SIM_STATE, state); @@ -7006,6 +7196,7 @@ public class TelephonyManager { * @param version baseband version * @hide */ + @UnsupportedAppUsage public void setBasebandVersionForPhone(int phoneId, String version) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_BASEBAND_VERSION, version); } @@ -7071,6 +7262,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public void setPhoneType(int phoneId, int type) { if (SubscriptionManager.isValidPhoneId(phoneId)) { TelephonyManager.setTelephonyProperty(phoneId, @@ -7100,6 +7292,7 @@ public class TelephonyManager { * * @hide */ + @UnsupportedAppUsage public String getOtaSpNumberSchemaForPhone(int phoneId, String defaultValue) { if (SubscriptionManager.isValidPhoneId(phoneId)) { return TelephonyManager.getTelephonyProperty(phoneId, @@ -7187,6 +7380,7 @@ public class TelephonyManager { * @param name the alphabetic name of current registered operator. * @hide */ + @UnsupportedAppUsage public void setNetworkOperatorNameForPhone(int phoneId, String name) { if (SubscriptionManager.isValidPhoneId(phoneId)) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, name); @@ -7209,6 +7403,7 @@ public class TelephonyManager { * @param operator the numeric name (MCC+MNC) of current registered operator * @hide */ + @UnsupportedAppUsage public void setNetworkOperatorNumericForPhone(int phoneId, String numeric) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_NUMERIC, numeric); } @@ -7229,6 +7424,7 @@ public class TelephonyManager { * @param isRoaming is network in romaing state or not * @hide */ + @UnsupportedAppUsage public void setNetworkRoamingForPhone(int phoneId, boolean isRoaming) { if (SubscriptionManager.isValidPhoneId(phoneId)) { setTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ISROAMING, @@ -7256,6 +7452,7 @@ public class TelephonyManager { * @param type the network type currently in use on the device for data transmission * @hide */ + @UnsupportedAppUsage public void setDataNetworkTypeForPhone(int phoneId, int type) { if (SubscriptionManager.isValidPhoneId(phoneId)) { setTelephonyProperty(phoneId, @@ -7268,6 +7465,7 @@ public class TelephonyManager { * Returns the subscription ID for the given phone account. * @hide */ + @UnsupportedAppUsage public int getSubIdForPhoneAccount(PhoneAccount phoneAccount) { int retval = SubscriptionManager.INVALID_SUBSCRIPTION_ID; try { @@ -7359,6 +7557,7 @@ public class TelephonyManager { * either READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE to retrieve the information. * @hide */ + @UnsupportedAppUsage public ServiceState getServiceStateForSubscriber(int subId) { try { ITelephony service = getITelephony(); @@ -8019,4 +8218,23 @@ public class TelephonyManager { } return UNKNOWN_CARRIER_ID_LIST_VERSION; } + + + /** + * How many modems can have simultaneous data connections. + * @hide + */ + @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) + public int getNumberOfModemsWithSimultaneousDataConnections() { + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + return telephony.getNumberOfModemsWithSimultaneousDataConnections( + getSubId(), mContext.getOpPackageName()); + } + } catch (RemoteException ex) { + // This could happen if binder process crashes. + } + return 0; + } } diff --git a/telephony/java/android/telephony/VoLteServiceState.java b/telephony/java/android/telephony/VoLteServiceState.java index afef601b9c4c..25bb8b4a414e 100644 --- a/telephony/java/android/telephony/VoLteServiceState.java +++ b/telephony/java/android/telephony/VoLteServiceState.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -77,6 +78,7 @@ public final class VoLteServiceState implements Parcelable { * * @hide */ + @UnsupportedAppUsage public VoLteServiceState(int srvccState) { initialize(); diff --git a/telephony/java/android/telephony/cdma/CdmaCellLocation.java b/telephony/java/android/telephony/cdma/CdmaCellLocation.java index 7c10569f3376..ee602c06f0f7 100644 --- a/telephony/java/android/telephony/cdma/CdmaCellLocation.java +++ b/telephony/java/android/telephony/cdma/CdmaCellLocation.java @@ -16,6 +16,7 @@ package android.telephony.cdma; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.telephony.CellLocation; @@ -23,6 +24,7 @@ import android.telephony.CellLocation; * Represents the cell location on a CDMA phone. */ public class CdmaCellLocation extends CellLocation { + @UnsupportedAppUsage private int mBaseStationId = -1; /** @@ -36,6 +38,7 @@ public class CdmaCellLocation extends CellLocation { * to 1296000, both values inclusive (corresponding to a range of -90 * to +90 degrees). Integer.MAX_VALUE is considered invalid value. */ + @UnsupportedAppUsage private int mBaseStationLatitude = INVALID_LAT_LONG; /** @@ -44,9 +47,12 @@ public class CdmaCellLocation extends CellLocation { * to 2592000, both values inclusive (corresponding to a range of -180 * to +180 degrees). Integer.MAX_VALUE is considered invalid value. */ + @UnsupportedAppUsage private int mBaseStationLongitude = INVALID_LAT_LONG; + @UnsupportedAppUsage private int mSystemId = -1; + @UnsupportedAppUsage private int mNetworkId = -1; /** @@ -200,6 +206,7 @@ public class CdmaCellLocation extends CellLocation { * @param b second obj * @return true if two objects equal or both are null */ + @UnsupportedAppUsage private static boolean equalsHandlesNulls(Object a, Object b) { return (a == null) ? (b == null) : a.equals (b); } diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 9388ed155390..0e4a7addd58c 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -810,7 +810,7 @@ public class ApnSetting implements Parcelable { version = 1; } - String[] a = data.split("\\s*,\\s*"); + String[] a = data.split("\\s*,\\s*", -1); if (a.length < 14) { return null; } diff --git a/telephony/java/android/telephony/data/IQualifiedNetworksService.aidl b/telephony/java/android/telephony/data/IQualifiedNetworksService.aidl new file mode 100644 index 000000000000..9c80cb77e435 --- /dev/null +++ b/telephony/java/android/telephony/data/IQualifiedNetworksService.aidl @@ -0,0 +1,28 @@ +/* + * Copyright 2018 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.telephony.data; + +import android.telephony.data.IQualifiedNetworksServiceCallback; + +/** + * {@hide} + */ +interface IQualifiedNetworksService +{ + oneway void createNetworkAvailabilityUpdater(int slotId, IQualifiedNetworksServiceCallback callback); + oneway void removeNetworkAvailabilityUpdater(int slotId); +} diff --git a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionCategory.java b/telephony/java/android/telephony/data/IQualifiedNetworksServiceCallback.aidl index 19e556ad55bb..e8e1f017789f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/suggestions/SuggestionCategory.java +++ b/telephony/java/android/telephony/data/IQualifiedNetworksServiceCallback.aidl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 The Android Open Source Project + * Copyright 2018 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. @@ -14,12 +14,13 @@ * limitations under the License. */ -package com.android.settingslib.suggestions; +package android.telephony.data; -public class SuggestionCategory { - public String category; - public String pkg; - public boolean multiple; - public boolean exclusive; - public long exclusiveExpireDaysInMillis; +/** + * The qualified networks service call back interface + * @hide + */ +oneway interface IQualifiedNetworksServiceCallback +{ + void onQualifiedNetworkTypesChanged(int apnType, in int[] qualifiedNetworkTypesList); } diff --git a/telephony/java/android/telephony/data/QualifiedNetworksService.java b/telephony/java/android/telephony/data/QualifiedNetworksService.java new file mode 100644 index 000000000000..bb89f193e03a --- /dev/null +++ b/telephony/java/android/telephony/data/QualifiedNetworksService.java @@ -0,0 +1,286 @@ +/* + * Copyright 2018 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.telephony.data; + +import android.annotation.SystemApi; +import android.app.Service; +import android.content.Intent; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.IBinder; +import android.os.Looper; +import android.os.Message; +import android.os.RemoteException; +import android.telephony.AccessNetworkConstants.AccessNetworkType; +import android.telephony.Rlog; +import android.telephony.data.ApnSetting.ApnType; +import android.util.SparseArray; + +import com.android.internal.annotations.VisibleForTesting; + +/** + * Base class of the qualified networks service. Services that extend QualifiedNetworksService must + * register the service in their AndroidManifest to be detected by the framework. They must be + * protected by the permission "android.permission.BIND_TELEPHONY_QUALIFIED_NETWORKS_SERVICE". + * The qualified networks service definition in the manifest must follow the following format: + * ... + * <service android:name=".xxxQualifiedNetworksService" + * android:permission="android.permission.BIND_TELEPHONY_QUALIFIED_NETWORKS_SERVICE" > + * <intent-filter> + * <action android:name="android.telephony.data.QualifiedNetworksService" /> + * </intent-filter> + * </service> + * @hide + */ +@SystemApi +public abstract class QualifiedNetworksService extends Service { + private static final String TAG = QualifiedNetworksService.class.getSimpleName(); + + public static final String QUALIFIED_NETWORKS_SERVICE_INTERFACE = + "android.telephony.data.QualifiedNetworksService"; + + private static final int QNS_CREATE_NETWORK_AVAILABILITY_UPDATER = 1; + private static final int QNS_REMOVE_NETWORK_AVAILABILITY_UPDATER = 2; + private static final int QNS_REMOVE_ALL_NETWORK_AVAILABILITY_UPDATERS = 3; + private static final int QNS_UPDATE_QUALIFIED_NETWORKS = 4; + + private final HandlerThread mHandlerThread; + + private final QualifiedNetworksServiceHandler mHandler; + + private final SparseArray<NetworkAvailabilityUpdater> mUpdaters = new SparseArray<>(); + + /** @hide */ + @VisibleForTesting + public final IQualifiedNetworksServiceWrapper mBinder = new IQualifiedNetworksServiceWrapper(); + + /** + * The abstract class of the network availability updater implementation. The vendor qualified + * network service must extend this class to report the available networks for data + * connection setup. Note that each instance of network availability updater is associated with + * one physical SIM slot. + */ + public abstract class NetworkAvailabilityUpdater implements AutoCloseable { + private final int mSlotIndex; + + private IQualifiedNetworksServiceCallback mCallback; + + /** + * Qualified networks for each APN type. Key is the {@link ApnType}, value is the array + * of available networks. + */ + private SparseArray<int[]> mQualifiedNetworkTypesList = new SparseArray<>(); + + /** + * Constructor + * @param slotIndex SIM slot index the network availability updater associated with. + */ + public NetworkAvailabilityUpdater(int slotIndex) { + mSlotIndex = slotIndex; + } + + /** + * @return SIM slot index the network availability updater associated with. + */ + public final int getSlotIndex() { + return mSlotIndex; + } + + private void registerForQualifiedNetworkTypesChanged( + IQualifiedNetworksServiceCallback callback) { + mCallback = callback; + + // Force sending the qualified networks upon registered. + if (mCallback != null) { + for (int i = 0; i < mQualifiedNetworkTypesList.size(); i++) { + try { + mCallback.onQualifiedNetworkTypesChanged( + mQualifiedNetworkTypesList.keyAt(i), + mQualifiedNetworkTypesList.valueAt(i)); + } catch (RemoteException e) { + loge("Failed to call onQualifiedNetworksChanged. " + e); + } + } + } + } + + /** + * Update the qualified networks list. Network availability updater must invoke this method + * whenever the qualified networks changes. If this method is never invoked for certain + * APN type, then frameworks will always use the default (i.e. cellular) data and network + * service. + * + * @param apnType APN type of the qualified networks + * @param qualifiedNetworkTypes List of network types which are qualified for data + * connection setup for {@link @apnType} in the preferred order. Each element in the array + * is a {@link AccessNetworkType}. An empty list or null indicates no networks are qualified + * for data setup. + */ + public final void updateQualifiedNetworkTypes(@ApnType int apnType, + int[] qualifiedNetworkTypes) { + mHandler.obtainMessage(QNS_UPDATE_QUALIFIED_NETWORKS, mSlotIndex, apnType, + qualifiedNetworkTypes).sendToTarget(); + } + + private void onUpdateQualifiedNetworkTypes(@ApnType int apnType, + int[] qualifiedNetworkTypes) { + mQualifiedNetworkTypesList.put(apnType, qualifiedNetworkTypes); + if (mCallback != null) { + try { + mCallback.onQualifiedNetworkTypesChanged(apnType, qualifiedNetworkTypes); + } catch (RemoteException e) { + loge("Failed to call onQualifiedNetworksChanged. " + e); + } + } + } + + /** + * Called when the qualified networks updater is removed. The extended class should + * implement this method to perform clean up works. + */ + @Override + public abstract void close(); + } + + private class QualifiedNetworksServiceHandler extends Handler { + QualifiedNetworksServiceHandler(Looper looper) { + super(looper); + } + + @Override + public void handleMessage(Message message) { + IQualifiedNetworksServiceCallback callback; + final int slotIndex = message.arg1; + NetworkAvailabilityUpdater updater = mUpdaters.get(slotIndex); + + switch (message.what) { + case QNS_CREATE_NETWORK_AVAILABILITY_UPDATER: + if (mUpdaters.get(slotIndex) != null) { + loge("Network availability updater for slot " + slotIndex + + " already existed."); + return; + } + + updater = createNetworkAvailabilityUpdater(slotIndex); + if (updater != null) { + mUpdaters.put(slotIndex, updater); + + callback = (IQualifiedNetworksServiceCallback) message.obj; + updater.registerForQualifiedNetworkTypesChanged(callback); + } else { + loge("Failed to create network availability updater. slot index = " + + slotIndex); + } + break; + + case QNS_REMOVE_NETWORK_AVAILABILITY_UPDATER: + if (updater != null) { + updater.close(); + mUpdaters.remove(slotIndex); + } + break; + + case QNS_REMOVE_ALL_NETWORK_AVAILABILITY_UPDATERS: + for (int i = 0; i < mUpdaters.size(); i++) { + updater = mUpdaters.get(i); + if (updater != null) { + updater.close(); + } + } + mUpdaters.clear(); + break; + + case QNS_UPDATE_QUALIFIED_NETWORKS: + if (updater == null) break; + updater.onUpdateQualifiedNetworkTypes(message.arg2, (int[]) message.obj); + break; + } + } + } + + /** + * Default constructor. + */ + public QualifiedNetworksService() { + mHandlerThread = new HandlerThread(TAG); + mHandlerThread.start(); + + mHandler = new QualifiedNetworksServiceHandler(mHandlerThread.getLooper()); + log("Qualified networks service created"); + } + + /** + * Create the instance of {@link NetworkAvailabilityUpdater}. Vendor qualified network service + * must override this method to facilitate the creation of {@link NetworkAvailabilityUpdater} + * instances. The system will call this method after binding the qualified networks service for + * each active SIM slot index. + * + * @param slotIndex SIM slot index the qualified networks service associated with. + * @return Qualified networks service instance + */ + public abstract NetworkAvailabilityUpdater createNetworkAvailabilityUpdater(int slotIndex); + + /** @hide */ + @Override + public IBinder onBind(Intent intent) { + if (intent == null || !QUALIFIED_NETWORKS_SERVICE_INTERFACE.equals(intent.getAction())) { + loge("Unexpected intent " + intent); + return null; + } + return mBinder; + } + + /** @hide */ + @Override + public boolean onUnbind(Intent intent) { + mHandler.obtainMessage(QNS_REMOVE_ALL_NETWORK_AVAILABILITY_UPDATERS).sendToTarget(); + return false; + } + + /** @hide */ + @Override + public void onDestroy() { + mHandlerThread.quit(); + } + + /** + * A wrapper around IQualifiedNetworksService that forwards calls to implementations of + * {@link QualifiedNetworksService}. + */ + private class IQualifiedNetworksServiceWrapper extends IQualifiedNetworksService.Stub { + @Override + public void createNetworkAvailabilityUpdater(int slotIndex, + IQualifiedNetworksServiceCallback callback) { + mHandler.obtainMessage(QNS_CREATE_NETWORK_AVAILABILITY_UPDATER, slotIndex, 0, + callback).sendToTarget(); + } + + @Override + public void removeNetworkAvailabilityUpdater(int slotIndex) { + mHandler.obtainMessage(QNS_REMOVE_NETWORK_AVAILABILITY_UPDATER, slotIndex, 0) + .sendToTarget(); + } + } + + private void log(String s) { + Rlog.d(TAG, s); + } + + private void loge(String s) { + Rlog.e(TAG, s); + } +} diff --git a/telephony/java/android/telephony/euicc/DownloadableSubscription.java b/telephony/java/android/telephony/euicc/DownloadableSubscription.java index edf3b08fbdd2..f1d5bdde92a4 100644 --- a/telephony/java/android/telephony/euicc/DownloadableSubscription.java +++ b/telephony/java/android/telephony/euicc/DownloadableSubscription.java @@ -17,6 +17,7 @@ package android.telephony.euicc; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.app.PendingIntent; import android.os.Parcel; import android.os.Parcelable; @@ -59,6 +60,7 @@ public final class DownloadableSubscription implements Parcelable { */ @Nullable @Deprecated + @UnsupportedAppUsage public final String encodedActivationCode; @Nullable private String confirmationCode; @@ -188,6 +190,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated + @UnsupportedAppUsage public void setCarrierName(String carrierName) { this.carrierName = carrierName; } @@ -234,6 +237,7 @@ public final class DownloadableSubscription implements Parcelable { * @deprecated - Do not use. */ @Deprecated + @UnsupportedAppUsage public void setAccessRules(UiccAccessRule[] accessRules) { this.accessRules = Arrays.asList(accessRules); } diff --git a/telephony/java/android/telephony/euicc/EuiccInfo.java b/telephony/java/android/telephony/euicc/EuiccInfo.java index a4adf0591a00..28855b2e1794 100644 --- a/telephony/java/android/telephony/euicc/EuiccInfo.java +++ b/telephony/java/android/telephony/euicc/EuiccInfo.java @@ -16,6 +16,7 @@ package android.telephony.euicc; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -43,6 +44,7 @@ public final class EuiccInfo implements Parcelable { }; @Nullable + @UnsupportedAppUsage private final String osVersion; /** diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java index 171780239edf..98ce33368ca6 100644 --- a/telephony/java/android/telephony/gsm/GsmCellLocation.java +++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java @@ -16,6 +16,7 @@ package android.telephony.gsm; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.telephony.CellLocation; @@ -91,6 +92,7 @@ public class GsmCellLocation extends CellLocation { * Set the primary scrambling code. * @hide */ + @UnsupportedAppUsage public void setPsc(int psc) { mPsc = psc; } diff --git a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java index 283112793d87..34b888425fdb 100644 --- a/telephony/java/android/telephony/ims/ImsCallForwardInfo.java +++ b/telephony/java/android/telephony/ims/ImsCallForwardInfo.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -30,30 +31,37 @@ public final class ImsCallForwardInfo implements Parcelable { // Refer to ImsUtInterface#CDIV_CF_XXX /** @hide */ // TODO: Make private, do not modify this field directly, use getter. + @UnsupportedAppUsage public int mCondition; // 0: disabled, 1: enabled /** @hide */ // TODO: Make private, do not modify this field directly, use getter. + @UnsupportedAppUsage public int mStatus; // 0x91: International, 0x81: Unknown /** @hide */ // TODO: Make private, do not modify this field directly, use getter. + @UnsupportedAppUsage public int mToA; // Service class /** @hide */ // TODO: Make private, do not modify this field directly, use getter. + @UnsupportedAppUsage public int mServiceClass; // Number (it will not include the "sip" or "tel" URI scheme) /** @hide */ // TODO: Make private, do not modify this field directly, use getter. + @UnsupportedAppUsage public String mNumber; // No reply timer for CF /** @hide */ // TODO: Make private, do not modify this field directly, use getter. + @UnsupportedAppUsage public int mTimeSeconds; /** @hide */ // TODO: Will be removed in the future, use public constructor instead. + @UnsupportedAppUsage public ImsCallForwardInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsCallProfile.java b/telephony/java/android/telephony/ims/ImsCallProfile.java index 350dfe3a8d08..f0d3c8956962 100644 --- a/telephony/java/android/telephony/ims/ImsCallProfile.java +++ b/telephony/java/android/telephony/ims/ImsCallProfile.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -260,8 +261,10 @@ public final class ImsCallProfile implements Parcelable { /** @hide */ public int mServiceType; /** @hide */ + @UnsupportedAppUsage public int mCallType; /** @hide */ + @UnsupportedAppUsage public int mRestrictCause = CALL_RESTRICT_CAUSE_NONE; /** @@ -287,8 +290,10 @@ public final class ImsCallProfile implements Parcelable { * a {@link android.os.Binder}. */ /** @hide */ + @UnsupportedAppUsage public Bundle mCallExtras; /** @hide */ + @UnsupportedAppUsage public ImsStreamMediaProfile mMediaProfile; /** @hide */ @@ -568,6 +573,7 @@ public final class ImsCallProfile implements Parcelable { * See {@link #presentationToOir(int)}. * @hide */ + @UnsupportedAppUsage public static int presentationToOIR(int presentation) { switch (presentation) { case PhoneConstants.PRESENTATION_RESTRICTED: diff --git a/telephony/java/android/telephony/ims/ImsExternalCallState.java b/telephony/java/android/telephony/ims/ImsExternalCallState.java index e158fa84e34e..8d18ae8ed281 100644 --- a/telephony/java/android/telephony/ims/ImsExternalCallState.java +++ b/telephony/java/android/telephony/ims/ImsExternalCallState.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; @@ -58,6 +59,7 @@ public final class ImsExternalCallState implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public ImsExternalCallState(int callId, Uri address, boolean isPullable, int callState, int callType, boolean isCallheld) { mCallId = callId; diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java index 81f2fe7f4ed8..c9766668ae84 100644 --- a/telephony/java/android/telephony/ims/ImsReasonInfo.java +++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -182,6 +183,15 @@ public final class ImsReasonInfo implements Parcelable { public static final int CODE_EMERGENCY_PERM_FAILURE = 364; /** + * Call failure code during hangup/reject if user marked the call as unwanted. + * + * Android Telephony will receive information whether ROBO call feature is supported by the + * network from modem and propagate the same to AOSP as new ImsCallProfile members. OEMs can + * check this information and provide an option to the user to mark the call as unwanted. + */ + public static final int CODE_SIP_USER_MARKED_UNWANTED = 365; + + /** * MEDIA (IMS -> Telephony) */ // Media resource initialization failed @@ -400,6 +410,12 @@ public final class ImsReasonInfo implements Parcelable { public static final int CODE_UNOBTAINABLE_NUMBER = 1515; /** + * Call failed because WiFi call could not complete and circuit switch silent redial + * is not allowed while roaming on another network. + */ + public static final int CODE_NO_CSFB_IN_CS_ROAM = 1516; + + /** * The rejection cause is not known. * <p> * Used with implicit call rejection. @@ -581,12 +597,15 @@ public final class ImsReasonInfo implements Parcelable { // For main reason code /** @hide */ + @UnsupportedAppUsage public int mCode; // For the extra code value; it depends on the code value. /** @hide */ + @UnsupportedAppUsage public int mExtraCode; // For the additional message of the reason info. /** @hide */ + @UnsupportedAppUsage public String mExtraMessage; /** @hide */ @@ -603,6 +622,7 @@ public final class ImsReasonInfo implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public ImsReasonInfo(int code, int extraCode) { mCode = code; mExtraCode = extraCode; diff --git a/telephony/java/android/telephony/ims/ImsSsInfo.java b/telephony/java/android/telephony/ims/ImsSsInfo.java index e924a2521617..3a784c163afb 100644 --- a/telephony/java/android/telephony/ims/ImsSsInfo.java +++ b/telephony/java/android/telephony/ims/ImsSsInfo.java @@ -18,6 +18,7 @@ package android.telephony.ims; import android.annotation.IntDef; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -65,15 +66,18 @@ public final class ImsSsInfo implements Parcelable { // 0: disabled, 1: enabled /** @hide */ // TODO: Make private, do not modify this field directly, use getter! + @UnsupportedAppUsage public int mStatus; /** @hide */ // TODO: Make private, do not modify this field directly, use getter! + @UnsupportedAppUsage public String mIcbNum; /** @hide */ public int mProvisionStatus = SERVICE_PROVISIONING_UNKNOWN; /**@hide*/ // TODO: Remove! Do not use this constructor, instead use public version. + @UnsupportedAppUsage public ImsSsInfo() { } diff --git a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java index 137106a011b0..52d72b5847b5 100644 --- a/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java +++ b/telephony/java/android/telephony/ims/ImsStreamMediaProfile.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -82,13 +83,16 @@ public final class ImsStreamMediaProfile implements Parcelable { // Audio related information /** @hide */ + @UnsupportedAppUsage public int mAudioQuality; /** @hide */ + @UnsupportedAppUsage public int mAudioDirection; // Video related information /** @hide */ public int mVideoQuality; /** @hide */ + @UnsupportedAppUsage public int mVideoDirection; // Rtt related information /** @hide */ @@ -156,6 +160,7 @@ public final class ImsStreamMediaProfile implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public ImsStreamMediaProfile() { mAudioQuality = AUDIO_QUALITY_NONE; mAudioDirection = DIRECTION_SEND_RECEIVE; diff --git a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java index b4f60b952a00..17724018ee57 100644 --- a/telephony/java/android/telephony/ims/ImsVideoCallProvider.java +++ b/telephony/java/android/telephony/ims/ImsVideoCallProvider.java @@ -17,6 +17,7 @@ package android.telephony.ims; import android.annotation.SystemApi; +import android.annotation.UnsupportedAppUsage; import android.net.Uri; import android.os.Handler; import android.os.Looper; @@ -179,6 +180,7 @@ public abstract class ImsVideoCallProvider { * Returns binder object which can be used across IPC methods. * @hide */ + @UnsupportedAppUsage public final IImsVideoCallProvider getInterface() { return mBinder; } diff --git a/telephony/java/android/telephony/ims/compat/ImsService.java b/telephony/java/android/telephony/ims/compat/ImsService.java index cf1efb34bd0a..2750e51fc3d4 100644 --- a/telephony/java/android/telephony/ims/compat/ImsService.java +++ b/telephony/java/android/telephony/ims/compat/ImsService.java @@ -17,6 +17,7 @@ package android.telephony.ims.compat; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.app.Service; import android.content.Intent; import android.os.IBinder; @@ -86,6 +87,7 @@ public class ImsService extends Service { /** * @hide */ + @UnsupportedAppUsage protected final IBinder mImsServiceController = new IImsServiceController.Stub() { @Override diff --git a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java index 0a12cae26af4..e8fcac19f675 100644 --- a/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/ImsFeature.java @@ -17,6 +17,7 @@ package android.telephony.ims.compat.feature; import android.annotation.IntDef; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.os.IInterface; @@ -104,10 +105,12 @@ public abstract class ImsFeature { mSlotId = slotId; } + @UnsupportedAppUsage public int getFeatureState() { return mState; } + @UnsupportedAppUsage protected final void setFeatureState(@ImsState int state) { if (mState != state) { mState = state; diff --git a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java index d3d17f4fb198..40ea208e4578 100644 --- a/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java +++ b/telephony/java/android/telephony/ims/compat/feature/MMTelFeature.java @@ -20,6 +20,7 @@ import android.app.PendingIntent; import android.os.Message; import android.os.RemoteException; +import android.annotation.UnsupportedAppUsage; import android.telephony.ims.ImsCallProfile; import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsCallSessionListener; diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java index e5ed82572873..23de2fd3c32c 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java @@ -28,6 +28,7 @@ import android.telephony.ims.aidl.IImsCallSessionListener; import com.android.ims.internal.IImsCallSession; import com.android.ims.internal.IImsVideoCallProvider; +import android.annotation.UnsupportedAppUsage; import android.telephony.ims.ImsCallSession; /** diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java index 2c325ba8e134..e55c3d0823c2 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsConfigImplBase.java @@ -16,6 +16,7 @@ package android.telephony.ims.compat.stub; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.os.RemoteException; @@ -58,6 +59,7 @@ public class ImsConfigImplBase { ImsConfigStub mImsConfigStub; + @UnsupportedAppUsage public ImsConfigImplBase(Context context) { mImsConfigStub = new ImsConfigStub(this, context); } @@ -162,6 +164,7 @@ public class ImsConfigImplBase { public void setVideoQuality(int quality, ImsConfigListener listener) throws RemoteException { } + @UnsupportedAppUsage public IImsConfig getIImsConfig() { return mImsConfigStub; } /** diff --git a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java index b2aa08015d10..976c2be1a3fe 100644 --- a/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java +++ b/telephony/java/android/telephony/ims/compat/stub/ImsUtListenerImplBase.java @@ -19,6 +19,7 @@ package android.telephony.ims.compat.stub; import android.os.Bundle; import android.os.RemoteException; +import android.annotation.UnsupportedAppUsage; import android.telephony.ims.ImsCallForwardInfo; import android.telephony.ims.ImsReasonInfo; import android.telephony.ims.ImsSsData; diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java index f646028b4eb3..0abe45ce448c 100644 --- a/telephony/java/com/android/internal/telephony/CallerInfo.java +++ b/telephony/java/com/android/internal/telephony/CallerInfo.java @@ -16,6 +16,7 @@ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; import android.content.ContentResolver; import android.content.Context; import android.database.Cursor; @@ -83,7 +84,9 @@ public class CallerInfo { * field here, NOT name. We're NOT always guaranteed to have a name * for a connection, but the number should be displayable. */ + @UnsupportedAppUsage public String name; + @UnsupportedAppUsage public String phoneNumber; public String normalizedNumber; public String geoDescription; @@ -95,12 +98,15 @@ public class CallerInfo { public String phoneLabel; /* Split up the phoneLabel into number type and label name */ + @UnsupportedAppUsage public int numberType; + @UnsupportedAppUsage public String numberLabel; public int photoResource; // Contact ID, which will be 0 if a contact comes from the corp CP2. + @UnsupportedAppUsage public long contactIdOrZero; public boolean needUpdate; public Uri contactRefUri; @@ -155,6 +161,7 @@ public class CallerInfo { private boolean mIsEmergency; private boolean mIsVoiceMail; + @UnsupportedAppUsage public CallerInfo() { // TODO: Move all the basic initialization here? mIsEmergency = false; @@ -300,6 +307,7 @@ public class CallerInfo { * @return the CallerInfo which contains the caller id for the given * number. The returned CallerInfo is null if no number is supplied. */ + @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, Uri contactRef) { CallerInfo info = null; ContentResolver cr = CallerInfoAsyncQuery.getCurrentProfileContentResolver(context); @@ -324,6 +332,7 @@ public class CallerInfo { * a matching number is not found, then a generic caller info is returned, * with all relevant fields empty or null. */ + @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, String number) { if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number..."); @@ -342,6 +351,7 @@ public class CallerInfo { * a matching number is not found, then a generic caller info is returned, * with all relevant fields empty or null. */ + @UnsupportedAppUsage public static CallerInfo getCallerInfo(Context context, String number, int subId) { if (TextUtils.isEmpty(number)) { diff --git a/telephony/java/com/android/internal/telephony/EncodeException.java b/telephony/java/com/android/internal/telephony/EncodeException.java index 0436ba0a070b..4e3fac1a2aea 100644 --- a/telephony/java/com/android/internal/telephony/EncodeException.java +++ b/telephony/java/com/android/internal/telephony/EncodeException.java @@ -16,6 +16,8 @@ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; + /** * {@hide} */ @@ -24,10 +26,12 @@ public class EncodeException extends Exception { super(); } + @UnsupportedAppUsage public EncodeException(String s) { super(s); } + @UnsupportedAppUsage public EncodeException(char c) { super("Unencodable char: '" + c + "'"); } diff --git a/telephony/java/com/android/internal/telephony/GsmAlphabet.java b/telephony/java/com/android/internal/telephony/GsmAlphabet.java index 478516952c1a..69ff329e2d07 100644 --- a/telephony/java/com/android/internal/telephony/GsmAlphabet.java +++ b/telephony/java/com/android/internal/telephony/GsmAlphabet.java @@ -20,6 +20,7 @@ import android.content.res.Resources; import android.text.TextUtils; import android.util.SparseIntArray; +import android.annotation.UnsupportedAppUsage; import android.telephony.Rlog; import java.nio.ByteBuffer; @@ -84,6 +85,7 @@ public class GsmAlphabet { /** *The number of SMS's required to encode the text. */ + @UnsupportedAppUsage public int msgCount; /** @@ -92,28 +94,33 @@ public class GsmAlphabet { * septets for the standard ASCII and GSM encodings, and 16 * bits for Unicode. */ + @UnsupportedAppUsage public int codeUnitCount; /** * How many code units are still available without spilling * into an additional message. */ + @UnsupportedAppUsage public int codeUnitsRemaining; /** * The encoding code unit size (specified using * android.telephony.SmsMessage ENCODING_*). */ + @UnsupportedAppUsage public int codeUnitSize; /** * The GSM national language table to use, or 0 for the default 7-bit alphabet. */ + @UnsupportedAppUsage public int languageTable; /** * The GSM national language shift table to use, or 0 for the default 7-bit extension table. */ + @UnsupportedAppUsage public int languageShiftTable; @Override @@ -138,6 +145,7 @@ public class GsmAlphabet { * @param c the character to convert * @return the GSM 7 bit table index for the specified character */ + @UnsupportedAppUsage public static int charToGsm(char c) { try { @@ -160,6 +168,7 @@ public class GsmAlphabet { * @throws EncodeException encode error when throwException is true * @return the GSM 7 bit table index for the specified character */ + @UnsupportedAppUsage public static int charToGsm(char c, boolean throwException) throws EncodeException { int ret; @@ -215,6 +224,7 @@ public class GsmAlphabet { * @param gsmChar the GSM 7 bit table index to convert * @return the decoded character */ + @UnsupportedAppUsage public static char gsmToChar(int gsmChar) { if (gsmChar >= 0 && gsmChar < 128) { @@ -293,6 +303,7 @@ public class GsmAlphabet { * @return Byte array containing header and encoded data. * @throws EncodeException if String is too large to encode */ + @UnsupportedAppUsage public static byte[] stringToGsm7BitPackedWithHeader(String data, byte[] header, int languageTable, int languageShiftTable) throws EncodeException { @@ -327,6 +338,7 @@ public class GsmAlphabet { * @return the encoded string * @throws EncodeException if String is too large to encode */ + @UnsupportedAppUsage public static byte[] stringToGsm7BitPacked(String data) throws EncodeException { return stringToGsm7BitPacked(data, 0, true, 0, 0); @@ -377,6 +389,7 @@ public class GsmAlphabet { * * @throws EncodeException if String is too large to encode */ + @UnsupportedAppUsage public static byte[] stringToGsm7BitPacked(String data, int startingSeptetOffset, boolean throwException, int languageTable, int languageShiftTable) throws EncodeException { @@ -428,6 +441,7 @@ public class GsmAlphabet { * (septet index * 7) * @param value the 7-bit character to store */ + @UnsupportedAppUsage private static void packSmsChar(byte[] packedChars, int bitOffset, int value) { int byteOffset = bitOffset / 8; @@ -451,6 +465,7 @@ public class GsmAlphabet { * @param lengthSeptets string length in septets, not bytes * @return String representation or null on decoding exception */ + @UnsupportedAppUsage public static String gsm7BitPackedToString(byte[] pdu, int offset, int lengthSeptets) { return gsm7BitPackedToString(pdu, offset, lengthSeptets, 0, 0, 0); @@ -472,6 +487,7 @@ public class GsmAlphabet { * GSM extension table * @return String representation or null on decoding exception */ + @UnsupportedAppUsage public static String gsm7BitPackedToString(byte[] pdu, int offset, int lengthSeptets, int numPaddingBits, int languageTable, int shiftTable) { StringBuilder ret = new StringBuilder(lengthSeptets); @@ -555,6 +571,7 @@ public class GsmAlphabet { * @param length the number of bytes to decode * @return the decoded string */ + @UnsupportedAppUsage public static String gsm8BitUnpackedToString(byte[] data, int offset, int length) { return gsm8BitUnpackedToString(data, offset, length, ""); @@ -570,6 +587,7 @@ public class GsmAlphabet { * Additionally, in some country(ex. Korea), there are non-ASCII or MBCS characters. * If a character set is given, characters in data are treat as MBCS. */ + @UnsupportedAppUsage public static String gsm8BitUnpackedToString(byte[] data, int offset, int length, String characterset) { boolean isMbcs = false; @@ -649,6 +667,7 @@ public class GsmAlphabet { * @param s the string to encode * @return the 8-bit GSM encoded byte array for the string */ + @UnsupportedAppUsage public static byte[] stringToGsm8BitPacked(String s) { byte[] ret; @@ -736,6 +755,7 @@ public class GsmAlphabet { * @return the number of septets for this character * @throws EncodeException the character can't be encoded and throwsException is true */ + @UnsupportedAppUsage public static int countGsmSeptets(char c, boolean throwsException) throws EncodeException { if (sCharsToGsmTables[0].get(c, -1) != -1) { @@ -978,6 +998,7 @@ public class GsmAlphabet { * @return index of first character that won't fit, or the length * of the entire string if everything fits */ + @UnsupportedAppUsage public static int findGsmSeptetLimitIndex(String s, int start, int limit, int langTable, int langShiftTable) { int accumulator = 0; @@ -1076,18 +1097,23 @@ public class GsmAlphabet { } /** Reverse mapping from Unicode characters to indexes into language tables. */ + @UnsupportedAppUsage private static final SparseIntArray[] sCharsToGsmTables; /** Reverse mapping from Unicode characters to indexes into language shift tables. */ + @UnsupportedAppUsage private static final SparseIntArray[] sCharsToShiftTables; /** OEM configured list of enabled national language single shift tables for encoding. */ + @UnsupportedAppUsage private static int[] sEnabledSingleShiftTables; /** OEM configured list of enabled national language locking shift tables for encoding. */ + @UnsupportedAppUsage private static int[] sEnabledLockingShiftTables; /** Highest language code to include in array of single shift counters. */ + @UnsupportedAppUsage private static int sHighestEnabledSingleShiftCode; /** Flag to bypass check for country-specific overlays (for test cases only). */ @@ -1098,9 +1124,13 @@ public class GsmAlphabet { * the single shift tables that it can be paired with. */ private static class LanguagePairCount { + @UnsupportedAppUsage final int languageCode; + @UnsupportedAppUsage final int[] septetCounts; + @UnsupportedAppUsage final int[] unencodableCounts; + @UnsupportedAppUsage LanguagePairCount(int code) { this.languageCode = code; int maxSingleShiftCode = sHighestEnabledSingleShiftCode; @@ -1130,6 +1160,7 @@ public class GsmAlphabet { * GSM default 7 bit alphabet plus national language locking shift character tables. * Comment lines above strings indicate the lower four bits of the table position. */ + @UnsupportedAppUsage private static final String[] sLanguageTables = { /* 3GPP TS 23.038 V9.1.1 section 6.2.1 - GSM 7 bit Default Alphabet 01.....23.....4.....5.....6.....7.....8.....9.....A.B.....C.....D.E.....F.....0.....1 */ @@ -1323,6 +1354,7 @@ public class GsmAlphabet { /** * GSM default extension table plus national language single shift character tables. */ + @UnsupportedAppUsage private static final String[] sLanguageShiftTables = new String[]{ /* 6.2.1.1 GSM 7 bit Default Alphabet Extension Table 0123456789A.....BCDEF0123456789ABCDEF0123456789ABCDEF.0123456789ABCDEF0123456789ABCDEF */ diff --git a/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl b/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl index 0d315e5e563e..1ebb6976b45e 100644 --- a/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl +++ b/telephony/java/com/android/internal/telephony/IPhoneStateListener.aidl @@ -21,6 +21,7 @@ import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.CellInfo; import android.telephony.DataConnectionRealTimeInfo; +import android.telephony.PhoneCapability; import android.telephony.PhysicalChannelConfig; import android.telephony.PreciseCallState; import android.telephony.PreciseDataConnectionState; @@ -50,5 +51,6 @@ oneway interface IPhoneStateListener { void onOemHookRawEvent(in byte[] rawData); void onCarrierNetworkChange(in boolean active); void onUserMobileDataStateChanged(in boolean enabled); + void onPhoneCapabilityChanged(in PhoneCapability capability); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 5cf3dff1cad1..b4f3487a5f63 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -1520,6 +1520,22 @@ interface ITelephony { void setRadioIndicationUpdateMode(int subId, int filters, int mode); /** + * Returns whether mobile data roaming is enabled on the subscription with id {@code subId}. + * + * @param subId the subscription id + * @return {@code true} if the data roaming is enabled on this subscription. + */ + boolean isDataRoamingEnabled(int subId); + + /** + * Enables/Disables the data roaming on the subscription with id {@code subId}. + * + * @param subId the subscription id + * @param isEnabled {@code true} to enable mobile data roaming, otherwise disable it. + */ + void setDataRoamingEnabled(int subId, boolean isEnabled); + + /** * A test API to override carrier information including mccmnc, imsi, iccid, gid1, gid2, * plmn and spn. This would be handy for, eg, forcing a particular carrier id, carrier's config * (also any country or carrier overlays) to be loaded when using a test SIM with a call box. @@ -1537,4 +1553,10 @@ interface ITelephony { * @hide */ void refreshUiccProfile(int subId); + + /** + * How many modems can have simultaneous data connections. + * @hide + */ + int getNumberOfModemsWithSimultaneousDataConnections(int subId, String callingPackage); } diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl index 0127db97963e..e0e1a7b87916 100644 --- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl @@ -21,6 +21,7 @@ import android.net.LinkProperties; import android.net.NetworkCapabilities; import android.os.Bundle; import android.telephony.CellInfo; +import android.telephony.PhoneCapability; import android.telephony.PhysicalChannelConfig; import android.telephony.ServiceState; import android.telephony.SignalStrength; @@ -74,4 +75,5 @@ interface ITelephonyRegistry { void notifySubscriptionInfoChanged(); void notifyCarrierNetworkChange(in boolean active); void notifyUserMobileDataStateChangedForPhoneId(in int phoneId, in int subId, in boolean state); + void notifyPhoneCapabilityChanged(in PhoneCapability capability); } diff --git a/telephony/java/com/android/internal/telephony/OperatorInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java index a29d7c161990..d0245a0a07b4 100644 --- a/telephony/java/com/android/internal/telephony/OperatorInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -16,6 +16,7 @@ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -26,37 +27,48 @@ public class OperatorInfo implements Parcelable { public enum State { UNKNOWN, AVAILABLE, + @UnsupportedAppUsage CURRENT, + @UnsupportedAppUsage FORBIDDEN; } + @UnsupportedAppUsage private String mOperatorAlphaLong; + @UnsupportedAppUsage private String mOperatorAlphaShort; + @UnsupportedAppUsage private String mOperatorNumeric; + @UnsupportedAppUsage private State mState = State.UNKNOWN; + @UnsupportedAppUsage public String getOperatorAlphaLong() { return mOperatorAlphaLong; } + @UnsupportedAppUsage public String getOperatorAlphaShort() { return mOperatorAlphaShort; } + @UnsupportedAppUsage public String getOperatorNumeric() { return mOperatorNumeric; } + @UnsupportedAppUsage public State getState() { return mState; } + @UnsupportedAppUsage OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -70,6 +82,7 @@ public class OperatorInfo implements Parcelable { } + @UnsupportedAppUsage public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, @@ -78,6 +91,7 @@ public class OperatorInfo implements Parcelable { operatorNumeric, rilStateToState(stateString)); } + @UnsupportedAppUsage public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric) { @@ -87,6 +101,7 @@ public class OperatorInfo implements Parcelable { /** * See state strings defined in ril.h RIL_REQUEST_QUERY_AVAILABLE_NETWORKS */ + @UnsupportedAppUsage private static State rilStateToState(String s) { if (s.equals("unknown")) { return State.UNKNOWN; @@ -140,6 +155,7 @@ public class OperatorInfo implements Parcelable { * Implement the Parcelable interface * Method to deserialize a OperatorInfo object, or an array thereof. */ + @UnsupportedAppUsage public static final Creator<OperatorInfo> CREATOR = new Creator<OperatorInfo>() { @Override diff --git a/telephony/java/com/android/internal/telephony/SmsAddress.java b/telephony/java/com/android/internal/telephony/SmsAddress.java index b3892cb0b342..2a8de8c8502e 100644 --- a/telephony/java/com/android/internal/telephony/SmsAddress.java +++ b/telephony/java/com/android/internal/telephony/SmsAddress.java @@ -16,6 +16,8 @@ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; + public abstract class SmsAddress { // From TS 23.040 9.1.2.5 and TS 24.008 table 10.5.118 // and C.S0005-D table 2.7.1.3.2.4-2 @@ -29,6 +31,7 @@ public abstract class SmsAddress { public int ton; public String address; + @UnsupportedAppUsage public byte[] origBytes; /** diff --git a/telephony/java/com/android/internal/telephony/SmsConstants.java b/telephony/java/com/android/internal/telephony/SmsConstants.java index 0aba468b5e1f..19f52b0ef429 100644 --- a/telephony/java/com/android/internal/telephony/SmsConstants.java +++ b/telephony/java/com/android/internal/telephony/SmsConstants.java @@ -15,6 +15,8 @@ */ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; + /** * SMS Constants and must be the same as the corresponding * deprecated version in SmsMessage. @@ -58,10 +60,15 @@ public class SmsConstants { * See TS 23.038. */ public enum MessageClass{ + @UnsupportedAppUsage UNKNOWN, + @UnsupportedAppUsage CLASS_0, + @UnsupportedAppUsage CLASS_1, + @UnsupportedAppUsage CLASS_2, + @UnsupportedAppUsage CLASS_3; } diff --git a/telephony/java/com/android/internal/telephony/SmsHeader.java b/telephony/java/com/android/internal/telephony/SmsHeader.java index b519b70088fb..9fe1718df6b6 100644 --- a/telephony/java/com/android/internal/telephony/SmsHeader.java +++ b/telephony/java/com/android/internal/telephony/SmsHeader.java @@ -22,6 +22,7 @@ import com.android.internal.util.HexDump; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import android.annotation.UnsupportedAppUsage; import java.util.ArrayList; /** @@ -72,14 +73,19 @@ public class SmsHeader { public static final int PORT_WAP_WSP = 9200; public static class PortAddrs { + @UnsupportedAppUsage public int destPort; + @UnsupportedAppUsage public int origPort; public boolean areEightBits; } public static class ConcatRef { + @UnsupportedAppUsage public int refNumber; + @UnsupportedAppUsage public int seqNumber; + @UnsupportedAppUsage public int msgCount; public boolean isEightBits; } @@ -98,17 +104,22 @@ public class SmsHeader { public byte[] data; } + @UnsupportedAppUsage public PortAddrs portAddrs; + @UnsupportedAppUsage public ConcatRef concatRef; public ArrayList<SpecialSmsMsg> specialSmsMsgList = new ArrayList<SpecialSmsMsg>(); public ArrayList<MiscElt> miscEltList = new ArrayList<MiscElt>(); /** 7 bit national language locking shift table, or 0 for GSM default 7 bit alphabet. */ + @UnsupportedAppUsage public int languageTable; /** 7 bit national language single shift table, or 0 for GSM default 7 bit extension table. */ + @UnsupportedAppUsage public int languageShiftTable; + @UnsupportedAppUsage public SmsHeader() {} /** @@ -117,6 +128,7 @@ public class SmsHeader { * @param data is user data header bytes * @return SmsHeader object */ + @UnsupportedAppUsage public static SmsHeader fromByteArray(byte[] data) { ByteArrayInputStream inStream = new ByteArrayInputStream(data); SmsHeader smsHeader = new SmsHeader(); @@ -198,6 +210,7 @@ public class SmsHeader { * (see TS 23.040 9.2.3.24) * @return Byte array representing the SmsHeader */ + @UnsupportedAppUsage public static byte[] toByteArray(SmsHeader smsHeader) { if ((smsHeader.portAddrs == null) && (smsHeader.concatRef == null) && diff --git a/telephony/java/com/android/internal/telephony/SmsMessageBase.java b/telephony/java/com/android/internal/telephony/SmsMessageBase.java index e5821dcd94a5..7b1ead9722b8 100644 --- a/telephony/java/com/android/internal/telephony/SmsMessageBase.java +++ b/telephony/java/com/android/internal/telephony/SmsMessageBase.java @@ -22,6 +22,7 @@ import com.android.internal.telephony.SmsHeader; import java.text.BreakIterator; import java.util.Arrays; +import android.annotation.UnsupportedAppUsage; import android.provider.Telephony; import android.telephony.SmsMessage; import android.text.Emoji; @@ -32,12 +33,15 @@ import android.text.Emoji; */ public abstract class SmsMessageBase { /** {@hide} The address of the SMSC. May be null */ + @UnsupportedAppUsage protected String mScAddress; /** {@hide} The address of the sender */ + @UnsupportedAppUsage protected SmsAddress mOriginatingAddress; /** {@hide} The message body as a string. May be null if the message isn't text */ + @UnsupportedAppUsage protected String mMessageBody; /** {@hide} */ @@ -56,23 +60,28 @@ public abstract class SmsMessageBase { protected long mScTimeMillis; /** {@hide} The raw PDU of the message */ + @UnsupportedAppUsage protected byte[] mPdu; /** {@hide} The raw bytes for the user data section of the message */ protected byte[] mUserData; /** {@hide} */ + @UnsupportedAppUsage protected SmsHeader mUserDataHeader; // "Message Waiting Indication Group" // 23.038 Section 4 /** {@hide} */ + @UnsupportedAppUsage protected boolean mIsMwi; /** {@hide} */ + @UnsupportedAppUsage protected boolean mMwiSense; /** {@hide} */ + @UnsupportedAppUsage protected boolean mMwiDontStore; /** @@ -86,11 +95,14 @@ public abstract class SmsMessageBase { protected int mIndexOnIcc = -1; /** TP-Message-Reference - Message Reference of sent message. @hide */ + @UnsupportedAppUsage public int mMessageRef; // TODO(): This class is duplicated in SmsMessage.java. Refactor accordingly. public static abstract class SubmitPduBase { + @UnsupportedAppUsage public byte[] encodedScAddress; // Null if not applicable. + @UnsupportedAppUsage public byte[] encodedMessage; @Override @@ -106,6 +118,7 @@ public abstract class SmsMessageBase { * Returns the address of the SMS service center that relayed this message * or null if there is none. */ + @UnsupportedAppUsage public String getServiceCenterAddress() { return mScAddress; } @@ -114,6 +127,7 @@ public abstract class SmsMessageBase { * Returns the originating address (sender) of this SMS message in String * form or null if unavailable */ + @UnsupportedAppUsage public String getOriginatingAddress() { if (mOriginatingAddress == null) { return null; @@ -127,6 +141,7 @@ public abstract class SmsMessageBase { * was from an email gateway. Returns null if originating address * unavailable. */ + @UnsupportedAppUsage public String getDisplayOriginatingAddress() { if (mIsEmail) { return mEmailFrom; @@ -139,6 +154,7 @@ public abstract class SmsMessageBase { * Returns the message body as a String, if it exists and is text based. * @return message body is there is one, otherwise null */ + @UnsupportedAppUsage public String getMessageBody() { return mMessageBody; } @@ -152,6 +168,7 @@ public abstract class SmsMessageBase { * Returns the message body, or email message body if this message was from * an email gateway. Returns null if message body unavailable. */ + @UnsupportedAppUsage public String getDisplayMessageBody() { if (mIsEmail) { return mEmailBody; @@ -164,6 +181,7 @@ public abstract class SmsMessageBase { * Unofficial convention of a subject line enclosed in parens empty string * if not present */ + @UnsupportedAppUsage public String getPseudoSubject() { return mPseudoSubject == null ? "" : mPseudoSubject; } @@ -171,6 +189,7 @@ public abstract class SmsMessageBase { /** * Returns the service centre timestamp in currentTimeMillis() format */ + @UnsupportedAppUsage public long getTimestampMillis() { return mScTimeMillis; } @@ -204,12 +223,14 @@ public abstract class SmsMessageBase { /** * Get protocol identifier. */ + @UnsupportedAppUsage public abstract int getProtocolIdentifier(); /** * See TS 23.040 9.2.3.9 returns true if this is a "replace short message" * SMS */ + @UnsupportedAppUsage public abstract boolean isReplace(); /** @@ -242,6 +263,7 @@ public abstract class SmsMessageBase { * returns the user data section minus the user data header if one was * present. */ + @UnsupportedAppUsage public byte[] getUserData() { return mUserData; } @@ -251,6 +273,7 @@ public abstract class SmsMessageBase { * * {@hide} */ + @UnsupportedAppUsage public SmsHeader getUserDataHeader() { return mUserDataHeader; } @@ -279,17 +302,20 @@ public abstract class SmsMessageBase { * See TS 23.040, 9.9.2.3.15 for a description of other possible * values. */ + @UnsupportedAppUsage public abstract int getStatus(); /** * Return true iff the message is a SMS-STATUS-REPORT message. */ + @UnsupportedAppUsage public abstract boolean isStatusReportMessage(); /** * Returns true iff the <code>TP-Reply-Path</code> bit is set in * this message. */ + @UnsupportedAppUsage public abstract boolean isReplyPathPresent(); /** diff --git a/telephony/java/com/android/internal/telephony/SmsRawData.java b/telephony/java/com/android/internal/telephony/SmsRawData.java index 891d942b9a13..18727f3a14fa 100644 --- a/telephony/java/com/android/internal/telephony/SmsRawData.java +++ b/telephony/java/com/android/internal/telephony/SmsRawData.java @@ -17,6 +17,7 @@ package com.android.internal.telephony; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -27,6 +28,7 @@ public class SmsRawData implements Parcelable { byte[] data; //Static Methods + @UnsupportedAppUsage public static final Parcelable.Creator<SmsRawData> CREATOR = new Parcelable.Creator<SmsRawData> (){ public SmsRawData createFromParcel(Parcel source) { @@ -43,10 +45,12 @@ public class SmsRawData implements Parcelable { }; // Constructor + @UnsupportedAppUsage public SmsRawData(byte[] data) { this.data = data; } + @UnsupportedAppUsage public byte[] getBytes() { return data; } diff --git a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java index bbe38b7f709a..06378ba95d59 100644 --- a/telephony/java/com/android/internal/telephony/TelephonyPermissions.java +++ b/telephony/java/com/android/internal/telephony/TelephonyPermissions.java @@ -20,7 +20,6 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED; import android.Manifest; import android.app.AppOpsManager; import android.content.Context; -import android.content.pm.PackageManager; import android.os.Binder; import android.os.RemoteException; import android.os.ServiceManager; @@ -250,6 +249,26 @@ public final class TelephonyPermissions { } /** + * Ensure the caller (or self, if not processing an IPC) has + * {@link android.Manifest.permission#READ_PHONE_STATE} or carrier privileges. + * + * @throws SecurityException if the caller does not have the required permission/privileges + */ + public static void enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege( + Context context, int subId, String message) { + if (context.checkCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE) + == PERMISSION_GRANTED) { + return; + } + + if (DBG) { + Rlog.d(LOG_TAG, "No READ_PHONE_STATE permission, check carrier privilege next."); + } + + enforceCallingOrSelfCarrierPrivilege(subId, message); + } + + /** * Make sure the caller (or self, if not processing an IPC) has carrier privileges. * * @throws SecurityException if the caller does not have the required privileges diff --git a/tests/net/java/android/net/NetworkUtilsTest.java b/tests/net/java/android/net/NetworkUtilsTest.java index 2b172dac4865..3452819835f5 100644 --- a/tests/net/java/android/net/NetworkUtilsTest.java +++ b/tests/net/java/android/net/NetworkUtilsTest.java @@ -24,6 +24,8 @@ import static android.net.NetworkUtils.intToInet4AddressHTL; import static android.net.NetworkUtils.netmaskToPrefixLength; import static android.net.NetworkUtils.prefixLengthToV4NetmaskIntHTH; import static android.net.NetworkUtils.prefixLengthToV4NetmaskIntHTL; +import static android.net.NetworkUtils.getBroadcastAddress; +import static android.net.NetworkUtils.getPrefixMaskAsInet4Address; import static junit.framework.Assert.assertEquals; @@ -125,7 +127,6 @@ public class NetworkUtilsTest { assertInvalidNetworkMask(IPv4Address("255.255.0.255")); } - @Test public void testPrefixLengthToV4NetmaskIntHTL() { assertEquals(0, prefixLengthToV4NetmaskIntHTL(0)); @@ -266,4 +267,44 @@ public class NetworkUtilsTest { assertEquals(BigInteger.valueOf(7l - 4 + 4 + 16 + 65536), NetworkUtils.routedIPv6AddressCount(set)); } + + @Test + public void testGetPrefixMaskAsAddress() { + assertEquals("255.255.240.0", getPrefixMaskAsInet4Address(20).getHostAddress()); + assertEquals("255.0.0.0", getPrefixMaskAsInet4Address(8).getHostAddress()); + assertEquals("0.0.0.0", getPrefixMaskAsInet4Address(0).getHostAddress()); + assertEquals("255.255.255.255", getPrefixMaskAsInet4Address(32).getHostAddress()); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetPrefixMaskAsAddress_PrefixTooLarge() { + getPrefixMaskAsInet4Address(33); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetPrefixMaskAsAddress_NegativePrefix() { + getPrefixMaskAsInet4Address(-1); + } + + @Test + public void testGetBroadcastAddress() { + assertEquals("192.168.15.255", + getBroadcastAddress(IPv4Address("192.168.0.123"), 20).getHostAddress()); + assertEquals("192.255.255.255", + getBroadcastAddress(IPv4Address("192.168.0.123"), 8).getHostAddress()); + assertEquals("192.168.0.123", + getBroadcastAddress(IPv4Address("192.168.0.123"), 32).getHostAddress()); + assertEquals("255.255.255.255", + getBroadcastAddress(IPv4Address("192.168.0.123"), 0).getHostAddress()); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetBroadcastAddress_PrefixTooLarge() { + getBroadcastAddress(IPv4Address("192.168.0.123"), 33); + } + + @Test(expected = IllegalArgumentException.class) + public void testGetBroadcastAddress_NegativePrefix() { + getBroadcastAddress(IPv4Address("192.168.0.123"), -1); + } } diff --git a/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java b/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java new file mode 100644 index 000000000000..7f8e7b5456c2 --- /dev/null +++ b/tests/net/java/android/net/dhcp/DhcpLeaseRepositoryTest.java @@ -0,0 +1,539 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import static android.net.dhcp.DhcpLease.HOSTNAME_NONE; +import static android.net.dhcp.DhcpLeaseRepository.CLIENTID_UNSPEC; +import static android.net.dhcp.DhcpLeaseRepository.INETADDR_UNSPEC; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.when; + +import static java.lang.String.format; +import static java.net.InetAddress.parseNumericAddress; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.IpPrefix; +import android.net.MacAddress; +import android.net.util.SharedLog; +import android.net.dhcp.DhcpServer.Clock; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.net.Inet4Address; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +@RunWith(AndroidJUnit4.class) +@SmallTest +public class DhcpLeaseRepositoryTest { + private static final Inet4Address INET4_ANY = (Inet4Address) Inet4Address.ANY; + private static final Inet4Address TEST_DEF_ROUTER = parseAddr4("192.168.42.247"); + private static final Inet4Address TEST_SERVER_ADDR = parseAddr4("192.168.42.241"); + private static final Inet4Address TEST_RESERVED_ADDR = parseAddr4("192.168.42.243"); + private static final MacAddress TEST_MAC_1 = MacAddress.fromBytes( + new byte[] { 5, 4, 3, 2, 1, 0 }); + private static final MacAddress TEST_MAC_2 = MacAddress.fromBytes( + new byte[] { 0, 1, 2, 3, 4, 5 }); + private static final MacAddress TEST_MAC_3 = MacAddress.fromBytes( + new byte[] { 0, 1, 2, 3, 4, 6 }); + private static final Inet4Address TEST_INETADDR_1 = parseAddr4("192.168.42.248"); + private static final Inet4Address TEST_INETADDR_2 = parseAddr4("192.168.42.249"); + private static final String TEST_HOSTNAME_1 = "hostname1"; + private static final String TEST_HOSTNAME_2 = "hostname2"; + private static final IpPrefix TEST_IP_PREFIX = new IpPrefix(TEST_SERVER_ADDR, 22); + private static final long TEST_TIME = 100L; + private static final int TEST_LEASE_TIME_MS = 3_600_000; + private static final Set<Inet4Address> TEST_EXCL_SET = + Collections.unmodifiableSet(new HashSet<>(Arrays.asList( + TEST_SERVER_ADDR, TEST_DEF_ROUTER, TEST_RESERVED_ADDR))); + + @NonNull + private SharedLog mLog; + @NonNull @Mock + private Clock mClock; + @NonNull + private DhcpLeaseRepository mRepo; + + private static Inet4Address parseAddr4(String inet4Addr) { + return (Inet4Address) parseNumericAddress(inet4Addr); + } + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mLog = new SharedLog("DhcpLeaseRepositoryTest"); + when(mClock.elapsedRealtime()).thenReturn(TEST_TIME); + mRepo = new DhcpLeaseRepository( + TEST_IP_PREFIX, TEST_EXCL_SET, TEST_LEASE_TIME_MS, mLog, mClock); + } + + /** + * Request a number of addresses through offer/request. Useful to test address exhaustion. + * @param nAddr Number of addresses to request. + */ + private void requestAddresses(byte nAddr) throws Exception { + final HashSet<Inet4Address> addrs = new HashSet<>(); + byte[] hwAddrBytes = new byte[] { 8, 4, 3, 2, 1, 0 }; + for (byte i = 0; i < nAddr; i++) { + hwAddrBytes[5] = i; + MacAddress newMac = MacAddress.fromBytes(hwAddrBytes); + final String hostname = "host_" + i; + final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, newMac, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, hostname); + + assertNotNull(lease); + assertEquals(newMac, lease.getHwAddr()); + assertEquals(hostname, lease.getHostname()); + assertTrue(format("Duplicate address allocated: %s in %s", lease.getNetAddr(), addrs), + addrs.add(lease.getNetAddr())); + + requestLeaseSelecting(newMac, lease.getNetAddr(), hostname); + } + } + + @Test + public void testAddressExhaustion() throws Exception { + // Use a /28 to quickly run out of addresses + mRepo.updateParams(new IpPrefix(TEST_SERVER_ADDR, 28), TEST_EXCL_SET, TEST_LEASE_TIME_MS); + + // /28 should have 16 addresses, 14 w/o the first/last, 11 w/o excluded addresses + requestAddresses((byte)11); + + try { + mRepo.getOffer(null, TEST_MAC_2, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + fail("Should be out of addresses"); + } catch (DhcpLeaseRepository.OutOfAddressesException e) { + // Expected + } + } + + @Test + public void testUpdateParams_LeaseCleanup() throws Exception { + // Inside /28: + final Inet4Address reqAddrIn28 = parseAddr4("192.168.42.242"); + final Inet4Address declinedAddrIn28 = parseAddr4("192.168.42.245"); + + // Inside /28, but not available there (first address of the range) + final Inet4Address declinedFirstAddrIn28 = parseAddr4("192.168.42.240"); + + final DhcpLease reqAddrIn28Lease = requestLeaseSelecting(TEST_MAC_1, reqAddrIn28); + mRepo.markLeaseDeclined(declinedAddrIn28); + mRepo.markLeaseDeclined(declinedFirstAddrIn28); + + // Inside /22, but outside /28: + final Inet4Address reqAddrIn22 = parseAddr4("192.168.42.3"); + final Inet4Address declinedAddrIn22 = parseAddr4("192.168.42.4"); + + final DhcpLease reqAddrIn22Lease = requestLeaseSelecting(TEST_MAC_3, reqAddrIn22); + mRepo.markLeaseDeclined(declinedAddrIn22); + + // Address that will be reserved in the updateParams call below + final Inet4Address reservedAddr = parseAddr4("192.168.42.244"); + final DhcpLease reservedAddrLease = requestLeaseSelecting(TEST_MAC_2, reservedAddr); + + // Update from /22 to /28 and add another reserved address + Set<Inet4Address> newReserved = new HashSet<>(TEST_EXCL_SET); + newReserved.add(reservedAddr); + mRepo.updateParams(new IpPrefix(TEST_SERVER_ADDR, 28), newReserved, TEST_LEASE_TIME_MS); + + assertHasLease(reqAddrIn28Lease); + assertDeclined(declinedAddrIn28); + + assertNotDeclined(declinedFirstAddrIn28); + + assertNoLease(reqAddrIn22Lease); + assertNotDeclined(declinedAddrIn22); + + assertNoLease(reservedAddrLease); + } + + @Test + public void testGetOffer_StableAddress() throws Exception { + for (final MacAddress macAddr : new MacAddress[] { TEST_MAC_1, TEST_MAC_2, TEST_MAC_3 }) { + final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, macAddr, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + + // Same lease is offered twice + final DhcpLease newLease = mRepo.getOffer(CLIENTID_UNSPEC, macAddr, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + assertEquals(lease, newLease); + } + } + + @Test + public void testUpdateParams_UsesNewPrefix() throws Exception { + final IpPrefix newPrefix = new IpPrefix(parseAddr4("192.168.123.0"), 24); + mRepo.updateParams(newPrefix, TEST_EXCL_SET, TEST_LEASE_TIME_MS); + + DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + assertTrue(newPrefix.contains(lease.getNetAddr())); + } + + @Test + public void testGetOffer_ExistingLease() throws Exception { + requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1, TEST_HOSTNAME_1); + + DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + assertEquals(TEST_INETADDR_1, offer.getNetAddr()); + assertEquals(TEST_HOSTNAME_1, offer.getHostname()); + } + + @Test + public void testGetOffer_ClientIdHasExistingLease() throws Exception { + final byte[] clientId = new byte[] { 1, 2 }; + mRepo.requestLease(clientId, TEST_MAC_1, INET4_ANY /* clientAddr */, + INET4_ANY /* relayAddr */, TEST_INETADDR_1 /* reqAddr */, false, TEST_HOSTNAME_1); + + // Different MAC, but same clientId + DhcpLease offer = mRepo.getOffer(clientId, TEST_MAC_2, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + assertEquals(TEST_INETADDR_1, offer.getNetAddr()); + assertEquals(TEST_HOSTNAME_1, offer.getHostname()); + } + + @Test + public void testGetOffer_DifferentClientId() throws Exception { + final byte[] clientId1 = new byte[] { 1, 2 }; + final byte[] clientId2 = new byte[] { 3, 4 }; + mRepo.requestLease(clientId1, TEST_MAC_1, INET4_ANY /* clientAddr */, + INET4_ANY /* relayAddr */, TEST_INETADDR_1 /* reqAddr */, false, TEST_HOSTNAME_1); + + // Same MAC, different client ID + DhcpLease offer = mRepo.getOffer(clientId2, TEST_MAC_1, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + // Obtains a different address + assertNotEquals(TEST_INETADDR_1, offer.getNetAddr()); + assertEquals(HOSTNAME_NONE, offer.getHostname()); + assertEquals(TEST_MAC_1, offer.getHwAddr()); + } + + @Test + public void testGetOffer_RequestedAddress() throws Exception { + DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */, + TEST_INETADDR_1 /* reqAddr */, TEST_HOSTNAME_1); + assertEquals(TEST_INETADDR_1, offer.getNetAddr()); + assertEquals(TEST_HOSTNAME_1, offer.getHostname()); + } + + @Test + public void testGetOffer_RequestedAddressInUse() throws Exception { + requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1); + DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_2, INET4_ANY /* relayAddr */, + TEST_INETADDR_1 /* reqAddr */, HOSTNAME_NONE); + assertNotEquals(TEST_INETADDR_1, offer.getNetAddr()); + } + + @Test + public void testGetOffer_RequestedAddressReserved() throws Exception { + DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */, + TEST_RESERVED_ADDR /* reqAddr */, HOSTNAME_NONE); + assertNotEquals(TEST_RESERVED_ADDR, offer.getNetAddr()); + } + + @Test + public void testGetOffer_RequestedAddressInvalid() throws Exception { + final Inet4Address invalidAddr = parseAddr4("192.168.42.0"); + DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */, + invalidAddr /* reqAddr */, HOSTNAME_NONE); + assertNotEquals(invalidAddr, offer.getNetAddr()); + } + + @Test + public void testGetOffer_RequestedAddressOutsideSubnet() throws Exception { + final Inet4Address invalidAddr = parseAddr4("192.168.254.2"); + DhcpLease offer = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* relayAddr */, + invalidAddr /* reqAddr */, HOSTNAME_NONE); + assertNotEquals(invalidAddr, offer.getNetAddr()); + } + + @Test(expected = DhcpLeaseRepository.InvalidSubnetException.class) + public void testGetOffer_RelayInInvalidSubnet() throws Exception { + mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, parseAddr4("192.168.254.2") /* relayAddr */, + INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + } + + @Test + public void testRequestLease_SelectingTwice() throws Exception { + final DhcpLease lease1 = requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1, + TEST_HOSTNAME_1); + + // Second request from same client for a different address + final DhcpLease lease2 = requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_2, + TEST_HOSTNAME_2); + + assertEquals(TEST_INETADDR_1, lease1.getNetAddr()); + assertEquals(TEST_HOSTNAME_1, lease1.getHostname()); + + assertEquals(TEST_INETADDR_2, lease2.getNetAddr()); + assertEquals(TEST_HOSTNAME_2, lease2.getHostname()); + + // First address freed when client requested a different one: another client can request it + final DhcpLease lease3 = requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1, HOSTNAME_NONE); + assertEquals(TEST_INETADDR_1, lease3.getNetAddr()); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_SelectingInvalid() throws Exception { + requestLeaseSelecting(TEST_MAC_1, parseAddr4("192.168.254.5")); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_SelectingInUse() throws Exception { + requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1); + requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_SelectingReserved() throws Exception { + requestLeaseSelecting(TEST_MAC_1, TEST_RESERVED_ADDR); + } + + @Test(expected = DhcpLeaseRepository.InvalidSubnetException.class) + public void testRequestLease_SelectingRelayInInvalidSubnet() throws Exception { + mRepo.requestLease(CLIENTID_UNSPEC, TEST_MAC_1, INET4_ANY /* clientAddr */, + parseAddr4("192.168.128.1") /* relayAddr */, TEST_INETADDR_1 /* reqAddr */, + true /* sidSet */, HOSTNAME_NONE); + } + + @Test + public void testRequestLease_InitReboot() throws Exception { + // Request address once + requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1); + + final long newTime = TEST_TIME + 100; + when(mClock.elapsedRealtime()).thenReturn(newTime); + + // init-reboot (sidSet == false): verify configuration + final DhcpLease lease = requestLeaseInitReboot(TEST_MAC_1, TEST_INETADDR_1); + assertEquals(TEST_INETADDR_1, lease.getNetAddr()); + assertEquals(newTime + TEST_LEASE_TIME_MS, lease.getExpTime()); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_InitRebootWrongAddr() throws Exception { + // Request address once + requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1); + // init-reboot with different requested address + requestLeaseInitReboot(TEST_MAC_1, TEST_INETADDR_2); + } + + @Test + public void testRequestLease_InitRebootUnknownAddr() throws Exception { + // init-reboot with unknown requested address + final DhcpLease lease = requestLeaseInitReboot(TEST_MAC_1, TEST_INETADDR_2); + // RFC2131 says we should not reply to accommodate other servers, but since we are + // authoritative we allow creating the lease to avoid issues with lost lease DB (same as + // dnsmasq behavior) + assertEquals(TEST_INETADDR_2, lease.getNetAddr()); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_InitRebootWrongSubnet() throws Exception { + requestLeaseInitReboot(TEST_MAC_1, parseAddr4("192.168.254.2")); + } + + @Test + public void testRequestLease_Renewing() throws Exception { + requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1); + + final long newTime = TEST_TIME + 100; + when(mClock.elapsedRealtime()).thenReturn(newTime); + + final DhcpLease lease = requestLeaseRenewing(TEST_MAC_1, TEST_INETADDR_1); + + assertEquals(TEST_INETADDR_1, lease.getNetAddr()); + assertEquals(newTime + TEST_LEASE_TIME_MS, lease.getExpTime()); + } + + @Test + public void testRequestLease_RenewingUnknownAddr() throws Exception { + final long newTime = TEST_TIME + 100; + when(mClock.elapsedRealtime()).thenReturn(newTime); + final DhcpLease lease = requestLeaseRenewing(TEST_MAC_1, TEST_INETADDR_1); + // Allows renewing an unknown address if available + assertEquals(TEST_INETADDR_1, lease.getNetAddr()); + assertEquals(newTime + TEST_LEASE_TIME_MS, lease.getExpTime()); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_RenewingAddrInUse() throws Exception { + requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1); + requestLeaseRenewing(TEST_MAC_1, TEST_INETADDR_1); + } + + @Test(expected = DhcpLeaseRepository.InvalidAddressException.class) + public void testRequestLease_RenewingInvalidAddr() throws Exception { + requestLeaseRenewing(TEST_MAC_1, parseAddr4("192.168.254.2")); + } + + @Test + public void testReleaseLease() throws Exception { + final DhcpLease lease1 = requestLeaseSelecting(TEST_MAC_1, TEST_INETADDR_1); + + assertHasLease(lease1); + assertTrue(mRepo.releaseLease(CLIENTID_UNSPEC, TEST_MAC_1, TEST_INETADDR_1)); + assertNoLease(lease1); + + final DhcpLease lease2 = requestLeaseSelecting(TEST_MAC_2, TEST_INETADDR_1); + assertEquals(TEST_INETADDR_1, lease2.getNetAddr()); + } + + @Test + public void testReleaseLease_UnknownLease() { + assertFalse(mRepo.releaseLease(CLIENTID_UNSPEC, TEST_MAC_1, TEST_INETADDR_1)); + } + + @Test + public void testReleaseLease_StableOffer() throws Exception { + for (MacAddress mac : new MacAddress[] { TEST_MAC_1, TEST_MAC_2, TEST_MAC_3 }) { + final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, mac, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + + requestLeaseSelecting(mac, lease.getNetAddr()); + mRepo.releaseLease(CLIENTID_UNSPEC, mac, lease.getNetAddr()); + + // Same lease is offered after it was released + final DhcpLease newLease = mRepo.getOffer(CLIENTID_UNSPEC, mac, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + assertEquals(lease.getNetAddr(), newLease.getNetAddr()); + } + } + + @Test + public void testMarkLeaseDeclined() throws Exception { + final DhcpLease lease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + + mRepo.markLeaseDeclined(lease.getNetAddr()); + + // Same lease is not offered again + final DhcpLease newLease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + assertNotEquals(lease.getNetAddr(), newLease.getNetAddr()); + } + + @Test + public void testMarkLeaseDeclined_UsedIfOutOfAddresses() throws Exception { + // Use a /28 to quickly run out of addresses + mRepo.updateParams(new IpPrefix(TEST_SERVER_ADDR, 28), TEST_EXCL_SET, TEST_LEASE_TIME_MS); + + mRepo.markLeaseDeclined(TEST_INETADDR_1); + mRepo.markLeaseDeclined(TEST_INETADDR_2); + + // /28 should have 16 addresses, 14 w/o the first/last, 11 w/o excluded addresses + requestAddresses((byte) 9); + + // Last 2 addresses: addresses marked declined should be used + final DhcpLease firstLease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_1, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, TEST_HOSTNAME_1); + requestLeaseSelecting(TEST_MAC_1, firstLease.getNetAddr()); + + final DhcpLease secondLease = mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_2, + INET4_ANY /* relayAddr */, INETADDR_UNSPEC /* reqAddr */, TEST_HOSTNAME_2); + requestLeaseSelecting(TEST_MAC_2, secondLease.getNetAddr()); + + // Now out of addresses + try { + mRepo.getOffer(CLIENTID_UNSPEC, TEST_MAC_3, INET4_ANY /* relayAddr */, + INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE); + fail("Repository should be out of addresses and throw"); + } catch (DhcpLeaseRepository.OutOfAddressesException e) { /* expected */ } + + assertEquals(TEST_INETADDR_1, firstLease.getNetAddr()); + assertEquals(TEST_HOSTNAME_1, firstLease.getHostname()); + assertEquals(TEST_INETADDR_2, secondLease.getNetAddr()); + assertEquals(TEST_HOSTNAME_2, secondLease.getHostname()); + } + + private DhcpLease requestLease(@NonNull MacAddress macAddr, @NonNull Inet4Address clientAddr, + @Nullable Inet4Address reqAddr, @Nullable String hostname, boolean sidSet) + throws DhcpLeaseRepository.DhcpLeaseException { + return mRepo.requestLease(CLIENTID_UNSPEC, macAddr, clientAddr, INET4_ANY /* relayAddr */, + reqAddr, sidSet, hostname); + } + + /** + * Request a lease simulating a client in the SELECTING state. + */ + private DhcpLease requestLeaseSelecting(@NonNull MacAddress macAddr, + @NonNull Inet4Address reqAddr, @Nullable String hostname) + throws DhcpLeaseRepository.DhcpLeaseException { + return requestLease(macAddr, INET4_ANY /* clientAddr */, reqAddr, hostname, + true /* sidSet */); + } + + /** + * Request a lease simulating a client in the SELECTING state. + */ + private DhcpLease requestLeaseSelecting(@NonNull MacAddress macAddr, + @NonNull Inet4Address reqAddr) throws DhcpLeaseRepository.DhcpLeaseException { + return requestLeaseSelecting(macAddr, reqAddr, HOSTNAME_NONE); + } + + /** + * Request a lease simulating a client in the INIT-REBOOT state. + */ + private DhcpLease requestLeaseInitReboot(@NonNull MacAddress macAddr, + @NonNull Inet4Address reqAddr) throws DhcpLeaseRepository.DhcpLeaseException { + return requestLease(macAddr, INET4_ANY /* clientAddr */, reqAddr, HOSTNAME_NONE, + false /* sidSet */); + } + + /** + * Request a lease simulating a client in the RENEWING state. + */ + private DhcpLease requestLeaseRenewing(@NonNull MacAddress macAddr, + @NonNull Inet4Address clientAddr) throws DhcpLeaseRepository.DhcpLeaseException { + // Renewing: clientAddr filled in, no reqAddr + return requestLease(macAddr, clientAddr, INETADDR_UNSPEC /* reqAddr */, HOSTNAME_NONE, + true /* sidSet */); + } + + private void assertNoLease(DhcpLease lease) { + assertFalse("Leases contain " + lease, mRepo.getCommittedLeases().contains(lease)); + } + + private void assertHasLease(DhcpLease lease) { + assertTrue("Leases do not contain " + lease, mRepo.getCommittedLeases().contains(lease)); + } + + private void assertNotDeclined(Inet4Address addr) { + assertFalse("Address is declined: " + addr, mRepo.getDeclinedAddresses().contains(addr)); + } + + private void assertDeclined(Inet4Address addr) { + assertTrue("Address is not declined: " + addr, mRepo.getDeclinedAddresses().contains(addr)); + } +} diff --git a/tests/net/java/android/net/dhcp/DhcpPacketTest.java b/tests/net/java/android/net/dhcp/DhcpPacketTest.java index 050183c1ac1f..312b3d1878d6 100644 --- a/tests/net/java/android/net/dhcp/DhcpPacketTest.java +++ b/tests/net/java/android/net/dhcp/DhcpPacketTest.java @@ -16,6 +16,8 @@ package android.net.dhcp; +import static android.net.NetworkUtils.getBroadcastAddress; +import static android.net.NetworkUtils.getPrefixMaskAsInet4Address; import static android.net.dhcp.DhcpPacket.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,14 +31,15 @@ import android.net.NetworkUtils; import android.net.metrics.DhcpErrorEvent; import android.support.test.runner.AndroidJUnit4; import android.support.test.filters.SmallTest; -import android.system.OsConstants; import com.android.internal.util.HexDump; +import java.io.ByteArrayOutputStream; import java.net.Inet4Address; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Random; import org.junit.Before; @@ -47,13 +50,17 @@ import org.junit.runner.RunWith; @SmallTest public class DhcpPacketTest { - private static Inet4Address SERVER_ADDR = v4Address("192.0.2.1"); - private static Inet4Address CLIENT_ADDR = v4Address("192.0.2.234"); + private static final Inet4Address SERVER_ADDR = v4Address("192.0.2.1"); + private static final Inet4Address CLIENT_ADDR = v4Address("192.0.2.234"); + private static final int PREFIX_LENGTH = 22; + private static final Inet4Address NETMASK = getPrefixMaskAsInet4Address(PREFIX_LENGTH); + private static final Inet4Address BROADCAST_ADDR = getBroadcastAddress( + SERVER_ADDR, PREFIX_LENGTH); // Use our own empty address instead of Inet4Address.ANY or INADDR_ANY to ensure that the code // doesn't use == instead of equals when comparing addresses. - private static Inet4Address ANY = (Inet4Address) v4Address("0.0.0.0"); + private static final Inet4Address ANY = (Inet4Address) v4Address("0.0.0.0"); - private static byte[] CLIENT_MAC = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }; + private static final byte[] CLIENT_MAC = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 }; private static final Inet4Address v4Address(String addrString) throws IllegalArgumentException { return (Inet4Address) NetworkUtils.numericToInetAddress(addrString); @@ -952,4 +959,96 @@ public class DhcpPacketTest { "\nActual:\n " + Arrays.toString(actual); assertTrue(msg, Arrays.equals(expected, actual)); } + + public void checkBuildOfferPacket(int leaseTimeSecs) throws Exception { + final int renewalTime = (int) (Integer.toUnsignedLong(leaseTimeSecs) / 2); + final int rebindingTime = (int) (Integer.toUnsignedLong(leaseTimeSecs) * 875 / 1000); + final int transactionId = 0xdeadbeef; + + final ByteBuffer packet = DhcpPacket.buildOfferPacket( + DhcpPacket.ENCAP_BOOTP, transactionId, false /* broadcast */, + SERVER_ADDR, INADDR_ANY /* relayIp */, CLIENT_ADDR /* yourIp */, + CLIENT_MAC, leaseTimeSecs, NETMASK /* netMask */, + BROADCAST_ADDR /* bcAddr */, Collections.singletonList(SERVER_ADDR) /* gateways */, + Collections.singletonList(SERVER_ADDR) /* dnsServers */, + SERVER_ADDR /* dhcpServerIdentifier */, null /* domainName */, false /* metered */); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + // BOOTP headers + bos.write(new byte[] { + (byte) 0x02, (byte) 0x01, (byte) 0x06, (byte) 0x00, + (byte) 0xde, (byte) 0xad, (byte) 0xbe, (byte) 0xef, + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + // ciaddr + (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, + }); + // yiaddr + bos.write(CLIENT_ADDR.getAddress()); + // siaddr + bos.write(SERVER_ADDR.getAddress()); + // giaddr + bos.write(INADDR_ANY.getAddress()); + // chaddr + bos.write(CLIENT_MAC); + + // Padding + bos.write(new byte[202]); + + // Options + bos.write(new byte[]{ + // Magic cookie 0x63825363. + (byte) 0x63, (byte) 0x82, (byte) 0x53, (byte) 0x63, + // Message type OFFER. + (byte) 0x35, (byte) 0x01, (byte) 0x02, + }); + // Server ID + bos.write(new byte[] { (byte) 0x36, (byte) 0x04 }); + bos.write(SERVER_ADDR.getAddress()); + // Lease time + bos.write(new byte[] { (byte) 0x33, (byte) 0x04 }); + bos.write(intToByteArray(leaseTimeSecs)); + if (leaseTimeSecs != INFINITE_LEASE) { + // Renewal time + bos.write(new byte[]{(byte) 0x3a, (byte) 0x04}); + bos.write(intToByteArray(renewalTime)); + // Rebinding time + bos.write(new byte[]{(byte) 0x3b, (byte) 0x04}); + bos.write(intToByteArray(rebindingTime)); + } + // Subnet mask + bos.write(new byte[] { (byte) 0x01, (byte) 0x04 }); + bos.write(NETMASK.getAddress()); + // Broadcast address + bos.write(new byte[] { (byte) 0x1c, (byte) 0x04 }); + bos.write(BROADCAST_ADDR.getAddress()); + // Router + bos.write(new byte[] { (byte) 0x03, (byte) 0x04 }); + bos.write(SERVER_ADDR.getAddress()); + // Nameserver + bos.write(new byte[] { (byte) 0x06, (byte) 0x04 }); + bos.write(SERVER_ADDR.getAddress()); + // End options. + bos.write(0xff); + + final byte[] expected = bos.toByteArray(); + assertTrue((expected.length & 1) == 0); + + final byte[] actual = new byte[packet.limit()]; + packet.get(actual); + final String msg = "Expected:\n " + HexDump.dumpHexString(expected) + + "\nActual:\n " + HexDump.dumpHexString(actual); + assertTrue(msg, Arrays.equals(expected, actual)); + } + + @Test + public void testOfferPacket() throws Exception { + checkBuildOfferPacket(3600); + checkBuildOfferPacket(Integer.MAX_VALUE); + checkBuildOfferPacket(0x80000000); + checkBuildOfferPacket(INFINITE_LEASE); + } + + private static byte[] intToByteArray(int val) { + return ByteBuffer.allocate(4).putInt(val).array(); + } } diff --git a/tests/net/java/android/net/dhcp/DhcpServerTest.java b/tests/net/java/android/net/dhcp/DhcpServerTest.java new file mode 100644 index 000000000000..45a50d9a8b5f --- /dev/null +++ b/tests/net/java/android/net/dhcp/DhcpServerTest.java @@ -0,0 +1,315 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import static android.net.dhcp.DhcpPacket.DHCP_CLIENT; +import static android.net.dhcp.DhcpPacket.ENCAP_BOOTP; +import static android.net.dhcp.DhcpPacket.INADDR_ANY; +import static android.net.dhcp.DhcpPacket.INADDR_BROADCAST; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; +import static junit.framework.Assert.assertTrue; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.doNothing; +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 java.net.InetAddress.parseNumericAddress; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.LinkAddress; +import android.net.MacAddress; +import android.net.dhcp.DhcpLeaseRepository.InvalidAddressException; +import android.net.dhcp.DhcpLeaseRepository.OutOfAddressesException; +import android.net.dhcp.DhcpServer.Clock; +import android.net.dhcp.DhcpServer.Dependencies; +import android.net.util.InterfaceParams; +import android.net.util.SharedLog; +import android.os.test.TestLooper; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.net.Inet4Address; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +@RunWith(AndroidJUnit4.class) +@SmallTest +public class DhcpServerTest { + private static final String PROP_DEXMAKER_SHARE_CLASSLOADER = "dexmaker.share_classloader"; + private static final String TEST_IFACE = "testiface"; + private static final MacAddress TEST_IFACE_MAC = MacAddress.fromString("11:22:33:44:55:66"); + private static final InterfaceParams TEST_IFACEPARAMS = + new InterfaceParams(TEST_IFACE, 1, TEST_IFACE_MAC); + + private static final Inet4Address TEST_SERVER_ADDR = parseAddr("192.168.0.2"); + private static final LinkAddress TEST_SERVER_LINKADDR = new LinkAddress(TEST_SERVER_ADDR, 20); + private static final Set<Inet4Address> TEST_DEFAULT_ROUTERS = new HashSet<>( + Arrays.asList(parseAddr("192.168.0.123"), parseAddr("192.168.0.124"))); + private static final Set<Inet4Address> TEST_DNS_SERVERS = new HashSet<>( + Arrays.asList(parseAddr("192.168.0.126"), parseAddr("192.168.0.127"))); + private static final Set<Inet4Address> TEST_EXCLUDED_ADDRS = new HashSet<>( + Arrays.asList(parseAddr("192.168.0.200"), parseAddr("192.168.0.201"))); + private static final long TEST_LEASE_TIME_SECS = 3600L; + private static final int TEST_MTU = 1500; + + private static final int TEST_TRANSACTION_ID = 123; + private static final byte[] TEST_CLIENT_MAC_BYTES = new byte [] { 1, 2, 3, 4, 5, 6 }; + private static final MacAddress TEST_CLIENT_MAC = MacAddress.fromBytes(TEST_CLIENT_MAC_BYTES); + private static final Inet4Address TEST_CLIENT_ADDR = parseAddr("192.168.0.42"); + + private static final long TEST_CLOCK_TIME = 1234L; + private static final int TEST_LEASE_EXPTIME_SECS = 3600; + private static final DhcpLease TEST_LEASE = new DhcpLease(null, TEST_CLIENT_MAC, + TEST_CLIENT_ADDR, TEST_LEASE_EXPTIME_SECS*1000L + TEST_CLOCK_TIME, null /* hostname */); + + @NonNull @Mock + private Dependencies mDeps; + @NonNull @Mock + private DhcpLeaseRepository mRepository; + @NonNull @Mock + private Clock mClock; + @NonNull @Mock + private DhcpPacketListener mPacketListener; + + @NonNull @Captor + private ArgumentCaptor<ByteBuffer> mSentPacketCaptor; + @NonNull @Captor + private ArgumentCaptor<Inet4Address> mResponseDstAddrCaptor; + + @NonNull + private TestLooper mLooper; + @NonNull + private DhcpServer mServer; + + @Nullable + private String mPrevShareClassloaderProp; + + @Before + public void setUp() throws Exception { + // Allow mocking package-private classes + mPrevShareClassloaderProp = System.getProperty(PROP_DEXMAKER_SHARE_CLASSLOADER); + System.setProperty(PROP_DEXMAKER_SHARE_CLASSLOADER, "true"); + MockitoAnnotations.initMocks(this); + + when(mDeps.makeLeaseRepository(any(), any(), any())).thenReturn(mRepository); + when(mDeps.makeClock()).thenReturn(mClock); + when(mDeps.makePacketListener()).thenReturn(mPacketListener); + doNothing().when(mDeps) + .sendPacket(any(), mSentPacketCaptor.capture(), mResponseDstAddrCaptor.capture()); + when(mClock.elapsedRealtime()).thenReturn(TEST_CLOCK_TIME); + + final DhcpServingParams servingParams = new DhcpServingParams.Builder() + .setDefaultRouters(TEST_DEFAULT_ROUTERS) + .setDhcpLeaseTimeSecs(TEST_LEASE_TIME_SECS) + .setDnsServers(TEST_DNS_SERVERS) + .setServerAddr(TEST_SERVER_LINKADDR) + .setLinkMtu(TEST_MTU) + .setExcludedAddrs(TEST_EXCLUDED_ADDRS) + .build(); + + mLooper = new TestLooper(); + mServer = new DhcpServer(mLooper.getLooper(), TEST_IFACEPARAMS, servingParams, + new SharedLog(DhcpServerTest.class.getSimpleName()), mDeps); + + mServer.start(); + mLooper.dispatchAll(); + } + + @After + public void tearDown() { + // Calling stop() several times is not an issue + mServer.stop(); + System.setProperty(PROP_DEXMAKER_SHARE_CLASSLOADER, + (mPrevShareClassloaderProp == null ? "" : mPrevShareClassloaderProp)); + } + + @Test + public void testStart() throws Exception { + verify(mPacketListener, times(1)).start(); + } + + @Test + public void testStop() throws Exception { + mServer.stop(); + mLooper.dispatchAll(); + verify(mPacketListener, times(1)).stop(); + } + + @Test + public void testDiscover() throws Exception { + // TODO: refactor packet construction to eliminate unnecessary/confusing/duplicate fields + when(mRepository.getOffer(isNull() /* clientId */, eq(TEST_CLIENT_MAC), + eq(INADDR_ANY) /* relayAddr */, isNull() /* reqAddr */, isNull() /* hostname */)) + .thenReturn(TEST_LEASE); + + final DhcpDiscoverPacket discover = new DhcpDiscoverPacket(TEST_TRANSACTION_ID, + (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES, + false /* broadcast */, INADDR_ANY /* srcIp */); + mServer.processPacket(discover, DHCP_CLIENT); + + assertResponseSentTo(TEST_CLIENT_ADDR); + final DhcpOfferPacket packet = assertOffer(getPacket()); + assertMatchesTestLease(packet); + } + + @Test + public void testDiscover_OutOfAddresses() throws Exception { + when(mRepository.getOffer(isNull() /* clientId */, eq(TEST_CLIENT_MAC), + eq(INADDR_ANY) /* relayAddr */, isNull() /* reqAddr */, isNull() /* hostname */)) + .thenThrow(new OutOfAddressesException("Test exception")); + + final DhcpDiscoverPacket discover = new DhcpDiscoverPacket(TEST_TRANSACTION_ID, + (short) 0 /* secs */, INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES, + false /* broadcast */, INADDR_ANY /* srcIp */); + mServer.processPacket(discover, DHCP_CLIENT); + + assertResponseSentTo(INADDR_BROADCAST); + final DhcpNakPacket packet = assertNak(getPacket()); + assertMatchesClient(packet); + } + + private DhcpRequestPacket makeRequestSelectingPacket() { + final DhcpRequestPacket request = new DhcpRequestPacket(TEST_TRANSACTION_ID, + (short) 0 /* secs */, INADDR_ANY /* clientIp */, INADDR_ANY /* relayIp */, + TEST_CLIENT_MAC_BYTES, false /* broadcast */); + request.mServerIdentifier = TEST_SERVER_ADDR; + request.mRequestedIp = TEST_CLIENT_ADDR; + return request; + } + + @Test + public void testRequest_Selecting_Ack() throws Exception { + when(mRepository.requestLease(isNull() /* clientId */, eq(TEST_CLIENT_MAC), + eq(INADDR_ANY) /* clientAddr */, eq(INADDR_ANY) /* relayAddr */, + eq(TEST_CLIENT_ADDR) /* reqAddr */, eq(true) /* sidSet */, isNull() /* hostname */)) + .thenReturn(TEST_LEASE); + + final DhcpRequestPacket request = makeRequestSelectingPacket(); + mServer.processPacket(request, DHCP_CLIENT); + + assertResponseSentTo(TEST_CLIENT_ADDR); + final DhcpAckPacket packet = assertAck(getPacket()); + assertMatchesTestLease(packet); + } + + @Test + public void testRequest_Selecting_Nak() throws Exception { + when(mRepository.requestLease(isNull(), eq(TEST_CLIENT_MAC), + eq(INADDR_ANY) /* clientAddr */, eq(INADDR_ANY) /* relayAddr */, + eq(TEST_CLIENT_ADDR) /* reqAddr */, eq(true) /* sidSet */, isNull() /* hostname */)) + .thenThrow(new InvalidAddressException("Test error")); + + final DhcpRequestPacket request = makeRequestSelectingPacket(); + mServer.processPacket(request, DHCP_CLIENT); + + assertResponseSentTo(INADDR_BROADCAST); + final DhcpNakPacket packet = assertNak(getPacket()); + assertMatchesClient(packet); + } + + @Test + public void testRequest_Selecting_WrongClientPort() throws Exception { + final DhcpRequestPacket request = makeRequestSelectingPacket(); + mServer.processPacket(request, 50000); + + verify(mRepository, never()) + .requestLease(any(), any(), any(), any(), any(), anyBoolean(), any()); + verify(mDeps, never()).sendPacket(any(), any(), any()); + } + + @Test + public void testRelease() throws Exception { + final DhcpReleasePacket release = new DhcpReleasePacket(TEST_TRANSACTION_ID, + TEST_SERVER_ADDR, TEST_CLIENT_ADDR, + INADDR_ANY /* relayIp */, TEST_CLIENT_MAC_BYTES); + mServer.processPacket(release, DHCP_CLIENT); + + verify(mRepository, times(1)) + .releaseLease(isNull(), eq(TEST_CLIENT_MAC), eq(TEST_CLIENT_ADDR)); + } + + /* TODO: add more tests once packet construction is refactored, including: + * - usage of giaddr + * - usage of broadcast bit + * - other request states (init-reboot/renewing/rebinding) + */ + + private void assertMatchesTestLease(@NonNull DhcpPacket packet) { + assertMatchesClient(packet); + assertFalse(packet.hasExplicitClientId()); + assertEquals(TEST_SERVER_ADDR, packet.mServerIdentifier); + assertEquals(TEST_CLIENT_ADDR, packet.mYourIp); + assertNotNull(packet.mLeaseTime); + assertEquals(TEST_LEASE_EXPTIME_SECS, (int) packet.mLeaseTime); + assertNull(packet.mHostName); + } + + private void assertMatchesClient(@NonNull DhcpPacket packet) { + assertEquals(TEST_TRANSACTION_ID, packet.mTransId); + assertEquals(TEST_CLIENT_MAC, MacAddress.fromBytes(packet.mClientMac)); + } + + private void assertResponseSentTo(@NonNull Inet4Address addr) { + assertEquals(addr, mResponseDstAddrCaptor.getValue()); + } + + private static DhcpNakPacket assertNak(@Nullable DhcpPacket packet) { + assertTrue(packet instanceof DhcpNakPacket); + return (DhcpNakPacket) packet; + } + + private static DhcpAckPacket assertAck(@Nullable DhcpPacket packet) { + assertTrue(packet instanceof DhcpAckPacket); + return (DhcpAckPacket) packet; + } + + private static DhcpOfferPacket assertOffer(@Nullable DhcpPacket packet) { + assertTrue(packet instanceof DhcpOfferPacket); + return (DhcpOfferPacket) packet; + } + + private DhcpPacket getPacket() throws Exception { + verify(mDeps, times(1)).sendPacket(any(), any(), any()); + return DhcpPacket.decodeFullPacket(mSentPacketCaptor.getValue(), ENCAP_BOOTP); + } + + private static Inet4Address parseAddr(@Nullable String inet4Addr) { + return (Inet4Address) parseNumericAddress(inet4Addr); + } +} diff --git a/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java b/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java new file mode 100644 index 000000000000..b6a4073a64da --- /dev/null +++ b/tests/net/java/android/net/dhcp/DhcpServingParamsTest.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.dhcp; + +import static android.net.dhcp.DhcpServingParams.MTU_UNSET; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; + +import static java.net.InetAddress.parseNumericAddress; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.net.LinkAddress; +import android.net.dhcp.DhcpServingParams.InvalidParameterException; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.net.Inet4Address; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +@RunWith(AndroidJUnit4.class) +@SmallTest +public class DhcpServingParamsTest { + @NonNull + private DhcpServingParams.Builder mBuilder; + + private static final Set<Inet4Address> TEST_DEFAULT_ROUTERS = new HashSet<>( + Arrays.asList(parseAddr("192.168.0.123"), parseAddr("192.168.0.124"))); + private static final long TEST_LEASE_TIME_SECS = 3600L; + private static final Set<Inet4Address> TEST_DNS_SERVERS = new HashSet<>( + Arrays.asList(parseAddr("192.168.0.126"), parseAddr("192.168.0.127"))); + private static final Inet4Address TEST_SERVER_ADDR = parseAddr("192.168.0.2"); + private static final LinkAddress TEST_LINKADDR = new LinkAddress(TEST_SERVER_ADDR, 20); + private static final int TEST_MTU = 1500; + private static final Set<Inet4Address> TEST_EXCLUDED_ADDRS = new HashSet<>( + Arrays.asList(parseAddr("192.168.0.200"), parseAddr("192.168.0.201"))); + + @Before + public void setUp() { + mBuilder = new DhcpServingParams.Builder() + .setDefaultRouters(TEST_DEFAULT_ROUTERS) + .setDhcpLeaseTimeSecs(TEST_LEASE_TIME_SECS) + .setDnsServers(TEST_DNS_SERVERS) + .setServerAddr(TEST_LINKADDR) + .setLinkMtu(TEST_MTU) + .setExcludedAddrs(TEST_EXCLUDED_ADDRS); + } + + @Test + public void testBuild_Immutable() throws InvalidParameterException { + final Set<Inet4Address> routers = new HashSet<>(TEST_DEFAULT_ROUTERS); + final Set<Inet4Address> dnsServers = new HashSet<>(TEST_DNS_SERVERS); + final Set<Inet4Address> excludedAddrs = new HashSet<>(TEST_EXCLUDED_ADDRS); + + final DhcpServingParams params = mBuilder + .setDefaultRouters(routers) + .setDnsServers(dnsServers) + .setExcludedAddrs(excludedAddrs) + .build(); + + // Modifications to source objects should not affect builder or final parameters + final Inet4Address addedAddr = parseAddr("192.168.0.223"); + routers.add(addedAddr); + dnsServers.add(addedAddr); + excludedAddrs.add(addedAddr); + + assertEquals(TEST_DEFAULT_ROUTERS, params.defaultRouters); + assertEquals(TEST_LEASE_TIME_SECS, params.dhcpLeaseTimeSecs); + assertEquals(TEST_DNS_SERVERS, params.dnsServers); + assertEquals(TEST_LINKADDR, params.serverAddr); + assertEquals(TEST_MTU, params.linkMtu); + + assertContains(params.excludedAddrs, TEST_EXCLUDED_ADDRS); + assertContains(params.excludedAddrs, TEST_DEFAULT_ROUTERS); + assertContains(params.excludedAddrs, TEST_DNS_SERVERS); + assertContains(params.excludedAddrs, TEST_SERVER_ADDR); + + assertFalse("excludedAddrs should not contain " + addedAddr, + params.excludedAddrs.contains(addedAddr)); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_NegativeLeaseTime() throws InvalidParameterException { + mBuilder.setDhcpLeaseTimeSecs(-1).build(); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_LeaseTimeTooLarge() throws InvalidParameterException { + // Set lease time larger than max value for uint32 + mBuilder.setDhcpLeaseTimeSecs(1L << 32).build(); + } + + @Test + public void testBuild_InfiniteLeaseTime() throws InvalidParameterException { + final long infiniteLeaseTime = 0xffffffffL; + final DhcpServingParams params = mBuilder + .setDhcpLeaseTimeSecs(infiniteLeaseTime).build(); + assertEquals(infiniteLeaseTime, params.dhcpLeaseTimeSecs); + assertTrue(params.dhcpLeaseTimeSecs > 0L); + } + + @Test + public void testBuild_UnsetMtu() throws InvalidParameterException { + final DhcpServingParams params = mBuilder.setLinkMtu(MTU_UNSET).build(); + assertEquals(MTU_UNSET, params.linkMtu); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_MtuTooSmall() throws InvalidParameterException { + mBuilder.setLinkMtu(20).build(); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_MtuTooLarge() throws InvalidParameterException { + mBuilder.setLinkMtu(65_536).build(); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_IPv6Addr() throws InvalidParameterException { + mBuilder.setServerAddr(new LinkAddress(parseNumericAddress("fe80::1111"), 120)).build(); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_PrefixTooLarge() throws InvalidParameterException { + mBuilder.setServerAddr(new LinkAddress(TEST_SERVER_ADDR, 15)).build(); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_PrefixTooSmall() throws InvalidParameterException { + mBuilder.setDefaultRouters(parseAddr("192.168.0.254")) + .setServerAddr(new LinkAddress(TEST_SERVER_ADDR, 31)) + .build(); + } + + @Test(expected = InvalidParameterException.class) + public void testBuild_RouterNotInPrefix() throws InvalidParameterException { + mBuilder.setDefaultRouters(parseAddr("192.168.254.254")).build(); + } + + private static <T> void assertContains(@NonNull Set<T> set, @NonNull Set<T> subset) { + for (final T elem : subset) { + assertContains(set, elem); + } + } + + private static <T> void assertContains(@NonNull Set<T> set, @Nullable T elem) { + assertTrue("Set does not contain " + elem, set.contains(elem)); + } + + @NonNull + private static Inet4Address parseAddr(@NonNull String inet4Addr) { + return (Inet4Address) parseNumericAddress(inet4Addr); + } +} diff --git a/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java b/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java index b01713006254..b399b0d51577 100644 --- a/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java @@ -106,6 +106,7 @@ public class NetworkMonitorTest { anyString())).thenReturn(TEST_HTTP_URL); when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_HTTPS_URL), anyString())).thenReturn(TEST_HTTPS_URL); + when(mNetwork.getPrivateDnsBypassingCopy()).thenReturn(mNetwork); when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephony); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifi); diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java index f025f41f292b..4dc63f249a52 100644 --- a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -21,7 +21,9 @@ import static android.Manifest.permission.CHANGE_WIFI_STATE; import static android.Manifest.permission.CONNECTIVITY_INTERNAL; import static android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS; import static android.Manifest.permission.NETWORK_STACK; -import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; +import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_OEM; +import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRODUCT; +import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_VENDOR; import static android.content.pm.PackageManager.GET_PERMISSIONS; import static org.junit.Assert.assertFalse; @@ -34,6 +36,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.os.Build; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -48,6 +51,10 @@ import org.mockito.MockitoAnnotations; public class PermissionMonitorTest { private static final int MOCK_UID = 10001; private static final String[] MOCK_PACKAGE_NAMES = new String[] { "com.foo.bar" }; + private static final String PARTITION_SYSTEM = "system"; + private static final String PARTITION_OEM = "oem"; + private static final String PARTITION_PRODUCT = "product"; + private static final String PARTITION_VENDOR = "vendor"; @Mock private Context mContext; @Mock private PackageManager mPackageManager; @@ -62,39 +69,53 @@ public class PermissionMonitorTest { mPermissionMonitor = new PermissionMonitor(mContext, null); } - private void expectPermission(String[] permissions, boolean preinstalled) throws Exception { - final PackageInfo packageInfo = packageInfoWithPermissions(permissions, preinstalled); + private void expectPermission(String[] permissions, String partition, + int targetSdkVersion) throws Exception { + final PackageInfo packageInfo = packageInfoWithPermissions(permissions, partition); + packageInfo.applicationInfo.targetSdkVersion = targetSdkVersion; when(mPackageManager.getPackageInfoAsUser( eq(MOCK_PACKAGE_NAMES[0]), eq(GET_PERMISSIONS), anyInt())).thenReturn(packageInfo); } - private PackageInfo packageInfoWithPermissions(String[] permissions, boolean preinstalled) { + private PackageInfo packageInfoWithPermissions(String[] permissions, String partition) { final PackageInfo packageInfo = new PackageInfo(); packageInfo.requestedPermissions = permissions; packageInfo.applicationInfo = new ApplicationInfo(); - packageInfo.applicationInfo.flags = preinstalled ? FLAG_SYSTEM : 0; + int privateFlags = 0; + switch (partition) { + case PARTITION_OEM: + privateFlags = PRIVATE_FLAG_OEM; + break; + case PARTITION_PRODUCT: + privateFlags = PRIVATE_FLAG_PRODUCT; + break; + case PARTITION_VENDOR: + privateFlags = PRIVATE_FLAG_VENDOR; + break; + } + packageInfo.applicationInfo.privateFlags = privateFlags; return packageInfo; } @Test public void testHasPermission() { - PackageInfo app = packageInfoWithPermissions(new String[] {}, false); + PackageInfo app = packageInfoWithPermissions(new String[] {}, PARTITION_SYSTEM); assertFalse(mPermissionMonitor.hasPermission(app, CHANGE_NETWORK_STATE)); assertFalse(mPermissionMonitor.hasPermission(app, NETWORK_STACK)); assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS)); assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_INTERNAL)); app = packageInfoWithPermissions(new String[] { - CHANGE_NETWORK_STATE, NETWORK_STACK - }, false); + CHANGE_NETWORK_STATE, NETWORK_STACK + }, PARTITION_SYSTEM); assertTrue(mPermissionMonitor.hasPermission(app, CHANGE_NETWORK_STATE)); assertTrue(mPermissionMonitor.hasPermission(app, NETWORK_STACK)); assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS)); assertFalse(mPermissionMonitor.hasPermission(app, CONNECTIVITY_INTERNAL)); app = packageInfoWithPermissions(new String[] { - CONNECTIVITY_USE_RESTRICTED_NETWORKS, CONNECTIVITY_INTERNAL - }, false); + CONNECTIVITY_USE_RESTRICTED_NETWORKS, CONNECTIVITY_INTERNAL + }, PARTITION_SYSTEM); assertFalse(mPermissionMonitor.hasPermission(app, CHANGE_NETWORK_STATE)); assertFalse(mPermissionMonitor.hasPermission(app, NETWORK_STACK)); assertTrue(mPermissionMonitor.hasPermission(app, CONNECTIVITY_USE_RESTRICTED_NETWORKS)); @@ -102,35 +123,64 @@ public class PermissionMonitorTest { } @Test - public void testIsPreinstalledSystemApp() { - PackageInfo app = packageInfoWithPermissions(new String[] {}, false); - assertFalse(mPermissionMonitor.isPreinstalledSystemApp(app)); - - app = packageInfoWithPermissions(new String[] {}, true); - assertTrue(mPermissionMonitor.isPreinstalledSystemApp(app)); + public void testIsVendorApp() { + PackageInfo app = packageInfoWithPermissions(new String[] {}, PARTITION_SYSTEM); + assertFalse(mPermissionMonitor.isVendorApp(app.applicationInfo)); + app = packageInfoWithPermissions(new String[] {}, PARTITION_OEM); + assertTrue(mPermissionMonitor.isVendorApp(app.applicationInfo)); + app = packageInfoWithPermissions(new String[] {}, PARTITION_PRODUCT); + assertTrue(mPermissionMonitor.isVendorApp(app.applicationInfo)); + app = packageInfoWithPermissions(new String[] {}, PARTITION_VENDOR); + assertTrue(mPermissionMonitor.isVendorApp(app.applicationInfo)); } @Test public void testHasUseBackgroundNetworksPermission() throws Exception { - expectPermission(new String[] { CHANGE_NETWORK_STATE }, false); + expectPermission(new String[] { CHANGE_NETWORK_STATE }, + PARTITION_SYSTEM, Build.VERSION_CODES.P); assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); - - expectPermission(new String[] { NETWORK_STACK, CONNECTIVITY_INTERNAL }, false); + expectPermission(new String[] { NETWORK_STACK }, PARTITION_SYSTEM, Build.VERSION_CODES.P); assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); - - // TODO : make this false when b/31479477 is fixed - expectPermission(new String[] {}, true); + expectPermission(new String[] { CONNECTIVITY_INTERNAL }, + PARTITION_SYSTEM, Build.VERSION_CODES.P); assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); - expectPermission(new String[] { CHANGE_WIFI_STATE }, true); + expectPermission(new String[] { CONNECTIVITY_USE_RESTRICTED_NETWORKS }, + PARTITION_SYSTEM, Build.VERSION_CODES.P); assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); - expectPermission(new String[] { NETWORK_STACK, CONNECTIVITY_INTERNAL }, true); + expectPermission(new String[] { CHANGE_NETWORK_STATE }, + PARTITION_VENDOR, Build.VERSION_CODES.P); + assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { NETWORK_STACK }, + PARTITION_VENDOR, Build.VERSION_CODES.P); + assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { CONNECTIVITY_INTERNAL }, + PARTITION_VENDOR, Build.VERSION_CODES.P); + assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { CONNECTIVITY_USE_RESTRICTED_NETWORKS }, + PARTITION_VENDOR, Build.VERSION_CODES.P); assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); - expectPermission(new String[] {}, false); + expectPermission(new String[] {}, PARTITION_SYSTEM, Build.VERSION_CODES.P); assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { CHANGE_WIFI_STATE }, + PARTITION_SYSTEM, Build.VERSION_CODES.P); + assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] {}, PARTITION_VENDOR, Build.VERSION_CODES.P); + assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { CHANGE_WIFI_STATE }, + PARTITION_VENDOR, Build.VERSION_CODES.P); + assertTrue(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); - expectPermission(new String[] { CHANGE_WIFI_STATE }, false); + expectPermission(new String[] {}, PARTITION_SYSTEM, Build.VERSION_CODES.Q); + assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { CHANGE_WIFI_STATE }, + PARTITION_SYSTEM, Build.VERSION_CODES.Q); + assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] {}, PARTITION_VENDOR, Build.VERSION_CODES.Q); + assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); + expectPermission(new String[] { CHANGE_WIFI_STATE }, + PARTITION_VENDOR, Build.VERSION_CODES.Q); assertFalse(mPermissionMonitor.hasUseBackgroundNetworksPermission(MOCK_UID)); } } diff --git a/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java b/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java index 19d3a2e11904..593465380263 100644 --- a/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java +++ b/tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java @@ -16,6 +16,7 @@ package com.android.server.connectivity.tethering; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; @@ -23,7 +24,9 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -40,9 +43,15 @@ import static com.android.server.connectivity.tethering.IControlsTethering.STATE import android.net.INetworkStatsService; import android.net.InterfaceConfiguration; +import android.net.IpPrefix; import android.net.LinkAddress; import android.net.LinkProperties; +import android.net.MacAddress; import android.net.RouteInfo; +import android.net.dhcp.DhcpServer; +import android.net.dhcp.DhcpServingParams; +import android.net.ip.RouterAdvertisementDaemon; +import android.net.util.InterfaceParams; import android.net.util.InterfaceSet; import android.net.util.SharedLog; import android.os.INetworkManagementService; @@ -58,6 +67,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -68,33 +78,58 @@ public class TetherInterfaceStateMachineTest { private static final String IFACE_NAME = "testnet1"; private static final String UPSTREAM_IFACE = "upstream0"; private static final String UPSTREAM_IFACE2 = "upstream1"; + private static final int DHCP_LEASE_TIME_SECS = 3600; + + private static final InterfaceParams TEST_IFACE_PARAMS = new InterfaceParams( + IFACE_NAME, 42 /* index */, MacAddress.ALL_ZEROS_ADDRESS, 1500 /* defaultMtu */); @Mock private INetworkManagementService mNMService; @Mock private INetworkStatsService mStatsService; @Mock private IControlsTethering mTetherHelper; @Mock private InterfaceConfiguration mInterfaceConfiguration; @Mock private SharedLog mSharedLog; + @Mock private DhcpServer mDhcpServer; + @Mock private RouterAdvertisementDaemon mRaDaemon; @Mock private TetheringDependencies mTetheringDependencies; + @Captor private ArgumentCaptor<DhcpServingParams> mDhcpParamsCaptor; + private final TestLooper mLooper = new TestLooper(); private final ArgumentCaptor<LinkProperties> mLinkPropertiesCaptor = ArgumentCaptor.forClass(LinkProperties.class); private TetherInterfaceStateMachine mTestedSm; private void initStateMachine(int interfaceType) throws Exception { + initStateMachine(interfaceType, false /* usingLegacyDhcp */); + } + + private void initStateMachine(int interfaceType, boolean usingLegacyDhcp) throws Exception { mTestedSm = new TetherInterfaceStateMachine( IFACE_NAME, mLooper.getLooper(), interfaceType, mSharedLog, - mNMService, mStatsService, mTetherHelper, mTetheringDependencies); + mNMService, mStatsService, mTetherHelper, usingLegacyDhcp, + mTetheringDependencies); mTestedSm.start(); // Starting the state machine always puts us in a consistent state and notifies // the rest of the world that we've changed from an unknown to available state. mLooper.dispatchAll(); reset(mNMService, mStatsService, mTetherHelper); when(mNMService.getInterfaceConfig(IFACE_NAME)).thenReturn(mInterfaceConfiguration); + when(mTetheringDependencies.makeDhcpServer( + any(), any(), mDhcpParamsCaptor.capture(), any())).thenReturn(mDhcpServer); + when(mTetheringDependencies.getRouterAdvertisementDaemon(any())).thenReturn(mRaDaemon); + when(mTetheringDependencies.getInterfaceParams(IFACE_NAME)).thenReturn(TEST_IFACE_PARAMS); + + when(mRaDaemon.start()).thenReturn(true); + } + + private void initTetheredStateMachine(int interfaceType, String upstreamIface) + throws Exception { + initTetheredStateMachine(interfaceType, upstreamIface, false); } - private void initTetheredStateMachine(int interfaceType, String upstreamIface) throws Exception { - initStateMachine(interfaceType); + private void initTetheredStateMachine(int interfaceType, String upstreamIface, + boolean usingLegacyDhcp) throws Exception { + initStateMachine(interfaceType, usingLegacyDhcp); dispatchCommand(TetherInterfaceStateMachine.CMD_TETHER_REQUESTED, STATE_TETHERED); if (upstreamIface != null) { dispatchTetherConnectionChanged(upstreamIface); @@ -112,7 +147,7 @@ public class TetherInterfaceStateMachineTest { public void startsOutAvailable() { mTestedSm = new TetherInterfaceStateMachine(IFACE_NAME, mLooper.getLooper(), TETHERING_BLUETOOTH, mSharedLog, mNMService, mStatsService, mTetherHelper, - mTetheringDependencies); + false /* usingLegacyDhcp */, mTetheringDependencies); mTestedSm.start(); mLooper.dispatchAll(); verify(mTetherHelper).updateInterfaceState( @@ -345,6 +380,45 @@ public class TetherInterfaceStateMachineTest { } } + @Test + public void startsDhcpServer() throws Exception { + initTetheredStateMachine(TETHERING_WIFI, UPSTREAM_IFACE); + dispatchTetherConnectionChanged(UPSTREAM_IFACE); + + assertDhcpStarted(new IpPrefix("192.168.43.0/24")); + } + + @Test + public void startsDhcpServerOnBluetooth() throws Exception { + initTetheredStateMachine(TETHERING_BLUETOOTH, UPSTREAM_IFACE); + dispatchTetherConnectionChanged(UPSTREAM_IFACE); + + assertDhcpStarted(new IpPrefix("192.168.44.0/24")); + } + + @Test + public void doesNotStartDhcpServerIfDisabled() throws Exception { + initTetheredStateMachine(TETHERING_WIFI, UPSTREAM_IFACE, true /* usingLegacyDhcp */); + dispatchTetherConnectionChanged(UPSTREAM_IFACE); + + verify(mTetheringDependencies, never()).makeDhcpServer(any(), any(), any(), any()); + } + + private void assertDhcpStarted(IpPrefix expectedPrefix) { + verify(mTetheringDependencies, times(1)).makeDhcpServer( + eq(mLooper.getLooper()), eq(TEST_IFACE_PARAMS), any(), eq(mSharedLog)); + verify(mDhcpServer, times(1)).start(); + final DhcpServingParams params = mDhcpParamsCaptor.getValue(); + // Last address byte is random + assertTrue(expectedPrefix.contains(params.serverAddr.getAddress())); + assertEquals(expectedPrefix.getPrefixLength(), params.serverAddr.getPrefixLength()); + assertEquals(1, params.defaultRouters.size()); + assertEquals(params.serverAddr.getAddress(), params.defaultRouters.iterator().next()); + assertEquals(1, params.dnsServers.size()); + assertEquals(params.serverAddr.getAddress(), params.dnsServers.iterator().next()); + assertEquals(DHCP_LEASE_TIME_SECS, params.dhcpLeaseTimeSecs); + } + /** * Send a command to the state machine under test, and run the event loop to idle. * diff --git a/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java b/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java index b68f203d869f..bb312309b34f 100644 --- a/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java +++ b/tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java @@ -21,6 +21,8 @@ import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE_DUN; import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI; import static android.net.ConnectivityManager.TYPE_WIFI; +import static android.provider.Settings.Global.TETHER_ENABLE_LEGACY_DHCP_SERVER; + import static com.android.server.connectivity.tethering.TetheringConfiguration.DUN_NOT_REQUIRED; import static com.android.server.connectivity.tethering.TetheringConfiguration.DUN_REQUIRED; import static com.android.server.connectivity.tethering.TetheringConfiguration.DUN_UNSPECIFIED; @@ -29,15 +31,18 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.when; +import android.content.ContentResolver; import android.content.Context; -import android.content.ContextWrapper; import android.content.res.Resources; import android.net.util.SharedLog; +import android.provider.Settings; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.telephony.TelephonyManager; +import android.test.mock.MockContentResolver; import com.android.internal.util.test.BroadcastInterceptingContext; +import com.android.internal.util.test.FakeSettingsProvider; import java.util.Iterator; @@ -55,6 +60,7 @@ public class TetheringConfigurationTest { @Mock private Context mContext; @Mock private TelephonyManager mTelephonyManager; @Mock private Resources mResources; + private MockContentResolver mContentResolver; private Context mMockContext; private boolean mHasTelephonyManager; @@ -73,6 +79,11 @@ public class TetheringConfigurationTest { } return super.getSystemService(name); } + + @Override + public ContentResolver getContentResolver() { + return mContentResolver; + } } @Before @@ -86,6 +97,10 @@ public class TetheringConfigurationTest { .thenReturn(new String[]{ "test_wlan\\d" }); when(mResources.getStringArray(com.android.internal.R.array.config_tether_bluetooth_regexs)) .thenReturn(new String[0]); + when(mResources.getIntArray(com.android.internal.R.array.config_tether_upstream_types)) + .thenReturn(new int[0]); + mContentResolver = new MockContentResolver(); + mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider()); mMockContext = new MockContext(mContext); } @@ -194,4 +209,29 @@ public class TetheringConfigurationTest { assertEquals(TYPE_MOBILE_HIPRI, upstreamIterator.next().intValue()); assertFalse(upstreamIterator.hasNext()); } + + @Test + public void testNewDhcpServerDisabled() { + Settings.Global.putInt(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, 1); + + final TetheringConfiguration cfg = new TetheringConfiguration(mMockContext, mLog); + assertTrue(cfg.enableLegacyDhcpServer); + } + + @Test + public void testNewDhcpServerEnabled() { + Settings.Global.putInt(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, 0); + + final TetheringConfiguration cfg = new TetheringConfiguration(mMockContext, mLog); + assertFalse(cfg.enableLegacyDhcpServer); + } + + @Test + public void testNewDhcpServerDefault() { + Settings.Global.putString(mContentResolver, TETHER_ENABLE_LEGACY_DHCP_SERVER, null); + + final TetheringConfiguration cfg = new TetheringConfiguration(mMockContext, mLog); + // TODO: change to false when new server is promoted to default + assertTrue(cfg.enableLegacyDhcpServer); + } } diff --git a/tests/testables/Android.bp b/tests/testables/Android.bp new file mode 100644 index 000000000000..f07f09da3f03 --- /dev/null +++ b/tests/testables/Android.bp @@ -0,0 +1,32 @@ +// +// 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. +// + +java_library { + + name: "testables", + // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_MODULE_TAG + // LOCAL_MODULE_TAG := tests + + srcs: ["src/**/*.java"], + + libs: [ + "android.test.runner", + "android.test.mock", + "android-support-test", + "mockito-target-inline-minus-junit4", + ], + +} diff --git a/tests/testables/Android.mk b/tests/testables/Android.mk deleted file mode 100644 index f3cbac05d1cb..000000000000 --- a/tests/testables/Android.mk +++ /dev/null @@ -1,32 +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. -# - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := testables -LOCAL_MODULE_TAG := tests - -LOCAL_SRC_FILES := $(call all-java-files-under,src) - -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.mock \ - android-support-test \ - mockito-target-inline-minus-junit4 - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp index e26c9c3fdf63..a594e5bf0ce1 100644 --- a/tools/aapt/Android.bp +++ b/tools/aapt/Android.bp @@ -99,6 +99,17 @@ cc_library_host_static { } // ========================================================== +// Build the host executable: aapt +// ========================================================== +cc_binary_host { + name: "aapt", + defaults: ["aapt_defaults"], + srcs: ["Main.cpp"], + use_version_lib: true, + static_libs: ["libaapt"], +} + +// ========================================================== // Build the host tests: libaapt_tests // ========================================================== cc_test_host { diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk deleted file mode 100644 index 7bcf631da652..000000000000 --- a/tools/aapt/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2014 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. -# - -ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),) - -# ========================================================== -# Setup some common variables for the different build -# targets here. -# ========================================================== -LOCAL_PATH:= $(call my-dir) - -aaptHostStaticLibs := \ - libandroidfw \ - libpng \ - libutils \ - liblog \ - libcutils \ - libexpat \ - libziparchive \ - libbase \ - libz - -aaptCFlags := -Wall -Werror - -# ========================================================== -# Build the host executable: aapt -# ========================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE := aapt -LOCAL_MODULE_HOST_OS := darwin linux windows -LOCAL_CFLAGS := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" $(aaptCFlags) -LOCAL_SRC_FILES := Main.cpp -LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs) - -include $(BUILD_HOST_EXECUTABLE) - -endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index d714687ee914..2f2ef92e72b4 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -6,6 +6,7 @@ #include "Main.h" #include "Bundle.h" +#include <build/version.h> #include <utils/Compat.h> #include <utils/Log.h> #include <utils/threads.h> @@ -20,10 +21,6 @@ using namespace android; static const char* gProgName = "aapt"; -#ifndef AAPT_VERSION - #define AAPT_VERSION "" -#endif - /* * Show version info. All the cool kids do it. */ @@ -32,7 +29,7 @@ int doVersion(Bundle* bundle) if (bundle->getFileSpecCount() != 0) { printf("(ignoring extra arguments)\n"); } - printf("Android Asset Packaging Tool, v0.2-" AAPT_VERSION "\n"); + printf("Android Asset Packaging Tool, v0.2-%s\n", android::build::GetBuildNumber().c_str()); return 0; } diff --git a/tools/aapt2/cmd/Dump.cpp b/tools/aapt2/cmd/Dump.cpp index 8e7e5e59bc31..6bb762aafb3b 100644 --- a/tools/aapt2/cmd/Dump.cpp +++ b/tools/aapt2/cmd/Dump.cpp @@ -23,6 +23,7 @@ #include "Debug.h" #include "Diagnostics.h" #include "Flags.h" +#include "LoadedApk.h" #include "format/Container.h" #include "format/binary/BinaryResourceParser.h" #include "format/proto/ProtoDeserialize.h" @@ -254,6 +255,32 @@ static bool TryDumpFile(IAaptContext* context, const std::string& file_path, return true; } +static bool DumpPackageName(IAaptContext* context, const std::string& file_path) { + auto loaded_apk = LoadedApk::LoadApkFromPath(file_path, context->GetDiagnostics()); + if (!loaded_apk) { + return false; + } + + constexpr size_t kStdOutBufferSize = 1024u; + io::FileOutputStream fout(STDOUT_FILENO, kStdOutBufferSize); + Printer printer(&fout); + + xml::Element* manifest_el = loaded_apk->GetManifest()->root.get(); + if (!manifest_el) { + context->GetDiagnostics()->Error(DiagMessage() << "No AndroidManifest."); + return false; + } + + xml::Attribute* attr = manifest_el->FindAttribute({}, "package"); + if (!attr) { + context->GetDiagnostics()->Error(DiagMessage() << "No package name."); + return false; + } + printer.Println(StringPrintf("%s", attr->value.c_str())); + + return true; +} + namespace { class DumpContext : public IAaptContext { @@ -324,9 +351,20 @@ int Dump(const std::vector<StringPiece>& args) { DumpContext context; context.SetVerbose(verbose); + auto parsedArgs = flags.GetArgs(); + if (parsedArgs.size() > 1 && parsedArgs[0] == "packagename") { + parsedArgs.erase(parsedArgs.begin()); + for (const std::string& arg : parsedArgs) { + if (!DumpPackageName(&context, arg)) { + return 1; + } + } + return 0; + } + options.print_options.show_sources = true; options.print_options.show_values = !no_values; - for (const std::string& arg : flags.GetArgs()) { + for (const std::string& arg : parsedArgs) { if (!TryDumpFile(&context, arg, options)) { return 1; } diff --git a/tools/hiddenapi/generate_hiddenapi_lists.py b/tools/hiddenapi/generate_hiddenapi_lists.py new file mode 100755 index 000000000000..4a0931a149af --- /dev/null +++ b/tools/hiddenapi/generate_hiddenapi_lists.py @@ -0,0 +1,241 @@ +#!/usr/bin/env python +# +# Copyright (C) 2018 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. +""" +Generate API lists for non-SDK API enforcement. + +usage: generate-hiddenapi-lists.py [-h] + --input-public INPUT_PUBLIC + --input-private INPUT_PRIVATE + [--input-whitelists [INPUT_WHITELISTS [INPUT_WHITELISTS ...]]] + [--input-greylists [INPUT_GREYLISTS [INPUT_GREYLISTS ...]]] + [--input-blacklists [INPUT_BLACKLISTS [INPUT_BLACKLISTS ...]]] + --output-whitelist OUTPUT_WHITELIST + --output-light-greylist OUTPUT_LIGHT_GREYLIST + --output-dark-greylist OUTPUT_DARK_GREYLIST + --output-blacklist OUTPUT_BLACKLIST +""" +import argparse +import os +import sys +import re + +def get_args(): + """Parses command line arguments. + + Returns: + Namespace: dictionary of parsed arguments + """ + parser = argparse.ArgumentParser() + parser.add_argument('--input-public', required=True, help='List of all public members') + parser.add_argument('--input-private', required=True, help='List of all private members') + parser.add_argument( + '--input-whitelists', nargs='*', + help='Lists of members to force on whitelist') + parser.add_argument( + '--input-greylists', nargs='*', + help='Lists of members to force on light greylist') + parser.add_argument( + '--input-blacklists', nargs='*', + help='Lists of members to force on blacklist') + parser.add_argument('--output-whitelist', required=True) + parser.add_argument('--output-light-greylist', required=True) + parser.add_argument('--output-dark-greylist', required=True) + parser.add_argument('--output-blacklist', required=True) + return parser.parse_args() + +def read_lines(filename): + """Reads entire file and return it as a list of lines. + + Args: + filename (string): Path to the file to read from. + + Returns: + list: Lines of the loaded file as a list of strings. + """ + with open(filename, 'r') as f: + return f.readlines() + +def write_lines(filename, lines): + """Writes list of lines into a file, overwriting the file it it exists. + + Args: + filename (string): Path to the file to be writting into. + lines (list): List of strings to write into the file. + """ + with open(filename, 'w') as f: + f.writelines(lines) + +def move_between_sets(subset, src, dst, source = "<unknown>"): + """Removes a subset of elements from one set and add it to another. + + Args: + subset (set): The subset of `src` to be moved from `src` to `dst`. + src (set): Source set. Must be a superset of `subset`. + dst (set): Destination set. Must be disjoint with `subset`. + """ + assert src.issuperset(subset), ( + "Error processing: {}\n" + "The following entries were not found:\n" + "{}" + "Please visit go/hiddenapi for more information.").format( + source, "".join(map(lambda x: " " + str(x), subset.difference(src)))) + assert dst.isdisjoint(subset) + # Order matters if `src` and `subset` are the same object. + dst.update(subset) + src.difference_update(subset) + +def get_package_name(signature): + """Returns the package name prefix of a class member signature. + + Example: "Ljava/lang/String;->hashCode()J" --> "Ljava/lang/" + + Args: + signature (string): Member signature + + Returns + string: Package name of the given member + """ + class_name_end = signature.find("->") + assert class_name_end != -1, "Invalid signature: {}".format(signature) + package_name_end = signature.rfind("/", 0, class_name_end) + assert package_name_end != -1, "Invalid signature: {}".format(signature) + return signature[:package_name_end + 1] + +def all_package_names(*args): + """Returns a set of packages names in given lists of member signatures. + + Example: args = [ set([ "Lpkg1/ClassA;->foo()V", "Lpkg2/ClassB;->bar()J" ]), + set([ "Lpkg1/ClassC;->baz()Z" ]) ] + return value = set([ "Lpkg1/", "Lpkg2" ]) + + Args: + *args (list): List of sets to iterate over and extract the package names + of its elements (member signatures) + + Returns: + set: All package names extracted from the given lists of signatures. + """ + packages = set() + for arg in args: + packages = packages.union(map(get_package_name, arg)) + return packages + +def move_all(src, dst): + """Moves all elements of one set to another. + + Args: + src (set): Source set. Will become empty. + dst (set): Destination set. Will contain all elements of `src`. + """ + move_between_sets(src, src, dst) + +def move_from_files(filenames, src, dst): + """Loads member signatures from a list of files and moves them to a given set. + + Opens files in `filenames`, reads all their lines and moves those from `src` + set to `dst` set. + + Args: + filenames (list): List of paths to files to be loaded. + src (set): Set that loaded lines should be moved from. + dst (set): Set that loaded lines should be moved to. + """ + if filenames: + for filename in filenames: + move_between_sets(set(read_lines(filename)), src, dst, filename) + +def move_serialization(src, dst): + """Moves all members matching serialization API signatures between given sets. + + Args: + src (set): Set that will be searched for serialization API and that API + will be removed from it. + dst (set): Set that serialization API will be moved to. + """ + serialization_patterns = [ + r'readObject\(Ljava/io/ObjectInputStream;\)V', + r'readObjectNoData\(\)V', + r'readResolve\(\)Ljava/lang/Object;', + r'serialVersionUID:J', + r'serialPersistentFields:\[Ljava/io/ObjectStreamField;', + r'writeObject\(Ljava/io/ObjectOutputStream;\)V', + r'writeReplace\(\)Ljava/lang/Object;', + ] + regex = re.compile(r'.*->(' + '|'.join(serialization_patterns) + r')$') + move_between_sets(filter(lambda api: regex.match(api), src), src, dst) + +def move_from_packages(packages, src, dst): + """Moves all members of given package names from one set to another. + + Args: + packages (list): List of string package names. + src (set): Set that will be searched for API matching one of the given + package names. Surch API will be removed from the set. + dst (set): Set that matching API will be moved to. + """ + move_between_sets(filter(lambda api: get_package_name(api) in packages, src), src, dst) + +def main(argv): + args = get_args() + + # Initialize API sets by loading lists of public and private API. Public API + # are all members resolvable from SDK API stubs, other members are private. + # As an optimization, skip the step of moving public API from a full set of + # members and start with a populated whitelist. + whitelist = set(read_lines(args.input_public)) + uncategorized = set(read_lines(args.input_private)) + light_greylist = set() + dark_greylist = set() + blacklist = set() + + # Assert that there is no overlap between public and private API. + assert whitelist.isdisjoint(uncategorized) + num_all_api = len(whitelist) + len(uncategorized) + + # Read all files which manually assign members to specific lists. + move_from_files(args.input_whitelists, uncategorized, whitelist) + move_from_files(args.input_greylists, uncategorized, light_greylist) + move_from_files(args.input_blacklists, uncategorized, blacklist) + + # Iterate over all uncategorized members and move serialization API to light greylist. + move_serialization(uncategorized, light_greylist) + + # Extract package names of members from whitelist and light greylist, which + # are assumed to have been finalized at this point. Assign all uncategorized + # members from the same packages to the dark greylist. + dark_greylist_packages = all_package_names(whitelist, light_greylist) + move_from_packages(dark_greylist_packages, uncategorized, dark_greylist) + + # Assign all uncategorized members to the blacklist. + move_all(uncategorized, blacklist) + + # Assert we have not missed anything. + assert whitelist.isdisjoint(light_greylist) + assert whitelist.isdisjoint(dark_greylist) + assert whitelist.isdisjoint(blacklist) + assert light_greylist.isdisjoint(dark_greylist) + assert light_greylist.isdisjoint(blacklist) + assert dark_greylist.isdisjoint(blacklist) + assert num_all_api == len(whitelist) + len(light_greylist) + len(dark_greylist) + len(blacklist) + + # Write final lists to disk. + write_lines(args.output_whitelist, whitelist) + write_lines(args.output_light_greylist, light_greylist) + write_lines(args.output_dark_greylist, dark_greylist) + write_lines(args.output_blacklist, blacklist) + +if __name__ == "__main__": + main(sys.argv) diff --git a/tools/hiddenapi/generate_hiddenapi_lists_test.py b/tools/hiddenapi/generate_hiddenapi_lists_test.py new file mode 100755 index 000000000000..8f793189650c --- /dev/null +++ b/tools/hiddenapi/generate_hiddenapi_lists_test.py @@ -0,0 +1,89 @@ +#!/usr/bin/env python +# +# Copyright (C) 2018 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. +"""Unit tests for Hidden API list generation.""" +import unittest +from generate_hiddenapi_lists import * + +class TestHiddenapiListGeneration(unittest.TestCase): + + def test_move_between_sets(self): + A = set([1, 2, 3, 4]) + B = set([5, 6, 7, 8]) + move_between_sets(set([2, 4]), A, B) + self.assertEqual(A, set([1, 3])) + self.assertEqual(B, set([2, 4, 5, 6, 7, 8])) + + def test_move_between_sets_fail_not_superset(self): + A = set([1, 2, 3, 4]) + B = set([5, 6, 7, 8]) + with self.assertRaises(AssertionError) as ar: + move_between_sets(set([0, 2]), A, B) + + def test_move_between_sets_fail_not_disjoint(self): + A = set([1, 2, 3, 4]) + B = set([4, 5, 6, 7, 8]) + with self.assertRaises(AssertionError) as ar: + move_between_sets(set([1, 4]), A, B) + + def test_get_package_name(self): + self.assertEqual(get_package_name("Ljava/lang/String;->clone()V"), "Ljava/lang/") + + def test_get_package_name_fail_no_arrow(self): + with self.assertRaises(AssertionError) as ar: + get_package_name("Ljava/lang/String;-clone()V") + with self.assertRaises(AssertionError) as ar: + get_package_name("Ljava/lang/String;>clone()V") + with self.assertRaises(AssertionError) as ar: + get_package_name("Ljava/lang/String;__clone()V") + + def test_get_package_name_fail_no_package(self): + with self.assertRaises(AssertionError) as ar: + get_package_name("LString;->clone()V") + + def test_all_package_names(self): + self.assertEqual(all_package_names(), set()) + self.assertEqual(all_package_names(set(["Lfoo/Bar;->baz()V"])), set(["Lfoo/"])) + self.assertEqual( + all_package_names(set(["Lfoo/Bar;->baz()V", "Lfoo/BarX;->bazx()I"])), + set(["Lfoo/"])) + self.assertEqual( + all_package_names( + set(["Lfoo/Bar;->baz()V"]), + set(["Lfoo/BarX;->bazx()I", "Labc/xyz/Mno;->ijk()J"])), + set(["Lfoo/", "Labc/xyz/"])) + + def test_move_all(self): + src = set([ "abc", "xyz" ]) + dst = set([ "def" ]) + move_all(src, dst) + self.assertEqual(src, set()) + self.assertEqual(dst, set([ "abc", "def", "xyz" ])) + + def test_move_from_packages(self): + src = set([ "Lfoo/bar/ClassA;->abc()J", # will be moved + "Lfoo/bar/ClassA;->def()J", # will be moved + "Lcom/pkg/example/ClassD;->ijk:J", # not moved: different package + "Lfoo/bar/xyz/ClassC;->xyz()Z" ]) # not moved: subpackage + dst = set() + packages = set([ "Lfoo/bar/" ]) + move_from_packages(packages, src, dst) + self.assertEqual( + src, set([ "Lfoo/bar/xyz/ClassC;->xyz()Z", "Lcom/pkg/example/ClassD;->ijk:J" ])) + self.assertEqual( + dst, set([ "Lfoo/bar/ClassA;->abc()J", "Lfoo/bar/ClassA;->def()J" ])) + +if __name__ == '__main__': + unittest.main() diff --git a/tools/processors/unsupportedappusage/Android.bp b/tools/processors/unsupportedappusage/Android.bp new file mode 100644 index 000000000000..98f3c955a2d2 --- /dev/null +++ b/tools/processors/unsupportedappusage/Android.bp @@ -0,0 +1,15 @@ + +java_library_host { + name: "unsupportedappusage-annotation-processor", + java_resources: [ + "META-INF/**/*", + ], + srcs: [ + "src/**/*.java", + ], + static_libs: [ + "guava", + "unsupportedappusage-annotation" + ], + use_tools_jar: true, +} diff --git a/tools/processors/unsupportedappusage/META-INF/services/javax.annotation.processing.Processor b/tools/processors/unsupportedappusage/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000000..4a969d319070 --- /dev/null +++ b/tools/processors/unsupportedappusage/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +android.processor.unsupportedappusage.UnsupportedAppUsageProcessor diff --git a/tools/processors/unsupportedappusage/src/android/processor/unsupportedappusage/SignatureBuilder.java b/tools/processors/unsupportedappusage/src/android/processor/unsupportedappusage/SignatureBuilder.java new file mode 100644 index 000000000000..ef2914610f80 --- /dev/null +++ b/tools/processors/unsupportedappusage/src/android/processor/unsupportedappusage/SignatureBuilder.java @@ -0,0 +1,228 @@ +/* + * Copyright (C) 2018 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.processor.unsupportedappusage; + +import static javax.lang.model.element.ElementKind.PACKAGE; +import static javax.tools.Diagnostic.Kind.ERROR; +import static javax.tools.Diagnostic.Kind.WARNING; + +import android.annotation.UnsupportedAppUsage; + +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableMap; +import com.sun.tools.javac.code.Type; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import javax.annotation.processing.Messager; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; + +/** + * Builds a dex signature for a given method or field. + */ +public class SignatureBuilder { + + private static final Map<TypeKind, String> TYPE_MAP = ImmutableMap.<TypeKind, String>builder() + .put(TypeKind.BOOLEAN, "Z") + .put(TypeKind.BYTE, "B") + .put(TypeKind.CHAR, "C") + .put(TypeKind.DOUBLE, "D") + .put(TypeKind.FLOAT, "F") + .put(TypeKind.INT, "I") + .put(TypeKind.LONG, "J") + .put(TypeKind.SHORT, "S") + .put(TypeKind.VOID, "V") + .build(); + + private final Messager mMessager; + + /** + * Exception used internally when we can't build a signature. Whenever this is thrown, an error + * will also be written to the Messager. + */ + private class SignatureBuilderException extends Exception { + public SignatureBuilderException(String message) { + super(message); + } + public void report(Element offendingElement) { + mMessager.printMessage(ERROR, getMessage(), offendingElement); + } + } + + public SignatureBuilder(Messager messager) { + mMessager = messager; + } + + /** + * Returns a list of enclosing elements for the given element, with the package first, and + * excluding the element itself. + */ + private List<Element> getEnclosingElements(Element e) { + List<Element> enclosing = new ArrayList<>(); + e = e.getEnclosingElement(); // don't include the element itself. + while (e != null) { + enclosing.add(e); + e = e.getEnclosingElement(); + } + Collections.reverse(enclosing); + return enclosing; + } + + /** + * Get the dex signature for a clazz, in format "Lpackage/name/Outer$Inner;" + */ + private String getClassSignature(TypeElement clazz) { + StringBuilder sb = new StringBuilder("L"); + for (Element enclosing : getEnclosingElements(clazz)) { + if (enclosing.getKind() == PACKAGE) { + sb.append(((PackageElement) enclosing) + .getQualifiedName() + .toString() + .replace('.', '/')); + sb.append('/'); + } else { + sb.append(enclosing.getSimpleName()).append('$'); + } + + } + return sb + .append(clazz.getSimpleName()) + .append(";") + .toString(); + } + + /** + * Returns the type signature for a given type. For primitive types, a single character. + * For classes, the class signature. For arrays, a "[" preceeding the component type. + */ + private String getTypeSignature(TypeMirror type) throws SignatureBuilderException { + String sig = TYPE_MAP.get(type.getKind()); + if (sig != null) { + return sig; + } + switch (type.getKind()) { + case ARRAY: + return "[" + getTypeSignature(((ArrayType) type).getComponentType()); + case DECLARED: + Element declaring = ((DeclaredType) type).asElement(); + if (!(declaring instanceof TypeElement)) { + throw new SignatureBuilderException( + "Can't handle declared type of kind " + declaring.getKind()); + } + return getClassSignature((TypeElement) declaring); + case TYPEVAR: + Type.TypeVar typeVar = (Type.TypeVar) type; + if (typeVar.getLowerBound().getKind() != TypeKind.NULL) { + return getTypeSignature(typeVar.getLowerBound()); + } else if (typeVar.getUpperBound().getKind() != TypeKind.NULL) { + return getTypeSignature(typeVar.getUpperBound()); + } else { + throw new SignatureBuilderException("Can't handle typevar with no bound"); + } + + default: + throw new SignatureBuilderException("Can't handle type of kind " + type.getKind()); + } + } + + /** + * Get the signature for an executable, either a method or a constructor. + * + * @param name "<init>" for constructor, else the method name + * @param method The executable element in question. + */ + private String getExecutableSignature(CharSequence name, ExecutableElement method) + throws SignatureBuilderException { + StringBuilder sig = new StringBuilder(); + sig.append(getClassSignature((TypeElement) method.getEnclosingElement())) + .append("->") + .append(name) + .append("("); + for (VariableElement param : method.getParameters()) { + sig.append(getTypeSignature(param.asType())); + } + sig.append(")") + .append(getTypeSignature(method.getReturnType())); + return sig.toString(); + } + + private String buildMethodSignature(ExecutableElement method) throws SignatureBuilderException { + return getExecutableSignature(method.getSimpleName(), method); + } + + private String buildConstructorSignature(ExecutableElement cons) + throws SignatureBuilderException { + return getExecutableSignature("<init>", cons); + } + + private String buildFieldSignature(VariableElement field) throws SignatureBuilderException { + StringBuilder sig = new StringBuilder(); + sig.append(getClassSignature((TypeElement) field.getEnclosingElement())) + .append("->") + .append(field.getSimpleName()) + .append(":") + .append(getTypeSignature(field.asType())) + ; + return sig.toString(); + } + + public String buildSignature(Element element) { + UnsupportedAppUsage uba = element.getAnnotation(UnsupportedAppUsage.class); + try { + String signature; + switch (element.getKind()) { + case METHOD: + signature = buildMethodSignature((ExecutableElement) element); + break; + case CONSTRUCTOR: + signature = buildConstructorSignature((ExecutableElement) element); + break; + case FIELD: + signature = buildFieldSignature((VariableElement) element); + break; + default: + return null; + } + // if we have an expected signature on the annotation, warn if it doesn't match. + if (!Strings.isNullOrEmpty(uba.expectedSignature())) { + if (!signature.equals(uba.expectedSignature())) { + mMessager.printMessage( + WARNING, + String.format("Expected signature doesn't match generated signature.\n" + + " Expected: %s\n Generated: %s", + uba.expectedSignature(), signature), + element); + } + } + return signature; + } catch (SignatureBuilderException problem) { + problem.report(element); + return null; + } + } +} diff --git a/tools/processors/unsupportedappusage/src/android/processor/unsupportedappusage/UnsupportedAppUsageProcessor.java b/tools/processors/unsupportedappusage/src/android/processor/unsupportedappusage/UnsupportedAppUsageProcessor.java new file mode 100644 index 000000000000..1d4c435939db --- /dev/null +++ b/tools/processors/unsupportedappusage/src/android/processor/unsupportedappusage/UnsupportedAppUsageProcessor.java @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2018 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.processor.unsupportedappusage; + +import static javax.tools.StandardLocation.CLASS_OUTPUT; + +import android.annotation.UnsupportedAppUsage; + +import com.google.common.base.Joiner; +import com.sun.tools.javac.model.JavacElements; +import com.sun.tools.javac.tree.JCTree; +import com.sun.tools.javac.util.Pair; +import com.sun.tools.javac.util.Position; + +import java.io.IOException; +import java.io.PrintStream; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.stream.Stream; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; + +/** + * Annotation processor for {@link UnsupportedAppUsage} annotations. + * + * This processor currently outputs two things: + * 1. A greylist.txt containing dex signatures of all annotated elements. + * 2. A CSV file with a mapping of dex signatures to corresponding source positions. + * + * The first will be used at a later stage of the build to add access flags to the dex file. The + * second is used for automating updates to the annotations themselves. + */ +@SupportedAnnotationTypes({"android.annotation.UnsupportedAppUsage"}) +public class UnsupportedAppUsageProcessor extends AbstractProcessor { + + // Package name for writing output. Output will be written to the "class output" location within + // this package. + private static final String PACKAGE = "unsupportedappusage"; + private static final String INDEX_CSV = "unsupportedappusage_index.csv"; + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latest(); + } + + /** + * Write the contents of a stream to a text file, with one line per item. + */ + private void writeToFile(String name, + String headerLine, + Stream<?> contents) throws IOException { + PrintStream out = new PrintStream(processingEnv.getFiler().createResource( + CLASS_OUTPUT, + PACKAGE, + name) + .openOutputStream()); + out.println(headerLine); + contents.forEach(o -> out.println(o)); + if (out.checkError()) { + throw new IOException("Error when writing to " + name); + } + out.close(); + } + + /** + * Find the annotation mirror for the @UnsupportedAppUsage annotation on the given element. + */ + private AnnotationMirror getUnsupportedAppUsageAnnotationMirror(Element e) { + for (AnnotationMirror m : e.getAnnotationMirrors()) { + TypeElement type = (TypeElement) m.getAnnotationType().asElement(); + if (type.getQualifiedName().toString().equals( + UnsupportedAppUsage.class.getCanonicalName())) { + return m; + } + } + return null; + } + + /** + * Returns a CSV header line for the columns returned by + * {@link #getAnnotationIndex(String, Element)}. + */ + private String getCsvHeaders() { + return Joiner.on(',').join( + "signature", + "file", + "startline", + "startcol", + "endline", + "endcol" + ); + } + + /** + * Maps an annotated element to the source position of the @UnsupportedAppUsage annotation + * attached to it. It returns CSV in the format: + * dex-signature,filename,start-line,start-col,end-line,end-col + * + * The positions refer to the annotation itself, *not* the annotated member. This can therefore + * be used to read just the annotation from the file, and to perform in-place edits on it. + * + * @param signature the dex signature for the element. + * @param annotatedElement The annotated element + * @return A single line of CSV text + */ + private String getAnnotationIndex(String signature, Element annotatedElement) { + JavacElements javacElem = (JavacElements) processingEnv.getElementUtils(); + AnnotationMirror unsupportedAppUsage = + getUnsupportedAppUsageAnnotationMirror(annotatedElement); + Pair<JCTree, JCTree.JCCompilationUnit> pair = + javacElem.getTreeAndTopLevel(annotatedElement, unsupportedAppUsage, null); + Position.LineMap lines = pair.snd.lineMap; + return Joiner.on(",").join( + signature, + pair.snd.getSourceFile().getName(), + lines.getLineNumber(pair.fst.pos().getStartPosition()), + lines.getColumnNumber(pair.fst.pos().getStartPosition()), + lines.getLineNumber(pair.fst.pos().getEndPosition(pair.snd.endPositions)), + lines.getColumnNumber(pair.fst.pos().getEndPosition(pair.snd.endPositions))); + } + + /** + * This is the main entry point in the processor, called by the compiler. + */ + @Override + public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) { + Set<? extends Element> annotated = roundEnv.getElementsAnnotatedWith( + UnsupportedAppUsage.class); + if (annotated.size() == 0) { + return true; + } + // build signatures for each annotated member, and put them in a map of signature to member + Map<String, Element> signatureMap = new TreeMap<>(); + SignatureBuilder sb = new SignatureBuilder(processingEnv.getMessager()); + for (Element e : annotated) { + String sig = sb.buildSignature(e); + if (sig != null) { + signatureMap.put(sig, e); + } + } + try { + writeToFile(INDEX_CSV, + getCsvHeaders(), + signatureMap.entrySet() + .stream() + .map(e -> getAnnotationIndex(e.getKey() ,e.getValue()))); + } catch (IOException e) { + throw new RuntimeException("Failed to write output", e); + } + return true; + } +} diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 1e03891019f6..e37a85670972 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -17,14 +17,14 @@ package android.net.wifi; import android.annotation.UnsupportedAppUsage; -import android.os.Parcelable; -import android.os.Parcel; import android.net.NetworkInfo.DetailedState; import android.net.NetworkUtils; +import android.os.Parcel; +import android.os.Parcelable; import android.text.TextUtils; -import java.net.InetAddress; import java.net.Inet4Address; +import java.net.InetAddress; import java.net.UnknownHostException; import java.util.EnumMap; import java.util.Locale; @@ -540,9 +540,13 @@ public class WifiInfo implements Parcelable { dest.writeInt(mMeteredHint ? 1 : 0); dest.writeInt(mEphemeral ? 1 : 0); dest.writeInt(score); + dest.writeLong(txSuccess); dest.writeDouble(txSuccessRate); + dest.writeLong(txRetries); dest.writeDouble(txRetriesRate); + dest.writeLong(txBad); dest.writeDouble(txBadRate); + dest.writeLong(rxSuccess); dest.writeDouble(rxSuccessRate); mSupplicantState.writeToParcel(dest, flags); } @@ -570,9 +574,13 @@ public class WifiInfo implements Parcelable { info.mMeteredHint = in.readInt() != 0; info.mEphemeral = in.readInt() != 0; info.score = in.readInt(); + info.txSuccess = in.readLong(); info.txSuccessRate = in.readDouble(); + info.txRetries = in.readLong(); info.txRetriesRate = in.readDouble(); + info.txBad = in.readLong(); info.txBadRate = in.readDouble(); + info.rxSuccess = in.readLong(); info.rxSuccessRate = in.readDouble(); info.mSupplicantState = SupplicantState.CREATOR.createFromParcel(in); return info; diff --git a/wifi/tests/src/android/net/wifi/WifiInfoTest.java b/wifi/tests/src/android/net/wifi/WifiInfoTest.java new file mode 100644 index 000000000000..f5a8b29167bf --- /dev/null +++ b/wifi/tests/src/android/net/wifi/WifiInfoTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net.wifi; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import android.os.Parcel; +import android.support.test.filters.SmallTest; + +import org.junit.Test; + +/** + * Unit tests for {@link android.net.wifi.WifiInfo}. + */ +@SmallTest +public class WifiInfoTest { + private static final long TEST_TX_SUCCESS = 1; + private static final long TEST_TX_RETRIES = 2; + private static final long TEST_TX_BAD = 3; + private static final long TEST_RX_SUCCESS = 4; + + /** + * Verify parcel write/read with WifiInfo. + */ + @Test + public void testWifiInfoParcelWriteRead() throws Exception { + WifiInfo writeWifiInfo = new WifiInfo(); + writeWifiInfo.txSuccess = TEST_TX_SUCCESS; + writeWifiInfo.txRetries = TEST_TX_RETRIES; + writeWifiInfo.txBad = TEST_TX_BAD; + writeWifiInfo.rxSuccess = TEST_RX_SUCCESS; + + Parcel parcel = Parcel.obtain(); + writeWifiInfo.writeToParcel(parcel, 0); + // Rewind the pointer to the head of the parcel. + parcel.setDataPosition(0); + WifiInfo readWifiInfo = WifiInfo.CREATOR.createFromParcel(parcel); + + assertNotNull(readWifiInfo); + assertEquals(TEST_TX_SUCCESS, readWifiInfo.txSuccess); + assertEquals(TEST_TX_RETRIES, readWifiInfo.txRetries); + assertEquals(TEST_TX_BAD, readWifiInfo.txBad); + assertEquals(TEST_RX_SUCCESS, readWifiInfo.rxSuccess); + } +} |