diff options
34 files changed, 537 insertions, 368 deletions
diff --git a/api/current.txt b/api/current.txt index 9ffd50f27c12..f211f6dbbcbf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16345,6 +16345,8 @@ package android.icu.lang { field public static final int GAMAL = 12; // 0xc field public static final int HAH = 13; // 0xd field public static final int HAMZA_ON_HEH_GOAL = 14; // 0xe + field public static final int HANIFI_ROHINGYA_KINNA_YA = 100; // 0x64 + field public static final int HANIFI_ROHINGYA_PA = 101; // 0x65 field public static final int HE = 15; // 0xf field public static final int HEH = 16; // 0x10 field public static final int HEH_GOAL = 17; // 0x11 @@ -16596,6 +16598,8 @@ package android.icu.lang { field public static final int CHEROKEE_ID = 32; // 0x20 field public static final android.icu.lang.UCharacter.UnicodeBlock CHEROKEE_SUPPLEMENT; field public static final int CHEROKEE_SUPPLEMENT_ID = 255; // 0xff + field public static final android.icu.lang.UCharacter.UnicodeBlock CHESS_SYMBOLS; + field public static final int CHESS_SYMBOLS_ID = 281; // 0x119 field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY; field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_FORMS; field public static final int CJK_COMPATIBILITY_FORMS_ID = 83; // 0x53 @@ -16672,6 +16676,8 @@ package android.icu.lang { field public static final int DEVANAGARI_ID = 15; // 0xf field public static final android.icu.lang.UCharacter.UnicodeBlock DINGBATS; field public static final int DINGBATS_ID = 56; // 0x38 + field public static final android.icu.lang.UCharacter.UnicodeBlock DOGRA; + field public static final int DOGRA_ID = 282; // 0x11a field public static final android.icu.lang.UCharacter.UnicodeBlock DOMINO_TILES; field public static final int DOMINO_TILES_ID = 171; // 0xab field public static final android.icu.lang.UCharacter.UnicodeBlock DUPLOYAN; @@ -16707,6 +16713,8 @@ package android.icu.lang { field public static final int GEOMETRIC_SHAPES_EXTENDED_ID = 227; // 0xe3 field public static final int GEOMETRIC_SHAPES_ID = 54; // 0x36 field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN; + field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN_EXTENDED; + field public static final int GEORGIAN_EXTENDED_ID = 283; // 0x11b field public static final int GEORGIAN_ID = 29; // 0x1d field public static final android.icu.lang.UCharacter.UnicodeBlock GEORGIAN_SUPPLEMENT; field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87 @@ -16724,6 +16732,8 @@ package android.icu.lang { field public static final int GREEK_ID = 8; // 0x8 field public static final android.icu.lang.UCharacter.UnicodeBlock GUJARATI; field public static final int GUJARATI_ID = 18; // 0x12 + field public static final android.icu.lang.UCharacter.UnicodeBlock GUNJALA_GONDI; + field public static final int GUNJALA_GONDI_ID = 284; // 0x11c field public static final android.icu.lang.UCharacter.UnicodeBlock GURMUKHI; field public static final int GURMUKHI_ID = 17; // 0x11 field public static final android.icu.lang.UCharacter.UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS; @@ -16738,6 +16748,8 @@ package android.icu.lang { field public static final int HANGUL_JAMO_ID = 30; // 0x1e field public static final android.icu.lang.UCharacter.UnicodeBlock HANGUL_SYLLABLES; field public static final int HANGUL_SYLLABLES_ID = 74; // 0x4a + field public static final android.icu.lang.UCharacter.UnicodeBlock HANIFI_ROHINGYA; + field public static final int HANIFI_ROHINGYA_ID = 285; // 0x11d field public static final android.icu.lang.UCharacter.UnicodeBlock HANUNOO; field public static final int HANUNOO_ID = 99; // 0x63 field public static final android.icu.lang.UCharacter.UnicodeBlock HATRAN; @@ -16756,6 +16768,8 @@ package android.icu.lang { field public static final int IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION_ID = 267; // 0x10b field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC; field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba + field public static final android.icu.lang.UCharacter.UnicodeBlock INDIC_SIYAQ_NUMBERS; + field public static final int INDIC_SIYAQ_NUMBERS_ID = 286; // 0x11e field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI; field public static final int INSCRIPTIONAL_PAHLAVI_ID = 190; // 0xbe field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PARTHIAN; @@ -16834,6 +16848,8 @@ package android.icu.lang { field public static final int MAHAJANI_ID = 233; // 0xe9 field public static final android.icu.lang.UCharacter.UnicodeBlock MAHJONG_TILES; field public static final int MAHJONG_TILES_ID = 170; // 0xaa + field public static final android.icu.lang.UCharacter.UnicodeBlock MAKASAR; + field public static final int MAKASAR_ID = 287; // 0x11f field public static final android.icu.lang.UCharacter.UnicodeBlock MALAYALAM; field public static final int MALAYALAM_ID = 23; // 0x17 field public static final android.icu.lang.UCharacter.UnicodeBlock MANDAIC; @@ -16848,6 +16864,10 @@ package android.icu.lang { field public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93; // 0x5d field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_OPERATORS; field public static final int MATHEMATICAL_OPERATORS_ID = 47; // 0x2f + field public static final android.icu.lang.UCharacter.UnicodeBlock MAYAN_NUMERALS; + field public static final int MAYAN_NUMERALS_ID = 288; // 0x120 + field public static final android.icu.lang.UCharacter.UnicodeBlock MEDEFAIDRIN; + field public static final int MEDEFAIDRIN_ID = 289; // 0x121 field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK; field public static final android.icu.lang.UCharacter.UnicodeBlock MEETEI_MAYEK_EXTENSIONS; field public static final int MEETEI_MAYEK_EXTENSIONS_ID = 213; // 0xd5 @@ -16917,6 +16937,8 @@ package android.icu.lang { field public static final int OLD_PERMIC_ID = 241; // 0xf1 field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_PERSIAN; field public static final int OLD_PERSIAN_ID = 140; // 0x8c + field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_SOGDIAN; + field public static final int OLD_SOGDIAN_ID = 290; // 0x122 field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_SOUTH_ARABIAN; field public static final int OLD_SOUTH_ARABIAN_ID = 187; // 0xbb field public static final android.icu.lang.UCharacter.UnicodeBlock OLD_TURKIC; @@ -16981,6 +17003,8 @@ package android.icu.lang { field public static final int SINHALA_ID = 24; // 0x18 field public static final android.icu.lang.UCharacter.UnicodeBlock SMALL_FORM_VARIANTS; field public static final int SMALL_FORM_VARIANTS_ID = 84; // 0x54 + field public static final android.icu.lang.UCharacter.UnicodeBlock SOGDIAN; + field public static final int SOGDIAN_ID = 291; // 0x123 field public static final android.icu.lang.UCharacter.UnicodeBlock SORA_SOMPENG; field public static final int SORA_SOMPENG_ID = 218; // 0xda field public static final android.icu.lang.UCharacter.UnicodeBlock SOYOMBO; @@ -17105,6 +17129,7 @@ package android.icu.lang { field public static final int OTHER = 0; // 0x0 field public static final int REGIONAL_INDICATOR = 13; // 0xd field public static final int SINGLE_QUOTE = 15; // 0xf + field public static final int WSEGSPACE = 22; // 0x16 field public static final int ZWJ = 21; // 0x15 } @@ -17236,6 +17261,7 @@ package android.icu.lang { field public static final int EMOJI_MODIFIER = 59; // 0x3b field public static final int EMOJI_MODIFIER_BASE = 60; // 0x3c field public static final int EMOJI_PRESENTATION = 58; // 0x3a + field public static final int EXTENDED_PICTOGRAPHIC = 64; // 0x40 field public static final int EXTENDER = 8; // 0x8 field public static final int FULL_COMPOSITION_EXCLUSION = 9; // 0x9 field public static final int GENERAL_CATEGORY = 4101; // 0x1005 @@ -17366,6 +17392,7 @@ package android.icu.lang { field public static final int DEMOTIC_EGYPTIAN = 69; // 0x45 field public static final int DESERET = 9; // 0x9 field public static final int DEVANAGARI = 10; // 0xa + field public static final int DOGRA = 178; // 0xb2 field public static final int DUPLOYAN = 135; // 0x87 field public static final int EASTERN_SYRIAC = 97; // 0x61 field public static final int EGYPTIAN_HIEROGLYPHS = 71; // 0x47 @@ -17378,9 +17405,11 @@ package android.icu.lang { field public static final int GRANTHA = 137; // 0x89 field public static final int GREEK = 14; // 0xe field public static final int GUJARATI = 15; // 0xf + field public static final int GUNJALA_GONDI = 179; // 0xb3 field public static final int GURMUKHI = 16; // 0x10 field public static final int HAN = 17; // 0x11 field public static final int HANGUL = 18; // 0x12 + field public static final int HANIFI_ROHINGYA = 182; // 0xb6 field public static final int HANUNOO = 43; // 0x2b field public static final int HAN_WITH_BOPOMOFO = 172; // 0xac field public static final int HARAPPAN_INDUS = 77; // 0x4d @@ -17423,6 +17452,7 @@ package android.icu.lang { field public static final int LYCIAN = 107; // 0x6b field public static final int LYDIAN = 108; // 0x6c field public static final int MAHAJANI = 160; // 0xa0 + field public static final int MAKASAR = 180; // 0xb4 field public static final int MALAYALAM = 26; // 0x1a field public static final int MANDAEAN = 84; // 0x54 field public static final int MANDAIC = 84; // 0x54 @@ -17431,6 +17461,7 @@ package android.icu.lang { field public static final int MASARAM_GONDI = 175; // 0xaf field public static final int MATHEMATICAL_NOTATION = 128; // 0x80 field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55 + field public static final int MEDEFAIDRIN = 181; // 0xb5 field public static final int MEITEI_MAYEK = 115; // 0x73 field public static final int MENDE = 140; // 0x8c field public static final int MEROITIC = 86; // 0x56 @@ -17456,6 +17487,7 @@ package android.icu.lang { field public static final int OLD_NORTH_ARABIAN = 142; // 0x8e field public static final int OLD_PERMIC = 89; // 0x59 field public static final int OLD_PERSIAN = 61; // 0x3d + field public static final int OLD_SOGDIAN = 184; // 0xb8 field public static final int OLD_SOUTH_ARABIAN = 133; // 0x85 field public static final int OL_CHIKI = 109; // 0x6d field public static final int ORIYA = 31; // 0x1f @@ -17482,6 +17514,7 @@ package android.icu.lang { field public static final int SIMPLIFIED_HAN = 73; // 0x49 field public static final int SINDHI = 145; // 0x91 field public static final int SINHALA = 33; // 0x21 + field public static final int SOGDIAN = 183; // 0xb7 field public static final int SORA_SOMPENG = 152; // 0x98 field public static final int SOYOMBO = 176; // 0xb0 field public static final int SUNDANESE = 113; // 0x71 @@ -20423,6 +20456,7 @@ package android.icu.util { field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION; field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION; field public static final android.icu.util.VersionInfo UNICODE_10_0; + field public static final android.icu.util.VersionInfo UNICODE_11_0; field public static final android.icu.util.VersionInfo UNICODE_1_0; field public static final android.icu.util.VersionInfo UNICODE_1_0_1; field public static final android.icu.util.VersionInfo UNICODE_1_1_0; @@ -39386,6 +39420,7 @@ package android.telecom { method public void onReject(java.lang.String); method public void onSeparate(); method public void onShowIncomingCallUi(); + method public void onSilence(); method public void onStartRtt(android.telecom.Connection.RttTextStream); method public void onStateChanged(int); method public void onStopDtmfTone(); @@ -40774,8 +40809,10 @@ package android.telephony { method public java.lang.CharSequence getDisplayName(); method public java.lang.String getIccId(); method public int getIconTint(); - method public int getMcc(); - method public int getMnc(); + method public deprecated int getMcc(); + method public java.lang.String getMccString(); + method public deprecated int getMnc(); + method public java.lang.String getMncString(); method public java.lang.String getNumber(); method public int getSimSlotIndex(); method public int getSubscriptionId(); diff --git a/config/hiddenapi-p-light-greylist.txt b/config/hiddenapi-p-light-greylist.txt index 789d51209e16..7ad9ad21029d 100644 --- a/config/hiddenapi-p-light-greylist.txt +++ b/config/hiddenapi-p-light-greylist.txt @@ -144,6 +144,7 @@ Landroid/app/ActivityManager$StackInfo;->visible:Z Landroid/app/ActivityManager$TaskDescription;->getBackgroundColor()I Landroid/app/ActivityManager$TaskDescription;->getInMemoryIcon()Landroid/graphics/Bitmap; Landroid/app/ActivityManager$TaskDescription;->loadTaskDescriptionIcon(Ljava/lang/String;I)Landroid/graphics/Bitmap; +Landroid/app/ActivityManager$TaskDescription;->setIcon(Landroid/graphics/Bitmap;)V Landroid/app/ActivityManager$TaskSnapshot;->getContentInsets()Landroid/graphics/Rect; Landroid/app/ActivityManager$TaskSnapshot;->getOrientation()I Landroid/app/ActivityManager$TaskSnapshot;->getScale()F @@ -183,6 +184,7 @@ Landroid/app/ActivityOptions;->makeCustomAnimation(Landroid/content/Context;IILa Landroid/app/ActivityOptions;->makeMultiThumbFutureAspectScaleAnimation(Landroid/content/Context;Landroid/os/Handler;Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/app/ActivityOptions$OnAnimationStartedListener;Z)Landroid/app/ActivityOptions; Landroid/app/ActivityOptions;->makeRemoteAnimation(Landroid/view/RemoteAnimationAdapter;)Landroid/app/ActivityOptions; Landroid/app/ActivityOptions;->setSplitScreenCreateMode(I)V +Landroid/app/ActivityThread$ActivityClientRecord;-><init>()V Landroid/app/ActivityThread$ActivityClientRecord;->activity:Landroid/app/Activity; Landroid/app/ActivityThread$ActivityClientRecord;->activityInfo:Landroid/content/pm/ActivityInfo; Landroid/app/ActivityThread$ActivityClientRecord;->compatInfo:Landroid/content/res/CompatibilityInfo; @@ -192,6 +194,7 @@ Landroid/app/ActivityThread$ActivityClientRecord;->packageInfo:Landroid/app/Load Landroid/app/ActivityThread$ActivityClientRecord;->paused:Z Landroid/app/ActivityThread$ActivityClientRecord;->stopped:Z Landroid/app/ActivityThread$ActivityClientRecord;->token:Landroid/os/IBinder; +Landroid/app/ActivityThread$AppBindData;-><init>()V Landroid/app/ActivityThread$AppBindData;->appInfo:Landroid/content/pm/ApplicationInfo; Landroid/app/ActivityThread$AppBindData;->compatInfo:Landroid/content/res/CompatibilityInfo; Landroid/app/ActivityThread$AppBindData;->info:Landroid/app/LoadedApk; @@ -274,6 +277,7 @@ Landroid/app/ActivityThread;->mNumVisibleActivities:I Landroid/app/ActivityThread;->mPackages:Landroid/util/ArrayMap; Landroid/app/ActivityThread;->mPendingConfiguration:Landroid/content/res/Configuration; Landroid/app/ActivityThread;->mProviderMap:Landroid/util/ArrayMap; +Landroid/app/ActivityThread;->mProviderRefCountMap:Landroid/util/ArrayMap; Landroid/app/ActivityThread;->mResourcePackages:Landroid/util/ArrayMap; Landroid/app/ActivityThread;->mResourcesManager:Landroid/app/ResourcesManager; Landroid/app/ActivityThread;->mServices:Landroid/util/ArrayMap; @@ -281,6 +285,7 @@ Landroid/app/ActivityThread;->mSystemContext:Landroid/app/ContextImpl; Landroid/app/ActivityThread;->peekPackageInfo(Ljava/lang/String;Z)Landroid/app/LoadedApk; Landroid/app/ActivityThread;->performNewIntents(Landroid/os/IBinder;Ljava/util/List;Z)V Landroid/app/ActivityThread;->performStopActivity(Landroid/os/IBinder;ZLjava/lang/String;)V +Landroid/app/ActivityThread;->registerOnActivityPausedListener(Landroid/app/Activity;Landroid/app/OnActivityPausedListener;)V Landroid/app/ActivityThread;->releaseProvider(Landroid/content/IContentProvider;Z)Z Landroid/app/ActivityThread;->scheduleGcIdler()V Landroid/app/ActivityThread;->sCurrentActivityThread:Landroid/app/ActivityThread; @@ -289,6 +294,7 @@ Landroid/app/ActivityThread;->sMainThreadHandler:Landroid/os/Handler; Landroid/app/ActivityThread;->sPackageManager:Landroid/content/pm/IPackageManager; Landroid/app/ActivityThread;->startActivityNow(Landroid/app/Activity;Ljava/lang/String;Landroid/content/Intent;Landroid/content/pm/ActivityInfo;Landroid/os/IBinder;Landroid/os/Bundle;Landroid/app/Activity$NonConfigurationInstances;)Landroid/app/Activity; Landroid/app/ActivityThread;->systemMain()Landroid/app/ActivityThread; +Landroid/app/ActivityThread;->unregisterOnActivityPausedListener(Landroid/app/Activity;Landroid/app/OnActivityPausedListener;)V Landroid/app/ActivityView;-><init>(Landroid/content/Context;)V Landroid/app/ActivityView;->release()V Landroid/app/ActivityView;->startActivity(Landroid/app/PendingIntent;)V @@ -530,6 +536,7 @@ Landroid/app/ContentProviderHolder;-><init>(Landroid/os/Parcel;)V Landroid/app/ContentProviderHolder;->info:Landroid/content/pm/ProviderInfo; Landroid/app/ContentProviderHolder;->noReleaseNeeded:Z Landroid/app/ContentProviderHolder;->provider:Landroid/content/IContentProvider; +Landroid/app/ContextImpl$ApplicationContentResolver;->acquireProvider(Landroid/content/Context;Ljava/lang/String;)Landroid/content/IContentProvider; Landroid/app/ContextImpl$ApplicationContentResolver;->mMainThread:Landroid/app/ActivityThread; Landroid/app/ContextImpl;->createActivityContext(Landroid/app/ActivityThread;Landroid/app/LoadedApk;Landroid/content/pm/ActivityInfo;Landroid/os/IBinder;ILandroid/content/res/Configuration;)Landroid/app/ContextImpl; Landroid/app/ContextImpl;->createAppContext(Landroid/app/ActivityThread;Landroid/app/LoadedApk;)Landroid/app/ContextImpl; @@ -616,6 +623,7 @@ Landroid/app/IActivityManager$Stub$Proxy;->getProcessPss([I)[J Landroid/app/IActivityManager$Stub$Proxy;->isAppForeground(I)Z Landroid/app/IActivityManager$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/app/IActivityManager$Stub$Proxy;->setActivityController(Landroid/app/IActivityController;Z)V +Landroid/app/IActivityManager$Stub$Proxy;->updatePersistentConfiguration(Landroid/content/res/Configuration;)V Landroid/app/IActivityManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/IActivityManager; Landroid/app/IActivityManager;->bindService(Landroid/app/IApplicationThread;Landroid/os/IBinder;Landroid/content/Intent;Ljava/lang/String;Landroid/app/IServiceConnection;ILjava/lang/String;I)I Landroid/app/IActivityManager;->broadcastIntent(Landroid/app/IApplicationThread;Landroid/content/Intent;Ljava/lang/String;Landroid/content/IIntentReceiver;ILjava/lang/String;Landroid/os/Bundle;[Ljava/lang/String;ILandroid/os/Bundle;ZZI)I @@ -746,6 +754,7 @@ Landroid/app/INotificationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/app/INotificationManager$Stub$Proxy;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z Landroid/app/INotificationManager$Stub;-><init>()V Landroid/app/INotificationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/app/INotificationManager; +Landroid/app/INotificationManager$Stub;->TRANSACTION_enqueueNotificationWithTag:I Landroid/app/INotificationManager;->areNotificationsEnabledForPackage(Ljava/lang/String;I)Z Landroid/app/INotificationManager;->cancelAllNotifications(Ljava/lang/String;I)V Landroid/app/INotificationManager;->cancelNotificationWithTag(Ljava/lang/String;Ljava/lang/String;II)V @@ -758,6 +767,7 @@ Landroid/app/INotificationManager;->getZenModeConfig()Landroid/service/notificat Landroid/app/Instrumentation;->callActivityOnNewIntent(Landroid/app/Activity;Lcom/android/internal/content/ReferrerIntent;)V Landroid/app/Instrumentation;->checkStartActivityResult(ILjava/lang/Object;)V Landroid/app/Instrumentation;->execStartActivities(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;[Landroid/content/Intent;Landroid/os/Bundle;)V +Landroid/app/Instrumentation;->execStartActivitiesAsUser(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;[Landroid/content/Intent;Landroid/os/Bundle;I)I Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Landroid/app/Activity;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult; Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;)Landroid/app/Instrumentation$ActivityResult; Landroid/app/Instrumentation;->execStartActivity(Landroid/content/Context;Landroid/os/IBinder;Landroid/os/IBinder;Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;Landroid/os/UserHandle;)Landroid/app/Instrumentation$ActivityResult; @@ -793,6 +803,7 @@ Landroid/app/IWallpaperManager;->getHeightHint()I Landroid/app/IWallpaperManager;->getWallpaper(Ljava/lang/String;Landroid/app/IWallpaperManagerCallback;ILandroid/os/Bundle;I)Landroid/os/ParcelFileDescriptor; Landroid/app/IWallpaperManager;->getWallpaperInfo(I)Landroid/app/WallpaperInfo; Landroid/app/IWallpaperManager;->getWidthHint()I +Landroid/app/IWallpaperManager;->hasNamedWallpaper(Ljava/lang/String;)Z Landroid/app/IWallpaperManager;->setWallpaperComponent(Landroid/content/ComponentName;)V Landroid/app/IWallpaperManagerCallback$Stub;-><init>()V Landroid/app/IWallpaperManagerCallback;->onWallpaperChanged()V @@ -950,8 +961,11 @@ Landroid/app/ProgressDialog;->mMessageView:Landroid/widget/TextView; Landroid/app/ProgressDialog;->mProgress:Landroid/widget/ProgressBar; Landroid/app/ProgressDialog;->mProgressNumber:Landroid/widget/TextView; Landroid/app/QueuedWork;->addFinisher(Ljava/lang/Runnable;)V +Landroid/app/QueuedWork;->getHandler()Landroid/os/Handler; +Landroid/app/QueuedWork;->queue(Ljava/lang/Runnable;Z)V Landroid/app/QueuedWork;->removeFinisher(Ljava/lang/Runnable;)V Landroid/app/QueuedWork;->sFinishers:Ljava/util/LinkedList; +Landroid/app/ResourcesManager$ActivityResources;-><init>()V Landroid/app/ResourcesManager;-><init>()V Landroid/app/ResourcesManager;->appendLibAssetForMainAssetPath(Ljava/lang/String;Ljava/lang/String;)V Landroid/app/ResourcesManager;->createAssetManager(Landroid/content/res/ResourcesKey;)Landroid/content/res/AssetManager; @@ -968,6 +982,7 @@ Landroid/app/ResultInfo;->mResultWho:Ljava/lang/String; Landroid/app/SearchableInfo$ActionKeyInfo;->getQueryActionMsg()Ljava/lang/String; Landroid/app/SearchableInfo$ActionKeyInfo;->getSuggestActionMsg()Ljava/lang/String; Landroid/app/SearchableInfo$ActionKeyInfo;->getSuggestActionMsgColumn()Ljava/lang/String; +Landroid/app/SearchableInfo;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/content/ComponentName;)V Landroid/app/SearchableInfo;->findActionKey(I)Landroid/app/SearchableInfo$ActionKeyInfo; Landroid/app/SearchableInfo;->getActivityContext(Landroid/content/Context;)Landroid/content/Context; Landroid/app/SearchableInfo;->getIconId()I @@ -986,9 +1001,14 @@ Landroid/app/SearchManager;->isVisible()Z Landroid/app/SearchManager;->launchAssist(Landroid/os/Bundle;)V Landroid/app/SearchManager;->mSearchDialog:Landroid/app/SearchDialog; Landroid/app/SearchManager;->startSearch(Ljava/lang/String;ZLandroid/content/ComponentName;Landroid/os/Bundle;ZLandroid/graphics/Rect;)V +Landroid/app/servertransaction/ActivityResultItem;->mResultInfoList:Ljava/util/List; +Landroid/app/servertransaction/ClientTransaction;->getActivityToken()Landroid/os/IBinder; +Landroid/app/servertransaction/ClientTransaction;->getCallbacks()Ljava/util/List; +Landroid/app/servertransaction/ClientTransaction;->getLifecycleStateRequest()Landroid/app/servertransaction/ActivityLifecycleItem; Landroid/app/servertransaction/ClientTransaction;->mActivityCallbacks:Ljava/util/List; Landroid/app/servertransaction/LaunchActivityItem;->mInfo:Landroid/content/pm/ActivityInfo; Landroid/app/servertransaction/LaunchActivityItem;->mIntent:Landroid/content/Intent; +Landroid/app/servertransaction/NewIntentItem;->mIntents:Ljava/util/List; Landroid/app/Service;->attach(Landroid/content/Context;Landroid/app/ActivityThread;Ljava/lang/String;Landroid/os/IBinder;Landroid/app/Application;Ljava/lang/Object;)V Landroid/app/Service;->mActivityManager:Landroid/app/IActivityManager; Landroid/app/Service;->mApplication:Landroid/app/Application; @@ -1000,6 +1020,7 @@ Landroid/app/Service;->setForeground(Z)V Landroid/app/ServiceConnectionLeaked;-><init>(Ljava/lang/String;)V Landroid/app/SharedPreferencesImpl;-><init>(Ljava/io/File;I)V Landroid/app/SharedPreferencesImpl;->mFile:Ljava/io/File; +Landroid/app/SharedPreferencesImpl;->startLoadFromDisk()V Landroid/app/SharedPreferencesImpl;->startReloadIfChangedUnexpectedly()V Landroid/app/slice/Slice$Builder;-><init>(Landroid/net/Uri;)V Landroid/app/slice/Slice$Builder;->addTimestamp(JLjava/lang/String;Ljava/util/List;)Landroid/app/slice/Slice$Builder; @@ -1339,6 +1360,8 @@ Landroid/bluetooth/IBluetooth$Stub$Proxy;->getAddress()Ljava/lang/String; Landroid/bluetooth/IBluetooth$Stub$Proxy;->getConnectionState(Landroid/bluetooth/BluetoothDevice;)I Landroid/bluetooth/IBluetooth$Stub;-><init>()V Landroid/bluetooth/IBluetooth$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetooth; +Landroid/bluetooth/IBluetooth$Stub;->TRANSACTION_enable:I +Landroid/bluetooth/IBluetooth;->fetchRemoteUuids(Landroid/bluetooth/BluetoothDevice;)Z Landroid/bluetooth/IBluetooth;->getAddress()Ljava/lang/String; Landroid/bluetooth/IBluetooth;->getRemoteAlias(Landroid/bluetooth/BluetoothDevice;)Ljava/lang/String; Landroid/bluetooth/IBluetooth;->isEnabled()Z @@ -1366,6 +1389,7 @@ Landroid/bluetooth/IBluetoothHeadset;->setPriority(Landroid/bluetooth/BluetoothD Landroid/bluetooth/IBluetoothHidDeviceCallback$Stub;-><init>()V Landroid/bluetooth/IBluetoothManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/bluetooth/IBluetoothManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/bluetooth/IBluetoothManager; +Landroid/bluetooth/IBluetoothManager$Stub;->TRANSACTION_enable:I Landroid/bluetooth/IBluetoothManager;->getBluetoothGatt()Landroid/bluetooth/IBluetoothGatt; Landroid/bluetooth/IBluetoothManager;->registerStateChangeCallback(Landroid/bluetooth/IBluetoothStateChangeCallback;)V Landroid/bluetooth/IBluetoothManager;->unregisterStateChangeCallback(Landroid/bluetooth/IBluetoothStateChangeCallback;)V @@ -1484,8 +1508,10 @@ Landroid/content/Context;->startActivityAsUser(Landroid/content/Intent;Landroid/ Landroid/content/Context;->startActivityForResult(Ljava/lang/String;Landroid/content/Intent;ILandroid/os/Bundle;)V Landroid/content/Context;->startServiceAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)Landroid/content/ComponentName; Landroid/content/Context;->STATUS_BAR_SERVICE:Ljava/lang/String; +Landroid/content/ContextWrapper;->createApplicationContext(Landroid/content/pm/ApplicationInfo;I)Landroid/content/Context; Landroid/content/ContextWrapper;->getBasePackageName()Ljava/lang/String; Landroid/content/ContextWrapper;->getDisplay()Landroid/view/Display; +Landroid/content/ContextWrapper;->getOpPackageName()Ljava/lang/String; Landroid/content/ContextWrapper;->getSharedPreferences(Ljava/io/File;I)Landroid/content/SharedPreferences; Landroid/content/ContextWrapper;->getSharedPreferencesPath(Ljava/lang/String;)Ljava/io/File; Landroid/content/ContextWrapper;->getThemeResId()I @@ -1506,6 +1532,7 @@ Landroid/content/IContentProvider;->call(Ljava/lang/String;Ljava/lang/String;Lja Landroid/content/IContentProvider;->delete(Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I Landroid/content/IContentProvider;->descriptor:Ljava/lang/String; Landroid/content/IContentProvider;->insert(Ljava/lang/String;Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri; +Landroid/content/IContentProvider;->QUERY_TRANSACTION:I Landroid/content/IContentProvider;->update(Ljava/lang/String;Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I Landroid/content/IContentService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/content/IContentService$Stub;-><init>()V @@ -1571,6 +1598,7 @@ Landroid/content/IntentFilter;->hasExactDataType(Ljava/lang/String;)Z Landroid/content/IntentFilter;->isVerified()Z Landroid/content/IntentFilter;->mActions:Ljava/util/ArrayList; Landroid/content/IntentFilter;->mOrder:I +Landroid/content/IntentFilter;->setAutoVerify(Z)V Landroid/content/IntentSender;-><init>(Landroid/content/IIntentSender;)V Landroid/content/IntentSender;->getTarget()Landroid/content/IIntentSender; Landroid/content/IntentSender;->mTarget:Landroid/content/IIntentSender; @@ -1604,6 +1632,8 @@ Landroid/content/om/OverlayInfo;->packageName:Ljava/lang/String; Landroid/content/om/OverlayInfo;->state:I Landroid/content/om/OverlayInfo;->targetPackageName:Ljava/lang/String; Landroid/content/pm/ActivityInfo;->activityInfoConfigJavaToNative(I)I +Landroid/content/pm/ActivityInfo;->FLAG_ALLOW_EMBEDDED:I +Landroid/content/pm/ActivityInfo;->FLAG_SHOW_FOR_ALL_USERS:I Landroid/content/pm/ActivityInfo;->isResizeableMode(I)Z Landroid/content/pm/ActivityInfo;->resizeMode:I Landroid/content/pm/ActivityInfo;->supportsPictureInPicture()Z @@ -1643,9 +1673,11 @@ Landroid/content/pm/IPackageDeleteObserver$Stub;-><init>()V Landroid/content/pm/IPackageDeleteObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDeleteObserver; Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/content/pm/IPackageDeleteObserver2$Stub$Proxy;->mRemote:Landroid/os/IBinder; +Landroid/content/pm/IPackageDeleteObserver2$Stub;-><init>()V Landroid/content/pm/IPackageDeleteObserver2$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageDeleteObserver2; Landroid/content/pm/IPackageDeleteObserver2;->onPackageDeleted(Ljava/lang/String;ILjava/lang/String;)V Landroid/content/pm/IPackageDeleteObserver;->packageDeleted(Ljava/lang/String;I)V +Landroid/content/pm/IPackageInstaller;->uninstall(Landroid/content/pm/VersionedPackage;Ljava/lang/String;ILandroid/content/IntentSender;I)V Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/content/pm/IPackageInstallerCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder; Landroid/content/pm/IPackageInstallerCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageInstallerCallback; @@ -1665,13 +1697,17 @@ Landroid/content/pm/IPackageInstallObserver2$Stub;->asInterface(Landroid/os/IBin Landroid/content/pm/IPackageInstallObserver2;->onPackageInstalled(Ljava/lang/String;ILjava/lang/String;Landroid/os/Bundle;)V Landroid/content/pm/IPackageInstallObserver2;->onUserActionRequired(Landroid/content/Intent;)V Landroid/content/pm/IPackageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V +Landroid/content/pm/IPackageManager$Stub$Proxy;->checkUidPermission(Ljava/lang/String;I)I +Landroid/content/pm/IPackageManager$Stub$Proxy;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String; Landroid/content/pm/IPackageManager$Stub$Proxy;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice; Landroid/content/pm/IPackageManager$Stub$Proxy;->getInstallLocation()I +Landroid/content/pm/IPackageManager$Stub$Proxy;->getLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;I)Landroid/content/pm/ResolveInfo; Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo; Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackagesForUid(I)[Ljava/lang/String; Landroid/content/pm/IPackageManager$Stub$Proxy;->getSystemSharedLibraryNames()[Ljava/lang/String; Landroid/content/pm/IPackageManager$Stub;-><init>()V Landroid/content/pm/IPackageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/content/pm/IPackageManager; +Landroid/content/pm/IPackageManager$Stub;->TRANSACTION_getApplicationInfo:I Landroid/content/pm/IPackageManager;->addPermission(Landroid/content/pm/PermissionInfo;)Z Landroid/content/pm/IPackageManager;->addPermissionAsync(Landroid/content/pm/PermissionInfo;)Z Landroid/content/pm/IPackageManager;->canonicalToCurrentPackageNames([Ljava/lang/String;)[Ljava/lang/String; @@ -1686,6 +1722,7 @@ Landroid/content/pm/IPackageManager;->enterSafeMode()V Landroid/content/pm/IPackageManager;->getActivityInfo(Landroid/content/ComponentName;II)Landroid/content/pm/ActivityInfo; Landroid/content/pm/IPackageManager;->getApplicationEnabledSetting(Ljava/lang/String;I)I Landroid/content/pm/IPackageManager;->getApplicationInfo(Ljava/lang/String;II)Landroid/content/pm/ApplicationInfo; +Landroid/content/pm/IPackageManager;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String; Landroid/content/pm/IPackageManager;->getBlockUninstallForUser(Ljava/lang/String;I)Z Landroid/content/pm/IPackageManager;->getComponentEnabledSetting(Landroid/content/ComponentName;I)I Landroid/content/pm/IPackageManager;->getFlagsForUid(I)I @@ -1698,6 +1735,7 @@ Landroid/content/pm/IPackageManager;->getInstrumentationInfo(Landroid/content/Co Landroid/content/pm/IPackageManager;->getLastChosenActivity(Landroid/content/Intent;Ljava/lang/String;I)Landroid/content/pm/ResolveInfo; Landroid/content/pm/IPackageManager;->getNameForUid(I)Ljava/lang/String; Landroid/content/pm/IPackageManager;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo; +Landroid/content/pm/IPackageManager;->getPackageInstaller()Landroid/content/pm/IPackageInstaller; Landroid/content/pm/IPackageManager;->getPackagesForUid(I)[Ljava/lang/String; Landroid/content/pm/IPackageManager;->getPackageUid(Ljava/lang/String;II)I Landroid/content/pm/IPackageManager;->getPermissionControllerPackageName()Ljava/lang/String; @@ -1890,11 +1928,18 @@ Landroid/content/pm/PackageParser$Provider;->syncable:Z Landroid/content/pm/PackageParser$ProviderIntentInfo;->provider:Landroid/content/pm/PackageParser$Provider; Landroid/content/pm/PackageParser$Service;->info:Landroid/content/pm/ServiceInfo; Landroid/content/pm/PackageParser$ServiceIntentInfo;->service:Landroid/content/pm/PackageParser$Service; +Landroid/content/pm/PackageParser$SigningDetails$Builder;-><init>()V +Landroid/content/pm/PackageParser$SigningDetails$Builder;->build()Landroid/content/pm/PackageParser$SigningDetails; +Landroid/content/pm/PackageParser$SigningDetails$Builder;->setPastSigningCertificates([Landroid/content/pm/Signature;)Landroid/content/pm/PackageParser$SigningDetails$Builder; +Landroid/content/pm/PackageParser$SigningDetails$Builder;->setPastSigningCertificatesFlags([I)Landroid/content/pm/PackageParser$SigningDetails$Builder; +Landroid/content/pm/PackageParser$SigningDetails$Builder;->setSignatures([Landroid/content/pm/Signature;)Landroid/content/pm/PackageParser$SigningDetails$Builder; +Landroid/content/pm/PackageParser$SigningDetails$Builder;->setSignatureSchemeVersion(I)Landroid/content/pm/PackageParser$SigningDetails$Builder; Landroid/content/pm/PackageParser$SigningDetails;->signatures:[Landroid/content/pm/Signature; Landroid/content/pm/PackageParser;-><init>()V Landroid/content/pm/PackageParser;->collectCertificates(Landroid/content/pm/PackageParser$Package;Ljava/io/File;Z)V Landroid/content/pm/PackageParser;->collectCertificates(Landroid/content/pm/PackageParser$Package;Z)V Landroid/content/pm/PackageParser;->generateActivityInfo(Landroid/content/pm/PackageParser$Activity;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ActivityInfo; +Landroid/content/pm/PackageParser;->generateApplicationInfo(Landroid/content/pm/PackageParser$Package;ILandroid/content/pm/PackageUserState;)Landroid/content/pm/ApplicationInfo; Landroid/content/pm/PackageParser;->generateApplicationInfo(Landroid/content/pm/PackageParser$Package;ILandroid/content/pm/PackageUserState;I)Landroid/content/pm/ApplicationInfo; Landroid/content/pm/PackageParser;->generateInstrumentationInfo(Landroid/content/pm/PackageParser$Instrumentation;I)Landroid/content/pm/InstrumentationInfo; Landroid/content/pm/PackageParser;->generatePackageInfo(Landroid/content/pm/PackageParser$Package;[IIJJLjava/util/Set;Landroid/content/pm/PackageUserState;)Landroid/content/pm/PackageInfo; @@ -1906,6 +1951,7 @@ Landroid/content/pm/PackageParser;->generateServiceInfo(Landroid/content/pm/Pack Landroid/content/pm/PackageParser;->mCallback:Landroid/content/pm/PackageParser$Callback; Landroid/content/pm/PackageParser;->NEW_PERMISSIONS:[Landroid/content/pm/PackageParser$NewPermissionInfo; Landroid/content/pm/PackageParser;->parseBaseApk(Ljava/lang/String;Landroid/content/res/Resources;Landroid/content/res/XmlResourceParser;I[Ljava/lang/String;)Landroid/content/pm/PackageParser$Package; +Landroid/content/pm/PackageParser;->parseBaseApplication(Landroid/content/pm/PackageParser$Package;Landroid/content/res/Resources;Landroid/content/res/XmlResourceParser;I[Ljava/lang/String;)Z Landroid/content/pm/PackageParser;->parseMonolithicPackage(Ljava/io/File;I)Landroid/content/pm/PackageParser$Package; Landroid/content/pm/PackageParser;->parsePackage(Ljava/io/File;I)Landroid/content/pm/PackageParser$Package; Landroid/content/pm/PackageParser;->parsePackage(Ljava/io/File;IZ)Landroid/content/pm/PackageParser$Package; @@ -1957,6 +2003,7 @@ Landroid/content/pm/UserInfo;->serialNumber:I Landroid/content/pm/VerifierInfo;-><init>(Ljava/lang/String;Ljava/security/PublicKey;)V Landroid/content/pm/XmlSerializerAndParser;->createFromXml(Lorg/xmlpull/v1/XmlPullParser;)Ljava/lang/Object; Landroid/content/pm/XmlSerializerAndParser;->writeAsXml(Ljava/lang/Object;Lorg/xmlpull/v1/XmlSerializer;)V +Landroid/content/res/ApkAssets;->getAssetPath()Ljava/lang/String; Landroid/content/res/AssetFileDescriptor;->mFd:Landroid/os/ParcelFileDescriptor; Landroid/content/res/AssetFileDescriptor;->mLength:J Landroid/content/res/AssetFileDescriptor;->mStartOffset:J @@ -1968,6 +2015,7 @@ Landroid/content/res/AssetManager;->addAssetPathAsSharedLibrary(Ljava/lang/Strin Landroid/content/res/AssetManager;->addOverlayPath(Ljava/lang/String;)I Landroid/content/res/AssetManager;->applyStyle(JIILandroid/content/res/XmlBlock$Parser;[IJJ)V Landroid/content/res/AssetManager;->createTheme()J +Landroid/content/res/AssetManager;->getApkAssets()[Landroid/content/res/ApkAssets; Landroid/content/res/AssetManager;->getAssignedPackageIdentifiers()Landroid/util/SparseArray; Landroid/content/res/AssetManager;->getGlobalAssetCount()I Landroid/content/res/AssetManager;->getGlobalAssetManagerCount()I @@ -1991,6 +2039,7 @@ Landroid/content/res/AssetManager;->retrieveAttributes(Landroid/content/res/XmlB Landroid/content/res/AssetManager;->setConfiguration(IILjava/lang/String;IIIIIIIIIIIIIII)V Landroid/content/res/AssetManager;->sSystem:Landroid/content/res/AssetManager; Landroid/content/res/ColorStateList$ColorStateListFactory;-><init>(Landroid/content/res/ColorStateList;)V +Landroid/content/res/ColorStateList;-><init>()V Landroid/content/res/ColorStateList;->canApplyTheme()Z Landroid/content/res/ColorStateList;->getColors()[I Landroid/content/res/ColorStateList;->getStates()[[I @@ -2010,6 +2059,7 @@ Landroid/content/res/CompatibilityInfo$Translator;->translateRectInScreenToAppWi Landroid/content/res/CompatibilityInfo$Translator;->translateRectInScreenToAppWinFrame(Landroid/graphics/Rect;)V Landroid/content/res/CompatibilityInfo$Translator;->translateRegionInWindowToScreen(Landroid/graphics/Region;)V Landroid/content/res/CompatibilityInfo$Translator;->translateWindowLayout(Landroid/view/WindowManager$LayoutParams;)V +Landroid/content/res/CompatibilityInfo;-><init>()V Landroid/content/res/CompatibilityInfo;-><init>(Landroid/content/pm/ApplicationInfo;IIZ)V Landroid/content/res/CompatibilityInfo;->applicationScale:F Landroid/content/res/CompatibilityInfo;->computeCompatibleScaling(Landroid/util/DisplayMetrics;Landroid/util/DisplayMetrics;)F @@ -2023,11 +2073,13 @@ Landroid/content/res/Configuration;->makeDefault()V Landroid/content/res/Configuration;->resourceQualifierString(Landroid/content/res/Configuration;)Ljava/lang/String; Landroid/content/res/Configuration;->seq:I Landroid/content/res/Configuration;->userSetLocale:Z +Landroid/content/res/ConfigurationBoundResourceCache;-><init>()V Landroid/content/res/DrawableCache;-><init>()V Landroid/content/res/DrawableCache;->getInstance(JLandroid/content/res/Resources;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; Landroid/content/res/ObbInfo;->salt:[B Landroid/content/res/Resources$Theme;->mThemeImpl:Landroid/content/res/ResourcesImpl$ThemeImpl; Landroid/content/res/Resources$Theme;->resolveAttributes([I[I)Landroid/content/res/TypedArray; +Landroid/content/res/Resources;-><init>()V Landroid/content/res/Resources;-><init>(Ljava/lang/ClassLoader;)V Landroid/content/res/Resources;->getCompatibilityInfo()Landroid/content/res/CompatibilityInfo; Landroid/content/res/Resources;->getDisplayAdjustments()Landroid/view/DisplayAdjustments; @@ -2050,6 +2102,7 @@ Landroid/content/res/Resources;->setImpl(Landroid/content/res/ResourcesImpl;)V Landroid/content/res/Resources;->updateSystemConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;Landroid/content/res/CompatibilityInfo;)V Landroid/content/res/ResourcesImpl;-><init>(Landroid/content/res/AssetManager;Landroid/util/DisplayMetrics;Landroid/content/res/Configuration;Landroid/view/DisplayAdjustments;)V Landroid/content/res/ResourcesImpl;->getAssets()Landroid/content/res/AssetManager; +Landroid/content/res/ResourcesImpl;->getDisplayMetrics()Landroid/util/DisplayMetrics; Landroid/content/res/ResourcesImpl;->getValue(ILandroid/util/TypedValue;Z)V Landroid/content/res/ResourcesImpl;->mAccessLock:Ljava/lang/Object; Landroid/content/res/ResourcesImpl;->mAnimatorCache:Landroid/content/res/ConfigurationBoundResourceCache; @@ -2069,6 +2122,7 @@ Landroid/content/res/ResourcesKey;->mResDir:Ljava/lang/String; Landroid/content/res/ResourcesKey;->mSplitResDirs:[Ljava/lang/String; Landroid/content/res/StringBlock;-><init>(JZ)V Landroid/content/res/StringBlock;->get(I)Ljava/lang/CharSequence; +Landroid/content/res/ThemedResourceCache;->mThemedEntries:Landroid/util/ArrayMap; Landroid/content/res/ThemedResourceCache;->onConfigurationChange(I)V Landroid/content/res/TypedArray;->extractThemeAttrs()[I Landroid/content/res/TypedArray;->extractThemeAttrs([I)[I @@ -2163,6 +2217,7 @@ Landroid/database/CursorWindow;->sWindowToPidMap:Landroid/util/LongSparseArray; Landroid/database/CursorWrapper;->mCursor:Landroid/database/Cursor; Landroid/database/DatabaseUtils;->cursorPickFillWindowStartPosition(II)I Landroid/database/DatabaseUtils;->getTypeOfObject(Ljava/lang/Object;)I +Landroid/database/IContentObserver$Stub;-><init>()V Landroid/database/IContentObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/database/IContentObserver; Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V Landroid/database/MatrixCursor;->data:[Ljava/lang/Object; @@ -2329,6 +2384,7 @@ Landroid/graphics/CanvasProperty;->createFloat(F)Landroid/graphics/CanvasPropert Landroid/graphics/CanvasProperty;->createPaint(Landroid/graphics/Paint;)Landroid/graphics/CanvasProperty; Landroid/graphics/ColorMatrixColorFilter;->mMatrix:Landroid/graphics/ColorMatrix; Landroid/graphics/ColorMatrixColorFilter;->setColorMatrix(Landroid/graphics/ColorMatrix;)V +Landroid/graphics/ColorMatrixColorFilter;->setColorMatrixArray([F)V Landroid/graphics/drawable/AnimatedImageDrawable;->getLoopCount(I)I Landroid/graphics/drawable/AnimatedImageDrawable;->LOOP_INFINITE:I Landroid/graphics/drawable/AnimatedImageDrawable;->onAnimationEnd()V @@ -2446,6 +2502,8 @@ Landroid/graphics/FontFamily;->abortCreation()V Landroid/graphics/FontFamily;->addFontFromAssetManager(Landroid/content/res/AssetManager;Ljava/lang/String;IZIII[Landroid/graphics/fonts/FontVariationAxis;)Z Landroid/graphics/FontFamily;->addFontFromBuffer(Ljava/nio/ByteBuffer;I[Landroid/graphics/fonts/FontVariationAxis;II)Z Landroid/graphics/FontFamily;->freeze()Z +Landroid/graphics/FontFamily;->mNativePtr:J +Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig; Landroid/graphics/fonts/FontVariationAxis;->mStyleValue:F Landroid/graphics/fonts/FontVariationAxis;->mTag:I Landroid/graphics/GraphicBuffer;-><init>(IIIIJ)V @@ -2620,6 +2678,7 @@ Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STREAM_C Landroid/hardware/camera2/CameraCharacteristics;->LED_AVAILABLE_LEDS:Landroid/hardware/camera2/CameraCharacteristics$Key; Landroid/hardware/camera2/CameraCharacteristics;->LENS_INFO_SHADING_MAP_SIZE:Landroid/hardware/camera2/CameraCharacteristics$Key; Landroid/hardware/camera2/CameraCharacteristics;->LOGICAL_MULTI_CAMERA_PHYSICAL_IDS:Landroid/hardware/camera2/CameraCharacteristics$Key; +Landroid/hardware/camera2/CameraCharacteristics;->mProperties:Landroid/hardware/camera2/impl/CameraMetadataNative; Landroid/hardware/camera2/CameraCharacteristics;->QUIRKS_USE_PARTIAL_RESULT:Landroid/hardware/camera2/CameraCharacteristics$Key; Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_CHARACTERISTICS_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key; @@ -2646,6 +2705,7 @@ Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_COORDINATES:Landroid/hardwar Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureRequest$Key; Landroid/hardware/camera2/CaptureRequest;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureRequest$Key; Landroid/hardware/camera2/CaptureRequest;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureRequest$Key; +Landroid/hardware/camera2/CaptureRequest;->mLogicalCameraSettings:Landroid/hardware/camera2/impl/CameraMetadataNative; Landroid/hardware/camera2/CaptureRequest;->REQUEST_ID:Landroid/hardware/camera2/CaptureRequest$Key; Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_BLUE:Landroid/hardware/camera2/CaptureRequest$Key; Landroid/hardware/camera2/CaptureRequest;->TONEMAP_CURVE_GREEN:Landroid/hardware/camera2/CaptureRequest$Key; @@ -2658,6 +2718,7 @@ Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_COORDINATES:Landroid/hardware Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_PROCESSING_METHOD:Landroid/hardware/camera2/CaptureResult$Key; Landroid/hardware/camera2/CaptureResult;->JPEG_GPS_TIMESTAMP:Landroid/hardware/camera2/CaptureResult$Key; Landroid/hardware/camera2/CaptureResult;->LED_TRANSMIT:Landroid/hardware/camera2/CaptureResult$Key; +Landroid/hardware/camera2/CaptureResult;->mResults:Landroid/hardware/camera2/impl/CameraMetadataNative; Landroid/hardware/camera2/CaptureResult;->QUIRKS_PARTIAL_RESULT:Landroid/hardware/camera2/CaptureResult$Key; Landroid/hardware/camera2/CaptureResult;->REQUEST_FRAME_COUNT:Landroid/hardware/camera2/CaptureResult$Key; Landroid/hardware/camera2/CaptureResult;->REQUEST_ID:Landroid/hardware/camera2/CaptureResult$Key; @@ -2677,6 +2738,9 @@ Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_GREEN:Landroid/hardware/ Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureResult$Key; Landroid/hardware/camera2/impl/CameraMetadataNative$Key;->getTag()I Landroid/hardware/camera2/impl/CameraMetadataNative;->mMetadataPtr:J +Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeGetTagFromKeyLocal(Ljava/lang/String;)I +Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeGetTypeFromTagLocal(I)I +Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeReadValues(I)[B Landroid/hardware/camera2/utils/SurfaceUtils;->getSurfaceSize(Landroid/view/Surface;)Landroid/util/Size; Landroid/hardware/camera2/utils/TypeReference;-><init>()V Landroid/hardware/camera2/utils/TypeReference;->createSpecializedTypeReference(Ljava/lang/reflect/Type;)Landroid/hardware/camera2/utils/TypeReference; @@ -3019,6 +3083,7 @@ Landroid/inputmethodservice/InputMethodService;->onExtractedSetSpan(Ljava/lang/O Landroid/inputmethodservice/Keyboard;->mModifierKeys:Ljava/util/List; Landroid/inputmethodservice/Keyboard;->mTotalHeight:I Landroid/inputmethodservice/Keyboard;->mTotalWidth:I +Landroid/inputmethodservice/Keyboard;->resize(II)V Landroid/inputmethodservice/KeyboardView;->mKeyBackground:Landroid/graphics/drawable/Drawable; Landroid/inputmethodservice/KeyboardView;->mLabelTextSize:I Landroid/inputmethodservice/KeyboardView;->mPreviewText:Landroid/widget/TextView; @@ -3056,6 +3121,7 @@ Landroid/location/ILocationListener;->onStatusChanged(Ljava/lang/String;ILandroi Landroid/location/ILocationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/location/ILocationManager$Stub;-><init>()V Landroid/location/ILocationManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/location/ILocationManager; +Landroid/location/ILocationManager$Stub;->TRANSACTION_getAllProviders:I Landroid/location/ILocationManager;->getAllProviders()Ljava/util/List; Landroid/location/ILocationManager;->getNetworkProviderPackage()Ljava/lang/String; Landroid/location/ILocationManager;->reportLocation(Landroid/location/Location;Z)V @@ -3118,6 +3184,7 @@ Landroid/media/AudioGainConfig;->mRampDurationMs:I Landroid/media/AudioGainConfig;->mValues:[I Landroid/media/AudioHandle;-><init>(I)V Landroid/media/AudioHandle;->mId:I +Landroid/media/AudioManager;-><init>()V Landroid/media/AudioManager;-><init>(Landroid/content/Context;)V Landroid/media/AudioManager;->abandonAudioFocusForCall()V Landroid/media/AudioManager;->createAudioPatch([Landroid/media/AudioPatch;[Landroid/media/AudioPortConfig;[Landroid/media/AudioPortConfig;)I @@ -3378,6 +3445,9 @@ Landroid/media/MediaMetadataRetriever;->native_setup()V Landroid/media/MediaMuxer;->mCloseGuard:Ldalvik/system/CloseGuard; Landroid/media/MediaMuxer;->mNativeObject:J Landroid/media/MediaMuxer;->mState:I +Landroid/media/MediaMuxer;->MUXER_STATE_STARTED:I +Landroid/media/MediaMuxer;->MUXER_STATE_STOPPED:I +Landroid/media/MediaMuxer;->MUXER_STATE_UNINITIALIZED:I Landroid/media/MediaMuxer;->nativeRelease(J)V Landroid/media/MediaMuxer;->nativeSetup(Ljava/io/FileDescriptor;I)J Landroid/media/MediaPlayer$TrackInfo;->CREATOR:Landroid/os/Parcelable$Creator; @@ -3388,6 +3458,8 @@ Landroid/media/MediaPlayer;->BYPASS_METADATA_FILTER:Z Landroid/media/MediaPlayer;->getMediaTimeProvider()Landroid/media/MediaTimeProvider; Landroid/media/MediaPlayer;->getMetadata(ZZ)Landroid/media/Metadata; Landroid/media/MediaPlayer;->invoke(Landroid/os/Parcel;Landroid/os/Parcel;)V +Landroid/media/MediaPlayer;->MEDIA_INFO_EXTERNAL_METADATA_UPDATE:I +Landroid/media/MediaPlayer;->MEDIA_INFO_TIMED_TEXT_ERROR:I Landroid/media/MediaPlayer;->METADATA_ALL:Z Landroid/media/MediaPlayer;->mEventHandler:Landroid/media/MediaPlayer$EventHandler; Landroid/media/MediaPlayer;->mOnCompletionListener:Landroid/media/MediaPlayer$OnCompletionListener; @@ -3772,6 +3844,7 @@ Landroid/net/INetworkStatsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/INetworkStatsService$Stub$Proxy;->getMobileIfaces()[Ljava/lang/String; Landroid/net/INetworkStatsService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/INetworkStatsService; Landroid/net/INetworkStatsService;->forceUpdate()V +Landroid/net/INetworkStatsService;->getDataLayerSnapshotForUid(I)Landroid/net/NetworkStats; Landroid/net/INetworkStatsService;->getMobileIfaces()[Ljava/lang/String; Landroid/net/INetworkStatsService;->openSession()Landroid/net/INetworkStatsSession; Landroid/net/INetworkStatsService;->openSessionForUsageStats(ILjava/lang/String;)Landroid/net/INetworkStatsSession; @@ -3818,6 +3891,7 @@ Landroid/net/LinkProperties;->getAllLinkAddresses()Ljava/util/List; Landroid/net/LinkProperties;->getAllRoutes()Ljava/util/List; Landroid/net/LinkProperties;->getMtu()I Landroid/net/LinkProperties;->getStackedLinks()Ljava/util/List; +Landroid/net/LinkProperties;->getTcpBufferSizes()Ljava/lang/String; Landroid/net/LinkProperties;->hasGlobalIPv6Address()Z Landroid/net/LinkProperties;->hasIPv4Address()Z Landroid/net/LinkProperties;->hasIPv4DefaultRoute()Z @@ -4139,6 +4213,7 @@ Landroid/net/wifi/BatchedScanResult;->truncated:Z Landroid/net/wifi/IWifiManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/net/wifi/IWifiManager$Stub;-><init>()V Landroid/net/wifi/IWifiManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/net/wifi/IWifiManager; +Landroid/net/wifi/IWifiManager$Stub;->TRANSACTION_getScanResults:I Landroid/net/wifi/IWifiManager;->getCurrentNetwork()Landroid/net/Network; Landroid/net/wifi/IWifiManager;->getWifiApConfiguration()Landroid/net/wifi/WifiConfiguration; Landroid/net/wifi/IWifiManager;->getWifiApEnabledState()I @@ -4329,9 +4404,11 @@ Landroid/nfc/cardemulation/ApduServiceInfo;->mService:Landroid/content/pm/Resolv Landroid/nfc/cardemulation/ApduServiceInfo;->mStaticAidGroups:Ljava/util/HashMap; Landroid/nfc/cardemulation/ApduServiceInfo;->requiresUnlock()Z Landroid/nfc/ErrorCodes;->isError(I)Z +Landroid/nfc/INfcAdapter$Stub;->TRANSACTION_enable:I Landroid/nfc/INfcAdapterExtras;->authenticate(Ljava/lang/String;[B)V Landroid/nfc/INfcAdapterExtras;->close(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle; Landroid/nfc/INfcAdapterExtras;->getCardEmulationRoute(Ljava/lang/String;)I +Landroid/nfc/INfcAdapterExtras;->getDriverName(Ljava/lang/String;)Ljava/lang/String; Landroid/nfc/INfcAdapterExtras;->open(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle; Landroid/nfc/INfcAdapterExtras;->setCardEmulationRoute(Ljava/lang/String;I)V Landroid/nfc/INfcAdapterExtras;->transceive(Ljava/lang/String;[B)Landroid/os/Bundle; @@ -4369,6 +4446,7 @@ Landroid/os/AsyncTask;->mTaskInvoked:Ljava/util/concurrent/atomic/AtomicBoolean; Landroid/os/AsyncTask;->mWorker:Landroid/os/AsyncTask$WorkerRunnable; Landroid/os/AsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor; Landroid/os/AsyncTask;->setDefaultExecutor(Ljava/util/concurrent/Executor;)V +Landroid/os/BaseBundle;->isParcelled()Z Landroid/os/BaseBundle;->mMap:Landroid/util/ArrayMap; Landroid/os/BaseBundle;->mParcelledData:Landroid/os/Parcel; Landroid/os/BaseBundle;->unparcel()V @@ -4399,6 +4477,7 @@ Landroid/os/BatteryStats$Timer;-><init>()V Landroid/os/BatteryStats$Timer;->getCountLocked(I)I Landroid/os/BatteryStats$Timer;->getTotalTimeLocked(JI)J Landroid/os/BatteryStats$Uid$Pkg$Serv;->getLaunches(I)I +Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStarts(I)I Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStartTime(JI)J Landroid/os/BatteryStats$Uid$Pkg;-><init>()V Landroid/os/BatteryStats$Uid$Pkg;->getServiceStats()Landroid/util/ArrayMap; @@ -4436,13 +4515,21 @@ Landroid/os/BatteryStats$Uid;->getWifiMulticastTime(JI)J Landroid/os/BatteryStats$Uid;->getWifiRunningTime(JI)J Landroid/os/BatteryStats$Uid;->getWifiScanTime(JI)J Landroid/os/BatteryStats;-><init>()V +Landroid/os/BatteryStats;->computeBatteryRealtime(JI)J Landroid/os/BatteryStats;->computeBatteryTimeRemaining(J)J Landroid/os/BatteryStats;->computeBatteryUptime(JI)J Landroid/os/BatteryStats;->computeChargeTimeRemaining(J)J +Landroid/os/BatteryStats;->getBatteryUptime(J)J +Landroid/os/BatteryStats;->getGlobalWifiRunningTime(JI)J Landroid/os/BatteryStats;->getMobileRadioActiveTime(JI)J Landroid/os/BatteryStats;->getNetworkActivityBytes(II)J Landroid/os/BatteryStats;->getNextHistoryLocked(Landroid/os/BatteryStats$HistoryItem;)Z +Landroid/os/BatteryStats;->getPhoneOnTime(JI)J +Landroid/os/BatteryStats;->getPhoneSignalStrengthTime(IJI)J +Landroid/os/BatteryStats;->getScreenBrightnessTime(IJI)J +Landroid/os/BatteryStats;->getScreenOnTime(JI)J Landroid/os/BatteryStats;->getUidStats()Landroid/util/SparseArray; +Landroid/os/BatteryStats;->getWifiOnTime(JI)J Landroid/os/BatteryStats;->NUM_DATA_CONNECTION_TYPES:I Landroid/os/BatteryStats;->NUM_SCREEN_BRIGHTNESS_BINS:I Landroid/os/BatteryStats;->startIteratingHistoryLocked()Z @@ -4613,6 +4700,7 @@ Landroid/os/IPowerManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Landroid/os/IPowerManager$Stub$Proxy;->isLightDeviceIdleMode()Z Landroid/os/IPowerManager$Stub;-><init>()V Landroid/os/IPowerManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPowerManager; +Landroid/os/IPowerManager$Stub;->TRANSACTION_acquireWakeLock:I Landroid/os/IPowerManager$Stub;->TRANSACTION_goToSleep:I Landroid/os/IPowerManager;->goToSleep(JII)V Landroid/os/IPowerManager;->isInteractive()Z @@ -4786,6 +4874,7 @@ Landroid/os/SELinux;->isSELinuxEnforced()Z Landroid/os/SELinux;->restoreconRecursive(Ljava/io/File;)Z Landroid/os/ServiceManager;-><init>()V Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;)V +Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;Z)V Landroid/os/ServiceManager;->addService(Ljava/lang/String;Landroid/os/IBinder;ZI)V Landroid/os/ServiceManager;->checkService(Ljava/lang/String;)Landroid/os/IBinder; Landroid/os/ServiceManager;->getIServiceManager()Landroid/os/IServiceManager; @@ -4881,6 +4970,7 @@ Landroid/os/storage/VolumeInfo;->getDiskId()Ljava/lang/String; Landroid/os/storage/VolumeInfo;->getEnvironmentForState(I)Ljava/lang/String; Landroid/os/storage/VolumeInfo;->getFsUuid()Ljava/lang/String; Landroid/os/storage/VolumeInfo;->getId()Ljava/lang/String; +Landroid/os/storage/VolumeInfo;->getInternalPath()Ljava/io/File; Landroid/os/storage/VolumeInfo;->getInternalPathForUser(I)Ljava/io/File; Landroid/os/storage/VolumeInfo;->getMountUserId()I Landroid/os/storage/VolumeInfo;->getPath()Ljava/io/File; @@ -4918,6 +5008,7 @@ Landroid/os/StrictMode;->onWebViewMethodCalledOnWrongThread(Ljava/lang/Throwable Landroid/os/StrictMode;->sLastVmViolationTime:Ljava/util/HashMap; Landroid/os/StrictMode;->sWindowManager:Landroid/util/Singleton; Landroid/os/StrictMode;->violationsBeingTimed:Ljava/lang/ThreadLocal; +Landroid/os/SystemClock;-><init>()V Landroid/os/SystemClock;->currentThreadTimeMicro()J Landroid/os/SystemClock;->currentTimeMicro()J Landroid/os/SystemClock;->elapsedRealtimeClock()Ljava/time/Clock; @@ -5017,6 +5108,7 @@ Landroid/os/UserManager;->getUserUnlockRealtime()J Landroid/os/UserManager;->hasBaseUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z Landroid/os/UserManager;->isAdminUser()Z +Landroid/os/UserManager;->isDeviceInDemoMode(Landroid/content/Context;)Z Landroid/os/UserManager;->isGuestUser(I)Z Landroid/os/UserManager;->isLinkedUser()Z Landroid/os/UserManager;->isUserAdmin(I)Z @@ -5295,6 +5387,7 @@ Landroid/provider/Settings$Global;->HEADS_UP_NOTIFICATIONS_ENABLED:Ljava/lang/St Landroid/provider/Settings$Global;->HEADS_UP_OFF:I Landroid/provider/Settings$Global;->HEADS_UP_ON:I Landroid/provider/Settings$Global;->MOBILE_DATA:Ljava/lang/String; +Landroid/provider/Settings$Global;->MOVED_TO_SECURE:Ljava/util/HashSet; Landroid/provider/Settings$Global;->MULTI_SIM_USER_PREFERRED_SUBS:[Ljava/lang/String; Landroid/provider/Settings$Global;->MULTI_SIM_VOICE_PROMPT:Ljava/lang/String; Landroid/provider/Settings$Global;->NETWORK_SCORER_APP:Ljava/lang/String; @@ -5313,6 +5406,7 @@ Landroid/provider/Settings$Global;->ZEN_MODE_CONFIG_ETAG:Ljava/lang/String; Landroid/provider/Settings$Global;->ZEN_MODE_IMPORTANT_INTERRUPTIONS:I Landroid/provider/Settings$Global;->ZEN_MODE_NO_INTERRUPTIONS:I Landroid/provider/Settings$Global;->ZEN_MODE_OFF:I +Landroid/provider/Settings$NameValueCache;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String; Landroid/provider/Settings$NameValueCache;->mProviderHolder:Landroid/provider/Settings$ContentProviderHolder; Landroid/provider/Settings$Secure;->ACCESSIBILITY_AUTOCLICK_ENABLED:Ljava/lang/String; Landroid/provider/Settings$Secure;->ACCESSIBILITY_CAPTIONING_TYPEFACE:Ljava/lang/String; @@ -5339,6 +5433,8 @@ Landroid/provider/Settings$Secure;->LOCK_SCREEN_LOCK_AFTER_TIMEOUT:Ljava/lang/St Landroid/provider/Settings$Secure;->LOCK_SCREEN_OWNER_INFO_ENABLED:Ljava/lang/String; Landroid/provider/Settings$Secure;->LOCK_SCREEN_SHOW_NOTIFICATIONS:Ljava/lang/String; Landroid/provider/Settings$Secure;->LONG_PRESS_TIMEOUT:Ljava/lang/String; +Landroid/provider/Settings$Secure;->MOVED_TO_GLOBAL:Ljava/util/HashSet; +Landroid/provider/Settings$Secure;->MOVED_TO_LOCK_SETTINGS:Ljava/util/HashSet; Landroid/provider/Settings$Secure;->NFC_PAYMENT_DEFAULT_COMPONENT:Ljava/lang/String; Landroid/provider/Settings$Secure;->PACKAGE_VERIFIER_USER_CONSENT:Ljava/lang/String; Landroid/provider/Settings$Secure;->putIntForUser(Landroid/content/ContentResolver;Ljava/lang/String;II)Z @@ -5350,11 +5446,13 @@ Landroid/provider/Settings$Secure;->SELECTED_SPELL_CHECKER_SUBTYPE:Ljava/lang/St Landroid/provider/Settings$Secure;->SETTINGS_TO_BACKUP:[Ljava/lang/String; Landroid/provider/Settings$Secure;->SMS_DEFAULT_APPLICATION:Ljava/lang/String; Landroid/provider/Settings$Secure;->sNameValueCache:Landroid/provider/Settings$NameValueCache; +Landroid/provider/Settings$Secure;->sProviderHolder:Landroid/provider/Settings$ContentProviderHolder; Landroid/provider/Settings$Secure;->VOICE_RECOGNITION_SERVICE:Ljava/lang/String; Landroid/provider/Settings$System;->AIRPLANE_MODE_TOGGLEABLE_RADIOS:Ljava/lang/String; Landroid/provider/Settings$System;->APPEND_FOR_LAST_AUDIBLE:Ljava/lang/String; Landroid/provider/Settings$System;->CAR_DOCK_SOUND:Ljava/lang/String; Landroid/provider/Settings$System;->CAR_UNDOCK_SOUND:Ljava/lang/String; +Landroid/provider/Settings$System;->CLONE_TO_MANAGED_PROFILE:Ljava/util/Set; Landroid/provider/Settings$System;->DESK_DOCK_SOUND:Ljava/lang/String; Landroid/provider/Settings$System;->DESK_UNDOCK_SOUND:Ljava/lang/String; Landroid/provider/Settings$System;->DOCK_SOUNDS_ENABLED:Ljava/lang/String; @@ -5366,6 +5464,9 @@ Landroid/provider/Settings$System;->HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY: Landroid/provider/Settings$System;->LOCKSCREEN_SOUNDS_ENABLED:Ljava/lang/String; Landroid/provider/Settings$System;->LOCK_SOUND:Ljava/lang/String; Landroid/provider/Settings$System;->MASTER_MONO:Ljava/lang/String; +Landroid/provider/Settings$System;->MOVED_TO_GLOBAL:Ljava/util/HashSet; +Landroid/provider/Settings$System;->MOVED_TO_SECURE:Ljava/util/HashSet; +Landroid/provider/Settings$System;->MOVED_TO_SECURE_THEN_GLOBAL:Ljava/util/HashSet; Landroid/provider/Settings$System;->NOTIFICATION_LIGHT_PULSE:Ljava/lang/String; Landroid/provider/Settings$System;->POINTER_LOCATION:Ljava/lang/String; Landroid/provider/Settings$System;->POINTER_SPEED:Ljava/lang/String; @@ -5380,6 +5481,7 @@ Landroid/provider/Settings$System;->sNameValueCache:Landroid/provider/Settings$N Landroid/provider/Settings$System;->sProviderHolder:Landroid/provider/Settings$ContentProviderHolder; Landroid/provider/Settings$System;->TTY_MODE:Ljava/lang/String; Landroid/provider/Settings$System;->UNLOCK_SOUND:Ljava/lang/String; +Landroid/provider/Settings$System;->VALIDATORS:Ljava/util/Map; Landroid/provider/Settings$System;->VIBRATE_IN_SILENT:Ljava/lang/String; Landroid/provider/Settings$System;->VOLUME_ALARM:Ljava/lang/String; Landroid/provider/Settings$System;->VOLUME_BLUETOOTH_SCO:Ljava/lang/String; @@ -5937,6 +6039,7 @@ Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBin Landroid/service/wallpaper/WallpaperService$Engine;->mPendingXOffset:F Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V Landroid/service/wallpaper/WallpaperService;->MSG_WINDOW_RESIZED:I +Landroid/speech/IRecognitionListener;->onEvent(ILandroid/os/Bundle;)V Landroid/speech/tts/TextToSpeech;->getCurrentEngine()Ljava/lang/String; Landroid/speech/tts/TextToSpeech;->mConnectingServiceConnection:Landroid/speech/tts/TextToSpeech$Connection; Landroid/speech/tts/TextToSpeech;->mCurrentEngine:Ljava/lang/String; @@ -6178,6 +6281,7 @@ Landroid/telephony/PhoneNumberUtils;->ttsSpanAsPhoneNumber(Ljava/lang/CharSequen Landroid/telephony/PhoneStateListener;-><init>(Landroid/os/Looper;)V Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;)V Landroid/telephony/PhoneStateListener;-><init>(Ljava/lang/Integer;Landroid/os/Looper;)V +Landroid/telephony/PhoneStateListener;->callback:Lcom/android/internal/telephony/IPhoneStateListener; Landroid/telephony/PhoneStateListener;->LISTEN_PRECISE_CALL_STATE:I Landroid/telephony/PhoneStateListener;->mSubId:Ljava/lang/Integer; Landroid/telephony/PhoneStateListener;->onDataConnectionRealTimeInfoChanged(Landroid/telephony/DataConnectionRealTimeInfo;)V @@ -6249,6 +6353,7 @@ Landroid/telephony/ServiceState;->mCdmaRoamingIndicator:I Landroid/telephony/ServiceState;->mCssIndicator:Z Landroid/telephony/ServiceState;->mergeServiceStates(Landroid/telephony/ServiceState;Landroid/telephony/ServiceState;)Landroid/telephony/ServiceState; Landroid/telephony/ServiceState;->mIsManualNetworkSelection:Z +Landroid/telephony/ServiceState;->mIsUsingCarrierAggregation:Z Landroid/telephony/ServiceState;->mNetworkId:I Landroid/telephony/ServiceState;->mSystemId:I Landroid/telephony/ServiceState;->newFromBundle(Landroid/os/Bundle;)Landroid/telephony/ServiceState; @@ -6338,6 +6443,7 @@ Landroid/telephony/SmsMessage;->mWrappedSmsMessage:Lcom/android/internal/telepho Landroid/telephony/SmsMessage;->setSubId(I)V Landroid/telephony/SmsMessage;->useCdmaFormatForMoSms()Z Landroid/telephony/SmsMessage;->useCdmaFormatForMoSms(I)Z +Landroid/telephony/SubscriptionInfo;->getNameSource()I Landroid/telephony/SubscriptionInfo;->setDisplayName(Ljava/lang/CharSequence;)V Landroid/telephony/SubscriptionInfo;->setIconTint(I)V Landroid/telephony/SubscriptionManager;-><init>(Landroid/content/Context;)V @@ -6377,6 +6483,7 @@ Landroid/telephony/TelephonyManager$MultiSimVariants;->UNKNOWN:Landroid/telephon Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants; Landroid/telephony/TelephonyManager;-><init>()V Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;)V +Landroid/telephony/TelephonyManager;-><init>(Landroid/content/Context;I)V Landroid/telephony/TelephonyManager;->ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED:Ljava/lang/String; Landroid/telephony/TelephonyManager;->from(Landroid/content/Context;)Landroid/telephony/TelephonyManager; Landroid/telephony/TelephonyManager;->getCallState(I)I @@ -6390,6 +6497,8 @@ Landroid/telephony/TelephonyManager;->getDefault()Landroid/telephony/TelephonyMa Landroid/telephony/TelephonyManager;->getDeviceSoftwareVersion(I)Ljava/lang/String; Landroid/telephony/TelephonyManager;->getGroupIdLevel1(I)Ljava/lang/String; Landroid/telephony/TelephonyManager;->getIccAuthentication(IIILjava/lang/String;)Ljava/lang/String; +Landroid/telephony/TelephonyManager;->getImsConfig(II)Landroid/telephony/ims/aidl/IImsConfig; +Landroid/telephony/TelephonyManager;->getImsRegistration(II)Landroid/telephony/ims/aidl/IImsRegistration; Landroid/telephony/TelephonyManager;->getIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;I)I Landroid/telephony/TelephonyManager;->getIsimDomain()Ljava/lang/String; Landroid/telephony/TelephonyManager;->getIsimImpi()Ljava/lang/String; @@ -6486,6 +6595,14 @@ Landroid/text/DynamicLayout;->getIndexFirstChangedBlock()I Landroid/text/DynamicLayout;->getNumberOfBlocks()I Landroid/text/DynamicLayout;->setIndexFirstChangedBlock(I)V Landroid/text/DynamicLayout;->sStaticLayout:Landroid/text/StaticLayout; +Landroid/text/FontConfig$Family;->getFonts()[Landroid/text/FontConfig$Font; +Landroid/text/FontConfig$Family;->getName()Ljava/lang/String; +Landroid/text/FontConfig$Family;->getVariant()I +Landroid/text/FontConfig$Font;->getAxes()[Landroid/graphics/fonts/FontVariationAxis; +Landroid/text/FontConfig$Font;->getTtcIndex()I +Landroid/text/FontConfig$Font;->getWeight()I +Landroid/text/FontConfig$Font;->isItalic()Z +Landroid/text/FontConfig;->getFamilies()[Landroid/text/FontConfig$Family; Landroid/text/format/DateFormat;->AM_PM:C Landroid/text/format/DateFormat;->CAPITAL_AM_PM:C Landroid/text/format/DateFormat;->DATE:C @@ -6650,6 +6767,7 @@ Landroid/transition/Scene;->mExitAction:Ljava/lang/Runnable; Landroid/transition/Scene;->setCurrentScene(Landroid/view/View;Landroid/transition/Scene;)V Landroid/transition/Transition;->cancel()V Landroid/transition/Transition;->end()V +Landroid/transition/Transition;->getRunningAnimators()Landroid/util/ArrayMap; Landroid/transition/TransitionManager;->getRunningTransitions()Landroid/util/ArrayMap; Landroid/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList; Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal; @@ -6719,6 +6837,7 @@ Landroid/util/MathUtils;->constrain(FFF)F Landroid/util/MathUtils;->constrain(III)I Landroid/util/MathUtils;->lerp(FFF)F Landroid/util/MathUtils;->max(II)F +Landroid/util/NtpTrustedTime;->currentTimeMillis()J Landroid/util/NtpTrustedTime;->forceRefresh()Z Landroid/util/NtpTrustedTime;->getCachedNtpTime()J Landroid/util/NtpTrustedTime;->getCachedNtpTimeReference()J @@ -6830,6 +6949,7 @@ Landroid/view/animation/TranslateAnimation;->mToYValue:F Landroid/view/animation/TranslateYAnimation;-><init>(IFIF)V Landroid/view/AppTransitionAnimationSpec;-><init>(ILandroid/graphics/GraphicBuffer;Landroid/graphics/Rect;)V Landroid/view/autofill/IAutoFillManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V +Landroid/view/autofill/IAutoFillManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/view/autofill/IAutoFillManager; Landroid/view/BatchedInputEventReceiver;-><init>(Landroid/view/InputChannel;Landroid/os/Looper;Landroid/view/Choreographer;)V Landroid/view/Choreographer$CallbackQueue;->addCallbackLocked(JLjava/lang/Object;Ljava/lang/Object;)V Landroid/view/Choreographer$CallbackRecord;->run(J)V @@ -6933,6 +7053,7 @@ Landroid/view/inputmethod/InputMethodManager;->getInputMethodWindowVisibleHeight Landroid/view/inputmethod/InputMethodManager;->getInstance()Landroid/view/inputmethod/InputMethodManager; Landroid/view/inputmethod/InputMethodManager;->isCursorAnchorInfoEnabled()Z Landroid/view/inputmethod/InputMethodManager;->mCurId:Ljava/lang/String; +Landroid/view/inputmethod/InputMethodManager;->mCurMethod:Lcom/android/internal/view/IInputMethodSession; Landroid/view/inputmethod/InputMethodManager;->mCurRootView:Landroid/view/View; Landroid/view/inputmethod/InputMethodManager;->mCursorRect:Landroid/graphics/Rect; Landroid/view/inputmethod/InputMethodManager;->mH:Landroid/view/inputmethod/InputMethodManager$H; @@ -7170,6 +7291,7 @@ Landroid/view/SurfaceControl;->getDisplayConfigs(Landroid/os/IBinder;)[Landroid/ Landroid/view/SurfaceControl;->HIDDEN:I Landroid/view/SurfaceControl;->hide()V Landroid/view/SurfaceControl;->openTransaction()V +Landroid/view/SurfaceControl;->screenshot(Landroid/graphics/Rect;III)Landroid/graphics/Bitmap; Landroid/view/SurfaceControl;->screenshot(Landroid/graphics/Rect;IIIIZI)Landroid/graphics/Bitmap; Landroid/view/SurfaceControl;->screenshot(Landroid/os/IBinder;Landroid/view/Surface;Landroid/graphics/Rect;IIIIZZ)V Landroid/view/SurfaceControl;->setDisplayLayerStack(Landroid/os/IBinder;I)V @@ -7451,6 +7573,7 @@ Landroid/view/ViewGroup$LayoutParams;-><init>()V Landroid/view/ViewGroup$MarginLayoutParams;->endMargin:I Landroid/view/ViewGroup$MarginLayoutParams;->setMarginsRelative(IIII)V Landroid/view/ViewGroup$MarginLayoutParams;->startMargin:I +Landroid/view/ViewGroup$TouchTarget;-><init>()V Landroid/view/ViewGroup$TouchTarget;->child:Landroid/view/View; Landroid/view/ViewGroup;->addTransientView(Landroid/view/View;I)V Landroid/view/ViewGroup;->cancelTouchTarget(Landroid/view/View;)V @@ -7529,6 +7652,7 @@ Landroid/view/ViewRootImpl;->mWidth:I Landroid/view/ViewRootImpl;->mWindowSession:Landroid/view/IWindowSession; Landroid/view/ViewRootImpl;->scheduleTraversals()V Landroid/view/ViewRootImpl;->setLocalDragState(Ljava/lang/Object;)V +Landroid/view/ViewRootImpl;->sRunQueues:Ljava/lang/ThreadLocal; Landroid/view/ViewTreeObserver$InternalInsetsInfo;-><init>()V Landroid/view/ViewTreeObserver$InternalInsetsInfo;->contentInsets:Landroid/graphics/Rect; Landroid/view/ViewTreeObserver$InternalInsetsInfo;->mTouchableInsets:I @@ -7550,6 +7674,7 @@ Landroid/view/ViewTreeObserver;->mOnTouchModeChangeListeners:Ljava/util/concurre Landroid/view/ViewTreeObserver;->removeOnComputeInternalInsetsListener(Landroid/view/ViewTreeObserver$OnComputeInternalInsetsListener;)V Landroid/view/Window;->addPrivateFlags(I)V Landroid/view/Window;->alwaysReadCloseOnTouchAttr()V +Landroid/view/Window;->FEATURE_MAX:I Landroid/view/Window;->isDestroyed()Z Landroid/view/Window;->mAppName:Ljava/lang/String; Landroid/view/Window;->mAppToken:Landroid/os/IBinder; @@ -7767,6 +7892,7 @@ Landroid/widget/AbsListView;->resurrectSelectionIfNeeded()Z Landroid/widget/AbsListView;->smoothScrollBy(IIZZ)V Landroid/widget/AbsListView;->trackMotionScroll(II)Z Landroid/widget/AbsListView;->updateSelectorState()V +Landroid/widget/AbsSeekBar;->drawThumb(Landroid/graphics/Canvas;)V Landroid/widget/AbsSeekBar;->mDisabledAlpha:F Landroid/widget/AbsSeekBar;->mIsDragging:Z Landroid/widget/AbsSeekBar;->mIsUserSeekable:Z @@ -7908,6 +8034,7 @@ Landroid/widget/Gallery;->mSelectedChild:Landroid/view/View; Landroid/widget/Gallery;->mSpacing:I Landroid/widget/Gallery;->trackMotionScroll(I)V Landroid/widget/GridLayout;->UNDEFINED_ALIGNMENT:Landroid/widget/GridLayout$Alignment; +Landroid/widget/GridView;->determineColumns(I)Z Landroid/widget/GridView;->fillDown(II)Landroid/view/View; Landroid/widget/GridView;->fillUp(II)Landroid/view/View; Landroid/widget/GridView;->mColumnWidth:I @@ -7975,6 +8102,7 @@ Landroid/widget/ListView;->fillUp(II)Landroid/view/View; Landroid/widget/ListView;->findViewTraversal(I)Landroid/view/View; Landroid/widget/ListView;->findViewWithTagTraversal(Ljava/lang/Object;)Landroid/view/View; Landroid/widget/ListView;->getHeightForPosition(I)I +Landroid/widget/ListView;->isDirectChildHeaderOrFooter(Landroid/view/View;)Z Landroid/widget/ListView;->lookForSelectablePosition(IZ)I Landroid/widget/ListView;->makeAndAddView(IIZIZ)Landroid/view/View; Landroid/widget/ListView;->mAreAllItemsSelectable:Z @@ -8120,6 +8248,7 @@ Landroid/widget/RemoteViewsAdapter;->mWorkerThread:Landroid/os/HandlerThread; Landroid/widget/RemoteViewsAdapter;->saveRemoteViewsCache()V Landroid/widget/RemoteViewsAdapter;->setRemoteViewsOnClickHandler(Landroid/widget/RemoteViews$OnClickHandler;)V Landroid/widget/RemoteViewsAdapter;->setVisibleRangeHint(II)V +Landroid/widget/ScrollBarDrawable;-><init>()V Landroid/widget/ScrollBarDrawable;->mVerticalThumb:Landroid/graphics/drawable/Drawable; Landroid/widget/ScrollBarDrawable;->setHorizontalThumbDrawable(Landroid/graphics/drawable/Drawable;)V Landroid/widget/ScrollBarDrawable;->setVerticalThumbDrawable(Landroid/graphics/drawable/Drawable;)V @@ -8209,6 +8338,7 @@ Landroid/widget/TextClock;->onTimeChanged()V Landroid/widget/TextView$SavedState;->text:Ljava/lang/CharSequence; Landroid/widget/TextView;->assumeLayout()V Landroid/widget/TextView;->bringTextIntoView()Z +Landroid/widget/TextView;->canPaste()Z Landroid/widget/TextView;->checkForRelayout()V Landroid/widget/TextView;->compressText(F)Z Landroid/widget/TextView;->createEditorIfNeeded()V @@ -8223,6 +8353,7 @@ Landroid/widget/TextView;->getTextColors(Landroid/content/Context;Landroid/conte Landroid/widget/TextView;->getTextDirectionHeuristic()Landroid/text/TextDirectionHeuristic; Landroid/widget/TextView;->getTextForAccessibility()Ljava/lang/CharSequence; Landroid/widget/TextView;->getTextServicesLocale(Z)Ljava/util/Locale; +Landroid/widget/TextView;->getTransformedText(II)Ljava/lang/CharSequence; Landroid/widget/TextView;->getUpdatedHighlightPath()Landroid/graphics/Path; Landroid/widget/TextView;->getVerticalOffset(Z)I Landroid/widget/TextView;->isSingleLine()Z @@ -8258,6 +8389,7 @@ Landroid/widget/TextView;->mMaxMode:I Landroid/widget/TextView;->mMaxWidth:I Landroid/widget/TextView;->mMaxWidthMode:I Landroid/widget/TextView;->mMinimum:I +Landroid/widget/TextView;->mMinMode:I Landroid/widget/TextView;->mMinWidth:I Landroid/widget/TextView;->mMinWidthMode:I Landroid/widget/TextView;->mOldMaximum:I @@ -8288,6 +8420,7 @@ Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;Landroid/widget/TextV Landroid/widget/TextView;->startMarquee()V Landroid/widget/TextView;->startStopMarquee(Z)V Landroid/widget/TextView;->stopTextActionMode()V +Landroid/widget/TextView;->updateTextServicesLocaleLocked()V Landroid/widget/TextView;->viewportToContentVerticalOffset()I Landroid/widget/TimePicker;->mDelegate:Landroid/widget/TimePicker$TimePickerDelegate; Landroid/widget/Toast$TN;->handleHide()V @@ -8613,6 +8746,7 @@ Lcom/android/internal/app/AlertController;->setIcon(Landroid/graphics/drawable/D Lcom/android/internal/app/AlertController;->setMessage(Ljava/lang/CharSequence;)V Lcom/android/internal/app/AlertController;->setTitle(Ljava/lang/CharSequence;)V Lcom/android/internal/app/AlertController;->setView(Landroid/view/View;)V +Lcom/android/internal/app/IAppOpsCallback$Stub;-><init>()V Lcom/android/internal/app/IAppOpsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->checkOperation(IILjava/lang/String;)I Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->setMode(IILjava/lang/String;I)V @@ -8672,6 +8806,7 @@ Lcom/android/internal/appwidget/IAppWidgetService$Stub;->TRANSACTION_bindAppWidg Lcom/android/internal/appwidget/IAppWidgetService;->bindAppWidgetId(Ljava/lang/String;IILandroid/content/ComponentName;Landroid/os/Bundle;)Z Lcom/android/internal/appwidget/IAppWidgetService;->bindRemoteViewsService(Ljava/lang/String;ILandroid/content/Intent;Landroid/app/IApplicationThread;Landroid/os/IBinder;Landroid/app/IServiceConnection;I)Z Lcom/android/internal/appwidget/IAppWidgetService;->getAppWidgetIds(Landroid/content/ComponentName;)[I +Lcom/android/internal/appwidget/IAppWidgetService;->getAppWidgetViews(Ljava/lang/String;I)Landroid/widget/RemoteViews; Lcom/android/internal/backup/IBackupTransport$Stub;-><init>()V Lcom/android/internal/backup/IBackupTransport$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/backup/IBackupTransport; Lcom/android/internal/backup/IBackupTransport;->clearBackupData(Landroid/content/pm/PackageInfo;)I @@ -8914,6 +9049,9 @@ Lcom/android/internal/R$attr;->switchStyle:I Lcom/android/internal/R$attr;->text:I Lcom/android/internal/R$attr;->title:I Lcom/android/internal/R$attr;->webViewStyle:I +Lcom/android/internal/R$bool;-><init>()V +Lcom/android/internal/R$bool;->config_automatic_brightness_available:I +Lcom/android/internal/R$bool;->config_intrusiveNotificationLed:I Lcom/android/internal/R$bool;->config_mms_content_disposition_support:I Lcom/android/internal/R$bool;->config_showNavigationBar:I Lcom/android/internal/R$dimen;-><init>()V @@ -9339,6 +9477,8 @@ Lcom/android/internal/R$styleable;->WallpaperPreviewInfo:[I Lcom/android/internal/R$styleable;->Window:[I Lcom/android/internal/R$styleable;->WindowAnimation:[I Lcom/android/internal/R$styleable;->Window_windowActionBarFullscreenDecorLayout:I +Lcom/android/internal/R$styleable;->Window_windowBackground:I +Lcom/android/internal/R$styleable;->Window_windowFullscreen:I Lcom/android/internal/R$styleable;->Window_windowIsFloating:I Lcom/android/internal/R$styleable;->Window_windowIsTranslucent:I Lcom/android/internal/R$styleable;->Window_windowShowWallpaper:I @@ -9410,14 +9550,17 @@ Lcom/android/internal/telephony/IPhoneStateListener;->onServiceStateChanged(Land Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthChanged(I)V Lcom/android/internal/telephony/IPhoneStateListener;->onSignalStrengthsChanged(Landroid/telephony/SignalStrength;)V Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V +Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; Lcom/android/internal/telephony/IPhoneSubInfo$Stub;-><init>()V Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneSubInfo; +Lcom/android/internal/telephony/IPhoneSubInfo$Stub;->TRANSACTION_getDeviceId:I Lcom/android/internal/telephony/IPhoneSubInfo;->getIccSerialNumber(Ljava/lang/String;)Ljava/lang/String; Lcom/android/internal/telephony/IPhoneSubInfo;->getSubscriberId(Ljava/lang/String;)Ljava/lang/String; Lcom/android/internal/telephony/ISms$Stub;-><init>()V Lcom/android/internal/telephony/ISms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISms; Lcom/android/internal/telephony/ISub$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/ISub$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISub; +Lcom/android/internal/telephony/ISub;->getActiveSubIdList()[I Lcom/android/internal/telephony/ISub;->getDefaultDataSubId()I Lcom/android/internal/telephony/ISub;->getDefaultSubId()I Lcom/android/internal/telephony/ISub;->setDefaultDataSubId(I)V @@ -9425,11 +9568,13 @@ Lcom/android/internal/telephony/ITelephony$Stub$Proxy;-><init>(Landroid/os/IBind Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->endCall()Z Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->endCallForSubscriber(I)Z Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; +Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->isRadioOn(Ljava/lang/String;)Z Lcom/android/internal/telephony/ITelephony$Stub$Proxy;->mRemote:Landroid/os/IBinder; Lcom/android/internal/telephony/ITelephony$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephony; Lcom/android/internal/telephony/ITelephony$Stub;->DESCRIPTOR:Ljava/lang/String; Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_answerRingingCall:I Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_call:I +Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_dial:I Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_endCall:I Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_getDeviceId:I Lcom/android/internal/telephony/ITelephony;->answerRingingCall()V @@ -9608,6 +9753,8 @@ Lcom/android/internal/view/menu/MenuBuilder;->addMenuPresenter(Lcom/android/inte Lcom/android/internal/view/menu/MenuBuilder;->addMenuPresenter(Lcom/android/internal/view/menu/MenuPresenter;Landroid/content/Context;)V Lcom/android/internal/view/menu/MenuBuilder;->collapseItemActionView(Lcom/android/internal/view/menu/MenuItemImpl;)Z Lcom/android/internal/view/menu/MenuBuilder;->getContext()Landroid/content/Context; +Lcom/android/internal/view/menu/MenuBuilder;->getHeaderIcon()Landroid/graphics/drawable/Drawable; +Lcom/android/internal/view/menu/MenuBuilder;->getHeaderTitle()Ljava/lang/CharSequence; Lcom/android/internal/view/menu/MenuBuilder;->getNonActionItems()Ljava/util/ArrayList; Lcom/android/internal/view/menu/MenuBuilder;->getRootMenu()Lcom/android/internal/view/menu/MenuBuilder; Lcom/android/internal/view/menu/MenuBuilder;->getVisibleItems()Ljava/util/ArrayList; @@ -9625,11 +9772,14 @@ Lcom/android/internal/view/menu/MenuItemImpl;->mIconResId:I Lcom/android/internal/view/menu/MenuItemImpl;->requestsActionButton()Z Lcom/android/internal/view/menu/MenuItemImpl;->requiresActionButton()Z Lcom/android/internal/view/menu/MenuItemImpl;->setActionViewExpanded(Z)V +Lcom/android/internal/view/menu/MenuItemImpl;->setExclusiveCheckable(Z)V Lcom/android/internal/view/menu/MenuItemImpl;->setMenuInfo(Landroid/view/ContextMenu$ContextMenuInfo;)V Lcom/android/internal/view/menu/MenuPopupHelper;-><init>(Landroid/content/Context;Lcom/android/internal/view/menu/MenuBuilder;)V Lcom/android/internal/view/menu/MenuPopupHelper;-><init>(Landroid/content/Context;Lcom/android/internal/view/menu/MenuBuilder;Landroid/view/View;)V Lcom/android/internal/view/menu/MenuPopupHelper;->dismiss()V +Lcom/android/internal/view/menu/MenuPopupHelper;->getPopup()Lcom/android/internal/view/menu/MenuPopup; Lcom/android/internal/view/menu/MenuPopupHelper;->mForceShowIcon:Z +Lcom/android/internal/view/menu/MenuPopupHelper;->setAnchorView(Landroid/view/View;)V Lcom/android/internal/view/menu/MenuPopupHelper;->setForceShowIcon(Z)V Lcom/android/internal/view/menu/MenuPopupHelper;->setGravity(I)V Lcom/android/internal/view/menu/MenuPopupHelper;->show()V @@ -9772,11 +9922,18 @@ Ldalvik/system/BaseDexClassLoader;->addDexPath(Ljava/lang/String;Z)V Ldalvik/system/BaseDexClassLoader;->getLdLibraryPath()Ljava/lang/String; Ldalvik/system/BaseDexClassLoader;->pathList:Ldalvik/system/DexPathList; Ldalvik/system/BlockGuard$BlockGuardPolicyException;-><init>(IILjava/lang/String;)V +Ldalvik/system/BlockGuard$BlockGuardPolicyException;->mMessage:Ljava/lang/String; +Ldalvik/system/BlockGuard$BlockGuardPolicyException;->mPolicyState:I +Ldalvik/system/BlockGuard$BlockGuardPolicyException;->mPolicyViolated:I Ldalvik/system/BlockGuard$Policy;->onNetwork()V Ldalvik/system/BlockGuard$Policy;->onReadFromDisk()V Ldalvik/system/BlockGuard;->getThreadPolicy()Ldalvik/system/BlockGuard$Policy; Ldalvik/system/BlockGuard;->LAX_POLICY:Ldalvik/system/BlockGuard$Policy; Ldalvik/system/BlockGuard;->setThreadPolicy(Ldalvik/system/BlockGuard$Policy;)V +Ldalvik/system/BlockGuard;->threadPolicy:Ljava/lang/ThreadLocal; +Ldalvik/system/CloseGuard$DefaultReporter;-><init>()V +Ldalvik/system/CloseGuard$Reporter;->report(Ljava/lang/String;Ljava/lang/Throwable;)V +Ldalvik/system/CloseGuard;-><init>()V Ldalvik/system/CloseGuard;->close()V Ldalvik/system/CloseGuard;->get()Ldalvik/system/CloseGuard; Ldalvik/system/CloseGuard;->open(Ljava/lang/String;)V @@ -10055,6 +10212,7 @@ Ljava/lang/reflect/Proxy;->invoke(Ljava/lang/reflect/Proxy;Ljava/lang/reflect/Me Ljava/lang/reflect/Proxy;->serialVersionUID:J Ljava/lang/reflect/UndeclaredThrowableException;->serialVersionUID:J Ljava/lang/ReflectiveOperationException;->serialVersionUID:J +Ljava/lang/Runtime;-><init>()V Ljava/lang/Runtime;->load(Ljava/lang/String;Ljava/lang/ClassLoader;)V Ljava/lang/Runtime;->loadLibrary(Ljava/lang/String;Ljava/lang/ClassLoader;)V Ljava/lang/Runtime;->loadLibrary0(Ljava/lang/ClassLoader;Ljava/lang/String;)V @@ -11047,6 +11205,20 @@ Lorg/apache/http/conn/ssl/SSLSocketFactory;->socketfactory:Ljavax/net/ssl/SSLSoc Lorg/apache/http/conn/ssl/SSLSocketFactory;->sslcontext:Ljavax/net/ssl/SSLContext; Lorg/ccil/cowan/tagsoup/AttributesImpl;->data:[Ljava/lang/String; Lorg/ccil/cowan/tagsoup/AttributesImpl;->length:I +Lorg/ccil/cowan/tagsoup/ElementType;->theAtts:Lorg/ccil/cowan/tagsoup/AttributesImpl; +Lorg/ccil/cowan/tagsoup/ElementType;->theFlags:I +Lorg/ccil/cowan/tagsoup/ElementType;->theLocalName:Ljava/lang/String; +Lorg/ccil/cowan/tagsoup/ElementType;->theMemberOf:I +Lorg/ccil/cowan/tagsoup/ElementType;->theModel:I +Lorg/ccil/cowan/tagsoup/ElementType;->theName:Ljava/lang/String; +Lorg/ccil/cowan/tagsoup/ElementType;->theNamespace:Ljava/lang/String; +Lorg/ccil/cowan/tagsoup/ElementType;->theParent:Lorg/ccil/cowan/tagsoup/ElementType; +Lorg/ccil/cowan/tagsoup/ElementType;->theSchema:Lorg/ccil/cowan/tagsoup/Schema; +Lorg/ccil/cowan/tagsoup/Schema;->theElementTypes:Ljava/util/HashMap; +Lorg/ccil/cowan/tagsoup/Schema;->theEntities:Ljava/util/HashMap; +Lorg/ccil/cowan/tagsoup/Schema;->thePrefix:Ljava/lang/String; +Lorg/ccil/cowan/tagsoup/Schema;->theRoot:Lorg/ccil/cowan/tagsoup/ElementType; +Lorg/ccil/cowan/tagsoup/Schema;->theURI:Ljava/lang/String; Lorg/json/JSONArray;->values:Ljava/util/List; Lorg/json/JSONArray;->writeTo(Lorg/json/JSONStringer;)V Lorg/json/JSONObject;->append(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject; @@ -11080,6 +11252,10 @@ Lorg/w3c/dom/ls/LSSerializerFilter;->getWhatToShow()I Lorg/w3c/dom/traversal/NodeFilter;->acceptNode(Lorg/w3c/dom/Node;)S Lorg/w3c/dom/traversal/NodeIterator;->detach()V Lorg/w3c/dom/traversal/NodeIterator;->nextNode()Lorg/w3c/dom/Node; +Lorg/xml/sax/ext/Attributes2Impl;->declared:[Z +Lorg/xml/sax/ext/Attributes2Impl;->specified:[Z +Lorg/xml/sax/ext/Locator2Impl;->encoding:Ljava/lang/String; +Lorg/xml/sax/ext/Locator2Impl;->version:Ljava/lang/String; Lorg/xml/sax/helpers/AttributesImpl;->badIndex(I)V Lorg/xml/sax/helpers/AttributesImpl;->data:[Ljava/lang/String; Lorg/xml/sax/helpers/AttributesImpl;->ensureCapacity(I)V @@ -11092,6 +11268,7 @@ Lorg/xml/sax/helpers/NamespaceSupport;->contextPos:I Lorg/xml/sax/helpers/NamespaceSupport;->contexts:[Lorg/xml/sax/helpers/NamespaceSupport$Context; Lorg/xml/sax/helpers/NamespaceSupport;->currentContext:Lorg/xml/sax/helpers/NamespaceSupport$Context; Lorg/xml/sax/helpers/NamespaceSupport;->EMPTY_ENUMERATION:Ljava/util/Enumeration; +Lorg/xml/sax/helpers/NamespaceSupport;->namespaceDeclUris:Z Lorg/xml/sax/helpers/ParserAdapter;->attAdapter:Lorg/xml/sax/helpers/ParserAdapter$AttributeListAdapter; Lorg/xml/sax/helpers/ParserAdapter;->atts:Lorg/xml/sax/helpers/AttributesImpl; Lorg/xml/sax/helpers/ParserAdapter;->checkNotParsing(Ljava/lang/String;Ljava/lang/String;)V @@ -11111,6 +11288,7 @@ Lorg/xml/sax/helpers/ParserAdapter;->processName(Ljava/lang/String;ZZ)[Ljava/lan Lorg/xml/sax/helpers/ParserAdapter;->reportError(Ljava/lang/String;)V Lorg/xml/sax/helpers/ParserAdapter;->setup(Lorg/xml/sax/Parser;)V Lorg/xml/sax/helpers/ParserAdapter;->setupParser()V +Lorg/xml/sax/helpers/ParserAdapter;->uris:Z Lorg/xml/sax/helpers/XMLFilterImpl;->contentHandler:Lorg/xml/sax/ContentHandler; Lorg/xml/sax/helpers/XMLFilterImpl;->dtdHandler:Lorg/xml/sax/DTDHandler; Lorg/xml/sax/helpers/XMLFilterImpl;->entityResolver:Lorg/xml/sax/EntityResolver; diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 7c5afbac31a0..1b431be5208c 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -5295,8 +5295,8 @@ public final class ActivityThread { } } } - final List<String> oldPaths = - sPackageManager.getPreviousCodePaths(packageName); + final ArrayList<String> oldPaths = new ArrayList<>(); + LoadedApk.makePaths(this, loadedApk.getApplicationInfo(), oldPaths); loadedApk.updateApplicationInfo(aInfo, oldPaths); } catch (RemoteException e) { } diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 73a403dd41f7..92be900e71ce 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -648,8 +648,6 @@ interface IPackageManager { boolean isPackageDeviceAdminOnAnyUser(String packageName); - List<String> getPreviousCodePaths(in String packageName); - int getInstallReason(String packageName, int userId); ParceledListSlice getSharedLibraries(in String packageName, int flags, int userId); diff --git a/core/java/android/net/http/HttpResponseCache.java b/core/java/android/net/http/HttpResponseCache.java index 729aff0ce278..7da76d119ce4 100644 --- a/core/java/android/net/http/HttpResponseCache.java +++ b/core/java/android/net/http/HttpResponseCache.java @@ -16,9 +16,8 @@ package android.net.http; -import com.android.okhttp.Cache; -import com.android.okhttp.AndroidShimResponseCache; -import com.android.okhttp.OkCacheContainer; +import com.android.okhttp.internalandroidapi.AndroidResponseCacheAdapter; +import com.android.okhttp.internalandroidapi.HasCacheHolder; import java.io.Closeable; import java.io.File; @@ -149,12 +148,12 @@ import java.util.Map; * } catch (Exception httpResponseCacheNotAvailable) { * }}</pre> */ -public final class HttpResponseCache extends ResponseCache implements Closeable, OkCacheContainer { +public final class HttpResponseCache extends ResponseCache implements HasCacheHolder, Closeable { - private final AndroidShimResponseCache delegate; + private final AndroidResponseCacheAdapter mDelegate; - private HttpResponseCache(AndroidShimResponseCache delegate) { - this.delegate = delegate; + private HttpResponseCache(AndroidResponseCacheAdapter delegate) { + mDelegate = delegate; } /** @@ -184,30 +183,33 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, ResponseCache installed = ResponseCache.getDefault(); if (installed instanceof HttpResponseCache) { HttpResponseCache installedResponseCache = (HttpResponseCache) installed; + CacheHolder cacheHolder = installedResponseCache.getCacheHolder(); // don't close and reopen if an equivalent cache is already installed - AndroidShimResponseCache trueResponseCache = installedResponseCache.delegate; - if (trueResponseCache.isEquivalent(directory, maxSize)) { + if (cacheHolder.isEquivalent(directory, maxSize)) { return installedResponseCache; } else { // The HttpResponseCache that owns this object is about to be replaced. - trueResponseCache.close(); + installedResponseCache.close(); } } - AndroidShimResponseCache trueResponseCache = - AndroidShimResponseCache.create(directory, maxSize); - HttpResponseCache newResponseCache = new HttpResponseCache(trueResponseCache); - ResponseCache.setDefault(newResponseCache); - return newResponseCache; + CacheHolder cacheHolder = CacheHolder.create(directory, maxSize); + AndroidResponseCacheAdapter androidResponseCacheAdapter = + new AndroidResponseCacheAdapter(cacheHolder); + HttpResponseCache responseCache = new HttpResponseCache(androidResponseCacheAdapter); + ResponseCache.setDefault(responseCache); + return responseCache; } - @Override public CacheResponse get(URI uri, String requestMethod, + @Override + public CacheResponse get(URI uri, String requestMethod, Map<String, List<String>> requestHeaders) throws IOException { - return delegate.get(uri, requestMethod, requestHeaders); + return mDelegate.get(uri, requestMethod, requestHeaders); } - @Override public CacheRequest put(URI uri, URLConnection urlConnection) throws IOException { - return delegate.put(uri, urlConnection); + @Override + public CacheRequest put(URI uri, URLConnection urlConnection) throws IOException { + return mDelegate.put(uri, urlConnection); } /** @@ -217,7 +219,7 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, */ public long size() { try { - return delegate.size(); + return mDelegate.getSize(); } catch (IOException e) { // This can occur if the cache failed to lazily initialize. return -1; @@ -229,7 +231,7 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, * its data. */ public long maxSize() { - return delegate.maxSize(); + return mDelegate.getMaxSize(); } /** @@ -239,7 +241,7 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, */ public void flush() { try { - delegate.flush(); + mDelegate.flush(); } catch (IOException ignored) { } } @@ -249,7 +251,7 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, * supply a response or validate a locally cached response. */ public int getNetworkCount() { - return delegate.getNetworkCount(); + return mDelegate.getNetworkCount(); } /** @@ -258,7 +260,7 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, * validated over the network. */ public int getHitCount() { - return delegate.getHitCount(); + return mDelegate.getHitCount(); } /** @@ -267,18 +269,19 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, * to handle a redirects and retries. */ public int getRequestCount() { - return delegate.getRequestCount(); + return mDelegate.getRequestCount(); } /** * Uninstalls the cache and releases any active resources. Stored contents * will remain on the filesystem. */ - @Override public void close() throws IOException { + @Override + public void close() throws IOException { if (ResponseCache.getDefault() == this) { ResponseCache.setDefault(null); } - delegate.close(); + mDelegate.close(); } /** @@ -288,13 +291,12 @@ public final class HttpResponseCache extends ResponseCache implements Closeable, if (ResponseCache.getDefault() == this) { ResponseCache.setDefault(null); } - delegate.delete(); + mDelegate.delete(); } /** @hide Needed for OkHttp integration. */ @Override - public Cache getCache() { - return delegate.getCache(); + public CacheHolder getCacheHolder() { + return mDelegate.getCacheHolder(); } - } diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 8847414d531d..fd3342ba93f6 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -2149,8 +2149,6 @@ public final class Parcel { @Deprecated static native void closeFileDescriptor(FileDescriptor desc) throws IOException; - static native void clearFileDescriptor(FileDescriptor desc); - /** * Read a byte value from the parcel at the current dataPosition(). */ diff --git a/core/java/android/os/ParcelFileDescriptor.java b/core/java/android/os/ParcelFileDescriptor.java index 7f588adbd69d..7556f0921b4d 100644 --- a/core/java/android/os/ParcelFileDescriptor.java +++ b/core/java/android/os/ParcelFileDescriptor.java @@ -683,7 +683,7 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { throw new IllegalStateException("Already closed"); } final int fd = getFd(); - Parcel.clearFileDescriptor(mFd); + mFd.setInt$(-1); writeCommStatusAndClose(Status.DETACHED, null); mClosed = true; mGuard.close(); diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 4db3607f95f9..c83f26c55f79 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -30,7 +30,6 @@ import android.content.IntentFilter; import android.content.res.Configuration; import android.content.res.TypedArray; import android.database.ContentObserver; -import android.icu.util.Calendar; import android.os.Handler; import android.text.format.Time; import android.util.AttributeSet; @@ -41,6 +40,7 @@ import com.android.internal.R; import java.text.DateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.TimeZone; @@ -293,7 +293,7 @@ public class DateTimeView extends TextView { */ private long computeNextMidnight(TimeZone timeZone) { Calendar c = Calendar.getInstance(); - c.setTimeZone(libcore.icu.DateUtilsBridge.icuTimeZone(timeZone)); + c.setTimeZone(timeZone); c.add(Calendar.DAY_OF_MONTH, 1); c.set(Calendar.HOUR_OF_DAY, 0); c.set(Calendar.MINUTE, 0); diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index a5a3986e7cfd..5e2cd4001d23 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -554,18 +554,6 @@ static void android_os_Parcel_closeFileDescriptor(JNIEnv* env, jclass clazz, job } } -static void android_os_Parcel_clearFileDescriptor(JNIEnv* env, jclass clazz, jobject object) -{ - if (object == NULL) { - jniThrowNullPointerException(env, NULL); - return; - } - int fd = jniGetFDFromFileDescriptor(env, object); - if (fd >= 0) { - jniSetFileDescriptorOfFD(env, object, -1); - } -} - static jlong android_os_Parcel_create(JNIEnv* env, jclass clazz) { Parcel* parcel = new Parcel(); @@ -811,7 +799,6 @@ static const JNINativeMethod gParcelMethods[] = { {"openFileDescriptor", "(Ljava/lang/String;I)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_openFileDescriptor}, {"dupFileDescriptor", "(Ljava/io/FileDescriptor;)Ljava/io/FileDescriptor;", (void*)android_os_Parcel_dupFileDescriptor}, {"closeFileDescriptor", "(Ljava/io/FileDescriptor;)V", (void*)android_os_Parcel_closeFileDescriptor}, - {"clearFileDescriptor", "(Ljava/io/FileDescriptor;)V", (void*)android_os_Parcel_clearFileDescriptor}, {"nativeCreate", "()J", (void*)android_os_Parcel_create}, {"nativeFreeBuffer", "(J)J", (void*)android_os_Parcel_freeBuffer}, diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index e8ef349f5b7a..17ab9563d372 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -150,7 +150,7 @@ static jobject android_os_VintfObject_getVndkSnapshots(JNIEnv* env, jclass) { } jobject jMap = env->NewObject(gHashMapClazz, gHashMapInit); for (const auto &vndk : manifest->vendorNdks()) { - std::string key = vndk.version(); + const std::string& key = vndk.version(); env->CallObjectMethod(jMap, gHashMapPut, env->NewStringUTF(key.c_str()), toJavaStringArray(env, vndk.libraries())); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6087229c871f..8efb33f4e22f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2294,7 +2294,8 @@ <permission android:name="android.permission.ASEC_RENAME" android:protectionLevel="signature" /> - <!-- @SystemApi Allows applications to write the apn settings. + <!-- @SystemApi Allows applications to write the apn settings and read sensitive fields of + an existing apn settings like user and password. <p>Not for use by third-party applications. --> <permission android:name="android.permission.WRITE_APN_SETTINGS" android:protectionLevel="signature|privileged" /> diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk index bf8067ccbd5c..bb8add1187e7 100644 --- a/data/sounds/AllAudio.mk +++ b/data/sounds/AllAudio.mk @@ -234,3 +234,8 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:system/media/audio/ui/ChargingStarted.ogg \ $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:system/media/audio/ui/InCallNotification.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCFailure.ogg:system/media/audio/ui/NFCFailure.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCInitiated.ogg:system/media/audio/ui/NFCInitiated.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCSuccess.ogg:system/media/audio/ui/NFCSuccess.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCTransferComplete.ogg:system/media/audio/ui/NFCTransferComplete.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCTransferInitiated.ogg:system/media/audio/ui/NFCTransferInitiated.ogg \ diff --git a/data/sounds/AudioPackage14.mk b/data/sounds/AudioPackage14.mk new file mode 100644 index 000000000000..c903a2b0eb97 --- /dev/null +++ b/data/sounds/AudioPackage14.mk @@ -0,0 +1,32 @@ +# +# Audio Package 14 - P +# +# Include this file in a product makefile to include these audio files +# +# + +LOCAL_PATH := frameworks/base/data/sounds + +# Simple files that do not require renaming +ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum Timer +NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys +RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \ + Umbriel +EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \ + camera_focus Dock Undock Lock Unlock Trusted ChargingStarted InCallNotification \ + NFCFailure NFCInitiated NFCSuccess NFCTransferComplete NFCTransferInitiated +MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop + +PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ + $(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ + $(LOCAL_PATH)/notifications/material/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ + $(LOCAL_PATH)/ringtones/material/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ + $(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) +PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ + $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) diff --git a/data/sounds/README.txt b/data/sounds/README.txt index 193fd7179f5f..db20319f6bfc 100644 --- a/data/sounds/README.txt +++ b/data/sounds/README.txt @@ -31,3 +31,13 @@ Video recording ./effects/ogg/VideoStop_48k.ogg unused +NFC +--- + +./effects/ogg/NFCFailure.ogg +./effects/ogg/NFCInitiated.ogg +./effects/ogg/NFCSuccess.ogg +./effects/ogg/NFCTransferComplete.ogg +./effects/ogg/NFCTransferInitiated.ogg + +referenced in AudioPackage14.mk (= AudioPackage13.mk + NFC sounds). diff --git a/data/sounds/effects/ogg/NFCFailure.ogg b/data/sounds/effects/ogg/NFCFailure.ogg Binary files differnew file mode 100644 index 000000000000..e9ee6624b16c --- /dev/null +++ b/data/sounds/effects/ogg/NFCFailure.ogg diff --git a/data/sounds/effects/ogg/NFCInitiated.ogg b/data/sounds/effects/ogg/NFCInitiated.ogg Binary files differnew file mode 100644 index 000000000000..a86319faaac7 --- /dev/null +++ b/data/sounds/effects/ogg/NFCInitiated.ogg diff --git a/data/sounds/effects/ogg/NFCSuccess.ogg b/data/sounds/effects/ogg/NFCSuccess.ogg Binary files differnew file mode 100644 index 000000000000..39dfd1f9d863 --- /dev/null +++ b/data/sounds/effects/ogg/NFCSuccess.ogg diff --git a/data/sounds/effects/ogg/NFCTransferComplete.ogg b/data/sounds/effects/ogg/NFCTransferComplete.ogg Binary files differnew file mode 100644 index 000000000000..f00cd9876eff --- /dev/null +++ b/data/sounds/effects/ogg/NFCTransferComplete.ogg diff --git a/data/sounds/effects/ogg/NFCTransferInitiated.ogg b/data/sounds/effects/ogg/NFCTransferInitiated.ogg Binary files differnew file mode 100644 index 000000000000..7be1bcbe6375 --- /dev/null +++ b/data/sounds/effects/ogg/NFCTransferInitiated.ogg diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index d45a5ec70782..9ca8284280ac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -930,7 +930,7 @@ public class NetworkControllerImpl extends BroadcastReceiver private SubscriptionInfo addSignalController(int id, int simSlotIndex) { SubscriptionInfo info = new SubscriptionInfo(id, "", simSlotIndex, "", "", 0, 0, "", 0, - null, 0, 0, ""); + null, null, null, ""); MobileSignalController controller = new MobileSignalController(mContext, mConfig, mHasMobileDataFeature, mPhone, mCallbackHandler, this, info, mSubDefaults, mReceiverHandler.getLooper()); diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java index 01d31e2a9852..85f19085db80 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogMotion.java @@ -238,6 +238,7 @@ public class VolumeDialogMotion { mHandler.postDelayed(new Runnable() { @Override public void run() { + if (mShowing) return; if (D.BUG) Log.d(TAG, "mDialog.dismiss()"); mDialog.dismiss(); onComplete.run(); diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java index 0230f75b8a91..d05311630ffb 100644 --- a/services/core/java/com/android/server/connectivity/Tethering.java +++ b/services/core/java/com/android/server/connectivity/Tethering.java @@ -115,7 +115,6 @@ import com.android.server.LocalServices; import com.android.server.connectivity.tethering.IControlsTethering; import com.android.server.connectivity.tethering.IPv6TetheringCoordinator; import com.android.server.connectivity.tethering.OffloadController; -import com.android.server.connectivity.tethering.SimChangeListener; import com.android.server.connectivity.tethering.TetherInterfaceStateMachine; import com.android.server.connectivity.tethering.TetheringConfiguration; import com.android.server.connectivity.tethering.TetheringDependencies; @@ -201,8 +200,6 @@ public class Tethering extends BaseNetworkObserver { // into a single coherent structure. private final HashSet<TetherInterfaceStateMachine> mForwardedDownstreams; private final VersionedBroadcastListener mCarrierConfigChange; - // TODO: Delete SimChangeListener; it's obsolete. - private final SimChangeListener mSimChange; private final TetheringDependencies mDeps; private volatile TetheringConfiguration mConfig; @@ -252,14 +249,6 @@ public class Tethering extends BaseNetworkObserver { updateConfiguration(); reevaluateSimCardProvisioning(); }); - // TODO: Remove SimChangeListener altogether. For now, we retain it - // for logging purposes in case we need to debug something that might - // be related to changing signals from ACTION_SIM_STATE_CHANGED to - // ACTION_CARRIER_CONFIG_CHANGED. - mSimChange = new SimChangeListener( - mContext, smHandler, () -> { - mLog.log("OBSERVED SIM card change"); - }); mStateReceiver = new StateReceiver(); @@ -1529,7 +1518,6 @@ public class Tethering extends BaseNetworkObserver { return; } - mSimChange.startListening(); mUpstreamNetworkMonitor.start(mDeps.getDefaultNetworkRequest()); // TODO: De-duplicate with updateUpstreamWanted() below. @@ -1545,7 +1533,6 @@ public class Tethering extends BaseNetworkObserver { public void exit() { mOffload.stop(); mUpstreamNetworkMonitor.stop(); - mSimChange.stopListening(); notifyDownstreamsOfNewUpstreamIface(null); handleNewUpstreamNetworkState(null); } diff --git a/services/core/java/com/android/server/connectivity/tethering/SimChangeListener.java b/services/core/java/com/android/server/connectivity/tethering/SimChangeListener.java deleted file mode 100644 index 33c9355ae64b..000000000000 --- a/services/core/java/com/android/server/connectivity/tethering/SimChangeListener.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.connectivity.tethering; - -import static com.android.internal.telephony.IccCardConstants.INTENT_VALUE_ICC_LOADED; -import static com.android.internal.telephony.IccCardConstants.INTENT_KEY_ICC_STATE; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.net.util.VersionedBroadcastListener; -import android.net.util.VersionedBroadcastListener.IntentCallback; -import android.os.Handler; -import android.util.Log; - -import com.android.internal.telephony.TelephonyIntents; - -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Consumer; - - -/** - * A utility class that runs the provided callback on the provided handler when - * observing a new SIM card having been loaded. - * - * @hide - */ -public class SimChangeListener extends VersionedBroadcastListener { - private static final String TAG = SimChangeListener.class.getSimpleName(); - private static final boolean DBG = false; - - public SimChangeListener(Context ctx, Handler handler, Runnable onSimCardLoadedCallback) { - super(TAG, ctx, handler, makeIntentFilter(), makeCallback(onSimCardLoadedCallback)); - } - - private static IntentFilter makeIntentFilter() { - final IntentFilter filter = new IntentFilter(); - filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED); - return filter; - } - - private static Consumer<Intent> makeCallback(Runnable onSimCardLoadedCallback) { - return new Consumer<Intent>() { - private boolean mSimNotLoadedSeen = false; - - @Override - public void accept(Intent intent) { - final String state = intent.getStringExtra(INTENT_KEY_ICC_STATE); - Log.d(TAG, "got Sim changed to state " + state + ", mSimNotLoadedSeen=" + - mSimNotLoadedSeen); - - if (!INTENT_VALUE_ICC_LOADED.equals(state)) { - mSimNotLoadedSeen = true; - return; - } - - if (mSimNotLoadedSeen) { - mSimNotLoadedSeen = false; - onSimCardLoadedCallback.run(); - } - } - }; - } -} diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 5b2bc9e10faf..1b4b5f12be2a 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -4081,6 +4081,8 @@ public class NotificationManagerService extends SystemService { buzz = playVibration(record, vibration, hasValidSound); } + } else if ((record.getFlags() & Notification.FLAG_INSISTENT) != 0) { + hasValidSound = false; } } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 864c965af3f6..d136a55422d2 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -17901,22 +17901,6 @@ public class PackageManagerService extends IPackageManager.Stub } } - @Override - public List<String> getPreviousCodePaths(String packageName) { - final int callingUid = Binder.getCallingUid(); - final List<String> result = new ArrayList<>(); - if (getInstantAppPackageName(callingUid) != null) { - return result; - } - final PackageSetting ps = mSettings.mPackages.get(packageName); - if (ps != null - && ps.oldCodePaths != null - && !filterAppAccessLPr(ps, callingUid, UserHandle.getUserId(callingUid))) { - result.addAll(ps.oldCodePaths); - } - return result; - } - private void replaceNonSystemPackageLIF(PackageParser.Package deletedPackage, PackageParser.Package pkg, final int policyFlags, int scanFlags, UserHandle user, int[] allUsers, String installerPackageName, PackageInstalledInfo res, diff --git a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java index 0b4d61fb783e..5335e87f813d 100644 --- a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -191,6 +191,11 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { true /* noisy */, false /* buzzy*/, false /* lights */); } + private NotificationRecord getInsistentBeepyOnceNotification() { + return getNotificationRecord(mId, true /* insistent */, true /* once */, + true /* noisy */, false /* buzzy*/, false /* lights */); + } + private NotificationRecord getInsistentBeepyLeanbackNotification() { return getLeanbackNotificationRecord(mId, true /* insistent */, false /* once */, true /* noisy */, false /* buzzy*/, false /* lights */); @@ -498,6 +503,24 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { verifyNeverStopAudio(); } + /** + * Tests the case where the user re-posts a {@link Notification} with looping sound where + * {@link Notification.Builder#setOnlyAlertOnce(true)} has been called. This should silence + * the sound associated with the notification. + * @throws Exception + */ + @Test + public void testNoisyOnceUpdateDoesCancelAudio() throws Exception { + NotificationRecord r = getInsistentBeepyNotification(); + NotificationRecord s = getInsistentBeepyOnceNotification(); + s.isUpdate = true; + + mService.buzzBeepBlinkLocked(r); + mService.buzzBeepBlinkLocked(s); + + verifyStopAudio(); + } + @Test public void testQuietUpdateDoesNotCancelAudioFromOther() throws Exception { NotificationRecord r = getBeepyNotification(); diff --git a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java index 8c7565b790d2..686fdb4e8e4a 100644 --- a/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java +++ b/services/usb/java/com/android/server/usb/descriptors/UsbDescriptor.java @@ -126,6 +126,9 @@ public abstract class UsbDescriptor implements Reporting { public static final int REQUEST_GET_CONFIGURATION = 0x08; public static final int REQUEST_SET_CONFIGURATION = 0x09; + // USB control transfer timeout + public static final int USB_CONTROL_TRANSFER_TIMEOUT_MS = 200; + /** * @throws IllegalArgumentException */ @@ -224,7 +227,7 @@ public abstract class UsbDescriptor implements Reporting { 0, sStringBuffer, 0xFF, - 0); + USB_CONTROL_TRANSFER_TIMEOUT_MS); if (rdo >= 0) { usbStr = new String(sStringBuffer, 2, rdo - 2, "UTF-16LE"); } else { diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index ca444d4d78ed..25e67c8ee17b 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -2802,9 +2802,21 @@ public abstract class Connection extends Conferenceable { public void onReject(String replyMessage) {} /** - * Notifies the Connection of a request to silence the ringer. - * - * @hide + * Notifies this Connection of a request to silence the ringer. + * <p> + * The ringer may be silenced by any of the following methods: + * <ul> + * <li>{@link TelecomManager#silenceRinger()}</li> + * <li>The user presses the volume-down button while a call is ringing.</li> + * </ul> + * <p> + * Self-managed {@link ConnectionService} implementations should override this method in their + * {@link Connection} implementation and implement logic to silence their app's ringtone. If + * your app set the ringtone as part of the incoming call {@link Notification} (see + * {@link #onShowIncomingCallUi()}), it should re-post the notification now, except call + * {@link android.app.Notification.Builder#setOnlyAlertOnce(boolean)} with {@code true}. This + * will ensure the ringtone sound associated with your {@link android.app.NotificationChannel} + * stops playing. */ public void onSilence() {} @@ -2881,7 +2893,29 @@ public abstract class Connection extends Conferenceable { * <p> * You should trigger the display of the incoming call user interface for your application by * showing a {@link Notification} with a full-screen {@link Intent} specified. - * For example: + * + * In your application code, you should create a {@link android.app.NotificationChannel} for + * incoming call notifications from your app: + * <pre><code> + * NotificationChannel channel = new NotificationChannel(YOUR_CHANNEL_ID, "Incoming Calls", + * NotificationManager.IMPORTANCE_MAX); + * // other channel setup stuff goes here. + * + * // We'll use the default system ringtone for our incoming call notification channel. You can + * // use your own audio resource here. + * Uri ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE); + * channel.setSound(ringtoneUri, new AudioAttributes.Builder() + * // Setting the AudioAttributes is important as it identifies the purpose of your + * // notification sound. + * .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE) + * .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) + * .build()); + * + * NotificationManager mgr = getSystemService(NotificationManager.class); + * mgr.createNotificationChannel(channel); + * </code></pre> + * When it comes time to post a notification for your incoming call, ensure it uses your + * incoming call {@link android.app.NotificationChannel}. * <pre><code> * // Create an intent which triggers your fullscreen incoming call user interface. * Intent intent = new Intent(Intent.ACTION_MAIN, null); @@ -2907,11 +2941,14 @@ public abstract class Connection extends Conferenceable { * builder.setContentTitle("Your notification title"); * builder.setContentText("Your notification content."); * - * // Use builder.addAction(..) to add buttons to answer or reject the call. + * // Set notification as insistent to cause your ringtone to loop. + * Notification notification = builder.build(); + * notification.flags |= Notification.FLAG_INSISTENT; * + * // Use builder.addAction(..) to add buttons to answer or reject the call. * NotificationManager notificationManager = mContext.getSystemService( * NotificationManager.class); - * notificationManager.notify(YOUR_TAG, YOUR_ID, builder.build()); + * notificationManager.notify(YOUR_CHANNEL_ID, YOUR_TAG, YOUR_ID, notification); * </code></pre> */ public void onShowIncomingCallUi() {} diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java index bd25ab2b8eab..1aeeca73c0b9 100644 --- a/telecomm/java/android/telecom/InCallService.java +++ b/telecomm/java/android/telecom/InCallService.java @@ -47,13 +47,19 @@ import java.util.List; * before the telecom service will bind to its {@code InCallService} implementation. * <p> * Below is an example manifest registration for an {@code InCallService}. The meta-data - * ({@link TelecomManager#METADATA_IN_CALL_SERVICE_UI}) indicates that this particular + * {@link TelecomManager#METADATA_IN_CALL_SERVICE_UI} indicates that this particular * {@code InCallService} implementation intends to replace the built-in in-call UI. + * The meta-data {@link TelecomManager#METADATA_IN_CALL_SERVICE_RINGING} indicates that this + * {@link InCallService} will play the ringtone for incoming calls. See + * <a href="#incomingCallNotification">below</a> for more information on showing the incoming call + * UI and playing the ringtone in your app. * <pre> * {@code * <service android:name="your.package.YourInCallServiceImplementation" * android:permission="android.permission.BIND_INCALL_SERVICE"> * <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" /> + * <meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING" + * android:value="true" /> * <intent-filter> * <action android:name="android.telecom.InCallService"/> * </intent-filter> @@ -80,6 +86,72 @@ import java.util.List; * to see if they would like your application to be the new default phone app. See the * {@link TelecomManager#ACTION_CHANGE_DEFAULT_DIALER} intent documentation for more information on * how to do this. + * <p id="incomingCallNotification"> + * <h2>Showing the Incoming Call Notification</h2> + * When your app receives a new incoming call via {@link InCallService#onCallAdded(Call)}, it is + * responsible for displaying an incoming call UI for the incoming call. It should do this using + * {@link android.app.NotificationManager} APIs to post a new incoming call notification. + * <p> + * Where your app declares the meta-data {@link TelecomManager#METADATA_IN_CALL_SERVICE_RINGING}, it + * is responsible for playing the ringtone for incoming calls. Your app should create a + * {@link android.app.NotificationChannel} which specifies the desired ringtone. For example: + * <pre><code> + * NotificationChannel channel = new NotificationChannel(YOUR_CHANNEL_ID, "Incoming Calls", + * NotificationManager.IMPORTANCE_MAX); + * // other channel setup stuff goes here. + * + * // We'll use the default system ringtone for our incoming call notification channel. You can + * // use your own audio resource here. + * Uri ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE); + * channel.setSound(ringtoneUri, new AudioAttributes.Builder() + * // Setting the AudioAttributes is important as it identifies the purpose of your + * // notification sound. + * .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE) + * .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) + * .build()); + * + * NotificationManager mgr = getSystemService(NotificationManager.class); + * mgr.createNotificationChannel(channel); + * </code></pre> + * <p> + * When your app receives a new incoming call, it creates a {@link android.app.Notification} for the + * incoming call and associates it with your incoming call notification channel. You can specify a + * {@link android.app.PendingIntent} on the notification which will launch your full screen + * incoming call UI. The notification manager framework will display your notification as a + * heads-up notification if the user is actively using the phone. When the user is not using the + * phone, your full-screen incoming call UI is used instead. + * For example: + * <pre><code> + * // Create an intent which triggers your fullscreen incoming call user interface. + * Intent intent = new Intent(Intent.ACTION_MAIN, null); + * intent.setFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION | Intent.FLAG_ACTIVITY_NEW_TASK); + * intent.setClass(context, YourIncomingCallActivity.class); + * PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent, 0); + * + * // Build the notification as an ongoing high priority item; this ensures it will show as + * // a heads up notification which slides down over top of the current content. + * final Notification.Builder builder = new Notification.Builder(context); + * builder.setOngoing(true); + * builder.setPriority(Notification.PRIORITY_HIGH); + * + * // Set notification content intent to take user to the fullscreen UI if user taps on the + * // notification body. + * builder.setContentIntent(pendingIntent); + * // Set full screen intent to trigger display of the fullscreen UI when the notification + * // manager deems it appropriate. + * builder.setFullScreenIntent(pendingIntent, true); + * + * // Setup notification content. + * builder.setSmallIcon( yourIconResourceId ); + * builder.setContentTitle("Your notification title"); + * builder.setContentText("Your notification content."); + * + * // Use builder.addAction(..) to add buttons to answer or reject the call. + * + * NotificationManager notificationManager = mContext.getSystemService( + * NotificationManager.class); + * notificationManager.notify(YOUR_CHANNEL_ID, YOUR_TAG, YOUR_ID, builder.build()); + * </code></pre> */ public abstract class InCallService extends Service { diff --git a/telephony/java/android/telephony/CellIdentityTdscdma.java b/telephony/java/android/telephony/CellIdentityTdscdma.java index feff238092d4..b99fe466ec46 100644 --- a/telephony/java/android/telephony/CellIdentityTdscdma.java +++ b/telephony/java/android/telephony/CellIdentityTdscdma.java @@ -16,7 +16,6 @@ package android.telephony; -import android.annotation.Nullable; import android.os.Parcel; import java.util.Objects; @@ -135,28 +134,6 @@ public final class CellIdentityTdscdma extends CellIdentity { return mUarfcn; } - /** - * @return The long alpha tag associated with the current scan result (may be the operator - * name string or extended operator name string). May be null if unknown. - * - * @hide - */ - @Nullable - public CharSequence getOperatorAlphaLong() { - return mAlphaLong; - } - - /** - * @return The short alpha tag associated with the current scan result (may be the operator - * name string or extended operator name string). May be null if unknown. - * - * @hide - */ - @Nullable - public CharSequence getOperatorAlphaShort() { - return mAlphaShort; - } - @Override public boolean equals(Object other) { if (this == other) { diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java index 936505ca407d..d76e39b83801 100644 --- a/telephony/java/android/telephony/SubscriptionInfo.java +++ b/telephony/java/android/telephony/SubscriptionInfo.java @@ -33,9 +33,9 @@ import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.util.DisplayMetrics; +import android.util.Log; import java.util.Arrays; -import java.util.ArrayList; import java.util.List; /** @@ -105,12 +105,12 @@ public class SubscriptionInfo implements Parcelable { /** * Mobile Country Code */ - private int mMcc; + private String mMcc; /** * Mobile Network Code */ - private int mMnc; + private String mMnc; /** * ISO Country code for the subscription's provider @@ -138,11 +138,11 @@ public class SubscriptionInfo implements Parcelable { * @hide */ public SubscriptionInfo(int id, String iccId, int simSlotIndex, CharSequence displayName, - CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, - Bitmap icon, int mcc, int mnc, String countryIso) { + CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, + Bitmap icon, String mcc, String mnc, String countryIso) { this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, - roaming, icon, mcc, mnc, countryIso, false /* isEmbedded */, - null /* accessRules */, null /* accessRules */); + roaming, icon, mcc, mnc, countryIso, false /* isEmbedded */, + null /* accessRules */, null /* accessRules */); } /** @@ -150,7 +150,7 @@ public class SubscriptionInfo implements Parcelable { */ public SubscriptionInfo(int id, String iccId, int simSlotIndex, CharSequence displayName, CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, - Bitmap icon, int mcc, int mnc, String countryIso, boolean isEmbedded, + Bitmap icon, String mcc, String mnc, String countryIso, boolean isEmbedded, @Nullable UiccAccessRule[] accessRules) { this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number, roaming, icon, mcc, mnc, countryIso, isEmbedded, accessRules, null /* cardId */); @@ -161,7 +161,7 @@ public class SubscriptionInfo implements Parcelable { */ public SubscriptionInfo(int id, String iccId, int simSlotIndex, CharSequence displayName, CharSequence carrierName, int nameSource, int iconTint, String number, int roaming, - Bitmap icon, int mcc, int mnc, String countryIso, boolean isEmbedded, + Bitmap icon, String mcc, String mnc, String countryIso, boolean isEmbedded, @Nullable UiccAccessRule[] accessRules, String cardId) { this.mId = id; this.mIccId = iccId; @@ -316,15 +316,43 @@ public class SubscriptionInfo implements Parcelable { /** * @return the MCC. + * @deprecated Use {@link #getMccString()} instead. */ + @Deprecated public int getMcc() { - return this.mMcc; + try { + return this.mMcc == null ? 0 : Integer.valueOf(this.mMcc); + } catch (NumberFormatException e) { + Log.w(SubscriptionInfo.class.getSimpleName(), "MCC string is not a number"); + return 0; + } } /** * @return the MNC. + * @deprecated Use {@link #getMncString()} instead. */ + @Deprecated public int getMnc() { + try { + return this.mMnc == null ? 0 : Integer.valueOf(this.mMnc); + } catch (NumberFormatException e) { + Log.w(SubscriptionInfo.class.getSimpleName(), "MNC string is not a number"); + return 0; + } + } + + /** + * @return The MCC, as a string. + */ + public String getMccString() { + return this.mMcc; + } + + /** + * @return The MNC, as a string. + */ + public String getMncString() { return this.mMnc; } @@ -425,8 +453,8 @@ public class SubscriptionInfo implements Parcelable { int iconTint = source.readInt(); String number = source.readString(); int dataRoaming = source.readInt(); - int mcc = source.readInt(); - int mnc = source.readInt(); + String mcc = source.readString(); + String mnc = source.readString(); String countryIso = source.readString(); Bitmap iconBitmap = Bitmap.CREATOR.createFromParcel(source); boolean isEmbedded = source.readBoolean(); @@ -455,8 +483,8 @@ public class SubscriptionInfo implements Parcelable { dest.writeInt(mIconTint); dest.writeString(mNumber); dest.writeInt(mDataRoaming); - dest.writeInt(mMcc); - dest.writeInt(mMnc); + dest.writeString(mMcc); + dest.writeString(mMnc); dest.writeString(mCountryIso); mIconBitmap.writeToParcel(dest, flags); dest.writeBoolean(mIsEmbedded); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 5a60aa669d80..310d2bf2083b 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -243,6 +243,20 @@ public class SubscriptionManager { public static final int SIM_PROVISIONED = 0; /** + * TelephonyProvider column name for the MCC associated with a SIM, stored as a string. + * <P>Type: TEXT (String)</P> + * @hide + */ + public static final String MCC_STRING = "mcc_string"; + + /** + * TelephonyProvider column name for the MNC associated with a SIM, stored as a string. + * <P>Type: TEXT (String)</P> + * @hide + */ + public static final String MNC_STRING = "mnc_string"; + + /** * TelephonyProvider column name for the MCC associated with a SIM. * <P>Type: INTEGER (int)</P> * @hide diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 49fbd8f06b05..3a263504a2ec 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -16,15 +16,6 @@ package com.android.internal.telephony; -/** - * TODO: This should probably not be an interface see - * http://www.javaworld.com/javaworld/javaqa/2001-06/01-qa-0608-constants.html and google with - * http://www.google.com/search?q=interface+constants&ie=utf-8&oe=utf-8&aq=t&rls=com.ubuntu:en-US:unofficial&client=firefox-a - * - * Also they should all probably be static final. - */ - -import android.os.SystemProperties; import android.telephony.TelephonyManager; /** @@ -231,13 +222,6 @@ public interface RILConstants { int LCE_STOPPED = 0; int LCE_ACTIVE = 1; -/* -cat include/telephony/ril.h | \ - egrep '^#define' | \ - sed -re 's/^#define +([^ ]+)* +([^ ]+)/ int \1 = \2;/' \ - >>java/android/com.android.internal.telephony/gsm/RILConstants.java -*/ - /** * No restriction at all including voice/SMS/USSD/SS/AV64 * and packet data. @@ -272,6 +256,18 @@ cat include/telephony/ril.h | \ public static final int DATA_PROFILE_OEM_BASE = 1000; public static final int DATA_PROFILE_INVALID = 0xFFFFFFFF; + /** + * The request/response/unsol message IDs below match RIL.h through Android O-MR1. + * + * RIL.h is at hardware/ril/include/telephony.ril.h; RIL support is deprecated and may + * be removed in the future. + * + * Messages defined after O-MR1 have no corresponding definition in RIL.h. + * P-and-later messages start at RIL_REQUEST_HAL_NON_RIL_BASE and + * RIL_UNSOL_HAL_NON_RIL_BASE. + */ + + /* Requests begin */ int RIL_REQUEST_GET_SIM_STATUS = 1; int RIL_REQUEST_ENTER_SIM_PIN = 2; int RIL_REQUEST_ENTER_SIM_PUK = 3; @@ -415,15 +411,20 @@ cat include/telephony/ril.h | \ int RIL_REQUEST_SET_CARRIER_INFO_IMSI_ENCRYPTION = 141; int RIL_REQUEST_START_NETWORK_SCAN = 142; int RIL_REQUEST_STOP_NETWORK_SCAN = 143; - int RIL_REQUEST_GET_SLOT_STATUS = 144; - int RIL_REQUEST_SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING = 145; - int RIL_REQUEST_START_KEEPALIVE = 146; - int RIL_REQUEST_STOP_KEEPALIVE = 147; - int RIL_REQUEST_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA = 148; - int RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA = 149; + int RIL_REQUEST_START_KEEPALIVE = 144; + int RIL_REQUEST_STOP_KEEPALIVE = 145; + /* The following requests are not defined in RIL.h */ + int RIL_REQUEST_HAL_NON_RIL_BASE = 200; + int RIL_REQUEST_GET_SLOT_STATUS = 200; + int RIL_REQUEST_SET_LOGICAL_TO_PHYSICAL_SLOT_MAPPING = 201; + int RIL_REQUEST_SET_SIGNAL_STRENGTH_REPORTING_CRITERIA = 202; + int RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA = 203; + + /* Responses begin */ int RIL_RESPONSE_ACKNOWLEDGEMENT = 800; + /* Unsols begin */ int RIL_UNSOL_RESPONSE_BASE = 1000; int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000; int RIL_UNSOL_RESPONSE_CALL_STATE_CHANGED = 1001; @@ -475,7 +476,10 @@ cat include/telephony/ril.h | \ int RIL_UNSOL_MODEM_RESTART = 1047; int RIL_UNSOL_CARRIER_INFO_IMSI_ENCRYPTION = 1048; int RIL_UNSOL_NETWORK_SCAN_RESULT = 1049; - int RIL_UNSOL_ICC_SLOT_STATUS = 1050; - int RIL_UNSOL_KEEPALIVE_STATUS = 1051; - int RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG = 1052; + int RIL_UNSOL_KEEPALIVE_STATUS = 1050; + + /* The following unsols are not defined in RIL.h */ + int RIL_UNSOL_HAL_NON_RIL_BASE = 1100; + int RIL_UNSOL_ICC_SLOT_STATUS = 1100; + int RIL_UNSOL_PHYSICAL_CHANNEL_CONFIG = 1101; } diff --git a/tests/net/java/com/android/server/connectivity/tethering/SimChangeListenerTest.java b/tests/net/java/com/android/server/connectivity/tethering/SimChangeListenerTest.java deleted file mode 100644 index f58ea7e9375f..000000000000 --- a/tests/net/java/com/android/server/connectivity/tethering/SimChangeListenerTest.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.connectivity.tethering; - -import static com.android.internal.telephony.IccCardConstants.INTENT_VALUE_ICC_ABSENT; -import static com.android.internal.telephony.IccCardConstants.INTENT_VALUE_ICC_LOADED; -import static com.android.internal.telephony.IccCardConstants.INTENT_KEY_ICC_STATE; -import static com.android.internal.telephony.TelephonyIntents.ACTION_SIM_STATE_CHANGED; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.reset; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Looper; -import android.os.UserHandle; - -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; - -import com.android.internal.util.test.BroadcastInterceptingContext; - -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.runner.RunWith; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; - - -@RunWith(AndroidJUnit4.class) -@SmallTest -public class SimChangeListenerTest { - @Mock private Context mContext; - private BroadcastInterceptingContext mServiceContext; - private Handler mHandler; - private SimChangeListener mSCL; - private int mCallbackCount; - - private void doCallback() { mCallbackCount++; } - - private class MockContext extends BroadcastInterceptingContext { - MockContext(Context base) { - super(base); - } - } - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - if (Looper.myLooper() == null) { - Looper.prepare(); - } - } - - @Before public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - reset(mContext); - mServiceContext = new MockContext(mContext); - mHandler = new Handler(Looper.myLooper()); - mCallbackCount = 0; - mSCL = new SimChangeListener(mServiceContext, mHandler, () -> doCallback()); - } - - @After public void tearDown() throws Exception { - if (mSCL != null) { - mSCL.stopListening(); - mSCL = null; - } - } - - private void sendSimStateChangeIntent(String state) { - final Intent intent = new Intent(ACTION_SIM_STATE_CHANGED); - intent.putExtra(INTENT_KEY_ICC_STATE, state); - mServiceContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); - } - - @Test - public void testNotSeenFollowedBySeenCallsCallback() { - mSCL.startListening(); - - sendSimStateChangeIntent(INTENT_VALUE_ICC_ABSENT); - sendSimStateChangeIntent(INTENT_VALUE_ICC_LOADED); - assertEquals(1, mCallbackCount); - - sendSimStateChangeIntent(INTENT_VALUE_ICC_ABSENT); - sendSimStateChangeIntent(INTENT_VALUE_ICC_LOADED); - assertEquals(2, mCallbackCount); - - mSCL.stopListening(); - } - - @Test - public void testNotListeningDoesNotCallback() { - sendSimStateChangeIntent(INTENT_VALUE_ICC_ABSENT); - sendSimStateChangeIntent(INTENT_VALUE_ICC_LOADED); - assertEquals(0, mCallbackCount); - - sendSimStateChangeIntent(INTENT_VALUE_ICC_ABSENT); - sendSimStateChangeIntent(INTENT_VALUE_ICC_LOADED); - assertEquals(0, mCallbackCount); - } - - @Test - public void testSeenOnlyDoesNotCallback() { - mSCL.startListening(); - - sendSimStateChangeIntent(INTENT_VALUE_ICC_LOADED); - assertEquals(0, mCallbackCount); - - sendSimStateChangeIntent(INTENT_VALUE_ICC_LOADED); - assertEquals(0, mCallbackCount); - - mSCL.stopListening(); - } -} |