diff options
71 files changed, 2021 insertions, 1655 deletions
diff --git a/Android.bp b/Android.bp index 0e1cdeaf216a..fe4fdb2a502e 100644 --- a/Android.bp +++ b/Android.bp @@ -690,6 +690,7 @@ java_defaults { "android.hardware.wifi-V1.0-java-constants", "android.hardware.radio-V1.0-java", "android.hardware.radio-V1.3-java", + "android.hardware.radio-V1.4-java", "android.hardware.usb.gadget-V1.0-java", "netd_aidl_interface-java", ], @@ -818,7 +819,7 @@ gensrcs { java_library { name: "ext", installable: true, - sdk_version: "core_current", + no_framework_libs: true, static_libs: [ "libphonenumber-platform", "nist-sip", diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 01df817ead56..e061b1548e58 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -13,7 +13,9 @@ api_lint_hook = ${REPO_ROOT}/frameworks/base/tools/apilint/apilint_sha.sh ${PREU strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT} -hidden_api_txt_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT} +hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT} + +hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT} owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$" diff --git a/api/current.txt b/api/current.txt index 332dc8774cbf..299700b2dde5 100755 --- a/api/current.txt +++ b/api/current.txt @@ -42109,6 +42109,7 @@ package android.telephony { field public static final java.lang.String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool"; field public static final java.lang.String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool"; field public static final java.lang.String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool"; + field public static final java.lang.String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool"; field public static final java.lang.String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool"; field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool"; field public static final java.lang.String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int"; @@ -42456,9 +42457,9 @@ package android.telephony { public class MbmsGroupCallSession implements java.lang.AutoCloseable { method public void close(); - method public static android.telephony.MbmsGroupCallSession create(android.content.Context, java.util.concurrent.Executor, int, android.telephony.mbms.MbmsGroupCallSessionCallback); + method public static android.telephony.MbmsGroupCallSession create(android.content.Context, int, java.util.concurrent.Executor, android.telephony.mbms.MbmsGroupCallSessionCallback); method public static android.telephony.MbmsGroupCallSession create(android.content.Context, java.util.concurrent.Executor, android.telephony.mbms.MbmsGroupCallSessionCallback); - method public android.telephony.mbms.GroupCall startGroupCall(java.util.concurrent.Executor, long, int[], int[], android.telephony.mbms.GroupCallCallback); + method public android.telephony.mbms.GroupCall startGroupCall(long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, java.util.concurrent.Executor, android.telephony.mbms.GroupCallCallback); } public class MbmsStreamingSession implements java.lang.AutoCloseable { @@ -42810,6 +42811,7 @@ package android.telephony { method public java.lang.String getCountryIso(); method public int getDataRoaming(); method public java.lang.CharSequence getDisplayName(); + method public java.lang.String getGroupUuid(); method public java.lang.String getIccId(); method public int getIconTint(); method public deprecated int getMcc(); @@ -42817,7 +42819,6 @@ package android.telephony { method public deprecated int getMnc(); method public java.lang.String getMncString(); method public java.lang.String getNumber(); - method public int getParentSubId(); method public int getSimSlotIndex(); method public int getSubscriptionId(); method public boolean isEmbedded(); @@ -42841,7 +42842,7 @@ package android.telephony { method public static int getDefaultSmsSubscriptionId(); method public static int getDefaultSubscriptionId(); method public static int getDefaultVoiceSubscriptionId(); - method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(int); + method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(); method public static int getSlotIndex(int); method public static int[] getSubscriptionIds(int); method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int); @@ -42851,6 +42852,7 @@ package android.telephony { method public static boolean isValidSubscriptionId(int); method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); + method public java.lang.String setSubscriptionGroup(int[]); method public void setSubscriptionOverrideCongested(int, boolean, long); method public void setSubscriptionOverrideUnmetered(int, boolean, long); method public void setSubscriptionPlans(int, java.util.List<android.telephony.SubscriptionPlan>); @@ -43175,6 +43177,7 @@ package android.telephony.data { method public java.lang.String getApnName(); method public int getApnTypeBitmask(); method public int getAuthType(); + method public int getCarrierId(); method public java.lang.String getEntryName(); method public int getId(); method public deprecated java.net.InetAddress getMmsProxyAddress(); @@ -43225,6 +43228,7 @@ package android.telephony.data { method public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int); method public android.telephony.data.ApnSetting.Builder setAuthType(int); method public android.telephony.data.ApnSetting.Builder setCarrierEnabled(boolean); + method public android.telephony.data.ApnSetting.Builder setCarrierId(int); method public android.telephony.data.ApnSetting.Builder setEntryName(java.lang.String); method public deprecated android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress); method public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.lang.String); @@ -43457,7 +43461,7 @@ package android.telephony.mbms { public class GroupCall implements java.lang.AutoCloseable { method public void close(); method public long getTmgi(); - method public void updateGroupCall(int[], int[]); + method public void updateGroupCall(java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>); field public static final int REASON_BY_USER_REQUEST = 1; // 0x1 field public static final int REASON_FREQUENCY_CONFLICT = 3; // 0x3 field public static final int REASON_LEFT_MBMS_BROADCAST_AREA = 6; // 0x6 @@ -43469,11 +43473,10 @@ package android.telephony.mbms { field public static final int STATE_STOPPED = 1; // 0x1 } - public class GroupCallCallback { - ctor public GroupCallCallback(); - method public void onBroadcastSignalStrengthUpdated(int); - method public void onError(int, java.lang.String); - method public void onGroupCallStateChanged(int, int); + public abstract interface GroupCallCallback { + method public abstract void onBroadcastSignalStrengthUpdated(int); + method public abstract void onError(int, java.lang.String); + method public abstract void onGroupCallStateChanged(int, int); field public static final int SIGNAL_STRENGTH_UNAVAILABLE = -1; // 0xffffffff } @@ -43513,6 +43516,11 @@ package android.telephony.mbms { field public static final int ERROR_UNABLE_TO_READ_SIM = 206; // 0xce } + public static class MbmsErrors.GroupCallErrors { + field public static final int ERROR_DUPLICATE_START_GROUP_CALL = 502; // 0x1f6 + field public static final int ERROR_UNABLE_TO_START_SERVICE = 501; // 0x1f5 + } + public static class MbmsErrors.InitializationErrors { field public static final int ERROR_APP_PERMISSIONS_NOT_GRANTED = 102; // 0x66 field public static final int ERROR_DUPLICATE_INITIALIZE = 101; // 0x65 @@ -43525,12 +43533,11 @@ package android.telephony.mbms { field public static final int ERROR_UNABLE_TO_START_SERVICE = 302; // 0x12e } - public class MbmsGroupCallSessionCallback { - ctor public MbmsGroupCallSessionCallback(); - method public void onAvailableSaisUpdated(java.util.List<java.lang.Integer>, java.util.List<java.util.List<java.lang.Integer>>); - method public void onError(int, java.lang.String); - method public void onMiddlewareReady(); - method public void onServiceInterfaceAvailable(java.lang.String, int); + public abstract interface MbmsGroupCallSessionCallback { + method public abstract void onAvailableSaisUpdated(java.util.List<java.lang.Integer>, java.util.List<java.util.List<java.lang.Integer>>); + method public abstract void onError(int, java.lang.String); + method public abstract void onMiddlewareReady(); + method public abstract void onServiceInterfaceAvailable(java.lang.String, int); } public class MbmsStreamingSessionCallback { diff --git a/api/system-current.txt b/api/system-current.txt index b1f0bed327ac..3dea80e8e04e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4462,6 +4462,16 @@ package android.service.autofill { } +package android.service.carrier { + + public abstract class ApnService extends android.app.Service { + ctor public ApnService(); + method public abstract java.util.List<android.content.ContentValues> onRestoreApns(int); + method public android.os.IBinder onBind(android.content.Intent); + } + +} + package android.service.euicc { public final class EuiccProfileInfo implements android.os.Parcelable { @@ -6614,9 +6624,9 @@ package android.telephony.mbms.vendor { method public int initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException; method public void onAppCallbackDied(int, int); method public android.os.IBinder onBind(android.content.Intent); - method public int startGroupCall(int, long, int[], int[], android.telephony.mbms.GroupCallCallback); + method public int startGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, android.telephony.mbms.GroupCallCallback); method public void stopGroupCall(int, long); - method public void updateGroupCall(int, long, int[], int[]); + method public void updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>); } public class MbmsStreamingServiceBase extends android.os.Binder { diff --git a/api/test-current.txt b/api/test-current.txt index c09ff9880ce7..c86feb22d782 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1050,9 +1050,9 @@ package android.telephony.mbms.vendor { method public int initialize(android.telephony.mbms.MbmsGroupCallSessionCallback, int) throws android.os.RemoteException; method public void onAppCallbackDied(int, int); method public android.os.IBinder onBind(android.content.Intent); - method public int startGroupCall(int, long, int[], int[], android.telephony.mbms.GroupCallCallback); + method public int startGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>, android.telephony.mbms.GroupCallCallback); method public void stopGroupCall(int, long); - method public void updateGroupCall(int, long, int[], int[]); + method public void updateGroupCall(int, long, java.util.List<java.lang.Integer>, java.util.List<java.lang.Integer>); } public class MbmsStreamingServiceBase extends android.os.Binder { diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index e12b665d1505..281f900d9cb9 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -1794,8 +1794,8 @@ message CpuTimePerFreq { */ message CpuTimePerUid { optional int32 uid = 1 [(is_uid) = true]; - optional uint64 user_time_millis = 2; - optional uint64 sys_time_millis = 3; + optional uint64 user_time_micros = 2; + optional uint64 sys_time_micros = 3; } /** diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt index dd6b4d9d083b..5ee94f73212b 100644 --- a/config/boot-image-profile.txt +++ b/config/boot-image-profile.txt @@ -24224,7 +24224,8 @@ HSPLandroid/icu/util/CodePointMap;->get(I)I HSPLandroid/icu/util/CodePointMap;->getRange(ILandroid/icu/util/CodePointMap$RangeOption;ILandroid/icu/util/CodePointMap$ValueFilter;Landroid/icu/util/CodePointMap$Range;)Z HSPLandroid/icu/util/CodePointMap;->getRange(ILandroid/icu/util/CodePointMap$ValueFilter;Landroid/icu/util/CodePointMap$Range;)Z HSPLandroid/icu/util/CodePointMap;->iterator()Ljava/util/Iterator; -HSPLandroid/icu/util/CodePointMap;->stringIterator(Ljava/lang/CharSequence;I)Landroid/icu/util/CodePointMap$StringIterator;HSPLandroid/icu/util/Currency$1;-><init>()V +HSPLandroid/icu/util/CodePointMap;->stringIterator(Ljava/lang/CharSequence;I)Landroid/icu/util/CodePointMap$StringIterator; +HSPLandroid/icu/util/Currency$1;-><init>()V HSPLandroid/icu/util/Currency$1;->createInstance(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; HSPLandroid/icu/util/Currency$1;->createInstance(Ljava/lang/String;Ljava/lang/Void;)Landroid/icu/util/Currency; HSPLandroid/icu/util/Currency$CurrencyUsage;-><init>(Ljava/lang/String;I)V @@ -41088,7 +41089,7 @@ HSPLcom/android/internal/telephony/TimeServiceHelper;->setDeviceTimeZoneStatic(L HSPLcom/android/internal/telephony/TimeServiceHelper;->setListener(Lcom/android/internal/telephony/TimeServiceHelper$Listener;)V HSPLcom/android/internal/telephony/TimeZoneLookupHelper$CountryResult;->toString()Ljava/lang/String; HSPLcom/android/internal/telephony/TimeZoneLookupHelper$OffsetResult;->toString()Ljava/lang/String; -HSPLcom/android/internal/telephony/TimeZoneLookupHelper;->getCountryTimeZones(Ljava/lang/String;)Llibcore/util/CountryTimeZones; +HSPLcom/android/internal/telephony/TimeZoneLookupHelper;->getCountryTimeZones(Ljava/lang/String;)Llibcore/timezone/CountryTimeZones; HSPLcom/android/internal/telephony/TimeZoneLookupHelper;->lookupByCountry(Ljava/lang/String;J)Lcom/android/internal/telephony/TimeZoneLookupHelper$CountryResult; HSPLcom/android/internal/telephony/TimeZoneLookupHelper;->lookupByNitzCountry(Lcom/android/internal/telephony/NitzData;Ljava/lang/String;)Lcom/android/internal/telephony/TimeZoneLookupHelper$OffsetResult; HSPLcom/android/internal/telephony/UiccSmsController;->disableCellBroadcastRangeForSubscriber(IIII)Z @@ -51866,7 +51867,46 @@ HSPLlibcore/reflect/Types;->getType(Ljava/lang/reflect/Type;)Ljava/lang/reflect/ HSPLlibcore/reflect/Types;->getTypeArray(Llibcore/reflect/ListOfTypes;Z)[Ljava/lang/reflect/Type; HSPLlibcore/reflect/WildcardTypeImpl;->getLowerBounds()[Ljava/lang/reflect/Type; HSPLlibcore/reflect/WildcardTypeImpl;->getUpperBounds()[Ljava/lang/reflect/Type; -HSPLlibcore/util/-$$Lambda$TimeZoneFinder$ReaderSupplier$IAVNuAYizGfcsPtGXEBkDPhlBF0;->get()Ljava/io/Reader; +HSPLlibcore/timezone/-$$Lambda$TimeZoneFinder$ReaderSupplier$IAVNuAYizGfcsPtGXEBkDPhlBF0;->get()Ljava/io/Reader; +HSPLlibcore/timezone/CountryTimeZones;->createValidated(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;Ljava/lang/String;)Llibcore/timezone/CountryTimeZones; +HSPLlibcore/timezone/CountryTimeZones;->getDefaultTimeZone()Landroid/icu/util/TimeZone; +HSPLlibcore/timezone/CountryTimeZones;->getIcuTimeZones()Ljava/util/List; +HSPLlibcore/timezone/CountryTimeZones;->isDefaultOkForCountryTimeZoneDetection(J)Z +HSPLlibcore/timezone/CountryTimeZones;->isForCountryCode(Ljava/lang/String;)Z +HSPLlibcore/timezone/CountryTimeZones;->lookupByOffsetWithBias(IZJLandroid/icu/util/TimeZone;)Llibcore/timezone/CountryTimeZones$OffsetResult; +HSPLlibcore/timezone/TimeZoneDataFiles;->generateIcuDataPath()Ljava/lang/String; +HSPLlibcore/timezone/TimeZoneDataFiles;->getTimeZoneFilePaths(Ljava/lang/String;)[Ljava/lang/String; +HSPLlibcore/timezone/TimeZoneFinder$ReaderSupplier;->forFile(Ljava/lang/String;Ljava/nio/charset/Charset;)Llibcore/timezone/TimeZoneFinder$ReaderSupplier; +HSPLlibcore/timezone/TimeZoneFinder$ReaderSupplier;->get()Ljava/io/Reader; +HSPLlibcore/timezone/TimeZoneFinder$SelectiveCountryTimeZonesExtractor;->processCountryZones(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;Ljava/lang/String;)Z +HSPLlibcore/timezone/TimeZoneFinder$TimeZonesProcessor;->processHeader(Ljava/lang/String;)Z +HSPLlibcore/timezone/TimeZoneFinder;->checkOnEndTag(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)V +HSPLlibcore/timezone/TimeZoneFinder;->consumeText(Lorg/xmlpull/v1/XmlPullParser;)Ljava/lang/String; +HSPLlibcore/timezone/TimeZoneFinder;->createInstanceWithFallback([Ljava/lang/String;)Llibcore/timezone/TimeZoneFinder; +HSPLlibcore/timezone/TimeZoneFinder;->findStartTag(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;Z)Z +HSPLlibcore/timezone/TimeZoneFinder;->getInstance()Llibcore/timezone/TimeZoneFinder; +HSPLlibcore/timezone/TimeZoneFinder;->lookupCountryTimeZones(Ljava/lang/String;)Llibcore/timezone/CountryTimeZones; +HSPLlibcore/timezone/TimeZoneFinder;->parseBooleanAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;Ljava/lang/Boolean;)Ljava/lang/Boolean; +HSPLlibcore/timezone/TimeZoneFinder;->parseLongAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;Ljava/lang/Long;)Ljava/lang/Long; +HSPLlibcore/timezone/TimeZoneFinder;->parseTimeZoneMappings(Lorg/xmlpull/v1/XmlPullParser;)Ljava/util/List; +HSPLlibcore/timezone/TimeZoneFinder;->processCountryZones(Lorg/xmlpull/v1/XmlPullParser;Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;)Z +HSPLlibcore/timezone/TimeZoneFinder;->processXml(Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;)V +HSPLlibcore/timezone/ZoneInfoDB$TzData$1;->create(Ljava/lang/Object;)Ljava/lang/Object; +HSPLlibcore/timezone/ZoneInfoDB$TzData$1;->create(Ljava/lang/String;)Llibcore/util/ZoneInfo; +HSPLlibcore/timezone/ZoneInfoDB$TzData;->close()V +HSPLlibcore/timezone/ZoneInfoDB$TzData;->finalize()V +HSPLlibcore/timezone/ZoneInfoDB$TzData;->getAvailableIDs()[Ljava/lang/String; +HSPLlibcore/timezone/ZoneInfoDB$TzData;->getBufferIterator(Ljava/lang/String;)Llibcore/io/BufferIterator; +HSPLlibcore/timezone/ZoneInfoDB$TzData;->hasTimeZone(Ljava/lang/String;)Z +HSPLlibcore/timezone/ZoneInfoDB$TzData;->loadData(Ljava/lang/String;)Z +HSPLlibcore/timezone/ZoneInfoDB$TzData;->loadTzDataWithFallback([Ljava/lang/String;)Llibcore/timezone/ZoneInfoDB$TzData; +HSPLlibcore/timezone/ZoneInfoDB$TzData;->makeTimeZone(Ljava/lang/String;)Llibcore/util/ZoneInfo; +HSPLlibcore/timezone/ZoneInfoDB$TzData;->makeTimeZoneUncached(Ljava/lang/String;)Llibcore/util/ZoneInfo; +HSPLlibcore/timezone/ZoneInfoDB$TzData;->readHeader()V +HSPLlibcore/timezone/ZoneInfoDB$TzData;->readIndex(Llibcore/io/BufferIterator;II)V +HSPLlibcore/timezone/ZoneInfoDB$TzData;->readZoneTab(Llibcore/io/BufferIterator;II)V +HSPLlibcore/timezone/ZoneInfoDB$TzData;->validateOffset(II)V +HSPLlibcore/timezone/ZoneInfoDB;->getInstance()Llibcore/timezone/ZoneInfoDB$TzData; HSPLlibcore/util/BasicLruCache;-><init>(I)V HSPLlibcore/util/BasicLruCache;->create(Ljava/lang/Object;)Ljava/lang/Object; HSPLlibcore/util/BasicLruCache;->entryEvicted(Ljava/lang/Object;Ljava/lang/Object;)V @@ -51874,12 +51914,6 @@ HSPLlibcore/util/BasicLruCache;->evictAll()V HSPLlibcore/util/BasicLruCache;->get(Ljava/lang/Object;)Ljava/lang/Object; HSPLlibcore/util/BasicLruCache;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; HSPLlibcore/util/CollectionUtils;->removeDuplicates(Ljava/util/List;Ljava/util/Comparator;)V -HSPLlibcore/util/CountryTimeZones;->createValidated(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;Ljava/lang/String;)Llibcore/util/CountryTimeZones; -HSPLlibcore/util/CountryTimeZones;->getDefaultTimeZone()Landroid/icu/util/TimeZone; -HSPLlibcore/util/CountryTimeZones;->getIcuTimeZones()Ljava/util/List; -HSPLlibcore/util/CountryTimeZones;->isDefaultOkForCountryTimeZoneDetection(J)Z -HSPLlibcore/util/CountryTimeZones;->isForCountryCode(Ljava/lang/String;)Z -HSPLlibcore/util/CountryTimeZones;->lookupByOffsetWithBias(IZJLandroid/icu/util/TimeZone;)Llibcore/util/CountryTimeZones$OffsetResult; HSPLlibcore/util/HexEncoding;->encode([BII)[C HSPLlibcore/util/NativeAllocationRegistry$CleanerRunner;->run()V HSPLlibcore/util/NativeAllocationRegistry$CleanerThunk;->run()V @@ -51887,23 +51921,6 @@ HSPLlibcore/util/NativeAllocationRegistry;-><init>(Ljava/lang/ClassLoader;JJ)V HSPLlibcore/util/NativeAllocationRegistry;->registerNativeAllocation(Ljava/lang/Object;J)Ljava/lang/Runnable; HSPLlibcore/util/SneakyThrow;->sneakyThrow(Ljava/lang/Throwable;)V HSPLlibcore/util/SneakyThrow;->sneakyThrow_(Ljava/lang/Throwable;)V -HSPLlibcore/util/TimeZoneDataFiles;->generateIcuDataPath()Ljava/lang/String; -HSPLlibcore/util/TimeZoneDataFiles;->getTimeZoneFilePaths(Ljava/lang/String;)[Ljava/lang/String; -HSPLlibcore/util/TimeZoneFinder$ReaderSupplier;->forFile(Ljava/lang/String;Ljava/nio/charset/Charset;)Llibcore/util/TimeZoneFinder$ReaderSupplier; -HSPLlibcore/util/TimeZoneFinder$ReaderSupplier;->get()Ljava/io/Reader; -HSPLlibcore/util/TimeZoneFinder$SelectiveCountryTimeZonesExtractor;->processCountryZones(Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;Ljava/lang/String;)Z -HSPLlibcore/util/TimeZoneFinder$TimeZonesProcessor;->processHeader(Ljava/lang/String;)Z -HSPLlibcore/util/TimeZoneFinder;->checkOnEndTag(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)V -HSPLlibcore/util/TimeZoneFinder;->consumeText(Lorg/xmlpull/v1/XmlPullParser;)Ljava/lang/String; -HSPLlibcore/util/TimeZoneFinder;->createInstanceWithFallback([Ljava/lang/String;)Llibcore/util/TimeZoneFinder; -HSPLlibcore/util/TimeZoneFinder;->findStartTag(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;Z)Z -HSPLlibcore/util/TimeZoneFinder;->getInstance()Llibcore/util/TimeZoneFinder; -HSPLlibcore/util/TimeZoneFinder;->lookupCountryTimeZones(Ljava/lang/String;)Llibcore/util/CountryTimeZones; -HSPLlibcore/util/TimeZoneFinder;->parseBooleanAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;Ljava/lang/Boolean;)Ljava/lang/Boolean; -HSPLlibcore/util/TimeZoneFinder;->parseLongAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;Ljava/lang/Long;)Ljava/lang/Long; -HSPLlibcore/util/TimeZoneFinder;->parseTimeZoneMappings(Lorg/xmlpull/v1/XmlPullParser;)Ljava/util/List; -HSPLlibcore/util/TimeZoneFinder;->processCountryZones(Lorg/xmlpull/v1/XmlPullParser;Llibcore/util/TimeZoneFinder$TimeZonesProcessor;)Z -HSPLlibcore/util/TimeZoneFinder;->processXml(Llibcore/util/TimeZoneFinder$TimeZonesProcessor;)V HSPLlibcore/util/ZoneInfo$WallTime;-><init>()V HSPLlibcore/util/ZoneInfo$WallTime;->copyFieldsFromCalendar()V HSPLlibcore/util/ZoneInfo$WallTime;->copyFieldsToCalendar()V @@ -51943,22 +51960,6 @@ HSPLlibcore/util/ZoneInfo;->hasSameRules(Ljava/util/TimeZone;)Z HSPLlibcore/util/ZoneInfo;->hashCode()I HSPLlibcore/util/ZoneInfo;->inDaylightTime(Ljava/util/Date;)Z HSPLlibcore/util/ZoneInfo;->readTimeZone(Ljava/lang/String;Llibcore/io/BufferIterator;J)Llibcore/util/ZoneInfo; -HSPLlibcore/util/ZoneInfoDB$TzData$1;->create(Ljava/lang/Object;)Ljava/lang/Object; -HSPLlibcore/util/ZoneInfoDB$TzData$1;->create(Ljava/lang/String;)Llibcore/util/ZoneInfo; -HSPLlibcore/util/ZoneInfoDB$TzData;->close()V -HSPLlibcore/util/ZoneInfoDB$TzData;->finalize()V -HSPLlibcore/util/ZoneInfoDB$TzData;->getAvailableIDs()[Ljava/lang/String; -HSPLlibcore/util/ZoneInfoDB$TzData;->getBufferIterator(Ljava/lang/String;)Llibcore/io/BufferIterator; -HSPLlibcore/util/ZoneInfoDB$TzData;->hasTimeZone(Ljava/lang/String;)Z -HSPLlibcore/util/ZoneInfoDB$TzData;->loadData(Ljava/lang/String;)Z -HSPLlibcore/util/ZoneInfoDB$TzData;->loadTzDataWithFallback([Ljava/lang/String;)Llibcore/util/ZoneInfoDB$TzData; -HSPLlibcore/util/ZoneInfoDB$TzData;->makeTimeZone(Ljava/lang/String;)Llibcore/util/ZoneInfo; -HSPLlibcore/util/ZoneInfoDB$TzData;->makeTimeZoneUncached(Ljava/lang/String;)Llibcore/util/ZoneInfo; -HSPLlibcore/util/ZoneInfoDB$TzData;->readHeader()V -HSPLlibcore/util/ZoneInfoDB$TzData;->readIndex(Llibcore/io/BufferIterator;II)V -HSPLlibcore/util/ZoneInfoDB$TzData;->readZoneTab(Llibcore/io/BufferIterator;II)V -HSPLlibcore/util/ZoneInfoDB$TzData;->validateOffset(II)V -HSPLlibcore/util/ZoneInfoDB;->getInstance()Llibcore/util/ZoneInfoDB$TzData; HSPLorg/apache/harmony/dalvik/ddmc/Chunk;-><init>(ILjava/nio/ByteBuffer;)V HSPLorg/apache/harmony/dalvik/ddmc/ChunkHandler;->putString(Ljava/nio/ByteBuffer;Ljava/lang/String;)V HSPLorg/apache/harmony/dalvik/ddmc/ChunkHandler;->type(Ljava/lang/String;)I @@ -63390,13 +63391,21 @@ Llibcore/reflect/ParameterizedTypeImpl; Llibcore/reflect/TypeVariableImpl; Llibcore/reflect/Types; Llibcore/reflect/WildcardTypeImpl; -Llibcore/util/-$$Lambda$TimeZoneFinder$ReaderSupplier$IAVNuAYizGfcsPtGXEBkDPhlBF0; +Llibcore/timezone/-$$Lambda$TimeZoneFinder$ReaderSupplier$IAVNuAYizGfcsPtGXEBkDPhlBF0; +Llibcore/timezone/CountryTimeZones$OffsetResult; +Llibcore/timezone/CountryTimeZones$TimeZoneMapping; +Llibcore/timezone/CountryTimeZones; +Llibcore/timezone/TimeZoneDataFiles; +Llibcore/timezone/TimeZoneFinder$ReaderSupplier; +Llibcore/timezone/TimeZoneFinder$SelectiveCountryTimeZonesExtractor; +Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor; +Llibcore/timezone/TimeZoneFinder; +Llibcore/timezone/ZoneInfoDB$TzData$1; +Llibcore/timezone/ZoneInfoDB$TzData; +Llibcore/timezone/ZoneInfoDB; Llibcore/util/BasicLruCache; Llibcore/util/CharsetUtils; Llibcore/util/CollectionUtils; -Llibcore/util/CountryTimeZones$OffsetResult; -Llibcore/util/CountryTimeZones$TimeZoneMapping; -Llibcore/util/CountryTimeZones; Llibcore/util/EmptyArray; Llibcore/util/HexEncoding; Llibcore/util/NativeAllocationRegistry$CleanerRunner; @@ -63404,18 +63413,10 @@ Llibcore/util/NativeAllocationRegistry$CleanerThunk; Llibcore/util/NativeAllocationRegistry; Llibcore/util/Objects; Llibcore/util/SneakyThrow; -Llibcore/util/TimeZoneDataFiles; -Llibcore/util/TimeZoneFinder$ReaderSupplier; -Llibcore/util/TimeZoneFinder$SelectiveCountryTimeZonesExtractor; -Llibcore/util/TimeZoneFinder$TimeZonesProcessor; -Llibcore/util/TimeZoneFinder; Llibcore/util/ZoneInfo$CheckedArithmeticException; Llibcore/util/ZoneInfo$OffsetInterval; Llibcore/util/ZoneInfo$WallTime; Llibcore/util/ZoneInfo; -Llibcore/util/ZoneInfoDB$TzData$1; -Llibcore/util/ZoneInfoDB$TzData; -Llibcore/util/ZoneInfoDB; Lorg/apache/harmony/dalvik/NativeTestTarget; Lorg/apache/harmony/dalvik/ddmc/Chunk; Lorg/apache/harmony/dalvik/ddmc/ChunkHandler; diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 27133893d543..a0363ac785e2 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -1562,86 +1562,10 @@ Landroid/widget/QuickContactBadge$QueryHandler;-><init>(Landroid/widget/QuickCon Landroid/widget/RelativeLayout$DependencyGraph$Node;-><init>()V Landroid/widget/RemoteViews$OnClickHandler;-><init>()V Landroid/widget/ScrollBarDrawable;-><init>()V -Lcom/android/i18n/phonenumbers/AsYouTypeFormatter;->clear()V -Lcom/android/i18n/phonenumbers/AsYouTypeFormatter;->getRememberedPosition()I -Lcom/android/i18n/phonenumbers/AsYouTypeFormatter;->inputDigit(C)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/AsYouTypeFormatter;->inputDigitAndRememberPosition(C)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder;->getDescriptionForNumber(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;Ljava/util/Locale;)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder;->getInstance()Lcom/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder; -Lcom/android/i18n/phonenumbers/NumberParseException;->getErrorType()Lcom/android/i18n/phonenumbers/NumberParseException$ErrorType; -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->getDomesticCarrierCodeFormattingRule()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->getFormat()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->getLeadingDigitsPattern(I)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->getNationalPrefixFormattingRule()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->getPattern()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$NumberFormat;->leadingDigitsPatternSize()I -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->getCountryCode()I -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->getGeneralDesc()Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneNumberDesc; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->getNationalPrefixForParsing()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->getNationalPrefixTransformRule()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->getPreferredExtnPrefix()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->hasNationalPrefix()Z -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->hasPreferredExtnPrefix()Z -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->intlNumberFormats()Ljava/util/List; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadata;->numberFormats()Ljava/util/List; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadataCollection;-><init>()V -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneMetadataCollection;->getMetadataList()Ljava/util/List; -Lcom/android/i18n/phonenumbers/Phonemetadata$PhoneNumberDesc;->getNationalNumberPattern()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;->FROM_DEFAULT_COUNTRY:Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;->FROM_NUMBER_WITHOUT_PLUS_SIGN:Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;->FROM_NUMBER_WITH_IDD:Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;->FROM_NUMBER_WITH_PLUS_SIGN:Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource;->values()[Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->clearCountryCode()Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->getCountryCode()I -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->getCountryCodeSource()Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber$CountryCodeSource; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->getExtension()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->getNationalNumber()J -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->hasCountryCode()Z -Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;->hasExtension()Z -Lcom/android/i18n/phonenumbers/PhoneNumberMatch;->end()I -Lcom/android/i18n/phonenumbers/PhoneNumberMatch;->number()Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber; -Lcom/android/i18n/phonenumbers/PhoneNumberMatch;->rawString()Ljava/lang/String; -Lcom/android/i18n/phonenumbers/PhoneNumberMatch;->start()I -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$Leniency;->POSSIBLE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$Leniency; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->EXACT_MATCH:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->NOT_A_NUMBER:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->NO_MATCH:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->NSN_MATCH:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->SHORT_NSN_MATCH:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType;->values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;->E164:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;->INTERNATIONAL:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;->NATIONAL:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;->RFC3966:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat; Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;->values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->FIXED_LINE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->FIXED_LINE_OR_MOBILE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->MOBILE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->PAGER:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->PERSONAL_NUMBER:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->PREMIUM_RATE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->SHARED_COST:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->TOLL_FREE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->UAN:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->values()[Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->VOICEMAIL:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType;->VOIP:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$ValidationResult;->IS_POSSIBLE:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$ValidationResult; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil$ValidationResult;->TOO_LONG:Lcom/android/i18n/phonenumbers/PhoneNumberUtil$ValidationResult; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->findNumbers(Ljava/lang/CharSequence;Ljava/lang/String;Lcom/android/i18n/phonenumbers/PhoneNumberUtil$Leniency;J)Ljava/lang/Iterable; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->format(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberFormat;)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->formatInOriginalFormat(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;Ljava/lang/String;)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->getAsYouTypeFormatter(Ljava/lang/String;)Lcom/android/i18n/phonenumbers/AsYouTypeFormatter; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->getCountryCodeForRegion(Ljava/lang/String;)I -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->getInstance()Lcom/android/i18n/phonenumbers/PhoneNumberUtil; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->getNationalSignificantNumber(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->getNumberType(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Lcom/android/i18n/phonenumbers/PhoneNumberUtil$PhoneNumberType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->getRegionCodeForNumber(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Ljava/lang/String; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->isNumberMatch(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Lcom/android/i18n/phonenumbers/PhoneNumberUtil$MatchType; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->isPossibleNumber(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Z -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->isPossibleNumberWithReason(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Lcom/android/i18n/phonenumbers/PhoneNumberUtil$ValidationResult; -Lcom/android/i18n/phonenumbers/PhoneNumberUtil;->isValidNumber(Lcom/android/i18n/phonenumbers/Phonenumber$PhoneNumber;)Z Lcom/android/ims/ImsCall;->deflect(Ljava/lang/String;)V Lcom/android/ims/ImsCall;->isMultiparty()Z Lcom/android/ims/ImsCall;->reject(I)V @@ -4216,77 +4140,6 @@ Lcom/android/internal/widget/ViewPager$OnPageChangeListener;->onPageScrolled(IFI Lcom/android/internal/widget/ViewPager$OnPageChangeListener;->onPageScrollStateChanged(I)V Lcom/android/internal/widget/ViewPager$OnPageChangeListener;->onPageSelected(I)V Lcom/android/internal/widget/ViewPager;->getCurrentItem()I -Lcom/android/okhttp/Connection;->getSocket()Ljava/net/Socket; -Lcom/android/okhttp/ConnectionPool;->connections:Ljava/util/Deque; -Lcom/android/okhttp/ConnectionPool;->keepAliveDurationNs:J -Lcom/android/okhttp/ConnectionPool;->maxIdleConnections:I -Lcom/android/okhttp/ConnectionPool;->systemDefault:Lcom/android/okhttp/ConnectionPool; -Lcom/android/okhttp/HttpHandler;-><init>()V -Lcom/android/okhttp/HttpsHandler;-><init>()V -Lcom/android/okhttp/HttpUrl$Builder;->build()Lcom/android/okhttp/HttpUrl; -Lcom/android/okhttp/HttpUrl;->encodedPath()Ljava/lang/String; -Lcom/android/okhttp/HttpUrl;->newBuilder()Lcom/android/okhttp/HttpUrl$Builder; -Lcom/android/okhttp/HttpUrl;->parse(Ljava/lang/String;)Lcom/android/okhttp/HttpUrl; -Lcom/android/okhttp/HttpUrl;->query()Ljava/lang/String; -Lcom/android/okhttp/internal/http/HeaderParser;->skipUntil(Ljava/lang/String;ILjava/lang/String;)I -Lcom/android/okhttp/internal/http/HeaderParser;->skipWhitespace(Ljava/lang/String;I)I -Lcom/android/okhttp/internal/http/HttpDate;->format(Ljava/util/Date;)Ljava/lang/String; -Lcom/android/okhttp/internal/http/HttpDate;->parse(Ljava/lang/String;)Ljava/util/Date; -Lcom/android/okhttp/internal/http/HttpEngine;->getConnection()Lcom/android/okhttp/Connection; -Lcom/android/okhttp/internal/http/HttpEngine;->hasResponse()Z -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;->readResponse()V -Lcom/android/okhttp/internal/http/HttpEngine;->sendRequest()V -Lcom/android/okhttp/internal/http/HttpEngine;->sentRequestMillis:J -Lcom/android/okhttp/internal/http/HttpEngine;->userResponse:Lcom/android/okhttp/Response; -Lcom/android/okhttp/internal/http/HttpEngine;->writingRequestHeaders()V -Lcom/android/okhttp/internal/http/RouteSelector;->hasNext()Z -Lcom/android/okhttp/internal/huc/HttpsURLConnectionImpl;->delegate:Lcom/android/okhttp/internal/huc/HttpURLConnectionImpl; -Lcom/android/okhttp/internal/huc/HttpURLConnectionImpl;->client:Lcom/android/okhttp/OkHttpClient; -Lcom/android/okhttp/internal/huc/HttpURLConnectionImpl;->httpEngine:Lcom/android/okhttp/internal/http/HttpEngine; -Lcom/android/okhttp/internal/Internal;-><init>()V -Lcom/android/okhttp/internal/Internal;->addLenient(Lcom/android/okhttp/Headers$Builder;Ljava/lang/String;)V -Lcom/android/okhttp/internal/Internal;->addLenient(Lcom/android/okhttp/Headers$Builder;Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/okhttp/internal/Internal;->apply(Lcom/android/okhttp/ConnectionSpec;Ljavax/net/ssl/SSLSocket;Z)V -Lcom/android/okhttp/internal/Internal;->callEngineGetStreamAllocation(Lcom/android/okhttp/Call;)Lcom/android/okhttp/internal/http/StreamAllocation; -Lcom/android/okhttp/internal/Internal;->callEnqueue(Lcom/android/okhttp/Call;Lcom/android/okhttp/Callback;Z)V -Lcom/android/okhttp/internal/Internal;->connectionBecameIdle(Lcom/android/okhttp/ConnectionPool;Lcom/android/okhttp/internal/io/RealConnection;)Z -Lcom/android/okhttp/internal/Internal;->get(Lcom/android/okhttp/ConnectionPool;Lcom/android/okhttp/Address;Lcom/android/okhttp/internal/http/StreamAllocation;)Lcom/android/okhttp/internal/io/RealConnection; -Lcom/android/okhttp/internal/Internal;->getHttpUrlChecked(Ljava/lang/String;)Lcom/android/okhttp/HttpUrl; -Lcom/android/okhttp/internal/Internal;->instance:Lcom/android/okhttp/internal/Internal; -Lcom/android/okhttp/internal/Internal;->internalCache(Lcom/android/okhttp/OkHttpClient;)Lcom/android/okhttp/internal/InternalCache; -Lcom/android/okhttp/internal/Internal;->put(Lcom/android/okhttp/ConnectionPool;Lcom/android/okhttp/internal/io/RealConnection;)V -Lcom/android/okhttp/internal/Internal;->routeDatabase(Lcom/android/okhttp/ConnectionPool;)Lcom/android/okhttp/internal/RouteDatabase; -Lcom/android/okhttp/internal/Internal;->setCache(Lcom/android/okhttp/OkHttpClient;Lcom/android/okhttp/internal/InternalCache;)V -Lcom/android/okhttp/internal/Platform;->get()Lcom/android/okhttp/internal/Platform; -Lcom/android/okhttp/internal/Platform;->logW(Ljava/lang/String;)V -Lcom/android/okhttp/internal/Util;->closeAll(Ljava/io/Closeable;Ljava/io/Closeable;)V -Lcom/android/okhttp/internal/Util;->closeQuietly(Ljava/io/Closeable;)V -Lcom/android/okhttp/internal/Util;->EMPTY_BYTE_ARRAY:[B -Lcom/android/okhttp/internal/Util;->UTF_8:Ljava/nio/charset/Charset; -Lcom/android/okhttp/OkHttpClient;-><init>()V -Lcom/android/okhttp/OkHttpClient;->connectionPool:Lcom/android/okhttp/ConnectionPool; -Lcom/android/okhttp/OkHttpClient;->DEFAULT_PROTOCOLS:Ljava/util/List; -Lcom/android/okhttp/OkHttpClient;->dns:Lcom/android/okhttp/Dns; -Lcom/android/okhttp/OkHttpClient;->getConnectionPool()Lcom/android/okhttp/ConnectionPool; -Lcom/android/okhttp/OkHttpClient;->getCookieHandler()Ljava/net/CookieHandler; -Lcom/android/okhttp/OkHttpClient;->getHostnameVerifier()Ljavax/net/ssl/HostnameVerifier; -Lcom/android/okhttp/OkHttpClient;->getProxy()Ljava/net/Proxy; -Lcom/android/okhttp/OkHttpClient;->getProxySelector()Ljava/net/ProxySelector; -Lcom/android/okhttp/OkHttpClient;->getSslSocketFactory()Ljavax/net/ssl/SSLSocketFactory; -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/server/net/BaseNetworkObserver;-><init>()V Lcom/android/server/net/NetlinkTracker;-><init>(Ljava/lang/String;Lcom/android/server/net/NetlinkTracker$Callback;)V Lcom/android/server/net/NetlinkTracker;->clearLinkProperties()V @@ -4593,7 +4446,6 @@ Lcom/google/android/util/AbstractMessageParser$Token$Type;->PHOTO:Lcom/google/an Lcom/google/android/util/AbstractMessageParser$Token$Type;->SMILEY:Lcom/google/android/util/AbstractMessageParser$Token$Type; Lcom/google/android/util/AbstractMessageParser$Token$Type;->values()[Lcom/google/android/util/AbstractMessageParser$Token$Type; Lcom/google/android/util/AbstractMessageParser$Token$Type;->YOUTUBE_VIDEO:Lcom/google/android/util/AbstractMessageParser$Token$Type; -Lcom/sun/nio/file/ExtendedWatchEventModifier;->FILE_TREE:Lcom/sun/nio/file/ExtendedWatchEventModifier; Lgov/nist/core/Debug;->printStackTrace(Ljava/lang/Exception;)V Lgov/nist/core/GenericObject;-><init>()V Lgov/nist/core/GenericObject;->dbgPrint()V @@ -4733,178 +4585,9 @@ Lgov/nist/javax/sip/address/SipUri;->setParameter(Ljava/lang/String;Ljava/lang/S Lgov/nist/javax/sip/address/SipUri;->setUserParam(Ljava/lang/String;)V Lgov/nist/javax/sip/parser/URLParser;-><init>(Ljava/lang/String;)V Lgov/nist/javax/sip/parser/URLParser;->sipURL(Z)Lgov/nist/javax/sip/address/SipUri; -Ljava/lang/DexCache;->dexFile:J -Ljava/lang/invoke/SerializedLambda;-><init>(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V -Ljava/lang/invoke/SerializedLambda;->getCapturedArg(I)Ljava/lang/Object; -Ljava/lang/invoke/SerializedLambda;->getCapturedArgCount()I -Ljava/lang/invoke/SerializedLambda;->getCapturingClass()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getFunctionalInterfaceClass()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getFunctionalInterfaceMethodName()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getFunctionalInterfaceMethodSignature()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getImplClass()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getImplMethodKind()I -Ljava/lang/invoke/SerializedLambda;->getImplMethodName()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getImplMethodSignature()Ljava/lang/String; -Ljava/lang/invoke/SerializedLambda;->getInstantiatedMethodType()Ljava/lang/String; -Ljava/lang/UNIXProcess;->pid:I -Ljava/net/AddressCache$AddressCacheEntry;-><init>(Ljava/lang/Object;)V -Ljava/net/AddressCache$AddressCacheEntry;->expiryNanos:J -Ljava/net/AddressCache$AddressCacheEntry;->value:Ljava/lang/Object; -Ljava/net/AddressCache$AddressCacheKey;->mHostname:Ljava/lang/String; -Ljava/net/AddressCache;->cache:Llibcore/util/BasicLruCache; -Ljava/net/Inet6AddressImpl;->addressCache:Ljava/net/AddressCache; -Ljava/net/PlainSocketImpl;-><init>()V -Ljava/nio/DirectByteBuffer;->cleaner()Lsun/misc/Cleaner; -Ljava/nio/file/FileTreeWalker;->followLinks:Z -Ljava/nio/file/FileTreeWalker;->linkOptions:[Ljava/nio/file/LinkOption; -Ljava/nio/file/FileTreeWalker;->maxDepth:I -Ljava/util/zip/ZipFile$ZipEntryIterator;->nextElement()Ljava/util/zip/ZipEntry; Ljunit/framework/TestCase;->fName:Ljava/lang/String; Ljunit/framework/TestSuite;->isPublicTestMethod(Ljava/lang/reflect/Method;)Z Ljunit/framework/TestSuite;->isTestMethod(Ljava/lang/reflect/Method;)Z -Llibcore/icu/DateIntervalFormat;->formatDateRange(JJILjava/lang/String;)Ljava/lang/String; -Llibcore/icu/ICU;->CACHED_PATTERNS:Llibcore/util/BasicLruCache; -Llibcore/icu/ICU;->getBestDateTimePattern(Ljava/lang/String;Ljava/util/Locale;)Ljava/lang/String; -Llibcore/icu/ICU;->getBestDateTimePatternNative(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Llibcore/icu/ICU;->getDateFormatOrder(Ljava/lang/String;)[C -Llibcore/icu/LocaleData;->firstDayOfWeek:Ljava/lang/Integer; -Llibcore/icu/LocaleData;->get(Ljava/util/Locale;)Llibcore/icu/LocaleData; -Llibcore/icu/LocaleData;->longStandAloneWeekdayNames:[Ljava/lang/String; -Llibcore/icu/LocaleData;->mapInvalidAndNullLocales(Ljava/util/Locale;)Ljava/util/Locale; -Llibcore/icu/LocaleData;->minimalDaysInFirstWeek:Ljava/lang/Integer; -Llibcore/icu/LocaleData;->shortMonthNames:[Ljava/lang/String; -Llibcore/icu/LocaleData;->shortStandAloneMonthNames:[Ljava/lang/String; -Llibcore/icu/LocaleData;->shortStandAloneWeekdayNames:[Ljava/lang/String; -Llibcore/icu/LocaleData;->timeFormat_Hm:Ljava/lang/String; -Llibcore/icu/LocaleData;->timeFormat_hm:Ljava/lang/String; -Llibcore/icu/LocaleData;->today:Ljava/lang/String; -Llibcore/icu/LocaleData;->tomorrow:Ljava/lang/String; -Llibcore/icu/LocaleData;->zeroDigit:C -Llibcore/icu/TimeZoneNames;->forLocale(Ljava/util/Locale;)[Ljava/lang/String; -Llibcore/io/AsynchronousCloseMonitor;->signalBlockedThreads(Ljava/io/FileDescriptor;)V -Llibcore/io/BlockGuardOs;-><init>(Llibcore/io/Os;)V -Llibcore/io/BlockGuardOs;->chmod(Ljava/lang/String;I)V -Llibcore/io/BlockGuardOs;->chown(Ljava/lang/String;II)V -Llibcore/io/BlockGuardOs;->close(Ljava/io/FileDescriptor;)V -Llibcore/io/BlockGuardOs;->fchmod(Ljava/io/FileDescriptor;I)V -Llibcore/io/BlockGuardOs;->fchown(Ljava/io/FileDescriptor;II)V -Llibcore/io/BlockGuardOs;->fdatasync(Ljava/io/FileDescriptor;)V -Llibcore/io/BlockGuardOs;->fstat(Ljava/io/FileDescriptor;)Landroid/system/StructStat; -Llibcore/io/BlockGuardOs;->fstatvfs(Ljava/io/FileDescriptor;)Landroid/system/StructStatVfs; -Llibcore/io/BlockGuardOs;->lchown(Ljava/lang/String;II)V -Llibcore/io/BlockGuardOs;->link(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/BlockGuardOs;->lseek(Ljava/io/FileDescriptor;JI)J -Llibcore/io/BlockGuardOs;->lstat(Ljava/lang/String;)Landroid/system/StructStat; -Llibcore/io/BlockGuardOs;->mkdir(Ljava/lang/String;I)V -Llibcore/io/BlockGuardOs;->mkfifo(Ljava/lang/String;I)V -Llibcore/io/BlockGuardOs;->open(Ljava/lang/String;II)Ljava/io/FileDescriptor; -Llibcore/io/BlockGuardOs;->posix_fallocate(Ljava/io/FileDescriptor;JJ)V -Llibcore/io/BlockGuardOs;->pread(Ljava/io/FileDescriptor;Ljava/nio/ByteBuffer;J)I -Llibcore/io/BlockGuardOs;->pread(Ljava/io/FileDescriptor;[BIIJ)I -Llibcore/io/BlockGuardOs;->pwrite(Ljava/io/FileDescriptor;Ljava/nio/ByteBuffer;J)I -Llibcore/io/BlockGuardOs;->pwrite(Ljava/io/FileDescriptor;[BIIJ)I -Llibcore/io/BlockGuardOs;->read(Ljava/io/FileDescriptor;Ljava/nio/ByteBuffer;)I -Llibcore/io/BlockGuardOs;->read(Ljava/io/FileDescriptor;[BII)I -Llibcore/io/BlockGuardOs;->readlink(Ljava/lang/String;)Ljava/lang/String; -Llibcore/io/BlockGuardOs;->readv(Ljava/io/FileDescriptor;[Ljava/lang/Object;[I[I)I -Llibcore/io/BlockGuardOs;->realpath(Ljava/lang/String;)Ljava/lang/String; -Llibcore/io/BlockGuardOs;->remove(Ljava/lang/String;)V -Llibcore/io/BlockGuardOs;->rename(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/BlockGuardOs;->stat(Ljava/lang/String;)Landroid/system/StructStat; -Llibcore/io/BlockGuardOs;->statvfs(Ljava/lang/String;)Landroid/system/StructStatVfs; -Llibcore/io/BlockGuardOs;->symlink(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/BlockGuardOs;->write(Ljava/io/FileDescriptor;Ljava/nio/ByteBuffer;)I -Llibcore/io/BlockGuardOs;->write(Ljava/io/FileDescriptor;[BII)I -Llibcore/io/BlockGuardOs;->writev(Ljava/io/FileDescriptor;[Ljava/lang/Object;[I[I)I -Llibcore/io/BufferIterator;->readByte()B -Llibcore/io/BufferIterator;->readByteArray([BII)V -Llibcore/io/BufferIterator;->readInt()I -Llibcore/io/BufferIterator;->readIntArray([III)V -Llibcore/io/BufferIterator;->seek(I)V -Llibcore/io/BufferIterator;->skip(I)V -Llibcore/io/DropBox;->addText(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/ForwardingOs;-><init>(Llibcore/io/Os;)V -Llibcore/io/ForwardingOs;->access(Ljava/lang/String;I)Z -Llibcore/io/ForwardingOs;->chmod(Ljava/lang/String;I)V -Llibcore/io/ForwardingOs;->chown(Ljava/lang/String;II)V -Llibcore/io/ForwardingOs;->getenv(Ljava/lang/String;)Ljava/lang/String; -Llibcore/io/ForwardingOs;->lchown(Ljava/lang/String;II)V -Llibcore/io/ForwardingOs;->link(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/ForwardingOs;->lstat(Ljava/lang/String;)Landroid/system/StructStat; -Llibcore/io/ForwardingOs;->mkdir(Ljava/lang/String;I)V -Llibcore/io/ForwardingOs;->mkfifo(Ljava/lang/String;I)V -Llibcore/io/ForwardingOs;->open(Ljava/lang/String;II)Ljava/io/FileDescriptor; -Llibcore/io/ForwardingOs;->os:Llibcore/io/Os; -Llibcore/io/ForwardingOs;->readlink(Ljava/lang/String;)Ljava/lang/String; -Llibcore/io/ForwardingOs;->remove(Ljava/lang/String;)V -Llibcore/io/ForwardingOs;->removexattr(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/ForwardingOs;->rename(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/ForwardingOs;->setenv(Ljava/lang/String;Ljava/lang/String;Z)V -Llibcore/io/ForwardingOs;->setsockoptTimeval(Ljava/io/FileDescriptor;IILandroid/system/StructTimeval;)V -Llibcore/io/ForwardingOs;->setxattr(Ljava/lang/String;Ljava/lang/String;[BI)V -Llibcore/io/ForwardingOs;->stat(Ljava/lang/String;)Landroid/system/StructStat; -Llibcore/io/ForwardingOs;->statvfs(Ljava/lang/String;)Landroid/system/StructStatVfs; -Llibcore/io/ForwardingOs;->symlink(Ljava/lang/String;Ljava/lang/String;)V -Llibcore/io/ForwardingOs;->sysconf(I)J -Llibcore/io/ForwardingOs;->unlink(Ljava/lang/String;)V -Llibcore/io/IoBridge;->isConnected(Ljava/io/FileDescriptor;Ljava/net/InetAddress;III)Z -Llibcore/io/IoUtils;->closeQuietly(Ljava/io/FileDescriptor;)V -Llibcore/io/IoUtils;->closeQuietly(Ljava/lang/AutoCloseable;)V -Llibcore/io/IoUtils;->closeQuietly(Ljava/net/Socket;)V -Llibcore/io/IoUtils;->readFileAsByteArray(Ljava/lang/String;)[B -Llibcore/io/IoUtils;->readFileAsString(Ljava/lang/String;)Ljava/lang/String; -Llibcore/io/IoUtils;->setBlocking(Ljava/io/FileDescriptor;Z)V -Llibcore/io/MemoryMappedFile;->bigEndianIterator()Llibcore/io/BufferIterator; -Llibcore/io/MemoryMappedFile;->mmapRO(Ljava/lang/String;)Llibcore/io/MemoryMappedFile; -Llibcore/io/Os;->chmod(Ljava/lang/String;I)V -Llibcore/io/Os;->close(Ljava/io/FileDescriptor;)V -Llibcore/io/Os;->connect(Ljava/io/FileDescriptor;Ljava/net/InetAddress;I)V -Llibcore/io/Os;->gai_strerror(I)Ljava/lang/String; -Llibcore/io/Os;->remove(Ljava/lang/String;)V -Llibcore/io/Os;->setenv(Ljava/lang/String;Ljava/lang/String;Z)V -Llibcore/io/Os;->setsockoptTimeval(Ljava/io/FileDescriptor;IILandroid/system/StructTimeval;)V -Llibcore/io/Os;->stat(Ljava/lang/String;)Landroid/system/StructStat; -Llibcore/io/Os;->strerror(I)Ljava/lang/String; -Llibcore/io/Os;->sysconf(I)J -Llibcore/io/Streams;->readAsciiLine(Ljava/io/InputStream;)Ljava/lang/String; -Llibcore/io/Streams;->readFully(Ljava/io/InputStream;)[B -Llibcore/io/Streams;->readFully(Ljava/io/InputStream;[B)V -Llibcore/io/Streams;->readSingleByte(Ljava/io/InputStream;)I -Llibcore/io/Streams;->skipAll(Ljava/io/InputStream;)V -Llibcore/io/Streams;->writeSingleByte(Ljava/io/OutputStream;I)V -Llibcore/net/event/NetworkEventDispatcher;->addListener(Llibcore/net/event/NetworkEventListener;)V -Llibcore/net/event/NetworkEventDispatcher;->getInstance()Llibcore/net/event/NetworkEventDispatcher; -Llibcore/net/event/NetworkEventListener;-><init>()V -Llibcore/net/http/HttpDate;->format(Ljava/util/Date;)Ljava/lang/String; -Llibcore/net/http/HttpDate;->parse(Ljava/lang/String;)Ljava/util/Date; -Llibcore/net/MimeUtils;->guessExtensionFromMimeType(Ljava/lang/String;)Ljava/lang/String; -Llibcore/net/MimeUtils;->guessMimeTypeFromExtension(Ljava/lang/String;)Ljava/lang/String; -Llibcore/net/NetworkSecurityPolicy;->isCleartextTrafficPermitted()Z -Llibcore/util/BasicLruCache;-><init>(I)V -Llibcore/util/BasicLruCache;->evictAll()V -Llibcore/util/BasicLruCache;->get(Ljava/lang/Object;)Ljava/lang/Object; -Llibcore/util/BasicLruCache;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; -Llibcore/util/EmptyArray;->BYTE:[B -Llibcore/util/EmptyArray;->INT:[I -Llibcore/util/EmptyArray;->OBJECT:[Ljava/lang/Object; -Llibcore/util/ZoneInfoDB$TzData;-><init>()V -Lorg/apache/harmony/dalvik/ddmc/Chunk;-><init>(ILjava/nio/ByteBuffer;)V -Lorg/apache/harmony/dalvik/ddmc/ChunkHandler;->CHUNK_ORDER:Ljava/nio/ByteOrder; -Lorg/apache/harmony/dalvik/ddmc/DdmServer;->broadcast(I)V -Lorg/apache/harmony/dalvik/ddmc/DdmServer;->sendChunk(Lorg/apache/harmony/dalvik/ddmc/Chunk;)V -Lorg/apache/harmony/dalvik/ddmc/DdmVmInternal;->getThreadStats()[B -Lorg/apache/harmony/xml/dom/ElementImpl;->localName:Ljava/lang/String; -Lorg/apache/harmony/xml/ExpatAttributes;-><init>()V -Lorg/apache/harmony/xml/ExpatParser$EntityParser;->depth:I -Lorg/apache/harmony/xml/ExpatParser;-><init>(Ljava/lang/String;Lorg/apache/harmony/xml/ExpatReader;ZLjava/lang/String;Ljava/lang/String;)V -Lorg/apache/harmony/xml/ExpatParser;->append([BII)V -Lorg/apache/harmony/xml/ExpatParser;->append([CII)V -Lorg/apache/harmony/xml/ExpatParser;->attributes:Lorg/apache/harmony/xml/ExpatAttributes; -Lorg/apache/harmony/xml/ExpatParser;->cloneAttributes()Lorg/xml/sax/Attributes; -Lorg/apache/harmony/xml/ExpatParser;->finish()V -Lorg/apache/harmony/xml/ExpatParser;->xmlReader:Lorg/apache/harmony/xml/ExpatReader; -Lorg/apache/harmony/xml/ExpatReader;-><init>()V -Lorg/apache/harmony/xml/ExpatReader;->contentHandler:Lorg/xml/sax/ContentHandler; Lorg/apache/xalan/extensions/ExpressionContext;->getContextNode()Lorg/w3c/dom/Node; Lorg/apache/xalan/extensions/ExpressionContext;->getErrorListener()Ljavax/xml/transform/ErrorListener; Lorg/apache/xalan/extensions/ExpressionContext;->getVariableOrParam(Lorg/apache/xml/utils/QName;)Lorg/apache/xpath/objects/XObject; @@ -5583,431 +5266,3 @@ Lorg/ccil/cowan/tagsoup/XMLWriter;->htmlMode:Z Lorg/ccil/cowan/tagsoup/XMLWriter;->setOutput(Ljava/io/Writer;)V Lorg/ccil/cowan/tagsoup/XMLWriter;->setOutputProperty(Ljava/lang/String;Ljava/lang/String;)V Lorg/ccil/cowan/tagsoup/XMLWriter;->setPrefix(Ljava/lang/String;Ljava/lang/String;)V -Lorg/xml/sax/helpers/NamespaceSupport$Context;-><init>(Lorg/xml/sax/helpers/NamespaceSupport;)V -Lorg/xml/sax/helpers/ParserAdapter$AttributeListAdapter;-><init>(Lorg/xml/sax/helpers/ParserAdapter;)V -Lsun/misc/ASCIICaseInsensitiveComparator;->CASE_INSENSITIVE_ORDER:Ljava/util/Comparator; -Lsun/misc/ASCIICaseInsensitiveComparator;->lowerCaseHashCode(Ljava/lang/String;)I -Lsun/misc/BASE64Decoder;-><init>()V -Lsun/misc/BASE64Decoder;->pem_convert_array:[B -Lsun/misc/BASE64Encoder;-><init>()V -Lsun/misc/BASE64Encoder;->pem_array:[C -Lsun/misc/CEFormatException;-><init>(Ljava/lang/String;)V -Lsun/misc/CEStreamExhausted;-><init>()V -Lsun/misc/CharacterDecoder;-><init>()V -Lsun/misc/CharacterEncoder;-><init>()V -Lsun/misc/CharacterEncoder;->encodeBuffer([B)Ljava/lang/String; -Lsun/misc/CharacterEncoder;->encodeBufferPrefix(Ljava/io/OutputStream;)V -Lsun/misc/CharacterEncoder;->pStream:Ljava/io/PrintStream; -Lsun/misc/Cleaner;->create(Ljava/lang/Object;Ljava/lang/Runnable;)Lsun/misc/Cleaner; -Lsun/misc/FloatingDecimal;->$assertionsDisabled:Z -Lsun/misc/FloatingDecimal;->getHexDigit(Ljava/lang/String;I)I -Lsun/misc/FloatingDecimal;->stripLeadingZeros(Ljava/lang/String;)Ljava/lang/String; -Lsun/misc/FormattedFloatingDecimal$Form;->COMPATIBLE:Lsun/misc/FormattedFloatingDecimal$Form; -Lsun/misc/FormattedFloatingDecimal$Form;->DECIMAL_FLOAT:Lsun/misc/FormattedFloatingDecimal$Form; -Lsun/misc/FormattedFloatingDecimal$Form;->SCIENTIFIC:Lsun/misc/FormattedFloatingDecimal$Form; -Lsun/misc/FormattedFloatingDecimal;->$assertionsDisabled:Z -Lsun/misc/FpUtils;->$assertionsDisabled:Z -Lsun/misc/FpUtils;->rawCopySign(DD)D -Lsun/misc/HexDumpEncoder;-><init>()V -Lsun/misc/HexDumpEncoder;->currentByte:I -Lsun/misc/HexDumpEncoder;->offset:I -Lsun/misc/HexDumpEncoder;->thisLine:[B -Lsun/misc/HexDumpEncoder;->thisLineLength:I -Lsun/misc/IOUtils;->readFully(Ljava/io/InputStream;IZ)[B -Lsun/misc/JarIndex;-><init>([Ljava/lang/String;)V -Lsun/misc/JarIndex;->write(Ljava/io/OutputStream;)V -Lsun/misc/MessageUtils;-><init>()V -Lsun/misc/MetaIndex;->forJar(Ljava/io/File;)Lsun/misc/MetaIndex; -Lsun/misc/MetaIndex;->registerDirectory(Ljava/io/File;)V -Lsun/misc/VM;->maxDirectMemory()J -Lsun/net/ftp/FtpClient;-><init>()V -Lsun/net/util/IPAddressUtil;->isIPv4LiteralAddress(Ljava/lang/String;)Z -Lsun/net/util/IPAddressUtil;->isIPv6LiteralAddress(Ljava/lang/String;)Z -Lsun/net/www/MessageHeader;-><init>()V -Lsun/net/www/MessageHeader;-><init>(Ljava/io/InputStream;)V -Lsun/net/www/MessageHeader;->add(Ljava/lang/String;Ljava/lang/String;)V -Lsun/net/www/MessageHeader;->findValue(Ljava/lang/String;)Ljava/lang/String; -Lsun/net/www/MessageHeader;->prepend(Ljava/lang/String;Ljava/lang/String;)V -Lsun/net/www/MessageHeader;->print(Ljava/io/PrintStream;)V -Lsun/net/www/MessageHeader;->set(Ljava/lang/String;Ljava/lang/String;)V -Lsun/net/www/ParseUtil;->decode(Ljava/lang/String;)Ljava/lang/String; -Lsun/net/www/ParseUtil;->encodePath(Ljava/lang/String;Z)Ljava/lang/String; -Lsun/net/www/ParseUtil;->fileToEncodedURL(Ljava/io/File;)Ljava/net/URL; -Lsun/net/www/URLConnection;-><init>(Ljava/net/URL;)V -Lsun/net/www/URLConnection;->setProperties(Lsun/net/www/MessageHeader;)V -Lsun/nio/ch/DirectBuffer;->address()J -Lsun/nio/ch/FileChannelImpl;->unmap0(JJ)I -Lsun/nio/ch/SelectorImpl;->publicSelectedKeys:Ljava/util/Set; -Lsun/nio/ch/SelectorImpl;->selectedKeys:Ljava/util/Set; -Lsun/nio/cs/HistoricallyNamedCharset;->historicalName()Ljava/lang/String; -Lsun/nio/cs/ThreadLocalCoders;->decoderFor(Ljava/lang/Object;)Ljava/nio/charset/CharsetDecoder; -Lsun/nio/fs/BasicFileAttributesHolder;->get()Ljava/nio/file/attribute/BasicFileAttributes; -Lsun/reflect/misc/ReflectUtil;->checkPackageAccess(Ljava/lang/Class;)V -Lsun/reflect/misc/ReflectUtil;->checkPackageAccess(Ljava/lang/String;)V -Lsun/reflect/misc/ReflectUtil;->isPackageAccessible(Ljava/lang/Class;)Z -Lsun/reflect/misc/ReflectUtil;->isSubclassOf(Ljava/lang/Class;Ljava/lang/Class;)Z -Lsun/reflect/Reflection;->ensureMemberAccess(Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;I)V -Lsun/reflect/Reflection;->isSubclassOf(Ljava/lang/Class;Ljava/lang/Class;)Z -Lsun/security/action/GetBooleanAction;-><init>(Ljava/lang/String;)V -Lsun/security/action/GetIntegerAction;-><init>(Ljava/lang/String;I)V -Lsun/security/action/GetPropertyAction;-><init>(Ljava/lang/String;)V -Lsun/security/action/GetPropertyAction;-><init>(Ljava/lang/String;Ljava/lang/String;)V -Lsun/security/jca/GetInstance$Instance;->impl:Ljava/lang/Object; -Lsun/security/jca/GetInstance$Instance;->provider:Ljava/security/Provider; -Lsun/security/jca/GetInstance;->getInstance(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Lsun/security/jca/GetInstance$Instance; -Lsun/security/jca/GetInstance;->getInstance(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)Lsun/security/jca/GetInstance$Instance; -Lsun/security/jca/GetInstance;->getInstance(Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;Ljava/security/Provider;)Lsun/security/jca/GetInstance$Instance; -Lsun/security/jca/JCAUtil;->getSecureRandom()Ljava/security/SecureRandom; -Lsun/security/jca/ProviderConfig;->argument:Ljava/lang/String; -Lsun/security/jca/ProviderConfig;->CL_STRING:[Ljava/lang/Class; -Lsun/security/jca/ProviderConfig;->disableLoad()V -Lsun/security/jca/ProviderConfig;->hasArgument()Z -Lsun/security/jca/ProviderList;->getService(Ljava/lang/String;Ljava/lang/String;)Ljava/security/Provider$Service; -Lsun/security/jca/Providers;->getProviderList()Lsun/security/jca/ProviderList; -Lsun/security/jca/Providers;->startJarVerification()Ljava/lang/Object; -Lsun/security/jca/Providers;->stopJarVerification(Ljava/lang/Object;)V -Lsun/security/pkcs/ContentInfo;-><init>(Lsun/security/util/ObjectIdentifier;Lsun/security/util/DerValue;)V -Lsun/security/pkcs/ContentInfo;-><init>([B)V -Lsun/security/pkcs/ContentInfo;->DATA_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/pkcs/ContentInfo;->encode(Lsun/security/util/DerOutputStream;)V -Lsun/security/pkcs/ContentInfo;->getData()[B -Lsun/security/pkcs/ParsingException;-><init>(Ljava/lang/String;)V -Lsun/security/pkcs/PKCS7;-><init>([B)V -Lsun/security/pkcs/PKCS7;-><init>([Lsun/security/x509/AlgorithmId;Lsun/security/pkcs/ContentInfo;[Ljava/security/cert/X509Certificate;[Ljava/security/cert/X509CRL;[Lsun/security/pkcs/SignerInfo;)V -Lsun/security/pkcs/PKCS7;-><init>([Lsun/security/x509/AlgorithmId;Lsun/security/pkcs/ContentInfo;[Ljava/security/cert/X509Certificate;[Lsun/security/pkcs/SignerInfo;)V -Lsun/security/pkcs/PKCS7;->encodeSignedData(Ljava/io/OutputStream;)V -Lsun/security/pkcs/PKCS7;->getCertificates()[Ljava/security/cert/X509Certificate; -Lsun/security/pkcs/PKCS7;->getContentInfo()Lsun/security/pkcs/ContentInfo; -Lsun/security/pkcs/PKCS7;->getSignerInfos()[Lsun/security/pkcs/SignerInfo; -Lsun/security/pkcs/PKCS7;->verify(Lsun/security/pkcs/SignerInfo;[B)Lsun/security/pkcs/SignerInfo; -Lsun/security/pkcs/PKCS7;->verify([B)[Lsun/security/pkcs/SignerInfo; -Lsun/security/pkcs/PKCS8Key;-><init>()V -Lsun/security/pkcs/PKCS8Key;->algid:Lsun/security/x509/AlgorithmId; -Lsun/security/pkcs/PKCS8Key;->encodedKey:[B -Lsun/security/pkcs/PKCS8Key;->key:[B -Lsun/security/pkcs/PKCS9Attribute;-><init>(Ljava/lang/String;Ljava/lang/Object;)V -Lsun/security/pkcs/PKCS9Attribute;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/pkcs/PKCS9Attribute;-><init>(Lsun/security/util/ObjectIdentifier;Ljava/lang/Object;)V -Lsun/security/pkcs/PKCS9Attribute;->CONTENT_TYPE_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/pkcs/PKCS9Attribute;->derEncode(Ljava/io/OutputStream;)V -Lsun/security/pkcs/PKCS9Attribute;->EMAIL_ADDRESS_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/pkcs/PKCS9Attribute;->getOID()Lsun/security/util/ObjectIdentifier; -Lsun/security/pkcs/PKCS9Attribute;->getValue()Ljava/lang/Object; -Lsun/security/pkcs/PKCS9Attribute;->MESSAGE_DIGEST_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/pkcs/PKCS9Attribute;->SIGNING_TIME_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/pkcs/PKCS9Attributes;-><init>(Lsun/security/util/DerInputStream;)V -Lsun/security/pkcs/PKCS9Attributes;-><init>(Lsun/security/util/DerInputStream;Z)V -Lsun/security/pkcs/PKCS9Attributes;-><init>([Lsun/security/pkcs/PKCS9Attribute;)V -Lsun/security/pkcs/PKCS9Attributes;->encode(BLjava/io/OutputStream;)V -Lsun/security/pkcs/PKCS9Attributes;->getAttribute(Ljava/lang/String;)Lsun/security/pkcs/PKCS9Attribute; -Lsun/security/pkcs/PKCS9Attributes;->getAttributeValue(Lsun/security/util/ObjectIdentifier;)Ljava/lang/Object; -Lsun/security/pkcs/PKCS9Attributes;->getDerEncoding()[B -Lsun/security/pkcs/SignerInfo;-><init>(Lsun/security/x509/X500Name;Ljava/math/BigInteger;Lsun/security/x509/AlgorithmId;Lsun/security/pkcs/PKCS9Attributes;Lsun/security/x509/AlgorithmId;[BLsun/security/pkcs/PKCS9Attributes;)V -Lsun/security/pkcs/SignerInfo;-><init>(Lsun/security/x509/X500Name;Ljava/math/BigInteger;Lsun/security/x509/AlgorithmId;Lsun/security/x509/AlgorithmId;[B)V -Lsun/security/pkcs/SignerInfo;->getCertificate(Lsun/security/pkcs/PKCS7;)Ljava/security/cert/X509Certificate; -Lsun/security/pkcs/SignerInfo;->getCertificateChain(Lsun/security/pkcs/PKCS7;)Ljava/util/ArrayList; -Lsun/security/pkcs/SignerInfo;->getDigestAlgorithmId()Lsun/security/x509/AlgorithmId; -Lsun/security/pkcs/SignerInfo;->getDigestEncryptionAlgorithmId()Lsun/security/x509/AlgorithmId; -Lsun/security/pkcs/SignerInfo;->getEncryptedDigest()[B -Lsun/security/provider/certpath/X509CertificatePair;->clearCache()V -Lsun/security/provider/certpath/X509CertPath;-><init>(Ljava/io/InputStream;)V -Lsun/security/provider/certpath/X509CertPath;-><init>(Ljava/io/InputStream;Ljava/lang/String;)V -Lsun/security/provider/certpath/X509CertPath;-><init>(Ljava/util/List;)V -Lsun/security/provider/certpath/X509CertPath;->certs:Ljava/util/List; -Lsun/security/provider/certpath/X509CertPath;->getEncodingsStatic()Ljava/util/Iterator; -Lsun/security/provider/X509Factory;->addToCache(Lsun/security/util/Cache;[BLjava/lang/Object;)V -Lsun/security/provider/X509Factory;->certCache:Lsun/security/util/Cache; -Lsun/security/provider/X509Factory;->crlCache:Lsun/security/util/Cache; -Lsun/security/provider/X509Factory;->getFromCache(Lsun/security/util/Cache;[B)Ljava/lang/Object; -Lsun/security/provider/X509Factory;->intern(Ljava/security/cert/X509Certificate;)Lsun/security/x509/X509CertImpl; -Lsun/security/provider/X509Factory;->intern(Ljava/security/cert/X509CRL;)Lsun/security/x509/X509CRLImpl; -Lsun/security/timestamp/TimestampToken;-><init>([B)V -Lsun/security/timestamp/TimestampToken;->getDate()Ljava/util/Date; -Lsun/security/timestamp/TimestampToken;->getHashAlgorithm()Lsun/security/x509/AlgorithmId; -Lsun/security/timestamp/TimestampToken;->getHashedMessage()[B -Lsun/security/timestamp/TimestampToken;->getNonce()Ljava/math/BigInteger; -Lsun/security/util/BitArray;-><init>(I[B)V -Lsun/security/util/BitArray;->toByteArray()[B -Lsun/security/util/Cache;-><init>()V -Lsun/security/util/Cache;->clear()V -Lsun/security/util/Cache;->get(Ljava/lang/Object;)Ljava/lang/Object; -Lsun/security/util/Cache;->newHardMemoryCache(I)Lsun/security/util/Cache; -Lsun/security/util/Cache;->put(Ljava/lang/Object;Ljava/lang/Object;)V -Lsun/security/util/Debug;->getInstance(Ljava/lang/String;)Lsun/security/util/Debug; -Lsun/security/util/Debug;->println()V -Lsun/security/util/Debug;->println(Ljava/lang/String;)V -Lsun/security/util/Debug;->toHexString(Ljava/math/BigInteger;)Ljava/lang/String; -Lsun/security/util/DerIndefLenConverter;-><init>()V -Lsun/security/util/DerIndefLenConverter;->convert([B)[B -Lsun/security/util/DerIndefLenConverter;->data:[B -Lsun/security/util/DerIndefLenConverter;->dataPos:I -Lsun/security/util/DerIndefLenConverter;->dataSize:I -Lsun/security/util/DerIndefLenConverter;->isIndefinite(I)Z -Lsun/security/util/DerIndefLenConverter;->newData:[B -Lsun/security/util/DerIndefLenConverter;->numOfTotalLenBytes:I -Lsun/security/util/DerIndefLenConverter;->parseLength()I -Lsun/security/util/DerIndefLenConverter;->parseTag()V -Lsun/security/util/DerIndefLenConverter;->parseValue(I)V -Lsun/security/util/DerIndefLenConverter;->writeLengthAndValue()V -Lsun/security/util/DerIndefLenConverter;->writeTag()V -Lsun/security/util/DerInputStream;-><init>([B)V -Lsun/security/util/DerInputStream;->available()I -Lsun/security/util/DerInputStream;->getBigInteger()Ljava/math/BigInteger; -Lsun/security/util/DerInputStream;->getBitString()[B -Lsun/security/util/DerInputStream;->getDerValue()Lsun/security/util/DerValue; -Lsun/security/util/DerInputStream;->getInteger()I -Lsun/security/util/DerInputStream;->getOctetString()[B -Lsun/security/util/DerInputStream;->getOID()Lsun/security/util/ObjectIdentifier; -Lsun/security/util/DerInputStream;->getSequence(I)[Lsun/security/util/DerValue; -Lsun/security/util/DerInputStream;->getSet(I)[Lsun/security/util/DerValue; -Lsun/security/util/DerInputStream;->getSet(IZ)[Lsun/security/util/DerValue; -Lsun/security/util/DerInputStream;->getUTCTime()Ljava/util/Date; -Lsun/security/util/DerInputStream;->getUTF8String()Ljava/lang/String; -Lsun/security/util/DerInputStream;->mark(I)V -Lsun/security/util/DerInputStream;->peekByte()I -Lsun/security/util/DerInputStream;->reset()V -Lsun/security/util/DerInputStream;->subStream(IZ)Lsun/security/util/DerInputStream; -Lsun/security/util/DerInputStream;->tag:B -Lsun/security/util/DerOutputStream;-><init>()V -Lsun/security/util/DerOutputStream;-><init>(I)V -Lsun/security/util/DerOutputStream;->putBitString([B)V -Lsun/security/util/DerOutputStream;->putBoolean(Z)V -Lsun/security/util/DerOutputStream;->putDerValue(Lsun/security/util/DerValue;)V -Lsun/security/util/DerOutputStream;->putIA5String(Ljava/lang/String;)V -Lsun/security/util/DerOutputStream;->putInteger(I)V -Lsun/security/util/DerOutputStream;->putInteger(Ljava/math/BigInteger;)V -Lsun/security/util/DerOutputStream;->putNull()V -Lsun/security/util/DerOutputStream;->putOctetString([B)V -Lsun/security/util/DerOutputStream;->putOID(Lsun/security/util/ObjectIdentifier;)V -Lsun/security/util/DerOutputStream;->putOrderedSetOf(B[Lsun/security/util/DerEncoder;)V -Lsun/security/util/DerOutputStream;->putPrintableString(Ljava/lang/String;)V -Lsun/security/util/DerOutputStream;->putSequence([Lsun/security/util/DerValue;)V -Lsun/security/util/DerOutputStream;->putUTCTime(Ljava/util/Date;)V -Lsun/security/util/DerOutputStream;->putUTF8String(Ljava/lang/String;)V -Lsun/security/util/DerOutputStream;->write(BLsun/security/util/DerOutputStream;)V -Lsun/security/util/DerOutputStream;->write(B[B)V -Lsun/security/util/DerValue;-><init>(B[B)V -Lsun/security/util/DerValue;-><init>(Ljava/io/InputStream;)V -Lsun/security/util/DerValue;-><init>(Ljava/lang/String;)V -Lsun/security/util/DerValue;-><init>([B)V -Lsun/security/util/DerValue;-><init>([BII)V -Lsun/security/util/DerValue;->buffer:Lsun/security/util/DerInputBuffer; -Lsun/security/util/DerValue;->createTag(BZB)B -Lsun/security/util/DerValue;->data:Lsun/security/util/DerInputStream; -Lsun/security/util/DerValue;->encode(Lsun/security/util/DerOutputStream;)V -Lsun/security/util/DerValue;->getAsString()Ljava/lang/String; -Lsun/security/util/DerValue;->getBigInteger()Ljava/math/BigInteger; -Lsun/security/util/DerValue;->getBitString()[B -Lsun/security/util/DerValue;->getData()Lsun/security/util/DerInputStream; -Lsun/security/util/DerValue;->getDataBytes()[B -Lsun/security/util/DerValue;->getOctetString()[B -Lsun/security/util/DerValue;->getOID()Lsun/security/util/ObjectIdentifier; -Lsun/security/util/DerValue;->getPositiveBigInteger()Ljava/math/BigInteger; -Lsun/security/util/DerValue;->getUnalignedBitString()Lsun/security/util/BitArray; -Lsun/security/util/DerValue;->isConstructed()Z -Lsun/security/util/DerValue;->isContextSpecific()Z -Lsun/security/util/DerValue;->isContextSpecific(B)Z -Lsun/security/util/DerValue;->isPrintableStringChar(C)Z -Lsun/security/util/DerValue;->resetTag(B)V -Lsun/security/util/DerValue;->tag:B -Lsun/security/util/DerValue;->toByteArray()[B -Lsun/security/util/DerValue;->toDerInputStream()Lsun/security/util/DerInputStream; -Lsun/security/util/ManifestDigester$Entry;->digest(Ljava/security/MessageDigest;)[B -Lsun/security/util/ManifestDigester$Entry;->digestWorkaround(Ljava/security/MessageDigest;)[B -Lsun/security/util/ManifestDigester;-><init>([B)V -Lsun/security/util/ManifestDigester;->get(Ljava/lang/String;Z)Lsun/security/util/ManifestDigester$Entry; -Lsun/security/util/ManifestDigester;->manifestDigest(Ljava/security/MessageDigest;)[B -Lsun/security/util/MemoryCache$HardCacheEntry;-><init>(Ljava/lang/Object;Ljava/lang/Object;J)V -Lsun/security/util/MemoryCache$SoftCacheEntry;-><init>(Ljava/lang/Object;Ljava/lang/Object;JLjava/lang/ref/ReferenceQueue;)V -Lsun/security/util/ObjectIdentifier;-><init>(Ljava/lang/String;)V -Lsun/security/util/ObjectIdentifier;-><init>([I)V -Lsun/security/util/ObjectIdentifier;->equals(Lsun/security/util/ObjectIdentifier;)Z -Lsun/security/util/ObjectIdentifier;->newInternal([I)Lsun/security/util/ObjectIdentifier; -Lsun/security/util/PropertyExpander;->expand(Ljava/lang/String;)Ljava/lang/String; -Lsun/security/util/ResourcesMgr;->getString(Ljava/lang/String;)Ljava/lang/String; -Lsun/security/util/SecurityConstants;->CREATE_CLASSLOADER_PERMISSION:Ljava/lang/RuntimePermission; -Lsun/security/util/SecurityConstants;->GET_CLASSLOADER_PERMISSION:Ljava/lang/RuntimePermission; -Lsun/security/util/SecurityConstants;->MODIFY_THREADGROUP_PERMISSION:Ljava/lang/RuntimePermission; -Lsun/security/util/SecurityConstants;->MODIFY_THREAD_PERMISSION:Ljava/lang/RuntimePermission; -Lsun/security/util/SignatureFileVerifier;->isBlockOrSF(Ljava/lang/String;)Z -Lsun/security/x509/AccessDescription;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/AccessDescription;->getAccessLocation()Lsun/security/x509/GeneralName; -Lsun/security/x509/AccessDescription;->getAccessMethod()Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;-><init>()V -Lsun/security/x509/AlgorithmId;-><init>(Lsun/security/util/ObjectIdentifier;)V -Lsun/security/x509/AlgorithmId;-><init>(Lsun/security/util/ObjectIdentifier;Ljava/security/AlgorithmParameters;)V -Lsun/security/x509/AlgorithmId;->derEncode(Ljava/io/OutputStream;)V -Lsun/security/x509/AlgorithmId;->DSA_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->EC_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->encode()[B -Lsun/security/x509/AlgorithmId;->encode(Lsun/security/util/DerOutputStream;)V -Lsun/security/x509/AlgorithmId;->equals(Lsun/security/x509/AlgorithmId;)Z -Lsun/security/x509/AlgorithmId;->getAlgorithmId(Ljava/lang/String;)Lsun/security/x509/AlgorithmId; -Lsun/security/x509/AlgorithmId;->getDigAlgFromSigAlg(Ljava/lang/String;)Ljava/lang/String; -Lsun/security/x509/AlgorithmId;->getEncAlgFromSigAlg(Ljava/lang/String;)Ljava/lang/String; -Lsun/security/x509/AlgorithmId;->getEncodedParams()[B -Lsun/security/x509/AlgorithmId;->getOID()Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->getParameters()Ljava/security/AlgorithmParameters; -Lsun/security/x509/AlgorithmId;->MD2_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->MD5_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->params:Lsun/security/util/DerValue; -Lsun/security/x509/AlgorithmId;->parse(Lsun/security/util/DerValue;)Lsun/security/x509/AlgorithmId; -Lsun/security/x509/AlgorithmId;->RSAEncryption_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->sha1WithRSAEncryption_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->SHA256_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->SHA384_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->SHA512_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AlgorithmId;->SHA_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AttributeNameEnumeration;-><init>()V -Lsun/security/x509/AVA;-><init>(Lsun/security/util/ObjectIdentifier;Lsun/security/util/DerValue;)V -Lsun/security/x509/AVA;->getDerValue()Lsun/security/util/DerValue; -Lsun/security/x509/AVA;->getObjectIdentifier()Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AVA;->getValueString()Ljava/lang/String; -Lsun/security/x509/AVA;->toRFC2253CanonicalString()Ljava/lang/String; -Lsun/security/x509/AVAComparator;->INSTANCE:Ljava/util/Comparator; -Lsun/security/x509/AVAKeyword;->getOID(Ljava/lang/String;ILjava/util/Map;)Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AVAKeyword;->isCompliant(I)Z -Lsun/security/x509/AVAKeyword;->keyword:Ljava/lang/String; -Lsun/security/x509/AVAKeyword;->keywordMap:Ljava/util/Map; -Lsun/security/x509/AVAKeyword;->oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/AVAKeyword;->oidMap:Ljava/util/Map; -Lsun/security/x509/CertificateAlgorithmId;-><init>(Lsun/security/x509/AlgorithmId;)V -Lsun/security/x509/CertificateExtensions;-><init>()V -Lsun/security/x509/CertificateExtensions;-><init>(Lsun/security/util/DerInputStream;)V -Lsun/security/x509/CertificateExtensions;->encode(Ljava/io/OutputStream;Z)V -Lsun/security/x509/CertificateExtensions;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/CertificateExtensions;->set(Ljava/lang/String;Ljava/lang/Object;)V -Lsun/security/x509/CertificateIssuerName;-><init>(Lsun/security/x509/X500Name;)V -Lsun/security/x509/CertificateSerialNumber;-><init>(I)V -Lsun/security/x509/CertificateSerialNumber;-><init>(Ljava/math/BigInteger;)V -Lsun/security/x509/CertificateSubjectName;-><init>(Lsun/security/x509/X500Name;)V -Lsun/security/x509/CertificateSubjectName;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/CertificateValidity;-><init>(Ljava/util/Date;Ljava/util/Date;)V -Lsun/security/x509/CertificateVersion;-><init>(I)V -Lsun/security/x509/CertificateX509Key;-><init>(Ljava/security/PublicKey;)V -Lsun/security/x509/CRLDistributionPointsExtension;->encodeThis()V -Lsun/security/x509/CRLNumberExtension;-><init>(Ljava/lang/Boolean;Ljava/lang/Object;)V -Lsun/security/x509/CRLNumberExtension;->encodeThis()V -Lsun/security/x509/CRLNumberExtension;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/Extension;-><init>(Lsun/security/x509/Extension;)V -Lsun/security/x509/Extension;->encode(Lsun/security/util/DerOutputStream;)V -Lsun/security/x509/Extension;->getExtensionId()Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/GeneralName;-><init>(Lsun/security/x509/GeneralNameInterface;)V -Lsun/security/x509/GeneralName;->getName()Lsun/security/x509/GeneralNameInterface; -Lsun/security/x509/GeneralName;->getType()I -Lsun/security/x509/GeneralNames;-><init>()V -Lsun/security/x509/GeneralNames;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/GeneralNames;->add(Lsun/security/x509/GeneralName;)Lsun/security/x509/GeneralNames; -Lsun/security/x509/GeneralNames;->encode(Lsun/security/util/DerOutputStream;)V -Lsun/security/x509/GeneralNames;->isEmpty()Z -Lsun/security/x509/KeyIdentifier;-><init>(Ljava/security/PublicKey;)V -Lsun/security/x509/KeyIdentifier;->getIdentifier()[B -Lsun/security/x509/KeyIdentifier;->octetString:[B -Lsun/security/x509/KeyUsageExtension;-><init>([Z)V -Lsun/security/x509/KeyUsageExtension;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/NetscapeCertTypeExtension;-><init>([B)V -Lsun/security/x509/NetscapeCertTypeExtension;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/OIDMap$OIDInfo;->clazz:Ljava/lang/Class; -Lsun/security/x509/OIDMap;->getClass(Lsun/security/util/ObjectIdentifier;)Ljava/lang/Class; -Lsun/security/x509/OIDMap;->nameMap:Ljava/util/Map; -Lsun/security/x509/OIDMap;->oidMap:Ljava/util/Map; -Lsun/security/x509/PKIXExtensions;->CertificateIssuer_Id:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/SerialNumber;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/SubjectAlternativeNameExtension;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/SubjectKeyIdentifierExtension;-><init>([B)V -Lsun/security/x509/UniqueIdentity;-><init>(Lsun/security/util/DerInputStream;)V -Lsun/security/x509/UniqueIdentity;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/UniqueIdentity;->encode(Lsun/security/util/DerOutputStream;B)V -Lsun/security/x509/URIName;->getName()Ljava/lang/String; -Lsun/security/x509/URIName;->getScheme()Ljava/lang/String; -Lsun/security/x509/X500Name;-><init>(Ljava/lang/String;)V -Lsun/security/x509/X500Name;-><init>(Ljava/lang/String;Ljava/lang/String;)V -Lsun/security/x509/X500Name;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Lsun/security/x509/X500Name;-><init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -Lsun/security/x509/X500Name;-><init>(Lsun/security/util/DerInputStream;)V -Lsun/security/x509/X500Name;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/X500Name;-><init>([B)V -Lsun/security/x509/X500Name;->allAvas()Ljava/util/List; -Lsun/security/x509/X500Name;->asX500Name(Ljavax/security/auth/x500/X500Principal;)Lsun/security/x509/X500Name; -Lsun/security/x509/X500Name;->asX500Principal()Ljavax/security/auth/x500/X500Principal; -Lsun/security/x509/X500Name;->commonName_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->countryName_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->DNQUALIFIER_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->DOMAIN_COMPONENT_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->encode(Lsun/security/util/DerOutputStream;)V -Lsun/security/x509/X500Name;->GENERATIONQUALIFIER_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->getCommonName()Ljava/lang/String; -Lsun/security/x509/X500Name;->GIVENNAME_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->INITIALS_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->ipAddress_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->isEmpty()Z -Lsun/security/x509/X500Name;->localityName_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->orgName_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->orgUnitName_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->SERIALNUMBER_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->stateName_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->streetAddress_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->SURNAME_OID:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->title_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X500Name;->userid_oid:Lsun/security/util/ObjectIdentifier; -Lsun/security/x509/X509CertImpl;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/X509CertImpl;-><init>(Lsun/security/x509/X509CertInfo;)V -Lsun/security/x509/X509CertImpl;-><init>([B)V -Lsun/security/x509/X509CertImpl;->algId:Lsun/security/x509/AlgorithmId; -Lsun/security/x509/X509CertImpl;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/X509CertImpl;->getEncodedInternal()[B -Lsun/security/x509/X509CertImpl;->parse(Lsun/security/util/DerValue;)V -Lsun/security/x509/X509CertImpl;->readOnly:Z -Lsun/security/x509/X509CertImpl;->sign(Ljava/security/PrivateKey;Ljava/lang/String;)V -Lsun/security/x509/X509CertImpl;->signature:[B -Lsun/security/x509/X509CertImpl;->signedCert:[B -Lsun/security/x509/X509CertInfo;-><init>()V -Lsun/security/x509/X509CertInfo;-><init>([B)V -Lsun/security/x509/X509CertInfo;->get(Ljava/lang/String;)Ljava/lang/Object; -Lsun/security/x509/X509CertInfo;->set(Ljava/lang/String;Ljava/lang/Object;)V -Lsun/security/x509/X509CRLEntryImpl;->getExtension(Lsun/security/util/ObjectIdentifier;)Lsun/security/x509/Extension; -Lsun/security/x509/X509CRLImpl;-><init>(Ljava/io/InputStream;)V -Lsun/security/x509/X509CRLImpl;-><init>(Lsun/security/util/DerValue;)V -Lsun/security/x509/X509CRLImpl;-><init>([B)V -Lsun/security/x509/X509CRLImpl;->getEncodedInternal()[B -Lsun/security/x509/X509Key;-><init>()V -Lsun/security/x509/X509Key;->algid:Lsun/security/x509/AlgorithmId; -Lsun/security/x509/X509Key;->encodedKey:[B -Lsun/security/x509/X509Key;->key:[B -Lsun/security/x509/X509Key;->parse(Lsun/security/util/DerValue;)Ljava/security/PublicKey; -Lsun/security/x509/X509Key;->unusedBits:I -Lsun/util/calendar/AbstractCalendar;->getDayOfWeekDateOnOrBefore(JI)J -Lsun/util/calendar/AbstractCalendar;->getTimeOfDayValue(Lsun/util/calendar/CalendarDate;)J -Lsun/util/calendar/BaseCalendar$Date;->getNormalizedYear()I -Lsun/util/calendar/BaseCalendar$Date;->setNormalizedYear(I)V -Lsun/util/calendar/CalendarDate;->getDayOfMonth()I -Lsun/util/calendar/CalendarDate;->getMonth()I -Lsun/util/calendar/CalendarDate;->getTimeOfDay()J -Lsun/util/calendar/CalendarDate;->getYear()I -Lsun/util/calendar/CalendarDate;->setDate(III)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarDate;->setDayOfMonth(I)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarDate;->setHours(I)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarDate;->setMillis(I)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarDate;->setMinutes(I)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarDate;->setSeconds(I)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarSystem;->forName(Ljava/lang/String;)Lsun/util/calendar/CalendarSystem; -Lsun/util/calendar/CalendarSystem;->getGregorianCalendar()Lsun/util/calendar/Gregorian; -Lsun/util/calendar/CalendarSystem;->getTime(Lsun/util/calendar/CalendarDate;)J -Lsun/util/calendar/CalendarSystem;->newCalendarDate(Ljava/util/TimeZone;)Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/CalendarSystem;->validate(Lsun/util/calendar/CalendarDate;)Z -Lsun/util/calendar/CalendarUtils;->floorDivide(II)I -Lsun/util/calendar/CalendarUtils;->floorDivide(JJ)J -Lsun/util/calendar/CalendarUtils;->mod(II)I -Lsun/util/calendar/CalendarUtils;->mod(JJ)J -Lsun/util/calendar/Era;-><init>(Ljava/lang/String;Ljava/lang/String;JZ)V -Lsun/util/calendar/Era;->getAbbreviation()Ljava/lang/String; -Lsun/util/calendar/Era;->getName()Ljava/lang/String; -Lsun/util/calendar/Era;->getSinceDate()Lsun/util/calendar/CalendarDate; -Lsun/util/calendar/ImmutableGregorianDate;->unsupported()V -Lsun/util/calendar/LocalGregorianCalendar$Date;->getNormalizedYear()I -Lsun/util/calendar/LocalGregorianCalendar$Date;->setEra(Lsun/util/calendar/Era;)Lsun/util/calendar/LocalGregorianCalendar$Date; -Lsun/util/calendar/LocalGregorianCalendar$Date;->setNormalizedYear(I)V -Lsun/util/calendar/LocalGregorianCalendar$Date;->setYear(I)Lsun/util/calendar/LocalGregorianCalendar$Date; -Lsun/util/calendar/LocalGregorianCalendar;->newCalendarDate(Ljava/util/TimeZone;)Lsun/util/calendar/LocalGregorianCalendar$Date; -Lsun/util/calendar/LocalGregorianCalendar;->normalize(Lsun/util/calendar/CalendarDate;)Z -Lsun/util/calendar/LocalGregorianCalendar;->validate(Lsun/util/calendar/CalendarDate;)Z diff --git a/config/preloaded-classes b/config/preloaded-classes index 9496c37c4396..495615b90b15 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -6163,6 +6163,9 @@ libcore.reflect.TypeVariableImpl libcore.reflect.Types libcore.reflect.WildcardTypeImpl libcore.timezone.TimeZoneDataFiles +libcore.timezone.ZoneInfoDB +libcore.timezone.ZoneInfoDB$TzData +libcore.timezone.ZoneInfoDB$TzData$1 libcore.util.BasicLruCache libcore.util.CharsetUtils libcore.util.CollectionUtils @@ -6175,9 +6178,6 @@ libcore.util.SneakyThrow libcore.util.ZoneInfo libcore.util.ZoneInfo$CheckedArithmeticException libcore.util.ZoneInfo$WallTime -libcore.util.ZoneInfoDB -libcore.util.ZoneInfoDB$TzData -libcore.util.ZoneInfoDB$TzData$1 org.apache.harmony.dalvik.NativeTestTarget org.apache.harmony.dalvik.ddmc.Chunk org.apache.harmony.dalvik.ddmc.ChunkHandler diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index 676baceffb87..1d8c5efee453 100644 --- a/core/java/android/app/AlarmManager.java +++ b/core/java/android/app/AlarmManager.java @@ -35,7 +35,7 @@ import android.util.ArrayMap; import android.util.Log; import android.util.proto.ProtoOutputStream; -import libcore.util.ZoneInfoDB; +import libcore.timezone.ZoneInfoDB; import java.io.IOException; import java.lang.annotation.Retention; diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java index 7988008f03c0..2174255a3619 100644 --- a/core/java/android/bluetooth/le/ScanRecord.java +++ b/core/java/android/bluetooth/le/ScanRecord.java @@ -116,6 +116,9 @@ public final class ScanRecord { */ @Nullable public byte[] getManufacturerSpecificData(int manufacturerId) { + if (mManufacturerSpecificData == null) { + return null; + } return mManufacturerSpecificData.get(manufacturerId); } diff --git a/core/java/android/net/metrics/NetworkEvent.java b/core/java/android/net/metrics/NetworkEvent.java index 1999e78decc4..cb82fbe71f6b 100644 --- a/core/java/android/net/metrics/NetworkEvent.java +++ b/core/java/android/net/metrics/NetworkEvent.java @@ -44,6 +44,8 @@ public final class NetworkEvent implements Parcelable { public static final int NETWORK_FIRST_VALIDATION_PORTAL_FOUND = 10; public static final int NETWORK_REVALIDATION_PORTAL_FOUND = 11; + public static final int NETWORK_CONSECUTIVE_DNS_TIMEOUT_FOUND = 12; + @IntDef(value = { NETWORK_CONNECTED, NETWORK_VALIDATED, @@ -56,6 +58,7 @@ public final class NetworkEvent implements Parcelable { NETWORK_REVALIDATION_SUCCESS, NETWORK_FIRST_VALIDATION_PORTAL_FOUND, NETWORK_REVALIDATION_PORTAL_FOUND, + NETWORK_CONSECUTIVE_DNS_TIMEOUT_FOUND, }) @Retention(RetentionPolicy.SOURCE) public @interface EventType {} diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 258426e34a49..258c9a92fbfc 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10436,6 +10436,41 @@ public final class Settings { public static final String CAPTIVE_PORTAL_USER_AGENT = "captive_portal_user_agent"; /** + * The threshold value for the number of consecutive dns timeout events received to be a + * signal of data stall. Set the value to 0 or less than 0 to disable. Note that the value + * should be larger than 0 if the DNS data stall detection is enabled. + * + * @hide + */ + public static final String DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD = + "data_stall_consecutive_dns_timeout_threshold"; + + /** + * The minimal time interval in milliseconds for data stall reevaluation. + * + * @hide + */ + public static final String DATA_STALL_MIN_EVALUATE_INTERVAL = + "data_stall_min_evaluate_interval"; + + /** + * DNS timeouts older than this timeout (in milliseconds) are not considered for detecting + * a data stall. + * + * @hide + */ + public static final String DATA_STALL_VALID_DNS_TIME_THRESHOLD = + "data_stall_valid_dns_time_threshold"; + + /** + * Which data stall detection signal to use. Possible values are a union of the powers of 2 + * of DATA_STALL_EVALUATION_TYPE_*. + * + * @hide + */ + public static final String DATA_STALL_EVALUATION_TYPE = "data_stall_evaluation_type"; + + /** * Whether network service discovery is enabled. * * @hide diff --git a/core/java/android/service/carrier/ApnService.java b/core/java/android/service/carrier/ApnService.java new file mode 100644 index 000000000000..d53eb37ca786 --- /dev/null +++ b/core/java/android/service/carrier/ApnService.java @@ -0,0 +1,77 @@ +/* + * 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.service.carrier; + +import android.annotation.SystemApi; +import android.annotation.WorkerThread; +import android.app.Service; +import android.content.ContentValues; +import android.content.Intent; +import android.os.IBinder; +import android.util.Log; + +import com.android.internal.telephony.IApnSourceService; + +import java.util.List; + +/** + * A service that the system can call to restore default APNs. + * <p> + * To extend this class, specify the full name of your implementation in the resource file + * {@code packages/providers/TelephonyProvider/res/values/config.xml} as the + * {@code apn_source_service}. + * </p> + * + * @hide + */ +@SystemApi +public abstract class ApnService extends Service { + + private static final String LOG_TAG = "ApnService"; + + private final IApnSourceService.Stub mBinder = new IApnSourceService.Stub() { + /** + * Retreive APNs for the default slot index. + */ + @Override + public ContentValues[] getApns(int subId) { + try { + List<ContentValues> apns = ApnService.this.onRestoreApns(subId); + return apns.toArray(new ContentValues[apns.size()]); + } catch (Exception e) { + Log.e(LOG_TAG, "Error in getApns for subId=" + subId + ": " + e.getMessage(), e); + return null; + } + } + }; + + @Override + public IBinder onBind(Intent intent) { + return mBinder; + } + + /** + * Override this method to restore default user APNs with a carrier service instead of the + * built in platform xml APNs list. + * <p> + * This method is called by the TelephonyProvider when the user requests restoring the default + * APNs. It should return a list of ContentValues representing the default APNs for the given + * subId. + */ + @WorkerThread + public abstract List<ContentValues> onRestoreApns(int subId); +} diff --git a/core/java/android/text/format/Time.java b/core/java/android/text/format/Time.java index 562ae7ada90a..bab4bc362c0d 100644 --- a/core/java/android/text/format/Time.java +++ b/core/java/android/text/format/Time.java @@ -18,8 +18,8 @@ package android.text.format; import android.util.TimeFormatException; +import libcore.timezone.ZoneInfoDB; import libcore.util.ZoneInfo; -import libcore.util.ZoneInfoDB; import java.io.IOException; import java.util.Locale; diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index 717a85801eba..57d55bf31375 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -21,10 +21,10 @@ import android.annotation.Nullable; import android.annotation.UnsupportedAppUsage; import android.os.SystemClock; -import libcore.util.CountryTimeZones; -import libcore.util.CountryTimeZones.TimeZoneMapping; -import libcore.util.TimeZoneFinder; -import libcore.util.ZoneInfoDB; +import libcore.timezone.CountryTimeZones; +import libcore.timezone.CountryTimeZones.TimeZoneMapping; +import libcore.timezone.TimeZoneFinder; +import libcore.timezone.ZoneInfoDB; import java.io.PrintWriter; import java.text.SimpleDateFormat; diff --git a/core/jni/android_text_MeasuredParagraph.cpp b/core/jni/android_text_MeasuredParagraph.cpp index 9eb6f8d4189a..1cb25957747d 100644 --- a/core/jni/android_text_MeasuredParagraph.cpp +++ b/core/jni/android_text_MeasuredParagraph.cpp @@ -17,8 +17,6 @@ #define LOG_TAG "MeasuredParagraph" #include "GraphicsJNI.h" -#include "unicode/locid.h" -#include "unicode/brkiter.h" #include "utils/misc.h" #include "utils/Log.h" #include <nativehelper/ScopedStringChars.h> diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index dfb57696dbcc..24baba4512c1 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -16,8 +16,6 @@ #define LOG_TAG "StaticLayout" -#include "unicode/locid.h" -#include "unicode/brkiter.h" #include "utils/misc.h" #include "utils/Log.h" #include <nativehelper/ScopedStringChars.h> diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 9d3085aa2f88..f2f28937bb50 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -185,6 +185,10 @@ public class SettingsBackupTest { Settings.Global.DATA_ROAMING, Settings.Global.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS, Settings.Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS, + Settings.Global.DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD, + Settings.Global.DATA_STALL_EVALUATION_TYPE, + Settings.Global.DATA_STALL_MIN_EVALUATE_INTERVAL, + Settings.Global.DATA_STALL_VALID_DNS_TIME_THRESHOLD, Settings.Global.DEBUG_APP, Settings.Global.DEBUG_VIEW_ATTRIBUTES, Settings.Global.DEFAULT_DNS_SERVER, diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index fb8274426b16..6533eb9a2d87 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -45,9 +45,6 @@ cc_defaults { ], product_variables: { - device_uses_hwc2: { - cflags: ["-DUSE_HWC2"], - }, eng: { lto: { never: true, diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp index f2d50cd42523..39ed9a0478b6 100644 --- a/libs/hwui/JankTracker.cpp +++ b/libs/hwui/JankTracker.cpp @@ -81,7 +81,6 @@ static FrameInfoIndex sFrameStart = FrameInfoIndex::IntendedVsync; JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& displayInfo) { mGlobalData = globalData; nsecs_t frameIntervalNanos = static_cast<nsecs_t>(1_s / displayInfo.fps); -#if USE_HWC2 nsecs_t sfOffset = frameIntervalNanos - (displayInfo.presentationDeadline - 1_ms); nsecs_t offsetDelta = sfOffset - displayInfo.appVsyncOffset; // There are two different offset cases. If the offsetDelta is positive @@ -95,7 +94,6 @@ JankTracker::JankTracker(ProfileDataContainer* globalData, const DisplayInfo& di // return due to the staggering of VSYNC-app & VSYNC-sf. mDequeueTimeForgiveness = offsetDelta + 4_ms; } -#endif setFrameInterval(frameIntervalNanos); } diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java index 955f64a357dc..6157fec3441f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java +++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java @@ -33,7 +33,7 @@ import android.view.View; import com.android.settingslib.R; -import libcore.util.TimeZoneFinder; +import libcore.timezone.TimeZoneFinder; import org.xmlpull.v1.XmlPullParserException; diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java index 3e932e8d6daf..8366cdd34625 100644 --- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java +++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java @@ -270,7 +270,7 @@ final class RemoteFillService implements DeathRecipient { } final boolean willBind = mContext.bindServiceAsUser(mIntent, mServiceConnection, flags, - new UserHandle(mUserId)); + mHandler,new UserHandle(mUserId)); if (!willBind) { Slog.w(LOG_TAG, "[user: " + mUserId + "] could not bind to " + mIntent + " using flags " diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 74c80237d721..bb3b9f72d55e 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -894,10 +894,18 @@ public class ConnectivityService extends IConnectivityManager.Stub intentFilter.addAction(Intent.ACTION_USER_REMOVED); intentFilter.addAction(Intent.ACTION_USER_UNLOCKED); mContext.registerReceiverAsUser( - mUserIntentReceiver, UserHandle.ALL, intentFilter, null, null); + mIntentReceiver, UserHandle.ALL, intentFilter, null, null); mContext.registerReceiverAsUser(mUserPresentReceiver, UserHandle.SYSTEM, new IntentFilter(Intent.ACTION_USER_PRESENT), null, null); + // Listen to package add and removal events for all users. + intentFilter = new IntentFilter(); + intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED); + intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); + intentFilter.addDataScheme("package"); + mContext.registerReceiverAsUser( + mIntentReceiver, UserHandle.ALL, intentFilter, null, null); + try { mNMS.registerObserver(mTethering); mNMS.registerObserver(mDataActivityObserver); @@ -1659,6 +1667,24 @@ public class ConnectivityService extends IConnectivityManager.Stub loge("Error parsing ip address in validation event"); } } + + @Override + public void onDnsEvent(int netId, int eventType, int returnCode, String hostname, + String[] ipAddresses, int ipAddressesCount, long timestamp, int uid) { + NetworkAgentInfo nai = getNetworkAgentInfoForNetId(netId); + // Netd event only allow registrants from system. Each NetworkMonitor thread is under + // the caller thread of registerNetworkAgent. Thus, it's not allowed to register netd + // event callback for certain nai. e.g. cellular. Register here to pass to + // NetworkMonitor instead. + // TODO: Move the Dns Event to NetworkMonitor. Use Binder.clearCallingIdentity() in + // registerNetworkAgent to have NetworkMonitor created with system process as design + // expectation. Also, NetdEventListenerService only allow one callback from each + // caller type. Need to re-factor NetdEventListenerService to allow multiple + // NetworkMonitor registrants. + if (nai != null && nai.satisfies(mDefaultRequest)) { + nai.networkMonitor.sendMessage(NetworkMonitor.EVENT_DNS_NOTIFICATION, returnCode); + } + } }; @VisibleForTesting @@ -2073,12 +2099,7 @@ public class ConnectivityService extends IConnectivityManager.Stub return new MockableSystemProperties(); } - private void updateTcpBufferSizes(NetworkAgentInfo nai) { - if (isDefaultNetwork(nai) == false) { - return; - } - - String tcpBufferSizes = nai.linkProperties.getTcpBufferSizes(); + private void updateTcpBufferSizes(String tcpBufferSizes) { String[] values = null; if (tcpBufferSizes != null) { values = tcpBufferSizes.split(","); @@ -4155,6 +4176,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } private void onUserAdded(int userId) { + mPermissionMonitor.onUserAdded(userId); synchronized (mVpns) { final int vpnsSize = mVpns.size(); for (int i = 0; i < vpnsSize; i++) { @@ -4165,6 +4187,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } private void onUserRemoved(int userId) { + mPermissionMonitor.onUserRemoved(userId); synchronized (mVpns) { final int vpnsSize = mVpns.size(); for (int i = 0; i < vpnsSize; i++) { @@ -4174,6 +4197,22 @@ public class ConnectivityService extends IConnectivityManager.Stub } } + private void onPackageAdded(String packageName, int uid) { + if (TextUtils.isEmpty(packageName) || uid < 0) { + Slog.wtf(TAG, "Invalid package in onPackageAdded: " + packageName + " | " + uid); + return; + } + mPermissionMonitor.onPackageAdded(packageName, uid); + } + + private void onPackageRemoved(String packageName, int uid) { + if (TextUtils.isEmpty(packageName) || uid < 0) { + Slog.wtf(TAG, "Invalid package in onPackageRemoved: " + packageName + " | " + uid); + return; + } + mPermissionMonitor.onPackageRemoved(uid); + } + private void onUserUnlocked(int userId) { synchronized (mVpns) { // User present may be sent because of an unlock, which might mean an unlocked keystore. @@ -4185,11 +4224,15 @@ public class ConnectivityService extends IConnectivityManager.Stub } } - private BroadcastReceiver mUserIntentReceiver = new BroadcastReceiver() { + private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL); + final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1); + final Uri packageData = intent.getData(); + final String packageName = + packageData != null ? packageData.getSchemeSpecificPart() : null; if (userId == UserHandle.USER_NULL) return; if (Intent.ACTION_USER_STARTED.equals(action)) { @@ -4202,6 +4245,10 @@ public class ConnectivityService extends IConnectivityManager.Stub onUserRemoved(userId); } else if (Intent.ACTION_USER_UNLOCKED.equals(action)) { onUserUnlocked(userId); + } else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) { + onPackageAdded(packageName, uid); + } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) { + onPackageRemoved(packageName, uid); } } }; @@ -4728,8 +4775,8 @@ public class ConnectivityService extends IConnectivityManager.Stub updateUids(nai, null, nai.networkCapabilities); } - private void updateLinkProperties(NetworkAgentInfo networkAgent, LinkProperties oldLp) { - LinkProperties newLp = new LinkProperties(networkAgent.linkProperties); + private void updateLinkProperties(NetworkAgentInfo networkAgent, LinkProperties newLp, + LinkProperties oldLp) { int netId = networkAgent.network.netId; // The NetworkAgentInfo does not know whether clatd is running on its network or not. Before @@ -4744,7 +4791,9 @@ public class ConnectivityService extends IConnectivityManager.Stub // for (LinkProperties lp : newLp.getStackedLinks()) { // updateMtu(lp, null); // } - updateTcpBufferSizes(networkAgent); + if (isDefaultNetwork(networkAgent)) { + updateTcpBufferSizes(newLp.getTcpBufferSizes()); + } updateRoutes(newLp, oldLp, netId); updateDnses(newLp, oldLp, netId); @@ -4754,8 +4803,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // updateDnses will fetch the private DNS configuration from DnsManager. mDnsManager.updatePrivateDnsStatus(netId, newLp); - // Start or stop clat accordingly to network state. - networkAgent.updateClat(mNMS); if (isDefaultNetwork(networkAgent)) { handleApplyDefaultProxy(newLp.getHttpProxy()); } else { @@ -4766,8 +4813,12 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (networkAgent) { networkAgent.linkProperties = newLp; } + // Start or stop clat accordingly to network state. + networkAgent.updateClat(mNMS); notifyIfacesChangedForNetworkStats(); - notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); + if (networkAgent.everConnected) { + notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); + } } mKeepaliveTracker.handleCheckKeepalivesStillValid(networkAgent); @@ -5072,13 +5123,7 @@ public class ConnectivityService extends IConnectivityManager.Stub "; created=" + nai.created + "; everConnected=" + nai.everConnected); } - LinkProperties oldLp = nai.linkProperties; - synchronized (nai) { - nai.linkProperties = newLp; - } - if (nai.everConnected) { - updateLinkProperties(nai, oldLp); - } + updateLinkProperties(nai, newLp, new LinkProperties(nai.linkProperties)); } private void sendUpdatedScoreToFactories(NetworkAgentInfo nai) { @@ -5239,7 +5284,7 @@ public class ConnectivityService extends IConnectivityManager.Stub notifyLockdownVpn(newNetwork); handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy()); - updateTcpBufferSizes(newNetwork); + updateTcpBufferSizes(newNetwork.linkProperties.getTcpBufferSizes()); mDnsManager.setDefaultDnsSystemProperties(newNetwork.linkProperties.getDnsServers()); notifyIfacesChangedForNetworkStats(); } @@ -5654,7 +5699,8 @@ public class ConnectivityService extends IConnectivityManager.Stub } handlePerNetworkPrivateDnsConfig(networkAgent, mDnsManager.getPrivateDnsConfig()); - updateLinkProperties(networkAgent, null); + updateLinkProperties(networkAgent, new LinkProperties(networkAgent.linkProperties), + null); networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED); scheduleUnvalidatedPrompt(networkAgent); diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index 289143c87ac0..f1ab0be32ce7 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -96,6 +96,7 @@ public class Watchdog extends Thread { "android.hardware.bluetooth@1.0::IBluetoothHci", "android.hardware.camera.provider@2.4::ICameraProvider", "android.hardware.graphics.composer@2.1::IComposer", + "android.hardware.health@2.0::IHealth", "android.hardware.media.omx@1.0::IOmx", "android.hardware.media.omx@1.0::IOmxStore", "android.hardware.sensors@1.0::ISensors", diff --git a/services/core/java/com/android/server/connectivity/NetworkMonitor.java b/services/core/java/com/android/server/connectivity/NetworkMonitor.java index c3e38424e90b..c2f4406c615d 100644 --- a/services/core/java/com/android/server/connectivity/NetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/NetworkMonitor.java @@ -72,6 +72,7 @@ import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import com.android.internal.util.Protocol; +import com.android.internal.util.RingBufferIndices; import com.android.internal.util.State; import com.android.internal.util.StateMachine; import com.android.server.connectivity.DnsManager.PrivateDnsConfig; @@ -99,7 +100,7 @@ public class NetworkMonitor extends StateMachine { private static final String TAG = NetworkMonitor.class.getSimpleName(); private static final boolean DBG = true; private static final boolean VDBG = false; - + private static final boolean VDBG_STALL = Log.isLoggable(TAG, Log.DEBUG); // Default configuration values for captive portal detection probes. // TODO: append a random length parameter to the default HTTPS url. // TODO: randomize browser version ids in the default User-Agent String. @@ -116,6 +117,15 @@ public class NetworkMonitor extends StateMachine { private static final int SOCKET_TIMEOUT_MS = 10000; private static final int PROBE_TIMEOUT_MS = 3000; + // Default configuration values for data stall detection. + private static final int DEFAULT_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD = 5; + private static final int DEFAULT_DATA_STALL_MIN_EVALUATE_TIME_MS = 60 * 1000; + private static final int DEFAULT_DATA_STALL_VALID_DNS_TIME_THRESHOLD_MS = 30 * 60 * 1000; + + private static final int DATA_STALL_EVALUATION_TYPE_DNS = 1; + private static final int DEFAULT_DATA_STALL_EVALUATION_TYPES = + (1 << DATA_STALL_EVALUATION_TYPE_DNS); + static enum EvaluationResult { VALIDATED(true), CAPTIVE_PORTAL(false); @@ -233,6 +243,12 @@ public class NetworkMonitor extends StateMachine { */ public static final int CMD_PROBE_COMPLETE = BASE + 16; + /** + * ConnectivityService notifies NetworkMonitor of DNS query responses event. + * arg1 = returncode in OnDnsEvent which indicates the response code for the DNS query. + */ + public static final int EVENT_DNS_NOTIFICATION = BASE + 17; + // Start mReevaluateDelayMs at this value and double. private static final int INITIAL_REEVALUATE_DELAY_MS = 1000; private static final int MAX_REEVALUATE_DELAY_MS = 10*60*1000; @@ -314,6 +330,12 @@ public class NetworkMonitor extends StateMachine { private int mReevaluateDelayMs = INITIAL_REEVALUATE_DELAY_MS; private int mEvaluateAttempts = 0; private volatile int mProbeToken = 0; + private final int mConsecutiveDnsTimeoutThreshold; + private final int mDataStallMinEvaluateTime; + private final int mDataStallValidDnsTimeThreshold; + private final int mDataStallEvaluationType; + private final DnsStallDetector mDnsStallDetector; + private long mLastProbeTime; public NetworkMonitor(Context context, Handler handler, NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest) { @@ -359,6 +381,12 @@ public class NetworkMonitor extends StateMachine { mCaptivePortalFallbackUrls = makeCaptivePortalFallbackUrls(); mCaptivePortalFallbackSpecs = makeCaptivePortalFallbackProbeSpecs(); mRandom = deps.getRandom(); + // TODO: Evaluate to move data stall configuration to a specific class. + mConsecutiveDnsTimeoutThreshold = getConsecutiveDnsTimeoutThreshold(); + mDnsStallDetector = new DnsStallDetector(mConsecutiveDnsTimeoutThreshold); + mDataStallMinEvaluateTime = getDataStallMinEvaluateTime(); + mDataStallValidDnsTimeThreshold = getDataStallValidDnsTimeThreshold(); + mDataStallEvaluationType = getDataStallEvalutionType(); start(); } @@ -507,6 +535,9 @@ public class NetworkMonitor extends StateMachine { sendMessage(CMD_EVALUATE_PRIVATE_DNS); break; } + case EVENT_DNS_NOTIFICATION: + mDnsStallDetector.accumulateConsecutiveDnsTimeoutCount(message.arg1); + break; default: break; } @@ -537,6 +568,13 @@ public class NetworkMonitor extends StateMachine { case CMD_EVALUATE_PRIVATE_DNS: transitionTo(mEvaluatingPrivateDnsState); break; + case EVENT_DNS_NOTIFICATION: + mDnsStallDetector.accumulateConsecutiveDnsTimeoutCount(message.arg1); + if (isDataStall()) { + validationLog("Suspecting data stall, reevaluate"); + transitionTo(mEvaluatingState); + } + break; default: return NOT_HANDLED; } @@ -856,6 +894,7 @@ public class NetworkMonitor extends StateMachine { final CaptivePortalProbeResult probeResult = (CaptivePortalProbeResult) message.obj; + mLastProbeTime = SystemClock.elapsedRealtime(); if (probeResult.isSuccessful()) { // Transit EvaluatingPrivateDnsState to get to Validated // state (even if no Private DNS validation required). @@ -883,6 +922,7 @@ public class NetworkMonitor extends StateMachine { // Leave the event to EvaluatingState. Defer this message will result in reset // of mReevaluateDelayMs and mEvaluateAttempts. case CMD_NETWORK_DISCONNECTED: + case EVENT_DNS_NOTIFICATION: return NOT_HANDLED; default: // TODO: Some events may able to handle in this state, instead of deferring to @@ -947,6 +987,29 @@ public class NetworkMonitor extends StateMachine { Settings.Global.CAPTIVE_PORTAL_HTTPS_URL, DEFAULT_HTTPS_URL); } + private int getConsecutiveDnsTimeoutThreshold() { + return mDependencies.getSetting(mContext, + Settings.Global.DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD, + DEFAULT_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD); + } + + private int getDataStallMinEvaluateTime() { + return mDependencies.getSetting(mContext, + Settings.Global.DATA_STALL_MIN_EVALUATE_INTERVAL, + DEFAULT_DATA_STALL_MIN_EVALUATE_TIME_MS); + } + + private int getDataStallValidDnsTimeThreshold() { + return mDependencies.getSetting(mContext, + Settings.Global.DATA_STALL_VALID_DNS_TIME_THRESHOLD, + DEFAULT_DATA_STALL_VALID_DNS_TIME_THRESHOLD_MS); + } + + private int getDataStallEvalutionType() { + return mDependencies.getSetting(mContext, Settings.Global.DATA_STALL_EVALUATION_TYPE, + DEFAULT_DATA_STALL_EVALUATION_TYPES); + } + // Static for direct access by ConnectivityService public static String getCaptivePortalServerHttpUrl(Context context) { return getCaptivePortalServerHttpUrl(Dependencies.DEFAULT, context); @@ -1462,4 +1525,127 @@ public class NetworkMonitor extends StateMachine { public static final Dependencies DEFAULT = new Dependencies(); } + + /** + * Methods in this class perform no locking because all accesses are performed on the state + * machine's thread. Need to consider the thread safety if it ever could be accessed outside the + * state machine. + */ + @VisibleForTesting + protected class DnsStallDetector { + private static final int DEFAULT_DNS_LOG_SIZE = 50; + private int mConsecutiveTimeoutCount = 0; + private int mSize; + final DnsResult[] mDnsEvents; + final RingBufferIndices mResultIndices; + + DnsStallDetector(int size) { + mSize = Math.max(DEFAULT_DNS_LOG_SIZE, size); + mDnsEvents = new DnsResult[mSize]; + mResultIndices = new RingBufferIndices(mSize); + } + + @VisibleForTesting + protected void accumulateConsecutiveDnsTimeoutCount(int code) { + final DnsResult result = new DnsResult(code); + mDnsEvents[mResultIndices.add()] = result; + if (result.isTimeout()) { + mConsecutiveTimeoutCount++; + } else { + // Keep the event in mDnsEvents without clearing it so that there are logs to do the + // simulation and analysis. + mConsecutiveTimeoutCount = 0; + } + } + + private boolean isDataStallSuspected(int timeoutCountThreshold, int validTime) { + if (timeoutCountThreshold <= 0) { + Log.wtf(TAG, "Timeout count threshold should be larger than 0."); + return false; + } + + // Check if the consecutive timeout count reach the threshold or not. + if (mConsecutiveTimeoutCount < timeoutCountThreshold) { + return false; + } + + // Check if the target dns event index is valid or not. + final int firstConsecutiveTimeoutIndex = + mResultIndices.indexOf(mResultIndices.size() - timeoutCountThreshold); + + // If the dns timeout events happened long time ago, the events are meaningless for + // data stall evaluation. Thus, check if the first consecutive timeout dns event + // considered in the evaluation happened in defined threshold time. + final long now = SystemClock.elapsedRealtime(); + final long firstTimeoutTime = now - mDnsEvents[firstConsecutiveTimeoutIndex].mTimeStamp; + return (firstTimeoutTime < validTime); + } + + int getConsecutiveTimeoutCount() { + return mConsecutiveTimeoutCount; + } + } + + private static class DnsResult { + // TODO: Need to move the DNS return code definition to a specific class once unify DNS + // response code is done. + private static final int RETURN_CODE_DNS_TIMEOUT = 255; + + private final long mTimeStamp; + private final int mReturnCode; + + DnsResult(int code) { + mTimeStamp = SystemClock.elapsedRealtime(); + mReturnCode = code; + } + + private boolean isTimeout() { + return mReturnCode == RETURN_CODE_DNS_TIMEOUT; + } + } + + + @VisibleForTesting + protected DnsStallDetector getDnsStallDetector() { + return mDnsStallDetector; + } + + private boolean dataStallEvaluateTypeEnabled(int type) { + return (mDataStallEvaluationType & (1 << type)) != 0; + } + + @VisibleForTesting + protected long getLastProbeTime() { + return mLastProbeTime; + } + + @VisibleForTesting + protected boolean isDataStall() { + boolean result = false; + // Reevaluation will generate traffic. Thus, set a minimal reevaluation timer to limit the + // possible traffic cost in metered network. + if (mNetworkAgentInfo.networkCapabilities.isMetered() + && (SystemClock.elapsedRealtime() - getLastProbeTime() + < mDataStallMinEvaluateTime)) { + return false; + } + + // Check dns signal. Suspect it may be a data stall if both : + // 1. The number of consecutive DNS query timeouts > mConsecutiveDnsTimeoutThreshold. + // 2. Those consecutive DNS queries happened in the last mValidDataStallDnsTimeThreshold ms. + if (dataStallEvaluateTypeEnabled(DATA_STALL_EVALUATION_TYPE_DNS)) { + if (mDnsStallDetector.isDataStallSuspected(mConsecutiveDnsTimeoutThreshold, + mDataStallValidDnsTimeThreshold)) { + result = true; + logNetworkEvent(NetworkEvent.NETWORK_CONSECUTIVE_DNS_TIMEOUT_FOUND); + } + } + + if (VDBG_STALL) { + log("isDataStall: result=" + result + ", consecutive dns timeout count=" + + mDnsStallDetector.getConsecutiveTimeoutCount()); + } + + return result; + } } diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java index 94c94a514dec..420b23e6a39f 100644 --- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java +++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java @@ -27,10 +27,7 @@ import static android.os.Process.INVALID_UID; import static android.os.Process.SYSTEM_UID; import android.annotation.NonNull; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -42,7 +39,6 @@ import android.os.INetworkManagementService; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import android.text.TextUtils; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -64,15 +60,14 @@ import java.util.Set; public class PermissionMonitor { private static final String TAG = "PermissionMonitor"; private static final boolean DBG = true; - private static final Boolean SYSTEM = Boolean.TRUE; - private static final Boolean NETWORK = Boolean.FALSE; + protected static final Boolean SYSTEM = Boolean.TRUE; + protected static final Boolean NETWORK = Boolean.FALSE; private static final int VERSION_Q = Build.VERSION_CODES.Q; private final Context mContext; private final PackageManager mPackageManager; private final UserManager mUserManager; private final INetworkManagementService mNetd; - private final BroadcastReceiver mIntentReceiver; // Values are User IDs. private final Set<Integer> mUsers = new HashSet<>(); @@ -85,26 +80,6 @@ public class PermissionMonitor { mPackageManager = context.getPackageManager(); mUserManager = UserManager.get(context); mNetd = netd; - mIntentReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - String action = intent.getAction(); - int user = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL); - int appUid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID); - Uri appData = intent.getData(); - String appName = appData != null ? appData.getSchemeSpecificPart() : null; - - if (Intent.ACTION_USER_ADDED.equals(action)) { - onUserAdded(user); - } else if (Intent.ACTION_USER_REMOVED.equals(action)) { - onUserRemoved(user); - } else if (Intent.ACTION_PACKAGE_ADDED.equals(action)) { - onAppAdded(appName, appUid); - } else if (Intent.ACTION_PACKAGE_REMOVED.equals(action)) { - onAppRemoved(appUid); - } - } - }; } // Intended to be called only once at startup, after the system is ready. Installs a broadcast @@ -112,17 +87,6 @@ public class PermissionMonitor { public synchronized void startMonitoring() { log("Monitoring"); - IntentFilter intentFilter = new IntentFilter(); - intentFilter.addAction(Intent.ACTION_USER_ADDED); - intentFilter.addAction(Intent.ACTION_USER_REMOVED); - mContext.registerReceiverAsUser(mIntentReceiver, UserHandle.ALL, intentFilter, null, null); - - intentFilter = new IntentFilter(); - intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED); - intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); - intentFilter.addDataScheme("package"); - mContext.registerReceiverAsUser(mIntentReceiver, UserHandle.ALL, intentFilter, null, null); - List<PackageInfo> apps = mPackageManager.getInstalledPackages(GET_PERMISSIONS); if (apps == null) { loge("No apps"); @@ -260,7 +224,14 @@ public class PermissionMonitor { } } - private synchronized void onUserAdded(int user) { + /** + * Called when a user is added. See {link #ACTION_USER_ADDED}. + * + * @param user The integer userHandle of the added user. See {@link #EXTRA_USER_HANDLE}. + * + * @hide + */ + public synchronized void onUserAdded(int user) { if (user < 0) { loge("Invalid user in onUserAdded: " + user); return; @@ -272,7 +243,14 @@ public class PermissionMonitor { update(users, mApps, true); } - private synchronized void onUserRemoved(int user) { + /** + * Called when an user is removed. See {link #ACTION_USER_REMOVED}. + * + * @param user The integer userHandle of the removed user. See {@link #EXTRA_USER_HANDLE}. + * + * @hide + */ + public synchronized void onUserRemoved(int user) { if (user < 0) { loge("Invalid user in onUserRemoved: " + user); return; @@ -284,8 +262,8 @@ public class PermissionMonitor { update(users, mApps, false); } - - private Boolean highestPermissionForUid(Boolean currentPermission, String name) { + @VisibleForTesting + protected Boolean highestPermissionForUid(Boolean currentPermission, String name) { if (currentPermission == SYSTEM) { return currentPermission; } @@ -303,33 +281,39 @@ public class PermissionMonitor { return currentPermission; } - private synchronized void onAppAdded(String appName, int appUid) { - if (TextUtils.isEmpty(appName) || appUid < 0) { - loge("Invalid app in onAppAdded: " + appName + " | " + appUid); - return; - } - + /** + * Called when a package is added. See {link #ACTION_PACKAGE_ADDED}. + * + * @param packageName The name of the new package. + * @param uid The uid of the new package. + * + * @hide + */ + public synchronized void onPackageAdded(String packageName, int uid) { // If multiple packages share a UID (cf: android:sharedUserId) and ask for different // permissions, don't downgrade (i.e., if it's already SYSTEM, leave it as is). - final Boolean permission = highestPermissionForUid(mApps.get(appUid), appName); - if (permission != mApps.get(appUid)) { - mApps.put(appUid, permission); + final Boolean permission = highestPermissionForUid(mApps.get(uid), packageName); + if (permission != mApps.get(uid)) { + mApps.put(uid, permission); Map<Integer, Boolean> apps = new HashMap<>(); - apps.put(appUid, permission); + apps.put(uid, permission); update(mUsers, apps, true); } } - private synchronized void onAppRemoved(int appUid) { - if (appUid < 0) { - loge("Invalid app in onAppRemoved: " + appUid); - return; - } + /** + * Called when a package is removed. See {link #ACTION_PACKAGE_REMOVED}. + * + * @param uid containing the integer uid previously assigned to the package. + * + * @hide + */ + public synchronized void onPackageRemoved(int uid) { Map<Integer, Boolean> apps = new HashMap<>(); Boolean permission = null; - String[] packages = mPackageManager.getPackagesForUid(appUid); + String[] packages = mPackageManager.getPackagesForUid(uid); if (packages != null && packages.length > 0) { for (String name : packages) { permission = highestPermissionForUid(permission, name); @@ -341,16 +325,16 @@ public class PermissionMonitor { } } } - if (permission == mApps.get(appUid)) { + if (permission == mApps.get(uid)) { // The permissions of this UID have not changed. Nothing to do. return; } else if (permission != null) { - mApps.put(appUid, permission); - apps.put(appUid, permission); + mApps.put(uid, permission); + apps.put(uid, permission); update(mUsers, apps, true); } else { - mApps.remove(appUid); - apps.put(appUid, NETWORK); // doesn't matter which permission we pick here + mApps.remove(uid); + apps.put(uid, NETWORK); // doesn't matter which permission we pick here update(mUsers, apps, false); } } diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java index 505e4ee60529..1fd9b69e521d 100644 --- a/services/core/java/com/android/server/pm/ShortcutUser.java +++ b/services/core/java/com/android/server/pm/ShortcutUser.java @@ -294,13 +294,14 @@ class ShortcutUser { */ public void detectLocaleChange() { final String currentLocales = mService.injectGetLocaleTagsForUser(mUserId); - if (getKnownLocales().equals(currentLocales)) { + if (!TextUtils.isEmpty(mKnownLocales) && mKnownLocales.equals(currentLocales)) { return; } if (ShortcutService.DEBUG) { - Slog.d(TAG, "Locale changed from " + currentLocales + " to " + mKnownLocales + Slog.d(TAG, "Locale changed from " + mKnownLocales + " to " + currentLocales + " for user " + mUserId); } + mKnownLocales = currentLocales; forAllPackages(pkg -> { diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index c4d285115ce7..4b413e5f76bb 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -48,8 +48,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; import libcore.icu.ICU; import libcore.timezone.TzDataSetVersion; -import libcore.util.TimeZoneFinder; -import libcore.util.ZoneInfoDB; +import libcore.timezone.TimeZoneFinder; +import libcore.timezone.ZoneInfoDB; import static android.app.timezone.RulesState.DISTRO_STATUS_INSTALLED; import static android.app.timezone.RulesState.DISTRO_STATUS_NONE; diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp new file mode 100644 index 000000000000..27ba9f5a87a9 --- /dev/null +++ b/services/tests/mockingservicestests/Android.bp @@ -0,0 +1,44 @@ +// 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. + +android_test { + name: "FrameworksMockingServicesTests", + + srcs: ["src/**/*.java"], + + static_libs: [ + "services.core", + "services.devicepolicy", + "frameworks-base-testutils", + "androidx.test.runner", + "mockito-target-extended-minus-junit4", + "ShortcutManagerTestUtils", + "compatibility-device-util", + "truth-prebuilt", + ], + + libs: ["android.test.mock"], + + jni_libs: [ + "libdexmakerjvmtiagent", + "libstaticjvmtiagent", + ], + + platform_apis: true, + test_suites: ["device-tests"], + + optimize: { + enabled: false, + }, +} diff --git a/services/tests/mockingservicestests/Android.mk b/services/tests/mockingservicestests/Android.mk deleted file mode 100644 index 7946bae5b466..000000000000 --- a/services/tests/mockingservicestests/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# 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. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - services.core \ - services.devicepolicy \ - frameworks-base-testutils \ - androidx.test.runner \ - mockito-target-extended-minus-junit4 \ - ShortcutManagerTestUtils \ - compatibility-device-util \ - truth-prebuilt - -LOCAL_JAVA_LIBRARIES := \ - android.test.mock - -LOCAL_JNI_SHARED_LIBRARIES := \ - libdexmakerjvmtiagent \ - libstaticjvmtiagent - -LOCAL_PACKAGE_NAME := FrameworksMockingServicesTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp new file mode 100644 index 000000000000..225df5ca96af --- /dev/null +++ b/services/tests/servicestests/Android.bp @@ -0,0 +1,101 @@ +//######################################################################## +// Build FrameworksServicesTests package +//######################################################################## + +android_test { + name: "FrameworksServicesTests", + + // Include all test java files. + srcs: [ + "src/**/*.java", + + "aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl", + "aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl", + + "test-apps/JobTestApp/src/**/*.java", + + "test-apps/SuspendTestApp/src/**/*.java", + ], + static_libs: [ + "frameworks-base-testutils", + "services.accessibility", + "services.appwidget", + "services.autofill", + "services.backup", + "services.core", + "services.devicepolicy", + "services.net", + "services.usage", + "guava", + "android-support-test", + "mockito-target-minus-junit4", + "platform-test-annotations", + "ShortcutManagerTestUtils", + "truth-prebuilt", + "testables", + "testng", + "ub-uiautomator", + "platformprotosnano", + "servicestests-utils", + ], + + aidl: { + local_include_dirs: ["aidl"], + }, + + libs: [ + "android.hidl.manager-V1.0-java", + "android.test.mock", + "android.test.base", + "android.test.runner", + ], + + platform_apis: true, + test_suites: ["device-tests"], + + certificate: "platform", + + // These are not normally accessible from apps so they must be explicitly included. + jni_libs: [ + "libbacktrace", + "libbase", + "libbinder", + "libbinderthreadstate", + "libc++", + "libcutils", + "liblog", + "liblzma", + "libnativehelper", + "libnetdaidl", + "libui", + "libunwind", + "libutils", + ], + + dxflags: ["--multi-dex"], + + optimize: { + enabled: false, + }, +} + +java_library { + name: "servicestests-utils", + srcs: [ + "utils/**/*.java", + ], + static_libs: [ + "android-support-test", + "mockito-target-minus-junit4", + ], + libs: [ + "android.test.runner", + ], +} + +filegroup { + name: "servicestests-SuspendTestApp-files", + srcs: [ + "src/com/android/server/pm/SuspendPackagesTest.java", + ], +} diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk deleted file mode 100644 index 00ebae6613cc..000000000000 --- a/services/tests/servicestests/Android.mk +++ /dev/null @@ -1,80 +0,0 @@ -######################################################################### -# Build FrameworksServicesTests package -######################################################################### - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include all test java files. -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-java-files-under, utils) \ - -LOCAL_STATIC_JAVA_LIBRARIES := \ - frameworks-base-testutils \ - services.accessibility \ - services.appwidget \ - services.autofill \ - services.backup \ - services.core \ - services.devicepolicy \ - services.net \ - services.usage \ - guava \ - android-support-test \ - mockito-target-minus-junit4 \ - platform-test-annotations \ - ShortcutManagerTestUtils \ - truth-prebuilt \ - testables \ - testng \ - ub-uiautomator\ - platformprotosnano - -LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl - -LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aidl \ - aidl/com/android/servicestests/aidl/ICmdReceiverService.aidl -LOCAL_SRC_FILES += $(call all-java-files-under, test-apps/JobTestApp/src) -LOCAL_SRC_FILES += $(call all-java-files-under, test-apps/SuspendTestApp/src) - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.manager-V1.0-java \ - android.test.mock \ - android.test.base android.test.runner \ - -LOCAL_PACKAGE_NAME := FrameworksServicesTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_CERTIFICATE := platform - -# These are not normally accessible from apps so they must be explicitly included. -LOCAL_JNI_SHARED_LIBRARIES := \ - libbacktrace \ - libbase \ - libbinder \ - libbinderthreadstate \ - libc++ \ - libcutils \ - liblog \ - liblzma \ - libnativehelper \ - libnetdaidl \ - libui \ - libunwind \ - libutils - -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -LOCAL_JACK_FLAGS := --multi-dex native -LOCAL_DX_FLAGS := --multi-dex - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/services/tests/servicestests/aidl/Android.bp b/services/tests/servicestests/aidl/Android.bp new file mode 100644 index 000000000000..d4e53dddf4a7 --- /dev/null +++ b/services/tests/servicestests/aidl/Android.bp @@ -0,0 +1,22 @@ +// 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: "servicestests-aidl", + sdk_version: "current", + srcs: [ + "com/android/servicestests/aidl/INetworkStateObserver.aidl", + "com/android/servicestests/aidl/ICmdReceiverService.aidl", + ], +} diff --git a/services/tests/servicestests/aidl/Android.mk b/services/tests/servicestests/aidl/Android.mk deleted file mode 100644 index 166da1dea7e3..000000000000 --- a/services/tests/servicestests/aidl/Android.mk +++ /dev/null @@ -1,24 +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_TAGS := tests -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := \ - com/android/servicestests/aidl/INetworkStateObserver.aidl \ - com/android/servicestests/aidl/ICmdReceiverService.aidl -LOCAL_MODULE := servicestests-aidl -include $(BUILD_STATIC_JAVA_LIBRARY)
\ No newline at end of file diff --git a/services/tests/servicestests/test-apps/Android.mk b/services/tests/servicestests/test-apps/Android.mk deleted file mode 100644 index 5053e7d64389..000000000000 --- a/services/tests/servicestests/test-apps/Android.mk +++ /dev/null @@ -1 +0,0 @@ -include $(call all-subdir-makefiles) diff --git a/services/tests/servicestests/test-apps/ConnTestApp/Android.bp b/services/tests/servicestests/test-apps/ConnTestApp/Android.bp new file mode 100644 index 000000000000..13e664446418 --- /dev/null +++ b/services/tests/servicestests/test-apps/ConnTestApp/Android.bp @@ -0,0 +1,31 @@ +// 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_test_helper_app { + name: "ConnTestApp", + + test_suites: ["device-tests"], + + static_libs: ["servicestests-aidl"], + srcs: ["**/*.java"], + + platform_apis: true, + certificate: "platform", + dex_preopt: { + enabled: false, + }, + optimize: { + enabled: false, + }, +} diff --git a/services/tests/servicestests/test-apps/ConnTestApp/Android.mk b/services/tests/servicestests/test-apps/ConnTestApp/Android.mk deleted file mode 100644 index 18b8c2d63313..000000000000 --- a/services/tests/servicestests/test-apps/ConnTestApp/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_TAGS := tests - -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_STATIC_JAVA_LIBRARIES := servicestests-aidl -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := ConnTestApp -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_CERTIFICATE := platform -LOCAL_DEX_PREOPT := false -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE)
\ No newline at end of file diff --git a/services/tests/servicestests/test-apps/JobTestApp/Android.bp b/services/tests/servicestests/test-apps/JobTestApp/Android.bp new file mode 100644 index 000000000000..ae1eca7ba707 --- /dev/null +++ b/services/tests/servicestests/test-apps/JobTestApp/Android.bp @@ -0,0 +1,30 @@ +// 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_test_helper_app { + name: "JobTestApp", + + sdk_version: "current", + + test_suites: ["device-tests"], + + srcs: ["**/*.java"], + + dex_preopt: { + enabled: false, + }, + optimize: { + enabled: false, + }, +} diff --git a/services/tests/servicestests/test-apps/JobTestApp/Android.mk b/services/tests/servicestests/test-apps/JobTestApp/Android.mk deleted file mode 100644 index 7893c913d19d..000000000000 --- a/services/tests/servicestests/test-apps/JobTestApp/Android.mk +++ /dev/null @@ -1,30 +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_TAGS := tests -LOCAL_SDK_VERSION := current - -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_PACKAGE_NAME := JobTestApp -LOCAL_DEX_PREOPT := false -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE)
\ No newline at end of file diff --git a/services/tests/servicestests/test-apps/SuspendTestApp/Android.bp b/services/tests/servicestests/test-apps/SuspendTestApp/Android.bp new file mode 100644 index 000000000000..7bff1ae7d582 --- /dev/null +++ b/services/tests/servicestests/test-apps/SuspendTestApp/Android.bp @@ -0,0 +1,39 @@ +// 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. + +android_test_helper_app { + name: "SuspendTestApp", + + test_suites: ["device-tests"], + + static_libs: [ + "android-support-test", + "ub-uiautomator", + ], + + srcs: [ + "**/*.java", + ":servicestests-SuspendTestApp-files", + ], + + dex_preopt: { + enabled: false, + }, + optimize: { + enabled: false, + }, + + platform_apis: true, + +} diff --git a/services/tests/servicestests/test-apps/SuspendTestApp/Android.mk b/services/tests/servicestests/test-apps/SuspendTestApp/Android.mk deleted file mode 100644 index ae0b0f9326d0..000000000000 --- a/services/tests/servicestests/test-apps/SuspendTestApp/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator - -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_SRC_FILES += ../../src/com/android/server/pm/SuspendPackagesTest.java - -LOCAL_PACKAGE_NAME := SuspendTestApp -LOCAL_DEX_PREOPT := false -LOCAL_PROGUARD_ENABLED := disabled - -LOCAL_PRIVATE_PLATFORM_APIS := true - -include $(BUILD_PACKAGE)
\ No newline at end of file diff --git a/services/tests/shortcutmanagerutils/Android.bp b/services/tests/shortcutmanagerutils/Android.bp new file mode 100644 index 000000000000..c2cb688175b2 --- /dev/null +++ b/services/tests/shortcutmanagerutils/Android.bp @@ -0,0 +1,26 @@ +// 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: "ShortcutManagerTestUtils", + + srcs: ["src/**/*.java"], + + libs: [ + "mockito-target", + "android.test.runner.stubs", + ], + + sdk_version: "test_current", +} diff --git a/services/tests/shortcutmanagerutils/Android.mk b/services/tests/shortcutmanagerutils/Android.mk deleted file mode 100644 index 019bcbd37628..000000000000 --- a/services/tests/shortcutmanagerutils/Android.mk +++ /dev/null @@ -1,32 +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_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := \ - mockito-target \ - android.test.runner.stubs - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE := ShortcutManagerTestUtils - -LOCAL_SDK_VERSION := test_current - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp new file mode 100644 index 000000000000..9b414f1eb24a --- /dev/null +++ b/services/tests/uiservicestests/Android.bp @@ -0,0 +1,58 @@ +//######################################################################## +// Build FrameworksUiServicesTests package +//######################################################################## + +android_test { + name: "FrameworksUiServicesTests", + + // Include test java files + srcs: [ + "src/**/*.java", + ], + + static_libs: [ + "services.accessibility", + "services.core", + "services.devicepolicy", + "services.net", + "services.usage", + "guava", + "android-support-test", + "mockito-target-inline-minus-junit4", + "platform-test-annotations", + "testables", + ], + + libs: [ + "android.test.runner", + "android.test.base", + ], + + dxflags: ["--multi-dex"], + + platform_apis: true, + test_suites: ["device-tests"], + + certificate: "platform", + + compile_multilib: "both", + + // These are not normally accessible from apps so they must be explicitly included. + jni_libs: [ + "libdexmakerjvmtiagent", + "libmultiplejvmtiagentsinterferenceagent", + "libbacktrace", + "libbase", + "libbinder", + "libbinderthreadstate", + "libc++", + "libcutils", + "liblog", + "liblzma", + "libnativehelper", + "libnetdaidl", + "libui", + "libunwind", + "libutils", + ], +} diff --git a/services/tests/uiservicestests/Android.mk b/services/tests/uiservicestests/Android.mk deleted file mode 100644 index 3fa776cc3180..000000000000 --- a/services/tests/uiservicestests/Android.mk +++ /dev/null @@ -1,61 +0,0 @@ -######################################################################### -# Build FrameworksUiServicesTests package -######################################################################### - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include test java files and source from notifications package. -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-java-files-under, ../../core/java/com/android/server/notification) \ - $(call all-java-files-under, ../../core/java/com/android/server/slice) \ - -LOCAL_STATIC_JAVA_LIBRARIES := \ - services.accessibility \ - services.core \ - services.devicepolicy \ - services.net \ - services.usage \ - guava \ - android-support-test \ - mockito-target-inline-minus-junit4 \ - platform-test-annotations \ - testables - -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base - -LOCAL_JACK_FLAGS := --multi-dex native -LOCAL_DX_FLAGS := --multi-dex - -LOCAL_PACKAGE_NAME := FrameworksUiServicesTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_CERTIFICATE := platform - -LOCAL_MULTILIB := both - -# These are not normally accessible from apps so they must be explicitly included. -LOCAL_JNI_SHARED_LIBRARIES := \ - libdexmakerjvmtiagent \ - libmultiplejvmtiagentsinterferenceagent \ - libbacktrace \ - libbase \ - libbinder \ - libbinderthreadstate \ - libc++ \ - libcutils \ - liblog \ - liblzma \ - libnativehelper \ - libnetdaidl \ - libui \ - libunwind \ - libutils - -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -include $(BUILD_PACKAGE) diff --git a/services/tests/wmtests/Android.bp b/services/tests/wmtests/Android.bp new file mode 100644 index 000000000000..c034c3831524 --- /dev/null +++ b/services/tests/wmtests/Android.bp @@ -0,0 +1,42 @@ +//######################################################################## +// Build WmTests package +//######################################################################## + +android_test { + name: "WmTests", + + // We only want this apk build for tests. + + // Include all test java files. + srcs: [ + "src/**/*.java", + ], + + static_libs: [ + "androidx.test.runner", + "mockito-target-minus-junit4", + "platform-test-annotations", + "servicestests-utils", + ], + + libs: [ + "android.test.mock", + "android.test.base", + "android.test.runner", + ], + + platform_apis: true, + test_suites: ["device-tests"], + + certificate: "platform", + + // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_JACK_FLAGS + // LOCAL_JACK_FLAGS := --multi-dex native + + dxflags: ["--multi-dex"], + + optimize: { + enabled: false, + }, + +} diff --git a/services/tests/wmtests/Android.mk b/services/tests/wmtests/Android.mk deleted file mode 100644 index c095ae0dd2ff..000000000000 --- a/services/tests/wmtests/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -######################################################################### -# Build WmTests package -######################################################################### - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include all test java files. -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-java-files-under, ../servicestests/utils) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.runner \ - mockito-target-minus-junit4 \ - platform-test-annotations \ - -LOCAL_JAVA_LIBRARIES := \ - android.test.mock \ - android.test.base \ - android.test.runner \ - -LOCAL_PACKAGE_NAME := WmTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_CERTIFICATE := platform - -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -LOCAL_JACK_FLAGS := --multi-dex native -LOCAL_DX_FLAGS := --multi-dex - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f69f3e8b146e..45303e0e16c7 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1838,6 +1838,13 @@ public class CarrierConfigManager { "notify_international_call_on_wfc_bool"; /** + * Flag to hide Preset APN details. If true, user cannot enter ApnEditor view of Preset APN, + * and cannot view details of the APN. If false, user can enter ApnEditor view of Preset APN. + * Default value is false. + */ + public static final String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool"; + + /** * Flag specifying whether to show an alert dialog for video call charges. * By default this value is {@code false}. * @hide @@ -2605,6 +2612,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false); + sDefaults.putBoolean(KEY_HIDE_PRESET_APN_DETAILS_BOOL, false); sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false); sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY, null); diff --git a/telephony/java/android/telephony/MbmsGroupCallSession.java b/telephony/java/android/telephony/MbmsGroupCallSession.java index e3737976adf7..269cda13bd93 100644 --- a/telephony/java/android/telephony/MbmsGroupCallSession.java +++ b/telephony/java/android/telephony/MbmsGroupCallSession.java @@ -37,6 +37,7 @@ import android.telephony.mbms.vendor.IMbmsGroupCallService; import android.util.ArraySet; import android.util.Log; +import java.util.List; import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; @@ -107,14 +108,14 @@ public class MbmsGroupCallSession implements AutoCloseable { * {@link MbmsGroupCallSession} that you received before calling this method again. * * @param context The {@link Context} to use. - * @param executor The executor on which you wish to execute callbacks. * @param subscriptionId The subscription ID to use. + * @param executor The executor on which you wish to execute callbacks. * @param callback A callback object on which you wish to receive results of asynchronous * operations. * @return An instance of {@link MbmsGroupCallSession}, or null if an error occurred. */ public static @Nullable MbmsGroupCallSession create(@NonNull Context context, - @NonNull Executor executor, int subscriptionId, + int subscriptionId, @NonNull Executor executor, final @NonNull MbmsGroupCallSessionCallback callback) { if (!sIsInitialized.compareAndSet(false, true)) { throw new IllegalStateException("Cannot create two instances of MbmsGroupCallSession"); @@ -138,11 +139,11 @@ public class MbmsGroupCallSession implements AutoCloseable { /** * Create a new {@link MbmsGroupCallSession} using the system default data subscription ID. - * See {@link #create(Context, Executor, int, MbmsGroupCallSessionCallback)}. + * See {@link #create(Context, int, Executor, MbmsGroupCallSessionCallback)}. */ public static MbmsGroupCallSession create(@NonNull Context context, @NonNull Executor executor, @NonNull MbmsGroupCallSessionCallback callback) { - return create(context, executor, SubscriptionManager.getDefaultSubscriptionId(), callback); + return create(context, SubscriptionManager.getDefaultSubscriptionId(), executor, callback); } /** @@ -153,7 +154,7 @@ public class MbmsGroupCallSession implements AutoCloseable { * instance of {@link MbmsGroupCallSessionCallback}, but callbacks that have already been * enqueued will still be delivered. * - * It is safe to call {@link #create(Context, Executor, int, MbmsGroupCallSessionCallback)} to + * It is safe to call {@link #create(Context, int, Executor, MbmsGroupCallSessionCallback)} to * obtain another instance of {@link MbmsGroupCallSession} immediately after this method * returns. * @@ -189,18 +190,19 @@ public class MbmsGroupCallSession implements AutoCloseable { * Asynchronous errors through the callback include any of the errors in * {@link MbmsErrors.GeneralErrors}. * - * @param executor The executor on which you wish to execute callbacks for this stream. * @param tmgi The TMGI, an identifier for the group call you want to join. - * @param saiArray An array of SAIs for the group call that should be negotiated separately with + * @param saiList A list of SAIs for the group call that should be negotiated separately with * the carrier. - * @param frequencyArray An array of frequencies for the group call that should be negotiated + * @param frequencyList A lost of frequencies for the group call that should be negotiated * separately with the carrier. + * @param executor The executor on which you wish to execute callbacks for this stream. * @param callback The callback that you want to receive information about the call on. * @return An instance of {@link GroupCall} through which the call can be controlled. * May be {@code null} if an error occurred. */ - public @Nullable GroupCall startGroupCall(@NonNull Executor executor, long tmgi, int[] saiArray, - int[] frequencyArray, @NonNull GroupCallCallback callback) { + public @Nullable GroupCall startGroupCall(long tmgi, @NonNull List<Integer> saiList, + @NonNull List<Integer> frequencyList, @NonNull Executor executor, + @NonNull GroupCallCallback callback) { IMbmsGroupCallService groupCallService = mService.get(); if (groupCallService == null) { throw new IllegalStateException("Middleware not yet bound"); @@ -215,7 +217,7 @@ public class MbmsGroupCallSession implements AutoCloseable { try { int returnCode = groupCallService.startGroupCall( - mSubscriptionId, tmgi, saiArray, frequencyArray, serviceCallback); + mSubscriptionId, tmgi, saiList, frequencyList, serviceCallback); if (returnCode == MbmsErrors.UNKNOWN) { // Unbind and throw an obvious error close(); diff --git a/telephony/java/android/telephony/PhysicalChannelConfig.java b/telephony/java/android/telephony/PhysicalChannelConfig.java index d2001ae6ea0e..22ddb4adcbf7 100644 --- a/telephony/java/android/telephony/PhysicalChannelConfig.java +++ b/telephony/java/android/telephony/PhysicalChannelConfig.java @@ -16,11 +16,15 @@ package android.telephony; +import android.annotation.IntDef; import android.os.Parcel; import android.os.Parcelable; -import android.annotation.IntDef; +import android.telephony.TelephonyManager.NetworkType; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; +import java.util.Objects; /** * @hide @@ -50,6 +54,7 @@ public final class PhysicalChannelConfig implements Parcelable { * * <p>One of {@link #CONNECTION_PRIMARY_SERVING}, {@link #CONNECTION_SECONDARY_SERVING}. */ + @ConnectionStatus private int mCellConnectionStatus; /** @@ -57,15 +62,33 @@ public final class PhysicalChannelConfig implements Parcelable { */ private int mCellBandwidthDownlinkKhz; - public PhysicalChannelConfig(int status, int bandwidth) { - mCellConnectionStatus = status; - mCellBandwidthDownlinkKhz = bandwidth; - } + /** + * The radio technology for this physical channel. + */ + @NetworkType + private int mRat; - public PhysicalChannelConfig(Parcel in) { - mCellConnectionStatus = in.readInt(); - mCellBandwidthDownlinkKhz = in.readInt(); - } + /** + * The rough frequency range for this physical channel. + */ + @ServiceState.FrequencyRange + private int mFrequencyRange; + + /** + * The absolute radio frequency channel number, {@link Integer#MAX_VALUE} if unknown. + */ + private int mChannelNumber; + + /** + * A list of data calls mapped to this physical channel. An empty list means the physical + * channel has no data call mapped to it. + */ + private int[] mContextIds; + + /** + * The physical cell identifier for this cell - PCI, PSC, {@link Integer#MAX_VALUE} if known. + */ + private int mPhysicalCellId; @Override public int describeContents() { @@ -76,6 +99,11 @@ public final class PhysicalChannelConfig implements Parcelable { public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mCellConnectionStatus); dest.writeInt(mCellBandwidthDownlinkKhz); + dest.writeInt(mRat); + dest.writeInt(mChannelNumber); + dest.writeInt(mFrequencyRange); + dest.writeIntArray(mContextIds); + dest.writeInt(mPhysicalCellId); } /** @@ -86,6 +114,60 @@ public final class PhysicalChannelConfig implements Parcelable { } /** + * Get the list of data call ids mapped to this physical channel. This list is sorted into + * ascending numerical order. Each id in this list must match the id in + * {@link com.android.internal.telephony.dataconnection.DataConnection}. An empty list means the + * physical channel has no data call mapped to it. + * + * @return an integer list indicates the data call ids. + */ + public int[] getContextIds() { + return mContextIds; + } + + /** + * @return the rough frequency range for this physical channel. + * @see {@link ServiceState#FREQUENCY_RANGE_LOW} + * @see {@link ServiceState#FREQUENCY_RANGE_MID} + * @see {@link ServiceState#FREQUENCY_RANGE_HIGH} + * @see {@link ServiceState#FREQUENCY_RANGE_MMWAVE} + */ + @ServiceState.FrequencyRange + public int getFrequencyRange() { + return mFrequencyRange; + } + + /** + * @return the absolute radio frequency channel number for this physical channel, + * {@link Integer#MAX_VALUE} if unknown. + */ + public int getChannelNumber() { + return mChannelNumber; + } + + /** + * In UTRAN, this value is primary scrambling code. The range is [0, 511]. + * Reference: 3GPP TS 25.213 section 5.2.2. + * + * In EUTRAN, this value is physical layer cell identity. The range is [0, 503]. + * Reference: 3GPP TS 36.211 section 6.11. + * + * In 5G RAN, this value is physical layer cell identity. The range is [0, 1008]. + * Reference: 3GPP TS 38.211 section 7.4.2.1. + * + * @return the physical cell identifier for this cell, {@link Integer#MAX_VALUE} if unknown. + */ + public int getPhysicalCellId() { + return mPhysicalCellId; + } + + /**The radio technology for this physical channel. */ + @NetworkType + public int getRat() { + return mRat; + } + + /** * Gets the connection status of the cell. * * @see #CONNECTION_PRIMARY_SERVING @@ -125,12 +207,19 @@ public final class PhysicalChannelConfig implements Parcelable { PhysicalChannelConfig config = (PhysicalChannelConfig) o; return mCellConnectionStatus == config.mCellConnectionStatus - && mCellBandwidthDownlinkKhz == config.mCellBandwidthDownlinkKhz; + && mCellBandwidthDownlinkKhz == config.mCellBandwidthDownlinkKhz + && mRat == config.mRat + && mFrequencyRange == config.mFrequencyRange + && mChannelNumber == config.mChannelNumber + && mPhysicalCellId == config.mPhysicalCellId + && Arrays.equals(mContextIds, config.mContextIds); } @Override public int hashCode() { - return (mCellBandwidthDownlinkKhz * 29) + (mCellConnectionStatus * 31); + return Objects.hash( + mCellConnectionStatus, mCellBandwidthDownlinkKhz, mRat, mFrequencyRange, + mChannelNumber, mPhysicalCellId, mContextIds); } public static final Parcelable.Creator<PhysicalChannelConfig> CREATOR = @@ -147,11 +236,111 @@ public final class PhysicalChannelConfig implements Parcelable { @Override public String toString() { return new StringBuilder() - .append("{mConnectionStatus=") - .append(getConnectionStatusString()) - .append(",mCellBandwidthDownlinkKhz=") - .append(mCellBandwidthDownlinkKhz) - .append("}") - .toString(); + .append("{mConnectionStatus=") + .append(getConnectionStatusString()) + .append(",mCellBandwidthDownlinkKhz=") + .append(mCellBandwidthDownlinkKhz) + .append(",mRat=") + .append(mRat) + .append(",mFrequencyRange=") + .append(mFrequencyRange) + .append(",mChannelNumber=") + .append(mChannelNumber) + .append(",mContextIds=") + .append(mContextIds.toString()) + .append(",mPhysicalCellId=") + .append(mPhysicalCellId) + .append("}") + .toString(); + } + + private PhysicalChannelConfig(Parcel in) { + mCellConnectionStatus = in.readInt(); + mCellBandwidthDownlinkKhz = in.readInt(); + mRat = in.readInt(); + mChannelNumber = in.readInt(); + mFrequencyRange = in.readInt(); + mContextIds = in.createIntArray(); + mPhysicalCellId = in.readInt(); + } + + private PhysicalChannelConfig(Builder builder) { + mCellConnectionStatus = builder.mCellConnectionStatus; + mCellBandwidthDownlinkKhz = builder.mCellBandwidthDownlinkKhz; + mRat = builder.mRat; + mChannelNumber = builder.mChannelNumber; + mFrequencyRange = builder.mFrequencyRange; + mContextIds = builder.mContextIds; + mPhysicalCellId = builder.mPhysicalCellId; + } + + /** The builder of {@code PhysicalChannelConfig}. */ + public static final class Builder { + private int mRat; + private int mFrequencyRange; + private int mChannelNumber; + private int mCellBandwidthDownlinkKhz; + private int mCellConnectionStatus; + private int[] mContextIds; + private int mPhysicalCellId; + + /** @hide */ + public Builder() { + mRat = ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN; + mFrequencyRange = ServiceState.FREQUENCY_RANGE_UNKNOWN; + mChannelNumber = Integer.MAX_VALUE; + mCellBandwidthDownlinkKhz = 0; + mCellConnectionStatus = CONNECTION_UNKNOWN; + mContextIds = new int[0]; + mPhysicalCellId = Integer.MAX_VALUE; + } + + /** @hide */ + public PhysicalChannelConfig build() { + return new PhysicalChannelConfig(this); + } + + /** @hide */ + public Builder setRat(int rat) { + this.mRat = rat; + return this; + } + + /** @hide */ + public Builder setFrequencyRange(int frequencyRange) { + this.mFrequencyRange = frequencyRange; + return this; + } + + /** @hide */ + public Builder setChannelNumber(int channelNumber) { + this.mChannelNumber = channelNumber; + return this; + } + + /** @hide */ + public Builder setCellBandwidthDownlinkKhz(int cellBandwidthDownlinkKhz) { + this.mCellBandwidthDownlinkKhz = cellBandwidthDownlinkKhz; + return this; + } + + /** @hide */ + public Builder setCellConnectionStatus(int connectionStatus) { + this.mCellConnectionStatus = connectionStatus; + return this; + } + + /** @hide */ + public Builder setContextIds(int[] contextIds) { + if (contextIds != null) Arrays.sort(contextIds); + this.mContextIds = contextIds; + return this; + } + + /** @hide */ + public Builder setPhysicalCellId(int physicalCellId) { + this.mPhysicalCellId = physicalCellId; + return this; + } } } diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 22c1e58449de..b41e14e09554 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -143,9 +143,11 @@ public class SubscriptionInfo implements Parcelable { private boolean mIsOpportunistic; /** - * SubId of the parent subscription, if there is one. + * A UUID assigned to the subscription group. It returns + * null if not assigned. */ - private int mParentSubId; + @Nullable + private String mGroupUUID; /** * @hide @@ -156,7 +158,7 @@ public class SubscriptionInfo implements Parcelable { @Nullable UiccAccessRule[] accessRules, String cardId) { this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, roaming, icon, mcc, mnc, countryIso, isEmbedded, accessRules, cardId, - false, SubscriptionManager.INVALID_SUBSCRIPTION_ID); + false, null); } /** @@ -166,7 +168,7 @@ public class SubscriptionInfo implements Parcelable { CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, Bitmap icon, String mcc, String mnc, String countryIso, boolean isEmbedded, @Nullable UiccAccessRule[] accessRules, String cardId, boolean isOpportunistic, - int parentSubId) { + @Nullable String groupUUID) { this.mId = id; this.mIccId = iccId; this.mSimSlotIndex = simSlotIndex; @@ -184,7 +186,7 @@ public class SubscriptionInfo implements Parcelable { this.mAccessRules = accessRules; this.mCardId = cardId; this.mIsOpportunistic = isOpportunistic; - this.mParentSubId = parentSubId; + this.mGroupUUID = groupUUID; } /** @@ -388,16 +390,16 @@ public class SubscriptionInfo implements Parcelable { } /** - * Used in scenarios where a child subscription is bundled with a primary parent subscription. - * The child subscription will typically be opportunistic (see {@link #isOpportunistic()}) - * and will be used to provide data services where available, with the parent being the primary - * fallback subscription. + * Used in scenarios where different subscriptions are bundled as a group. + * It's typically a primary and an opportunistic subscription. (see {@link #isOpportunistic()}) + * Such that those subscriptions will have some affiliated behaviors such as opportunistic + * subscription may be invisible to the user. * - * @return subId of parent subscription if it’s bundled with a primary subscription. - * If there isn't one, {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} + * @return group UUID a String of group UUID if it belongs to a group. Otherwise + * it will return null. */ - public int getParentSubId() { - return mParentSubId; + public String getGroupUuid() { + return mGroupUUID; } /** @@ -493,11 +495,11 @@ public class SubscriptionInfo implements Parcelable { UiccAccessRule[] accessRules = source.createTypedArray(UiccAccessRule.CREATOR); String cardId = source.readString(); boolean isOpportunistic = source.readBoolean(); - int parentSubId = source.readInt(); + String groupUUID = source.readString(); return new SubscriptionInfo(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, dataRoaming, iconBitmap, mcc, mnc, countryIso, - isEmbedded, accessRules, cardId, isOpportunistic, parentSubId); + isEmbedded, accessRules, cardId, isOpportunistic, groupUUID); } @Override @@ -525,7 +527,7 @@ public class SubscriptionInfo implements Parcelable { dest.writeTypedArray(mAccessRules, flags); dest.writeString(mCardId); dest.writeBoolean(mIsOpportunistic); - dest.writeInt(mParentSubId); + dest.writeString(mGroupUUID); } @Override @@ -559,13 +561,13 @@ public class SubscriptionInfo implements Parcelable { + " mnc " + mMnc + "mCountryIso=" + mCountryIso + " isEmbedded " + mIsEmbedded + " accessRules " + Arrays.toString(mAccessRules) + " cardId=" + cardIdToPrint + " isOpportunistic " + mIsOpportunistic - + " parentSubId=" + mParentSubId + "}"; + + " mGroupUUID=" + mGroupUUID + "}"; } @Override public int hashCode() { return Objects.hash(mId, mSimSlotIndex, mNameSource, mIconTint, mDataRoaming, mIsEmbedded, - mIsOpportunistic, mParentSubId, mIccId, mNumber, mMcc, mMnc, mCountryIso, + mIsOpportunistic, mGroupUUID, mIccId, mNumber, mMcc, mMnc, mCountryIso, mCardId, mDisplayName, mCarrierName, mAccessRules); } @@ -588,7 +590,7 @@ public class SubscriptionInfo implements Parcelable { && mDataRoaming == toCompare.mDataRoaming && mIsEmbedded == toCompare.mIsEmbedded && mIsOpportunistic == toCompare.mIsOpportunistic - && mParentSubId == toCompare.mParentSubId + && Objects.equals(mGroupUUID, toCompare.mGroupUUID) && Objects.equals(mIccId, toCompare.mIccId) && Objects.equals(mNumber, toCompare.mNumber) && Objects.equals(mMcc, toCompare.mMcc) diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 93a062299be1..781a0482733d 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -43,6 +43,7 @@ import android.database.ContentObserver; import android.net.INetworkPolicyManager; import android.net.NetworkCapabilities; import android.net.Uri; +import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.Looper; @@ -118,7 +119,6 @@ public class SubscriptionManager { @UnsupportedAppUsage public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo"); - /** * Generates a content {@link Uri} used to receive updates on simInfo change * on the given subscriptionId @@ -147,7 +147,8 @@ public class SubscriptionManager { public static final Uri WFC_ENABLED_CONTENT_URI = Uri.withAppendedPath(CONTENT_URI, "wfc"); /** - * A content {@link Uri} used to receive updates on advanced calling user setting. + * A content {@link Uri} used to receive updates on advanced calling user setting + * @see ImsMmTelManager#isAdvancedCallingSettingEnabled(). * <p> * Use this {@link Uri} with a {@link ContentObserver} to be notified of changes to the * subscription advanced calling enabled @@ -576,6 +577,15 @@ public class SubscriptionManager { public static final String PARENT_SUB_ID = "parent_sub_id"; /** + * TelephonyProvider column name for group ID. Subscriptions with same group ID + * are considered bundled together, and should behave as a single subscription at + * certain scenarios. + * + * @hide + */ + public static final String GROUP_UUID = "group_uuid"; + + /** * Broadcast Action: The user has changed one of the default subs related to * data, phone calls, or sms</p> * @@ -850,8 +860,13 @@ public class SubscriptionManager { IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() { @Override public void onSubscriptionsChanged() { - if (DBG) log("onOpportunisticSubscriptionsChanged callback received."); - mExecutor.execute(() -> onOpportunisticSubscriptionsChanged()); + final long identity = Binder.clearCallingIdentity(); + try { + if (DBG) log("onOpportunisticSubscriptionsChanged callback received."); + mExecutor.execute(() -> onOpportunisticSubscriptionsChanged()); + } finally { + Binder.restoreCallingIdentity(identity); + } } }; @@ -2285,7 +2300,7 @@ public class SubscriptionManager { * subscription dynamically in multi-SIM devices. * * @param subId which subscription is preferred to for cellular data. If it's - * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}, it means + * {@link SubscriptionManager#DEFAULT_SUBSCRIPTION_ID}, it means * it's unset and {@link SubscriptionManager#getDefaultDataSubscriptionId()} * is used to determine which modem is preferred. * @hide @@ -2299,22 +2314,27 @@ public class SubscriptionManager { } /** - * Get opportunistic data Profiles. + * Return opportunistic subscriptions that can be visible to the caller. + * Opportunistic subscriptions are for opportunistic networks, which are cellular + * networks with limited capabilities and coverage, for example, CBRS. * - * Provide all available user downloaded profiles on phone which are used only for - * opportunistic data. - * @param slotIndex slot on which the profiles are queried from. - * @return the list of opportunistic subscription info. If none exists, an empty list. + * <p>Requires Permission: + * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} + * or that the calling app has carrier privileges (see + * {@link TelephonyManager#hasCarrierPrivileges}). + * + * @return the list of opportunistic subscription info. If none exists, an empty list. */ + @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) - public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions(int slotIndex) { + public @NonNull List<SubscriptionInfo> getOpportunisticSubscriptions() { String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>"; List<SubscriptionInfo> subInfoList = null; try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - subInfoList = iSub.getOpportunisticSubscriptions(slotIndex, pkgForDebug); + subInfoList = iSub.getOpportunisticSubscriptions(pkgForDebug); } } catch (RemoteException ex) { // ignore it @@ -2355,19 +2375,40 @@ public class SubscriptionManager { } /** - * Set parent subId by simInfo index + * Inform SubscriptionManager that subscriptions in the list are bundled + * as a group. Typically it's a primary subscription and an opportunistic + * subscription. It should only affect multi-SIM scenarios where primary + * and opportunistic subscriptions can be activated together. + * Being in the same group means they might be activated or deactivated + * together, some of them may be invisible to the users, etc. * - * @param parentSubId subId of its parent subscription. - * @param subId the unique SubscriptionInfo index in database - * @return the number of records updated - * @hide + * Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE} + * permission or can manage all subscriptions in the list, according to their + * acess rules. + * + * @param subIdList list of subId that will be in the same group + * @return groupUUID a UUID assigned to the subscription group. It returns + * null if fails. * */ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) - public int setParentSubId(int parentSubId, int subId) { - if (VDBG) logd("[setParentSubId]+ parentSubId:" + parentSubId + " subId:" + subId); - return setSubscriptionPropertyHelper(subId, "parentSubId", - (iSub)-> iSub.setParentSubId(parentSubId, subId)); + public String setSubscriptionGroup(int[] subIdList) { + String pkgForDebug = mContext != null ? mContext.getOpPackageName() : "<unknown>"; + if (VDBG) { + logd("[setSubscriptionGroup]+ subIdList:" + Arrays.toString(subIdList)); + } + + String groupUUID = null; + try { + ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); + if (iSub != null) { + groupUUID = iSub.setSubscriptionGroup(subIdList, pkgForDebug); + } + } catch (RemoteException ex) { + // ignore it + } + + return groupUUID; } private interface CallISubMethodHelper { diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index e1cb7cc2725b..b750d4c89626 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -60,6 +60,7 @@ public class ApnSetting implements Parcelable { private static final String V3_FORMAT_REGEX = "^\\[ApnSettingV3\\]\\s*"; private static final String V4_FORMAT_REGEX = "^\\[ApnSettingV4\\]\\s*"; private static final String V5_FORMAT_REGEX = "^\\[ApnSettingV5\\]\\s*"; + private static final String V6_FORMAT_REGEX = "^\\[ApnSettingV6\\]\\s*"; /** * Default value for mtu if it's not set. Moved from PhoneConstants. @@ -268,6 +269,7 @@ public class ApnSetting implements Parcelable { private final int mApnSetId; private boolean mPermanentFailed = false; + private final int mCarrierId; /** * Returns the MTU size of the mobile interface to which the APN connected. @@ -596,6 +598,16 @@ public class ApnSetting implements Parcelable { return mMvnoType; } + /** + * Returns the carrier id for this APN. + * + * @see Builder#setCarrierId(int) + * @return the carrier id + */ + public int getCarrierId() { + return mCarrierId; + } + private ApnSetting(Builder builder) { this.mEntryName = builder.mEntryName; this.mApnName = builder.mApnName; @@ -623,47 +635,53 @@ public class ApnSetting implements Parcelable { this.mMvnoType = builder.mMvnoType; this.mMvnoMatchData = builder.mMvnoMatchData; this.mApnSetId = builder.mApnSetId; + this.mCarrierId = builder.mCarrierId; } - /** @hide */ + /** + * @hide + */ public static ApnSetting makeApnSetting(int id, String operatorNumeric, String entryName, String apnName, String proxyAddress, int proxyPort, Uri mmsc, String mmsProxyAddress, int mmsProxyPort, String user, String password, int authType, int mApnTypeBitmask, int protocol, int roamingProtocol, - boolean carrierEnabled, int networkTypeBitmask, int profileId, boolean modemCognitive, - int maxConns, int waitTime, int maxConnsTime, int mtu, int mvnoType, - String mvnoMatchData, int apnSetId) { + boolean carrierEnabled, int networkTypeBitmask, int profileId, + boolean modemCognitive, int maxConns, int waitTime, int maxConnsTime, int mtu, + int mvnoType, String mvnoMatchData, int apnSetId, int carrierId) { return new Builder() - .setId(id) - .setOperatorNumeric(operatorNumeric) - .setEntryName(entryName) - .setApnName(apnName) - .setProxyAddress(proxyAddress) - .setProxyPort(proxyPort) - .setMmsc(mmsc) - .setMmsProxyAddress(mmsProxyAddress) - .setMmsProxyPort(mmsProxyPort) - .setUser(user) - .setPassword(password) - .setAuthType(authType) - .setApnTypeBitmask(mApnTypeBitmask) - .setProtocol(protocol) - .setRoamingProtocol(roamingProtocol) - .setCarrierEnabled(carrierEnabled) - .setNetworkTypeBitmask(networkTypeBitmask) - .setProfileId(profileId) - .setModemCognitive(modemCognitive) - .setMaxConns(maxConns) - .setWaitTime(waitTime) - .setMaxConnsTime(maxConnsTime) - .setMtu(mtu) - .setMvnoType(mvnoType) - .setMvnoMatchData(mvnoMatchData) - .setApnSetId(apnSetId) - .buildWithoutCheck(); + .setId(id) + .setOperatorNumeric(operatorNumeric) + .setEntryName(entryName) + .setApnName(apnName) + .setProxyAddress(proxyAddress) + .setProxyPort(proxyPort) + .setMmsc(mmsc) + .setMmsProxyAddress(mmsProxyAddress) + .setMmsProxyPort(mmsProxyPort) + .setUser(user) + .setPassword(password) + .setAuthType(authType) + .setApnTypeBitmask(mApnTypeBitmask) + .setProtocol(protocol) + .setRoamingProtocol(roamingProtocol) + .setCarrierEnabled(carrierEnabled) + .setNetworkTypeBitmask(networkTypeBitmask) + .setProfileId(profileId) + .setModemCognitive(modemCognitive) + .setMaxConns(maxConns) + .setWaitTime(waitTime) + .setMaxConnsTime(maxConnsTime) + .setMtu(mtu) + .setMvnoType(mvnoType) + .setMvnoMatchData(mvnoMatchData) + .setApnSetId(apnSetId) + .setCarrierId(carrierId) + .buildWithoutCheck(); } - /** @hide */ + /** + * @hide + */ public static ApnSetting makeApnSetting(int id, String operatorNumeric, String entryName, String apnName, String proxyAddress, int proxyPort, Uri mmsc, String mmsProxyAddress, int mmsProxyPort, String user, String password, @@ -675,10 +693,12 @@ public class ApnSetting implements Parcelable { mmsc, mmsProxyAddress, mmsProxyPort, user, password, authType, mApnTypeBitmask, protocol, roamingProtocol, carrierEnabled, networkTypeBitmask, profileId, modemCognitive, maxConns, waitTime, maxConnsTime, mtu, mvnoType, mvnoMatchData, - Carriers.NO_SET_SET); + Carriers.NO_SET_SET, TelephonyManager.UNKNOWN_CARRIER_ID); } - /** @hide */ + /** + * @hide + */ public static ApnSetting makeApnSetting(Cursor cursor) { final int apnTypesBitmask = getApnTypesBitmaskFromString( cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.TYPE))); @@ -688,60 +708,64 @@ public class ApnSetting implements Parcelable { final int bearerBitmask = cursor.getInt(cursor.getColumnIndexOrThrow( Telephony.Carriers.BEARER_BITMASK)); networkTypeBitmask = - ServiceState.convertBearerBitmaskToNetworkTypeBitmask(bearerBitmask); + ServiceState.convertBearerBitmaskToNetworkTypeBitmask(bearerBitmask); } return makeApnSetting( - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers._ID)), - cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.NUMERIC)), - cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.NAME)), - cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.APN)), - cursor.getString( - cursor.getColumnIndexOrThrow(Telephony.Carriers.PROXY)), - portFromString(cursor.getString( - cursor.getColumnIndexOrThrow(Telephony.Carriers.PORT))), - UriFromString(cursor.getString( - cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSC))), - cursor.getString( - cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSPROXY)), - portFromString(cursor.getString( - cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSPORT))), - cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.USER)), - cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.PASSWORD)), - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.AUTH_TYPE)), - apnTypesBitmask, - getProtocolIntFromString( - cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.PROTOCOL))), - getProtocolIntFromString( - cursor.getString(cursor.getColumnIndexOrThrow( - Telephony.Carriers.ROAMING_PROTOCOL))), - cursor.getInt(cursor.getColumnIndexOrThrow( - Telephony.Carriers.CARRIER_ENABLED)) == 1, - networkTypeBitmask, - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.PROFILE_ID)), - cursor.getInt(cursor.getColumnIndexOrThrow( - Telephony.Carriers.MODEM_COGNITIVE)) == 1, - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MAX_CONNS)), - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.WAIT_TIME)), - cursor.getInt(cursor.getColumnIndexOrThrow( - Telephony.Carriers.MAX_CONNS_TIME)), - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MTU)), - getMvnoTypeIntFromString( - cursor.getString(cursor.getColumnIndexOrThrow( - Telephony.Carriers.MVNO_TYPE))), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers._ID)), + cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.NUMERIC)), + cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.NAME)), + cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.APN)), + cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.Carriers.PROXY)), + portFromString(cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.Carriers.PORT))), + UriFromString(cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSC))), + cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSPROXY)), + portFromString(cursor.getString( + cursor.getColumnIndexOrThrow(Telephony.Carriers.MMSPORT))), + cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.USER)), + cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.PASSWORD)), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.AUTH_TYPE)), + apnTypesBitmask, + getProtocolIntFromString( + cursor.getString(cursor.getColumnIndexOrThrow(Telephony.Carriers.PROTOCOL))), + getProtocolIntFromString( + cursor.getString(cursor.getColumnIndexOrThrow( + Telephony.Carriers.ROAMING_PROTOCOL))), + cursor.getInt(cursor.getColumnIndexOrThrow( + Telephony.Carriers.CARRIER_ENABLED)) == 1, + networkTypeBitmask, + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.PROFILE_ID)), + cursor.getInt(cursor.getColumnIndexOrThrow( + Telephony.Carriers.MODEM_COGNITIVE)) == 1, + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MAX_CONNS)), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.WAIT_TIME)), + cursor.getInt(cursor.getColumnIndexOrThrow( + Telephony.Carriers.MAX_CONNS_TIME)), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.MTU)), + getMvnoTypeIntFromString( cursor.getString(cursor.getColumnIndexOrThrow( - Telephony.Carriers.MVNO_MATCH_DATA)), - cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.APN_SET_ID))); + Telephony.Carriers.MVNO_TYPE))), + cursor.getString(cursor.getColumnIndexOrThrow( + Telephony.Carriers.MVNO_MATCH_DATA)), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.APN_SET_ID)), + cursor.getInt(cursor.getColumnIndexOrThrow(Telephony.Carriers.CARRIER_ID))); } - /** @hide */ + /** + * @hide + */ public static ApnSetting makeApnSetting(ApnSetting apn) { return makeApnSetting(apn.mId, apn.mOperatorNumeric, apn.mEntryName, apn.mApnName, - apn.mProxyAddress, apn.mProxyPort, apn.mMmsc, apn.mMmsProxyAddress, - apn.mMmsProxyPort, apn.mUser, apn.mPassword, apn.mAuthType, apn.mApnTypeBitmask, - apn.mProtocol, apn.mRoamingProtocol, apn.mCarrierEnabled, apn.mNetworkTypeBitmask, - apn.mProfileId, apn.mPersistent, apn.mMaxConns, apn.mWaitTime, - apn.mMaxConnsTime, apn.mMtu, apn.mMvnoType, apn.mMvnoMatchData, apn.mApnSetId); + apn.mProxyAddress, apn.mProxyPort, apn.mMmsc, apn.mMmsProxyAddress, + apn.mMmsProxyPort, apn.mUser, apn.mPassword, apn.mAuthType, apn.mApnTypeBitmask, + apn.mProtocol, apn.mRoamingProtocol, apn.mCarrierEnabled, apn.mNetworkTypeBitmask, + apn.mProfileId, apn.mPersistent, apn.mMaxConns, apn.mWaitTime, + apn.mMaxConnsTime, apn.mMtu, apn.mMvnoType, apn.mMvnoMatchData, apn.mApnSetId, + apn.mCarrierId); } /** @@ -783,6 +807,13 @@ public class ApnSetting implements Parcelable { * <profileId>, <modemCognitive>, <maxConns>, <waitTime>, <maxConnsTime>, <mtu>, * <mvnoType>, <mvnoMatchData>, <networkTypeBitmask>, <apnSetId> * + * v6 format: + * [ApnSettingV6] <carrier>, <apn>, <proxy>, <port>, <user>, <password>, <server>, + * <mmsc>, <mmsproxy>, <mmsport>, <mcc>, <mnc>, <authtype>, + * <type>[| <type>...], <protocol>, <roaming_protocol>, <carrierEnabled>, <bearerBitmask>, + * <profileId>, <modemCognitive>, <maxConns>, <waitTime>, <maxConnsTime>, <mtu>, + * <mvnoType>, <mvnoMatchData>, <networkTypeBitmask>, <apnSetId>, <carrierId> + * * Note that the strings generated by {@link #toString()} do not contain the username * and password and thus cannot be read by this method. * @@ -795,7 +826,10 @@ public class ApnSetting implements Parcelable { int version; // matches() operates on the whole string, so append .* to the regex. - if (data.matches(V5_FORMAT_REGEX + ".*")) { + if (data.matches(V6_FORMAT_REGEX + ".*")) { + version = 6; + data = data.replaceFirst(V6_FORMAT_REGEX, ""); + } else if (data.matches(V5_FORMAT_REGEX + ".*")) { version = 5; data = data.replaceFirst(V5_FORMAT_REGEX, ""); } else if (data.matches(V4_FORMAT_REGEX + ".*")) { @@ -837,6 +871,7 @@ public class ApnSetting implements Parcelable { String mvnoType = ""; String mvnoMatchData = ""; int apnSetId = Carriers.NO_SET_SET; + int carrierId = TelephonyManager.UNKNOWN_CARRIER_ID; if (version == 1) { typeArray = new String[a.length - 13]; System.arraycopy(a, 13, typeArray, 0, a.length - 13); @@ -880,6 +915,9 @@ public class ApnSetting implements Parcelable { if (a.length > 27) { apnSetId = Integer.parseInt(a[27]); } + if (a.length > 28) { + carrierId = Integer.parseInt(a[28]); + } } // If both bearerBitmask and networkTypeBitmask were specified, bearerBitmask would be @@ -894,7 +932,8 @@ public class ApnSetting implements Parcelable { getApnTypesBitmaskFromString(TextUtils.join(",", typeArray)), getProtocolIntFromString(protocol), getProtocolIntFromString(roamingProtocol), carrierEnabled, networkTypeBitmask, profileId, modemCognitive, maxConns, waitTime, - maxConnsTime, mtu, getMvnoTypeIntFromString(mvnoType), mvnoMatchData, apnSetId); + maxConnsTime, mtu, getMvnoTypeIntFromString(mvnoType), mvnoMatchData, apnSetId, + carrierId); } /** @@ -1013,7 +1052,10 @@ public class ApnSetting implements Parcelable { // TODO - if we have this function we should also have hashCode. // Also should handle changes in type order and perhaps case-insensitivity. - /** @hide */ + + /** + * @hide + */ public boolean equals(Object o) { if (o instanceof ApnSetting == false) { return false; @@ -1022,31 +1064,32 @@ public class ApnSetting implements Parcelable { ApnSetting other = (ApnSetting) o; return mEntryName.equals(other.mEntryName) - && Objects.equals(mId, other.mId) - && Objects.equals(mOperatorNumeric, other.mOperatorNumeric) - && Objects.equals(mApnName, other.mApnName) - && Objects.equals(mProxyAddress, other.mProxyAddress) - && Objects.equals(mMmsc, other.mMmsc) - && Objects.equals(mMmsProxyAddress, other.mMmsProxyAddress) - && Objects.equals(mMmsProxyPort, other.mMmsProxyPort) - && Objects.equals(mProxyPort, other.mProxyPort) - && Objects.equals(mUser, other.mUser) - && Objects.equals(mPassword, other.mPassword) - && Objects.equals(mAuthType, other.mAuthType) - && Objects.equals(mApnTypeBitmask, other.mApnTypeBitmask) - && Objects.equals(mProtocol, other.mProtocol) - && Objects.equals(mRoamingProtocol, other.mRoamingProtocol) - && Objects.equals(mCarrierEnabled, other.mCarrierEnabled) - && Objects.equals(mProfileId, other.mProfileId) - && Objects.equals(mPersistent, other.mPersistent) - && Objects.equals(mMaxConns, other.mMaxConns) - && Objects.equals(mWaitTime, other.mWaitTime) - && Objects.equals(mMaxConnsTime, other.mMaxConnsTime) - && Objects.equals(mMtu, other.mMtu) - && Objects.equals(mMvnoType, other.mMvnoType) - && Objects.equals(mMvnoMatchData, other.mMvnoMatchData) - && Objects.equals(mNetworkTypeBitmask, other.mNetworkTypeBitmask) - && Objects.equals(mApnSetId, other.mApnSetId); + && Objects.equals(mId, other.mId) + && Objects.equals(mOperatorNumeric, other.mOperatorNumeric) + && Objects.equals(mApnName, other.mApnName) + && Objects.equals(mProxyAddress, other.mProxyAddress) + && Objects.equals(mMmsc, other.mMmsc) + && Objects.equals(mMmsProxyAddress, other.mMmsProxyAddress) + && Objects.equals(mMmsProxyPort, other.mMmsProxyPort) + && Objects.equals(mProxyPort, other.mProxyPort) + && Objects.equals(mUser, other.mUser) + && Objects.equals(mPassword, other.mPassword) + && Objects.equals(mAuthType, other.mAuthType) + && Objects.equals(mApnTypeBitmask, other.mApnTypeBitmask) + && Objects.equals(mProtocol, other.mProtocol) + && Objects.equals(mRoamingProtocol, other.mRoamingProtocol) + && Objects.equals(mCarrierEnabled, other.mCarrierEnabled) + && Objects.equals(mProfileId, other.mProfileId) + && Objects.equals(mPersistent, other.mPersistent) + && Objects.equals(mMaxConns, other.mMaxConns) + && Objects.equals(mWaitTime, other.mWaitTime) + && Objects.equals(mMaxConnsTime, other.mMaxConnsTime) + && Objects.equals(mMtu, other.mMtu) + && Objects.equals(mMvnoType, other.mMvnoType) + && Objects.equals(mMvnoMatchData, other.mMvnoMatchData) + && Objects.equals(mNetworkTypeBitmask, other.mNetworkTypeBitmask) + && Objects.equals(mApnSetId, other.mApnSetId) + && Objects.equals(mCarrierId, other.mCarrierId); } /** @@ -1069,29 +1112,30 @@ public class ApnSetting implements Parcelable { ApnSetting other = (ApnSetting) o; return mEntryName.equals(other.mEntryName) - && Objects.equals(mOperatorNumeric, other.mOperatorNumeric) - && Objects.equals(mApnName, other.mApnName) - && Objects.equals(mProxyAddress, other.mProxyAddress) - && Objects.equals(mMmsc, other.mMmsc) - && Objects.equals(mMmsProxyAddress, other.mMmsProxyAddress) - && Objects.equals(mMmsProxyPort, other.mMmsProxyPort) - && Objects.equals(mProxyPort, other.mProxyPort) - && Objects.equals(mUser, other.mUser) - && Objects.equals(mPassword, other.mPassword) - && Objects.equals(mAuthType, other.mAuthType) - && Objects.equals(mApnTypeBitmask, other.mApnTypeBitmask) - && (isDataRoaming || Objects.equals(mProtocol, other.mProtocol)) - && (!isDataRoaming || Objects.equals(mRoamingProtocol, other.mRoamingProtocol)) - && Objects.equals(mCarrierEnabled, other.mCarrierEnabled) - && Objects.equals(mProfileId, other.mProfileId) - && Objects.equals(mPersistent, other.mPersistent) - && Objects.equals(mMaxConns, other.mMaxConns) - && Objects.equals(mWaitTime, other.mWaitTime) - && Objects.equals(mMaxConnsTime, other.mMaxConnsTime) - && Objects.equals(mMtu, other.mMtu) - && Objects.equals(mMvnoType, other.mMvnoType) - && Objects.equals(mMvnoMatchData, other.mMvnoMatchData) - && Objects.equals(mApnSetId, other.mApnSetId); + && Objects.equals(mOperatorNumeric, other.mOperatorNumeric) + && Objects.equals(mApnName, other.mApnName) + && Objects.equals(mProxyAddress, other.mProxyAddress) + && Objects.equals(mMmsc, other.mMmsc) + && Objects.equals(mMmsProxyAddress, other.mMmsProxyAddress) + && Objects.equals(mMmsProxyPort, other.mMmsProxyPort) + && Objects.equals(mProxyPort, other.mProxyPort) + && Objects.equals(mUser, other.mUser) + && Objects.equals(mPassword, other.mPassword) + && Objects.equals(mAuthType, other.mAuthType) + && Objects.equals(mApnTypeBitmask, other.mApnTypeBitmask) + && (isDataRoaming || Objects.equals(mProtocol, other.mProtocol)) + && (!isDataRoaming || Objects.equals(mRoamingProtocol, other.mRoamingProtocol)) + && Objects.equals(mCarrierEnabled, other.mCarrierEnabled) + && Objects.equals(mProfileId, other.mProfileId) + && Objects.equals(mPersistent, other.mPersistent) + && Objects.equals(mMaxConns, other.mMaxConns) + && Objects.equals(mWaitTime, other.mWaitTime) + && Objects.equals(mMaxConnsTime, other.mMaxConnsTime) + && Objects.equals(mMtu, other.mMtu) + && Objects.equals(mMvnoType, other.mMvnoType) + && Objects.equals(mMvnoMatchData, other.mMvnoMatchData) + && Objects.equals(mApnSetId, other.mApnSetId) + && Objects.equals(mCarrierId, other.mCarrierId); } /** @@ -1103,22 +1147,23 @@ public class ApnSetting implements Parcelable { */ public boolean similar(ApnSetting other) { return (!this.canHandleType(TYPE_DUN) - && !other.canHandleType(TYPE_DUN) - && Objects.equals(this.mApnName, other.mApnName) - && !typeSameAny(this, other) - && xorEquals(this.mProxyAddress, other.mProxyAddress) - && xorEqualsInt(this.mProxyPort, other.mProxyPort) - && xorEquals(this.mProtocol, other.mProtocol) - && xorEquals(this.mRoamingProtocol, other.mRoamingProtocol) - && Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled) - && Objects.equals(this.mProfileId, other.mProfileId) - && Objects.equals(this.mMvnoType, other.mMvnoType) - && Objects.equals(this.mMvnoMatchData, other.mMvnoMatchData) - && xorEquals(this.mMmsc, other.mMmsc) - && xorEquals(this.mMmsProxyAddress, other.mMmsProxyAddress) - && xorEqualsInt(this.mMmsProxyPort, other.mMmsProxyPort)) - && Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask) - && Objects.equals(mApnSetId, other.mApnSetId); + && !other.canHandleType(TYPE_DUN) + && Objects.equals(this.mApnName, other.mApnName) + && !typeSameAny(this, other) + && xorEquals(this.mProxyAddress, other.mProxyAddress) + && xorEqualsInt(this.mProxyPort, other.mProxyPort) + && xorEquals(this.mProtocol, other.mProtocol) + && xorEquals(this.mRoamingProtocol, other.mRoamingProtocol) + && Objects.equals(this.mCarrierEnabled, other.mCarrierEnabled) + && Objects.equals(this.mProfileId, other.mProfileId) + && Objects.equals(this.mMvnoType, other.mMvnoType) + && Objects.equals(this.mMvnoMatchData, other.mMvnoMatchData) + && xorEquals(this.mMmsc, other.mMmsc) + && xorEquals(this.mMmsProxyAddress, other.mMmsProxyAddress) + && xorEqualsInt(this.mMmsProxyPort, other.mMmsProxyPort)) + && Objects.equals(this.mNetworkTypeBitmask, other.mNetworkTypeBitmask) + && Objects.equals(mApnSetId, other.mApnSetId) + && Objects.equals(mCarrierId, other.mCarrierId); } // Equal or one is null. @@ -1164,6 +1209,7 @@ public class ApnSetting implements Parcelable { apnValue.put(Telephony.Carriers.CARRIER_ENABLED, mCarrierEnabled); apnValue.put(Telephony.Carriers.MVNO_TYPE, getMvnoTypeStringFromInt(mMvnoType)); apnValue.put(Telephony.Carriers.NETWORK_TYPE_BITMASK, mNetworkTypeBitmask); + apnValue.put(Telephony.Carriers.CARRIER_ID, mCarrierId); return apnValue; } @@ -1321,6 +1367,8 @@ public class ApnSetting implements Parcelable { dest.writeBoolean(mCarrierEnabled); dest.writeInt(mMvnoType); dest.writeInt(mNetworkTypeBitmask); + dest.writeInt(mApnSetId); + dest.writeInt(mCarrierId); } private static ApnSetting readFromParcel(Parcel in) { @@ -1330,7 +1378,7 @@ public class ApnSetting implements Parcelable { final String apnName = in.readString(); final String proxy = in.readString(); final int port = in.readInt(); - final Uri mmsc = (Uri)in.readValue(Uri.class.getClassLoader()); + final Uri mmsc = (Uri) in.readValue(Uri.class.getClassLoader()); final String mmsProxy = in.readString(); final int mmsPort = in.readInt(); final String user = in.readString(); @@ -1342,11 +1390,13 @@ public class ApnSetting implements Parcelable { final boolean carrierEnabled = in.readBoolean(); final int mvnoType = in.readInt(); final int networkTypeBitmask = in.readInt(); + final int apnSetId = in.readInt(); + final int carrierId = in.readInt(); return makeApnSetting(id, operatorNumeric, entryName, apnName, proxy, port, mmsc, mmsProxy, mmsPort, user, password, authType, apnTypesBitmask, protocol, roamingProtocol, carrierEnabled, networkTypeBitmask, 0, false, - 0, 0, 0, 0, mvnoType, null); + 0, 0, 0, 0, mvnoType, null, apnSetId, carrierId); } public static final Parcelable.Creator<ApnSetting> CREATOR = @@ -1422,6 +1472,7 @@ public class ApnSetting implements Parcelable { private int mMvnoType = UNSPECIFIED_INT; private String mMvnoMatchData; private int mApnSetId; + private int mCarrierId = TelephonyManager.UNKNOWN_CARRIER_ID; /** * Default constructor for Builder. @@ -1751,6 +1802,19 @@ public class ApnSetting implements Parcelable { } /** + * Sets the carrier id for this APN. + * + * See {@link TelephonyManager#getSimCarrierId()} which provides more background for what a + * carrier ID is. + * + * @param carrierId the carrier id to set for this APN + */ + public Builder setCarrierId(int carrierId) { + this.mCarrierId = carrierId; + return this; + } + + /** * Builds {@link ApnSetting} from this builder. * * @return {@code null} if {@link #setApnName(String)} or {@link #setEntryName(String)} diff --git a/telephony/java/android/telephony/emergency/EmergencyNumber.java b/telephony/java/android/telephony/emergency/EmergencyNumber.java index bdba8c860db0..2d46ec26a755 100644 --- a/telephony/java/android/telephony/emergency/EmergencyNumber.java +++ b/telephony/java/android/telephony/emergency/EmergencyNumber.java @@ -17,8 +17,8 @@ package android.telephony.emergency; import android.annotation.IntDef; -import android.hardware.radio.V1_3.EmergencyNumberSource; -import android.hardware.radio.V1_3.EmergencyServiceCategory; +import android.hardware.radio.V1_4.EmergencyNumberSource; +import android.hardware.radio.V1_4.EmergencyServiceCategory; import android.os.Parcel; import android.os.Parcelable; @@ -138,7 +138,7 @@ public final class EmergencyNumber implements Parcelable, Comparable<EmergencyNu } /** - * The source to tell where the corresponding @1.3::EmergencyNumber comes from. + * The source to tell where the corresponding @1.4::EmergencyNumber comes from. * * The emergency number has one or more defined emergency number sources. * diff --git a/telephony/java/android/telephony/mbms/GroupCall.java b/telephony/java/android/telephony/mbms/GroupCall.java index 9aca18e07812..25e274e4cb13 100644 --- a/telephony/java/android/telephony/mbms/GroupCall.java +++ b/telephony/java/android/telephony/mbms/GroupCall.java @@ -17,6 +17,7 @@ package android.telephony.mbms; import android.annotation.IntDef; +import android.annotation.NonNull; import android.os.RemoteException; import android.telephony.MbmsGroupCallSession; import android.telephony.mbms.vendor.IMbmsGroupCallService; @@ -24,6 +25,7 @@ import android.util.Log; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.List; /** * Class used to represent a single MBMS group call. After a call has been started with @@ -41,8 +43,26 @@ public class GroupCall implements AutoCloseable { @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = { "STATE_" }, value = {STATE_STOPPED, STATE_STARTED, STATE_STALLED}) public @interface GroupCallState {} + + /** + * Indicates that the group call is in a stopped state + * + * This can be reported after network action or after calling {@link #close}. + */ public static final int STATE_STOPPED = 1; + + /** + * Indicates that the group call is started. + * + * Data can be transmitted and received in this state. + */ public static final int STATE_STARTED = 2; + + /** + * Indicates that the group call is stalled. + * + * This may be due to a network issue or the device being temporarily out of range. + */ public static final int STATE_STALLED = 3; /** @@ -122,16 +142,17 @@ public class GroupCall implements AutoCloseable { * Send an update to the middleware when the SAI (Service Area Identifier) list and frequency * information of the group call has * changed. Callers must obtain this information from the * wireless carrier independently. - * @param saiArray New array of SAIs that the call is available on. - * @param frequencyArray New array of frequencies that the call is available on. + * @param saiList New list of SAIs that the call is available on. + * @param frequencyList New list of frequencies that the call is available on. */ - public void updateGroupCall(int[] saiArray, int[] frequencyArray) { + public void updateGroupCall(@NonNull List<Integer> saiList, + @NonNull List<Integer> frequencyList) { if (mService == null) { throw new IllegalStateException("No group call service attached"); } try { - mService.updateGroupCall(mSubscriptionId, mTmgi, saiArray, frequencyArray); + mService.updateGroupCall(mSubscriptionId, mTmgi, saiList, frequencyList); } catch (RemoteException e) { Log.w(LOG_TAG, "Remote process died"); mService = null; diff --git a/telephony/java/android/telephony/mbms/GroupCallCallback.java b/telephony/java/android/telephony/mbms/GroupCallCallback.java index 001bb02aad94..77e36bbcf2ae 100644 --- a/telephony/java/android/telephony/mbms/GroupCallCallback.java +++ b/telephony/java/android/telephony/mbms/GroupCallCallback.java @@ -17,6 +17,7 @@ package android.telephony.mbms; import android.annotation.IntDef; +import android.annotation.IntRange; import android.annotation.Nullable; import java.lang.annotation.Retention; @@ -26,7 +27,7 @@ import java.lang.annotation.RetentionPolicy; * A callback class for use when the application is in a group call. The middleware * will provide updates on the status of the call via this callback. */ -public class GroupCallCallback { +public interface GroupCallCallback { /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(value = { @@ -40,7 +41,7 @@ public class GroupCallCallback { MbmsErrors.GeneralErrors.ERROR_NOT_CONNECTED_TO_HOME_CARRIER_LTE, MbmsErrors.GeneralErrors.ERROR_UNABLE_TO_READ_SIM, MbmsErrors.GeneralErrors.ERROR_CARRIER_CHANGE_NOT_ALLOWED}, prefix = { "ERROR_" }) - private @interface GroupCallError{} + @interface GroupCallError{} /** * Indicates broadcast signal strength is not available for this call. @@ -48,7 +49,7 @@ public class GroupCallCallback { * This may be due to the call no longer being available due to geography * or timing (end of service) */ - public static final int SIGNAL_STRENGTH_UNAVAILABLE = -1; + int SIGNAL_STRENGTH_UNAVAILABLE = -1; /** * Called by the middleware when it has detected an error condition in this group call. The @@ -56,9 +57,7 @@ public class GroupCallCallback { * @param errorCode The error code. * @param message A human-readable message generated by the middleware for debugging purposes. */ - public void onError(@GroupCallError int errorCode, @Nullable String message) { - // default implementation empty - } + void onError(@GroupCallError int errorCode, @Nullable String message); /** * Called to indicate this call has changed state. @@ -66,10 +65,8 @@ public class GroupCallCallback { * See {@link GroupCall#STATE_STOPPED}, {@link GroupCall#STATE_STARTED} * and {@link GroupCall#STATE_STALLED}. */ - public void onGroupCallStateChanged(@GroupCall.GroupCallState int state, - @GroupCall.GroupCallStateChangeReason int reason) { - // default implementation empty - } + void onGroupCallStateChanged(@GroupCall.GroupCallState int state, + @GroupCall.GroupCallStateChangeReason int reason); /** * Broadcast Signal Strength updated. @@ -81,7 +78,5 @@ public class GroupCallCallback { * {@link #SIGNAL_STRENGTH_UNAVAILABLE} if broadcast is not available * for this call due to timing, geography or popularity. */ - public void onBroadcastSignalStrengthUpdated(int signalStrength) { - // default implementation empty - } + void onBroadcastSignalStrengthUpdated(@IntRange(from = -1, to = 4) int signalStrength); } diff --git a/telephony/java/android/telephony/mbms/MbmsErrors.java b/telephony/java/android/telephony/mbms/MbmsErrors.java index 7c4321ba75c3..52e4d333b29d 100644 --- a/telephony/java/android/telephony/mbms/MbmsErrors.java +++ b/telephony/java/android/telephony/mbms/MbmsErrors.java @@ -140,5 +140,21 @@ public class MbmsErrors { public static final int ERROR_UNKNOWN_FILE_INFO = 403; } + /** + * Indicates the errors that are applicable only to the group call use-case. + */ + public static class GroupCallErrors { + private GroupCallErrors() { } + /** Indicates that the middleware was unable to start the group call. */ + public static final int ERROR_UNABLE_TO_START_SERVICE = 501; + + /** + * Indicates that the app called + * {@link android.telephony.MbmsGroupCallSession#startGroupCall} more than once for the + * same {@code tmgi}. + */ + public static final int ERROR_DUPLICATE_START_GROUP_CALL = 502; + } + private MbmsErrors() {} } diff --git a/telephony/java/android/telephony/mbms/MbmsGroupCallSessionCallback.java b/telephony/java/android/telephony/mbms/MbmsGroupCallSessionCallback.java index 7da734ee5837..04e7ba1af372 100644 --- a/telephony/java/android/telephony/mbms/MbmsGroupCallSessionCallback.java +++ b/telephony/java/android/telephony/mbms/MbmsGroupCallSessionCallback.java @@ -17,6 +17,7 @@ package android.telephony.mbms; import android.annotation.IntDef; +import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.telephony.MbmsGroupCallSession; @@ -29,9 +30,9 @@ import java.util.concurrent.Executor; /** * A callback class that is used to receive information from the middleware on MBMS group-call * services. An instance of this object should be passed into - * {@link MbmsGroupCallSession#create(Context, Executor, int, MbmsGroupCallSessionCallback)}. + * {@link MbmsGroupCallSession#create(Context, int, Executor, MbmsGroupCallSessionCallback)}. */ -public class MbmsGroupCallSessionCallback { +public interface MbmsGroupCallSessionCallback { /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(value = { @@ -48,7 +49,7 @@ public class MbmsGroupCallSessionCallback { MbmsErrors.GeneralErrors.ERROR_NOT_CONNECTED_TO_HOME_CARRIER_LTE, MbmsErrors.GeneralErrors.ERROR_UNABLE_TO_READ_SIM, MbmsErrors.GeneralErrors.ERROR_CARRIER_CHANGE_NOT_ALLOWED}, prefix = { "ERROR_" }) - private @interface GroupCallError{} + @interface GroupCallError{} /** * Called by the middleware when it has detected an error condition. The possible error codes @@ -56,8 +57,7 @@ public class MbmsGroupCallSessionCallback { * @param errorCode The error code. * @param message A human-readable message generated by the middleware for debugging purposes. */ - public void onError(@GroupCallError int errorCode, @Nullable String message) { - } + void onError(@GroupCallError int errorCode, @Nullable String message); /** * Indicates that the list of currently available SAIs has been updated. The app may use this @@ -70,21 +70,22 @@ public class MbmsGroupCallSessionCallback { * @param availableSais A list of lists of available SAIS in neighboring cells, where each list * contains the available SAIs in an individual cell. */ - public void onAvailableSaisUpdated(List<Integer> currentSais, - List<List<Integer>> availableSais) { - } + void onAvailableSaisUpdated(@NonNull List<Integer> currentSais, + @NonNull List<List<Integer>> availableSais); /** * Called soon after the app calls {@link MbmsGroupCallSession#create}. The information supplied - * via this callback may be used to establish a data-link interface with the modem before the - * middleware is ready. - * Note that this method may be called before {@link #onMiddlewareReady()}. + * via this callback may be used to establish a data-link interface with the modem. + * + * In order to establish the data-link interface, the multicast IP and port must be obtained + * out-of-band from the carrier. A {@link java.net.MulticastSocket} may then be constructed + * using a {@link java.net.NetworkInterface} with the name and interface supplied by this + * callback. * * @param interfaceName The interface name for the data link. * @param index The index for the data link. */ - public void onServiceInterfaceAvailable(String interfaceName, int index) { - } + void onServiceInterfaceAvailable(@NonNull String interfaceName, int index); /** * Called to indicate that the middleware has been initialized and is ready. @@ -94,6 +95,5 @@ public class MbmsGroupCallSessionCallback { * delivered via {@link #onError(int, String)} with error code * {@link MbmsErrors.GeneralErrors#ERROR_MIDDLEWARE_NOT_YET_READY}. */ - public void onMiddlewareReady() { - } + void onMiddlewareReady(); } diff --git a/telephony/java/android/telephony/mbms/vendor/IMbmsGroupCallService.aidl b/telephony/java/android/telephony/mbms/vendor/IMbmsGroupCallService.aidl index 721256a95396..44cc24a839f2 100755 --- a/telephony/java/android/telephony/mbms/vendor/IMbmsGroupCallService.aidl +++ b/telephony/java/android/telephony/mbms/vendor/IMbmsGroupCallService.aidl @@ -29,11 +29,11 @@ interface IMbmsGroupCallService void stopGroupCall(int subId, long tmgi); - void updateGroupCall(int subscriptionId, long tmgi, in int[] saiArray, - in int[] frequencyArray); + void updateGroupCall(int subscriptionId, long tmgi, in List saiList, + in List frequencyList); - int startGroupCall(int subscriptionId, long tmgi, in int[] saiArray, - in int[] frequencyArray, IGroupCallCallback callback); + int startGroupCall(int subscriptionId, long tmgi, in List saiList, + in List frequencyList, IGroupCallCallback callback); void dispose(int subId); } diff --git a/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java b/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java index 3734ca7d6fc9..e86a47d5bfa1 100644 --- a/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java +++ b/telephony/java/android/telephony/mbms/vendor/MbmsGroupCallServiceBase.java @@ -115,15 +115,16 @@ public class MbmsGroupCallServiceBase extends Service { } @Override - public void updateGroupCall(int subscriptionId, long tmgi, int[] saiArray, - int[] frequencyArray) { + public void updateGroupCall(int subscriptionId, long tmgi, List saiList, + List frequencyList) { MbmsGroupCallServiceBase.this.updateGroupCall( - subscriptionId, tmgi, saiArray, frequencyArray); + subscriptionId, tmgi, saiList, frequencyList); } @Override - public int startGroupCall(final int subscriptionId, final long tmgi, final int[] saiArray, - final int[] frequencyArray, final IGroupCallCallback callback) + public int startGroupCall(final int subscriptionId, final long tmgi, + final List saiList, + final List frequencyList, final IGroupCallCallback callback) throws RemoteException { if (callback == null) { throw new NullPointerException("Callback must not be null"); @@ -132,7 +133,7 @@ public class MbmsGroupCallServiceBase extends Service { final int uid = Binder.getCallingUid(); int result = MbmsGroupCallServiceBase.this.startGroupCall( - subscriptionId, tmgi, saiArray, frequencyArray, new GroupCallCallback() { + subscriptionId, tmgi, saiList, frequencyList, new GroupCallCallback() { @Override public void onError(final int errorCode, final String message) { try { @@ -209,13 +210,13 @@ public class MbmsGroupCallServiceBase extends Service { * * @param subscriptionId The subscription id to use. * @param tmgi The TMGI, an identifier for the group call. - * @param saiArray An array of SAIs for the group call. - * @param frequencyArray An array of frequencies for the group call. + * @param saiList A list of SAIs for the group call. + * @param frequencyList A list of frequencies for the group call. * @param callback The callback object on which the app wishes to receive updates. * @return Any error in {@link MbmsErrors.GeneralErrors} */ - public int startGroupCall(int subscriptionId, long tmgi, int[] saiArray, int[] frequencyArray, - GroupCallCallback callback) { + public int startGroupCall(int subscriptionId, long tmgi, List<Integer> saiList, + List<Integer> frequencyList, GroupCallCallback callback) { throw new UnsupportedOperationException("Not implemented"); } @@ -237,11 +238,11 @@ public class MbmsGroupCallServiceBase extends Service { /** * Called when the app receives new SAI and frequency information for the group call identified * by {@code tmgi}. - * @param saiArray New array of SAIs that the call is available on. - * @param frequencyArray New array of frequencies that the call is available on. + * @param saiList New list of SAIs that the call is available on. + * @param frequencyList New list of frequencies that the call is available on. */ - public void updateGroupCall(int subscriptionId, long tmgi, int[] saiArray, - int[] frequencyArray) { + public void updateGroupCall(int subscriptionId, long tmgi, List<Integer> saiList, + List<Integer> frequencyList) { throw new UnsupportedOperationException("Not implemented"); } diff --git a/telephony/java/com/android/internal/telephony/IApnSourceService.aidl b/telephony/java/com/android/internal/telephony/IApnSourceService.aidl index 07bb18b6cd1b..34c9067c3f2f 100644 --- a/telephony/java/com/android/internal/telephony/IApnSourceService.aidl +++ b/telephony/java/com/android/internal/telephony/IApnSourceService.aidl @@ -20,5 +20,5 @@ import android.content.ContentValues; interface IApnSourceService { /** Retreive APNs. */ - ContentValues[] getApns(); + ContentValues[] getApns(int subId); } diff --git a/telephony/java/com/android/internal/telephony/ISub.aidl b/telephony/java/com/android/internal/telephony/ISub.aidl index 85b4941cf971..bc4451977d92 100755 --- a/telephony/java/com/android/internal/telephony/ISub.aidl +++ b/telephony/java/com/android/internal/telephony/ISub.aidl @@ -165,13 +165,23 @@ interface ISub { int setOpportunistic(boolean opportunistic, int subId); /** - * Set parent subId by simInfo index + * Inform SubscriptionManager that subscriptions in the list are bundled + * as a group. Typically it's a primary subscription and an opportunistic + * subscription. It should only affect multi-SIM scenarios where primary + * and opportunistic subscriptions can be activated together. + * Being in the same group means they might be activated or deactivated + * together, some of them may be invisible to the users, etc. + * + * Caller will either have {@link android.Manifest.permission.MODIFY_PHONE_STATE} + * permission or can manage all subscriptions in the list, according to their + * acess rules. + * + * @param subIdList list of subId that will be in the same group + * @return groupUUID a UUID assigned to the subscription group. It returns + * null if fails. * - * @param parentSubId: subId of its parent subscription. - * @param subId the unique SubscriptionInfo index in database - * @return the number of records updated */ - int setParentSubId(int parentSubId, int subId); + String setSubscriptionGroup(in int[] subIdList, String callingPackage); /** * Set which subscription is preferred for cellular data. It's @@ -186,10 +196,10 @@ interface ISub { /** * Get User downloaded Profiles. * - * Provide all available user downloaded profile on the phone. - * @param slotId on which phone the switch will operate on + * Return opportunistic subscriptions that can be visible to the caller. + * @return the list of opportunistic subscription info. If none exists, an empty list. */ - List<SubscriptionInfo> getOpportunisticSubscriptions(int slotId, String callingPackage); + List<SubscriptionInfo> getOpportunisticSubscriptions(String callingPackage); int getSlotIndex(int subId); diff --git a/tests/TouchLatency/.gitignore b/tests/TouchLatency/.gitignore index bd79078a904e..7f4121a9623a 100644 --- a/tests/TouchLatency/.gitignore +++ b/tests/TouchLatency/.gitignore @@ -3,4 +3,5 @@ /.idea .DS_Store /build +/gen .iml diff --git a/tests/TouchLatency/app/build.gradle b/tests/TouchLatency/app/build.gradle index 233711055eb8..2594322e3727 100644 --- a/tests/TouchLatency/app/build.gradle +++ b/tests/TouchLatency/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.prefabulated.touchlatency" minSdkVersion 21 - targetSdkVersion 21 + targetSdkVersion 28 versionCode 1 versionName "1.0" } diff --git a/tests/TouchLatency/app/src/main/java/com/prefabulated/touchlatency/TouchLatencyActivity.java b/tests/TouchLatency/app/src/main/java/com/prefabulated/touchlatency/TouchLatencyActivity.java index b4b5ca7161fc..360c22f832b3 100644 --- a/tests/TouchLatency/app/src/main/java/com/prefabulated/touchlatency/TouchLatencyActivity.java +++ b/tests/TouchLatency/app/src/main/java/com/prefabulated/touchlatency/TouchLatencyActivity.java @@ -19,11 +19,9 @@ package com.prefabulated.touchlatency; import android.app.Activity; import android.content.Context; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; -import android.os.CountDownTimer; +import android.graphics.Paint.Align; import android.os.Bundle; -import android.text.method.Touch; import android.util.AttributeSet; import android.util.Log; import android.view.Menu; @@ -31,15 +29,17 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.os.Trace; - -import java.util.ArrayList; -import java.util.Collections; +import java.math.RoundingMode; +import java.text.DecimalFormat; class TouchLatencyView extends View implements View.OnTouchListener { private static final String LOG_TAG = "TouchLatency"; private static final int BACKGROUND_COLOR = 0xFF400080; private static final int INNER_RADIUS = 70; - private static final int BALL_RADIUS = 100; + private static final int BALL_DIAMETER = 200; + private static final int SEC_TO_NANOS = 1000000000; + private static final float FPS_UPDATE_THRESHOLD = 20; + private static final long BALL_VELOCITY = 420; public TouchLatencyView(Context context, AttributeSet attrs) { super(context, attrs); @@ -58,13 +58,17 @@ class TouchLatencyView extends View implements View.OnTouchListener { mRedPaint = new Paint(Paint.ANTI_ALIAS_FLAG); mRedPaint.setColor(0xFFFF0000); mRedPaint.setStyle(Paint.Style.FILL); + mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + mTextPaint.setColor(0xFFFFFFFF); + mTextPaint.setTextSize(100); + mTextPaint.setTextAlign(Align.RIGHT); mTouching = false; - mBallX = 100.0f; - mBallY = 100.0f; - mVelocityX = 7.0f; - mVelocityY = 7.0f; + mLastDrawNano = 0; + mFps = 0; + mLastFpsUpdate = 0; + mFrameCount = 0; Trace.endSection(); } @@ -113,43 +117,70 @@ class TouchLatencyView extends View implements View.OnTouchListener { } } + private Paint getBallColor() { + if (mFps > 75) + return mGreenPaint; + else if (mFps > 45) + return mYellowPaint; + else + return mRedPaint; + } + private void drawBall(Canvas canvas) { Trace.beginSection("TouchLatencyView drawBall"); int width = canvas.getWidth(); int height = canvas.getHeight(); + float fps = 0f; - // Update position - mBallX += mVelocityX; - mBallY += mVelocityY; + long t = System.nanoTime(); + long tDiff = t - mLastDrawNano; + mLastDrawNano = t; + mFrameCount++; - // Clamp and change velocity if necessary - float left = mBallX - BALL_RADIUS; - if (left < 0) { - left = 0; - mVelocityX *= -1; + if (tDiff < SEC_TO_NANOS) { + fps = 1f * SEC_TO_NANOS / tDiff; } - float top = mBallY - BALL_RADIUS; - if (top < 0) { - top = 0; - mVelocityY *= -1; + long fDiff = t - mLastFpsUpdate; + if (Math.abs(mFps - fps) > FPS_UPDATE_THRESHOLD) { + mFps = fps; + mLastFpsUpdate = t; + mFrameCount = 0; + } else if (fDiff > SEC_TO_NANOS) { + mFps = 1f * mFrameCount * SEC_TO_NANOS / fDiff; + mLastFpsUpdate = t; + mFrameCount = 0; } - float right = mBallX + BALL_RADIUS; - if (right > width) { - right = width; - mVelocityX *= -1; + final long pos = t * BALL_VELOCITY / SEC_TO_NANOS; + final long xMax = width - BALL_DIAMETER; + final long yMax = height - BALL_DIAMETER; + long xOffset = pos % xMax; + long yOffset = pos % yMax; + + float left, right, top, bottom; + + if (((pos / xMax) & 1) == 0) { + left = xMax - xOffset; + } else { + left = xOffset; } + right = left + BALL_DIAMETER; - float bottom = mBallY + BALL_RADIUS; - if (bottom > height) { - bottom = height; - mVelocityY *= -1; + if (((pos / yMax) & 1) == 0) { + top = yMax - yOffset; + } else { + top = yOffset; } + bottom = top + BALL_DIAMETER; // Draw the ball canvas.drawColor(BACKGROUND_COLOR); - canvas.drawOval(left, top, right, bottom, mYellowPaint); + canvas.drawOval(left, top, right, bottom, getBallColor()); + DecimalFormat df = new DecimalFormat("fps: #.##"); + df.setRoundingMode(RoundingMode.HALF_UP); + canvas.drawText(df.format(mFps), width, 100, mTextPaint); + invalidate(); Trace.endSection(); } @@ -176,15 +207,15 @@ class TouchLatencyView extends View implements View.OnTouchListener { Trace.endSection(); } - private Paint mBluePaint, mGreenPaint, mYellowPaint, mRedPaint; + private final Paint mBluePaint, mGreenPaint, mYellowPaint, mRedPaint, mTextPaint; private int mMode; private boolean mTouching; private float mTouchX, mTouchY; private float mLastDrawnX, mLastDrawnY; - private float mBallX, mBallY; - private float mVelocityX, mVelocityY; + private long mLastDrawNano, mLastFpsUpdate, mFrameCount; + private float mFps; } public class TouchLatencyActivity extends Activity { diff --git a/tests/TouchLatency/build.gradle b/tests/TouchLatency/build.gradle index d3ff69d6e7f9..03abe82a4359 100644 --- a/tests/TouchLatency/build.gradle +++ b/tests/TouchLatency/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,5 +16,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/tests/TouchLatency/gradle/wrapper/gradle-wrapper.properties b/tests/TouchLatency/gradle/wrapper/gradle-wrapper.properties index 0c71e760dc93..111992a460fa 100644 --- a/tests/TouchLatency/gradle/wrapper/gradle-wrapper.properties +++ b/tests/TouchLatency/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Tue Nov 27 13:37:59 PST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java b/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java index b399b0d51577..6e07b26e883a 100644 --- a/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/NetworkMonitorTest.java @@ -40,6 +40,7 @@ import android.net.captiveportal.CaptivePortalProbeResult; import android.net.metrics.IpConnectivityLog; import android.net.wifi.WifiManager; import android.os.Handler; +import android.os.SystemClock; import android.provider.Settings; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -70,6 +71,7 @@ public class NetworkMonitorTest { private @Mock Handler mHandler; private @Mock IpConnectivityLog mLogger; private @Mock NetworkAgentInfo mAgent; + private @Mock NetworkAgentInfo mNotMeteredAgent; private @Mock NetworkInfo mNetworkInfo; private @Mock NetworkRequest mRequest; private @Mock TelephonyManager mTelephony; @@ -87,6 +89,10 @@ public class NetworkMonitorTest { private static final String TEST_FALLBACK_URL = "http://fallback.google.com/gen_204"; private static final String TEST_OTHER_FALLBACK_URL = "http://otherfallback.google.com/gen_204"; + private static final int DATA_STALL_EVALUATION_TYPE_DNS = 1; + private static final int RETURN_CODE_DNS_SUCCESS = 0; + private static final int RETURN_CODE_DNS_TIMEOUT = 255; + @Before public void setUp() throws IOException { MockitoAnnotations.initMocks(this); @@ -95,6 +101,12 @@ public class NetworkMonitorTest { .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); mAgent.networkInfo = mNetworkInfo; + mNotMeteredAgent.linkProperties = new LinkProperties(); + mNotMeteredAgent.networkCapabilities = new NetworkCapabilities() + .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); + mNotMeteredAgent.networkInfo = mNetworkInfo; + when(mAgent.network()).thenReturn(mNetwork); when(mDependencies.getNetwork(any())).thenReturn(mNetwork); when(mDependencies.getRandom()).thenReturn(mRandom); @@ -138,6 +150,40 @@ public class NetworkMonitorTest { when(mNetwork.getAllByName(any())).thenReturn(new InetAddress[] { InetAddress.parseNumericAddress("192.168.0.0") }); + + setMinDataStallEvaluateInterval(500); + setDataStallEvaluationType(1 << DATA_STALL_EVALUATION_TYPE_DNS); + setValidDataStallDnsTimeThreshold(500); + setConsecutiveDnsTimeoutThreshold(5); + } + + private class WrappedNetworkMonitor extends NetworkMonitor { + private long mProbeTime = 0; + + WrappedNetworkMonitor(Context context, Handler handler, + NetworkAgentInfo networkAgentInfo, NetworkRequest defaultRequest, + IpConnectivityLog logger, Dependencies deps) { + super(context, handler, networkAgentInfo, defaultRequest, logger, deps); + } + + @Override + protected long getLastProbeTime() { + return mProbeTime; + } + + protected void setLastProbeTime(long time) { + mProbeTime = time; + } + } + + WrappedNetworkMonitor makeMeteredWrappedNetworkMonitor() { + return new WrappedNetworkMonitor( + mContext, mHandler, mAgent, mRequest, mLogger, mDependencies); + } + + WrappedNetworkMonitor makeNotMeteredWrappedNetworkMonitor() { + return new WrappedNetworkMonitor( + mContext, mHandler, mNotMeteredAgent, mRequest, mLogger, mDependencies); } NetworkMonitor makeMonitor() { @@ -272,6 +318,113 @@ public class NetworkMonitorTest { assertPortal(makeMonitor().isCaptivePortal()); } + @Test + public void testIsDataStall_EvaluationDisabled() { + setDataStallEvaluationType(0); + WrappedNetworkMonitor wrappedMonitor = makeMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100); + assertFalse(wrappedMonitor.isDataStall()); + } + + @Test + public void testIsDataStall_EvaluationDnsOnNotMeteredNetwork() { + WrappedNetworkMonitor wrappedMonitor = makeNotMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100); + makeDnsTimeoutEvent(wrappedMonitor, 5); + assertTrue(wrappedMonitor.isDataStall()); + } + + @Test + public void testIsDataStall_EvaluationDnsOnMeteredNetwork() { + WrappedNetworkMonitor wrappedMonitor = makeMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100); + assertFalse(wrappedMonitor.isDataStall()); + + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000); + makeDnsTimeoutEvent(wrappedMonitor, 5); + assertTrue(wrappedMonitor.isDataStall()); + } + + @Test + public void testIsDataStall_EvaluationDnsWithDnsTimeoutCount() { + WrappedNetworkMonitor wrappedMonitor = makeMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000); + makeDnsTimeoutEvent(wrappedMonitor, 3); + assertFalse(wrappedMonitor.isDataStall()); + // Reset consecutive timeout counts. + makeDnsSuccessEvent(wrappedMonitor, 1); + makeDnsTimeoutEvent(wrappedMonitor, 2); + assertFalse(wrappedMonitor.isDataStall()); + + makeDnsTimeoutEvent(wrappedMonitor, 3); + assertTrue(wrappedMonitor.isDataStall()); + + // Set the value to larger than the default dns log size. + setConsecutiveDnsTimeoutThreshold(51); + wrappedMonitor = makeMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000); + makeDnsTimeoutEvent(wrappedMonitor, 50); + assertFalse(wrappedMonitor.isDataStall()); + + makeDnsTimeoutEvent(wrappedMonitor, 1); + assertTrue(wrappedMonitor.isDataStall()); + } + + @Test + public void testIsDataStall_EvaluationDnsWithDnsTimeThreshold() { + // Test dns events happened in valid dns time threshold. + WrappedNetworkMonitor wrappedMonitor = makeMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100); + makeDnsTimeoutEvent(wrappedMonitor, 5); + assertFalse(wrappedMonitor.isDataStall()); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000); + assertTrue(wrappedMonitor.isDataStall()); + + // Test dns events happened before valid dns time threshold. + setValidDataStallDnsTimeThreshold(0); + wrappedMonitor = makeMeteredWrappedNetworkMonitor(); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100); + makeDnsTimeoutEvent(wrappedMonitor, 5); + assertFalse(wrappedMonitor.isDataStall()); + wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000); + assertFalse(wrappedMonitor.isDataStall()); + } + + private void makeDnsTimeoutEvent(WrappedNetworkMonitor wrappedMonitor, int count) { + for (int i = 0; i < count; i++) { + wrappedMonitor.getDnsStallDetector().accumulateConsecutiveDnsTimeoutCount( + RETURN_CODE_DNS_TIMEOUT); + } + } + + private void makeDnsSuccessEvent(WrappedNetworkMonitor wrappedMonitor, int count) { + for (int i = 0; i < count; i++) { + wrappedMonitor.getDnsStallDetector().accumulateConsecutiveDnsTimeoutCount( + RETURN_CODE_DNS_SUCCESS); + } + } + + private void setDataStallEvaluationType(int type) { + when(mDependencies.getSetting(any(), + eq(Settings.Global.DATA_STALL_EVALUATION_TYPE), anyInt())).thenReturn(type); + } + + private void setMinDataStallEvaluateInterval(int time) { + when(mDependencies.getSetting(any(), + eq(Settings.Global.DATA_STALL_MIN_EVALUATE_INTERVAL), anyInt())).thenReturn(time); + } + + private void setValidDataStallDnsTimeThreshold(int time) { + when(mDependencies.getSetting(any(), + eq(Settings.Global.DATA_STALL_VALID_DNS_TIME_THRESHOLD), anyInt())).thenReturn(time); + } + + private void setConsecutiveDnsTimeoutThreshold(int num) { + when(mDependencies.getSetting(any(), + eq(Settings.Global.DATA_STALL_CONSECUTIVE_DNS_TIMEOUT_THRESHOLD), anyInt())) + .thenReturn(num); + } + private void setFallbackUrl(String url) { when(mDependencies.getSetting(any(), eq(Settings.Global.CAPTIVE_PORTAL_FALLBACK_URL), any())).thenReturn(url); diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java index af7123b84842..f2bd770d085a 100644 --- a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -27,9 +27,17 @@ import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_VENDOR; import static android.content.pm.PackageManager.GET_PERMISSIONS; import static android.os.Process.SYSTEM_UID; +import static com.android.server.connectivity.PermissionMonitor.NETWORK; +import static com.android.server.connectivity.PermissionMonitor.SYSTEM; + +import static junit.framework.Assert.fail; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.spy; @@ -40,6 +48,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; +import android.os.INetworkManagementService; +import android.os.UserHandle; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; @@ -48,12 +58,19 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; + +import java.util.HashMap; @RunWith(AndroidJUnit4.class) @SmallTest 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 int MOCK_USER1 = 0; + private static final int MOCK_USER2 = 1; + private static final int MOCK_UID1 = 10001; + private static final String MOCK_PACKAGE1 = "appName1"; + private static final String SYSTEM_PACKAGE1 = "sysName1"; + private static final String SYSTEM_PACKAGE2 = "sysName2"; private static final String PARTITION_SYSTEM = "system"; private static final String PARTITION_OEM = "oem"; private static final String PARTITION_PRODUCT = "product"; @@ -63,6 +80,7 @@ public class PermissionMonitorTest { @Mock private Context mContext; @Mock private PackageManager mPackageManager; + @Mock private INetworkManagementService mNMS; private PermissionMonitor mPermissionMonitor; @@ -70,8 +88,7 @@ public class PermissionMonitorTest { public void setUp() throws Exception { MockitoAnnotations.initMocks(this); when(mContext.getPackageManager()).thenReturn(mPackageManager); - when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(MOCK_PACKAGE_NAMES); - mPermissionMonitor = spy(new PermissionMonitor(mContext, null)); + mPermissionMonitor = spy(new PermissionMonitor(mContext, mNMS)); } private boolean hasBgPermission(String partition, int targetSdkVersion, int uid, @@ -80,7 +97,8 @@ public class PermissionMonitorTest { packageInfo.applicationInfo.targetSdkVersion = targetSdkVersion; packageInfo.applicationInfo.uid = uid; when(mPackageManager.getPackageInfoAsUser( - eq(MOCK_PACKAGE_NAMES[0]), eq(GET_PERMISSIONS), anyInt())).thenReturn(packageInfo); + eq(MOCK_PACKAGE1), eq(GET_PERMISSIONS), anyInt())).thenReturn(packageInfo); + when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(new String[] {MOCK_PACKAGE1}); return mPermissionMonitor.hasUseBackgroundNetworksPermission(uid); } @@ -143,16 +161,16 @@ public class PermissionMonitorTest { @Test public void testHasUseBackgroundNetworksPermission() throws Exception { - assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID)); - assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID, CHANGE_NETWORK_STATE)); - assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID, NETWORK_STACK)); - assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID, CONNECTIVITY_INTERNAL)); - assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID, + assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID1)); + assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID1, CHANGE_NETWORK_STATE)); + assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID1, NETWORK_STACK)); + assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID1, CONNECTIVITY_INTERNAL)); + assertTrue(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID1, CONNECTIVITY_USE_RESTRICTED_NETWORKS)); - assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID, CHANGE_WIFI_STATE)); + assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_P, MOCK_UID1, CHANGE_WIFI_STATE)); - assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_Q, MOCK_UID)); - assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_Q, MOCK_UID, CHANGE_WIFI_STATE)); + assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_Q, MOCK_UID1)); + assertFalse(hasBgPermission(PARTITION_SYSTEM, VERSION_Q, MOCK_UID1, CHANGE_WIFI_STATE)); } @Test @@ -172,15 +190,150 @@ public class PermissionMonitorTest { @Test public void testHasUseBackgroundNetworksPermissionVendorApp() throws Exception { - assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID)); - assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID, CHANGE_NETWORK_STATE)); - assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID, NETWORK_STACK)); - assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID, CONNECTIVITY_INTERNAL)); - assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID, + assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID1)); + assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID1, CHANGE_NETWORK_STATE)); + assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID1, NETWORK_STACK)); + assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID1, CONNECTIVITY_INTERNAL)); + assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID1, CONNECTIVITY_USE_RESTRICTED_NETWORKS)); - assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID, CHANGE_WIFI_STATE)); + assertTrue(hasBgPermission(PARTITION_VENDOR, VERSION_P, MOCK_UID1, CHANGE_WIFI_STATE)); + + assertFalse(hasBgPermission(PARTITION_VENDOR, VERSION_Q, MOCK_UID1)); + assertFalse(hasBgPermission(PARTITION_VENDOR, VERSION_Q, MOCK_UID1, CHANGE_WIFI_STATE)); + } + + private class NMSMonitor { + private final HashMap<Integer, Boolean> mApps = new HashMap<>(); + + NMSMonitor(INetworkManagementService mockNMS) throws Exception { + // Add hook to verify and track result of setPermission. + doAnswer((InvocationOnMock invocation) -> { + final Object[] args = invocation.getArguments(); + final Boolean isSystem = args[0].equals("SYSTEM"); + for (final int uid : (int[]) args[1]) { + // TODO: Currently, permission monitor will send duplicate commands for each uid + // corresponding to each user. Need to fix that and uncomment below test. + // if (mApps.containsKey(uid) && mApps.get(uid) == isSystem) { + // fail("uid " + uid + " is already set to " + isSystem); + // } + mApps.put(uid, isSystem); + } + return null; + }).when(mockNMS).setPermission(anyString(), any(int[].class)); + + // Add hook to verify and track result of clearPermission. + doAnswer((InvocationOnMock invocation) -> { + final Object[] args = invocation.getArguments(); + for (final int uid : (int[]) args[0]) { + // TODO: Currently, permission monitor will send duplicate commands for each uid + // corresponding to each user. Need to fix that and uncomment below test. + // if (!mApps.containsKey(uid)) { + // fail("uid " + uid + " does not exist."); + // } + mApps.remove(uid); + } + return null; + }).when(mockNMS).clearPermission(any(int[].class)); + } + + public void expectPermission(Boolean permission, int[] users, int[] apps) { + for (final int user : users) { + for (final int app : apps) { + final int uid = UserHandle.getUid(user, app); + if (!mApps.containsKey(uid)) { + fail("uid " + uid + " does not exist."); + } + if (mApps.get(uid) != permission) { + fail("uid " + uid + " has wrong permission: " + permission); + } + } + } + } + + public void expectNoPermission(int[] users, int[] apps) { + for (final int user : users) { + for (final int app : apps) { + final int uid = UserHandle.getUid(user, app); + if (mApps.containsKey(uid)) { + fail("uid " + uid + " has listed permissions, expected none."); + } + } + } + } + } + + @Test + public void testUserAndPackageAddRemove() throws Exception { + final NMSMonitor mNMSMonitor = new NMSMonitor(mNMS); - assertFalse(hasBgPermission(PARTITION_VENDOR, VERSION_Q, MOCK_UID)); - assertFalse(hasBgPermission(PARTITION_VENDOR, VERSION_Q, MOCK_UID, CHANGE_WIFI_STATE)); + // MOCK_UID1: MOCK_PACKAGE1 only has network permission. + // SYSTEM_UID: SYSTEM_PACKAGE1 has system permission. + // SYSTEM_UID: SYSTEM_PACKAGE2 only has network permission. + doReturn(SYSTEM).when(mPermissionMonitor).highestPermissionForUid(eq(SYSTEM), anyString()); + doReturn(SYSTEM).when(mPermissionMonitor).highestPermissionForUid(any(), + eq(SYSTEM_PACKAGE1)); + doReturn(NETWORK).when(mPermissionMonitor).highestPermissionForUid(any(), + eq(SYSTEM_PACKAGE2)); + doReturn(NETWORK).when(mPermissionMonitor).highestPermissionForUid(any(), + eq(MOCK_PACKAGE1)); + + // Add SYSTEM_PACKAGE2, expect only have network permission. + mPermissionMonitor.onUserAdded(MOCK_USER1); + addPackageForUsers(new int[]{MOCK_USER1}, SYSTEM_PACKAGE2, SYSTEM_UID); + mNMSMonitor.expectPermission(NETWORK, new int[]{MOCK_USER1}, new int[]{SYSTEM_UID}); + + // Add SYSTEM_PACKAGE1, expect permission escalate. + addPackageForUsers(new int[]{MOCK_USER1}, SYSTEM_PACKAGE1, SYSTEM_UID); + mNMSMonitor.expectPermission(SYSTEM, new int[]{MOCK_USER1}, new int[]{SYSTEM_UID}); + + mPermissionMonitor.onUserAdded(MOCK_USER2); + mNMSMonitor.expectPermission(SYSTEM, new int[]{MOCK_USER1, MOCK_USER2}, + new int[]{SYSTEM_UID}); + + addPackageForUsers(new int[]{MOCK_USER1, MOCK_USER2}, MOCK_PACKAGE1, MOCK_UID1); + mNMSMonitor.expectPermission(SYSTEM, new int[]{MOCK_USER1, MOCK_USER2}, + new int[]{SYSTEM_UID}); + mNMSMonitor.expectPermission(NETWORK, new int[]{MOCK_USER1, MOCK_USER2}, + new int[]{MOCK_UID1}); + + // Remove MOCK_UID1, expect no permission left for all user. + mPermissionMonitor.onPackageRemoved(MOCK_UID1); + removePackageForUsers(new int[]{MOCK_USER1, MOCK_USER2}, MOCK_UID1); + mNMSMonitor.expectNoPermission(new int[]{MOCK_USER1, MOCK_USER2}, new int[]{MOCK_UID1}); + + // Remove SYSTEM_PACKAGE1, expect permission downgrade. + when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(new String[]{SYSTEM_PACKAGE2}); + removePackageForUsers(new int[]{MOCK_USER1, MOCK_USER2}, SYSTEM_UID); + mNMSMonitor.expectPermission(NETWORK, new int[]{MOCK_USER1, MOCK_USER2}, + new int[]{SYSTEM_UID}); + + mPermissionMonitor.onUserRemoved(MOCK_USER1); + mNMSMonitor.expectPermission(NETWORK, new int[]{MOCK_USER2}, new int[]{SYSTEM_UID}); + + // Remove all packages, expect no permission left. + when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(new String[]{}); + removePackageForUsers(new int[]{MOCK_USER2}, SYSTEM_UID); + mNMSMonitor.expectNoPermission(new int[]{MOCK_USER1, MOCK_USER2}, + new int[]{SYSTEM_UID, MOCK_UID1}); + + // Remove last user, expect no redundant clearPermission is invoked. + mPermissionMonitor.onUserRemoved(MOCK_USER2); + mNMSMonitor.expectNoPermission(new int[]{MOCK_USER1, MOCK_USER2}, + new int[]{SYSTEM_UID, MOCK_UID1}); + } + + // Normal package add/remove operations will trigger multiple intent for uids corresponding to + // each user. To simulate generic package operations, the onPackageAdded/Removed will need to be + // called multiple times with the uid corresponding to each user. + private void addPackageForUsers(int[] users, String packageName, int uid) { + for (final int user : users) { + mPermissionMonitor.onPackageAdded(packageName, UserHandle.getUid(user, uid)); + } + } + + private void removePackageForUsers(int[] users, int uid) { + for (final int user : users) { + mPermissionMonitor.onPackageRemoved(UserHandle.getUid(user, uid)); + } } } diff --git a/tools/hiddenapi/exclude.sh b/tools/hiddenapi/exclude.sh new file mode 100755 index 000000000000..2291e5a92730 --- /dev/null +++ b/tools/hiddenapi/exclude.sh @@ -0,0 +1,57 @@ +#!/bin/bash +set -e +# Make sure that entries are not added for packages that are already fully handled using +# annotations. +LOCAL_DIR="$( dirname ${BASH_SOURCE} )" +# Each team should add a <team>_PACKAGES and <team>_EMAIL with the list of packages and +# the team email to use in the event of this detecting an entry in a <team> package. Also +# add <team> to the TEAMS list. +LIBCORE_PACKAGES="\ + android.icu \ + android.system \ + com.android.bouncycastle \ + com.android.conscrypt \ + com.android.okhttp \ + com.sun \ + dalvik \ + java \ + javax \ + libcore \ + org.apache.harmony \ + org.json \ + org.w3c.dom \ + org.xml.sax \ + sun \ + " +LIBCORE_EMAIL=libcore-team@android.com + +# List of teams. +TEAMS=LIBCORE + +# Generate the list of packages and convert to a regular expression. +PACKAGES=$(for t in $TEAMS; do echo $(eval echo \${${t}_PACKAGES}); done) +RE=$(echo ${PACKAGES} | sed "s/ /|/g") +git show --name-only --pretty=format: $1 | grep "config/hiddenapi-.*txt" | while read file; do + ENTRIES=$(grep -E "^L(${RE})/" <(git show $1:$file)) + if [[ -n "${ENTRIES}" ]]; then + echo -e "\e[1m\e[31m$file $1 contains the following entries\e[0m" + echo -e "\e[1m\e[31mfor packages that are handled using UnsupportedAppUsage. Please remove\e[0m" + echo -e "\e[1m\e[31mthese entries and add annotations instead.\e[0m" + # Partition the entries by team and provide contact details to aid in fixing the issue. + for t in ${TEAMS} + do + PACKAGES=$(eval echo \${${t}_PACKAGES}) + RE=$(echo ${PACKAGES} | sed "s/ /|/g") + TEAM_ENTRIES=$(grep -E "^L(${RE})/" <(echo "${ENTRIES}")) + if [[ -n "${TEAM_ENTRIES}" ]]; then + EMAIL=$(eval echo \${${t}_EMAIL}) + echo -e "\e[33mContact ${EMAIL} or compat- for help with the following:\e[0m" + for i in ${ENTRIES} + do + echo -e "\e[33m ${i}\e[0m" + done + fi + done + exit 1 + fi +done |