diff options
201 files changed, 5654 insertions, 3190 deletions
diff --git a/api/current.txt b/api/current.txt index 0f146d769cbb..2a33d6e23129 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4171,7 +4171,6 @@ package android.app { method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle); method public abstract void onActivityDestroyed(android.app.Activity); method public abstract void onActivityPaused(android.app.Activity); - method public default void onActivityPreCreated(android.app.Activity, android.os.Bundle); method public abstract void onActivityResumed(android.app.Activity); method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle); method public abstract void onActivityStarted(android.app.Activity); @@ -22163,6 +22162,7 @@ package android.media { } public static final class MediaMuxer.OutputFormat { + field public static final int MUXER_OUTPUT_3GPP = 2; // 0x2 field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0 field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1 } @@ -23943,6 +23943,7 @@ package android.media.tv { field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION"; field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; + field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri"; field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language"; field public static final java.lang.String COLUMN_AUTHOR = "author"; field public static final java.lang.String COLUMN_AVAILABILITY = "availability"; @@ -23950,6 +23951,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre"; field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id"; field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating"; + field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis"; field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis"; field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number"; field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number"; @@ -23963,17 +23965,14 @@ package android.media.tv { field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4"; field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id"; field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count"; + field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis"; field public static final java.lang.String COLUMN_LIVE = "live"; - field public static final java.lang.String COLUMN_LOGO = "logo"; + field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri"; field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description"; field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price"; field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio"; field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri"; - field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration"; - field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri"; - field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position"; field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri"; - field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight"; field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited"; field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date"; field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating"; @@ -23993,6 +23992,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height"; field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width"; field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type"; + field public static final java.lang.String COLUMN_WEIGHT = "weight"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program"; field public static final android.net.Uri CONTENT_URI; @@ -45685,6 +45685,7 @@ package android.view { field public static final int TYPE_APPLICATION = 2; // 0x2 field public static final int TYPE_APPLICATION_ATTACHED_DIALOG = 1003; // 0x3eb field public static final int TYPE_APPLICATION_MEDIA = 1001; // 0x3e9 + field public static final int TYPE_APPLICATION_OVERLAY = 2038; // 0x7f6 field public static final int TYPE_APPLICATION_PANEL = 1000; // 0x3e8 field public static final int TYPE_APPLICATION_STARTING = 3; // 0x3 field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea @@ -45694,17 +45695,17 @@ package android.view { field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9 - field public static final int TYPE_PHONE = 2002; // 0x7d2 - field public static final int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 + field public static final deprecated int TYPE_PHONE = 2002; // 0x7d2 + field public static final deprecated int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 field public static final int TYPE_PRIVATE_PRESENTATION = 2030; // 0x7ee field public static final int TYPE_SEARCH_BAR = 2001; // 0x7d1 field public static final int TYPE_STATUS_BAR = 2000; // 0x7d0 field public static final int TYPE_STATUS_BAR_PANEL = 2014; // 0x7de - field public static final int TYPE_SYSTEM_ALERT = 2003; // 0x7d3 + field public static final deprecated int TYPE_SYSTEM_ALERT = 2003; // 0x7d3 field public static final int TYPE_SYSTEM_DIALOG = 2008; // 0x7d8 - field public static final int TYPE_SYSTEM_ERROR = 2010; // 0x7da - field public static final int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 - field public static final int TYPE_TOAST = 2005; // 0x7d5 + field public static final deprecated int TYPE_SYSTEM_ERROR = 2010; // 0x7da + field public static final deprecated int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 + field public static final deprecated int TYPE_TOAST = 2005; // 0x7d5 field public static final int TYPE_WALLPAPER = 2013; // 0x7dd field public float alpha; field public float buttonBrightness; diff --git a/api/system-current.txt b/api/system-current.txt index 5ccfbcef6598..e2502b611c2d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4313,7 +4313,6 @@ package android.app { method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle); method public abstract void onActivityDestroyed(android.app.Activity); method public abstract void onActivityPaused(android.app.Activity); - method public default void onActivityPreCreated(android.app.Activity, android.os.Bundle); method public abstract void onActivityResumed(android.app.Activity); method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle); method public abstract void onActivityStarted(android.app.Activity); @@ -23769,6 +23768,7 @@ package android.media { } public static final class MediaMuxer.OutputFormat { + field public static final int MUXER_OUTPUT_3GPP = 2; // 0x2 field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0 field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1 } @@ -25628,6 +25628,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_SEARCHABLE = "searchable"; field public static final java.lang.String COLUMN_SERVICE_ID = "service_id"; field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type"; + field public static final java.lang.String COLUMN_SYSTEM_APPROVED = "system_approved"; field public static final java.lang.String COLUMN_TRANSIENT = "transient"; field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id"; field public static final java.lang.String COLUMN_TYPE = "type"; @@ -25694,6 +25695,7 @@ package android.media.tv { field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION"; field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; + field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri"; field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language"; field public static final java.lang.String COLUMN_AUTHOR = "author"; field public static final java.lang.String COLUMN_AVAILABILITY = "availability"; @@ -25701,6 +25703,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre"; field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id"; field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating"; + field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis"; field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis"; field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number"; field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number"; @@ -25714,17 +25717,14 @@ package android.media.tv { field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4"; field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id"; field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count"; + field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis"; field public static final java.lang.String COLUMN_LIVE = "live"; - field public static final java.lang.String COLUMN_LOGO = "logo"; + field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri"; field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description"; field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price"; field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio"; field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri"; - field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration"; - field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri"; - field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position"; field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri"; - field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight"; field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited"; field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date"; field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating"; @@ -25745,6 +25745,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height"; field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width"; field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type"; + field public static final java.lang.String COLUMN_WEIGHT = "weight"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program"; field public static final android.net.Uri CONTENT_URI; @@ -49094,6 +49095,7 @@ package android.view { field public static final int TYPE_APPLICATION = 2; // 0x2 field public static final int TYPE_APPLICATION_ATTACHED_DIALOG = 1003; // 0x3eb field public static final int TYPE_APPLICATION_MEDIA = 1001; // 0x3e9 + field public static final int TYPE_APPLICATION_OVERLAY = 2038; // 0x7f6 field public static final int TYPE_APPLICATION_PANEL = 1000; // 0x3e8 field public static final int TYPE_APPLICATION_STARTING = 3; // 0x3 field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea @@ -49103,17 +49105,17 @@ package android.view { field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9 - field public static final int TYPE_PHONE = 2002; // 0x7d2 - field public static final int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 + field public static final deprecated int TYPE_PHONE = 2002; // 0x7d2 + field public static final deprecated int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 field public static final int TYPE_PRIVATE_PRESENTATION = 2030; // 0x7ee field public static final int TYPE_SEARCH_BAR = 2001; // 0x7d1 field public static final int TYPE_STATUS_BAR = 2000; // 0x7d0 field public static final int TYPE_STATUS_BAR_PANEL = 2014; // 0x7de - field public static final int TYPE_SYSTEM_ALERT = 2003; // 0x7d3 + field public static final deprecated int TYPE_SYSTEM_ALERT = 2003; // 0x7d3 field public static final int TYPE_SYSTEM_DIALOG = 2008; // 0x7d8 - field public static final int TYPE_SYSTEM_ERROR = 2010; // 0x7da - field public static final int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 - field public static final int TYPE_TOAST = 2005; // 0x7d5 + field public static final deprecated int TYPE_SYSTEM_ERROR = 2010; // 0x7da + field public static final deprecated int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 + field public static final deprecated int TYPE_TOAST = 2005; // 0x7d5 field public static final int TYPE_WALLPAPER = 2013; // 0x7dd field public float alpha; field public float buttonBrightness; diff --git a/api/test-current.txt b/api/test-current.txt index 896c142be7ef..151ccbf007d7 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -4181,7 +4181,6 @@ package android.app { method public abstract void onActivityCreated(android.app.Activity, android.os.Bundle); method public abstract void onActivityDestroyed(android.app.Activity); method public abstract void onActivityPaused(android.app.Activity); - method public default void onActivityPreCreated(android.app.Activity, android.os.Bundle); method public abstract void onActivityResumed(android.app.Activity); method public abstract void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle); method public abstract void onActivityStarted(android.app.Activity); @@ -22255,6 +22254,7 @@ package android.media { } public static final class MediaMuxer.OutputFormat { + field public static final int MUXER_OUTPUT_3GPP = 2; // 0x2 field public static final int MUXER_OUTPUT_MPEG_4 = 0; // 0x0 field public static final int MUXER_OUTPUT_WEBM = 1; // 0x1 } @@ -24035,6 +24035,7 @@ package android.media.tv { field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE"; field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION"; field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT"; + field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri"; field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language"; field public static final java.lang.String COLUMN_AUTHOR = "author"; field public static final java.lang.String COLUMN_AVAILABILITY = "availability"; @@ -24042,6 +24043,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre"; field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id"; field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating"; + field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis"; field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis"; field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number"; field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number"; @@ -24055,17 +24057,14 @@ package android.media.tv { field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4"; field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id"; field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count"; + field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis"; field public static final java.lang.String COLUMN_LIVE = "live"; - field public static final java.lang.String COLUMN_LOGO = "logo"; + field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri"; field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description"; field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price"; field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio"; field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri"; - field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration"; - field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri"; - field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position"; field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri"; - field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight"; field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited"; field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date"; field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating"; @@ -24085,6 +24084,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height"; field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width"; field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type"; + field public static final java.lang.String COLUMN_WEIGHT = "weight"; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program"; field public static final android.net.Uri CONTENT_URI; @@ -45996,6 +45996,7 @@ package android.view { field public static final int TYPE_APPLICATION = 2; // 0x2 field public static final int TYPE_APPLICATION_ATTACHED_DIALOG = 1003; // 0x3eb field public static final int TYPE_APPLICATION_MEDIA = 1001; // 0x3e9 + field public static final int TYPE_APPLICATION_OVERLAY = 2038; // 0x7f6 field public static final int TYPE_APPLICATION_PANEL = 1000; // 0x3e8 field public static final int TYPE_APPLICATION_STARTING = 3; // 0x3 field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea @@ -46005,17 +46006,17 @@ package android.view { field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9 - field public static final int TYPE_PHONE = 2002; // 0x7d2 - field public static final int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 + field public static final deprecated int TYPE_PHONE = 2002; // 0x7d2 + field public static final deprecated int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 field public static final int TYPE_PRIVATE_PRESENTATION = 2030; // 0x7ee field public static final int TYPE_SEARCH_BAR = 2001; // 0x7d1 field public static final int TYPE_STATUS_BAR = 2000; // 0x7d0 field public static final int TYPE_STATUS_BAR_PANEL = 2014; // 0x7de - field public static final int TYPE_SYSTEM_ALERT = 2003; // 0x7d3 + field public static final deprecated int TYPE_SYSTEM_ALERT = 2003; // 0x7d3 field public static final int TYPE_SYSTEM_DIALOG = 2008; // 0x7d8 - field public static final int TYPE_SYSTEM_ERROR = 2010; // 0x7da - field public static final int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 - field public static final int TYPE_TOAST = 2005; // 0x7d5 + field public static final deprecated int TYPE_SYSTEM_ERROR = 2010; // 0x7da + field public static final deprecated int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 + field public static final deprecated int TYPE_TOAST = 2005; // 0x7d5 field public static final int TYPE_WALLPAPER = 2013; // 0x7dd field public float alpha; field public float buttonBrightness; diff --git a/compiled-classes-phone b/compiled-classes-phone index e4ffaa358497..ea8f4a4d87fa 100644 --- a/compiled-classes-phone +++ b/compiled-classes-phone @@ -1,5 +1,5 @@ # -# Copyright (C) 2016 The Android Open Source Project +# 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. @@ -31,7 +31,6 @@ android.R$styleable android.accessibilityservice.AccessibilityServiceInfo android.accessibilityservice.AccessibilityServiceInfo$1 -android.accessibilityservice.AccessibilityServiceInfo$CapabilityInfo android.accessibilityservice.IAccessibilityServiceClient android.accessibilityservice.IAccessibilityServiceConnection android.accessibilityservice.IAccessibilityServiceConnection$Stub @@ -58,6 +57,8 @@ android.accounts.AccountManager$Future2Task android.accounts.AccountManager$Future2Task$1 android.accounts.AccountManagerCallback android.accounts.AccountManagerFuture +android.accounts.AccountManagerInternal +android.accounts.AccountManagerInternal$OnAppPermissionChangeListener android.accounts.AccountsException android.accounts.AuthenticatorDescription android.accounts.AuthenticatorDescription$1 @@ -78,7 +79,6 @@ android.accounts.OnAccountsUpdateListener android.accounts.OperationCanceledException android.animation.AnimationHandler android.animation.AnimationHandler$1 -android.animation.AnimationHandler$2 android.animation.AnimationHandler$AnimationFrameCallback android.animation.AnimationHandler$AnimationFrameCallbackProvider android.animation.AnimationHandler$MyFrameCallbackProvider @@ -90,9 +90,13 @@ android.animation.AnimatorInflater android.animation.AnimatorInflater$PathDataEvaluator android.animation.AnimatorListenerAdapter android.animation.AnimatorSet -android.animation.AnimatorSet$AnimatorSetListener +android.animation.AnimatorSet$1 +android.animation.AnimatorSet$2 +android.animation.AnimatorSet$3 +android.animation.AnimatorSet$AnimationEvent android.animation.AnimatorSet$Builder android.animation.AnimatorSet$Node +android.animation.AnimatorSet$SeekState android.animation.ArgbEvaluator android.animation.FloatArrayEvaluator android.animation.FloatEvaluator @@ -119,14 +123,15 @@ android.animation.ObjectAnimator android.animation.PathKeyframes android.animation.PathKeyframes$1 android.animation.PathKeyframes$2 -android.animation.PathKeyframes$3 -android.animation.PathKeyframes$4 android.animation.PathKeyframes$FloatKeyframesBase android.animation.PathKeyframes$IntKeyframesBase android.animation.PathKeyframes$SimpleKeyframes android.animation.PropertyValuesHolder +android.animation.PropertyValuesHolder$1 android.animation.PropertyValuesHolder$FloatPropertyValuesHolder android.animation.PropertyValuesHolder$IntPropertyValuesHolder +android.animation.PropertyValuesHolder$PropertyValues +android.animation.PropertyValuesHolder$PropertyValues$DataSource android.animation.RectEvaluator android.animation.RevealAnimator android.animation.StateListAnimator @@ -139,22 +144,25 @@ android.animation.TimeInterpolator android.animation.TypeEvaluator android.animation.ValueAnimator android.animation.ValueAnimator$AnimatorUpdateListener -android.annotation.TargetApi +android.app.-$Lambda$36$c44uHH2WE4sJvw5tZZB6gRzEaHI +android.app.-$Lambda$39$c44uHH2WE4sJvw5tZZB6gRzEaHI +android.app.-$Lambda$57$vZ1qb742P9hE4drBY-TrOZB_qKo +android.app.-$Lambda$7$u_rp3dnwvfyMTggc6hVftcuYJ3E +android.app.-$Lambda$71$3eJ3p8XnIxdVOnT82Ns3R0V5ZQE +android.app.-$Lambda$76$3eJ3p8XnIxdVOnT82Ns3R0V5ZQE android.app.ActionBar android.app.ActionBar$LayoutParams android.app.ActionBar$OnMenuVisibilityListener -android.app.ActionBar$OnNavigationListener android.app.ActionBar$Tab android.app.ActionBar$TabListener android.app.Activity android.app.Activity$HostCallbacks -android.app.Activity$NonConfigurationInstances android.app.ActivityManager +android.app.ActivityManager$1 android.app.ActivityManager$AppTask android.app.ActivityManager$MemoryInfo android.app.ActivityManager$MemoryInfo$1 -android.app.ActivityManager$ProcessErrorStateInfo -android.app.ActivityManager$ProcessErrorStateInfo$1 +android.app.ActivityManager$OnUidImportanceListener android.app.ActivityManager$RecentTaskInfo android.app.ActivityManager$RecentTaskInfo$1 android.app.ActivityManager$RunningAppProcessInfo @@ -168,10 +176,12 @@ android.app.ActivityManager$StackInfo android.app.ActivityManager$StackInfo$1 android.app.ActivityManager$TaskDescription android.app.ActivityManager$TaskDescription$1 +android.app.ActivityManager$TaskSnapshot +android.app.ActivityManager$TaskSnapshot$1 android.app.ActivityManager$TaskThumbnail -android.app.ActivityManager$TaskThumbnail$1 android.app.ActivityManager$TaskThumbnailInfo android.app.ActivityManager$TaskThumbnailInfo$1 +android.app.ActivityManager$UidObserver android.app.ActivityManagerInternal android.app.ActivityManagerInternal$SleepToken android.app.ActivityOptions @@ -189,6 +199,7 @@ android.app.ActivityThread$BindServiceData android.app.ActivityThread$ContextCleanupInfo android.app.ActivityThread$CreateServiceData android.app.ActivityThread$DropBoxReporter +android.app.ActivityThread$DumpComponentInfo android.app.ActivityThread$EventLoggingReporter android.app.ActivityThread$GcIdler android.app.ActivityThread$H @@ -199,18 +210,13 @@ android.app.ActivityThread$ProviderClientRecord android.app.ActivityThread$ProviderKey android.app.ActivityThread$ProviderRefCount android.app.ActivityThread$ReceiverData +android.app.ActivityThread$RequestAssistContextExtras android.app.ActivityThread$ResultData android.app.ActivityThread$ServiceArgsData android.app.ActivityThread$StopInfo -android.app.ActivityTransitionCoordinator -android.app.ActivityTransitionCoordinator$1 -android.app.ActivityTransitionCoordinator$2 -android.app.ActivityTransitionCoordinator$ContinueTransitionListener -android.app.ActivityTransitionCoordinator$FixedEpicenterCallback -android.app.ActivityTransitionCoordinator$SharedElementOriginalState android.app.ActivityTransitionState +android.app.AlarmManager android.app.AlarmManager$AlarmClockInfo -android.app.AlarmManager$AlarmClockInfo$1 android.app.AlarmManager$ListenerWrapper android.app.AlarmManager$OnAlarmListener android.app.AlertDialog @@ -227,71 +233,59 @@ android.app.AppOpsManager$PackageOps$1 android.app.Application android.app.Application$ActivityLifecycleCallbacks android.app.ApplicationErrorReport -android.app.ApplicationErrorReport$1 android.app.ApplicationErrorReport$CrashInfo +android.app.ApplicationErrorReport$ParcelableCrashInfo android.app.ApplicationLoaders android.app.ApplicationPackageManager android.app.ApplicationPackageManager$MoveCallbackDelegate android.app.ApplicationPackageManager$OnPermissionsChangeListenerDelegate android.app.ApplicationPackageManager$ResourceName -android.app.ApplicationThreadProxy android.app.AutomaticZenRule android.app.BackStackRecord android.app.BackStackRecord$Op -android.app.BackStackRecord$TransitionState -android.app.BackStackState -android.app.BackStackState$1 android.app.BroadcastOptions android.app.ContentProviderHolder android.app.ContentProviderHolder$1 android.app.ContextImpl -android.app.ContextImpl$1 android.app.ContextImpl$ApplicationContentResolver android.app.DatePickerDialog android.app.DatePickerDialog$OnDateSetListener android.app.Dialog -android.app.Dialog$-void__init__android_content_Context_context_int_themeResId_boolean_createContextThemeWrapper_LambdaImpl0 android.app.Dialog$ListenersHandler android.app.DialogFragment android.app.DownloadManager android.app.DownloadManager$CursorTranslator android.app.DownloadManager$Query android.app.DownloadManager$Request -android.app.EnterTransitionCoordinator -android.app.EnterTransitionCoordinator$1 -android.app.EnterTransitionCoordinator$4 -android.app.EnterTransitionCoordinator$5 -android.app.EnterTransitionCoordinator$5$1 -android.app.EnterTransitionCoordinator$5$1$1 -android.app.EnterTransitionCoordinator$6 -android.app.EnterTransitionCoordinator$7 -android.app.EnterTransitionCoordinator$8 -android.app.ExitTransitionCoordinator -android.app.ExitTransitionCoordinator$10 -android.app.ExitTransitionCoordinator$11 -android.app.ExitTransitionCoordinator$4 android.app.Fragment android.app.Fragment$1 +android.app.Fragment$AnimationInfo +android.app.Fragment$OnStartEnterTransitionListener android.app.Fragment$SavedState -android.app.FragmentBreadCrumbs android.app.FragmentContainer android.app.FragmentController android.app.FragmentHostCallback android.app.FragmentManager android.app.FragmentManager$BackStackEntry +android.app.FragmentManager$FragmentLifecycleCallbacks android.app.FragmentManager$OnBackStackChangedListener android.app.FragmentManagerImpl android.app.FragmentManagerImpl$1 android.app.FragmentManagerImpl$2 -android.app.FragmentManagerImpl$3 -android.app.FragmentManagerImpl$4 -android.app.FragmentManagerImpl$5 android.app.FragmentManagerImpl$AnimateOnHWLayerIfNeededListener +android.app.FragmentManagerImpl$OpGenerator +android.app.FragmentManagerImpl$PopBackStackState +android.app.FragmentManagerImpl$StartEnterTransitionListener android.app.FragmentManagerState android.app.FragmentManagerState$1 android.app.FragmentState android.app.FragmentState$1 android.app.FragmentTransaction +android.app.FragmentTransition +android.app.FragmentTransition$3 +android.app.FragmentTransition$4 +android.app.FragmentTransition$5 +android.app.FragmentTransition$FragmentContainerTransition android.app.IActivityContainer android.app.IActivityContainer$Stub android.app.IActivityContainerCallback @@ -356,12 +350,11 @@ android.app.IntentService$ServiceHandler android.app.JobSchedulerImpl android.app.KeyguardManager android.app.ListActivity -android.app.ListActivity$1 -android.app.ListActivity$2 android.app.ListFragment android.app.ListFragment$1 android.app.ListFragment$2 android.app.LoadedApk +android.app.LoadedApk$DexLoadReporter android.app.LoadedApk$ReceiverDispatcher android.app.LoadedApk$ReceiverDispatcher$Args android.app.LoadedApk$ReceiverDispatcher$InnerReceiver @@ -391,26 +384,34 @@ android.app.Notification$Extender android.app.Notification$InboxStyle android.app.Notification$MediaStyle android.app.Notification$MessagingStyle +android.app.Notification$MessagingStyle$Message +android.app.Notification$StandardTemplateParams android.app.Notification$Style android.app.Notification$WearableExtender +android.app.NotificationChannel +android.app.NotificationChannel$1 android.app.NotificationManager android.app.NotificationManager$Policy android.app.NotificationManager$Policy$1 android.app.OnActivityPausedListener -android.app.PackageDeleteObserver -android.app.PackageDeleteObserver$1 -android.app.PackageInstallObserver -android.app.PackageInstallObserver$1 android.app.PendingIntent android.app.PendingIntent$1 android.app.PendingIntent$CanceledException android.app.PendingIntent$FinishedDispatcher android.app.PendingIntent$OnFinished +android.app.PendingIntent$OnMarshaledListener +android.app.PictureInPictureArgs +android.app.PictureInPictureArgs$1 android.app.Presentation android.app.ProfilerInfo android.app.ProgressDialog android.app.QueuedWork +android.app.QueuedWork$QueuedWorkHandler android.app.ReceiverRestrictedContext +android.app.RemoteAction +android.app.RemoteAction$1 +android.app.RemoteAction$2 +android.app.RemoteAction$OnActionListener android.app.RemoteInput android.app.RemoteInput$1 android.app.RemoteInput$Builder @@ -419,13 +420,14 @@ android.app.ResourcesManager$1 android.app.ResourcesManager$ActivityResources android.app.ResultInfo android.app.ResultInfo$1 +android.app.RetailDemoModeServiceInternal +android.app.SearchManager android.app.SearchableInfo android.app.SearchableInfo$1 android.app.Service android.app.ServiceConnectionLeaked android.app.SharedElementCallback android.app.SharedElementCallback$1 -android.app.SharedElementCallback$OnSharedElementsReadyListener android.app.SharedPreferencesImpl android.app.SharedPreferencesImpl$1 android.app.SharedPreferencesImpl$2 @@ -509,6 +511,11 @@ android.app.SystemServiceRegistry$71 android.app.SystemServiceRegistry$72 android.app.SystemServiceRegistry$73 android.app.SystemServiceRegistry$74 +android.app.SystemServiceRegistry$75 +android.app.SystemServiceRegistry$76 +android.app.SystemServiceRegistry$77 +android.app.SystemServiceRegistry$78 +android.app.SystemServiceRegistry$79 android.app.SystemServiceRegistry$8 android.app.SystemServiceRegistry$9 android.app.SystemServiceRegistry$CachedServiceFetcher @@ -516,29 +523,43 @@ android.app.SystemServiceRegistry$ServiceFetcher android.app.SystemServiceRegistry$StaticApplicationContextServiceFetcher android.app.SystemServiceRegistry$StaticServiceFetcher android.app.TaskStackBuilder -android.app.TimePickerDialog +android.app.TaskStackListener android.app.TimePickerDialog$OnTimeSetListener android.app.UiModeManager -android.app.WaitResult; +android.app.UserSwitchObserver +android.app.VoiceInteractor$PickOptionRequest$Option +android.app.WaitResult android.app.WallpaperInfo +android.app.WallpaperInfo$1 android.app.WallpaperManager android.app.WallpaperManager$Globals -android.app.admin.DeviceAdminInfo -android.app.admin.DeviceAdminInfo$1 -android.app.admin.DeviceAdminInfo$PolicyInfo android.app.admin.DevicePolicyManager android.app.admin.DevicePolicyManagerInternal android.app.admin.DevicePolicyManagerInternal$OnCrossProfileWidgetProvidersChangeListener android.app.admin.IDevicePolicyManager android.app.admin.IDevicePolicyManager$Stub android.app.admin.IDevicePolicyManager$Stub$Proxy +android.app.admin.PasswordMetrics +android.app.admin.PasswordMetrics$1 android.app.admin.SecurityLog android.app.admin.SecurityLog$SecurityEvent android.app.admin.SecurityLog$SecurityEvent$1 +android.app.admin.SystemUpdateInfo +android.app.admin.SystemUpdateInfo$1 android.app.admin.SystemUpdatePolicy android.app.admin.SystemUpdatePolicy$1 android.app.assist.AssistContent +android.app.assist.AssistContent$1 android.app.assist.AssistStructure +android.app.assist.AssistStructure$1 +android.app.assist.AssistStructure$ParcelTransferReader +android.app.assist.AssistStructure$ParcelTransferWriter +android.app.assist.AssistStructure$SendChannel +android.app.assist.AssistStructure$ViewNode +android.app.assist.AssistStructure$ViewNodeBuilder +android.app.assist.AssistStructure$ViewNodeText +android.app.assist.AssistStructure$ViewStackEntry +android.app.assist.AssistStructure$WindowNode android.app.backup.BackupAgent android.app.backup.BackupAgentHelper android.app.backup.BackupDataInput @@ -559,6 +580,7 @@ android.app.backup.IBackupManager$Stub$Proxy android.app.backup.IBackupObserver android.app.backup.IFullBackupRestoreObserver android.app.backup.IRestoreSession +android.app.backup.ISelectBackupTransportCallback android.app.backup.RestoreDescription android.app.backup.RestoreSet android.app.backup.SharedPreferencesBackupHelper @@ -597,10 +619,15 @@ android.app.trust.TrustManager$2 android.app.trust.TrustManager$TrustListener android.app.usage.ConfigurationStats android.app.usage.ConfigurationStats$1 +android.app.usage.ExternalStorageStats +android.app.usage.IStorageStatsManager +android.app.usage.IStorageStatsManager$Stub android.app.usage.IUsageStatsManager android.app.usage.IUsageStatsManager$Stub android.app.usage.IUsageStatsManager$Stub$Proxy android.app.usage.NetworkStatsManager +android.app.usage.StorageStats +android.app.usage.StorageStatsManager android.app.usage.TimeSparseArray android.app.usage.UsageEvents android.app.usage.UsageEvents$1 @@ -626,18 +653,15 @@ android.bluetooth.BluetoothActivityEnergyInfo android.bluetooth.BluetoothActivityEnergyInfo$1 android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothAdapter$1 -android.bluetooth.BluetoothAdapter$2 -android.bluetooth.BluetoothAdapter$BluetoothStateChangeCallback -android.bluetooth.BluetoothAdapter$LeScanCallback -android.bluetooth.BluetoothAudioConfig android.bluetooth.BluetoothClass android.bluetooth.BluetoothClass$1 android.bluetooth.BluetoothCodecConfig +android.bluetooth.BluetoothCodecConfig$1 android.bluetooth.BluetoothCodecStatus +android.bluetooth.BluetoothCodecStatus$1 android.bluetooth.BluetoothDevice android.bluetooth.BluetoothDevice$1 android.bluetooth.BluetoothDevice$2 -android.bluetooth.BluetoothGattCallbackWrapper android.bluetooth.BluetoothGattCharacteristic android.bluetooth.BluetoothGattDescriptor android.bluetooth.BluetoothGattService @@ -674,8 +698,6 @@ android.bluetooth.IBluetooth$Stub$Proxy android.bluetooth.IBluetoothA2dp android.bluetooth.IBluetoothA2dp$Stub android.bluetooth.IBluetoothA2dp$Stub$Proxy -android.bluetooth.IBluetoothA2dpSink -android.bluetooth.IBluetoothA2dpSink$Stub android.bluetooth.IBluetoothCallback android.bluetooth.IBluetoothCallback$Stub android.bluetooth.IBluetoothCallback$Stub$Proxy @@ -683,14 +705,10 @@ android.bluetooth.IBluetoothGatt android.bluetooth.IBluetoothGatt$Stub android.bluetooth.IBluetoothGatt$Stub$Proxy android.bluetooth.IBluetoothGattCallback -android.bluetooth.IBluetoothGattCallback$Stub -android.bluetooth.IBluetoothGattCallback$Stub$Proxy android.bluetooth.IBluetoothGattServerCallback android.bluetooth.IBluetoothHeadset android.bluetooth.IBluetoothHeadset$Stub android.bluetooth.IBluetoothHeadset$Stub$Proxy -android.bluetooth.IBluetoothHeadsetClient -android.bluetooth.IBluetoothHeadsetClient$Stub android.bluetooth.IBluetoothHeadsetPhone android.bluetooth.IBluetoothHeadsetPhone$Stub android.bluetooth.IBluetoothHeadsetPhone$Stub$Proxy @@ -715,8 +733,6 @@ android.bluetooth.IBluetoothPan$Stub$Proxy android.bluetooth.IBluetoothPbap android.bluetooth.IBluetoothPbap$Stub android.bluetooth.IBluetoothPbap$Stub$Proxy -android.bluetooth.IBluetoothPbapClient -android.bluetooth.IBluetoothPbapClient$Stub android.bluetooth.IBluetoothProfileServiceConnection android.bluetooth.IBluetoothProfileServiceConnection$Stub android.bluetooth.IBluetoothProfileServiceConnection$Stub$Proxy @@ -736,11 +752,15 @@ android.bluetooth.UidTraffic android.bluetooth.UidTraffic$1 android.bluetooth.le.AdvertiseData android.bluetooth.le.AdvertiseSettings -android.bluetooth.le.BluetoothLeAdvertiser android.bluetooth.le.BluetoothLeScanner android.bluetooth.le.BluetoothLeScanner$BleScanCallbackWrapper android.bluetooth.le.BluetoothLeScanner$BleScanCallbackWrapper$1 +android.bluetooth.le.BluetoothLeScanner$BleScanCallbackWrapper$2 android.bluetooth.le.BluetoothLeUtils +android.bluetooth.le.IAdvertiserCallback +android.bluetooth.le.IScannerCallback +android.bluetooth.le.IScannerCallback$Stub +android.bluetooth.le.IScannerCallback$Stub$Proxy android.bluetooth.le.ScanCallback android.bluetooth.le.ScanFilter android.bluetooth.le.ScanFilter$1 @@ -826,6 +846,7 @@ android.content.IIntentSender$Stub android.content.IIntentSender$Stub$Proxy android.content.IOnPrimaryClipChangedListener android.content.IOnPrimaryClipChangedListener$Stub +android.content.IOnPrimaryClipChangedListener$Stub$Proxy android.content.IRestrictionsManager android.content.IRestrictionsManager$Stub android.content.IRestrictionsManager$Stub$Proxy @@ -841,14 +862,11 @@ android.content.ISyncStatusObserver$Stub$Proxy android.content.Intent android.content.Intent$1 android.content.Intent$FilterComparison -android.content.Intent$ShortcutIconResource -android.content.Intent$ShortcutIconResource$1 android.content.IntentFilter android.content.IntentFilter$1 android.content.IntentFilter$AuthorityEntry android.content.IntentFilter$MalformedMimeTypeException android.content.IntentSender -android.content.IntentSender$1 android.content.IntentSender$SendIntentException android.content.Loader android.content.Loader$ForceLoadContentObserver @@ -893,11 +911,14 @@ android.content.UriMatcher android.content.UriPermission android.content.pm.ActivityInfo android.content.pm.ActivityInfo$1 +android.content.pm.ActivityInfo$WindowLayout android.content.pm.ApplicationInfo android.content.pm.ApplicationInfo$1 android.content.pm.ComponentInfo android.content.pm.ConfigurationInfo android.content.pm.ConfigurationInfo$1 +android.content.pm.EphemeralResponse +android.content.pm.FallbackCategoryProvider android.content.pm.FeatureGroupInfo android.content.pm.FeatureGroupInfo$1 android.content.pm.FeatureInfo @@ -914,16 +935,9 @@ android.content.pm.IOnPermissionsChangeListener$Stub$Proxy android.content.pm.IOtaDexopt android.content.pm.IOtaDexopt$Stub android.content.pm.IPackageDataObserver -android.content.pm.IPackageDataObserver$Stub -android.content.pm.IPackageDataObserver$Stub$Proxy android.content.pm.IPackageDeleteObserver -android.content.pm.IPackageDeleteObserver$Stub android.content.pm.IPackageDeleteObserver2 -android.content.pm.IPackageDeleteObserver2$Stub -android.content.pm.IPackageInstallObserver -android.content.pm.IPackageInstallObserver$Stub android.content.pm.IPackageInstallObserver2 -android.content.pm.IPackageInstallObserver2$Stub android.content.pm.IPackageInstaller android.content.pm.IPackageInstaller$Stub android.content.pm.IPackageInstaller$Stub$Proxy @@ -931,8 +945,6 @@ android.content.pm.IPackageInstallerCallback android.content.pm.IPackageInstallerCallback$Stub android.content.pm.IPackageInstallerCallback$Stub$Proxy android.content.pm.IPackageInstallerSession -android.content.pm.IPackageInstallerSession$Stub -android.content.pm.IPackageInstallerSession$Stub$Proxy android.content.pm.IPackageManager android.content.pm.IPackageManager$Stub android.content.pm.IPackageManager$Stub$Proxy @@ -944,6 +956,7 @@ android.content.pm.IPackageStatsObserver$Stub android.content.pm.IPackageStatsObserver$Stub$Proxy android.content.pm.IShortcutService android.content.pm.IShortcutService$Stub +android.content.pm.IShortcutService$Stub$Proxy android.content.pm.InstrumentationInfo android.content.pm.InstrumentationInfo$1 android.content.pm.IntentFilterVerificationInfo @@ -956,46 +969,49 @@ android.content.pm.LauncherApps$1 android.content.pm.LauncherApps$Callback android.content.pm.LauncherApps$CallbackMessageHandler android.content.pm.LauncherApps$CallbackMessageHandler$CallbackInfo +android.content.pm.LauncherApps$ShortcutQuery android.content.pm.PackageCleanItem -android.content.pm.PackageCleanItem$1 android.content.pm.PackageInfo android.content.pm.PackageInfo$1 android.content.pm.PackageInfoLite -android.content.pm.PackageInfoLite$1 android.content.pm.PackageInstaller android.content.pm.PackageInstaller$Session android.content.pm.PackageInstaller$SessionCallback android.content.pm.PackageInstaller$SessionCallbackDelegate android.content.pm.PackageInstaller$SessionInfo -android.content.pm.PackageInstaller$SessionInfo$1 android.content.pm.PackageInstaller$SessionParams -android.content.pm.PackageInstaller$SessionParams$1 android.content.pm.PackageItemInfo android.content.pm.PackageManager -android.content.pm.PackageManager$LegacyPackageDeleteObserver android.content.pm.PackageManager$MoveCallback android.content.pm.PackageManager$NameNotFoundException android.content.pm.PackageManager$OnPermissionsChangedListener android.content.pm.PackageManagerInternal +android.content.pm.PackageManagerInternal$ExternalSourcesPolicy android.content.pm.PackageManagerInternal$PackagesProvider android.content.pm.PackageManagerInternal$SyncAdapterPackagesProvider android.content.pm.PackageParser android.content.pm.PackageParser$Activity +android.content.pm.PackageParser$Activity$1 android.content.pm.PackageParser$ActivityIntentInfo android.content.pm.PackageParser$ApkLite android.content.pm.PackageParser$Component android.content.pm.PackageParser$IntentInfo android.content.pm.PackageParser$NewPermissionInfo android.content.pm.PackageParser$Package +android.content.pm.PackageParser$Package$1 android.content.pm.PackageParser$PackageLite android.content.pm.PackageParser$PackageParserException android.content.pm.PackageParser$ParseComponentArgs android.content.pm.PackageParser$ParsePackageItemArgs android.content.pm.PackageParser$Permission +android.content.pm.PackageParser$Permission$1 android.content.pm.PackageParser$PermissionGroup +android.content.pm.PackageParser$PermissionGroup$1 android.content.pm.PackageParser$Provider +android.content.pm.PackageParser$Provider$1 android.content.pm.PackageParser$ProviderIntentInfo android.content.pm.PackageParser$Service +android.content.pm.PackageParser$Service$1 android.content.pm.PackageParser$ServiceIntentInfo android.content.pm.PackageParser$SplitNameComparator android.content.pm.PackageParser$SplitPermissionInfo @@ -1024,6 +1040,11 @@ android.content.pm.ResolveInfo android.content.pm.ResolveInfo$1 android.content.pm.ServiceInfo android.content.pm.ServiceInfo$1 +android.content.pm.SharedLibraryInfo +android.content.pm.SharedLibraryInfo$1 +android.content.pm.ShortcutInfo +android.content.pm.ShortcutInfo$1 +android.content.pm.ShortcutInfo$Builder android.content.pm.ShortcutManager android.content.pm.ShortcutServiceInternal android.content.pm.ShortcutServiceInternal$ShortcutChangeListener @@ -1033,7 +1054,18 @@ android.content.pm.UserInfo android.content.pm.UserInfo$1 android.content.pm.VerifierDeviceIdentity android.content.pm.VerifierInfo +android.content.pm.VersionedPackage +android.content.pm.VersionedPackage$1 android.content.pm.XmlSerializerAndParser +android.content.pm.permission.IRuntimePermissionPresenter +android.content.pm.permission.IRuntimePermissionPresenter$Stub +android.content.pm.permission.IRuntimePermissionPresenter$Stub$Proxy +android.content.pm.permission.RuntimePermissionPresentationInfo +android.content.pm.permission.RuntimePermissionPresentationInfo$1 +android.content.pm.permission.RuntimePermissionPresenter +android.content.pm.permission.RuntimePermissionPresenter$OnResultCallback +android.content.pm.permission.RuntimePermissionPresenter$RemoteService +android.content.pm.permission.RuntimePermissionPresenter$RemoteService$1 android.content.res.AssetFileDescriptor android.content.res.AssetFileDescriptor$1 android.content.res.AssetFileDescriptor$AutoCloseInputStream @@ -1109,6 +1141,7 @@ android.database.Observable android.database.SQLException android.database.sqlite.DatabaseObjectNotClosedException android.database.sqlite.SQLiteAbortException +android.database.sqlite.SQLiteAccessPermException android.database.sqlite.SQLiteCantOpenDatabaseException android.database.sqlite.SQLiteClosable android.database.sqlite.SQLiteConnection @@ -1144,6 +1177,7 @@ android.database.sqlite.SQLiteOpenHelper android.database.sqlite.SQLiteProgram android.database.sqlite.SQLiteQuery android.database.sqlite.SQLiteQueryBuilder +android.database.sqlite.SQLiteReadOnlyDatabaseException android.database.sqlite.SQLiteSession android.database.sqlite.SQLiteSession$Transaction android.database.sqlite.SQLiteStatement @@ -1170,6 +1204,7 @@ android.drm.DrmManagerClient$OnEventListener android.drm.DrmManagerClient$OnInfoListener android.drm.DrmOutputStream android.drm.DrmSupportInfo +android.graphics.BaseCanvas android.graphics.Bitmap android.graphics.Bitmap$1 android.graphics.Bitmap$CompressFormat @@ -1196,23 +1231,20 @@ android.graphics.DashPathEffect android.graphics.DiscretePathEffect android.graphics.DrawFilter android.graphics.EmbossMaskFilter -android.graphics.FontConfig -android.graphics.FontConfig$Alias -android.graphics.FontConfig$Axis -android.graphics.FontConfig$Family -android.graphics.FontConfig$Font android.graphics.FontFamily android.graphics.FontListParser +android.graphics.GraphicBuffer +android.graphics.GraphicBuffer$1 android.graphics.ImageFormat android.graphics.Insets android.graphics.Interpolator android.graphics.Interpolator$Result -android.graphics.LayerRasterizer android.graphics.LightingColorFilter android.graphics.LinearGradient android.graphics.MaskFilter android.graphics.Matrix android.graphics.Matrix$1 +android.graphics.Matrix$NoImagePreloadHolder android.graphics.Matrix$ScaleToFit android.graphics.Movie android.graphics.NinePatch @@ -1246,7 +1278,6 @@ android.graphics.PorterDuff$Mode android.graphics.PorterDuffColorFilter android.graphics.PorterDuffXfermode android.graphics.RadialGradient -android.graphics.Rasterizer android.graphics.Rect android.graphics.Rect$1 android.graphics.Rect$UnflattenHelper @@ -1270,7 +1301,6 @@ android.graphics.Xfermode android.graphics.YuvImage android.graphics.drawable.Animatable android.graphics.drawable.Animatable2 -android.graphics.drawable.Animatable2$AnimationCallback android.graphics.drawable.AnimatedRotateDrawable android.graphics.drawable.AnimatedRotateDrawable$1 android.graphics.drawable.AnimatedRotateDrawable$AnimatedRotateState @@ -1282,7 +1312,6 @@ android.graphics.drawable.AnimatedStateListDrawable$FrameInterpolator android.graphics.drawable.AnimatedStateListDrawable$Transition android.graphics.drawable.AnimatedVectorDrawable android.graphics.drawable.AnimatedVectorDrawable$1 -android.graphics.drawable.AnimatedVectorDrawable$2 android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState$PendingAnimator android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimator @@ -1301,6 +1330,7 @@ android.graphics.drawable.Drawable$Callback android.graphics.drawable.Drawable$ConstantState android.graphics.drawable.DrawableContainer android.graphics.drawable.DrawableContainer$1 +android.graphics.drawable.DrawableContainer$BlockInvalidateCallback android.graphics.drawable.DrawableContainer$DrawableContainerState android.graphics.drawable.DrawableInflater android.graphics.drawable.DrawableWrapper @@ -1349,13 +1379,31 @@ android.graphics.drawable.VectorDrawable android.graphics.drawable.VectorDrawable$VClipPath android.graphics.drawable.VectorDrawable$VFullPath android.graphics.drawable.VectorDrawable$VFullPath$1 +android.graphics.drawable.VectorDrawable$VFullPath$10 +android.graphics.drawable.VectorDrawable$VFullPath$2 +android.graphics.drawable.VectorDrawable$VFullPath$3 +android.graphics.drawable.VectorDrawable$VFullPath$4 +android.graphics.drawable.VectorDrawable$VFullPath$5 +android.graphics.drawable.VectorDrawable$VFullPath$6 +android.graphics.drawable.VectorDrawable$VFullPath$7 +android.graphics.drawable.VectorDrawable$VFullPath$8 +android.graphics.drawable.VectorDrawable$VFullPath$9 android.graphics.drawable.VectorDrawable$VGroup android.graphics.drawable.VectorDrawable$VGroup$1 +android.graphics.drawable.VectorDrawable$VGroup$2 +android.graphics.drawable.VectorDrawable$VGroup$3 +android.graphics.drawable.VectorDrawable$VGroup$4 +android.graphics.drawable.VectorDrawable$VGroup$5 +android.graphics.drawable.VectorDrawable$VGroup$6 +android.graphics.drawable.VectorDrawable$VGroup$7 +android.graphics.drawable.VectorDrawable$VGroup$8 +android.graphics.drawable.VectorDrawable$VGroup$9 android.graphics.drawable.VectorDrawable$VObject android.graphics.drawable.VectorDrawable$VPath +android.graphics.drawable.VectorDrawable$VPath$1 android.graphics.drawable.VectorDrawable$VectorDrawableState +android.graphics.drawable.VectorDrawable$VectorDrawableState$1 android.graphics.drawable.shapes.OvalShape -android.graphics.drawable.shapes.PathShape android.graphics.drawable.shapes.RectShape android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.Shape @@ -1363,7 +1411,6 @@ android.graphics.pdf.PdfDocument android.graphics.pdf.PdfEditor android.graphics.pdf.PdfRenderer android.hardware.Camera -android.hardware.Camera$Area android.hardware.Camera$AutoFocusCallback android.hardware.Camera$AutoFocusMoveCallback android.hardware.Camera$CameraInfo @@ -1377,9 +1424,13 @@ android.hardware.Camera$PictureCallback android.hardware.Camera$PreviewCallback android.hardware.Camera$ShutterCallback android.hardware.Camera$Size +android.hardware.CameraStatus +android.hardware.CameraStatus$1 android.hardware.ConsumerIrManager android.hardware.GeomagneticField android.hardware.GeomagneticField$LegendreTable +android.hardware.HardwareBuffer +android.hardware.HardwareBuffer$1 android.hardware.ICameraService android.hardware.ICameraService$Stub android.hardware.ICameraService$Stub$Proxy @@ -1419,8 +1470,11 @@ android.hardware.camera2.CameraDevice$StateCallback android.hardware.camera2.CameraManager android.hardware.camera2.CameraManager$AvailabilityCallback android.hardware.camera2.CameraManager$CameraManagerGlobal +android.hardware.camera2.CameraManager$CameraManagerGlobal$1 +android.hardware.camera2.CameraManager$CameraManagerGlobal$2 android.hardware.camera2.CameraManager$CameraManagerGlobal$3 android.hardware.camera2.CameraManager$CameraManagerGlobal$4 +android.hardware.camera2.CameraManager$CameraManagerGlobal$5 android.hardware.camera2.CameraManager$TorchCallback android.hardware.camera2.CameraMetadata android.hardware.camera2.CaptureFailure @@ -1461,6 +1515,7 @@ android.hardware.camera2.impl.CameraCaptureSessionImpl$SequenceDrainListener android.hardware.camera2.impl.CameraDeviceImpl android.hardware.camera2.impl.CameraDeviceImpl$1 android.hardware.camera2.impl.CameraDeviceImpl$10 +android.hardware.camera2.impl.CameraDeviceImpl$11 android.hardware.camera2.impl.CameraDeviceImpl$2 android.hardware.camera2.impl.CameraDeviceImpl$3 android.hardware.camera2.impl.CameraDeviceImpl$4 @@ -1472,7 +1527,6 @@ android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$2 android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$3 android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$4 -android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$5 android.hardware.camera2.impl.CameraDeviceImpl$CameraDeviceCallbacks$6 android.hardware.camera2.impl.CameraDeviceImpl$CaptureCallback android.hardware.camera2.impl.CameraDeviceImpl$CaptureCallbackHolder @@ -1565,7 +1619,6 @@ android.hardware.camera2.params.StreamConfiguration android.hardware.camera2.params.StreamConfigurationDuration android.hardware.camera2.params.StreamConfigurationMap android.hardware.camera2.params.TonemapCurve -android.hardware.camera2.utils.ArrayUtils android.hardware.camera2.utils.HashCodeHelpers android.hardware.camera2.utils.SubmitInfo android.hardware.camera2.utils.SubmitInfo$1 @@ -1605,21 +1658,11 @@ android.hardware.fingerprint.Fingerprint$1 android.hardware.fingerprint.FingerprintManager android.hardware.fingerprint.FingerprintManager$1 android.hardware.fingerprint.FingerprintManager$2 -android.hardware.fingerprint.FingerprintManager$2$1 android.hardware.fingerprint.FingerprintManager$AuthenticationCallback android.hardware.fingerprint.FingerprintManager$AuthenticationResult -android.hardware.fingerprint.FingerprintManager$CryptoObject -android.hardware.fingerprint.FingerprintManager$EnrollmentCallback android.hardware.fingerprint.FingerprintManager$LockoutResetCallback android.hardware.fingerprint.FingerprintManager$MyHandler -android.hardware.fingerprint.FingerprintManager$OnAuthenticationCancelListener -android.hardware.fingerprint.FingerprintManager$OnEnrollCancelListener -android.hardware.fingerprint.FingerprintManager$RemovalCallback -android.hardware.fingerprint.IFingerprintDaemon -android.hardware.fingerprint.IFingerprintDaemon$Stub -android.hardware.fingerprint.IFingerprintDaemon$Stub$Proxy -android.hardware.fingerprint.IFingerprintDaemonCallback -android.hardware.fingerprint.IFingerprintDaemonCallback$Stub +android.hardware.fingerprint.IFingerprintClientActiveCallback android.hardware.fingerprint.IFingerprintService android.hardware.fingerprint.IFingerprintService$Stub android.hardware.fingerprint.IFingerprintService$Stub$Proxy @@ -1628,14 +1671,8 @@ android.hardware.fingerprint.IFingerprintServiceLockoutResetCallback$Stub android.hardware.fingerprint.IFingerprintServiceLockoutResetCallback$Stub$Proxy android.hardware.fingerprint.IFingerprintServiceReceiver android.hardware.fingerprint.IFingerprintServiceReceiver$Stub -android.hardware.fingerprint.IFingerprintServiceReceiver$Stub$Proxy -android.hardware.hdmi.HdmiClient android.hardware.hdmi.HdmiControlManager -android.hardware.hdmi.HdmiPlaybackClient android.hardware.hdmi.HdmiPlaybackClient$DisplayStatusCallback -android.hardware.hdmi.HdmiTvClient -android.hardware.hdmi.IHdmiControlService -android.hardware.hdmi.IHdmiControlService$Stub android.hardware.input.IInputDevicesChangedListener android.hardware.input.IInputDevicesChangedListener$Stub android.hardware.input.IInputDevicesChangedListener$Stub$Proxy @@ -1655,13 +1692,15 @@ android.hardware.input.KeyboardLayout android.hardware.input.KeyboardLayout$1 android.hardware.input.TouchCalibration android.hardware.input.TouchCalibration$1 -android.hardware.location.ActivityChangedEvent android.hardware.location.ActivityRecognitionHardware -android.hardware.location.ActivityRecognitionHardware$SinkList android.hardware.location.ContextHubInfo android.hardware.location.ContextHubInfo$1 android.hardware.location.ContextHubManager -android.hardware.location.ContextHubService +android.hardware.location.ContextHubManager$1 +android.hardware.location.ContextHubManager$Callback +android.hardware.location.ContextHubManager$ICallback +android.hardware.location.ContextHubMessage +android.hardware.location.ContextHubMessage$1 android.hardware.location.GeofenceHardware android.hardware.location.GeofenceHardware$GeofenceHardwareMonitorCallbackWrapper android.hardware.location.GeofenceHardwareCallback @@ -1671,27 +1710,21 @@ android.hardware.location.GeofenceHardwareImpl$2 android.hardware.location.GeofenceHardwareImpl$3 android.hardware.location.GeofenceHardwareImpl$Reaper android.hardware.location.GeofenceHardwareMonitorCallback -android.hardware.location.GeofenceHardwareRequestParcelable android.hardware.location.GeofenceHardwareService android.hardware.location.GeofenceHardwareService$1 android.hardware.location.IActivityRecognitionHardware android.hardware.location.IActivityRecognitionHardware$Stub -android.hardware.location.IActivityRecognitionHardware$Stub$Proxy android.hardware.location.IActivityRecognitionHardwareClient android.hardware.location.IActivityRecognitionHardwareClient$Stub android.hardware.location.IActivityRecognitionHardwareClient$Stub$Proxy -android.hardware.location.IActivityRecognitionHardwareSink -android.hardware.location.IActivityRecognitionHardwareSink$Stub -android.hardware.location.IActivityRecognitionHardwareSink$Stub$Proxy android.hardware.location.IActivityRecognitionHardwareWatcher +android.hardware.location.IContextHubCallback +android.hardware.location.IContextHubCallback$Stub +android.hardware.location.IContextHubCallback$Stub$Proxy android.hardware.location.IContextHubService android.hardware.location.IContextHubService$Stub +android.hardware.location.IContextHubService$Stub$Proxy android.hardware.location.IFusedLocationHardware -android.hardware.location.IFusedLocationHardware$Stub -android.hardware.location.IFusedLocationHardware$Stub$Proxy -android.hardware.location.IFusedLocationHardwareSink -android.hardware.location.IFusedLocationHardwareSink$Stub -android.hardware.location.IFusedLocationHardwareSink$Stub$Proxy android.hardware.location.IGeofenceHardware android.hardware.location.IGeofenceHardware$Stub android.hardware.location.IGeofenceHardware$Stub$Proxy @@ -1699,6 +1732,10 @@ android.hardware.location.IGeofenceHardwareMonitorCallback android.hardware.location.IGeofenceHardwareMonitorCallback$Stub android.hardware.location.IGeofenceHardwareMonitorCallback$Stub$Proxy android.hardware.location.MemoryRegion +android.hardware.location.MemoryRegion$1 +android.hardware.location.NanoApp +android.hardware.location.NanoAppFilter +android.hardware.location.NanoAppFilter$1 android.hardware.location.NanoAppInstanceInfo android.hardware.location.NanoAppInstanceInfo$1 android.hardware.radio.RadioManager @@ -1722,6 +1759,21 @@ android.hardware.radio.RadioMetadata android.hardware.radio.RadioMetadata$1 android.hardware.radio.RadioModule android.hardware.radio.RadioTuner +android.hardware.radio.V1_0.Call +android.hardware.radio.V1_0.CardStatus +android.hardware.radio.V1_0.CdmaSignalStrength +android.hardware.radio.V1_0.EvdoSignalStrength +android.hardware.radio.V1_0.GsmSignalStrength +android.hardware.radio.V1_0.IRadio +android.hardware.radio.V1_0.IRadio$Proxy +android.hardware.radio.V1_0.IRadioIndication +android.hardware.radio.V1_0.IRadioIndication$Stub +android.hardware.radio.V1_0.IRadioResponse +android.hardware.radio.V1_0.IRadioResponse$Stub +android.hardware.radio.V1_0.LteSignalStrength +android.hardware.radio.V1_0.RadioResponseInfo +android.hardware.radio.V1_0.SignalStrength +android.hardware.radio.V1_0.TdScdmaSignalStrength android.hardware.soundtrigger.IRecognitionStatusCallback android.hardware.soundtrigger.IRecognitionStatusCallback$Stub android.hardware.soundtrigger.KeyphraseEnrollmentInfo @@ -1757,21 +1809,28 @@ android.hardware.usb.IUsbManager$Stub$Proxy android.hardware.usb.UsbAccessory android.hardware.usb.UsbDevice android.hardware.usb.UsbDeviceConnection -android.hardware.usb.UsbInterface android.hardware.usb.UsbManager android.hardware.usb.UsbPort android.hardware.usb.UsbPort$1 android.hardware.usb.UsbPortStatus android.hardware.usb.UsbPortStatus$1 android.hardware.usb.UsbRequest +android.hidl.base.V1_0.IBase android.icu.impl.BMPSet android.icu.impl.CacheBase android.icu.impl.CacheValue android.icu.impl.CacheValue$NullValue android.icu.impl.CacheValue$SoftValue android.icu.impl.CacheValue$Strength -android.icu.impl.CalendarData +android.icu.impl.CalendarAstronomer +android.icu.impl.CalendarAstronomer$2 +android.icu.impl.CalendarAstronomer$CoordFunc +android.icu.impl.CalendarAstronomer$Equatorial +android.icu.impl.CalendarAstronomer$MoonAge +android.icu.impl.CalendarAstronomer$SolarLongitude android.icu.impl.CalendarUtil +android.icu.impl.CalendarUtil$CalendarPreferences +android.icu.impl.CaseMap$StringContextIterator android.icu.impl.CharTrie android.icu.impl.CharacterIteration android.icu.impl.ClassLoaderUtil @@ -1779,6 +1838,8 @@ android.icu.impl.CurrencyData android.icu.impl.CurrencyData$CurrencyDisplayInfo android.icu.impl.CurrencyData$CurrencyDisplayInfoProvider android.icu.impl.CurrencyData$CurrencySpacingInfo +android.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingPattern +android.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingType android.icu.impl.DateNumberFormat android.icu.impl.DontCareFieldPosition android.icu.impl.Grego @@ -1792,6 +1853,7 @@ android.icu.impl.ICUCache android.icu.impl.ICUConfig android.icu.impl.ICUCurrencyDisplayInfoProvider android.icu.impl.ICUCurrencyDisplayInfoProvider$ICUCurrencyDisplayInfo +android.icu.impl.ICUCurrencyDisplayInfoProvider$ICUCurrencyDisplayInfo$SpacingInfoSink android.icu.impl.ICUCurrencyMetaInfo android.icu.impl.ICUCurrencyMetaInfo$Collector android.icu.impl.ICUCurrencyMetaInfo$CurrencyCollector @@ -1809,8 +1871,11 @@ android.icu.impl.ICURegionDataTables android.icu.impl.ICUResourceBundle android.icu.impl.ICUResourceBundle$1 android.icu.impl.ICUResourceBundle$2 -android.icu.impl.ICUResourceBundle$2$1 +android.icu.impl.ICUResourceBundle$3 +android.icu.impl.ICUResourceBundle$3$1 +android.icu.impl.ICUResourceBundle$4 android.icu.impl.ICUResourceBundle$AvailEntry +android.icu.impl.ICUResourceBundle$Loader android.icu.impl.ICUResourceBundle$OpenType android.icu.impl.ICUResourceBundle$WholeBundle android.icu.impl.ICUResourceBundleImpl @@ -1844,6 +1909,7 @@ android.icu.impl.IDNA2003 android.icu.impl.JavaTimeZone android.icu.impl.LocaleDisplayNamesImpl android.icu.impl.LocaleDisplayNamesImpl$Cache +android.icu.impl.LocaleDisplayNamesImpl$CapitalizationContextSink android.icu.impl.LocaleDisplayNamesImpl$CapitalizationContextUsage android.icu.impl.LocaleDisplayNamesImpl$DataTable android.icu.impl.LocaleDisplayNamesImpl$DataTables @@ -1875,21 +1941,10 @@ android.icu.impl.PluralRulesLoader android.icu.impl.ReplaceableUCharacterIterator android.icu.impl.RuleCharacterIterator android.icu.impl.SimpleCache -android.icu.impl.SimplePatternFormatter +android.icu.impl.SimpleFormatterImpl android.icu.impl.SoftCache android.icu.impl.StandardPlural android.icu.impl.StringPrepDataReader -android.icu.impl.TextTrieMap -android.icu.impl.TextTrieMap$CharIterator -android.icu.impl.TextTrieMap$Node -android.icu.impl.TimeZoneNamesFactoryImpl -android.icu.impl.TimeZoneNamesImpl -android.icu.impl.TimeZoneNamesImpl$MZ2TZsCache -android.icu.impl.TimeZoneNamesImpl$MZMapEntry -android.icu.impl.TimeZoneNamesImpl$NameInfo -android.icu.impl.TimeZoneNamesImpl$TZ2MZsCache -android.icu.impl.TimeZoneNamesImpl$ZNames -android.icu.impl.TimeZoneNamesImpl$ZNamesLoader android.icu.impl.Trie android.icu.impl.Trie$DataManipulate android.icu.impl.Trie$DefaultGetFoldingOffset @@ -1942,8 +1997,10 @@ android.icu.impl.UCharacterProperty$NormQuickCheckIntProperty android.icu.impl.UPropertyAliases android.icu.impl.UPropertyAliases$IsAcceptable android.icu.impl.URLHandler$URLVisitor +android.icu.impl.UResource$Array android.icu.impl.UResource$Key -android.icu.impl.UResource$TableSink +android.icu.impl.UResource$Sink +android.icu.impl.UResource$Table android.icu.impl.UResource$Value android.icu.impl.USerializedSet android.icu.impl.Utility @@ -1979,7 +2036,6 @@ android.icu.impl.locale.LocaleObjectCache android.icu.impl.locale.LocaleObjectCache$CacheEntry android.icu.impl.locale.LocaleSyntaxException android.icu.lang.UCharacter -android.icu.lang.UCharacter$StringContextIterator android.icu.lang.UCharacterEnums$ECharacterCategory android.icu.lang.UCharacterEnums$ECharacterDirection android.icu.lang.UScript @@ -2014,26 +2070,36 @@ android.icu.text.DateFormat android.icu.text.DateFormat$BooleanAttribute android.icu.text.DateFormat$Field android.icu.text.DateFormatSymbols +android.icu.text.DateFormatSymbols$1 +android.icu.text.DateFormatSymbols$CalendarDataSink +android.icu.text.DateFormatSymbols$CalendarDataSink$AliasType android.icu.text.DateFormatSymbols$CapitalizationContextUsage android.icu.text.DateIntervalFormat android.icu.text.DateIntervalFormat$BestMatchInfo android.icu.text.DateIntervalFormat$SkeletonAndItsBestMatch android.icu.text.DateIntervalInfo +android.icu.text.DateIntervalInfo$DateIntervalSink android.icu.text.DateIntervalInfo$PatternInfo android.icu.text.DateTimePatternGenerator +android.icu.text.DateTimePatternGenerator$AppendItemFormatsSink +android.icu.text.DateTimePatternGenerator$AppendItemNamesSink +android.icu.text.DateTimePatternGenerator$AvailableFormatsSink android.icu.text.DateTimePatternGenerator$DTPGflags android.icu.text.DateTimePatternGenerator$DateTimeMatcher +android.icu.text.DateTimePatternGenerator$DayPeriodAllowedHoursSink android.icu.text.DateTimePatternGenerator$DistanceInfo android.icu.text.DateTimePatternGenerator$FormatParser android.icu.text.DateTimePatternGenerator$PatternInfo android.icu.text.DateTimePatternGenerator$PatternWithMatcher android.icu.text.DateTimePatternGenerator$PatternWithSkeletonFlag +android.icu.text.DateTimePatternGenerator$SkeletonFields android.icu.text.DateTimePatternGenerator$VariableField android.icu.text.DecimalFormat android.icu.text.DecimalFormat$Unit android.icu.text.DecimalFormatSymbols android.icu.text.DecimalFormatSymbols$1 android.icu.text.DecimalFormatSymbols$CacheData +android.icu.text.DecimalFormatSymbols$DecFmtDataSink android.icu.text.DigitList android.icu.text.DisplayContext android.icu.text.DisplayContext$Type @@ -2045,14 +2111,6 @@ android.icu.text.ListFormatter$FormattedListBuilder android.icu.text.ListFormatter$Style android.icu.text.LocaleDisplayNames android.icu.text.LocaleDisplayNames$DialectHandling -android.icu.text.MessageFormat -android.icu.text.MessageFormat$AppendableWrapper -android.icu.text.MessageFormat$Field -android.icu.text.MessagePattern -android.icu.text.MessagePattern$ApostropheMode -android.icu.text.MessagePattern$ArgType -android.icu.text.MessagePattern$Part -android.icu.text.MessagePattern$Part$Type android.icu.text.Normalizer android.icu.text.Normalizer$FCDMode android.icu.text.Normalizer$Mode @@ -2074,6 +2132,9 @@ android.icu.text.NumberFormatServiceShim android.icu.text.NumberFormatServiceShim$NFService android.icu.text.NumberFormatServiceShim$NFService$1RBNumberFormatFactory android.icu.text.NumberingSystem +android.icu.text.NumberingSystem$1 +android.icu.text.NumberingSystem$2 +android.icu.text.NumberingSystem$LocaleLookupData android.icu.text.PluralRanges android.icu.text.PluralRanges$Matrix android.icu.text.PluralRules @@ -2101,20 +2162,18 @@ android.icu.text.RawCollationKey android.icu.text.RelativeDateTimeFormatter android.icu.text.RelativeDateTimeFormatter$AbsoluteUnit android.icu.text.RelativeDateTimeFormatter$Cache +android.icu.text.RelativeDateTimeFormatter$Cache$1 android.icu.text.RelativeDateTimeFormatter$Direction android.icu.text.RelativeDateTimeFormatter$Loader -android.icu.text.RelativeDateTimeFormatter$RelDateTimeFmtDataSink -android.icu.text.RelativeDateTimeFormatter$RelDateTimeFmtDataSink$DateTimeUnit -android.icu.text.RelativeDateTimeFormatter$RelDateTimeFmtDataSink$RelativeSink -android.icu.text.RelativeDateTimeFormatter$RelDateTimeFmtDataSink$RelativeTimeDetailSink -android.icu.text.RelativeDateTimeFormatter$RelDateTimeFmtDataSink$RelativeTimeSink -android.icu.text.RelativeDateTimeFormatter$RelDateTimeFmtDataSink$UnitSink +android.icu.text.RelativeDateTimeFormatter$RelDateTimeDataSink +android.icu.text.RelativeDateTimeFormatter$RelDateTimeDataSink$DateTimeUnit android.icu.text.RelativeDateTimeFormatter$RelativeDateTimeFormatterData android.icu.text.RelativeDateTimeFormatter$RelativeUnit android.icu.text.RelativeDateTimeFormatter$Style android.icu.text.Replaceable android.icu.text.ReplaceableString android.icu.text.RuleBasedBreakIterator +android.icu.text.RuleBasedBreakIterator$LookAheadResults android.icu.text.RuleBasedCollator android.icu.text.RuleBasedCollator$CollationBuffer android.icu.text.RuleBasedCollator$CollationKeyByteSink @@ -2125,9 +2184,6 @@ android.icu.text.SimpleDateFormat android.icu.text.SimpleDateFormat$PatternItem android.icu.text.StringPrep android.icu.text.StringPrepParseException -android.icu.text.TimeZoneNames -android.icu.text.TimeZoneNames$Cache -android.icu.text.TimeZoneNames$Factory android.icu.text.TimeZoneNames$NameType android.icu.text.UCharacterIterator android.icu.text.UFieldPosition @@ -2156,12 +2212,19 @@ android.icu.util.Calendar$WeekDataCache android.icu.util.CharsTrie android.icu.util.CharsTrie$Entry android.icu.util.CharsTrie$Iterator +android.icu.util.ChineseCalendar android.icu.util.Currency +android.icu.util.Currency$1 android.icu.util.Currency$CurrencyUsage android.icu.util.Currency$EquivalenceRelation android.icu.util.CurrencyAmount android.icu.util.Freezable android.icu.util.GregorianCalendar +android.icu.util.HebrewCalendar +android.icu.util.ICUException +android.icu.util.IndianCalendar +android.icu.util.IslamicCalendar +android.icu.util.IslamicCalendar$CalculationType android.icu.util.LocaleData android.icu.util.Measure android.icu.util.MeasureUnit @@ -2175,11 +2238,13 @@ android.icu.util.TimeUnit android.icu.util.TimeZone android.icu.util.TimeZone$ConstantZone android.icu.util.ULocale +android.icu.util.ULocale$1 +android.icu.util.ULocale$2 android.icu.util.ULocale$Category android.icu.util.ULocale$JDKLocaleHelper android.icu.util.ULocale$Type android.icu.util.UResourceBundle -android.icu.util.UResourceBundle$ResourceCacheKey +android.icu.util.UResourceBundle$RootType android.icu.util.UResourceBundleIterator android.icu.util.UResourceTypeMismatchException android.icu.util.VersionInfo @@ -2197,26 +2262,17 @@ android.inputmethodservice.InputMethodService$InputMethodImpl android.inputmethodservice.InputMethodService$InputMethodSessionImpl android.inputmethodservice.InputMethodService$Insets android.inputmethodservice.InputMethodService$SettingsObserver -android.inputmethodservice.Keyboard -android.inputmethodservice.Keyboard$Key -android.inputmethodservice.Keyboard$Row -android.inputmethodservice.KeyboardView -android.inputmethodservice.KeyboardView$1 -android.inputmethodservice.KeyboardView$2 -android.inputmethodservice.KeyboardView$OnKeyboardActionListener -android.inputmethodservice.KeyboardView$SwipeTracker android.inputmethodservice.SoftInputWindow +android.inputmethodservice.SoftInputWindow$Callback android.location.Address android.location.Address$1 android.location.Country android.location.Country$1 android.location.CountryDetector android.location.CountryDetector$ListenerTransport +android.location.CountryDetector$ListenerTransport$1 android.location.CountryListener android.location.Criteria -android.location.Criteria$1 -android.location.FusedBatchOptions -android.location.FusedBatchOptions$1 android.location.Geocoder android.location.GeocoderParams android.location.GeocoderParams$1 @@ -2238,11 +2294,8 @@ android.location.ICountryDetector$Stub$Proxy android.location.ICountryListener android.location.ICountryListener$Stub android.location.ICountryListener$Stub$Proxy -android.location.IFusedGeofenceHardware -android.location.IFusedGeofenceHardware$Stub android.location.IFusedProvider android.location.IFusedProvider$Stub -android.location.IFusedProvider$Stub$Proxy android.location.IGeocodeProvider android.location.IGeocodeProvider$Stub android.location.IGeocodeProvider$Stub$Proxy @@ -2284,7 +2337,6 @@ android.location.LocationManager$ListenerTransport$2 android.location.LocationProvider android.location.LocationRequest android.location.LocationRequest$1 -android.media.AmrInputStream android.media.AudioAttributes android.media.AudioAttributes$1 android.media.AudioAttributes$Builder @@ -2303,6 +2355,7 @@ android.media.AudioHandle android.media.AudioManager android.media.AudioManager$1 android.media.AudioManager$2 +android.media.AudioManager$3 android.media.AudioManager$NativeEventHandlerDelegate android.media.AudioManager$NativeEventHandlerDelegate$1 android.media.AudioManager$OnAmPortUpdateListener @@ -2315,6 +2368,10 @@ android.media.AudioManagerInternal$RingerModeDelegate android.media.AudioMixPort android.media.AudioMixPortConfig android.media.AudioPatch +android.media.AudioPlaybackConfiguration +android.media.AudioPlaybackConfiguration$1 +android.media.AudioPlaybackConfiguration$IPlayerShell +android.media.AudioPlaybackConfiguration$PlayerDeathMonitor android.media.AudioPort android.media.AudioPortConfig android.media.AudioPortEventHandler @@ -2331,6 +2388,8 @@ android.media.AudioSystem$DynamicPolicyCallback android.media.AudioSystem$ErrorCallback android.media.AudioTimestamp android.media.AudioTrack +android.media.BufferingParams +android.media.BufferingParams$1 android.media.CamcorderProfile android.media.CameraProfile android.media.Cea708CaptionRenderer @@ -2339,11 +2398,9 @@ android.media.DecoderCapabilities android.media.DeniedByServerException android.media.EncoderCapabilities android.media.ExifInterface -android.media.ExifInterface$ByteOrderAwarenessDataInputStream -android.media.ExifInterface$ByteOrderAwarenessDataOutputStream +android.media.ExifInterface$ByteOrderedDataInputStream android.media.ExifInterface$ExifAttribute android.media.ExifInterface$ExifTag -android.media.ExifInterface$Rational android.media.IAudioFocusDispatcher android.media.IAudioFocusDispatcher$Stub android.media.IAudioFocusDispatcher$Stub$Proxy @@ -2357,12 +2414,23 @@ android.media.IMediaHTTPConnection android.media.IMediaHTTPConnection$Stub android.media.IMediaHTTPService android.media.IMediaHTTPService$Stub +android.media.IMediaResourceMonitor +android.media.IMediaResourceMonitor$Stub android.media.IMediaRouterClient android.media.IMediaRouterClient$Stub android.media.IMediaRouterClient$Stub$Proxy android.media.IMediaRouterService android.media.IMediaRouterService$Stub android.media.IMediaRouterService$Stub$Proxy +android.media.IMediaScannerListener +android.media.IMediaScannerListener$Stub +android.media.IMediaScannerService +android.media.IMediaScannerService$Stub +android.media.IPlaybackConfigDispatcher +android.media.IPlaybackConfigDispatcher$Stub +android.media.IPlayer +android.media.IPlayer$Stub +android.media.IPlayer$Stub$Proxy android.media.IRecordingConfigDispatcher android.media.IRecordingConfigDispatcher$Stub android.media.IRemoteVolumeController @@ -2390,14 +2458,10 @@ android.media.ImageWriter$OnImageReleasedListener android.media.ImageWriter$WriterSurfaceImage android.media.ImageWriter$WriterSurfaceImage$SurfacePlane android.media.JetPlayer -android.media.MediaActionSound -android.media.MediaActionSound$1 -android.media.MediaActionSound$SoundState android.media.MediaCodec android.media.MediaCodec$BufferInfo android.media.MediaCodec$BufferMap android.media.MediaCodec$BufferMap$CodecBuffer -android.media.MediaCodec$Callback android.media.MediaCodec$CodecException android.media.MediaCodec$CryptoException android.media.MediaCodec$CryptoInfo @@ -2413,7 +2477,6 @@ android.media.MediaCodecInfo$Feature android.media.MediaCodecInfo$VideoCapabilities android.media.MediaCodecList android.media.MediaCrypto -android.media.MediaCryptoException android.media.MediaDescription android.media.MediaDescription$1 android.media.MediaDescription$Builder @@ -2423,7 +2486,6 @@ android.media.MediaDrm$CryptoSession android.media.MediaDrm$EventHandler android.media.MediaDrm$KeyRequest android.media.MediaDrm$MediaDrmStateException -android.media.MediaDrm$OnEventListener android.media.MediaDrm$ProvisionRequest android.media.MediaDrmException android.media.MediaExtractor @@ -2441,7 +2503,8 @@ android.media.MediaMuxer android.media.MediaPlayer android.media.MediaPlayer$1 android.media.MediaPlayer$2 -android.media.MediaPlayer$2$1 +android.media.MediaPlayer$3 +android.media.MediaPlayer$3$1 android.media.MediaPlayer$EventHandler android.media.MediaPlayer$OnBufferingUpdateListener android.media.MediaPlayer$OnCompletionListener @@ -2473,6 +2536,7 @@ android.media.MediaRouter$Static$Client android.media.MediaRouter$Static$Client$1 android.media.MediaRouter$UserRouteInfo android.media.MediaRouter$VolumeCallback +android.media.MediaRouter$VolumeCallbackInfo android.media.MediaRouter$VolumeChangeReceiver android.media.MediaRouter$WifiDisplayStatusChangedReceiver android.media.MediaRouterClientState @@ -2480,7 +2544,13 @@ android.media.MediaRouterClientState$1 android.media.MediaRouterClientState$RouteInfo android.media.MediaRouterClientState$RouteInfo$1 android.media.MediaScanner +android.media.MediaScanner$FileEntry +android.media.MediaScanner$MediaBulkDeleter +android.media.MediaScanner$MyMediaScannerClient +android.media.MediaScannerClient android.media.MediaScannerConnection +android.media.MediaScannerConnection$1 +android.media.MediaScannerConnection$ClientProxy android.media.MediaScannerConnection$MediaScannerConnectionClient android.media.MediaScannerConnection$OnScanCompletedListener android.media.MediaSync @@ -2493,6 +2563,9 @@ android.media.PlaybackParams android.media.PlaybackParams$1 android.media.PlayerBase android.media.PlayerBase$1 +android.media.PlayerBase$2 +android.media.PlayerBase$PlayerIdCard +android.media.PlayerBase$PlayerIdCard$1 android.media.Rating android.media.Rating$1 android.media.RemoteControlClient @@ -2504,7 +2577,6 @@ android.media.Ringtone android.media.Ringtone$MyOnCompletionListener android.media.RingtoneManager android.media.SoundPool -android.media.SoundPool$1 android.media.SoundPool$Builder android.media.SoundPool$EventHandler android.media.SoundPool$OnLoadCompleteListener @@ -2520,7 +2592,6 @@ android.media.ThumbnailUtils android.media.ThumbnailUtils$SizedThumbnailBitmap android.media.ToneGenerator android.media.TtmlRenderer -android.media.UnsupportedSchemeException android.media.Utils android.media.Utils$1 android.media.Utils$2 @@ -2528,10 +2599,8 @@ android.media.VolumePolicy android.media.VolumePolicy$1 android.media.VolumeProvider android.media.WebVttRenderer -android.media.audiofx.AcousticEchoCanceler android.media.audiofx.AudioEffect android.media.audiofx.AudioEffect$Descriptor -android.media.audiofx.AutomaticGainControl android.media.audiofx.BassBoost android.media.audiofx.BassBoost$Settings android.media.audiofx.Equalizer @@ -2541,12 +2610,20 @@ android.media.audiofx.PresetReverb android.media.audiofx.Virtualizer android.media.audiofx.Virtualizer$Settings android.media.audiofx.Visualizer +android.media.audiofx.Visualizer$OnDataCaptureListener android.media.audiopolicy.AudioMix android.media.audiopolicy.AudioMixingRule android.media.audiopolicy.AudioMixingRule$AudioMixMatchCriterion android.media.audiopolicy.AudioPolicyConfig android.media.audiopolicy.IAudioPolicyCallback android.media.audiopolicy.IAudioPolicyCallback$Stub +android.media.browse.MediaBrowser +android.media.browse.MediaBrowser$10 +android.media.browse.MediaBrowser$ConnectionCallback +android.media.browse.MediaBrowser$MediaItem +android.media.browse.MediaBrowser$MediaServiceConnection +android.media.browse.MediaBrowser$MediaServiceConnection$1 +android.media.browse.MediaBrowser$ServiceCallbacks android.media.midi.IMidiDeviceListener android.media.midi.IMidiDeviceOpenCallback android.media.midi.IMidiDeviceServer @@ -2569,6 +2646,8 @@ android.media.projection.MediaProjectionManager$CallbackDelegate android.media.session.IActiveSessionsListener android.media.session.IActiveSessionsListener$Stub android.media.session.IActiveSessionsListener$Stub$Proxy +android.media.session.IOnMediaKeyListener +android.media.session.IOnVolumeKeyLongPressListener android.media.session.ISession android.media.session.ISession$Stub android.media.session.ISession$Stub$Proxy @@ -2617,12 +2696,12 @@ android.media.tv.TvInputHardwareInfo$Builder android.media.tv.TvInputManager android.media.tv.TvStreamConfig android.media.tv.TvStreamConfig$Builder +android.metrics.LogMaker android.mtp.MtpDatabase android.mtp.MtpDevice android.mtp.MtpDeviceInfo android.mtp.MtpEvent android.mtp.MtpObjectInfo -android.mtp.MtpObjectInfo$Builder android.mtp.MtpPropertyGroup android.mtp.MtpPropertyList android.mtp.MtpServer @@ -2632,14 +2711,13 @@ android.net.ConnectivityManager android.net.ConnectivityManager$CallbackHandler android.net.ConnectivityManager$NetworkCallback android.net.ConnectivityManager$OnNetworkActiveListener -android.net.ConnectivityManager$OnStartTetheringCallback android.net.ConnectivityManager$PacketKeepalive android.net.ConnectivityManager$PacketKeepaliveCallback android.net.ConnectivityMetricsEvent android.net.ConnectivityMetricsEvent$1 android.net.ConnectivityMetricsEvent$Reference -android.net.ConnectivityMetricsLogger android.net.ConnectivityThread +android.net.ConnectivityThread$Singleton android.net.Credentials android.net.DataUsageRequest android.net.DhcpInfo @@ -2649,16 +2727,22 @@ android.net.DhcpResults$1 android.net.EthernetManager android.net.EthernetManager$1 android.net.EthernetManager$2 +android.net.EventLogTags android.net.IConnectivityManager android.net.IConnectivityManager$Stub android.net.IConnectivityManager$Stub$Proxy android.net.IConnectivityMetricsLogger android.net.IConnectivityMetricsLogger$Stub -android.net.IConnectivityMetricsLogger$Stub$Proxy android.net.IEthernetManager android.net.IEthernetManager$Stub android.net.IEthernetServiceListener android.net.IEthernetServiceListener$Stub +android.net.IIpConnectivityMetrics +android.net.IIpConnectivityMetrics$Stub +android.net.INetd +android.net.INetd$Stub +android.net.INetd$Stub$Proxy +android.net.INetdEventCallback android.net.INetworkManagementEventObserver android.net.INetworkManagementEventObserver$Stub android.net.INetworkPolicyListener @@ -2669,6 +2753,7 @@ android.net.INetworkPolicyManager$Stub android.net.INetworkPolicyManager$Stub$Proxy android.net.INetworkScoreCache android.net.INetworkScoreCache$Stub +android.net.INetworkScoreCache$Stub$Proxy android.net.INetworkScoreService android.net.INetworkScoreService$Stub android.net.INetworkScoreService$Stub$Proxy @@ -2704,6 +2789,7 @@ android.net.Network$1 android.net.Network$2 android.net.Network$NetworkBoundSocketFactory android.net.NetworkAgent +android.net.NetworkBadging android.net.NetworkCapabilities android.net.NetworkCapabilities$1 android.net.NetworkConfig @@ -2725,6 +2811,7 @@ android.net.NetworkQuotaInfo android.net.NetworkRequest android.net.NetworkRequest$1 android.net.NetworkRequest$Builder +android.net.NetworkRequest$Type android.net.NetworkScoreManager android.net.NetworkScorerAppManager android.net.NetworkState @@ -2745,13 +2832,17 @@ android.net.ParseException android.net.Proxy android.net.ProxyInfo android.net.ProxyInfo$1 +android.net.RecommendationRequest +android.net.RecommendationResult android.net.RouteInfo android.net.RouteInfo$1 android.net.RssiCurve +android.net.RssiCurve$1 android.net.SSLCertificateSocketFactory android.net.SSLCertificateSocketFactory$1 android.net.SSLSessionCache android.net.ScoredNetwork +android.net.ScoredNetwork$1 android.net.SntpClient android.net.StaticIpConfiguration android.net.StaticIpConfiguration$1 @@ -2771,7 +2862,7 @@ android.net.Uri$PathSegments android.net.Uri$PathSegmentsBuilder android.net.Uri$StringUri android.net.UrlQuerySanitizer -android.net.UrlQuerySanitizer$ValueSanitizer +android.net.VpnService android.net.WebAddress android.net.WifiKey android.net.WifiKey$1 @@ -2784,19 +2875,23 @@ android.net.http.HttpResponseCache android.net.http.SslCertificate android.net.http.SslError android.net.http.X509TrustManagerExtensions +android.net.metrics.ApfProgramEvent +android.net.metrics.ApfProgramEvent$1 +android.net.metrics.ConnectStats android.net.metrics.DefaultNetworkEvent android.net.metrics.DefaultNetworkEvent$1 android.net.metrics.DhcpClientEvent android.net.metrics.DhcpClientEvent$1 android.net.metrics.DnsEvent android.net.metrics.DnsEvent$1 -android.net.metrics.IpConnectivityEvent +android.net.metrics.IpConnectivityLog android.net.metrics.IpManagerEvent android.net.metrics.IpManagerEvent$1 -android.net.metrics.IpReachabilityEvent -android.net.metrics.IpReachabilityEvent$1 android.net.metrics.NetworkEvent android.net.metrics.NetworkEvent$1 +android.net.metrics.RaEvent +android.net.metrics.RaEvent$1 +android.net.metrics.RaEvent$Builder android.net.metrics.ValidationProbeEvent android.net.metrics.ValidationProbeEvent$1 android.net.metrics.ValidationProbeEvent$Decoder @@ -2806,8 +2901,6 @@ android.net.nsd.NsdManager android.net.sip.ISipService android.net.sip.ISipService$Stub android.net.sip.SipManager -android.net.sip.SipProfile -android.net.sip.SipProfile$Builder android.net.wifi.IRttManager android.net.wifi.IRttManager$Stub android.net.wifi.IRttManager$Stub$Proxy @@ -2817,9 +2910,10 @@ android.net.wifi.IWifiManager$Stub$Proxy android.net.wifi.IWifiScanner android.net.wifi.IWifiScanner$Stub android.net.wifi.IWifiScanner$Stub$Proxy +android.net.wifi.ParcelUtil +android.net.wifi.RssiPacketCountInfo android.net.wifi.RttManager android.net.wifi.RttManager$RttCapabilities -android.net.wifi.RttManager$RttCapabilities$1 android.net.wifi.RttManager$RttListener android.net.wifi.RttManager$RttResult android.net.wifi.RttManager$ServiceHandler @@ -2831,6 +2925,7 @@ android.net.wifi.SupplicantState android.net.wifi.SupplicantState$1 android.net.wifi.WifiActivityEnergyInfo android.net.wifi.WifiActivityEnergyInfo$1 +android.net.wifi.WifiChannel android.net.wifi.WifiConfiguration android.net.wifi.WifiConfiguration$1 android.net.wifi.WifiConfiguration$AuthAlgorithm @@ -2844,9 +2939,6 @@ android.net.wifi.WifiConnectionStatistics android.net.wifi.WifiConnectionStatistics$1 android.net.wifi.WifiEnterpriseConfig android.net.wifi.WifiEnterpriseConfig$1 -android.net.wifi.WifiEnterpriseConfig$Eap -android.net.wifi.WifiEnterpriseConfig$Phase2 -android.net.wifi.WifiEnterpriseConfig$SupplicantLoader android.net.wifi.WifiInfo android.net.wifi.WifiInfo$1 android.net.wifi.WifiLinkLayerStats @@ -2855,25 +2947,30 @@ android.net.wifi.WifiManager android.net.wifi.WifiManager$ActionListener android.net.wifi.WifiManager$MulticastLock android.net.wifi.WifiManager$WifiLock +android.net.wifi.WifiNetworkScoreCache +android.net.wifi.WifiNetworkScoreCache$CacheListener android.net.wifi.WifiScanner android.net.wifi.WifiScanner$ActionListener android.net.wifi.WifiScanner$ChannelSpec -android.net.wifi.WifiScanner$OperationResult -android.net.wifi.WifiScanner$OperationResult$1 android.net.wifi.WifiScanner$ParcelableScanData android.net.wifi.WifiScanner$ParcelableScanData$1 +android.net.wifi.WifiScanner$ParcelableScanResults +android.net.wifi.WifiScanner$ParcelableScanResults$1 android.net.wifi.WifiScanner$PnoScanListener android.net.wifi.WifiScanner$ScanData android.net.wifi.WifiScanner$ScanData$1 android.net.wifi.WifiScanner$ScanListener android.net.wifi.WifiScanner$ScanSettings android.net.wifi.WifiScanner$ScanSettings$1 +android.net.wifi.WifiScanner$ScanSettings$HiddenNetwork android.net.wifi.WifiScanner$ServiceHandler android.net.wifi.WifiSsid android.net.wifi.WifiSsid$1 +android.net.wifi.WifiWakeReasonAndCounts android.net.wifi.WpsInfo android.net.wifi.WpsInfo$1 -android.net.wifi.nan.WifiNanManager +android.net.wifi.aware.WifiAwareManager +android.net.wifi.hotspot2.PasspointConfiguration android.net.wifi.p2p.IWifiP2pManager android.net.wifi.p2p.IWifiP2pManager$Stub android.net.wifi.p2p.WifiP2pConfig @@ -2925,7 +3022,6 @@ android.nfc.NfcAdapter android.nfc.NfcAdapter$1 android.nfc.NfcAdapter$CreateBeamUrisCallback android.nfc.NfcAdapter$CreateNdefMessageCallback -android.nfc.NfcAdapter$NfcUnlockHandler android.nfc.NfcAdapter$OnNdefPushCompleteCallback android.nfc.NfcEvent android.nfc.NfcManager @@ -2976,11 +3072,17 @@ android.opengl.GLSurfaceView$EglHelper android.opengl.GLSurfaceView$GLThread android.opengl.GLSurfaceView$GLThreadManager android.opengl.GLSurfaceView$Renderer +android.opengl.GLSurfaceView$SimpleEGLConfigChooser android.opengl.GLU android.opengl.GLUtils android.opengl.Matrix android.opengl.Visibility +android.os.-$Lambda$0$-dncxFEc2F2bgG2fsIoC6FC6WNE +android.os.-$Lambda$1$-dncxFEc2F2bgG2fsIoC6FC6WNE +android.os.-$Lambda$5$6x30vPJhBKUfNY8tswxuZo3DCe0 +android.os.-$Lambda$67$OsaxDBgigpqjZN1F4C6nYRYm1YQ android.os.AsyncResult +android.os.AsyncTask android.os.AsyncTask$1 android.os.AsyncTask$2 android.os.AsyncTask$3 @@ -3000,12 +3102,14 @@ android.os.BatteryProperties$1 android.os.BatteryStats android.os.BatteryStats$BitDescription android.os.BatteryStats$ControllerActivityCounter +android.os.BatteryStats$Counter android.os.BatteryStats$DailyItem android.os.BatteryStats$HistoryEventTracker android.os.BatteryStats$HistoryItem android.os.BatteryStats$HistoryPrinter android.os.BatteryStats$HistoryStepDetails android.os.BatteryStats$HistoryTag +android.os.BatteryStats$IntToString android.os.BatteryStats$LevelStepTracker android.os.BatteryStats$LongCounter android.os.BatteryStats$PackageChange @@ -3014,6 +3118,7 @@ android.os.BatteryStats$Uid android.os.BatteryStats$Uid$Pid android.os.BatteryStats$Uid$Pkg android.os.BatteryStats$Uid$Pkg$Serv +android.os.BatteryStats$Uid$Proc android.os.BatteryStats$Uid$Sensor android.os.BatteryStats$Uid$Wakelock android.os.Binder @@ -3042,16 +3147,20 @@ android.os.DropBoxManager$Entry$1 android.os.Environment android.os.Environment$UserEnvironment android.os.FactoryTest -android.os.FileBridge -android.os.FileBridge$FileBridgeOutputStream +android.os.FileObserver android.os.FileObserver$ObserverThread android.os.FileUtils +android.os.GraphicsEnvironment android.os.Handler android.os.Handler$BlockingRunnable android.os.Handler$Callback android.os.Handler$MessengerImpl android.os.HandlerThread android.os.HardwarePropertiesManager +android.os.HwBinder +android.os.HwBlob +android.os.HwParcel +android.os.HwRemoteBinder android.os.IBatteryPropertiesListener android.os.IBatteryPropertiesListener$Stub android.os.IBatteryPropertiesRegistrar @@ -3062,11 +3171,22 @@ android.os.IBinder$DeathRecipient android.os.ICancellationSignal android.os.ICancellationSignal$Stub android.os.ICancellationSignal$Stub$Proxy +android.os.IDeviceIdentifiersPolicyService +android.os.IDeviceIdentifiersPolicyService$Stub android.os.IDeviceIdleController android.os.IDeviceIdleController$Stub android.os.IDeviceIdleController$Stub$Proxy android.os.IHardwarePropertiesManager android.os.IHardwarePropertiesManager$Stub +android.os.IHardwarePropertiesManager$Stub$Proxy +android.os.IHwBinder +android.os.IHwBinder$DeathRecipient +android.os.IHwInterface +android.os.IIncidentManager +android.os.IIncidentManager$Stub +android.os.IInstalld +android.os.IInstalld$Stub +android.os.IInstalld$Stub$Proxy android.os.IInterface android.os.IMaintenanceActivityListener android.os.IMessenger @@ -3084,10 +3204,8 @@ android.os.IPowerManager$Stub$Proxy android.os.IProcessInfoService android.os.IProcessInfoService$Stub android.os.IProgressListener -android.os.IProgressListener$Stub android.os.IRecoverySystem android.os.IRecoverySystem$Stub -android.os.IRecoverySystem$Stub$Proxy android.os.IRecoverySystemProgressListener android.os.IRemoteCallback android.os.IRemoteCallback$Stub @@ -3103,6 +3221,7 @@ android.os.IUserManager$Stub$Proxy android.os.IVibratorService android.os.IVibratorService$Stub android.os.IVibratorService$Stub$Proxy +android.os.IncidentManager android.os.LocaleList android.os.LocaleList$1 android.os.Looper @@ -3115,7 +3234,6 @@ android.os.MessageQueue$IdleHandler android.os.MessageQueue$OnFileDescriptorEventListener android.os.Messenger android.os.Messenger$1 -android.os.NetworkOnMainThreadException android.os.NullVibrator android.os.OperationCanceledException android.os.Parcel @@ -3141,6 +3259,8 @@ android.os.PatternMatcher$1 android.os.PersistableBundle android.os.PersistableBundle$1 android.os.PersistableBundle$MyReadMapCallback +android.os.PooledStringReader +android.os.PooledStringWriter android.os.PowerManager android.os.PowerManager$WakeLock android.os.PowerManager$WakeLock$1 @@ -3148,12 +3268,14 @@ android.os.PowerManagerInternal android.os.PowerManagerInternal$LowPowerModeListener android.os.Process android.os.Process$ProcessStartResult -android.os.Process$ZygoteState android.os.RecoverySystem -android.os.RecoverySystem$ProgressListener android.os.Registrant android.os.RegistrantList android.os.RemoteCallback +android.os.RemoteCallback$1 +android.os.RemoteCallback$2 +android.os.RemoteCallback$3 +android.os.RemoteCallback$OnResultListener android.os.RemoteCallbackList android.os.RemoteCallbackList$Callback android.os.RemoteException @@ -3163,9 +3285,13 @@ android.os.ResultReceiver$MyResultReceiver android.os.ResultReceiver$MyRunnable android.os.SELinux android.os.ServiceManager +android.os.ServiceManager$ServiceNotFoundException android.os.ServiceManagerNative android.os.ServiceManagerProxy android.os.ServiceSpecificException +android.os.ShellCallback +android.os.ShellCallback$1 +android.os.ShellCommand android.os.StatFs android.os.StrictMode android.os.StrictMode$1 @@ -3191,6 +3317,7 @@ android.os.StrictMode$ThreadPolicy android.os.StrictMode$ThreadPolicy$Builder android.os.StrictMode$ThreadSpanState android.os.StrictMode$ViolationInfo +android.os.StrictMode$ViolationInfo$1 android.os.StrictMode$VmPolicy android.os.StrictMode$VmPolicy$Builder android.os.SynchronousResultReceiver @@ -3203,11 +3330,9 @@ android.os.SystemService$State android.os.SystemVibrator android.os.TokenWatcher android.os.TokenWatcher$1 -android.os.TokenWatcher$Death android.os.Trace android.os.Trace$1 android.os.TransactionTooLargeException -android.os.TransactionTracker android.os.UEventObserver android.os.UEventObserver$UEvent android.os.UEventObserver$UEventThread @@ -3220,26 +3345,30 @@ android.os.UserManagerInternal$UserRestrictionsListener android.os.Vibrator android.os.WorkSource android.os.WorkSource$1 +android.os.ZygoteProcess +android.os.ZygoteProcess$ZygoteState android.os.ZygoteStartFailedEx +android.os.health.HealthStats android.os.health.HealthStatsParceler android.os.health.SystemHealthManager +android.os.health.TimerStat android.os.storage.DiskInfo android.os.storage.DiskInfo$1 -android.os.storage.IStorageManager -android.os.storage.IStorageManager$Stub -android.os.storage.IStorageManager$Stub$Proxy +android.os.storage.IObbActionListener +android.os.storage.IObbActionListener$Stub android.os.storage.IStorageEventListener android.os.storage.IStorageEventListener$Stub android.os.storage.IStorageEventListener$Stub$Proxy +android.os.storage.IStorageManager +android.os.storage.IStorageManager$Stub +android.os.storage.IStorageManager$Stub$Proxy android.os.storage.IStorageShutdownObserver -android.os.storage.IObbActionListener -android.os.storage.IObbActionListener$Stub -android.os.storage.StorageManagerInternal -android.os.storage.StorageManagerInternal$ExternalStorageMountPolicy android.os.storage.StorageEventListener android.os.storage.StorageManager android.os.storage.StorageManager$ObbActionListener android.os.storage.StorageManager$StorageEventListenerDelegate +android.os.storage.StorageManagerInternal +android.os.storage.StorageManagerInternal$ExternalStorageMountPolicy android.os.storage.StorageVolume android.os.storage.StorageVolume$1 android.os.storage.VolumeInfo @@ -3247,30 +3376,30 @@ android.os.storage.VolumeInfo$1 android.os.storage.VolumeInfo$2 android.os.storage.VolumeRecord android.os.storage.VolumeRecord$1 +android.permissionpresenterservice.RuntimePermissionPresenterService +android.permissionpresenterservice.RuntimePermissionPresenterService$1 +android.permissionpresenterservice.RuntimePermissionPresenterService$MyHandler +android.preference.CheckBoxPreference android.preference.DialogPreference -android.preference.GenericInflater android.preference.GenericInflater$Parent android.preference.ListPreference android.preference.Preference +android.preference.Preference$BaseSavedState +android.preference.Preference$BaseSavedState$1 android.preference.Preference$OnPreferenceChangeInternalListener android.preference.Preference$OnPreferenceChangeListener android.preference.Preference$OnPreferenceClickListener android.preference.PreferenceActivity -android.preference.PreferenceActivity$1 -android.preference.PreferenceActivity$Header -android.preference.PreferenceActivity$Header$1 android.preference.PreferenceFragment android.preference.PreferenceFragment$1 android.preference.PreferenceFragment$2 android.preference.PreferenceFragment$3 android.preference.PreferenceFragment$OnPreferenceStartFragmentCallback android.preference.PreferenceFrameLayout -android.preference.PreferenceFrameLayout$LayoutParams android.preference.PreferenceGroup android.preference.PreferenceGroupAdapter android.preference.PreferenceGroupAdapter$1 android.preference.PreferenceGroupAdapter$PreferenceLayout -android.preference.PreferenceInflater android.preference.PreferenceManager android.preference.PreferenceManager$OnActivityDestroyListener android.preference.PreferenceManager$OnPreferenceTreeClickListener @@ -3285,8 +3414,6 @@ android.preference.SwitchPreference$Listener android.preference.TwoStatePreference android.print.IPrintDocumentAdapter android.print.IPrintJobStateChangeListener -android.print.IPrintJobStateChangeListener$Stub -android.print.IPrintJobStateChangeListener$Stub$Proxy android.print.IPrintManager android.print.IPrintManager$Stub android.print.IPrintManager$Stub$Proxy @@ -3298,7 +3425,6 @@ android.print.IPrintSpooler$Stub android.print.IPrintSpooler$Stub$Proxy android.print.IPrintSpoolerCallbacks android.print.IPrintSpoolerCallbacks$Stub -android.print.IPrintSpoolerCallbacks$Stub$Proxy android.print.IPrintSpoolerClient android.print.IPrintSpoolerClient$Stub android.print.IPrintSpoolerClient$Stub$Proxy @@ -3314,31 +3440,25 @@ android.print.PrintDocumentAdapter$LayoutResultCallback android.print.PrintDocumentAdapter$WriteResultCallback android.print.PrintDocumentInfo android.print.PrintDocumentInfo$Builder -android.print.PrintJob android.print.PrintJobId android.print.PrintJobInfo -android.print.PrintJobInfo$1 android.print.PrintManager android.print.PrintManager$1 -android.print.PrintManager$PrintJobStateChangeListener -android.print.PrintManager$PrintJobStateChangeListenerWrapper android.print.PrintManager$PrintServicesChangeListener android.print.PrintManager$PrintServicesChangeListenerWrapper android.print.PrintServicesLoader android.print.PrintServicesLoader$1 android.print.PrintServicesLoader$MyHandler android.print.PrinterId -android.print.pdf.PrintedPdfDocument android.printservice.IPrintServiceClient android.printservice.IPrintServiceClient$Stub android.printservice.PrintServiceInfo android.printservice.PrintServiceInfo$1 android.printservice.recommendation.IRecommendationsChangeListener +android.provider.-$Lambda$46$87WmhkvObehVg0OMBzwa_MTVV8g android.provider.BaseColumns android.provider.BlockedNumberContract android.provider.BlockedNumberContract$BlockedNumbers -android.provider.BlockedNumberContract$SystemContract -android.provider.BlockedNumberContract$SystemContract$BlockSuppressionStatus android.provider.CalendarContract android.provider.CalendarContract$Attendees android.provider.CalendarContract$AttendeesColumns @@ -3367,12 +3487,16 @@ android.provider.CalendarContract$SyncState android.provider.CallLog android.provider.CallLog$Calls android.provider.Contacts +android.provider.Contacts$ContactMethods +android.provider.Contacts$ContactMethodsColumns +android.provider.Contacts$PeopleColumns android.provider.ContactsContract android.provider.ContactsContract$AggregationExceptions android.provider.ContactsContract$BaseSyncColumns android.provider.ContactsContract$CommonDataKinds$BaseTypes android.provider.ContactsContract$CommonDataKinds$Callable android.provider.ContactsContract$CommonDataKinds$CommonColumns +android.provider.ContactsContract$CommonDataKinds$Contactables android.provider.ContactsContract$CommonDataKinds$Email android.provider.ContactsContract$CommonDataKinds$Event android.provider.ContactsContract$CommonDataKinds$Im @@ -3385,7 +3509,6 @@ android.provider.ContactsContract$ContactNameColumns android.provider.ContactsContract$ContactOptionsColumns android.provider.ContactsContract$ContactStatusColumns android.provider.ContactsContract$Contacts -android.provider.ContactsContract$Contacts$AggregationSuggestions$Builder android.provider.ContactsContract$ContactsColumns android.provider.ContactsContract$Data android.provider.ContactsContract$DataColumns @@ -3397,7 +3520,6 @@ android.provider.ContactsContract$DeletedContactsColumns android.provider.ContactsContract$Directory android.provider.ContactsContract$DisplayPhoto android.provider.ContactsContract$Groups -android.provider.ContactsContract$Groups$EntityIteratorImpl android.provider.ContactsContract$GroupsColumns android.provider.ContactsContract$MetadataSync android.provider.ContactsContract$MetadataSyncColumns @@ -3408,7 +3530,6 @@ android.provider.ContactsContract$Profile android.provider.ContactsContract$ProviderStatus android.provider.ContactsContract$QuickContact android.provider.ContactsContract$RawContacts -android.provider.ContactsContract$RawContacts$EntityIteratorImpl android.provider.ContactsContract$RawContactsColumns android.provider.ContactsContract$RawContactsEntity android.provider.ContactsContract$Settings @@ -3418,8 +3539,8 @@ android.provider.ContactsContract$StreamItems android.provider.ContactsContract$StreamItemsColumns android.provider.ContactsContract$SyncColumns android.provider.ContactsContract$SyncState +android.provider.ContactsInternal android.provider.DocumentsContract -android.provider.DocumentsContract$Root android.provider.DocumentsProvider android.provider.Downloads android.provider.Downloads$Impl @@ -3450,12 +3571,11 @@ android.provider.SearchIndexableResource android.provider.SearchIndexablesContract android.provider.SearchIndexablesProvider android.provider.SearchRecentSuggestions -android.provider.SearchRecentSuggestions$1 android.provider.Settings +android.provider.Settings$ContentProviderHolder android.provider.Settings$GenerationTracker android.provider.Settings$Global android.provider.Settings$NameValueCache -android.provider.Settings$NameValueCache$-java_lang_String_getStringForUser_android_content_ContentResolver_cr_java_lang_String_name_int_userHandle_LambdaImpl0 android.provider.Settings$NameValueTable android.provider.Settings$Secure android.provider.Settings$SettingNotFoundException @@ -3492,18 +3612,21 @@ android.provider.UserDictionary$Words android.provider.VoicemailContract$Status android.provider.VoicemailContract$Voicemails android.renderscript.Allocation +android.renderscript.Allocation$MipmapControl android.renderscript.BaseObj android.renderscript.Element -android.renderscript.Matrix4f -android.renderscript.RSRuntimeException +android.renderscript.Element$DataKind +android.renderscript.Element$DataType android.renderscript.RenderScript +android.renderscript.RenderScript$ContextType +android.renderscript.RenderScript$MessageThread android.renderscript.RenderScriptCacheDir android.renderscript.Script android.renderscript.ScriptIntrinsic android.renderscript.ScriptIntrinsicBlur android.renderscript.Type -android.security.Credentials -android.security.FrameworkNetworkSecurityPolicy +android.renderscript.Type$Builder +android.renderscript.Type$CubemapFace android.security.GateKeeper android.security.IKeyChainService android.security.IKeyChainService$Stub @@ -3514,10 +3637,11 @@ android.security.IKeystoreService$Stub$Proxy android.security.KeyChain android.security.KeyChain$1 android.security.KeyChain$KeyChainConnection -android.security.KeyChainAliasCallback android.security.KeyStore -android.security.KeyStore$State android.security.NetworkSecurityPolicy +android.security.keymaster.IKeyAttestationApplicationIdProvider +android.security.keymaster.IKeyAttestationApplicationIdProvider$Stub +android.security.keymaster.KeyAttestationApplicationId android.security.keymaster.KeymasterArguments android.security.keymaster.KeymasterArguments$1 android.security.keystore.AndroidKeyStoreBCWorkaroundProvider @@ -3559,12 +3683,20 @@ android.security.net.config.PinSet android.security.net.config.RootTrustManager android.security.net.config.RootTrustManagerFactorySpi android.security.net.config.SystemCertificateSource -android.security.net.config.TrustAnchor +android.security.net.config.SystemCertificateSource$NoPreloadHolder android.security.net.config.TrustedCertificateStoreAdapter android.security.net.config.UserCertificateSource +android.security.net.config.UserCertificateSource$NoPreloadHolder +android.security.net.config.XmlConfigSource +android.security.net.config.XmlConfigSource$ParserException +android.service.autofill.IAutoFillManagerService +android.service.autofill.IAutoFillManagerService$Stub +android.service.autofill.IAutoFillManagerService$Stub$Proxy android.service.carrier.CarrierIdentifier +android.service.carrier.CarrierIdentifier$1 android.service.carrier.ICarrierService android.service.carrier.ICarrierService$Stub +android.service.carrier.ICarrierService$Stub$Proxy android.service.chooser.ChooserTarget android.service.chooser.ChooserTargetService android.service.dreams.DreamManagerInternal @@ -3580,13 +3712,22 @@ android.service.dreams.IDreamManager$Stub$Proxy android.service.dreams.IDreamService android.service.dreams.IDreamService$Stub android.service.dreams.IDreamService$Stub$Proxy -android.service.gatekeeper.GateKeeperResponse -android.service.gatekeeper.GateKeeperResponse$1 android.service.gatekeeper.IGateKeeperService android.service.gatekeeper.IGateKeeperService$Stub android.service.gatekeeper.IGateKeeperService$Stub$Proxy -android.service.media.CameraPrewarmService +android.service.media.IMediaBrowserService +android.service.media.IMediaBrowserService$Stub +android.service.media.IMediaBrowserService$Stub$Proxy +android.service.media.IMediaBrowserServiceCallbacks +android.service.media.IMediaBrowserServiceCallbacks$Stub +android.service.media.IMediaBrowserServiceCallbacks$Stub$Proxy android.service.media.MediaBrowserService +android.service.media.MediaBrowserService$1 +android.service.media.MediaBrowserService$BrowserRoot +android.service.media.MediaBrowserService$ConnectionRecord +android.service.media.MediaBrowserService$Result +android.service.media.MediaBrowserService$ServiceBinder +android.service.media.MediaBrowserService$ServiceBinder$1 android.service.notification.Adjustment android.service.notification.Condition android.service.notification.Condition$1 @@ -3597,6 +3738,7 @@ android.service.notification.IConditionListener android.service.notification.IConditionListener$Stub android.service.notification.IConditionProvider android.service.notification.IConditionProvider$Stub +android.service.notification.IConditionProvider$Stub$Proxy android.service.notification.INotificationListener android.service.notification.INotificationListener$Stub android.service.notification.INotificationListener$Stub$Proxy @@ -3609,9 +3751,6 @@ android.service.notification.NotificationListenerService$NotificationListenerWra android.service.notification.NotificationListenerService$Ranking android.service.notification.NotificationListenerService$RankingMap android.service.notification.NotificationListenerService$RankingMap$1 -android.service.notification.NotificationAssistantService -android.service.notification.NotificationAssistantService$MyHandler -android.service.notification.NotificationAssistantService$NotificationRankingServiceWrapper android.service.notification.NotificationRankingUpdate android.service.notification.NotificationRankingUpdate$1 android.service.notification.StatusBarNotification @@ -3620,9 +3759,7 @@ android.service.notification.ZenModeConfig android.service.notification.ZenModeConfig$1 android.service.notification.ZenModeConfig$Diff android.service.notification.ZenModeConfig$EventInfo -android.service.notification.ZenModeConfig$Migration android.service.notification.ZenModeConfig$ScheduleInfo -android.service.notification.ZenModeConfig$XmlV1 android.service.notification.ZenModeConfig$ZenRule android.service.notification.ZenModeConfig$ZenRule$1 android.service.persistentdata.IPersistentDataBlockService @@ -3633,6 +3770,7 @@ android.service.quicksettings.IQSService android.service.quicksettings.IQSService$Stub android.service.quicksettings.IQSTileService android.service.quicksettings.Tile +android.service.quicksettings.Tile$1 android.service.quicksettings.TileService android.service.textservice.SpellCheckerService android.service.textservice.SpellCheckerService$InternalISpellCheckerSession @@ -3641,16 +3779,6 @@ android.service.textservice.SpellCheckerService$SentenceLevelAdapter$SentenceTex android.service.textservice.SpellCheckerService$SentenceLevelAdapter$SentenceWordItem android.service.textservice.SpellCheckerService$Session android.service.textservice.SpellCheckerService$SpellCheckerServiceBinder -android.service.trust.ITrustAgentService -android.service.trust.ITrustAgentService$Stub -android.service.trust.ITrustAgentService$Stub$Proxy -android.service.trust.ITrustAgentServiceCallback -android.service.trust.ITrustAgentServiceCallback$Stub -android.service.trust.ITrustAgentServiceCallback$Stub$Proxy -android.service.trust.TrustAgentService -android.service.trust.TrustAgentService$1 -android.service.trust.TrustAgentService$ConfigurationData -android.service.trust.TrustAgentService$TrustAgentServiceWrapper android.service.voice.AlwaysOnHotwordDetector android.service.voice.AlwaysOnHotwordDetector$Callback android.service.voice.AlwaysOnHotwordDetector$EventPayload @@ -3661,12 +3789,33 @@ android.service.voice.IVoiceInteractionService android.service.voice.IVoiceInteractionService$Stub android.service.voice.IVoiceInteractionService$Stub$Proxy android.service.voice.IVoiceInteractionSession +android.service.voice.IVoiceInteractionSession$Stub +android.service.voice.IVoiceInteractionSession$Stub$Proxy +android.service.voice.IVoiceInteractionSessionService +android.service.voice.IVoiceInteractionSessionService$Stub +android.service.voice.IVoiceInteractionSessionService$Stub$Proxy android.service.voice.VoiceInteractionManagerInternal android.service.voice.VoiceInteractionService android.service.voice.VoiceInteractionService$1 android.service.voice.VoiceInteractionService$MyHandler android.service.voice.VoiceInteractionServiceInfo android.service.voice.VoiceInteractionSession +android.service.voice.VoiceInteractionSession$1 +android.service.voice.VoiceInteractionSession$2 +android.service.voice.VoiceInteractionSession$2$1 +android.service.voice.VoiceInteractionSession$3 +android.service.voice.VoiceInteractionSession$4 +android.service.voice.VoiceInteractionSession$AbortVoiceRequest +android.service.voice.VoiceInteractionSession$CommandRequest +android.service.voice.VoiceInteractionSession$CompleteVoiceRequest +android.service.voice.VoiceInteractionSession$ConfirmationRequest +android.service.voice.VoiceInteractionSession$Insets +android.service.voice.VoiceInteractionSession$MyCallbacks +android.service.voice.VoiceInteractionSession$PickOptionRequest +android.service.voice.VoiceInteractionSession$Request +android.service.voice.VoiceInteractionSessionService +android.service.voice.VoiceInteractionSessionService$1 +android.service.voice.VoiceInteractionSessionService$2 android.service.vr.IVrManager android.service.vr.IVrManager$Stub android.service.vr.IVrManager$Stub$Proxy @@ -3733,6 +3882,7 @@ android.system.StructAddrinfo android.system.StructFlock android.system.StructGroupReq android.system.StructGroupSourceReq +android.system.StructIfaddrs android.system.StructLinger android.system.StructPasswd android.system.StructPollfd @@ -3742,6 +3892,7 @@ android.system.StructTimeval android.system.StructUcred android.system.StructUtsname android.system.UnixSocketAddress +android.telecom.-$Lambda$3$afyb_ODGzn3xMew6fjs8ANSIdVo android.telecom.AudioState android.telecom.AudioState$1 android.telecom.Call @@ -3760,8 +3911,8 @@ android.telecom.Conferenceable android.telecom.Connection android.telecom.Connection$1 android.telecom.Connection$2 +android.telecom.Connection$FailureSignalingConnection android.telecom.Connection$Listener -android.telecom.Connection$VideoProvider android.telecom.ConnectionRequest android.telecom.ConnectionRequest$1 android.telecom.ConnectionService @@ -3783,12 +3934,29 @@ android.telecom.InCallService$1 android.telecom.InCallService$2 android.telecom.InCallService$InCallServiceBinder android.telecom.InCallService$VideoCall -android.telecom.InCallService$VideoCall$Callback android.telecom.Log android.telecom.Log$1 +android.telecom.Logging.-$Lambda$2$OwO3BlCgqcOx28O1BaOAPVPor24 +android.telecom.Logging.-$Lambda$35$OwO3BlCgqcOx28O1BaOAPVPor24 +android.telecom.Logging.-$Lambda$47$OwO3BlCgqcOx28O1BaOAPVPor24 +android.telecom.Logging.EventManager +android.telecom.Logging.EventManager$Event +android.telecom.Logging.EventManager$EventListener +android.telecom.Logging.EventManager$EventRecord +android.telecom.Logging.EventManager$Loggable +android.telecom.Logging.EventManager$TimedEventPair +android.telecom.Logging.Runnable +android.telecom.Logging.Runnable$1 +android.telecom.Logging.Session +android.telecom.Logging.Session$Info +android.telecom.Logging.Session$Info$1 +android.telecom.Logging.SessionManager +android.telecom.Logging.SessionManager$ICurrentThreadId +android.telecom.Logging.SessionManager$ISessionCleanupTimeoutMs +android.telecom.Logging.SessionManager$ISessionIdQueryHandler +android.telecom.Logging.SessionManager$ISessionListener android.telecom.ParcelableCall android.telecom.ParcelableCall$1 -android.telecom.ParcelableCallAnalytics android.telecom.ParcelableConference android.telecom.ParcelableConnection android.telecom.ParcelableConnection$1 @@ -3800,40 +3968,41 @@ android.telecom.PhoneAccount$Builder android.telecom.PhoneAccountHandle android.telecom.PhoneAccountHandle$1 android.telecom.RemoteConnectionManager -android.telecom.Response android.telecom.StatusHints +android.telecom.TelecomAnalytics +android.telecom.TelecomAnalytics$SessionTiming +android.telecom.TelecomAnalytics$SessionTiming$1 android.telecom.TelecomManager +android.telecom.TimedEvent android.telecom.VideoProfile android.telecom.VideoProfile$1 -android.telecom.Voicemail -android.telecom.Voicemail$Builder android.telephony.CarrierConfigManager android.telephony.CellBroadcastMessage android.telephony.CellIdentityCdma android.telephony.CellIdentityGsm android.telephony.CellIdentityLte -android.telephony.CellIdentityLte$1 android.telephony.CellIdentityWcdma +android.telephony.CellIdentityWcdma$1 android.telephony.CellInfo android.telephony.CellInfo$1 android.telephony.CellInfoCdma android.telephony.CellInfoGsm android.telephony.CellInfoLte -android.telephony.CellInfoLte$1 android.telephony.CellInfoWcdma +android.telephony.CellInfoWcdma$1 android.telephony.CellLocation android.telephony.CellSignalStrength android.telephony.CellSignalStrengthCdma android.telephony.CellSignalStrengthGsm android.telephony.CellSignalStrengthLte -android.telephony.CellSignalStrengthLte$1 android.telephony.CellSignalStrengthWcdma +android.telephony.CellSignalStrengthWcdma$1 +android.telephony.ClientRequestStats +android.telephony.ClientRequestStats$1 android.telephony.DisconnectCause android.telephony.IccOpenLogicalChannelResponse android.telephony.ModemActivityInfo android.telephony.ModemActivityInfo$1 -android.telephony.NeighboringCellInfo -android.telephony.NeighboringCellInfo$1 android.telephony.PhoneNumberFormattingTextWatcher android.telephony.PhoneNumberUtils android.telephony.PhoneStateListener @@ -3844,7 +4013,6 @@ android.telephony.PreciseCallState$1 android.telephony.PreciseDataConnectionState android.telephony.PreciseDataConnectionState$1 android.telephony.RadioAccessFamily -android.telephony.RadioAccessFamily$1 android.telephony.Rlog android.telephony.ServiceState android.telephony.ServiceState$1 @@ -3859,26 +4027,41 @@ android.telephony.SubscriptionManager android.telephony.SubscriptionManager$OnSubscriptionsChangedListener android.telephony.SubscriptionManager$OnSubscriptionsChangedListener$1 android.telephony.SubscriptionManager$OnSubscriptionsChangedListener$2 +android.telephony.TelephonyHistogram +android.telephony.TelephonyHistogram$1 android.telephony.TelephonyManager android.telephony.TelephonyManager$MultiSimVariants +android.telephony.VisualVoicemailSmsFilterSettings android.telephony.VoLteServiceState android.telephony.VoLteServiceState$1 android.telephony.cdma.CdmaCellLocation +android.telephony.cdma.CdmaSmsCbProgramData android.telephony.gsm.GsmCellLocation android.telephony.gsm.SmsMessage android.text.AndroidBidi android.text.AndroidCharacter android.text.Annotation -android.text.AutoText android.text.BidiFormatter android.text.BidiFormatter$DirectionalityEstimator android.text.BoringLayout android.text.BoringLayout$Metrics +android.text.CharSequenceCharacterIterator android.text.ClipboardManager android.text.DynamicLayout android.text.DynamicLayout$ChangeWatcher android.text.Editable android.text.Editable$Factory +android.text.FontConfig +android.text.FontConfig$1 +android.text.FontConfig$Alias +android.text.FontConfig$Alias$1 +android.text.FontConfig$Axis +android.text.FontConfig$Axis$1 +android.text.FontConfig$Family +android.text.FontConfig$Family$1 +android.text.FontConfig$Font +android.text.FontConfig$Font$1 +android.text.FontManager android.text.GetChars android.text.GraphicsOperations android.text.Html @@ -3889,6 +4072,8 @@ android.text.HtmlToSpannedConverter android.text.HtmlToSpannedConverter$Bold android.text.HtmlToSpannedConverter$Href android.text.Hyphenator +android.text.ITextClassificationService +android.text.ITextClassificationService$Stub android.text.InputFilter android.text.InputFilter$LengthFilter android.text.InputType @@ -3948,16 +4133,12 @@ android.text.method.ArrowKeyMovementMethod android.text.method.BaseKeyListener android.text.method.BaseMovementMethod android.text.method.DialerKeyListener -android.text.method.DigitsKeyListener android.text.method.KeyListener android.text.method.LinkMovementMethod android.text.method.MetaKeyKeyListener android.text.method.MovementMethod android.text.method.NumberKeyListener android.text.method.PasswordTransformationMethod -android.text.method.PasswordTransformationMethod$PasswordCharSequence -android.text.method.PasswordTransformationMethod$ViewReference -android.text.method.PasswordTransformationMethod$Visible android.text.method.QwertyKeyListener android.text.method.QwertyKeyListener$Replaced android.text.method.ReplacementTransformationMethod @@ -3975,7 +4156,6 @@ android.text.method.TransformationMethod2 android.text.method.WordIterator android.text.style.AbsoluteSizeSpan android.text.style.AlignmentSpan -android.text.style.AlignmentSpan$Standard android.text.style.BackgroundColorSpan android.text.style.BulletSpan android.text.style.CharacterStyle @@ -3994,7 +4174,6 @@ android.text.style.LineHeightSpan$WithDensity android.text.style.MetricAffectingSpan android.text.style.MetricAffectingSpan$Passthrough android.text.style.ParagraphStyle -android.text.style.QuoteSpan android.text.style.RelativeSizeSpan android.text.style.ReplacementSpan android.text.style.SpellCheckSpan @@ -4002,7 +4181,6 @@ android.text.style.StrikethroughSpan android.text.style.StyleSpan android.text.style.SubscriptSpan android.text.style.SuggestionSpan -android.text.style.SuggestionSpan$1 android.text.style.SuperscriptSpan android.text.style.TabStopSpan android.text.style.TextAppearanceSpan @@ -4012,7 +4190,6 @@ android.text.style.TtsSpan$DigitsBuilder android.text.style.TtsSpan$SemioticClassBuilder android.text.style.TtsSpan$TelephoneBuilder android.text.style.TtsSpan$TextBuilder -android.text.style.TtsSpan$VerbatimBuilder android.text.style.TypefaceSpan android.text.style.URLSpan android.text.style.UnderlineSpan @@ -4028,7 +4205,6 @@ android.text.util.Linkify$MatchFilter android.text.util.Linkify$TransformFilter android.text.util.Rfc822Token android.text.util.Rfc822Tokenizer -android.transition.ArcMotion android.transition.AutoTransition android.transition.ChangeBounds android.transition.ChangeBounds$1 @@ -4051,8 +4227,6 @@ android.transition.ChangeTransform$3 android.transition.ChangeTransform$GhostListener android.transition.ChangeTransform$PathAnimatorMatrix android.transition.ChangeTransform$Transforms -android.transition.CircularPropagation -android.transition.Explode android.transition.Fade android.transition.Fade$1 android.transition.Fade$FadeAnimatorListener @@ -4074,7 +4248,6 @@ android.transition.Transition$1 android.transition.Transition$2 android.transition.Transition$3 android.transition.Transition$AnimationInfo -android.transition.Transition$ArrayListManager android.transition.Transition$EpicenterCallback android.transition.Transition$TransitionListener android.transition.Transition$TransitionListenerAdapter @@ -4087,7 +4260,6 @@ android.transition.TransitionSet android.transition.TransitionSet$1 android.transition.TransitionSet$TransitionSetListener android.transition.TransitionUtils -android.transition.TransitionUtils$MatrixEvaluator android.transition.TransitionValues android.transition.TransitionValuesMaps android.transition.TranslationAnimationCreator @@ -4109,7 +4281,7 @@ android.util.Base64 android.util.Base64$Coder android.util.Base64$Decoder android.util.Base64$Encoder -android.util.Base64DataException +android.util.BootTimingsTraceLog android.util.ContainerHelpers android.util.DebugUtils android.util.DisplayMetrics @@ -4130,12 +4302,14 @@ android.util.LocalLog$ReadOnlyLocalLog android.util.Log android.util.Log$1 android.util.Log$ImmediateLogWriter -android.util.Log$TerribleFailure +android.util.Log$NoPreloadHolder android.util.Log$TerribleFailureHandler android.util.LogPrinter +android.util.LongArray android.util.LongSparseArray android.util.LongSparseLongArray android.util.LruCache +android.util.MalformedJsonException android.util.MapCollections android.util.MapCollections$ArrayIterator android.util.MapCollections$EntrySet @@ -4161,6 +4335,7 @@ android.util.Printer android.util.Property android.util.Range android.util.Rational +android.util.ReflectiveProperty android.util.Singleton android.util.Size android.util.SizeF @@ -4172,7 +4347,6 @@ android.util.SparseLongArray android.util.Spline android.util.Spline$MonotoneCubicSpline android.util.StateSet -android.util.StringBuilderPrinter android.util.SuperNotCalledException android.util.TimeFormatException android.util.TimeUtils @@ -4184,18 +4358,17 @@ android.util.Xml android.util.Xml$Encoding android.util.Xml$XmlSerializerFactory android.util.apk.ApkSignatureSchemeV2Verifier +android.util.apk.ApkSignatureSchemeV2Verifier$ByteBufferDataSource +android.util.apk.ApkSignatureSchemeV2Verifier$DataSource +android.util.apk.ApkSignatureSchemeV2Verifier$MemoryMappedFileDataSource +android.util.apk.ApkSignatureSchemeV2Verifier$SignatureInfo android.util.apk.ApkSignatureSchemeV2Verifier$SignatureNotFoundException +android.util.apk.ApkSignatureSchemeV2Verifier$VerbatimX509Certificate +android.util.apk.ApkSignatureSchemeV2Verifier$WrappedX509Certificate android.util.apk.ZipUtils android.util.jar.StrictJarFile -android.util.jar.StrictJarFile$EntryIterator -android.util.jar.StrictJarFile$JarFileInputStream -android.util.jar.StrictJarFile$RAFStream -android.util.jar.StrictJarFile$ZipInflaterInputStream -android.util.jar.StrictJarManifest -android.util.jar.StrictJarManifest$Chunk -android.util.jar.StrictJarManifestReader -android.util.jar.StrictJarVerifier -android.util.jar.StrictJarVerifier$VerifierEntry +android.view.-$Lambda$48$iU_USrtPm1XIm5H9QYQvXfBGDE4 +android.view.-$Lambda$49$iU_USrtPm1XIm5H9QYQvXfBGDE4 android.view.AbsSavedState android.view.AbsSavedState$1 android.view.AbsSavedState$2 @@ -4219,8 +4392,6 @@ android.view.ContextMenu android.view.ContextMenu$ContextMenuInfo android.view.ContextThemeWrapper android.view.Display -android.view.Display$ColorTransform -android.view.Display$ColorTransform$1 android.view.Display$HdrCapabilities android.view.Display$HdrCapabilities$1 android.view.Display$Mode @@ -4247,8 +4418,6 @@ android.view.GestureDetector$OnDoubleTapListener android.view.GestureDetector$OnGestureListener android.view.GestureDetector$SimpleOnGestureListener android.view.GhostView -android.view.GraphicBuffer -android.view.GraphicBuffer$1 android.view.Gravity android.view.HandlerActionQueue android.view.HandlerActionQueue$HandlerAction @@ -4266,8 +4435,15 @@ android.view.IGraphicsStats$Stub android.view.IGraphicsStats$Stub$Proxy android.view.IInputFilter android.view.IOnKeyguardExitResult +android.view.IPinnedStackController +android.view.IPinnedStackController$Stub +android.view.IPinnedStackController$Stub$Proxy +android.view.IPinnedStackListener +android.view.IPinnedStackListener$Stub +android.view.IPinnedStackListener$Stub$Proxy android.view.IRotationWatcher android.view.IRotationWatcher$Stub +android.view.IRotationWatcher$Stub$Proxy android.view.IWindow android.view.IWindow$Stub android.view.IWindow$Stub$Proxy @@ -4307,8 +4483,6 @@ android.view.KeyEvent android.view.KeyEvent$1 android.view.KeyEvent$Callback android.view.KeyEvent$DispatcherState -android.view.KeyboardShortcutGroup -android.view.KeyboardShortcutInfo android.view.LayoutInflater android.view.LayoutInflater$Factory android.view.LayoutInflater$Factory2 @@ -4327,16 +4501,20 @@ android.view.MotionEvent$PointerCoords android.view.MotionEvent$PointerProperties android.view.NotificationHeaderView android.view.NotificationHeaderView$1 +android.view.NotificationHeaderView$2 android.view.NotificationHeaderView$HeaderTouchListener android.view.OrientationEventListener android.view.OrientationEventListener$SensorEventListenerImpl android.view.PointerIcon android.view.PointerIcon$1 +android.view.RecordingCanvas android.view.RemotableViewMethod android.view.RenderNode +android.view.RenderNode$NoImagePreloadHolder android.view.RenderNodeAnimator android.view.RenderNodeAnimator$1 android.view.RenderNodeAnimator$DelayedAnimationHelper +android.view.RenderNodeAnimatorSetHelper android.view.ScaleGestureDetector android.view.ScaleGestureDetector$1 android.view.ScaleGestureDetector$OnScaleGestureListener @@ -4347,6 +4525,7 @@ android.view.SubMenu android.view.Surface android.view.Surface$1 android.view.Surface$CompatibleCanvas +android.view.Surface$HwuiContext android.view.Surface$OutOfResourcesException android.view.SurfaceControl android.view.SurfaceControl$PhysicalDisplayInfo @@ -4364,7 +4543,7 @@ android.view.TextureView android.view.TextureView$1 android.view.TextureView$SurfaceTextureListener android.view.ThreadedRenderer -android.view.ThreadedRenderer$HardwareDrawCallbacks +android.view.ThreadedRenderer$DrawCallbacks android.view.ThreadedRenderer$ProcessInitializer android.view.TouchDelegate android.view.VelocityTracker @@ -4412,21 +4591,24 @@ android.view.View$OnTouchListener android.view.View$PerformClick android.view.View$ScrollabilityCache android.view.View$TintInfo +android.view.View$TooltipInfo android.view.View$TransformationInfo android.view.View$UnsetPressedState android.view.ViewAnimationUtils android.view.ViewConfiguration +android.view.ViewDebug$CapturedViewProperty +android.view.ViewDebug$ExportedProperty android.view.ViewDebug$HierarchyHandler android.view.ViewGroup android.view.ViewGroup$1 android.view.ViewGroup$2 android.view.ViewGroup$3 +android.view.ViewGroup$4 android.view.ViewGroup$LayoutParams android.view.ViewGroup$MarginLayoutParams android.view.ViewGroup$OnHierarchyChangeListener android.view.ViewGroup$TouchTarget android.view.ViewGroupOverlay -android.view.ViewHierarchyEncoder android.view.ViewManager android.view.ViewOutlineProvider android.view.ViewOutlineProvider$1 @@ -4489,6 +4671,7 @@ android.view.ViewTreeObserver$OnTouchModeChangeListener android.view.Window android.view.Window$Callback android.view.Window$OnWindowDismissedCallback +android.view.Window$OnWindowSwipeDismissedCallback android.view.Window$WindowControllerCallback android.view.WindowAnimationFrameStats android.view.WindowAnimationFrameStats$1 @@ -4520,18 +4703,20 @@ android.view.WindowManagerPolicy$InputConsumer android.view.WindowManagerPolicy$OnKeyguardExitResult android.view.WindowManagerPolicy$PointerEventListener android.view.WindowManagerPolicy$ScreenOnListener +android.view.WindowManagerPolicy$StartingSurface android.view.WindowManagerPolicy$WindowManagerFuncs android.view.WindowManagerPolicy$WindowState android.view.accessibility.AccessibilityEvent -android.view.accessibility.AccessibilityEvent$1 android.view.accessibility.AccessibilityEventSource android.view.accessibility.AccessibilityManager android.view.accessibility.AccessibilityManager$1 +android.view.accessibility.AccessibilityManager$AccessibilityServicesStateChangeListener android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener android.view.accessibility.AccessibilityManager$HighTextContrastChangeListener android.view.accessibility.AccessibilityManager$MyHandler android.view.accessibility.AccessibilityManager$TouchExplorationStateChangeListener android.view.accessibility.AccessibilityNodeInfo +android.view.accessibility.AccessibilityNodeInfo$1 android.view.accessibility.AccessibilityNodeInfo$AccessibilityAction android.view.accessibility.AccessibilityNodeInfo$CollectionInfo android.view.accessibility.AccessibilityNodeInfo$CollectionItemInfo @@ -4561,6 +4746,8 @@ android.view.animation.Animation$Description android.view.animation.Animation$NoImagePreloadHolder android.view.animation.AnimationSet android.view.animation.AnimationUtils +android.view.animation.AnimationUtils$1 +android.view.animation.AnimationUtils$AnimationState android.view.animation.BaseInterpolator android.view.animation.ClipRectAnimation android.view.animation.CycleInterpolator @@ -4576,12 +4763,16 @@ android.view.animation.RotateAnimation android.view.animation.ScaleAnimation android.view.animation.Transformation android.view.animation.TranslateAnimation +android.view.autofill.AutoFillId +android.view.autofill.AutoFillId$1 +android.view.autofill.AutoFillManager +android.view.autofill.AutoFillType +android.view.autofill.AutoFillType$1 android.view.inputmethod.BaseInputConnection android.view.inputmethod.CompletionInfo android.view.inputmethod.CompletionInfo$1 android.view.inputmethod.ComposingText android.view.inputmethod.CorrectionInfo -android.view.inputmethod.CorrectionInfo$1 android.view.inputmethod.CursorAnchorInfo android.view.inputmethod.CursorAnchorInfo$Builder android.view.inputmethod.EditorInfo @@ -4595,6 +4786,7 @@ android.view.inputmethod.InputBinding$1 android.view.inputmethod.InputConnection android.view.inputmethod.InputConnectionInspector android.view.inputmethod.InputConnectionWrapper +android.view.inputmethod.InputContentInfo android.view.inputmethod.InputMethod android.view.inputmethod.InputMethod$SessionCallback android.view.inputmethod.InputMethodInfo @@ -4614,6 +4806,8 @@ android.view.inputmethod.InputMethodSubtype android.view.inputmethod.InputMethodSubtype$1 android.view.inputmethod.InputMethodSubtype$InputMethodSubtypeBuilder android.view.inputmethod.InputMethodSubtypeArray +android.view.textclassifier.TextClassificationManager +android.view.textclassifier.TextLanguage android.view.textservice.SentenceSuggestionsInfo android.view.textservice.SentenceSuggestionsInfo$1 android.view.textservice.SpellCheckerInfo @@ -4645,10 +4839,13 @@ android.webkit.JavascriptInterface android.webkit.JsPromptResult android.webkit.JsResult android.webkit.MimeTypeMap +android.webkit.ServiceWorkerClient android.webkit.ServiceWorkerController +android.webkit.ServiceWorkerWebSettings android.webkit.SslErrorHandler android.webkit.TokenBindingService android.webkit.URLUtil +android.webkit.UserPackage android.webkit.ValueCallback android.webkit.WebBackForwardList android.webkit.WebChromeClient @@ -4657,7 +4854,6 @@ android.webkit.WebHistoryItem android.webkit.WebIconDatabase android.webkit.WebMessage android.webkit.WebMessagePort -android.webkit.WebResourceError android.webkit.WebResourceRequest android.webkit.WebResourceResponse android.webkit.WebSettings @@ -4693,12 +4889,13 @@ android.webkit.WebViewProviderInfo android.webkit.WebViewProviderInfo$1 android.webkit.WebViewProviderResponse android.webkit.WebViewProviderResponse$1 +android.webkit.WebViewZygote +android.widget.-$Lambda$50$tfOQKOmkDz_xLYaBQX_cysn8vbE android.widget.AbsListView android.widget.AbsListView$3 android.widget.AbsListView$4 android.widget.AbsListView$AbsPositionScroller android.widget.AbsListView$AdapterDataSetObserver -android.widget.AbsListView$CheckForLongPress android.widget.AbsListView$CheckForTap android.widget.AbsListView$FlingRunnable android.widget.AbsListView$FlingRunnable$1 @@ -4709,6 +4906,7 @@ android.widget.AbsListView$MultiChoiceModeWrapper android.widget.AbsListView$OnScrollListener android.widget.AbsListView$PerformClick android.widget.AbsListView$PositionScroller +android.widget.AbsListView$PositionScroller$1 android.widget.AbsListView$RecycleBin android.widget.AbsListView$RecyclerListener android.widget.AbsListView$SavedState @@ -4746,7 +4944,6 @@ android.widget.AdapterView$OnItemClickListener android.widget.AdapterView$OnItemLongClickListener android.widget.AdapterView$OnItemSelectedListener android.widget.AdapterView$SelectionNotifier -android.widget.Advanceable android.widget.ArrayAdapter android.widget.AutoCompleteTextView android.widget.AutoCompleteTextView$DropDownItemClickListener @@ -4768,7 +4965,6 @@ android.widget.CompoundButton$SavedState android.widget.CompoundButton$SavedState$1 android.widget.CursorAdapter android.widget.CursorFilter$CursorFilterClient -android.widget.DatePicker android.widget.DatePicker$OnDateChangedListener android.widget.DateTimeView android.widget.DateTimeView$ReceiverInfo @@ -4781,7 +4977,6 @@ android.widget.Editor android.widget.Editor$1 android.widget.Editor$2 android.widget.Editor$Blink -android.widget.Editor$CorrectionHighlighter android.widget.Editor$CursorAnchorInfoNotifier android.widget.Editor$CursorController android.widget.Editor$EditOperation @@ -4794,6 +4989,7 @@ android.widget.Editor$InsertionHandleView$2 android.widget.Editor$InsertionPointCursorController android.widget.Editor$PositionListener android.widget.Editor$ProcessTextIntentActionsHandler +android.widget.Editor$SelectionHandleView android.widget.Editor$SelectionModifierCursorController android.widget.Editor$SpanController android.widget.Editor$SuggestionHelper @@ -4802,7 +4998,6 @@ android.widget.Editor$TextRenderNode android.widget.Editor$TextViewPositionListener android.widget.Editor$UndoInputFilter android.widget.ExpandableListConnector -android.widget.ExpandableListView android.widget.FastScroller android.widget.FastScroller$1 android.widget.FastScroller$2 @@ -4896,7 +5091,6 @@ android.widget.PopupWindow android.widget.PopupWindow$1 android.widget.PopupWindow$2 android.widget.PopupWindow$3 -android.widget.PopupWindow$4 android.widget.PopupWindow$OnDismissListener android.widget.PopupWindow$PopupBackgroundView android.widget.PopupWindow$PopupDecorView @@ -4904,6 +5098,7 @@ android.widget.PopupWindow$PopupDecorView$1 android.widget.PopupWindow$PopupDecorView$2 android.widget.PopupWindow$PopupDecorView$2$1 android.widget.PopupWindow$PopupDecorView$3 +android.widget.PopupWindow$PopupDecorView$4 android.widget.ProgressBar android.widget.ProgressBar$1 android.widget.ProgressBar$ProgressTintInfo @@ -4943,10 +5138,7 @@ android.widget.RemoteViews$RuntimeAction android.widget.RemoteViews$SetDrawableParameters android.widget.RemoteViews$SetOnClickPendingIntent android.widget.RemoteViews$SetOnClickPendingIntent$1 -android.widget.RemoteViews$SetRemoteInputsAction -android.widget.RemoteViews$TextViewDrawableAction android.widget.RemoteViews$ViewGroupAction -android.widget.RemoteViews$ViewPaddingAction android.widget.RemoteViewsAdapter$RemoteAdapterConnectionCallback android.widget.RemoteViewsService android.widget.RemoteViewsService$RemoteViewsFactory @@ -4973,11 +5165,10 @@ android.widget.SearchView$9 android.widget.SearchView$OnCloseListener android.widget.SearchView$OnQueryTextListener android.widget.SearchView$SearchAutoComplete +android.widget.SearchView$UpdatableTouchDelegate android.widget.SectionIndexer android.widget.SeekBar android.widget.SeekBar$OnSeekBarChangeListener -android.widget.SimpleAdapter -android.widget.SimpleAdapter$ViewBinder android.widget.SimpleCursorAdapter android.widget.Space android.widget.SpellChecker @@ -4985,7 +5176,6 @@ android.widget.SpellChecker$1 android.widget.SpellChecker$SpellParser android.widget.Spinner android.widget.Spinner$1 -android.widget.Spinner$DialogPopup android.widget.Spinner$DropDownAdapter android.widget.Spinner$DropdownPopup android.widget.Spinner$DropdownPopup$1 @@ -5035,7 +5225,6 @@ android.widget.TimePicker$OnTimeChangedListener android.widget.Toast android.widget.Toast$TN android.widget.Toast$TN$1 -android.widget.Toast$TN$2 android.widget.ToggleButton android.widget.Toolbar android.widget.Toolbar$1 @@ -5059,6 +5248,7 @@ android.widget.ViewFlipper$1 android.widget.ViewFlipper$2 android.widget.ViewSwitcher android.widget.WrapperListAdapter +android.widget.ZoomButtonsController com.android.dex.ClassData com.android.dex.ClassData$Method com.android.dex.ClassDef @@ -5085,9 +5275,19 @@ com.android.dex.util.ByteInput com.android.dex.util.ByteOutput com.android.dex.util.ExceptionWithContext com.android.dex.util.FileUtils +com.android.framework.protobuf.nano.CodedInputByteBufferNano +com.android.framework.protobuf.nano.CodedOutputByteBufferNano +com.android.framework.protobuf.nano.ExtendableMessageNano +com.android.framework.protobuf.nano.InternalNano +com.android.framework.protobuf.nano.InvalidProtocolBufferNanoException +com.android.framework.protobuf.nano.MessageNano +com.android.framework.protobuf.nano.WireFormatNano +com.android.i18n.phonenumbers.AlternateFormatsCountryCodeSet com.android.i18n.phonenumbers.AsYouTypeFormatter com.android.i18n.phonenumbers.CountryCodeToRegionCodeMap com.android.i18n.phonenumbers.MetadataLoader +com.android.i18n.phonenumbers.MetadataManager +com.android.i18n.phonenumbers.MetadataManager$1 com.android.i18n.phonenumbers.MetadataSource com.android.i18n.phonenumbers.MultiFileMetadataSourceImpl com.android.i18n.phonenumbers.NumberParseException @@ -5096,7 +5296,6 @@ com.android.i18n.phonenumbers.PhoneNumberMatcher com.android.i18n.phonenumbers.PhoneNumberMatcher$State com.android.i18n.phonenumbers.PhoneNumberUtil com.android.i18n.phonenumbers.PhoneNumberUtil$1 -com.android.i18n.phonenumbers.PhoneNumberUtil$2 com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency$1 com.android.i18n.phonenumbers.PhoneNumberUtil$Leniency$2 @@ -5114,19 +5313,13 @@ com.android.i18n.phonenumbers.Phonenumber$PhoneNumber$CountryCodeSource com.android.i18n.phonenumbers.RegexCache com.android.i18n.phonenumbers.RegexCache$LRUCache com.android.i18n.phonenumbers.RegexCache$LRUCache$1 +com.android.i18n.phonenumbers.ShortNumbersRegionCodeSet com.android.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder -com.android.i18n.phonenumbers.prefixmapper.DefaultMapStorage com.android.i18n.phonenumbers.prefixmapper.MappingFileProvider -com.android.i18n.phonenumbers.prefixmapper.PhonePrefixMap -com.android.i18n.phonenumbers.prefixmapper.PhonePrefixMapStorageStrategy com.android.i18n.phonenumbers.prefixmapper.PrefixFileReader -com.android.ims.ImsCall -com.android.ims.ImsCall$ImsCallSessionListenerProxy com.android.ims.ImsCall$Listener com.android.ims.ImsCallForwardInfo com.android.ims.ImsCallProfile -com.android.ims.ImsCallProfile$1 -com.android.ims.ImsConferenceState com.android.ims.ImsConfig com.android.ims.ImsConfigListener com.android.ims.ImsConfigListener$Stub @@ -5141,37 +5334,77 @@ com.android.ims.ImsManager$1 com.android.ims.ImsManager$2 com.android.ims.ImsManager$ImsRegistrationListenerProxy com.android.ims.ImsManager$ImsServiceDeathRecipient +com.android.ims.ImsMultiEndpoint +com.android.ims.ImsMultiEndpoint$ImsExternalCallStateListenerProxy com.android.ims.ImsReasonInfo com.android.ims.ImsReasonInfo$1 com.android.ims.ImsSsInfo -com.android.ims.ImsStreamMediaProfile -com.android.ims.ImsStreamMediaProfile$1 -com.android.ims.ImsSuppServiceNotification -com.android.ims.internal.ICall com.android.ims.internal.IImsCallSession -com.android.ims.internal.IImsCallSession$Stub com.android.ims.internal.IImsCallSessionListener -com.android.ims.internal.IImsCallSessionListener$Stub com.android.ims.internal.IImsConfig com.android.ims.internal.IImsConfig$Stub +com.android.ims.internal.IImsConfig$Stub$Proxy com.android.ims.internal.IImsEcbm com.android.ims.internal.IImsEcbm$Stub com.android.ims.internal.IImsEcbmListener com.android.ims.internal.IImsEcbmListener$Stub +com.android.ims.internal.IImsExternalCallStateListener +com.android.ims.internal.IImsExternalCallStateListener$Stub com.android.ims.internal.IImsMultiEndpoint +com.android.ims.internal.IImsMultiEndpoint$Stub com.android.ims.internal.IImsRegistrationListener com.android.ims.internal.IImsRegistrationListener$Stub +com.android.ims.internal.IImsRegistrationListener$Stub$Proxy com.android.ims.internal.IImsService com.android.ims.internal.IImsService$Stub +com.android.ims.internal.IImsService$Stub$Proxy +com.android.ims.internal.IImsServiceController +com.android.ims.internal.IImsServiceFeatureListener com.android.ims.internal.IImsUt com.android.ims.internal.IImsUt$Stub com.android.ims.internal.IImsUtListener com.android.ims.internal.IImsUtListener$Stub -com.android.ims.internal.IImsVideoCallProvider -com.android.ims.internal.ImsCallSession -com.android.ims.internal.ImsCallSession$IImsCallSessionListenerProxy -com.android.ims.internal.ImsCallSession$Listener -com.android.ims.internal.ImsCallSession$State +com.android.ims.internal.uce.common.CapInfo +com.android.ims.internal.uce.common.CapInfo$1 +com.android.ims.internal.uce.common.StatusCode +com.android.ims.internal.uce.common.StatusCode$1 +com.android.ims.internal.uce.common.UceLong +com.android.ims.internal.uce.common.UceLong$1 +com.android.ims.internal.uce.options.IOptionsListener +com.android.ims.internal.uce.options.IOptionsService +com.android.ims.internal.uce.presence.IPresenceListener +com.android.ims.internal.uce.presence.IPresenceListener$Stub +com.android.ims.internal.uce.presence.IPresenceListener$Stub$Proxy +com.android.ims.internal.uce.presence.IPresenceService +com.android.ims.internal.uce.presence.IPresenceService$Stub +com.android.ims.internal.uce.presence.IPresenceService$Stub$Proxy +com.android.ims.internal.uce.presence.PresCapInfo +com.android.ims.internal.uce.presence.PresCmdId +com.android.ims.internal.uce.presence.PresCmdId$1 +com.android.ims.internal.uce.presence.PresCmdStatus +com.android.ims.internal.uce.presence.PresCmdStatus$1 +com.android.ims.internal.uce.presence.PresPublishTriggerType +com.android.ims.internal.uce.presence.PresPublishTriggerType$1 +com.android.ims.internal.uce.presence.PresResInfo +com.android.ims.internal.uce.presence.PresResInfo$1 +com.android.ims.internal.uce.presence.PresResInstanceInfo +com.android.ims.internal.uce.presence.PresResInstanceInfo$1 +com.android.ims.internal.uce.presence.PresRlmiInfo +com.android.ims.internal.uce.presence.PresRlmiInfo$1 +com.android.ims.internal.uce.presence.PresServiceInfo +com.android.ims.internal.uce.presence.PresSipResponse +com.android.ims.internal.uce.presence.PresSipResponse$1 +com.android.ims.internal.uce.presence.PresSubscriptionState +com.android.ims.internal.uce.presence.PresSubscriptionState$1 +com.android.ims.internal.uce.presence.PresTupleInfo +com.android.ims.internal.uce.presence.PresTupleInfo$1 +com.android.ims.internal.uce.uceservice.IUceListener +com.android.ims.internal.uce.uceservice.IUceListener$Stub +com.android.ims.internal.uce.uceservice.IUceService +com.android.ims.internal.uce.uceservice.IUceService$Stub +com.android.ims.internal.uce.uceservice.IUceService$Stub$Proxy +com.android.ims.internal.uce.uceservice.ImsUceManager +com.android.ims.internal.uce.uceservice.ImsUceManager$UceServiceDeathRecipient com.android.internal.R$styleable com.android.internal.alsa.AlsaCardsParser com.android.internal.alsa.AlsaCardsParser$AlsaCardRecord @@ -5186,17 +5419,6 @@ com.android.internal.app.AlertController$ButtonHandler com.android.internal.app.AlertController$CheckedItemAdapter com.android.internal.app.AlertController$RecycleListView com.android.internal.app.AssistUtils -com.android.internal.app.ChooserActivity -com.android.internal.app.ChooserActivity$1 -com.android.internal.app.ChooserActivity$BaseChooserTargetComparator -com.android.internal.app.ChooserActivity$ChooserListAdapter -com.android.internal.app.ChooserActivity$ChooserRowAdapter -com.android.internal.app.ChooserActivity$ChooserRowAdapter$1 -com.android.internal.app.ChooserActivity$ChooserRowAdapter$2 -com.android.internal.app.ChooserActivity$ChooserRowAdapter$3 -com.android.internal.app.ChooserActivity$OffsetDataSetObserver -com.android.internal.app.ChooserActivity$RowScale -com.android.internal.app.ChooserActivity$RowViewHolder com.android.internal.app.IAppOpsCallback com.android.internal.app.IAppOpsCallback$Stub com.android.internal.app.IAppOpsCallback$Stub$Proxy @@ -5204,6 +5426,7 @@ com.android.internal.app.IAppOpsService com.android.internal.app.IAppOpsService$Stub com.android.internal.app.IAppOpsService$Stub$Proxy com.android.internal.app.IAssistScreenshotReceiver +com.android.internal.app.IAssistScreenshotReceiver$Stub com.android.internal.app.IBatteryStats com.android.internal.app.IBatteryStats$Stub com.android.internal.app.IBatteryStats$Stub$Proxy @@ -5215,41 +5438,34 @@ com.android.internal.app.ISoundTriggerService$Stub com.android.internal.app.IVoiceInteractionManagerService com.android.internal.app.IVoiceInteractionManagerService$Stub com.android.internal.app.IVoiceInteractionManagerService$Stub$Proxy +com.android.internal.app.IVoiceInteractionSessionListener +com.android.internal.app.IVoiceInteractionSessionListener$Stub +com.android.internal.app.IVoiceInteractionSessionListener$Stub$Proxy com.android.internal.app.IVoiceInteractionSessionShowCallback com.android.internal.app.IVoiceInteractionSessionShowCallback$Stub +com.android.internal.app.IVoiceInteractionSessionShowCallback$Stub$Proxy com.android.internal.app.IVoiceInteractor com.android.internal.app.IVoiceInteractor$Stub -com.android.internal.app.IntentForwarderActivity +com.android.internal.app.IVoiceInteractor$Stub$Proxy com.android.internal.app.LocaleHelper com.android.internal.app.LocalePicker com.android.internal.app.LocalePickerWithRegion$LocaleSelectedListener -com.android.internal.app.PlatLogoActivity +com.android.internal.app.NightDisplayController +com.android.internal.app.NightDisplayController$1 +com.android.internal.app.NightDisplayController$Callback +com.android.internal.app.NightDisplayController$LocalTime com.android.internal.app.ProcessMap com.android.internal.app.ResolverActivity -com.android.internal.app.ResolverActivity$1 -com.android.internal.app.ResolverActivity$2 -com.android.internal.app.ResolverActivity$3 -com.android.internal.app.ResolverActivity$DisplayResolveInfo -com.android.internal.app.ResolverActivity$LoadAdapterIconTask -com.android.internal.app.ResolverActivity$LoadIconTask -com.android.internal.app.ResolverActivity$ResolveListAdapter -com.android.internal.app.ResolverActivity$ResolvedComponentInfo -com.android.internal.app.ResolverActivity$TargetInfo -com.android.internal.app.ResolverActivity$ViewHolder -com.android.internal.app.ResolverComparator -com.android.internal.app.ResolverComparator$ScoredTarget com.android.internal.app.ToolbarActionBar com.android.internal.app.ToolbarActionBar$1 com.android.internal.app.ToolbarActionBar$2 com.android.internal.app.ToolbarActionBar$ActionMenuPresenterCallback com.android.internal.app.ToolbarActionBar$MenuBuilderCallback com.android.internal.app.ToolbarActionBar$ToolbarCallbackWrapper -com.android.internal.app.UnlaunchableAppActivity com.android.internal.app.WindowDecorActionBar com.android.internal.app.WindowDecorActionBar$1 com.android.internal.app.WindowDecorActionBar$2 com.android.internal.app.WindowDecorActionBar$3 -com.android.internal.app.WindowDecorActionBar$ActionModeImpl com.android.internal.app.procstats.DumpUtils com.android.internal.app.procstats.DurationsTable com.android.internal.app.procstats.IProcessStats @@ -5281,11 +5497,16 @@ com.android.internal.backup.IBackupTransport$Stub$Proxy com.android.internal.backup.LocalTransport com.android.internal.backup.LocalTransportService com.android.internal.content.NativeLibraryHelper -com.android.internal.content.NativeLibraryHelper$Handle com.android.internal.content.PackageHelper com.android.internal.content.PackageMonitor com.android.internal.content.ReferrerIntent com.android.internal.content.ReferrerIntent$1 +com.android.internal.font.IFontManager +com.android.internal.font.IFontManager$Stub +com.android.internal.graphics.drawable.AnimationScaleListDrawable +com.android.internal.graphics.drawable.AnimationScaleListDrawable$AnimationScaleListState +com.android.internal.hardware.AmbientDisplayConfiguration +com.android.internal.inputmethod.IInputContentUriToken com.android.internal.inputmethod.InputMethodSubtypeHandle com.android.internal.inputmethod.InputMethodSubtypeSwitchingController com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$ControllerImpl @@ -5296,6 +5517,7 @@ com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$InputMeth com.android.internal.inputmethod.InputMethodSubtypeSwitchingController$StaticRotationList com.android.internal.inputmethod.InputMethodUtils com.android.internal.inputmethod.InputMethodUtils$1 +com.android.internal.inputmethod.InputMethodUtils$InputMethodListBuilder com.android.internal.inputmethod.InputMethodUtils$InputMethodSettings com.android.internal.inputmethod.LocaleUtils com.android.internal.inputmethod.LocaleUtils$LocaleExtractor @@ -5321,6 +5543,7 @@ com.android.internal.net.VpnConfig com.android.internal.net.VpnInfo com.android.internal.net.VpnProfile com.android.internal.os.AndroidPrintStream +com.android.internal.os.AppFuseMount com.android.internal.os.AtomicFile com.android.internal.os.BackgroundThread com.android.internal.os.BatterySipper @@ -5334,6 +5557,8 @@ com.android.internal.os.BatteryStatsImpl$BatchTimer com.android.internal.os.BatteryStatsImpl$BatteryCallback com.android.internal.os.BatteryStatsImpl$Clocks com.android.internal.os.BatteryStatsImpl$ControllerActivityCounterImpl +com.android.internal.os.BatteryStatsImpl$Counter +com.android.internal.os.BatteryStatsImpl$DurationTimer com.android.internal.os.BatteryStatsImpl$ExternalStatsSync com.android.internal.os.BatteryStatsImpl$LongSamplingCounter com.android.internal.os.BatteryStatsImpl$MyHandler @@ -5351,6 +5576,7 @@ com.android.internal.os.BatteryStatsImpl$Uid$2 com.android.internal.os.BatteryStatsImpl$Uid$3 com.android.internal.os.BatteryStatsImpl$Uid$Pkg com.android.internal.os.BatteryStatsImpl$Uid$Pkg$Serv +com.android.internal.os.BatteryStatsImpl$Uid$Proc com.android.internal.os.BatteryStatsImpl$Uid$Sensor com.android.internal.os.BatteryStatsImpl$Uid$Wakelock com.android.internal.os.BinderInternal @@ -5359,6 +5585,9 @@ com.android.internal.os.BluetoothPowerCalculator com.android.internal.os.CameraPowerCalculator com.android.internal.os.CpuPowerCalculator com.android.internal.os.FlashlightPowerCalculator +com.android.internal.os.FuseAppLoop +com.android.internal.os.FuseAppLoop$1 +com.android.internal.os.FuseAppLoop$UnmountedException com.android.internal.os.HandlerCaller com.android.internal.os.HandlerCaller$Callback com.android.internal.os.HandlerCaller$MyHandler @@ -5369,15 +5598,18 @@ com.android.internal.os.IParcelFileDescriptorFactory com.android.internal.os.IResultReceiver com.android.internal.os.IResultReceiver$Stub com.android.internal.os.IResultReceiver$Stub$Proxy -com.android.internal.os.InstallerConnection -com.android.internal.os.InstallerConnection$InstallerException +com.android.internal.os.IShellCallback +com.android.internal.os.IShellCallback$Stub +com.android.internal.os.IShellCallback$Stub$Proxy com.android.internal.os.KernelCpuSpeedReader +com.android.internal.os.KernelMemoryBandwidthStats com.android.internal.os.KernelUidCpuTimeReader com.android.internal.os.KernelWakelockReader com.android.internal.os.KernelWakelockStats com.android.internal.os.KernelWakelockStats$Entry com.android.internal.os.LoggingPrintStream com.android.internal.os.LoggingPrintStream$1 +com.android.internal.os.MemoryPowerCalculator com.android.internal.os.MobileRadioPowerCalculator com.android.internal.os.PathClassLoaderFactory com.android.internal.os.PowerCalculator @@ -5385,31 +5617,35 @@ com.android.internal.os.PowerProfile com.android.internal.os.PowerProfile$CpuClusterKey com.android.internal.os.ProcessCpuTracker com.android.internal.os.ProcessCpuTracker$1 +com.android.internal.os.ProcessCpuTracker$FilterStats com.android.internal.os.ProcessCpuTracker$Stats +com.android.internal.os.RoSystemProperties com.android.internal.os.RuntimeInit com.android.internal.os.RuntimeInit$1 com.android.internal.os.RuntimeInit$Arguments -com.android.internal.os.RuntimeInit$UncaughtHandler +com.android.internal.os.RuntimeInit$KillApplicationHandler +com.android.internal.os.RuntimeInit$LoggingHandler com.android.internal.os.SamplingProfilerIntegration com.android.internal.os.SensorPowerCalculator com.android.internal.os.SomeArgs +com.android.internal.os.TransferPipe com.android.internal.os.WakelockPowerCalculator -com.android.internal.os.WifiPowerEstimator +com.android.internal.os.WifiPowerCalculator com.android.internal.os.Zygote +com.android.internal.os.Zygote$MethodAndArgsCaller com.android.internal.os.ZygoteConnection com.android.internal.os.ZygoteConnection$Arguments com.android.internal.os.ZygoteInit -com.android.internal.os.ZygoteInit$MethodAndArgsCaller com.android.internal.os.ZygoteSecurityException +com.android.internal.os.ZygoteServer com.android.internal.policy.DecorContext com.android.internal.policy.DecorView com.android.internal.policy.DecorView$1 -com.android.internal.policy.DecorView$4 -com.android.internal.policy.DecorView$ActionModeCallback2Wrapper com.android.internal.policy.DecorView$ColorViewState com.android.internal.policy.DividerSnapAlgorithm com.android.internal.policy.DividerSnapAlgorithm$SnapTarget com.android.internal.policy.DockedDividerUtils +com.android.internal.policy.IKeyguardDismissCallback com.android.internal.policy.IKeyguardDrawnCallback com.android.internal.policy.IKeyguardDrawnCallback$Stub com.android.internal.policy.IKeyguardDrawnCallback$Stub$Proxy @@ -5434,6 +5670,8 @@ com.android.internal.policy.PhoneWindow$PanelFeatureState$SavedState$1 com.android.internal.policy.PhoneWindow$PhoneWindowMenuCallback com.android.internal.policy.PhoneWindow$RotationWatcher com.android.internal.policy.PhoneWindow$RotationWatcher$1 +com.android.internal.policy.PipMotionHelper +com.android.internal.policy.PipSnapAlgorithm com.android.internal.statusbar.IStatusBar com.android.internal.statusbar.IStatusBar$Stub com.android.internal.statusbar.IStatusBar$Stub$Proxy @@ -5464,10 +5702,8 @@ com.android.internal.telecom.IVideoProvider$Stub com.android.internal.telecom.RemoteServiceCallback com.android.internal.telecom.RemoteServiceCallback$Stub com.android.internal.telecom.RemoteServiceCallback$Stub$Proxy -com.android.internal.telephony.ATParseEx -com.android.internal.telephony.AsyncEmergencyContactNotifier +com.android.internal.telephony.AppSmsManager com.android.internal.telephony.BaseCommands -com.android.internal.telephony.BlockChecker com.android.internal.telephony.Call com.android.internal.telephony.Call$SrvccState com.android.internal.telephony.Call$State @@ -5481,28 +5717,30 @@ com.android.internal.telephony.CallerInfoAsyncQuery$CallerInfoAsyncQueryHandler com.android.internal.telephony.CallerInfoAsyncQuery$CallerInfoAsyncQueryHandler$CallerInfoWorkerHandler com.android.internal.telephony.CallerInfoAsyncQuery$CookieWrapper com.android.internal.telephony.CallerInfoAsyncQuery$OnQueryCompleteListener +com.android.internal.telephony.CarrierActionAgent com.android.internal.telephony.CarrierAppUtils com.android.internal.telephony.CarrierServiceBindHelper com.android.internal.telephony.CarrierServiceBindHelper$1 com.android.internal.telephony.CarrierServiceBindHelper$2 com.android.internal.telephony.CarrierServiceBindHelper$AppBinding com.android.internal.telephony.CarrierServiceBindHelper$CarrierServicePackageMonitor +com.android.internal.telephony.CarrierServiceStateTracker +com.android.internal.telephony.CarrierServiceStateTracker$1 +com.android.internal.telephony.CarrierSignalAgent +com.android.internal.telephony.CarrierSignalAgent$1 com.android.internal.telephony.CellBroadcastHandler com.android.internal.telephony.CellNetworkScanResult +com.android.internal.telephony.ClientWakelockAccountant +com.android.internal.telephony.ClientWakelockTracker com.android.internal.telephony.CommandException com.android.internal.telephony.CommandException$Error com.android.internal.telephony.CommandsInterface com.android.internal.telephony.CommandsInterface$RadioState com.android.internal.telephony.Connection -com.android.internal.telephony.Connection$Listener -com.android.internal.telephony.Connection$ListenerBase -com.android.internal.telephony.Connection$PostDialListener -com.android.internal.telephony.Connection$PostDialState com.android.internal.telephony.DctConstants$Activity com.android.internal.telephony.DctConstants$State com.android.internal.telephony.DebugService com.android.internal.telephony.DefaultPhoneNotifier -com.android.internal.telephony.DriverCall com.android.internal.telephony.EncodeException com.android.internal.telephony.GsmAlphabet com.android.internal.telephony.GsmAlphabet$TextEncodingDetails @@ -5514,6 +5752,7 @@ com.android.internal.telephony.GsmCdmaPhone com.android.internal.telephony.GsmCdmaPhone$1 com.android.internal.telephony.GsmCdmaPhone$2 com.android.internal.telephony.HardwareConfig +com.android.internal.telephony.HbpcdUtils com.android.internal.telephony.ICarrierConfigLoader com.android.internal.telephony.ICarrierConfigLoader$Stub com.android.internal.telephony.ICarrierConfigLoader$Stub$Proxy @@ -5521,7 +5760,6 @@ com.android.internal.telephony.IIccPhoneBook com.android.internal.telephony.IIccPhoneBook$Stub com.android.internal.telephony.IMms com.android.internal.telephony.IMms$Stub -com.android.internal.telephony.IMms$Stub$Proxy com.android.internal.telephony.IOnSubscriptionsChangedListener com.android.internal.telephony.IOnSubscriptionsChangedListener$Stub com.android.internal.telephony.IOnSubscriptionsChangedListener$Stub$Proxy @@ -5555,20 +5793,16 @@ com.android.internal.telephony.IccSmsInterfaceManager$CdmaBroadcastRangeManager com.android.internal.telephony.IccSmsInterfaceManager$CellBroadcastRangeManager com.android.internal.telephony.ImsSMSDispatcher com.android.internal.telephony.InboundSmsHandler +com.android.internal.telephony.InboundSmsHandler$1 com.android.internal.telephony.InboundSmsHandler$DefaultState com.android.internal.telephony.InboundSmsHandler$DeliveringState com.android.internal.telephony.InboundSmsHandler$IdleState -com.android.internal.telephony.InboundSmsHandler$SmsBroadcastReceiver +com.android.internal.telephony.InboundSmsHandler$NewMessageNotificationActionReceiver com.android.internal.telephony.InboundSmsHandler$StartupState com.android.internal.telephony.InboundSmsHandler$WaitingState -com.android.internal.telephony.InboundSmsTracker com.android.internal.telephony.IntRangeManager -com.android.internal.telephony.IntRangeManager$ClientRange -com.android.internal.telephony.IntRangeManager$IntRange com.android.internal.telephony.MccTable com.android.internal.telephony.MccTable$MccEntry -com.android.internal.telephony.MmiCode -com.android.internal.telephony.MmiCode$State com.android.internal.telephony.OperatorInfo com.android.internal.telephony.Phone com.android.internal.telephony.Phone$1 @@ -5577,7 +5811,6 @@ com.android.internal.telephony.PhoneConstants$State com.android.internal.telephony.PhoneFactory com.android.internal.telephony.PhoneInternalInterface com.android.internal.telephony.PhoneInternalInterface$DataActivityState -com.android.internal.telephony.PhoneInternalInterface$SuppService com.android.internal.telephony.PhoneNotifier com.android.internal.telephony.PhoneStateIntentReceiver com.android.internal.telephony.PhoneSubInfoController @@ -5593,43 +5826,39 @@ com.android.internal.telephony.RIL$1 com.android.internal.telephony.RIL$2 com.android.internal.telephony.RIL$RILReceiver com.android.internal.telephony.RIL$RILSender +com.android.internal.telephony.RIL$RadioProxyDeathRecipient +com.android.internal.telephony.RIL$RilHandler com.android.internal.telephony.RILConstants com.android.internal.telephony.RILRequest com.android.internal.telephony.RadioCapability +com.android.internal.telephony.RadioIndication +com.android.internal.telephony.RadioResponse +com.android.internal.telephony.RatRatcheter +com.android.internal.telephony.RatRatcheter$1 com.android.internal.telephony.RestrictedState com.android.internal.telephony.RetryManager -com.android.internal.telephony.RetryManager$RetryRec +com.android.internal.telephony.RilWakelockInfo com.android.internal.telephony.SMSDispatcher com.android.internal.telephony.SMSDispatcher$SettingsObserver -com.android.internal.telephony.SMSDispatcher$SmsTracker com.android.internal.telephony.ServiceStateTracker com.android.internal.telephony.ServiceStateTracker$1 com.android.internal.telephony.ServiceStateTracker$2 com.android.internal.telephony.ServiceStateTracker$3 com.android.internal.telephony.ServiceStateTracker$CellInfoResult com.android.internal.telephony.ServiceStateTracker$SstSubscriptionsChangedListener -com.android.internal.telephony.SmsAddress com.android.internal.telephony.SmsApplication com.android.internal.telephony.SmsApplication$SmsApplicationData com.android.internal.telephony.SmsApplication$SmsPackageMonitor com.android.internal.telephony.SmsBroadcastUndelivered com.android.internal.telephony.SmsBroadcastUndelivered$1 com.android.internal.telephony.SmsBroadcastUndelivered$ScanRawTableThread -com.android.internal.telephony.SmsConstants$MessageClass -com.android.internal.telephony.SmsHeader -com.android.internal.telephony.SmsHeader$PortAddrs com.android.internal.telephony.SmsMessageBase -com.android.internal.telephony.SmsMessageBase$SubmitPduBase -com.android.internal.telephony.SmsNumberUtils -com.android.internal.telephony.SmsResponse com.android.internal.telephony.SmsStorageMonitor com.android.internal.telephony.SmsStorageMonitor$1 com.android.internal.telephony.SmsUsageMonitor com.android.internal.telephony.SmsUsageMonitor$SettingsObserver com.android.internal.telephony.SmsUsageMonitor$SettingsObserverHandler -com.android.internal.telephony.SmsUsageMonitor$ShortCodePatternMatcher com.android.internal.telephony.SubscriptionController -com.android.internal.telephony.SubscriptionController$1 com.android.internal.telephony.SubscriptionController$ScLocalLog com.android.internal.telephony.SubscriptionInfoUpdater com.android.internal.telephony.SubscriptionInfoUpdater$1 @@ -5640,10 +5869,8 @@ com.android.internal.telephony.SubscriptionMonitor$2 com.android.internal.telephony.TelephonyCapabilities com.android.internal.telephony.TelephonyComponentFactory com.android.internal.telephony.TelephonyDevController -com.android.internal.telephony.TelephonyEventLog com.android.internal.telephony.TelephonyTester com.android.internal.telephony.TelephonyTester$1 -com.android.internal.telephony.UUSInfo com.android.internal.telephony.UiccPhoneBookController com.android.internal.telephony.UiccSmsController com.android.internal.telephony.WakeLockStateMachine @@ -5652,45 +5879,36 @@ com.android.internal.telephony.WakeLockStateMachine$DefaultState com.android.internal.telephony.WakeLockStateMachine$IdleState com.android.internal.telephony.WakeLockStateMachine$WaitingState com.android.internal.telephony.WapPushOverSms +com.android.internal.telephony.WapPushOverSms$1 +com.android.internal.telephony.WapPushOverSms$BindServiceThread com.android.internal.telephony.cat.AppInterface -com.android.internal.telephony.cat.CatException +com.android.internal.telephony.cat.AppInterface$CommandType +com.android.internal.telephony.cat.CatCmdMessage +com.android.internal.telephony.cat.CatCmdMessage$BrowserSettings +com.android.internal.telephony.cat.CatCmdMessage$CallSettings +com.android.internal.telephony.cat.CatCmdMessage$SetupEventListSettings com.android.internal.telephony.cat.CatLog +com.android.internal.telephony.cat.CatResponseMessage com.android.internal.telephony.cat.CatService -com.android.internal.telephony.cat.CommandParamsFactory -com.android.internal.telephony.cat.IconLoader -com.android.internal.telephony.cat.ResultException -com.android.internal.telephony.cat.RilMessageDecoder -com.android.internal.telephony.cat.RilMessageDecoder$StateCmdParamsReady -com.android.internal.telephony.cat.RilMessageDecoder$StateStart -com.android.internal.telephony.cdma.CdmaCallWaitingNotification +com.android.internal.telephony.cat.Input +com.android.internal.telephony.cat.Item +com.android.internal.telephony.cat.LaunchBrowserMode +com.android.internal.telephony.cat.Menu +com.android.internal.telephony.cat.ResultCode +com.android.internal.telephony.cat.TextMessage +com.android.internal.telephony.cat.ToneSettings com.android.internal.telephony.cdma.CdmaInboundSmsHandler -com.android.internal.telephony.cdma.CdmaInformationRecords$CdmaDisplayInfoRec -com.android.internal.telephony.cdma.CdmaInformationRecords$CdmaSignalInfoRec com.android.internal.telephony.cdma.CdmaSMSDispatcher com.android.internal.telephony.cdma.CdmaServiceCategoryProgramHandler com.android.internal.telephony.cdma.CdmaServiceCategoryProgramHandler$1 -com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager com.android.internal.telephony.cdma.EriInfo com.android.internal.telephony.cdma.EriManager +com.android.internal.telephony.cdma.EriManager$EriDisplayInformation com.android.internal.telephony.cdma.EriManager$EriFile -com.android.internal.telephony.cdma.SignalToneUtil com.android.internal.telephony.dataconnection.ApnContext -com.android.internal.telephony.dataconnection.ApnSetting -com.android.internal.telephony.dataconnection.DataCallResponse -com.android.internal.telephony.dataconnection.DataCallResponse$SetupResult com.android.internal.telephony.dataconnection.DataConnection -com.android.internal.telephony.dataconnection.DataConnection$ConnectionParams -com.android.internal.telephony.dataconnection.DataConnection$DcActivatingState -com.android.internal.telephony.dataconnection.DataConnection$DcActiveState -com.android.internal.telephony.dataconnection.DataConnection$DcDefaultState -com.android.internal.telephony.dataconnection.DataConnection$DcDisconnectingState -com.android.internal.telephony.dataconnection.DataConnection$DcDisconnectionErrorCreatingConnection -com.android.internal.telephony.dataconnection.DataConnection$DcInactiveState -com.android.internal.telephony.dataconnection.DataConnection$DcNetworkAgent -com.android.internal.telephony.dataconnection.DataConnection$DisconnectParams -com.android.internal.telephony.dataconnection.DataConnection$UpdateLinkPropertyResult -com.android.internal.telephony.dataconnection.DcAsyncChannel +com.android.internal.telephony.dataconnection.DataEnabledSettings com.android.internal.telephony.dataconnection.DcController com.android.internal.telephony.dataconnection.DcController$1 com.android.internal.telephony.dataconnection.DcController$DccDefaultState @@ -5717,19 +5935,24 @@ com.android.internal.telephony.dataconnection.TelephonyNetworkFactory$InternalHa com.android.internal.telephony.gsm.GsmCellBroadcastHandler com.android.internal.telephony.gsm.GsmInboundSmsHandler com.android.internal.telephony.gsm.GsmSMSDispatcher -com.android.internal.telephony.gsm.GsmSmsAddress -com.android.internal.telephony.gsm.SimTlv -com.android.internal.telephony.gsm.SmsBroadcastConfigInfo com.android.internal.telephony.gsm.SmsMessage -com.android.internal.telephony.gsm.SmsMessage$PduParser -com.android.internal.telephony.gsm.SmsMessage$SubmitPdu -com.android.internal.telephony.gsm.SuppServiceNotification com.android.internal.telephony.gsm.UsimDataDownloadHandler -com.android.internal.telephony.gsm.UsimPhoneBookManager +com.android.internal.telephony.ims.-$Lambda$2$6hDwuvYxqWrzW_Ex5wc53XnUOpg +com.android.internal.telephony.ims.-$Lambda$3$6hDwuvYxqWrzW_Ex5wc53XnUOpg +com.android.internal.telephony.ims.-$Lambda$4$6hDwuvYxqWrzW_Ex5wc53XnUOpg +com.android.internal.telephony.ims.ImsResolver +com.android.internal.telephony.ims.ImsResolver$1 +com.android.internal.telephony.ims.ImsResolver$2 +com.android.internal.telephony.ims.ImsResolver$3 +com.android.internal.telephony.ims.ImsResolver$ImsServiceControllerFactory +com.android.internal.telephony.ims.ImsResolver$SubscriptionManagerProxy +com.android.internal.telephony.ims.ImsServiceController$ImsServiceControllerCallbacks com.android.internal.telephony.imsphone.ImsExternalCallTracker +com.android.internal.telephony.imsphone.ImsExternalCallTracker$1 +com.android.internal.telephony.imsphone.ImsExternalCallTracker$2 com.android.internal.telephony.imsphone.ImsExternalCallTracker$ExternalCallStateListener com.android.internal.telephony.imsphone.ImsExternalCallTracker$ExternalConnectionListener -com.android.internal.telephony.imsphone.ImsExternalConnection +com.android.internal.telephony.imsphone.ImsExternalCallTracker$ImsCallNotify com.android.internal.telephony.imsphone.ImsExternalConnection$Listener com.android.internal.telephony.imsphone.ImsPhone com.android.internal.telephony.imsphone.ImsPhone$1 @@ -5743,64 +5966,43 @@ com.android.internal.telephony.imsphone.ImsPhoneCallTracker$2 com.android.internal.telephony.imsphone.ImsPhoneCallTracker$3 com.android.internal.telephony.imsphone.ImsPhoneCallTracker$4 com.android.internal.telephony.imsphone.ImsPhoneCallTracker$5 -com.android.internal.telephony.imsphone.ImsPhoneCallTracker$6 +com.android.internal.telephony.imsphone.ImsPhoneCallTracker$PhoneStateListener com.android.internal.telephony.imsphone.ImsPhoneCommandInterface -com.android.internal.telephony.imsphone.ImsPhoneConnection -com.android.internal.telephony.imsphone.ImsPhoneConnection$MyHandler com.android.internal.telephony.imsphone.ImsPhoneFactory -com.android.internal.telephony.imsphone.ImsPhoneMmiCode com.android.internal.telephony.imsphone.ImsPullCall -com.android.internal.telephony.sip.SipPhone -com.android.internal.telephony.sip.SipPhoneBase +com.android.internal.telephony.metrics.CallSessionEventBuilder +com.android.internal.telephony.metrics.InProgressCallSession +com.android.internal.telephony.metrics.InProgressSmsSession +com.android.internal.telephony.metrics.SmsSessionEventBuilder +com.android.internal.telephony.metrics.TelephonyEventBuilder +com.android.internal.telephony.metrics.TelephonyMetrics +com.android.internal.telephony.nano.TelephonyProto$ImsCapabilities +com.android.internal.telephony.nano.TelephonyProto$ImsConnectionState +com.android.internal.telephony.nano.TelephonyProto$ImsReasonInfo +com.android.internal.telephony.nano.TelephonyProto$RilDataCall +com.android.internal.telephony.nano.TelephonyProto$SmsSession$Event +com.android.internal.telephony.nano.TelephonyProto$TelephonyCallSession$Event +com.android.internal.telephony.nano.TelephonyProto$TelephonyCallSession$Event$RilCall +com.android.internal.telephony.nano.TelephonyProto$TelephonyEvent +com.android.internal.telephony.nano.TelephonyProto$TelephonyServiceState +com.android.internal.telephony.nano.TelephonyProto$TelephonyServiceState$TelephonyOperator +com.android.internal.telephony.nano.TelephonyProto$TelephonySettings com.android.internal.telephony.test.SimulatedRadioControl -com.android.internal.telephony.uicc.AdnRecord -com.android.internal.telephony.uicc.AdnRecord$1 -com.android.internal.telephony.uicc.AdnRecordCache -com.android.internal.telephony.uicc.AdnRecordLoader com.android.internal.telephony.uicc.IccCardApplicationStatus -com.android.internal.telephony.uicc.IccCardApplicationStatus$AppState com.android.internal.telephony.uicc.IccCardApplicationStatus$AppType -com.android.internal.telephony.uicc.IccCardApplicationStatus$PersoSubState com.android.internal.telephony.uicc.IccCardProxy com.android.internal.telephony.uicc.IccCardStatus com.android.internal.telephony.uicc.IccCardStatus$CardState com.android.internal.telephony.uicc.IccCardStatus$PinState com.android.internal.telephony.uicc.IccConstants -com.android.internal.telephony.uicc.IccFileHandler -com.android.internal.telephony.uicc.IccFileHandler$LoadLinearFixedContext -com.android.internal.telephony.uicc.IccIoResult com.android.internal.telephony.uicc.IccRecords -com.android.internal.telephony.uicc.IccRecords$IccRecordLoaded -com.android.internal.telephony.uicc.IccServiceTable +com.android.internal.telephony.uicc.IccRefreshResponse com.android.internal.telephony.uicc.IccUtils -com.android.internal.telephony.uicc.IsimFileHandler -com.android.internal.telephony.uicc.IsimRecords -com.android.internal.telephony.uicc.IsimUiccRecords -com.android.internal.telephony.uicc.IsimUiccRecords$EfIsimDomainLoaded -com.android.internal.telephony.uicc.IsimUiccRecords$EfIsimImpiLoaded -com.android.internal.telephony.uicc.IsimUiccRecords$EfIsimImpuLoaded -com.android.internal.telephony.uicc.IsimUiccRecords$EfIsimIstLoaded -com.android.internal.telephony.uicc.IsimUiccRecords$EfIsimPcscfLoaded -com.android.internal.telephony.uicc.SIMRecords -com.android.internal.telephony.uicc.SIMRecords$1 -com.android.internal.telephony.uicc.SIMRecords$EfPlLoaded -com.android.internal.telephony.uicc.SIMRecords$EfUsimLiLoaded -com.android.internal.telephony.uicc.SIMRecords$GetSpnFsmState -com.android.internal.telephony.uicc.SpnOverride com.android.internal.telephony.uicc.UiccCard com.android.internal.telephony.uicc.UiccCard$1 com.android.internal.telephony.uicc.UiccCardApplication -com.android.internal.telephony.uicc.UiccCardApplication$1 -com.android.internal.telephony.uicc.UiccCarrierPrivilegeRules -com.android.internal.telephony.uicc.UiccCarrierPrivilegeRules$1 com.android.internal.telephony.uicc.UiccController -com.android.internal.telephony.uicc.UiccPkcs15 -com.android.internal.telephony.uicc.UiccPkcs15$FileHandler -com.android.internal.telephony.uicc.UiccPkcs15$Pkcs15Selector -com.android.internal.telephony.uicc.UsimFileHandler -com.android.internal.telephony.uicc.UsimServiceTable -com.android.internal.telephony.uicc.UsimServiceTable$UsimService -com.android.internal.telephony.uicc.VoiceMailConstants +com.android.internal.telephony.uicc.UiccStateChangedLauncher com.android.internal.textservice.ISpellCheckerService com.android.internal.textservice.ISpellCheckerService$Stub com.android.internal.textservice.ISpellCheckerService$Stub$Proxy @@ -5828,6 +6030,9 @@ com.android.internal.util.AsyncChannel$AsyncChannelConnection com.android.internal.util.AsyncChannel$DeathMonitor com.android.internal.util.AsyncChannel$SyncMessenger com.android.internal.util.AsyncChannel$SyncMessenger$SyncHandler +com.android.internal.util.ConcurrentUtils +com.android.internal.util.ConcurrentUtils$1 +com.android.internal.util.ConcurrentUtils$1$1 com.android.internal.util.DumpUtils$Dump com.android.internal.util.FastMath com.android.internal.util.FastPrintWriter @@ -5850,7 +6055,6 @@ com.android.internal.util.MemInfoReader com.android.internal.util.MessageUtils com.android.internal.util.NotificationColorUtil com.android.internal.util.NotificationColorUtil$ColorUtilsFromCompat -com.android.internal.util.ParcelableString com.android.internal.util.Preconditions com.android.internal.util.Predicate com.android.internal.util.ProcFileReader @@ -5865,7 +6069,8 @@ com.android.internal.util.StateMachine$SmHandler com.android.internal.util.StateMachine$SmHandler$HaltingState com.android.internal.util.StateMachine$SmHandler$QuittingState com.android.internal.util.StateMachine$SmHandler$StateInfo -com.android.internal.util.UserIcons +com.android.internal.util.ToBooleanFunction +com.android.internal.util.TokenBucket com.android.internal.util.VirtualRefBasePtr com.android.internal.util.WakeupMessage com.android.internal.util.XmlUtils @@ -5874,12 +6079,6 @@ com.android.internal.util.XmlUtils$WriteMapCallback com.android.internal.view.ActionBarPolicy com.android.internal.view.BaseIWindow com.android.internal.view.BaseSurfaceHolder -com.android.internal.view.FloatingActionMode -com.android.internal.view.FloatingActionMode$1 -com.android.internal.view.FloatingActionMode$2 -com.android.internal.view.FloatingActionMode$3 -com.android.internal.view.FloatingActionMode$4 -com.android.internal.view.FloatingActionMode$FloatingToolbarVisibilityHelper com.android.internal.view.IInputConnectionWrapper com.android.internal.view.IInputConnectionWrapper$MyHandler com.android.internal.view.IInputConnectionWrapper$SomeArgs @@ -5908,11 +6107,13 @@ com.android.internal.view.InputBindResult com.android.internal.view.InputBindResult$1 com.android.internal.view.InputConnectionWrapper com.android.internal.view.InputConnectionWrapper$InputContextCallback +com.android.internal.view.OneShotPreDrawListener com.android.internal.view.RootViewSurfaceTaker com.android.internal.view.RotationPolicy -com.android.internal.view.RotationPolicy$1 com.android.internal.view.RotationPolicy$RotationPolicyListener com.android.internal.view.RotationPolicy$RotationPolicyListener$1 +com.android.internal.view.SurfaceCallbackHelper +com.android.internal.view.SurfaceCallbackHelper$1 com.android.internal.view.WindowManagerPolicyThread com.android.internal.view.animation.FallbackLUTInterpolator com.android.internal.view.animation.HasNativeInterpolator @@ -5922,7 +6123,6 @@ com.android.internal.view.menu.ActionMenuItem com.android.internal.view.menu.ActionMenuItemView com.android.internal.view.menu.ActionMenuItemView$PopupCallback com.android.internal.view.menu.BaseMenuPresenter -com.android.internal.view.menu.ContextMenuBuilder com.android.internal.view.menu.ListMenuItemView com.android.internal.view.menu.MenuAdapter com.android.internal.view.menu.MenuBuilder @@ -5942,12 +6142,12 @@ com.android.internal.view.menu.StandardMenuPopup com.android.internal.view.menu.StandardMenuPopup$1 com.android.internal.view.menu.StandardMenuPopup$2 com.android.internal.view.menu.SubMenuBuilder +com.android.internal.widget.-$Lambda$6$LaTFiUorkqfcqmu-zMQbCLeO77c com.android.internal.widget.AbsActionBarView com.android.internal.widget.AbsActionBarView$VisibilityAnimListener com.android.internal.widget.ActionBarContainer com.android.internal.widget.ActionBarContainer$ActionBarBackgroundDrawable com.android.internal.widget.ActionBarContextView -com.android.internal.widget.ActionBarContextView$1 com.android.internal.widget.ActionBarOverlayLayout com.android.internal.widget.ActionBarOverlayLayout$1 com.android.internal.widget.ActionBarOverlayLayout$2 @@ -5959,60 +6159,29 @@ com.android.internal.widget.ActionBarOverlayLayout$LayoutParams com.android.internal.widget.AlertDialogLayout com.android.internal.widget.BackgroundFallback com.android.internal.widget.ButtonBarLayout +com.android.internal.widget.CachingIconView com.android.internal.widget.DecorContentParent com.android.internal.widget.DecorToolbar com.android.internal.widget.DialogTitle com.android.internal.widget.EditableInputConnection -com.android.internal.widget.FloatingToolbar -com.android.internal.widget.FloatingToolbar$1 -com.android.internal.widget.FloatingToolbar$2 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$1 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$12 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$13 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$14 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$15 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$16 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$2 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$3 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$4 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$5 -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$LogAccelerateInterpolator -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$OverflowPanel -com.android.internal.widget.FloatingToolbar$FloatingToolbarPopup$OverflowPanelViewHelper +com.android.internal.widget.ICheckCredentialProgressCallback com.android.internal.widget.ILockSettings com.android.internal.widget.ILockSettings$Stub com.android.internal.widget.ILockSettings$Stub$Proxy com.android.internal.widget.ImageFloatingTextView -com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient -com.android.internal.widget.LockPatternChecker -com.android.internal.widget.LockPatternChecker$3 -com.android.internal.widget.LockPatternChecker$5 -com.android.internal.widget.LockPatternChecker$OnCheckCallback -com.android.internal.widget.LockPatternChecker$OnVerifyCallback com.android.internal.widget.LockPatternUtils -com.android.internal.widget.LockPatternUtils$1 com.android.internal.widget.LockPatternUtils$RequestThrottledException com.android.internal.widget.LockPatternUtils$StrongAuthTracker com.android.internal.widget.LockPatternUtils$StrongAuthTracker$1 com.android.internal.widget.LockPatternUtils$StrongAuthTracker$H com.android.internal.widget.MediaNotificationView com.android.internal.widget.NotificationActionListLayout -com.android.internal.widget.NotificationActionListLayout$-void__clinit___LambdaImpl0 +com.android.internal.widget.NotificationExpandButton com.android.internal.widget.PreferenceImageView -com.android.internal.widget.ResolverDrawerLayout -com.android.internal.widget.ResolverDrawerLayout$1 -com.android.internal.widget.ResolverDrawerLayout$LayoutParams -com.android.internal.widget.ResolverDrawerLayout$OnDismissedListener com.android.internal.widget.ScrollBarUtils -com.android.internal.widget.TextViewInputDisabler -com.android.internal.widget.TextViewInputDisabler$1 com.android.internal.widget.ToolbarWidgetWrapper com.android.internal.widget.ToolbarWidgetWrapper$1 -com.android.internal.widget.ToolbarWidgetWrapper$2 -com.android.internal.widget.ToolbarWidgetWrapper$3 com.android.internal.widget.VerifyCredentialResponse -com.android.internal.widget.VerifyCredentialResponse$1 com.android.okhttp.Address com.android.okhttp.AndroidInternal com.android.okhttp.AndroidShimResponseCache @@ -6032,6 +6201,8 @@ com.android.okhttp.ConnectionPool$1 com.android.okhttp.ConnectionSpec com.android.okhttp.ConnectionSpec$Builder com.android.okhttp.Dispatcher +com.android.okhttp.Dns +com.android.okhttp.Dns$1 com.android.okhttp.Handshake com.android.okhttp.Headers com.android.okhttp.Headers$Builder @@ -6060,12 +6231,11 @@ com.android.okhttp.internal.DiskLruCache com.android.okhttp.internal.DiskLruCache$1 com.android.okhttp.internal.DiskLruCache$2 com.android.okhttp.internal.DiskLruCache$3 +com.android.okhttp.internal.DiskLruCache$Editor com.android.okhttp.internal.DiskLruCache$Entry com.android.okhttp.internal.FaultHidingSink com.android.okhttp.internal.Internal com.android.okhttp.internal.InternalCache -com.android.okhttp.internal.Network -com.android.okhttp.internal.Network$1 com.android.okhttp.internal.OptionalMethod com.android.okhttp.internal.Platform com.android.okhttp.internal.RouteDatabase @@ -6076,17 +6246,17 @@ com.android.okhttp.internal.http.AuthenticatorAdapter com.android.okhttp.internal.http.CacheStrategy com.android.okhttp.internal.http.CacheStrategy$Factory com.android.okhttp.internal.http.HeaderParser -com.android.okhttp.internal.http.HttpConnection -com.android.okhttp.internal.http.HttpConnection$AbstractSource -com.android.okhttp.internal.http.HttpConnection$ChunkedSink -com.android.okhttp.internal.http.HttpConnection$ChunkedSource -com.android.okhttp.internal.http.HttpConnection$FixedLengthSink -com.android.okhttp.internal.http.HttpConnection$FixedLengthSource -com.android.okhttp.internal.http.HttpConnection$UnknownLengthSource +com.android.okhttp.internal.http.Http1xStream +com.android.okhttp.internal.http.Http1xStream$AbstractSource +com.android.okhttp.internal.http.Http1xStream$ChunkedSink +com.android.okhttp.internal.http.Http1xStream$ChunkedSource +com.android.okhttp.internal.http.Http1xStream$FixedLengthSink +com.android.okhttp.internal.http.Http1xStream$FixedLengthSource +com.android.okhttp.internal.http.Http1xStream$UnknownLengthSource com.android.okhttp.internal.http.HttpEngine com.android.okhttp.internal.http.HttpEngine$1 com.android.okhttp.internal.http.HttpMethod -com.android.okhttp.internal.http.HttpTransport +com.android.okhttp.internal.http.HttpStream com.android.okhttp.internal.http.OkHeaders com.android.okhttp.internal.http.OkHeaders$1 com.android.okhttp.internal.http.RealResponseBody @@ -6096,12 +6266,13 @@ com.android.okhttp.internal.http.RetryableSink com.android.okhttp.internal.http.RouteException com.android.okhttp.internal.http.RouteSelector com.android.okhttp.internal.http.StatusLine -com.android.okhttp.internal.http.Transport +com.android.okhttp.internal.http.StreamAllocation com.android.okhttp.internal.huc.DelegatingHttpsURLConnection com.android.okhttp.internal.huc.HttpURLConnectionImpl com.android.okhttp.internal.huc.HttpsURLConnectionImpl com.android.okhttp.internal.io.FileSystem com.android.okhttp.internal.io.FileSystem$1 +com.android.okhttp.internal.io.RealConnection com.android.okhttp.internal.tls.OkHostnameVerifier com.android.okhttp.okio.AsyncTimeout com.android.okhttp.okio.AsyncTimeout$1 @@ -6145,20 +6316,34 @@ com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers com.android.org.bouncycastle.asn1.x509.X509ObjectIdentifiers com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers com.android.org.bouncycastle.crypto.AsymmetricBlockCipher +com.android.org.bouncycastle.crypto.BlockCipher +com.android.org.bouncycastle.crypto.BufferedBlockCipher com.android.org.bouncycastle.crypto.CipherKeyGenerator +com.android.org.bouncycastle.crypto.CipherParameters com.android.org.bouncycastle.crypto.CryptoException +com.android.org.bouncycastle.crypto.DataLengthException com.android.org.bouncycastle.crypto.Digest com.android.org.bouncycastle.crypto.ExtendedDigest com.android.org.bouncycastle.crypto.InvalidCipherTextException com.android.org.bouncycastle.crypto.KeyGenerationParameters +com.android.org.bouncycastle.crypto.OutputLengthException +com.android.org.bouncycastle.crypto.RuntimeCryptoException com.android.org.bouncycastle.crypto.digests.AndroidDigestFactory com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryInterface com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL com.android.org.bouncycastle.crypto.digests.OpenSSLDigest com.android.org.bouncycastle.crypto.digests.OpenSSLDigest$SHA1 com.android.org.bouncycastle.crypto.encodings.OAEPEncoding +com.android.org.bouncycastle.crypto.engines.AESEngine com.android.org.bouncycastle.crypto.engines.RSABlindedEngine com.android.org.bouncycastle.crypto.engines.RSACoreEngine +com.android.org.bouncycastle.crypto.paddings.BlockCipherPadding +com.android.org.bouncycastle.crypto.paddings.PKCS7Padding +com.android.org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher +com.android.org.bouncycastle.crypto.params.KeyParameter +com.android.org.bouncycastle.crypto.params.ParametersWithRandom +com.android.org.bouncycastle.jcajce.PBKDFKey +com.android.org.bouncycastle.jcajce.PKCS12Key com.android.org.bouncycastle.jcajce.provider.asymmetric.DH$Mappings com.android.org.bouncycastle.jcajce.provider.asymmetric.DSA$Mappings com.android.org.bouncycastle.jcajce.provider.asymmetric.EC$Mappings @@ -6196,6 +6381,8 @@ com.android.org.bouncycastle.jcajce.provider.keystore.PKCS12$Mappings com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std com.android.org.bouncycastle.jcajce.provider.symmetric.AES +com.android.org.bouncycastle.jcajce.provider.symmetric.AES$ECB +com.android.org.bouncycastle.jcajce.provider.symmetric.AES$ECB$1 com.android.org.bouncycastle.jcajce.provider.symmetric.AES$KeyGen com.android.org.bouncycastle.jcajce.provider.symmetric.AES$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.ARC4 @@ -6206,18 +6393,31 @@ com.android.org.bouncycastle.jcajce.provider.symmetric.DES com.android.org.bouncycastle.jcajce.provider.symmetric.DES$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.DESede com.android.org.bouncycastle.jcajce.provider.symmetric.DESede$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2 +com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12 com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.PBES2AlgorithmParameters +com.android.org.bouncycastle.jcajce.provider.symmetric.PBES2AlgorithmParameters$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.RC2 com.android.org.bouncycastle.jcajce.provider.symmetric.RC2$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.SymmetricAlgorithmProvider com.android.org.bouncycastle.jcajce.provider.symmetric.Twofish com.android.org.bouncycastle.jcajce.provider.symmetric.Twofish$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$AEADGenericBlockCipher +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$BufferedGenericBlockCipher +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher$GenericBlockCipher com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher +com.android.org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider +com.android.org.bouncycastle.jcajce.provider.symmetric.util.PBE com.android.org.bouncycastle.jcajce.provider.util.AlgorithmProvider com.android.org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider com.android.org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter com.android.org.bouncycastle.jcajce.provider.util.DigestFactory +com.android.org.bouncycastle.jcajce.spec.AEADParameterSpec com.android.org.bouncycastle.jcajce.util.BCJcaJceHelper com.android.org.bouncycastle.jcajce.util.JcaJceHelper com.android.org.bouncycastle.jcajce.util.ProviderJcaJceHelper @@ -6227,19 +6427,25 @@ com.android.org.bouncycastle.jce.provider.BouncyCastleProvider$1 com.android.org.bouncycastle.jce.provider.BouncyCastleProviderConfiguration com.android.org.bouncycastle.util.Arrays com.android.org.bouncycastle.util.Encodable +com.android.org.bouncycastle.util.Pack com.android.org.bouncycastle.util.Strings com.android.org.bouncycastle.util.Strings$1 +com.android.org.conscrypt.AbstractOpenSSLSession com.android.org.conscrypt.AbstractSessionContext com.android.org.conscrypt.AbstractSessionContext$1 com.android.org.conscrypt.AddressUtils com.android.org.conscrypt.ByteArray -com.android.org.conscrypt.CertPinManager +com.android.org.conscrypt.CertBlacklist com.android.org.conscrypt.CertificatePriorityComparator com.android.org.conscrypt.ChainStrengthAnalyzer com.android.org.conscrypt.ClientSessionContext com.android.org.conscrypt.ClientSessionContext$HostAndPort com.android.org.conscrypt.CryptoUpcalls +com.android.org.conscrypt.EvpMdRef$MD5 +com.android.org.conscrypt.EvpMdRef$SHA1 +com.android.org.conscrypt.EvpMdRef$SHA256 com.android.org.conscrypt.FileClientSessionCache +com.android.org.conscrypt.FileClientSessionCache$CacheFile com.android.org.conscrypt.FileClientSessionCache$Impl com.android.org.conscrypt.Hex com.android.org.conscrypt.JSSEProvider @@ -6278,7 +6484,6 @@ com.android.org.conscrypt.OpenSSLMessageDigestJDK com.android.org.conscrypt.OpenSSLMessageDigestJDK$MD5 com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA1 com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA256 -com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA512 com.android.org.conscrypt.OpenSSLProvider com.android.org.conscrypt.OpenSSLRSAKeyFactory com.android.org.conscrypt.OpenSSLRSAKeyPairGenerator @@ -6305,10 +6510,8 @@ com.android.org.conscrypt.OpenSSLX509CertificateFactory$1 com.android.org.conscrypt.OpenSSLX509CertificateFactory$2 com.android.org.conscrypt.OpenSSLX509CertificateFactory$Parser com.android.org.conscrypt.OpenSSLX509CertificateFactory$ParsingException -com.android.org.conscrypt.PinEntryException -com.android.org.conscrypt.PinListEntry -com.android.org.conscrypt.PinManagerException com.android.org.conscrypt.Platform +com.android.org.conscrypt.Platform$NoPreloadHolder com.android.org.conscrypt.SSLClientSessionCache com.android.org.conscrypt.SSLParametersImpl com.android.org.conscrypt.SSLParametersImpl$AliasChooser @@ -6326,12 +6529,20 @@ com.android.org.conscrypt.TrustedCertificateStore$2 com.android.org.conscrypt.TrustedCertificateStore$4 com.android.org.conscrypt.TrustedCertificateStore$5 com.android.org.conscrypt.TrustedCertificateStore$CertSelector +com.android.org.conscrypt.ct.CTLogInfo +com.android.org.conscrypt.ct.CTLogStore +com.android.org.conscrypt.ct.CTLogStoreImpl +com.android.org.conscrypt.ct.CTLogStoreImpl$InvalidLogFileException +com.android.org.conscrypt.ct.CTPolicy +com.android.org.conscrypt.ct.CTPolicyImpl +com.android.org.conscrypt.ct.CTVerifier +com.android.org.conscrypt.ct.KnownLogs +com.android.org.conscrypt.ct.SerializationException com.android.org.conscrypt.util.ArrayUtils com.android.org.conscrypt.util.EmptyArray com.android.server.AppWidgetBackupBridge com.android.server.BootReceiver com.android.server.BootReceiver$1 -com.android.server.BootReceiver$2 com.android.server.LocalServices com.android.server.NetworkManagementSocketTagger com.android.server.NetworkManagementSocketTagger$1 @@ -6341,6 +6552,7 @@ com.android.server.SystemConfig$PermissionEntry com.android.server.WidgetBackupProvider com.android.server.backup.AccountSyncSettingsBackupHelper com.android.server.net.BaseNetworkObserver +com.android.server.net.DnsServerEntry com.android.server.net.DnsServerRepository com.android.server.net.NetlinkTracker com.android.server.net.NetlinkTracker$Callback @@ -6350,6 +6562,17 @@ com.android.server.sip.SipService$MyExecutor com.android.server.sip.SipWakeLock com.android.server.sip.SipWakeupTimer com.android.server.sip.SipWakeupTimer$MyEventComparator +com.android.server.wifi.nano.WifiMetricsProto$AlertReasonCount +com.android.server.wifi.nano.WifiMetricsProto$ConnectionEvent +com.android.server.wifi.nano.WifiMetricsProto$RouterFingerPrint +com.android.server.wifi.nano.WifiMetricsProto$RssiPollCount +com.android.server.wifi.nano.WifiMetricsProto$SoftApDurationBucket +com.android.server.wifi.nano.WifiMetricsProto$SoftApReturnCodeCount +com.android.server.wifi.nano.WifiMetricsProto$WifiLog +com.android.server.wifi.nano.WifiMetricsProto$WifiLog$ScanReturnEntry +com.android.server.wifi.nano.WifiMetricsProto$WifiLog$WifiSystemStateEntry +com.android.server.wifi.nano.WifiMetricsProto$WifiScoreCount +com.android.server.wm.nano.WindowManagerProtos$TaskSnapshotProto com.google.android.collect.Lists com.google.android.collect.Maps com.google.android.collect.Sets @@ -6363,15 +6586,21 @@ com.google.android.mms.MmsException com.google.android.mms.pdu.GenericPdu com.google.android.mms.pdu.PduComposer com.google.android.mms.pdu.PduPersister +dalvik.annotation.optimization.CriticalNative +dalvik.annotation.optimization.FastNative dalvik.system.BaseDexClassLoader +dalvik.system.BaseDexClassLoader$Reporter dalvik.system.BlockGuard dalvik.system.BlockGuard$1 dalvik.system.BlockGuard$2 dalvik.system.BlockGuard$BlockGuardPolicyException dalvik.system.BlockGuard$Policy +dalvik.system.ClassExt dalvik.system.CloseGuard dalvik.system.CloseGuard$DefaultReporter +dalvik.system.CloseGuard$DefaultTracker dalvik.system.CloseGuard$Reporter +dalvik.system.CloseGuard$Tracker dalvik.system.DalvikLogHandler dalvik.system.DalvikLogging dalvik.system.DexClassLoader @@ -6379,6 +6608,10 @@ dalvik.system.DexFile dalvik.system.DexFile$DFEnum dalvik.system.DexPathList dalvik.system.DexPathList$Element +dalvik.system.DexPathList$NativeLibraryElement +dalvik.system.EmulatedStackFrame +dalvik.system.EmulatedStackFrame$Range +dalvik.system.InMemoryDexClassLoader$DexData dalvik.system.PathClassLoader dalvik.system.SocketTagger dalvik.system.SocketTagger$1 @@ -6386,11 +6619,6 @@ dalvik.system.VMDebug dalvik.system.VMRuntime dalvik.system.VMStack dalvik.system.ZygoteHooks -java.beans.ChangeListenerMap -java.beans.PropertyChangeEvent -java.beans.PropertyChangeListener -java.beans.PropertyChangeSupport -java.beans.PropertyChangeSupport$PropertyChangeListenerMap java.io.Bits java.io.BufferedInputStream java.io.BufferedOutputStream @@ -6407,6 +6635,7 @@ java.io.DataInput java.io.DataInputStream java.io.DataOutput java.io.DataOutputStream +java.io.DefaultFileSystem java.io.EOFException java.io.ExpiringCache java.io.ExpiringCache$1 @@ -6414,7 +6643,9 @@ java.io.ExpiringCache$Entry java.io.Externalizable java.io.File java.io.File$PathStatus +java.io.File$TempDirectory java.io.FileDescriptor +java.io.FileDescriptor$1 java.io.FileFilter java.io.FileInputStream java.io.FileInputStream$UseManualSkipException @@ -6434,6 +6665,7 @@ java.io.InputStreamReader java.io.InterruptedIOException java.io.InvalidClassException java.io.InvalidObjectException +java.io.NotSerializableException java.io.ObjectInput java.io.ObjectInputStream java.io.ObjectInputStream$BlockDataInputStream @@ -6445,6 +6677,7 @@ java.io.ObjectOutput java.io.ObjectOutputStream java.io.ObjectOutputStream$BlockDataOutputStream java.io.ObjectOutputStream$HandleTable +java.io.ObjectOutputStream$PutField java.io.ObjectOutputStream$ReplaceTable java.io.ObjectStreamClass java.io.ObjectStreamClass$1 @@ -6475,13 +6708,17 @@ java.io.SequenceInputStream java.io.SerialCallbackContext java.io.Serializable java.io.SerializablePermission +java.io.StreamCorruptedException java.io.StringBufferInputStream java.io.StringReader java.io.StringWriter +java.io.SyncFailedException java.io.UTFDataFormatException java.io.UnixFileSystem java.io.UnsupportedEncodingException java.io.Writer +java.lang.-$Lambda$250$S9HjrJh0nDg7IyU6wZdPArnZWRQ +java.lang.-$Lambda$251$S9HjrJh0nDg7IyU6wZdPArnZWRQ java.lang.AbstractMethodError java.lang.AbstractStringBuilder java.lang.AndroidHardcodedSystemProperties @@ -6498,8 +6735,6 @@ java.lang.Byte$ByteCache java.lang.CaseMapper java.lang.CaseMapper$1 java.lang.CharSequence -java.lang.CharSequence$-java_util_stream_IntStream_chars__LambdaImpl0 -java.lang.CharSequence$-java_util_stream_IntStream_codePoints__LambdaImpl0 java.lang.CharSequence$1CharIterator java.lang.CharSequence$1CodePointIterator java.lang.Character @@ -6531,9 +6766,6 @@ java.lang.Error java.lang.Exception java.lang.ExceptionInInitializerError java.lang.Float -java.lang.FloatingDecimal -java.lang.FloatingDecimal$1 -java.lang.FloatingDecimal$2 java.lang.IllegalAccessError java.lang.IllegalAccessException java.lang.IllegalArgumentException @@ -6543,6 +6775,7 @@ java.lang.IllegalThreadStateException java.lang.IncompatibleClassChangeError java.lang.IndexOutOfBoundsException java.lang.InheritableThreadLocal +java.lang.InstantiationError java.lang.InstantiationException java.lang.Integer java.lang.Integer$IntegerCache @@ -6554,7 +6787,8 @@ java.lang.LinkageError java.lang.Long java.lang.Long$LongCache java.lang.Math -java.lang.Math$NoImagePreloadHolder +java.lang.Math$RandomNumberGeneratorHolder +java.lang.NegativeArraySizeException java.lang.NoClassDefFoundError java.lang.NoSuchFieldError java.lang.NoSuchFieldException @@ -6586,7 +6820,6 @@ java.lang.SecurityException java.lang.SecurityManager java.lang.Short java.lang.Short$ShortCache -java.lang.Shutdown java.lang.StackOverflowError java.lang.StackTraceElement java.lang.StrictMath @@ -6594,7 +6827,6 @@ java.lang.String java.lang.String$CaseInsensitiveComparator java.lang.StringBuffer java.lang.StringBuilder -java.lang.StringCoding java.lang.StringFactory java.lang.StringIndexOutOfBoundsException java.lang.System @@ -6636,6 +6868,22 @@ java.lang.annotation.IncompleteAnnotationException java.lang.annotation.Inherited java.lang.annotation.Retention java.lang.annotation.Target +java.lang.invoke.MethodHandle +java.lang.invoke.MethodHandleImpl +java.lang.invoke.MethodHandleImpl$HandleInfo +java.lang.invoke.MethodHandleInfo +java.lang.invoke.MethodHandleStatics +java.lang.invoke.MethodHandles +java.lang.invoke.MethodType +java.lang.invoke.MethodType$ConcurrentWeakInternSet +java.lang.invoke.MethodType$ConcurrentWeakInternSet$WeakEntry +java.lang.invoke.MethodTypeForm +java.lang.invoke.Transformers$BindTo +java.lang.invoke.Transformers$Collector +java.lang.invoke.Transformers$Spreader +java.lang.invoke.Transformers$Transformer +java.lang.invoke.Transformers$VarargsCollector +java.lang.invoke.WrongMethodTypeException java.lang.ref.FinalizerReference java.lang.ref.FinalizerReference$Sentinel java.lang.ref.PhantomReference @@ -6643,27 +6891,40 @@ java.lang.ref.Reference java.lang.ref.ReferenceQueue java.lang.ref.SoftReference java.lang.ref.WeakReference -java.lang.reflect.AbstractMethod -java.lang.reflect.AbstractMethod$GenericInfo java.lang.reflect.AccessibleObject java.lang.reflect.AnnotatedElement java.lang.reflect.Array java.lang.reflect.Constructor +java.lang.reflect.Executable +java.lang.reflect.Executable$GenericInfo java.lang.reflect.Field java.lang.reflect.GenericArrayType java.lang.reflect.GenericDeclaration java.lang.reflect.InvocationHandler java.lang.reflect.InvocationTargetException +java.lang.reflect.MalformedParametersException java.lang.reflect.Member java.lang.reflect.Method java.lang.reflect.Method$1 java.lang.reflect.Modifier +java.lang.reflect.Parameter java.lang.reflect.ParameterizedType java.lang.reflect.Proxy java.lang.reflect.Proxy$1 +java.lang.reflect.Proxy$Key1 +java.lang.reflect.Proxy$Key2 +java.lang.reflect.Proxy$KeyFactory +java.lang.reflect.Proxy$KeyX +java.lang.reflect.Proxy$ProxyClassFactory java.lang.reflect.Type java.lang.reflect.TypeVariable java.lang.reflect.UndeclaredThrowableException +java.lang.reflect.WeakCache +java.lang.reflect.WeakCache$CacheKey +java.lang.reflect.WeakCache$CacheValue +java.lang.reflect.WeakCache$Factory +java.lang.reflect.WeakCache$LookupValue +java.lang.reflect.WeakCache$Value java.lang.reflect.WildcardType java.math.BigDecimal java.math.BigInt @@ -6671,7 +6932,6 @@ java.math.BigInteger java.math.BitLevel java.math.Conversion java.math.Division -java.math.Logical java.math.MathContext java.math.Multiplication java.math.NativeBN @@ -6718,6 +6978,7 @@ java.net.IDN java.net.InMemoryCookieStore java.net.Inet4Address java.net.Inet6Address +java.net.Inet6Address$Inet6AddressHolder java.net.Inet6AddressImpl java.net.InetAddress java.net.InetAddress$1 @@ -6730,7 +6991,6 @@ java.net.JarURLConnection java.net.MalformedURLException java.net.MulticastSocket java.net.NetworkInterface -java.net.NetworkInterface$1 java.net.NetworkInterface$1checkedAddresses java.net.NoRouteToHostException java.net.Parts @@ -6739,14 +6999,12 @@ java.net.PlainDatagramSocketImpl java.net.PlainSocketImpl java.net.PortUnreachableException java.net.ProtocolException -java.net.ProtocolFamily java.net.Proxy java.net.Proxy$Type java.net.ProxySelector java.net.ResponseCache java.net.ServerSocket java.net.Socket -java.net.Socket$1 java.net.Socket$2 java.net.Socket$3 java.net.SocketAddress @@ -6758,8 +7016,6 @@ java.net.SocketOutputStream java.net.SocketTimeoutException java.net.SocksConsts java.net.SocksSocketImpl -java.net.SocksSocketImpl$3 -java.net.StandardProtocolFamily java.net.URI java.net.URI$Parser java.net.URISyntaxException @@ -6805,7 +7061,6 @@ java.nio.channels.ByteChannel java.nio.channels.CancelledKeyException java.nio.channels.Channel java.nio.channels.Channels -java.nio.channels.Channels$1 java.nio.channels.Channels$ReadableByteChannelImpl java.nio.channels.ClosedByInterruptException java.nio.channels.ClosedChannelException @@ -6815,6 +7070,7 @@ java.nio.channels.FileChannel$MapMode java.nio.channels.FileLock java.nio.channels.GatheringByteChannel java.nio.channels.InterruptibleChannel +java.nio.channels.MulticastChannel java.nio.channels.NetworkChannel java.nio.channels.NonWritableChannelException java.nio.channels.OverlappingFileLockException @@ -6822,19 +7078,12 @@ java.nio.channels.ReadableByteChannel java.nio.channels.ScatteringByteChannel java.nio.channels.SeekableByteChannel java.nio.channels.SelectableChannel -java.nio.channels.SelectionKey -java.nio.channels.Selector java.nio.channels.ServerSocketChannel java.nio.channels.SocketChannel java.nio.channels.WritableByteChannel java.nio.channels.spi.AbstractInterruptibleChannel java.nio.channels.spi.AbstractInterruptibleChannel$1 java.nio.channels.spi.AbstractSelectableChannel -java.nio.channels.spi.AbstractSelectionKey -java.nio.channels.spi.AbstractSelector -java.nio.channels.spi.AbstractSelector$1 -java.nio.channels.spi.SelectorProvider -java.nio.channels.spi.SelectorProvider$1 java.nio.charset.CharacterCodingException java.nio.charset.Charset java.nio.charset.CharsetDecoder @@ -6850,6 +7099,21 @@ java.nio.charset.CodingErrorAction java.nio.charset.IllegalCharsetNameException java.nio.charset.StandardCharsets java.nio.charset.UnsupportedCharsetException +java.nio.file.FileAlreadyExistsException +java.nio.file.FileSystem +java.nio.file.FileSystemException +java.nio.file.FileSystems +java.nio.file.FileSystems$DefaultFileSystemHolder +java.nio.file.FileSystems$DefaultFileSystemHolder$1 +java.nio.file.Files +java.nio.file.NoSuchFileException +java.nio.file.OpenOption +java.nio.file.Path +java.nio.file.Watchable +java.nio.file.attribute.BasicFileAttributes +java.nio.file.attribute.FileAttribute +java.nio.file.attribute.PosixFileAttributes +java.nio.file.spi.FileSystemProvider java.security.AccessControlContext java.security.AccessControlException java.security.AccessController @@ -6912,6 +7176,7 @@ java.security.UnrecoverableKeyException java.security.cert.CRL java.security.cert.CRLException java.security.cert.CertPath +java.security.cert.CertPathBuilderException java.security.cert.CertPathChecker java.security.cert.CertPathHelperImpl java.security.cert.CertPathParameters @@ -6950,7 +7215,6 @@ java.security.interfaces.RSAPrivateKey java.security.interfaces.RSAPublicKey java.security.spec.AlgorithmParameterSpec java.security.spec.ECField -java.security.spec.ECFieldF2m java.security.spec.ECFieldFp java.security.spec.ECGenParameterSpec java.security.spec.ECParameterSpec @@ -6964,6 +7228,8 @@ java.security.spec.InvalidParameterSpecException java.security.spec.KeySpec java.security.spec.MGF1ParameterSpec java.security.spec.PKCS8EncodedKeySpec +java.security.spec.RSAPrivateCrtKeySpec +java.security.spec.RSAPrivateKeySpec java.security.spec.RSAPublicKeySpec java.security.spec.X509EncodedKeySpec java.sql.Date @@ -6999,17 +7265,23 @@ java.text.ParsePosition java.text.RuleBasedCollator java.text.SimpleDateFormat java.text.StringCharacterIterator -java.text.spi.DateFormatProvider -java.text.spi.DateFormatSymbolsProvider -java.text.spi.DecimalFormatSymbolsProvider -java.text.spi.NumberFormatProvider +java.time.DateTimeException +java.util.-$Lambda$181$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$182$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$183$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$184$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$267$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$268$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$291$aUGKT4ItCOku5-JSG-x8Aqj2pJw +java.util.-$Lambda$292$aUGKT4ItCOku5-JSG-x8Aqj2pJw +java.util.-$Lambda$293$aUGKT4ItCOku5-JSG-x8Aqj2pJw +java.util.-$Lambda$294$aUGKT4ItCOku5-JSG-x8Aqj2pJw java.util.AbstractCollection java.util.AbstractList java.util.AbstractList$Itr java.util.AbstractList$ListItr java.util.AbstractMap java.util.AbstractMap$1 -java.util.AbstractMap$1$1 java.util.AbstractMap$2 java.util.AbstractMap$2$1 java.util.AbstractMap$SimpleEntry @@ -7019,14 +7291,31 @@ java.util.AbstractSequentialList java.util.AbstractSet java.util.ArrayDeque java.util.ArrayDeque$DeqIterator +java.util.ArrayDeque$DescendingIterator java.util.ArrayList java.util.ArrayList$ArrayListSpliterator java.util.ArrayList$Itr java.util.ArrayList$ListItr java.util.ArrayList$SubList java.util.ArrayList$SubList$1 +java.util.ArrayPrefixHelpers$CumulateTask +java.util.ArrayPrefixHelpers$DoubleCumulateTask +java.util.ArrayPrefixHelpers$IntCumulateTask +java.util.ArrayPrefixHelpers$LongCumulateTask java.util.Arrays java.util.Arrays$ArrayList +java.util.Arrays$NaturalOrder +java.util.ArraysParallelSortHelpers$FJByte$Sorter +java.util.ArraysParallelSortHelpers$FJChar$Sorter +java.util.ArraysParallelSortHelpers$FJDouble$Sorter +java.util.ArraysParallelSortHelpers$FJFloat$Sorter +java.util.ArraysParallelSortHelpers$FJInt$Sorter +java.util.ArraysParallelSortHelpers$FJLong$Sorter +java.util.ArraysParallelSortHelpers$FJObject$Sorter +java.util.ArraysParallelSortHelpers$FJShort$Sorter +java.util.Base64 +java.util.Base64$Decoder +java.util.Base64$Encoder java.util.BitSet java.util.Calendar java.util.Collection @@ -7038,6 +7327,9 @@ java.util.Collections$AsLIFOQueue java.util.Collections$CheckedCollection java.util.Collections$CheckedList java.util.Collections$CheckedMap +java.util.Collections$CheckedNavigableMap +java.util.Collections$CheckedNavigableSet +java.util.Collections$CheckedQueue java.util.Collections$CheckedRandomAccessList java.util.Collections$CheckedSet java.util.Collections$CheckedSortedMap @@ -7058,6 +7350,8 @@ java.util.Collections$SingletonSet java.util.Collections$SynchronizedCollection java.util.Collections$SynchronizedList java.util.Collections$SynchronizedMap +java.util.Collections$SynchronizedNavigableMap +java.util.Collections$SynchronizedNavigableSet java.util.Collections$SynchronizedRandomAccessList java.util.Collections$SynchronizedSet java.util.Collections$SynchronizedSortedMap @@ -7070,18 +7364,16 @@ java.util.Collections$UnmodifiableMap java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$1 java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableEntry +java.util.Collections$UnmodifiableNavigableMap +java.util.Collections$UnmodifiableNavigableMap$EmptyNavigableMap +java.util.Collections$UnmodifiableNavigableSet +java.util.Collections$UnmodifiableNavigableSet$EmptyNavigableSet java.util.Collections$UnmodifiableRandomAccessList java.util.Collections$UnmodifiableSet java.util.Collections$UnmodifiableSortedMap java.util.Collections$UnmodifiableSortedSet java.util.ComparableTimSort java.util.Comparator -java.util.Comparator$-java_util_Comparator_comparingDouble_java_util_function_ToDoubleFunction_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparingInt_java_util_function_ToIntFunction_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparingLong_java_util_function_ToLongFunction_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparing_java_util_function_Function_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparing_java_util_function_Function_keyExtractor_java_util_Comparator_keyComparator_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_thenComparing_java_util_Comparator_other_LambdaImpl0 java.util.Comparators$NaturalOrderComparator java.util.Comparators$NullComparator java.util.ConcurrentModificationException @@ -7105,8 +7397,6 @@ java.util.EnumSet java.util.EnumSet$SerializationProxy java.util.Enumeration java.util.EventListener -java.util.EventObject -java.util.FormatFlagsConversionMismatchException java.util.Formattable java.util.Formatter java.util.Formatter$Conversion @@ -7121,9 +7411,10 @@ java.util.HashMap java.util.HashMap$EntryIterator java.util.HashMap$EntrySet java.util.HashMap$HashIterator -java.util.HashMap$HashMapEntry java.util.HashMap$KeyIterator java.util.HashMap$KeySet +java.util.HashMap$Node +java.util.HashMap$TreeNode java.util.HashMap$ValueIterator java.util.HashMap$Values java.util.HashSet @@ -7148,11 +7439,14 @@ java.util.Iterator java.util.JumboEnumSet java.util.JumboEnumSet$EnumSetIterator java.util.LinkedHashMap -java.util.LinkedHashMap$EntryIterator -java.util.LinkedHashMap$KeyIterator +java.util.LinkedHashMap$LinkedEntryIterator +java.util.LinkedHashMap$LinkedEntrySet java.util.LinkedHashMap$LinkedHashIterator java.util.LinkedHashMap$LinkedHashMapEntry -java.util.LinkedHashMap$ValueIterator +java.util.LinkedHashMap$LinkedKeyIterator +java.util.LinkedHashMap$LinkedKeySet +java.util.LinkedHashMap$LinkedValueIterator +java.util.LinkedHashMap$LinkedValues java.util.LinkedHashSet java.util.LinkedList java.util.LinkedList$DescendingIterator @@ -7160,10 +7454,13 @@ java.util.LinkedList$ListItr java.util.LinkedList$Node java.util.List java.util.ListIterator +java.util.ListResourceBundle java.util.Locale java.util.Locale$Builder java.util.Locale$Cache java.util.Locale$Category +java.util.Locale$FilteringMode +java.util.Locale$LanguageRange java.util.Locale$LocaleKey java.util.Map java.util.Map$Entry @@ -7197,14 +7494,8 @@ java.util.ResourceBundle$Control java.util.ResourceBundle$Control$1 java.util.ResourceBundle$Control$CandidateListCache java.util.ResourceBundle$LoaderReference -java.util.ResourceBundle$RBClassLoader -java.util.ResourceBundle$RBClassLoader$1 java.util.Scanner java.util.Scanner$1 -java.util.ServiceConfigurationError -java.util.ServiceLoader -java.util.ServiceLoader$1 -java.util.ServiceLoader$LazyIterator java.util.Set java.util.SimpleTimeZone java.util.SortedMap @@ -7220,6 +7511,7 @@ java.util.Spliterators$EmptySpliterator$OfDouble java.util.Spliterators$EmptySpliterator$OfInt java.util.Spliterators$EmptySpliterator$OfLong java.util.Spliterators$EmptySpliterator$OfRef +java.util.Spliterators$IteratorSpliterator java.util.Stack java.util.StringJoiner java.util.StringTokenizer @@ -7264,6 +7556,7 @@ java.util.WeakHashMap$KeyIterator java.util.WeakHashMap$KeySet java.util.WeakHashMap$ValueIterator java.util.WeakHashMap$Values +java.util.concurrent.-$Lambda$269$xR9BLpu6SifNikvFgr4lEiECBsk java.util.concurrent.AbstractExecutorService java.util.concurrent.ArrayBlockingQueue java.util.concurrent.BlockingDeque @@ -7279,15 +7572,48 @@ java.util.concurrent.CompletionService java.util.concurrent.CompletionStage java.util.concurrent.ConcurrentHashMap java.util.concurrent.ConcurrentHashMap$BaseIterator +java.util.concurrent.ConcurrentHashMap$BulkTask java.util.concurrent.ConcurrentHashMap$CollectionView java.util.concurrent.ConcurrentHashMap$CounterCell java.util.concurrent.ConcurrentHashMap$EntryIterator java.util.concurrent.ConcurrentHashMap$EntrySetView +java.util.concurrent.ConcurrentHashMap$ForEachEntryTask +java.util.concurrent.ConcurrentHashMap$ForEachKeyTask +java.util.concurrent.ConcurrentHashMap$ForEachMappingTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedEntryTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedKeyTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedMappingTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedValueTask +java.util.concurrent.ConcurrentHashMap$ForEachValueTask java.util.concurrent.ConcurrentHashMap$ForwardingNode java.util.concurrent.ConcurrentHashMap$KeyIterator java.util.concurrent.ConcurrentHashMap$KeySetView java.util.concurrent.ConcurrentHashMap$MapEntry +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesTask +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToLongTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysToLongTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToLongTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesToLongTask java.util.concurrent.ConcurrentHashMap$Node +java.util.concurrent.ConcurrentHashMap$ReduceEntriesTask +java.util.concurrent.ConcurrentHashMap$ReduceKeysTask +java.util.concurrent.ConcurrentHashMap$ReduceValuesTask +java.util.concurrent.ConcurrentHashMap$ReservationNode +java.util.concurrent.ConcurrentHashMap$SearchEntriesTask +java.util.concurrent.ConcurrentHashMap$SearchKeysTask +java.util.concurrent.ConcurrentHashMap$SearchMappingsTask +java.util.concurrent.ConcurrentHashMap$SearchValuesTask java.util.concurrent.ConcurrentHashMap$Segment java.util.concurrent.ConcurrentHashMap$Traverser java.util.concurrent.ConcurrentHashMap$TreeBin @@ -7306,15 +7632,15 @@ java.util.concurrent.ConcurrentSkipListMap$Iter java.util.concurrent.ConcurrentSkipListMap$KeyIterator java.util.concurrent.ConcurrentSkipListMap$KeySet java.util.concurrent.ConcurrentSkipListMap$Node -java.util.concurrent.ConcurrentSkipListMap$SubMap java.util.concurrent.ConcurrentSkipListMap$ValueIterator java.util.concurrent.ConcurrentSkipListMap$Values java.util.concurrent.ConcurrentSkipListSet java.util.concurrent.CopyOnWriteArrayList -java.util.concurrent.CopyOnWriteArrayList$CowIterator +java.util.concurrent.CopyOnWriteArrayList$COWIterator java.util.concurrent.CopyOnWriteArraySet java.util.concurrent.CountDownLatch java.util.concurrent.CountDownLatch$Sync +java.util.concurrent.CountedCompleter java.util.concurrent.DelayQueue java.util.concurrent.Delayed java.util.concurrent.ExecutionException @@ -7346,6 +7672,8 @@ java.util.concurrent.LinkedBlockingDeque$Node java.util.concurrent.LinkedBlockingQueue java.util.concurrent.LinkedBlockingQueue$Itr java.util.concurrent.LinkedBlockingQueue$Node +java.util.concurrent.Phaser +java.util.concurrent.Phaser$QNode java.util.concurrent.PriorityBlockingQueue java.util.concurrent.RejectedExecutionException java.util.concurrent.RejectedExecutionHandler @@ -7368,6 +7696,7 @@ java.util.concurrent.ThreadLocalRandom java.util.concurrent.ThreadLocalRandom$1 java.util.concurrent.ThreadPoolExecutor java.util.concurrent.ThreadPoolExecutor$AbortPolicy +java.util.concurrent.ThreadPoolExecutor$DiscardOldestPolicy java.util.concurrent.ThreadPoolExecutor$DiscardPolicy java.util.concurrent.ThreadPoolExecutor$Worker java.util.concurrent.TimeUnit @@ -7412,21 +7741,35 @@ java.util.concurrent.locks.ReentrantReadWriteLock$Sync java.util.concurrent.locks.ReentrantReadWriteLock$Sync$HoldCounter java.util.concurrent.locks.ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock +java.util.function.-$Lambda$276$1MZdIZ-DL_fjy9l0o8IMJk57T2g java.util.function.BiConsumer java.util.function.BiFunction +java.util.function.BinaryOperator java.util.function.Consumer +java.util.function.DoubleBinaryOperator java.util.function.Function +java.util.function.IntBinaryOperator +java.util.function.IntConsumer +java.util.function.IntFunction +java.util.function.IntToDoubleFunction +java.util.function.IntToLongFunction +java.util.function.IntUnaryOperator +java.util.function.LongBinaryOperator +java.util.function.LongUnaryOperator java.util.function.Predicate java.util.function.Supplier +java.util.function.ToDoubleBiFunction java.util.function.ToDoubleFunction +java.util.function.ToIntBiFunction java.util.function.ToIntFunction +java.util.function.ToLongBiFunction java.util.function.ToLongFunction java.util.function.UnaryOperator java.util.jar.Attributes java.util.jar.Attributes$Name java.util.jar.JarEntry java.util.jar.JarFile -java.util.jar.JarFile$1 +java.util.jar.JarFile$JarEntryIterator java.util.jar.JarFile$JarFileEntry java.util.jar.JarVerifier java.util.jar.JarVerifier$1 @@ -7434,9 +7777,6 @@ java.util.jar.JarVerifier$VerifierStream java.util.jar.Manifest java.util.jar.Manifest$FastInputStream java.util.logging.ErrorManager -java.util.logging.FileHandler -java.util.logging.FileHandler$InitializationErrorManager -java.util.logging.FileHandler$MeteredStream java.util.logging.Filter java.util.logging.Formatter java.util.logging.Handler @@ -7445,7 +7785,8 @@ java.util.logging.Level$KnownLevel java.util.logging.LogManager java.util.logging.LogManager$1 java.util.logging.LogManager$2 -java.util.logging.LogManager$4 +java.util.logging.LogManager$3 +java.util.logging.LogManager$5 java.util.logging.LogManager$Cleaner java.util.logging.LogManager$LogNode java.util.logging.LogManager$LoggerContext @@ -7456,31 +7797,71 @@ java.util.logging.LogManager$SystemLoggerContext java.util.logging.LogRecord java.util.logging.Logger java.util.logging.Logger$1 +java.util.logging.Logger$LoggerBundle java.util.logging.LoggingPermission java.util.logging.LoggingProxyImpl -java.util.logging.SimpleFormatter -java.util.logging.StreamHandler -java.util.logging.XMLFormatter java.util.prefs.AbstractPreferences java.util.prefs.FileSystemPreferences java.util.prefs.Preferences java.util.regex.MatchResult java.util.regex.Matcher +java.util.regex.Matcher$OffsetBasedMatchResult java.util.regex.Pattern java.util.regex.PatternSyntaxException -java.util.spi.LocaleServiceProvider +java.util.stream.-$Lambda$155$qTstLJg88fs2C3g6LH-R51vCVP0 +java.util.stream.-$Lambda$41$qTstLJg88fs2C3g6LH-R51vCVP0 +java.util.stream.-$Lambda$67$qTstLJg88fs2C3g6LH-R51vCVP0 +java.util.stream.-$Lambda$89$qTstLJg88fs2C3g6LH-R51vCVP0 +java.util.stream.AbstractPipeline java.util.stream.BaseStream +java.util.stream.Collector +java.util.stream.Collector$Characteristics +java.util.stream.Collectors +java.util.stream.Collectors$CollectorImpl +java.util.stream.DoubleStream +java.util.stream.ForEachOps +java.util.stream.ForEachOps$ForEachOp +java.util.stream.ForEachOps$ForEachOp$OfRef java.util.stream.IntStream +java.util.stream.LongStream +java.util.stream.PipelineHelper +java.util.stream.ReduceOps +java.util.stream.ReduceOps$3 +java.util.stream.ReduceOps$3ReducingSink +java.util.stream.ReduceOps$AccumulatingSink +java.util.stream.ReduceOps$Box +java.util.stream.ReduceOps$ReduceOp +java.util.stream.ReferencePipeline +java.util.stream.ReferencePipeline$2 +java.util.stream.ReferencePipeline$2$1 +java.util.stream.ReferencePipeline$Head +java.util.stream.ReferencePipeline$StatefulOp +java.util.stream.ReferencePipeline$StatelessOp +java.util.stream.Sink +java.util.stream.Sink$ChainedReference +java.util.stream.SliceOps +java.util.stream.SliceOps$1 +java.util.stream.SliceOps$1$1 java.util.stream.Stream +java.util.stream.StreamOpFlag +java.util.stream.StreamOpFlag$MaskBuilder +java.util.stream.StreamOpFlag$Type +java.util.stream.StreamShape +java.util.stream.StreamSpliterators$InfiniteSupplyingSpliterator +java.util.stream.StreamSpliterators$InfiniteSupplyingSpliterator$OfRef java.util.stream.StreamSupport +java.util.stream.TerminalOp +java.util.stream.TerminalSink java.util.zip.Adler32 java.util.zip.CRC32 java.util.zip.CheckedInputStream +java.util.zip.CheckedOutputStream java.util.zip.Checksum java.util.zip.DataFormatException java.util.zip.Deflater java.util.zip.DeflaterOutputStream java.util.zip.GZIPInputStream +java.util.zip.GZIPInputStream$1 java.util.zip.GZIPOutputStream java.util.zip.Inflater java.util.zip.InflaterInputStream @@ -7488,13 +7869,15 @@ java.util.zip.ZStreamRef java.util.zip.ZipCoder java.util.zip.ZipConstants java.util.zip.ZipEntry +java.util.zip.ZipError java.util.zip.ZipException java.util.zip.ZipFile -java.util.zip.ZipFile$1 +java.util.zip.ZipFile$ZipEntryIterator java.util.zip.ZipFile$ZipFileInflaterInputStream java.util.zip.ZipFile$ZipFileInputStream java.util.zip.ZipInputStream java.util.zip.ZipOutputStream +java.util.zip.ZipUtils javax.crypto.BadPaddingException javax.crypto.Cipher javax.crypto.Cipher$CipherSpiAndProvider @@ -7506,7 +7889,6 @@ javax.crypto.Cipher$Transform javax.crypto.CipherInputStream javax.crypto.CipherOutputStream javax.crypto.CipherSpi -javax.crypto.EncryptedPrivateKeyInfo javax.crypto.IllegalBlockSizeException javax.crypto.JarVerifier javax.crypto.JceSecurity @@ -7518,11 +7900,11 @@ javax.crypto.MacSpi javax.crypto.NoSuchPaddingException javax.crypto.NullCipher javax.crypto.SecretKey -javax.crypto.SecretKeyFactory javax.crypto.ShortBufferException +javax.crypto.interfaces.PBEKey +javax.crypto.spec.GCMParameterSpec javax.crypto.spec.IvParameterSpec javax.crypto.spec.OAEPParameterSpec -javax.crypto.spec.PBEKeySpec javax.crypto.spec.PBEParameterSpec javax.crypto.spec.PSource javax.crypto.spec.PSource$PSpecified @@ -7546,6 +7928,7 @@ javax.net.ssl.ExtendedSSLSession javax.net.ssl.HandshakeCompletedListener javax.net.ssl.HostnameVerifier javax.net.ssl.HttpsURLConnection +javax.net.ssl.HttpsURLConnection$NoPreloadHolder javax.net.ssl.KeyManager javax.net.ssl.KeyManagerFactory javax.net.ssl.KeyManagerFactory$1 @@ -7574,9 +7957,11 @@ javax.net.ssl.X509ExtendedKeyManager javax.net.ssl.X509ExtendedTrustManager javax.net.ssl.X509KeyManager javax.net.ssl.X509TrustManager +javax.security.auth.Destroyable javax.security.auth.callback.UnsupportedCallbackException javax.security.auth.x500.X500Principal javax.security.cert.Certificate +javax.security.cert.CertificateEncodingException javax.security.cert.CertificateException javax.security.cert.X509Certificate javax.sip.SipException @@ -7607,8 +7992,6 @@ libcore.icu.TimeZoneNames$1 libcore.icu.TimeZoneNames$ZoneStringsCache libcore.internal.StringPool libcore.io.AsynchronousCloseMonitor -libcore.io.Base64 -libcore.io.Base64$InvalidBase64ByteException libcore.io.BlockGuardOs libcore.io.BufferIterator libcore.io.ClassPathURLStreamHandler @@ -7622,6 +8005,8 @@ libcore.io.EventLogger$DefaultReporter libcore.io.EventLogger$Reporter libcore.io.ForwardingOs libcore.io.IoBridge +libcore.io.IoTracker +libcore.io.IoTracker$Mode libcore.io.IoUtils libcore.io.IoUtils$FileReader libcore.io.Libcore @@ -7638,6 +8023,8 @@ libcore.net.NetworkSecurityPolicy$DefaultNetworkSecurityPolicy libcore.net.UriCodec libcore.net.event.NetworkEventDispatcher libcore.net.event.NetworkEventListener +libcore.net.http.HttpDate +libcore.net.http.HttpDate$1 libcore.reflect.AnnotatedElements libcore.reflect.AnnotationFactory libcore.reflect.AnnotationMember @@ -7683,21 +8070,16 @@ org.apache.harmony.xml.ExpatParser$CurrentAttributes org.apache.harmony.xml.ExpatParser$ExpatLocator org.apache.harmony.xml.ExpatReader org.apache.harmony.xml.dom.AttrImpl -org.apache.harmony.xml.dom.CDATASectionImpl org.apache.harmony.xml.dom.CharacterDataImpl -org.apache.harmony.xml.dom.CommentImpl org.apache.harmony.xml.dom.DOMImplementationImpl org.apache.harmony.xml.dom.DocumentImpl -org.apache.harmony.xml.dom.DocumentTypeImpl org.apache.harmony.xml.dom.ElementImpl org.apache.harmony.xml.dom.ElementImpl$ElementAttrNamedNodeMapImpl -org.apache.harmony.xml.dom.EntityReferenceImpl org.apache.harmony.xml.dom.InnerNodeImpl org.apache.harmony.xml.dom.LeafNodeImpl org.apache.harmony.xml.dom.NodeImpl org.apache.harmony.xml.dom.NodeImpl$1 org.apache.harmony.xml.dom.NodeListImpl -org.apache.harmony.xml.dom.ProcessingInstructionImpl org.apache.harmony.xml.dom.TextImpl org.apache.harmony.xml.parsers.DocumentBuilderFactoryImpl org.apache.harmony.xml.parsers.DocumentBuilderImpl @@ -7736,7 +8118,6 @@ org.apache.http.ProtocolVersion org.apache.http.ReasonPhraseCatalog org.apache.http.RequestLine org.apache.http.StatusLine -org.apache.http.TokenIterator org.apache.http.auth.AuthSchemeFactory org.apache.http.auth.AuthSchemeRegistry org.apache.http.auth.AuthState @@ -7774,7 +8155,6 @@ org.apache.http.client.utils.URIUtils org.apache.http.client.utils.URLEncodedUtils org.apache.http.conn.BasicManagedEntity org.apache.http.conn.ClientConnectionManager -org.apache.http.conn.ClientConnectionManagerFactory org.apache.http.conn.ClientConnectionOperator org.apache.http.conn.ClientConnectionRequest org.apache.http.conn.ConnectTimeoutException @@ -7829,7 +8209,6 @@ org.apache.http.entity.AbstractHttpEntity org.apache.http.entity.BasicHttpEntity org.apache.http.entity.ByteArrayEntity org.apache.http.entity.ContentLengthStrategy -org.apache.http.entity.FileEntity org.apache.http.entity.HttpEntityWrapper org.apache.http.entity.InputStreamEntity org.apache.http.entity.StringEntity @@ -7849,7 +8228,6 @@ org.apache.http.impl.client.AbstractAuthenticationHandler org.apache.http.impl.client.AbstractHttpClient org.apache.http.impl.client.BasicCookieStore org.apache.http.impl.client.BasicCredentialsProvider -org.apache.http.impl.client.BasicResponseHandler org.apache.http.impl.client.ClientParamsStack org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy org.apache.http.impl.client.DefaultHttpClient @@ -7860,6 +8238,7 @@ org.apache.http.impl.client.DefaultRequestDirector org.apache.http.impl.client.DefaultTargetAuthenticationHandler org.apache.http.impl.client.DefaultUserTokenHandler org.apache.http.impl.client.EntityEnclosingRequestWrapper +org.apache.http.impl.client.RedirectLocations org.apache.http.impl.client.RequestWrapper org.apache.http.impl.client.RoutedRequest org.apache.http.impl.client.TunnelRefusedException @@ -7872,10 +8251,6 @@ org.apache.http.impl.conn.DefaultResponseParser org.apache.http.impl.conn.IdleConnectionHandler org.apache.http.impl.conn.IdleConnectionHandler$TimeValues org.apache.http.impl.conn.ProxySelectorRoutePlanner -org.apache.http.impl.conn.SingleClientConnManager -org.apache.http.impl.conn.SingleClientConnManager$1 -org.apache.http.impl.conn.SingleClientConnManager$ConnAdapter -org.apache.http.impl.conn.SingleClientConnManager$PoolEntry org.apache.http.impl.conn.tsccm.AbstractConnPool org.apache.http.impl.conn.tsccm.BasicPoolEntry org.apache.http.impl.conn.tsccm.BasicPoolEntryRef @@ -7951,7 +8326,6 @@ org.apache.http.message.BasicHeader org.apache.http.message.BasicHeaderElement org.apache.http.message.BasicHeaderElementIterator org.apache.http.message.BasicHeaderValueParser -org.apache.http.message.BasicHttpEntityEnclosingRequest org.apache.http.message.BasicHttpRequest org.apache.http.message.BasicHttpResponse org.apache.http.message.BasicLineFormatter @@ -7960,7 +8334,6 @@ org.apache.http.message.BasicListHeaderIterator org.apache.http.message.BasicNameValuePair org.apache.http.message.BasicRequestLine org.apache.http.message.BasicStatusLine -org.apache.http.message.BasicTokenIterator org.apache.http.message.BufferedHeader org.apache.http.message.HeaderGroup org.apache.http.message.HeaderValueParser @@ -8002,7 +8375,6 @@ org.apache.http.util.CharArrayBuffer org.apache.http.util.EncodingUtils org.apache.http.util.EntityUtils org.apache.http.util.LangUtils -org.apache.http.util.VersionInfo org.ccil.cowan.tagsoup.AttributesImpl org.ccil.cowan.tagsoup.AutoDetector org.ccil.cowan.tagsoup.Element @@ -8027,16 +8399,12 @@ org.kxml2.io.KXmlParser org.kxml2.io.KXmlParser$ValueContext org.kxml2.io.KXmlSerializer org.w3c.dom.Attr -org.w3c.dom.CDATASection org.w3c.dom.CharacterData -org.w3c.dom.Comment -org.w3c.dom.DOMException org.w3c.dom.DOMImplementation org.w3c.dom.Document org.w3c.dom.DocumentFragment org.w3c.dom.DocumentType org.w3c.dom.Element -org.w3c.dom.EntityReference org.w3c.dom.NamedNodeMap org.w3c.dom.Node org.w3c.dom.NodeList @@ -8055,9 +8423,6 @@ org.xml.sax.SAXNotRecognizedException org.xml.sax.SAXNotSupportedException org.xml.sax.SAXParseException org.xml.sax.XMLReader -org.xml.sax.ext.DeclHandler -org.xml.sax.ext.DefaultHandler2 -org.xml.sax.ext.EntityResolver2 org.xml.sax.ext.LexicalHandler org.xml.sax.helpers.AttributesImpl org.xml.sax.helpers.DefaultHandler @@ -8065,22 +8430,28 @@ org.xmlpull.v1.XmlPullParser org.xmlpull.v1.XmlPullParserException org.xmlpull.v1.XmlPullParserFactory org.xmlpull.v1.XmlSerializer +sun.invoke.util.BytecodeDescriptor +sun.invoke.util.Wrapper sun.misc.ASCIICaseInsensitiveComparator -sun.misc.BASE64Decoder -sun.misc.CEStreamExhausted -sun.misc.CharacterDecoder sun.misc.Cleaner sun.misc.CompoundEnumeration -sun.misc.FDBigInt +sun.misc.FDBigInteger +sun.misc.FloatingDecimal +sun.misc.FloatingDecimal$1 +sun.misc.FloatingDecimal$ASCIIToBinaryBuffer +sun.misc.FloatingDecimal$ASCIIToBinaryConverter +sun.misc.FloatingDecimal$BinaryToASCIIBuffer +sun.misc.FloatingDecimal$BinaryToASCIIConverter +sun.misc.FloatingDecimal$ExceptionalBinaryToASCIIBuffer +sun.misc.FloatingDecimal$PreparedASCIIToBinaryBuffer sun.misc.FormattedFloatingDecimal sun.misc.FormattedFloatingDecimal$1 sun.misc.FormattedFloatingDecimal$Form -sun.misc.FpUtils -sun.misc.Hashing sun.misc.IOUtils -sun.misc.IoTrace +sun.misc.JavaIOFileDescriptorAccess sun.misc.LRUCache sun.misc.REException +sun.misc.SharedSecrets sun.misc.Unsafe sun.misc.VM sun.misc.Version @@ -8097,17 +8468,13 @@ sun.net.util.IPAddressUtil sun.net.www.ParseUtil sun.net.www.protocol.file.Handler sun.net.www.protocol.jar.Handler -sun.nio.ch.AbstractPollArrayWrapper -sun.nio.ch.AbstractPollSelectorImpl -sun.nio.ch.AllocatedNativeObject sun.nio.ch.ChannelInputStream sun.nio.ch.DatagramChannelImpl sun.nio.ch.DatagramDispatcher -sun.nio.ch.DefaultSelectorProvider sun.nio.ch.DirectBuffer +sun.nio.ch.EPollArrayWrapper sun.nio.ch.FileChannelImpl sun.nio.ch.FileChannelImpl$Unmapper -sun.nio.ch.FileDescriptorHolderSocketImpl sun.nio.ch.FileDispatcher sun.nio.ch.FileDispatcherImpl sun.nio.ch.FileKey @@ -8115,33 +8482,18 @@ sun.nio.ch.FileLockImpl sun.nio.ch.FileLockTable sun.nio.ch.IOStatus sun.nio.ch.IOUtil -sun.nio.ch.InheritedChannel sun.nio.ch.Interruptible sun.nio.ch.NativeDispatcher -sun.nio.ch.NativeObject sun.nio.ch.NativeThread sun.nio.ch.NativeThreadSet sun.nio.ch.Net -sun.nio.ch.Net$1 -sun.nio.ch.PollArrayWrapper -sun.nio.ch.PollSelectorImpl -sun.nio.ch.PollSelectorProvider sun.nio.ch.SelChImpl -sun.nio.ch.SelectionKeyImpl -sun.nio.ch.SelectorImpl -sun.nio.ch.SelectorProviderImpl sun.nio.ch.ServerSocketChannelImpl sun.nio.ch.SharedFileLockTable sun.nio.ch.SharedFileLockTable$FileLockReference -sun.nio.ch.SocketAdaptor -sun.nio.ch.SocketAdaptor$1 -sun.nio.ch.SocketAdaptor$2 -sun.nio.ch.SocketAdaptor$SocketInputStream sun.nio.ch.SocketChannelImpl -sun.nio.ch.SocketDispatcher sun.nio.ch.Util sun.nio.ch.Util$1 -sun.nio.ch.Util$2 sun.nio.ch.Util$BufferCache sun.nio.cs.ArrayDecoder sun.nio.cs.ArrayEncoder @@ -8151,15 +8503,30 @@ sun.nio.cs.ThreadLocalCoders sun.nio.cs.ThreadLocalCoders$1 sun.nio.cs.ThreadLocalCoders$2 sun.nio.cs.ThreadLocalCoders$Cache -sun.reflect.annotation.AnnotationType +sun.nio.fs.AbstractFileSystemProvider +sun.nio.fs.AbstractPath +sun.nio.fs.DefaultFileSystemProvider +sun.nio.fs.LinuxFileSystem +sun.nio.fs.LinuxFileSystemProvider +sun.nio.fs.NativeBuffer +sun.nio.fs.NativeBuffer$Deallocator +sun.nio.fs.NativeBuffers +sun.nio.fs.UnixChannelFactory +sun.nio.fs.UnixChannelFactory$Flags +sun.nio.fs.UnixConstants +sun.nio.fs.UnixException +sun.nio.fs.UnixFileAttributes +sun.nio.fs.UnixFileModeAttribute +sun.nio.fs.UnixFileStoreAttributes +sun.nio.fs.UnixFileSystem +sun.nio.fs.UnixFileSystemProvider +sun.nio.fs.UnixMountEntry +sun.nio.fs.UnixNativeDispatcher +sun.nio.fs.UnixPath +sun.nio.fs.Util sun.reflect.misc.ReflectUtil sun.security.action.GetBooleanAction sun.security.action.GetPropertyAction -sun.security.ec.ECKeyFactory -sun.security.ec.ECKeyFactory$1 -sun.security.ec.ECKeyFactory$2 -sun.security.ec.ECParameters -sun.security.ec.NamedCurve sun.security.jca.GetInstance sun.security.jca.GetInstance$Instance sun.security.jca.JCAUtil @@ -8175,8 +8542,9 @@ sun.security.jca.Providers sun.security.jca.ServiceId sun.security.pkcs.ContentInfo sun.security.pkcs.PKCS7 +sun.security.pkcs.PKCS7$VerbatimX509Certificate +sun.security.pkcs.PKCS7$WrappedX509Certificate sun.security.pkcs.PKCS9Attribute -sun.security.pkcs.ParsingException sun.security.pkcs.SignerInfo sun.security.provider.CertPathProvider sun.security.provider.X509Factory @@ -8192,7 +8560,9 @@ sun.security.provider.certpath.PKIXCertPathValidator sun.security.provider.certpath.PKIXMasterCertPathValidator sun.security.provider.certpath.PolicyChecker sun.security.provider.certpath.PolicyNodeImpl -sun.security.provider.certpath.UntrustedChecker +sun.security.util.-$Lambda$179$Kli5xKA4dAwmFO1sy_hpNWmbfH4 +sun.security.util.AbstractAlgorithmConstraints +sun.security.util.AlgorithmDecomposer sun.security.util.BitArray sun.security.util.ByteArrayLexOrder sun.security.util.ByteArrayTagOrder @@ -8206,7 +8576,6 @@ sun.security.util.DerInputStream sun.security.util.DerOutputStream sun.security.util.DerValue sun.security.util.DisabledAlgorithmConstraints -sun.security.util.DisabledAlgorithmConstraints$1 sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraint sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraint$Operator sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraints @@ -8221,9 +8590,7 @@ sun.security.util.MemoryCache sun.security.util.MemoryCache$CacheEntry sun.security.util.MemoryCache$SoftCacheEntry sun.security.util.ObjectIdentifier -sun.security.util.SecurityConstants sun.security.util.SignatureFileVerifier -sun.security.util.UntrustedCertificates sun.security.x509.AVA sun.security.x509.AVAKeyword sun.security.x509.AccessDescription @@ -8280,25 +8647,19 @@ sun.security.x509.X509AttributeName sun.security.x509.X509CertImpl sun.security.x509.X509CertInfo sun.security.x509.X509Key -sun.util.LocaleServiceProviderPool -sun.util.LocaleServiceProviderPool$1 sun.util.calendar.AbstractCalendar sun.util.calendar.BaseCalendar sun.util.calendar.BaseCalendar$Date sun.util.calendar.CalendarDate sun.util.calendar.CalendarSystem sun.util.calendar.CalendarUtils -sun.util.calendar.Era sun.util.calendar.Gregorian sun.util.calendar.Gregorian$Date -sun.util.calendar.ImmutableGregorianDate sun.util.calendar.JulianCalendar -sun.util.calendar.JulianCalendar$Date sun.util.calendar.LocalGregorianCalendar sun.util.locale.BaseLocale sun.util.locale.BaseLocale$Cache sun.util.locale.BaseLocale$Key -sun.util.locale.Extension sun.util.locale.InternalLocaleBuilder sun.util.locale.InternalLocaleBuilder$CaseInsensitiveChar sun.util.locale.LanguageTag @@ -8309,11 +8670,9 @@ sun.util.locale.LocaleSyntaxException sun.util.locale.LocaleUtils sun.util.locale.ParseStatus sun.util.locale.StringTokenIterator -sun.util.locale.UnicodeLocaleExtension sun.util.logging.LoggingProxy sun.util.logging.LoggingSupport sun.util.logging.LoggingSupport$1 -sun.util.logging.LoggingSupport$2 sun.util.logging.PlatformLogger sun.util.logging.PlatformLogger$1 sun.util.logging.PlatformLogger$JavaLoggerProxy diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 0ac30de584bf..6f9530901d82 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -969,9 +969,7 @@ public class Activity extends ContextThemeWrapper ? mLastNonConfigurationInstances.fragments : null); } mFragments.dispatchCreate(); - if (!isAtLeastO()) { - getApplication().dispatchActivityCreated(this, savedInstanceState); - } + getApplication().dispatchActivityCreated(this, savedInstanceState); if (mVoiceInteractor != null) { mVoiceInteractor.attachActivity(this); } @@ -1199,9 +1197,8 @@ public class Activity extends ContextThemeWrapper mCalled = true; mFragments.doLoaderStart(); - if (!isAtLeastO()) { - getApplication().dispatchActivityStarted(this); - } + + getApplication().dispatchActivityStarted(this); } /** @@ -1262,9 +1259,7 @@ public class Activity extends ContextThemeWrapper @CallSuper protected void onResume() { if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this); - if (!isAtLeastO()) { - getApplication().dispatchActivityResumed(this); - } + getApplication().dispatchActivityResumed(this); mActivityTransitionState.onResume(this, isTopOfTask()); mCalled = true; } @@ -1431,9 +1426,6 @@ public class Activity extends ContextThemeWrapper saveManagedDialogs(outState); mActivityTransitionState.saveState(outState); storeHasCurrentPermissionRequest(outState); - if (isAtLeastO()) { - getApplication().dispatchActivitySaveInstanceState(this, outState); - } if (DEBUG_LIFECYCLE) Slog.v(TAG, "onSaveInstanceState " + this + ": " + outState); } @@ -1450,9 +1442,6 @@ public class Activity extends ContextThemeWrapper onSaveInstanceState(outState, outPersistentState); saveManagedDialogs(outState); storeHasCurrentPermissionRequest(outState); - if (isAtLeastO()) { - getApplication().dispatchActivitySaveInstanceState(this, outState); - } if (DEBUG_LIFECYCLE) Slog.v(TAG, "onSaveInstanceState " + this + ": " + outState + ", " + outPersistentState); } @@ -1508,9 +1497,7 @@ public class Activity extends ContextThemeWrapper if (p != null) { outState.putParcelable(FRAGMENTS_TAG, p); } - if (!isAtLeastO()) { - getApplication().dispatchActivitySaveInstanceState(this, outState); - } + getApplication().dispatchActivitySaveInstanceState(this, outState); } /** @@ -1608,9 +1595,7 @@ public class Activity extends ContextThemeWrapper @CallSuper protected void onPause() { if (DEBUG_LIFECYCLE) Slog.v(TAG, "onPause " + this); - if (!isAtLeastO()) { - getApplication().dispatchActivityPaused(this); - } + getApplication().dispatchActivityPaused(this); mCalled = true; } @@ -1810,9 +1795,7 @@ public class Activity extends ContextThemeWrapper if (DEBUG_LIFECYCLE) Slog.v(TAG, "onStop " + this); if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(false); mActivityTransitionState.onStop(); - if (!isAtLeastO()) { - getApplication().dispatchActivityStopped(this); - } + getApplication().dispatchActivityStopped(this); mTranslucentCallback = null; mCalled = true; } @@ -1882,9 +1865,8 @@ public class Activity extends ContextThemeWrapper if (mActionBar != null) { mActionBar.onDestroy(); } - if (!isAtLeastO()) { - getApplication().dispatchActivityDestroyed(this); - } + + getApplication().dispatchActivityDestroyed(this); } /** @@ -6768,33 +6750,25 @@ public class Activity extends ContextThemeWrapper return mParent != null ? mParent.getActivityToken() : mToken; } - final void performCreateCommon(Bundle icicle) { - mActivityTransitionState.readState(icicle); + final void performCreateCommon() { mVisibleFromClient = !mWindow.getWindowStyle().getBoolean( com.android.internal.R.styleable.Window_windowNoDisplay, false); mFragments.dispatchActivityCreated(); mActivityTransitionState.setEnterActivityOptions(this, getActivityOptions()); - if (isAtLeastO()) { - getApplication().dispatchActivityCreated(this, icicle); - } } final void performCreate(Bundle icicle) { restoreHasCurrentPermissionRequest(icicle); - if (isAtLeastO()) { - getApplication().dispatchActivityPreCreated(this, icicle); - } onCreate(icicle); - performCreateCommon(icicle); + mActivityTransitionState.readState(icicle); + performCreateCommon(); } final void performCreate(Bundle icicle, PersistableBundle persistentState) { restoreHasCurrentPermissionRequest(icicle); - if (isAtLeastO()) { - getApplication().dispatchActivityPreCreated(this, icicle); - } onCreate(icicle, persistentState); - performCreateCommon(icicle); + mActivityTransitionState.readState(icicle); + performCreateCommon(); } final void performStart() { @@ -6837,9 +6811,6 @@ public class Activity extends ContextThemeWrapper } mActivityTransitionState.enterReady(this); - if (isAtLeastO()) { - getApplication().dispatchActivityStarted(this); - } } final void performRestart() { @@ -6915,9 +6886,7 @@ public class Activity extends ContextThemeWrapper mFragments.dispatchResume(); mFragments.execPendingActions(); - if (isAtLeastO()) { - getApplication().dispatchActivityResumed(this); - } + onPostResume(); if (!mCalled) { throw new SuperNotCalledException( @@ -6932,15 +6901,13 @@ public class Activity extends ContextThemeWrapper mCalled = false; onPause(); mResumed = false; - if (isAtLeastO()) { - getApplication().dispatchActivityPaused(this); - } if (!mCalled && getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.GINGERBREAD) { throw new SuperNotCalledException( "Activity " + mComponent.toShortString() + " did not call through to super.onPause()"); } + mResumed = false; } final void performUserLeaving() { @@ -6951,7 +6918,7 @@ public class Activity extends ContextThemeWrapper final void performStop(boolean preserveWindow) { mDoReportFullyDrawn = false; mFragments.doLoaderStop(mChangingConfigurations /*retain*/); - boolean dispatchActivityStopped = !mStopped; + if (!mStopped) { if (mWindow != null) { mWindow.closeAllPanels(); @@ -6988,9 +6955,6 @@ public class Activity extends ContextThemeWrapper mStopped = true; } mResumed = false; - if (dispatchActivityStopped && isAtLeastO()) { - getApplication().dispatchActivityStopped(this); - } } final void performDestroy() { @@ -7002,13 +6966,6 @@ public class Activity extends ContextThemeWrapper if (mVoiceInteractor != null) { mVoiceInteractor.detachActivity(); } - if (isAtLeastO()) { - getApplication().dispatchActivityDestroyed(this); - } - } - - private boolean isAtLeastO() { - return getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O; } final void dispatchMultiWindowModeChanged(boolean isInMultiWindowMode) { diff --git a/core/java/android/app/Application.java b/core/java/android/app/Application.java index 03efe68cb741..156df36a600c 100644 --- a/core/java/android/app/Application.java +++ b/core/java/android/app/Application.java @@ -55,7 +55,6 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { public LoadedApk mLoadedApk; public interface ActivityLifecycleCallbacks { - default void onActivityPreCreated(Activity activity, Bundle savedInstanceState) {} void onActivityCreated(Activity activity, Bundle savedInstanceState); void onActivityStarted(Activity activity); void onActivityResumed(Activity activity); @@ -191,16 +190,6 @@ public class Application extends ContextWrapper implements ComponentCallbacks2 { mLoadedApk = ContextImpl.getImpl(context).mPackageInfo; } - /* package */ void dispatchActivityPreCreated(Activity activity, Bundle savedInstanceState) { - Object[] callbacks = collectActivityLifecycleCallbacks(); - if (callbacks != null) { - for (int i = 0; i < callbacks.length; i++) { - ((ActivityLifecycleCallbacks) callbacks[i]).onActivityPreCreated(activity, - savedInstanceState); - } - } - } - /* package */ void dispatchActivityCreated(Activity activity, Bundle savedInstanceState) { Object[] callbacks = collectActivityLifecycleCallbacks(); if (callbacks != null) { diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index b7eda25cee4d..2c1cdd602d3f 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -48,6 +48,7 @@ import android.os.Parcelable; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; +import android.service.notification.StatusBarNotification; import android.text.BidiFormatter; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -3903,10 +3904,24 @@ public class Notification implements Parcelable * 3. Standard template view */ public RemoteViews createContentView() { + return createContentView(false /* increasedheight */ ); + } + + /** + * Construct a RemoteViews for the smaller content view. + * + * @param increasedHeight true if this layout be created with an increased height. Some + * styles may support showing more then just that basic 1U size + * and the system may decide to render important notifications + * slightly bigger even when collapsed. + * + * @hide + */ + public RemoteViews createContentView(boolean increasedHeight) { if (mN.contentView != null && (mStyle == null || !mStyle.displayCustomViewInline())) { return mN.contentView; } else if (mStyle != null) { - final RemoteViews styleView = mStyle.makeContentView(); + final RemoteViews styleView = mStyle.makeContentView(increasedHeight); if (styleView != null) { return styleView; } @@ -4536,6 +4551,19 @@ public class Notification implements Parcelable } /** + * @return the style class of this notification + * @hide + */ + public Class<? extends Notification.Style> getNotificationStyle() { + String templateClass = extras.getString(Notification.EXTRA_TEMPLATE); + + if (!TextUtils.isEmpty(templateClass)) { + return Notification.getNotificationStyleClass(templateClass); + } + return null; + } + + /** * @return true if this notification is colorized. This also factors in wheather the * notification is ongoing. * @@ -4656,11 +4684,13 @@ public class Notification implements Parcelable } /** - * Construct a Style-specific RemoteViews for the final 1U notification layout. + * Construct a Style-specific RemoteViews for the collapsed notification layout. * The default implementation has nothing additional to add. + * + * @param increasedHeight true if this layout be created with an increased height. * @hide */ - public RemoteViews makeContentView() { + public RemoteViews makeContentView(boolean increasedHeight) { return null; } @@ -5006,6 +5036,23 @@ public class Notification implements Parcelable } /** + * @param increasedHeight true if this layout be created with an increased height. + * + * @hide + */ + @Override + public RemoteViews makeContentView(boolean increasedHeight) { + if (increasedHeight) { + ArrayList<Action> actions = mBuilder.mActions; + mBuilder.mActions = new ArrayList<>(); + RemoteViews remoteViews = makeBigContentView(); + mBuilder.mActions = actions; + return remoteViews; + } + return super.makeContentView(increasedHeight); + } + + /** * @hide */ public RemoteViews makeBigContentView() { @@ -5269,17 +5316,25 @@ public class Notification implements Parcelable * @hide */ @Override - public RemoteViews makeContentView() { - Message m = findLatestIncomingMessage(); - CharSequence title = mConversationTitle != null - ? mConversationTitle - : (m == null) ? null : m.mSender; - CharSequence text = (m == null) - ? null - : mConversationTitle != null ? makeMessageLine(m, mBuilder) : m.mText; - - return mBuilder.applyStandardTemplateWithActions(mBuilder.getBaseLayoutResource(), - mBuilder.mParams.reset().hasProgress(false).title(title).text(text)); + public RemoteViews makeContentView(boolean increasedHeight) { + if (!increasedHeight) { + Message m = findLatestIncomingMessage(); + CharSequence title = mConversationTitle != null + ? mConversationTitle + : (m == null) ? null : m.mSender; + CharSequence text = (m == null) + ? null + : mConversationTitle != null ? makeMessageLine(m, mBuilder) : m.mText; + + return mBuilder.applyStandardTemplate(mBuilder.getBaseLayoutResource(), + mBuilder.mParams.reset().hasProgress(false).title(title).text(text)); + } else { + ArrayList<Action> actions = mBuilder.mActions; + mBuilder.mActions = new ArrayList<>(); + RemoteViews remoteViews = makeBigContentView(); + mBuilder.mActions = actions; + return remoteViews; + } } private Message findLatestIncomingMessage() { @@ -5844,7 +5899,7 @@ public class Notification implements Parcelable * @hide */ @Override - public RemoteViews makeContentView() { + public RemoteViews makeContentView(boolean increasedHeight) { return makeMediaContentView(); } @@ -6020,7 +6075,7 @@ public class Notification implements Parcelable * @hide */ @Override - public RemoteViews makeContentView() { + public RemoteViews makeContentView(boolean increasedHeight) { return makeStandardTemplateWithCustomContent(mBuilder.mN.contentView); } @@ -6134,8 +6189,8 @@ public class Notification implements Parcelable * @hide */ @Override - public RemoteViews makeContentView() { - RemoteViews remoteViews = super.makeContentView(); + public RemoteViews makeContentView(boolean increasedHeight) { + RemoteViews remoteViews = super.makeContentView(false /* increasedHeight */); return buildIntoRemoteView(remoteViews, R.id.notification_content_container, mBuilder.mN.contentView); } @@ -6157,7 +6212,7 @@ public class Notification implements Parcelable return buildIntoRemoteView(remoteViews, R.id.notification_main_column, customRemoteView); } else if (customRemoteView != mBuilder.mN.contentView){ - remoteViews = super.makeContentView(); + remoteViews = super.makeContentView(false /* increasedHeight */); return buildIntoRemoteView(remoteViews, R.id.notification_content_container, customRemoteView); } else { diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 52d73869e3c6..08832d1baa8b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6073,20 +6073,24 @@ public class DevicePolicyManager { /** * Sets which packages may enter lock task mode. * <p> - * Any packages that shares uid with an allowed package will also be allowed to activate lock + * Any packages that share uid with an allowed package will also be allowed to activate lock * task. From {@link android.os.Build.VERSION_CODES#M} removing packages from the lock task - * package list results in locked tasks belonging to those packages to be finished. This - * function can only be called by the device owner. + * package list results in locked tasks belonging to those packages to be finished. + * <p> + * This function can only be called by the device owner or by a profile owner of a user/profile + * that is affiliated with the device owner user. See {@link #setAffiliationIds}. Any packages + * set via this method will be cleared if the user becomes unaffiliated. * * @param packages The list of packages allowed to enter lock task mode * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @throws SecurityException if {@code admin} is not a device owner. + * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of + * an affiliated user or profile. * @see Activity#startLockTask() * @see DeviceAdminReceiver#onLockTaskModeEntering(Context, Intent, String) * @see DeviceAdminReceiver#onLockTaskModeExiting(Context, Intent) * @see UserManager#DISALLOW_CREATE_WINDOWS */ - public void setLockTaskPackages(@NonNull ComponentName admin, String[] packages) + public void setLockTaskPackages(@NonNull ComponentName admin, @NonNull String[] packages) throws SecurityException { throwIfParentInstance("setLockTaskPackages"); if (mService != null) { @@ -6099,9 +6103,12 @@ public class DevicePolicyManager { } /** - * This function returns the list of packages allowed to start the lock task mode. + * Returns the list of packages allowed to start the lock task mode. + * + * @throws SecurityException if {@code admin} is not the device owner, or the profile owner of + * an affiliated user or profile. + * @see #setLockTaskPackages * - * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @hide */ public @NonNull String[] getLockTaskPackages(@NonNull ComponentName admin) { @@ -6113,7 +6120,7 @@ public class DevicePolicyManager { throw e.rethrowFromSystemServer(); } } - return null; + return new String[0]; } /** diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 13907ba16b2a..ff928a0dd81d 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -2747,15 +2747,15 @@ public class PackageParser { String cls = clsSeq.toString(); char c = cls.charAt(0); if (c == '.') { - return (pkg + cls).intern(); + return pkg + cls; } if (cls.indexOf('.') < 0) { StringBuilder b = new StringBuilder(pkg); b.append('.'); b.append(cls); - return b.toString().intern(); + return b.toString(); } - return cls.intern(); + return cls; } private static String buildCompoundName(String pkg, @@ -2775,7 +2775,7 @@ public class PackageParser { + pkg + ": " + nameError; return null; } - return (pkg + proc).intern(); + return pkg + proc; } String nameError = validateName(proc, true, false); if (nameError != null && !"system".equals(proc)) { @@ -2783,7 +2783,7 @@ public class PackageParser { + pkg + ": " + nameError; return null; } - return proc.intern(); + return proc; } private static String buildProcessName(String pkg, String defProc, @@ -5033,9 +5033,7 @@ public class PackageParser { } private boolean isWebBrowsableIntent(IntentInfo intent) { - return intent.hasAction(Intent.ACTION_VIEW) - && intent.hasCategory(Intent.CATEGORY_BROWSABLE) - && (intent.hasDataScheme("http") || intent.hasDataScheme("https")); + return intent.hasCategory(Intent.CATEGORY_BROWSABLE); } private boolean parseAllMetaData(Resources res, XmlResourceParser parser, String tag, @@ -5103,7 +5101,7 @@ public class PackageParser { if (v != null) { if (v.type == TypedValue.TYPE_STRING) { CharSequence cs = v.coerceToString(); - data.putString(name, cs != null ? cs.toString().intern() : null); + data.putString(name, cs != null ? cs.toString() : null); } else if (v.type == TypedValue.TYPE_INT_BOOLEAN) { data.putBoolean(name, v.data != 0); } else if (v.type >= TypedValue.TYPE_FIRST_INT diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 222953e3ae6c..dc5750d55066 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -46,6 +46,7 @@ import android.telephony.SubscriptionManager; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import android.util.SparseIntArray; import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.PhoneConstants; @@ -1240,36 +1241,27 @@ public class ConnectivityManager { private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) { if (networkType == TYPE_MOBILE) { - int cap = -1; - if ("enableMMS".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_MMS; - } else if ("enableSUPL".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_SUPL; - } else if ("enableDUN".equals(feature) || "enableDUNAlways".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_DUN; - } else if ("enableHIPRI".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_INTERNET; - } else if ("enableFOTA".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_FOTA; - } else if ("enableIMS".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_IMS; - } else if ("enableCBS".equals(feature)) { - cap = NetworkCapabilities.NET_CAPABILITY_CBS; - } else { - return null; - } - NetworkCapabilities netCap = new NetworkCapabilities(); - netCap.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR).addCapability(cap); - netCap.maybeMarkCapabilitiesRestricted(); - return netCap; - } else if (networkType == TYPE_WIFI) { - if ("p2p".equals(feature)) { - NetworkCapabilities netCap = new NetworkCapabilities(); - netCap.addTransportType(NetworkCapabilities.TRANSPORT_WIFI); - netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_WIFI_P2P); - netCap.maybeMarkCapabilitiesRestricted(); - return netCap; + switch (feature) { + case "enableCBS": + return networkCapabilitiesForType(TYPE_MOBILE_CBS); + case "enableDUN": + case "enableDUNAlways": + return networkCapabilitiesForType(TYPE_MOBILE_DUN); + case "enableFOTA": + return networkCapabilitiesForType(TYPE_MOBILE_FOTA); + case "enableHIPRI": + return networkCapabilitiesForType(TYPE_MOBILE_HIPRI); + case "enableIMS": + return networkCapabilitiesForType(TYPE_MOBILE_IMS); + case "enableMMS": + return networkCapabilitiesForType(TYPE_MOBILE_MMS); + case "enableSUPL": + return networkCapabilitiesForType(TYPE_MOBILE_SUPL); + default: + return null; } + } else if (networkType == TYPE_WIFI && "p2p".equals(feature)) { + return networkCapabilitiesForType(TYPE_WIFI_P2P); } return null; } @@ -1477,6 +1469,59 @@ public class ConnectivityManager { return true; } + private static final SparseIntArray sLegacyTypeToTransport = new SparseIntArray(); + static { + sLegacyTypeToTransport.put(TYPE_MOBILE, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_CBS, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_DUN, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_FOTA, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_HIPRI, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_IMS, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_MMS, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_MOBILE_SUPL, NetworkCapabilities.TRANSPORT_CELLULAR); + sLegacyTypeToTransport.put(TYPE_WIFI, NetworkCapabilities.TRANSPORT_WIFI); + sLegacyTypeToTransport.put(TYPE_WIFI_P2P, NetworkCapabilities.TRANSPORT_WIFI); + sLegacyTypeToTransport.put(TYPE_BLUETOOTH, NetworkCapabilities.TRANSPORT_BLUETOOTH); + sLegacyTypeToTransport.put(TYPE_ETHERNET, NetworkCapabilities.TRANSPORT_ETHERNET); + } + + private static final SparseIntArray sLegacyTypeToCapability = new SparseIntArray(); + static { + sLegacyTypeToCapability.put(TYPE_MOBILE_CBS, NetworkCapabilities.NET_CAPABILITY_CBS); + sLegacyTypeToCapability.put(TYPE_MOBILE_DUN, NetworkCapabilities.NET_CAPABILITY_DUN); + sLegacyTypeToCapability.put(TYPE_MOBILE_FOTA, NetworkCapabilities.NET_CAPABILITY_FOTA); + sLegacyTypeToCapability.put(TYPE_MOBILE_IMS, NetworkCapabilities.NET_CAPABILITY_IMS); + sLegacyTypeToCapability.put(TYPE_MOBILE_MMS, NetworkCapabilities.NET_CAPABILITY_MMS); + sLegacyTypeToCapability.put(TYPE_MOBILE_SUPL, NetworkCapabilities.NET_CAPABILITY_SUPL); + sLegacyTypeToCapability.put(TYPE_WIFI_P2P, NetworkCapabilities.NET_CAPABILITY_WIFI_P2P); + } + + /** + * Given a legacy type (TYPE_WIFI, ...) returns a NetworkCapabilities + * instance suitable for registering a request or callback. Throws an + * IllegalArgumentException if no mapping from the legacy type to + * NetworkCapabilities is known. + * + * @hide + */ + public static NetworkCapabilities networkCapabilitiesForType(int type) { + final NetworkCapabilities nc = new NetworkCapabilities(); + + // Map from type to transports. + final int NOT_FOUND = -1; + final int transport = sLegacyTypeToTransport.get(type, NOT_FOUND); + if (transport == NOT_FOUND) { + throw new IllegalArgumentException("unknown legacy type: " + type); + } + nc.addTransportType(transport); + + // Map from type to capabilities. + nc.addCapability(sLegacyTypeToCapability.get( + type, NetworkCapabilities.NET_CAPABILITY_INTERNET)); + nc.maybeMarkCapabilitiesRestricted(); + return nc; + } + /** @hide */ public static class PacketKeepaliveCallback { /** The requested keepalive was successfully started. */ diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index ae724709c6c6..cb780090c46a 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -178,6 +178,20 @@ public class NetworkRequest implements Parcelable { } /** + * Set the {@code NetworkCapabilities} for this builder instance, + * overriding any capabilities that had been previously set. + * + * @param nc The superseding {@code NetworkCapabilities} instance. + * @return The builder to facilitate chaining. + * @hide + */ + public Builder setCapabilities(NetworkCapabilities nc) { + mNetworkCapabilities.clearAll(); + mNetworkCapabilities.combineCapabilities(nc); + return this; + } + + /** * Completely clears all the {@code NetworkCapabilities} from this builder instance, * removing even the capabilities that are set by default when the object is constructed. * diff --git a/core/java/android/os/Seccomp.java b/core/java/android/os/Seccomp.java new file mode 100644 index 000000000000..f14e93fe9403 --- /dev/null +++ b/core/java/android/os/Seccomp.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.os; + +/** + * @hide + */ +public final class Seccomp { + public static final native void setPolicy(); +} diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 388054d35ba8..dfcab3df628d 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -516,6 +516,7 @@ public class UserManager { * <li>{@link LayoutParams#TYPE_SYSTEM_ALERT}</li> * <li>{@link LayoutParams#TYPE_SYSTEM_ERROR}</li> * <li>{@link LayoutParams#TYPE_SYSTEM_OVERLAY}</li> + * <li>{@link LayoutParams#TYPE_APPLICATION_OVERLAY}</li> * * <p>This can only be set by device owners and profile owners on the primary user. * The default value is <code>false</code>. diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index bf840e547079..5a640faf08d3 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -335,7 +335,9 @@ public interface WindowManager extends ViewManager { @ViewDebug.IntToString(from = TYPE_QS_DIALOG, to = "TYPE_QS_DIALOG"), @ViewDebug.IntToString(from = TYPE_SCREENSHOT, - to = "TYPE_SCREENSHOT") + to = "TYPE_SCREENSHOT"), + @ViewDebug.IntToString(from = TYPE_APPLICATION_OVERLAY, + to = "TYPE_APPLICATION_OVERLAY") }) public int type; @@ -462,14 +464,18 @@ public interface WindowManager extends ViewManager { * These windows are normally placed above all applications, but behind * the status bar. * In multiuser systems shows on all users' windows. + * @deprecated for non-system apps. Use {@link #TYPE_APPLICATION_OVERLAY} instead. */ + @Deprecated public static final int TYPE_PHONE = FIRST_SYSTEM_WINDOW+2; /** * Window type: system window, such as low power alert. These windows * are always on top of application windows. * In multiuser systems shows only on the owning user's window. + * @deprecated for non-system apps. Use {@link #TYPE_APPLICATION_OVERLAY} instead. */ + @Deprecated public static final int TYPE_SYSTEM_ALERT = FIRST_SYSTEM_WINDOW+3; /** @@ -482,7 +488,9 @@ public interface WindowManager extends ViewManager { /** * Window type: transient notifications. * In multiuser systems shows only on the owning user's window. + * @deprecated for non-system apps. Use {@link #TYPE_APPLICATION_OVERLAY} instead. */ + @Deprecated public static final int TYPE_TOAST = FIRST_SYSTEM_WINDOW+5; /** @@ -490,7 +498,9 @@ public interface WindowManager extends ViewManager { * on top of everything else. These windows must not take input * focus, or they will interfere with the keyguard. * In multiuser systems shows only on the owning user's window. + * @deprecated for non-system apps. Use {@link #TYPE_APPLICATION_OVERLAY} instead. */ + @Deprecated public static final int TYPE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+6; /** @@ -498,7 +508,9 @@ public interface WindowManager extends ViewManager { * the keyguard is active. These windows must not take input * focus, or they will interfere with the keyguard. * In multiuser systems shows on all users' windows. + * @deprecated for non-system apps. Use {@link #TYPE_APPLICATION_OVERLAY} instead. */ + @Deprecated public static final int TYPE_PRIORITY_PHONE = FIRST_SYSTEM_WINDOW+7; /** @@ -517,7 +529,9 @@ public interface WindowManager extends ViewManager { * Window type: internal system error windows, appear on top of * everything they can. * In multiuser systems shows only on the owning user's window. + * @deprecated for non-system apps. Use {@link #TYPE_APPLICATION_OVERLAY} instead. */ + @Deprecated public static final int TYPE_SYSTEM_ERROR = FIRST_SYSTEM_WINDOW+10; /** @@ -703,10 +717,44 @@ public interface WindowManager extends ViewManager { public static final int TYPE_PRESENTATION = FIRST_SYSTEM_WINDOW + 37; /** + * Window type: Application overlay windows are displayed above all activity windows + * (types between {@link #FIRST_APPLICATION_WINDOW} and {@link #LAST_APPLICATION_WINDOW}) + * but below critical system windows like the status bar or IME. + * <p> + * The system may change the position, size, or visibility of these windows at anytime + * to reduce visual clutter to the user and also manage resources. + * <p> + * Requires {@link android.Manifest.permission#SYSTEM_ALERT_WINDOW} permission. + * <p> + * In mult-iuser systems shows only on the owning user's screen. + */ + public static final int TYPE_APPLICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 38; + + /** * End of types of system windows. */ public static final int LAST_SYSTEM_WINDOW = 2999; + /** + * Return true if the window type is an alert window. + * + * @param type The window type. + * @return If the window type is an alert window. + * @hide + */ + public static boolean isSystemAlertWindowType(int type) { + switch (type) { + case TYPE_PHONE: + case TYPE_PRIORITY_PHONE: + case TYPE_SYSTEM_ALERT: + case TYPE_SYSTEM_ERROR: + case TYPE_SYSTEM_OVERLAY: + case TYPE_APPLICATION_OVERLAY: + return true; + } + return false; + } + /** @deprecated this is ignored, this value is set automatically when needed. */ @Deprecated public static final int MEMORY_TYPE_NORMAL = 0; diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index bc4ae6d0fcf1..8e597dc40894 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -16,6 +16,51 @@ package android.view; +import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; +import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; +import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS; +import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; +import static android.view.WindowManager.LayoutParams.TYPE_DRAG; +import static android.view.WindowManager.LayoutParams.TYPE_DREAM; +import static android.view.WindowManager.LayoutParams.TYPE_INPUT_CONSUMER; +import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; +import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; +import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; +import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; +import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_PHONE; +import static android.view.WindowManager.LayoutParams.TYPE_POINTER; +import static android.view.WindowManager.LayoutParams.TYPE_PRESENTATION; +import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE; +import static android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION; +import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; +import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; +import static android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR; +import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; +import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; +import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; +import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR; +import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_TOAST; +import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION; +import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION_STARTING; +import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; +import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; +import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType; + import android.annotation.IntDef; import android.annotation.Nullable; import android.annotation.SystemApi; @@ -30,6 +75,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; +import android.util.Slog; import android.view.animation.Animation; import com.android.internal.policy.IKeyguardDismissCallback; @@ -423,6 +469,14 @@ public interface WindowManagerPolicy { public boolean isInputMethodWindow(); public int getDisplayId(); + + /** + * Returns true if the window owner can add internal system windows. + * That is, they have {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW}. + */ + default boolean canAddInternalSystemWindow() { + return false; + } } /** @@ -659,27 +713,181 @@ public interface WindowManagerPolicy { int navigationPresence); /** - * Assign a window type to a layer. Allows you to control how different + * Returns the layer assignment for the window state. Allows you to control how different + * kinds of windows are ordered on-screen. + * + * @param win The window state + * @return int An arbitrary integer used to order windows, with lower numbers below higher ones. + */ + default int getWindowLayerLw(WindowState win) { + return getWindowLayerFromTypeLw(win.getBaseType(), win.canAddInternalSystemWindow()); + } + + /** + * Returns the layer assignment for the window type. Allows you to control how different * kinds of windows are ordered on-screen. * * @param type The type of window being assigned. + * @return int An arbitrary integer used to order windows, with lower numbers below higher ones. + */ + default int getWindowLayerFromTypeLw(int type) { + if (isSystemAlertWindowType(type)) { + throw new IllegalArgumentException("Use getWindowLayerFromTypeLw() or" + + " getWindowLayerLw() for alert window types"); + } + return getWindowLayerFromTypeLw(type, false /* canAddInternalSystemWindow */); + } + + /** + * Returns the layer assignment for the window type. Allows you to control how different + * kinds of windows are ordered on-screen. * - * @return int An arbitrary integer used to order windows, with lower - * numbers below higher ones. - */ - public int windowTypeToLayerLw(int type); + * @param type The type of window being assigned. + * @param canAddInternalSystemWindow If the owner window associated with the type we are + * evaluating can add internal system windows. I.e they have + * {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW}. If true, alert window + * types {@link android.view.WindowManager.LayoutParams#isSystemAlertWindowType(int)} + * can be assigned layers greater than the layer for + * {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY} Else, their + * layers would be lesser. + * @return int An arbitrary integer used to order windows, with lower numbers below higher ones. + */ + default int getWindowLayerFromTypeLw(int type, boolean canAddInternalSystemWindow) { + if (type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW) { + return APPLICATION_LAYER; + } + + switch (type) { + case TYPE_WALLPAPER: + // wallpaper is at the bottom, though the window manager may move it. + return 1; + case TYPE_PRESENTATION: + case TYPE_PRIVATE_PRESENTATION: + return APPLICATION_LAYER; + case TYPE_DOCK_DIVIDER: + return APPLICATION_LAYER; + case TYPE_QS_DIALOG: + return APPLICATION_LAYER; + case TYPE_PHONE: + return 3; + case TYPE_SEARCH_BAR: + case TYPE_VOICE_INTERACTION_STARTING: + return 4; + case TYPE_VOICE_INTERACTION: + // voice interaction layer is almost immediately above apps. + return 5; + case TYPE_INPUT_CONSUMER: + return 6; + case TYPE_SYSTEM_DIALOG: + return 7; + case TYPE_TOAST: + // toasts and the plugged-in battery thing + return 8; + case TYPE_PRIORITY_PHONE: + // SIM errors and unlock. Not sure if this really should be in a high layer. + return 9; + case TYPE_DREAM: + // used for Dreams (screensavers with TYPE_DREAM windows) + return 10; + case TYPE_SYSTEM_ALERT: + // like the ANR / app crashed dialogs + return canAddInternalSystemWindow ? 11 : 10; + case TYPE_APPLICATION_OVERLAY: + return 13; + case TYPE_INPUT_METHOD: + // on-screen keyboards and other such input method user interfaces go here. + return 14; + case TYPE_INPUT_METHOD_DIALOG: + // on-screen keyboards and other such input method user interfaces go here. + return 15; + case TYPE_STATUS_BAR_SUB_PANEL: + return 17; + case TYPE_STATUS_BAR: + return 18; + case TYPE_STATUS_BAR_PANEL: + return 19; + case TYPE_KEYGUARD_DIALOG: + return 20; + case TYPE_VOLUME_OVERLAY: + // the on-screen volume indicator and controller shown when the user + // changes the device volume + return 21; + case TYPE_SYSTEM_OVERLAY: + // the on-screen volume indicator and controller shown when the user + // changes the device volume + return canAddInternalSystemWindow ? 22 : 11; + case TYPE_NAVIGATION_BAR: + // the navigation bar, if available, shows atop most things + return 23; + case TYPE_NAVIGATION_BAR_PANEL: + // some panels (e.g. search) need to show on top of the navigation bar + return 24; + case TYPE_SCREENSHOT: + // screenshot selection layer shouldn't go above system error, but it should cover + // navigation bars at the very least. + return 25; + case TYPE_SYSTEM_ERROR: + // system-level error dialogs + return canAddInternalSystemWindow ? 26 : 10; + case TYPE_MAGNIFICATION_OVERLAY: + // used to highlight the magnified portion of a display + return 27; + case TYPE_DISPLAY_OVERLAY: + // used to simulate secondary display devices + return 28; + case TYPE_DRAG: + // the drag layer: input for drag-and-drop is associated with this window, + // which sits above all other focusable windows + return 29; + case TYPE_ACCESSIBILITY_OVERLAY: + // overlay put by accessibility services to intercept user interaction + return 30; + case TYPE_SECURE_SYSTEM_OVERLAY: + return 31; + case TYPE_BOOT_PROGRESS: + return 32; + case TYPE_POINTER: + // the (mouse) pointer layer + return 33; + default: + Slog.e("WindowManager", "Unknown window type: " + type); + return APPLICATION_LAYER; + } + } + + int APPLICATION_LAYER = 2; + int APPLICATION_MEDIA_SUBLAYER = -2; + int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1; + int APPLICATION_PANEL_SUBLAYER = 1; + int APPLICATION_SUB_PANEL_SUBLAYER = 2; + int APPLICATION_ABOVE_SUB_PANEL_SUBLAYER = 3; /** - * Return how to Z-order sub-windows in relation to the window they are - * attached to. Return positive to have them ordered in front, negative for - * behind. + * Return how to Z-order sub-windows in relation to the window they are attached to. + * Return positive to have them ordered in front, negative for behind. * * @param type The sub-window type code. * * @return int Layer in relation to the attached window, where positive is * above and negative is below. */ - public int subWindowTypeToLayerLw(int type); + default int getSubWindowLayerFromTypeLw(int type) { + switch (type) { + case TYPE_APPLICATION_PANEL: + case TYPE_APPLICATION_ATTACHED_DIALOG: + return APPLICATION_PANEL_SUBLAYER; + case TYPE_APPLICATION_MEDIA: + return APPLICATION_MEDIA_SUBLAYER; + case TYPE_APPLICATION_MEDIA_OVERLAY: + return APPLICATION_MEDIA_OVERLAY_SUBLAYER; + case TYPE_APPLICATION_SUB_PANEL: + return APPLICATION_SUB_PANEL_SUBLAYER; + case TYPE_APPLICATION_ABOVE_SUB_PANEL: + return APPLICATION_ABOVE_SUB_PANEL_SUBLAYER; + } + Slog.e("WindowManager", "Unknown sub-window type: " + type); + return 0; + } /** * Get the highest layer (actually one more than) that the wallpaper is diff --git a/core/java/android/view/inputmethod/InputMethodInfo.java b/core/java/android/view/inputmethod/InputMethodInfo.java index b6da1d8c9de3..71809bdb4393 100644 --- a/core/java/android/view/inputmethod/InputMethodInfo.java +++ b/core/java/android/view/inputmethod/InputMethodInfo.java @@ -16,6 +16,7 @@ package android.view.inputmethod; +import android.annotation.NonNull; import android.content.ComponentName; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -42,7 +43,6 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * This class is used to specify meta information of an input method. @@ -110,6 +110,19 @@ public final class InputMethodInfo implements Parcelable { private final boolean mSupportsDismissingWindow; /** + * @param service the {@link ResolveInfo} corresponds in which the IME is implemented. + * @return a unique ID to be returned by {@link #getId()}. We have used + * {@link ComponentName#flattenToShortString()} for this purpose (and it is already + * unrealistic to switch to a different scheme as it is already implicitly assumed in + * many places). + * @hide + */ + public static String computeId(@NonNull ResolveInfo service) { + final ServiceInfo si = service.serviceInfo; + return new ComponentName(si.packageName, si.name).flattenToShortString(); + } + + /** * Constructor. * * @param context The Context in which we are parsing the input method. @@ -127,15 +140,15 @@ public final class InputMethodInfo implements Parcelable { * @param context The Context in which we are parsing the input method. * @param service The ResolveInfo returned from the package manager about * this input method's component. - * @param additionalSubtypesMap additional subtypes being added to this InputMethodInfo + * @param additionalSubtypes additional subtypes being added to this InputMethodInfo * @hide */ public InputMethodInfo(Context context, ResolveInfo service, - Map<String, List<InputMethodSubtype>> additionalSubtypesMap) + List<InputMethodSubtype> additionalSubtypes) throws XmlPullParserException, IOException { mService = service; ServiceInfo si = service.serviceInfo; - mId = new ComponentName(si.packageName, si.name).flattenToShortString(); + mId = computeId(service); boolean isAuxIme = true; boolean supportsSwitchingToNextInputMethod = false; // false as default boolean supportsDismissingWindow = false; // false as default @@ -233,8 +246,7 @@ public final class InputMethodInfo implements Parcelable { isAuxIme = false; } - if (additionalSubtypesMap != null && additionalSubtypesMap.containsKey(mId)) { - final List<InputMethodSubtype> additionalSubtypes = additionalSubtypesMap.get(mId); + if (additionalSubtypes != null) { final int N = additionalSubtypes.size(); for (int i = 0; i < N; ++i) { final InputMethodSubtype subtype = additionalSubtypes.get(i); diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java index 4673c50cddc9..a85dea9e96bc 100644 --- a/core/java/android/view/textclassifier/TextClassificationManager.java +++ b/core/java/android/view/textclassifier/TextClassificationManager.java @@ -55,7 +55,7 @@ public final class TextClassificationManager { /** * Returns the default text classifier. */ - public TextClassifier getDefaultTextClassifier() { + public synchronized TextClassifier getDefaultTextClassifier() { if (mDefault == null) { try { mFd = ParcelFileDescriptor.open( @@ -95,7 +95,7 @@ public final class TextClassificationManager { return Collections.emptyList(); } - private LangId getLanguageDetector() { + private synchronized LangId getLanguageDetector() { if (mLangId == null) { // TODO: Use a file descriptor as soon as we start to depend on a model file // for language detection. diff --git a/core/java/android/view/textclassifier/TextClassifierImpl.java b/core/java/android/view/textclassifier/TextClassifierImpl.java index 0657067d992f..783891838fe0 100644 --- a/core/java/android/view/textclassifier/TextClassifierImpl.java +++ b/core/java/android/view/textclassifier/TextClassifierImpl.java @@ -18,6 +18,7 @@ package android.view.textclassifier; import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; @@ -157,18 +158,29 @@ final class TextClassifierImpl implements TextClassifier { .setEntityType(type, 1.0f /* confidence */) .setIntent(intent) .setOnClickListener(TextClassificationResult.createStartActivityOnClick( - mContext, intent)) - .setLabel(IntentFactory.getLabel(mContext, type)); + mContext, intent)); final PackageManager pm = mContext.getPackageManager(); final ResolveInfo resolveInfo = pm.resolveActivity(intent, 0); - // TODO: If the resolveInfo is the "chooser", do not set the package name and use a default - // icon for this classification type. - intent.setPackage(resolveInfo.activityInfo.packageName); - Drawable icon = resolveInfo.activityInfo.loadIcon(pm); - if (icon == null) { - icon = resolveInfo.loadIcon(pm); + if (resolveInfo != null && resolveInfo.activityInfo != null) { + final String packageName = resolveInfo.activityInfo.packageName; + if ("android".equals(packageName)) { + // Requires the chooser to find an activity to handle the intent. + builder.setLabel(IntentFactory.getLabel(mContext, type)); + } else { + // A default activity will handle the intent. + intent.setComponent(new ComponentName(packageName, resolveInfo.activityInfo.name)); + Drawable icon = resolveInfo.activityInfo.loadIcon(pm); + if (icon == null) { + icon = resolveInfo.loadIcon(pm); + } + builder.setIcon(icon); + CharSequence label = resolveInfo.activityInfo.loadLabel(pm); + if (label == null) { + label = resolveInfo.loadLabel(pm); + } + builder.setLabel(label != null ? label.toString() : null); + } } - builder.setIcon(icon); return builder.build(); } @@ -211,9 +223,12 @@ final class TextClassifierImpl implements TextClassifier { final String type = smartSelection.classifyText(text, selectionStart, selectionEnd); if (matches(type, linkMask)) { - final ClickableSpan span = createSpan( - context, type, text.substring(selectionStart, selectionEnd)); - spans.add(new SpanSpec(selectionStart, selectionEnd, span)); + final Intent intent = IntentFactory.create( + type, text.substring(selectionStart, selectionEnd)); + if (hasActivityHandler(context, intent)) { + final ClickableSpan span = createSpan(context, intent); + spans.add(new SpanSpec(selectionStart, selectionEnd, span)); + } } } start = end; @@ -279,17 +294,24 @@ final class TextClassifierImpl implements TextClassifier { return result; } - private static ClickableSpan createSpan( - final Context context, final String type, final String text) { + private static ClickableSpan createSpan(final Context context, final Intent intent) { return new ClickableSpan() { // TODO: Style this span. @Override public void onClick(View widget) { - context.startActivity(IntentFactory.create(type, text)); + context.startActivity(intent); } }; } + private static boolean hasActivityHandler(Context context, @Nullable Intent intent) { + if (intent == null) { + return false; + } + final ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent, 0); + return resolveInfo != null && resolveInfo.activityInfo != null; + } + /** * Implementation of LinksInfo that adds ClickableSpans to the specified text. */ diff --git a/core/java/android/webkit/UserPackage.java b/core/java/android/webkit/UserPackage.java index 404bcf453aaf..f53b5d6a7cd7 100644 --- a/core/java/android/webkit/UserPackage.java +++ b/core/java/android/webkit/UserPackage.java @@ -20,6 +20,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.UserInfo; +import android.os.Build; import android.os.UserManager; import java.util.ArrayList; @@ -77,6 +78,15 @@ public class UserPackage { & ApplicationInfo.PRIVATE_FLAG_HIDDEN) == 0)); } + /** + * Returns whether the package represented by {@param packageInfo} targets a sdk version + * supported by the current framework version. + */ + public static boolean hasCorrectTargetSdkVersion(PackageInfo packageInfo) { + // TODO(gsennton) use Build.VERSION_CODES.O when that has been updated. + return packageInfo.applicationInfo.targetSdkVersion > Build.VERSION_CODES.N_MR1; + } + public UserInfo getUserInfo() { return mUserInfo; } diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index d7a49e46a236..0906d1a1e034 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -145,18 +145,10 @@ public final class WebViewFactory { /** * @hide */ - public static Class<WebViewFactoryProvider> getWebViewProviderClass( ClassLoader clazzLoader) - throws ClassNotFoundException{ - try { - return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, - true, clazzLoader); - } catch (ClassNotFoundException e) { - // TODO: This loads the provider which is not built for O, should be removed - // before the release. - return (Class<WebViewFactoryProvider>) Class.forName( - "com.android.webview.chromium.WebViewChromiumFactoryProvider", - true, clazzLoader); - } + public static Class<WebViewFactoryProvider> getWebViewProviderClass(ClassLoader clazzLoader) + throws ClassNotFoundException { + return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, + true, clazzLoader); } /** @@ -225,15 +217,10 @@ public final class WebViewFactory { } } - Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "providerClass.newInstance()"); + Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactoryProvider invocation"); try { - if (staticFactory != null) { - sProviderInstance = (WebViewFactoryProvider) - staticFactory.invoke(null, new WebViewDelegate()); - } else { - sProviderInstance = providerClass.getConstructor(WebViewDelegate.class) - .newInstance(new WebViewDelegate()); - } + sProviderInstance = (WebViewFactoryProvider) + staticFactory.invoke(null, new WebViewDelegate()); if (DEBUG) Log.v(LOGTAG, "Loaded provider: " + sProviderInstance); return sProviderInstance; } catch (Exception e) { @@ -384,8 +371,7 @@ public final class WebViewFactory { Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "Class.forName()"); try { return getWebViewProviderClass(clazzLoader); - } - finally { + } finally { Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); } } catch (ClassNotFoundException e) { diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index c1834f1b79ff..a2cb491bbb7a 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -3917,12 +3917,18 @@ public class Editor { private void updateAssistMenuItem( Menu menu, TextClassificationResult textClassificationResult) { menu.removeItem(TextView.ID_ASSIST); - if (textClassificationResult != null - && textClassificationResult.getIcon() != null - && textClassificationResult.getOnClickListener() != null) { - menu.add(Menu.NONE, TextView.ID_ASSIST, MENU_ITEM_ORDER_ASSIST, null) - .setIcon(textClassificationResult.getIcon()) - .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + if (textClassificationResult != null) { + final Drawable icon = textClassificationResult.getIcon(); + final CharSequence label = textClassificationResult.getLabel(); + final OnClickListener onClickListener = + textClassificationResult.getOnClickListener(); + final Intent intent = textClassificationResult.getIntent(); + if ((icon != null || !TextUtils.isEmpty(label)) + && (onClickListener != null || intent != null)) { + menu.add(Menu.NONE, TextView.ID_ASSIST, MENU_ITEM_ORDER_ASSIST, label) + .setIcon(icon) + .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + } } } @@ -3935,9 +3941,22 @@ public class Editor { if (customCallback != null && customCallback.onActionItemClicked(mode, item)) { return true; } - if (TextView.ID_ASSIST == item.getItemId() && mTextClassificationResult != null) { - mTextClassificationResult.getOnClickListener().onClick(mTextView); + final TextClassificationResult textClassificationResult = mTextClassificationResult; + if (TextView.ID_ASSIST == item.getItemId() && textClassificationResult != null) { + final OnClickListener onClickListener = + textClassificationResult.getOnClickListener(); + if (onClickListener != null) { + onClickListener.onClick(mTextView); + } else { + final Intent intent = textClassificationResult.getIntent(); + if (intent != null) { + TextClassificationResult.createStartActivityOnClick( + mTextView.getContext(), intent) + .onClick(mTextView); + } + } stopTextActionMode(); + return true; } return mTextView.onTextContextMenuItem(item.getItemId()); } diff --git a/core/java/com/android/internal/logging/legacy/EventLogCollector.java b/core/java/com/android/internal/logging/legacy/EventLogCollector.java index 46e70ea9bf7e..598f0d51c1b9 100644 --- a/core/java/com/android/internal/logging/legacy/EventLogCollector.java +++ b/core/java/com/android/internal/logging/legacy/EventLogCollector.java @@ -45,8 +45,6 @@ public class EventLogCollector { private EventLogCollector() { mTagParsers = new ArrayMap<>(); - addParser(new LockscreenGestureParser()); - addParser(new StatusBarStateParser()); addParser(new PowerScreenStateParser()); addParser(new SysuiMultiActionParser()); diff --git a/core/java/com/android/internal/logging/legacy/LegacyConversionLogger.java b/core/java/com/android/internal/logging/legacy/LegacyConversionLogger.java index 91e968b5b250..1209e4d8dc8c 100644 --- a/core/java/com/android/internal/logging/legacy/LegacyConversionLogger.java +++ b/core/java/com/android/internal/logging/legacy/LegacyConversionLogger.java @@ -24,14 +24,6 @@ import java.util.Queue; /** @hide */ public class LegacyConversionLogger implements TronLogger { - public static final String VIEW_KEY = "view"; - public static final String TYPE_KEY = "type"; - public static final String EVENT_KEY = "data"; - - public static final int TYPE_COUNTER = 1; - public static final int TYPE_HISTOGRAM = 2; - public static final int TYPE_EVENT = 3; - private final Queue<LogMaker> mQueue; private HashMap<String, Boolean> mConfig; diff --git a/core/java/com/android/internal/logging/legacy/LockscreenGestureParser.java b/core/java/com/android/internal/logging/legacy/LockscreenGestureParser.java deleted file mode 100644 index df08ee067087..000000000000 --- a/core/java/com/android/internal/logging/legacy/LockscreenGestureParser.java +++ /dev/null @@ -1,80 +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.internal.logging.legacy; - -import android.util.Log; - -import android.metrics.LogMaker; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - -/** - * Parse the Android lockscreen gesture logs. - * @hide - */ -public class LockscreenGestureParser extends TagParser { - private static final String TAG = "LockscreenGestureParser"; - private static final int EVENTLOG_TAG = 36021; - - // source of truth is com.android.systemui.EventLogConstants - public static final int[] GESTURE_TYPE_MAP = { - MetricsEvent.VIEW_UNKNOWN, // there is no type 0 - MetricsEvent.ACTION_LS_UNLOCK, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_UP_UNLOCK = 1 - MetricsEvent.ACTION_LS_SHADE, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_FULL_SHADE = 2 - MetricsEvent.ACTION_LS_HINT, // SYSUI_LOCKSCREEN_GESTURE_TAP_UNLOCK_HINT = 3 - MetricsEvent.ACTION_LS_CAMERA, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_CAMERA = 4 - MetricsEvent.ACTION_LS_DIALER, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_DIALER = 5 - MetricsEvent.ACTION_LS_LOCK, // SYSUI_LOCKSCREEN_GESTURE_TAP_LOCK = 6 - MetricsEvent.ACTION_LS_NOTE, // SYSUI_LOCKSCREEN_GESTURE_TAP_NOTIFICATION_ACTIVATE = 7 - MetricsEvent.ACTION_LS_QS, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_QS = 8 - MetricsEvent.ACTION_SHADE_QS_PULL, // SYSUI_SHADE_GESTURE_SWIPE_DOWN_QS = 9 - MetricsEvent.ACTION_SHADE_QS_TAP // SYSUI_TAP_TO_OPEN_QS = 10 - }; - - @Override - public int getTag() { - return EVENTLOG_TAG; - } - - @Override - public void parseEvent(TronLogger logger, long eventTimeMs, Object[] operands) { - final boolean debug = Util.debug(); - if (operands.length >= 1) { - try { - int type = ((Integer) operands[0]).intValue(); - // ignore gesture length in operands[1] - // ignore gesture velocity in operands[2] - - int category = MetricsEvent.VIEW_UNKNOWN; - if (type < GESTURE_TYPE_MAP.length) { - category = GESTURE_TYPE_MAP[type]; - } - if (category != MetricsEvent.VIEW_UNKNOWN) { - LogMaker proto = logger.obtain(); - proto.setCategory(category); - proto.setType(MetricsEvent.TYPE_ACTION); - proto.setTimestamp(eventTimeMs); - logger.addEvent(proto); - } - } catch (ClassCastException e) { - if (debug) { - Log.e(TAG, "unexpected operand type: ", e); - } - } - } else if (debug) { - Log.w(TAG, "wrong number of operands: " + operands.length); - } - } -} diff --git a/core/java/com/android/internal/logging/legacy/StatusBarStateParser.java b/core/java/com/android/internal/logging/legacy/StatusBarStateParser.java deleted file mode 100644 index 226253f3322f..000000000000 --- a/core/java/com/android/internal/logging/legacy/StatusBarStateParser.java +++ /dev/null @@ -1,74 +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.internal.logging.legacy; - -import android.util.Log; - -import android.metrics.LogMaker; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - -/** - * Parse the Android lockscreen gesture logs. - * @hide - */ -public class StatusBarStateParser extends TagParser { - private static final String TAG = "StatusBarStateParser"; - private static final int EVENTLOG_TAG = 36004; - - // source of truth is com.android.systemui.statusbar.StatusBarState - public static final int SHADE = 0; - public static final int KEYGUARD = 1; - public static final int SHADE_LOCKED = 2; - - @Override - public int getTag() { - return EVENTLOG_TAG; - } - - @Override - public void parseEvent(TronLogger logger, long eventTimeMs, Object[] operands) { - final boolean debug = Util.debug(); - if (operands.length >= 6) { - try { - // [state, isShowing, isOccluded, isBouncerShowing, isSecure, isCurrentlyInsecure] - int state = ((Integer) operands[0]).intValue(); - boolean isBouncerShowing = (((Integer) operands[3]).intValue()) == 1; - int isSecure = ((Integer) operands[4]).intValue(); - - int view = MetricsEvent.LOCKSCREEN; - int type = MetricsEvent.TYPE_OPEN; - if (state == SHADE) { - type = MetricsEvent.TYPE_CLOSE; - } else if (isBouncerShowing) { - view = MetricsEvent.BOUNCER; - } - - LogMaker proto = logger.obtain(); - proto.setCategory(view); - proto.setType(type); - proto.setTimestamp(eventTimeMs); - proto.setSubtype(isSecure); - logger.addEvent(proto); - } catch (ClassCastException e) { - if (debug) { - Log.e(TAG, "unexpected operand type: ", e); - } - } - } else if (debug) { - Log.w(TAG, "wrong number of operands: " + operands.length); - } - } -} diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index f3f34a88f17b..63622f15e4c1 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -377,6 +377,8 @@ public class BatteryStatsImpl extends BatteryStats { int mScreenBrightnessBin = -1; final StopwatchTimer[] mScreenBrightnessTimer = new StopwatchTimer[NUM_SCREEN_BRIGHTNESS_BINS]; + boolean mPretendScreenOff; + boolean mInteractive; StopwatchTimer mInteractiveTimer; @@ -3395,6 +3397,11 @@ public class BatteryStatsImpl extends BatteryStats { mNoAutoReset = enabled; } + public void setPretendScreenOff(boolean pretendScreenOff) { + mPretendScreenOff = pretendScreenOff; + noteScreenStateLocked(pretendScreenOff ? Display.STATE_OFF : Display.STATE_ON); + } + private String mInitialAcquireWakeName; private int mInitialAcquireWakeUid = -1; @@ -3698,6 +3705,7 @@ public class BatteryStatsImpl extends BatteryStats { } public void noteScreenStateLocked(int state) { + state = mPretendScreenOff ? Display.STATE_OFF : state; if (mScreenState != state) { recordDailyStatsIfNeededLocked(true); final int oldState = mScreenState; diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index a3b066a45c54..5049738f076a 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -28,6 +28,7 @@ import android.net.LocalServerSocket; import android.os.IInstalld; import android.os.Process; import android.os.RemoteException; +import android.os.Seccomp; import android.os.ServiceManager; import android.os.ServiceSpecificException; import android.os.SystemClock; @@ -712,6 +713,9 @@ public class ZygoteInit { // Zygote process unmounts root storage spaces. Zygote.nativeUnmountStorageOnInit(); + // Set seccomp policy + Seccomp.setPolicy(); + ZygoteHooks.stopZygoteNoThreadCreation(); if (startSystemServer) { diff --git a/core/java/com/android/internal/util/NotificationMessagingUtil.java b/core/java/com/android/internal/util/NotificationMessagingUtil.java new file mode 100644 index 000000000000..518cf41ee37a --- /dev/null +++ b/core/java/com/android/internal/util/NotificationMessagingUtil.java @@ -0,0 +1,93 @@ +/* + * 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.internal.util; + +import android.app.Notification; +import android.app.NotificationManager; +import android.content.Context; +import android.database.ContentObserver; +import android.net.Uri; +import android.os.Handler; +import android.os.Looper; +import android.os.UserHandle; +import android.provider.Settings; +import android.service.notification.StatusBarNotification; +import android.text.TextUtils; +import android.util.ArrayMap; + +import java.util.Objects; + +/** + * A util to look up messaging related functions for notifications. This is used for both the + * ranking and the actual layout. + */ +public class NotificationMessagingUtil { + + private static final String DEFAULT_SMS_APP_SETTING = Settings.Secure.SMS_DEFAULT_APPLICATION; + private final Context mContext; + private ArrayMap<Integer, String> mDefaultSmsApp = new ArrayMap<>(); + + public NotificationMessagingUtil(Context context) { + mContext = context; + mContext.getContentResolver().registerContentObserver( + Settings.Secure.getUriFor(DEFAULT_SMS_APP_SETTING), false, mSmsContentObserver); + } + + @SuppressWarnings("deprecation") + private boolean isDefaultMessagingApp(StatusBarNotification sbn) { + final int userId = sbn.getUserId(); + if (userId == UserHandle.USER_NULL || userId == UserHandle.USER_ALL) return false; + if (mDefaultSmsApp.get(userId) == null) { + cacheDefaultSmsApp(userId); + } + return Objects.equals(mDefaultSmsApp.get(userId), sbn.getPackageName()); + } + + private void cacheDefaultSmsApp(int userId) { + mDefaultSmsApp.put(userId, Settings.Secure.getStringForUser( + mContext.getContentResolver(), + Settings.Secure.SMS_DEFAULT_APPLICATION, userId)); + } + + private final ContentObserver mSmsContentObserver = new ContentObserver( + new Handler(Looper.getMainLooper())) { + @Override + public void onChange(boolean selfChange, Uri uri, int userId) { + if (Settings.Secure.getUriFor(DEFAULT_SMS_APP_SETTING).equals(uri)) { + cacheDefaultSmsApp(userId); + } + } + }; + + public boolean isImportantMessaging(StatusBarNotification sbn, int importance) { + if (importance < NotificationManager.IMPORTANCE_LOW) { + return false; + } + + Class<? extends Notification.Style> style = sbn.getNotification().getNotificationStyle(); + if (Notification.MessagingStyle.class.equals(style)) { + return true; + } + + if (Notification.CATEGORY_MESSAGE.equals(sbn.getNotification().category) + && isDefaultMessagingApp(sbn)) { + return true; + } + + return false; + } +} diff --git a/core/jni/Android.mk b/core/jni/Android.mk index cf9441b5c69c..db3ea8c51bf4 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -91,6 +91,7 @@ LOCAL_SRC_FILES:= \ android_os_MessageQueue.cpp \ android_os_Parcel.cpp \ android_os_SELinux.cpp \ + android_os_seccomp.cpp \ android_os_SystemClock.cpp \ android_os_SystemProperties.cpp \ android_os_Trace.cpp \ @@ -230,6 +231,7 @@ LOCAL_C_INCLUDES += \ LOCAL_STATIC_LIBRARIES := \ libgif \ + libseccomp_policy \ LOCAL_SHARED_LIBRARIES := \ libmemtrack \ diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 340f2eefa37a..407e69c2421a 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -159,6 +159,7 @@ extern int register_android_os_HwRemoteBinder(JNIEnv *env); extern int register_android_os_MessageQueue(JNIEnv* env); extern int register_android_os_Parcel(JNIEnv* env); extern int register_android_os_SELinux(JNIEnv* env); +extern int register_android_os_seccomp(JNIEnv* env); extern int register_android_os_SystemProperties(JNIEnv *env); extern int register_android_os_SystemClock(JNIEnv* env); extern int register_android_os_Trace(JNIEnv* env); @@ -1360,6 +1361,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_os_GraphicsEnvironment), REG_JNI(register_android_os_MessageQueue), REG_JNI(register_android_os_SELinux), + REG_JNI(register_android_os_seccomp), REG_JNI(register_android_os_Trace), REG_JNI(register_android_os_UEventObserver), REG_JNI(register_android_net_LocalSocketImpl), diff --git a/core/jni/android_os_seccomp.cpp b/core/jni/android_os_seccomp.cpp new file mode 100644 index 000000000000..fc35a7469753 --- /dev/null +++ b/core/jni/android_os_seccomp.cpp @@ -0,0 +1,235 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "JNIHelp.h" +#include "core_jni_helpers.h" +#include "JniConstants.h" +#include "utils/Log.h" +#include "utils/misc.h" + +#if defined __arm__ || defined __aarch64__ + +#include <vector> + +#include <sys/prctl.h> + +#include <linux/unistd.h> +#include <linux/audit.h> +#include <linux/filter.h> +#include <linux/seccomp.h> + +#include "seccomp_policy.h" + +#define syscall_nr (offsetof(struct seccomp_data, nr)) +#define arch_nr (offsetof(struct seccomp_data, arch)) + +typedef std::vector<sock_filter> filter; + +// We want to keep the below inline functions for debugging and future +// development even though they are not all sed currently. +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-function" + +static inline void Kill(filter& f) { + f.push_back(BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_KILL)); +} + +static inline void Trap(filter& f) { + f.push_back(BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_TRAP)); +} + +static inline void Error(filter& f, __u16 retcode) { + f.push_back(BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO + retcode)); +} + +inline static void Trace(filter& f) { + f.push_back(BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_TRACE)); +} + +inline static void Allow(filter& f) { + f.push_back(BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW)); +} + +#pragma clang diagnostic pop + +inline static void AllowSyscall(filter& f, __u32 num) { + f.push_back(BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, num, 0, 1)); + Allow(f); +} + +inline static void ExamineSyscall(filter& f) { + f.push_back(BPF_STMT(BPF_LD|BPF_W|BPF_ABS, syscall_nr)); +} + +inline static int SetValidateArchitectureJumpTarget(size_t offset, filter& f) { + size_t jump_length = f.size() - offset - 1; + auto u8_jump_length = (__u8) jump_length; + if (u8_jump_length != jump_length) { + ALOGE("Can't set jump greater than 255 - actual jump is %zu", + jump_length); + return -1; + } + f[offset] = BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, AUDIT_ARCH_ARM, u8_jump_length, 0); + return 0; +} + +inline static size_t ValidateArchitectureAndJumpIfNeeded(filter& f) { + f.push_back(BPF_STMT(BPF_LD|BPF_W|BPF_ABS, arch_nr)); + + f.push_back(BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, AUDIT_ARCH_AARCH64, 2, 0)); + f.push_back(BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, AUDIT_ARCH_ARM, 1, 0)); + Trap(f); + return f.size() - 2; +} + +static bool install_filter(filter const& f) { + struct sock_fprog prog = { + (unsigned short) f.size(), + (struct sock_filter*) &f[0], + }; + + if (prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, &prog) < 0) { + ALOGE("SECCOMP: Could not set seccomp filter of size %zu: %s", f.size(), strerror(errno)); + return false; + } + + ALOGI("SECCOMP: Global filter of size %zu installed", f.size()); + return true; +} + +bool set_seccomp_filter() { + filter f; + + // Note that for mixed 64/32 bit architectures, ValidateArchitecture inserts a + // jump that must be changed to point to the start of the 32-bit policy + // 32 bit syscalls will not hit the policy between here and the call to SetJump + auto offset_to_32bit_filter = + ValidateArchitectureAndJumpIfNeeded(f); + + // 64-bit filter + ExamineSyscall(f); + + // Syscalls needed to boot Android + AllowSyscall(f, 41); // __NR_pivot_root + AllowSyscall(f, 31); // __NR_ioprio_get + AllowSyscall(f, 30); // __NR_ioprio_set + AllowSyscall(f, 178); // __NR_gettid + AllowSyscall(f, 98); // __NR_futex + AllowSyscall(f, 220); // __NR_clone + AllowSyscall(f, 139); // __NR_rt_sigreturn + AllowSyscall(f, 240); // __NR_rt_tgsigqueueinfo + AllowSyscall(f, 128); // __NR_restart_syscall + AllowSyscall(f, 278); // __NR_getrandom + + // Needed for performance tools + AllowSyscall(f, 241); // __NR_perf_event_open + + // Needed for strace + AllowSyscall(f, 130); // __NR_tkill + + // Needed for kernel to restart syscalls + AllowSyscall(f, 128); // __NR_restart_syscall + + // arm64-only filter - autogenerated from bionic syscall usage + for (size_t i = 0; i < arm64_filter_size; ++i) + f.push_back(arm64_filter[i]); + + if (SetValidateArchitectureJumpTarget(offset_to_32bit_filter, f) != 0) + return -1; + + // 32-bit filter + ExamineSyscall(f); + + // Syscalls needed to boot android + AllowSyscall(f, 120); // __NR_clone + AllowSyscall(f, 240); // __NR_futex + AllowSyscall(f, 119); // __NR_sigreturn + AllowSyscall(f, 173); // __NR_rt_sigreturn + AllowSyscall(f, 363); // __NR_rt_tgsigqueueinfo + AllowSyscall(f, 224); // __NR_gettid + + // Syscalls needed to run Chrome + AllowSyscall(f, 383); // __NR_seccomp - needed to start Chrome + AllowSyscall(f, 384); // __NR_getrandom - needed to start Chrome + + // Syscalls needed to run GFXBenchmark + AllowSyscall(f, 190); // __NR_vfork + + // Needed for strace + AllowSyscall(f, 238); // __NR_tkill + + // Needed for kernel to restart syscalls + AllowSyscall(f, 0); // __NR_restart_syscall + + // Needed for debugging 32-bit Chrome + AllowSyscall(f, 42); // __NR_pipe + + // b/34732712 + AllowSyscall(f, 364); // __NR_perf_event_open + + // b/34651972 + AllowSyscall(f, 33); // __NR_access + AllowSyscall(f, 195); // __NR_stat64 + + // b/34813887 + AllowSyscall(f, 5); // __NR_open + AllowSyscall(f, 141); // __NR_getdents + AllowSyscall(f, 217); // __NR_getdents64 + + // b/34719286 + AllowSyscall(f, 351); // __NR_eventfd + + // b/34817266 + AllowSyscall(f, 252); // __NR_epoll_wait + + // Needed by sanitizers (b/34606909) + // 5 (__NR_open) and 195 (__NR_stat64) are also required, but they are + // already allowed. + AllowSyscall(f, 85); // __NR_readlink + + // arm32 filter - autogenerated from bionic syscall usage + for (size_t i = 0; i < arm_filter_size; ++i) + f.push_back(arm_filter[i]); + + return install_filter(f); +} + +static void Seccomp_setPolicy(JNIEnv* /*env*/) { + if (!set_seccomp_filter()) { + ALOGE("Failed to set seccomp policy - killing"); + exit(1); + } +} + +#else // #if defined __arm__ || defined __aarch64__ + +static void Seccomp_setPolicy(JNIEnv* /*env*/) { +} + +#endif + +static const JNINativeMethod method_table[] = { + NATIVE_METHOD(Seccomp, setPolicy, "()V"), +}; + +namespace android { + +int register_android_os_seccomp(JNIEnv* env) { + return android::RegisterMethodsOrDie(env, "android/os/Seccomp", + method_table, NELEM(method_table)); +} + +} diff --git a/core/proto/android/service/netstats.proto b/core/proto/android/service/netstats.proto index 5cca6ab07a6d..5a577b1a3236 100644 --- a/core/proto/android/service/netstats.proto +++ b/core/proto/android/service/netstats.proto @@ -27,12 +27,16 @@ message NetworkStatsServiceDumpProto { repeated NetworkInterfaceProto active_uid_interfaces = 2; + // Device level network stats, which may include non-IP layer traffic. NetworkStatsRecorderProto dev_stats = 3; + // IP-layer traffic stats. NetworkStatsRecorderProto xt_stats = 4; + // Per-UID network stats. NetworkStatsRecorderProto uid_stats = 5; + // Per-UID, per-tag network stats, excluding the default tag (i.e. tag=0). NetworkStatsRecorderProto uid_tag_stats = 6; } diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 8b9b3b2de89f..e00874fe4451 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3064,6 +3064,7 @@ <string name="adb_active_notification_title">USB debugging connected</string> <!-- Message of notification shown when ADB is actively connected to the phone. --> <string name="adb_active_notification_message">Tap to disable USB debugging.</string> + <string name="adb_active_notification_message" product="tv">Select to disable USB debugging.</string> <!-- Title of notification shown to indicate that bug report is being collected. --> <string name="taking_remote_bugreport_notification_title">Taking bug report\u2026</string> @@ -4468,4 +4469,6 @@ <!-- Channel name for DeviceStorageMonitor notifications --> <string name="device_storage_monitor_notification_channel">Device storage</string> + <!-- Channel name for UsbDeviceManager adb debugging notifications --> + <string name="adb_debugging_notification_channel_tv">USB debugging</string> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 571aa1730484..b95c20b05d9f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1914,6 +1914,7 @@ <java-symbol type="string" name="smv_process" /> <java-symbol type="string" name="tethered_notification_message" /> <java-symbol type="string" name="tethered_notification_title" /> + <java-symbol type="string" name="adb_debugging_notification_channel_tv" /> <java-symbol type="string" name="usb_accessory_notification_title" /> <java-symbol type="string" name="usb_mtp_notification_title" /> <java-symbol type="string" name="usb_charging_notification_title" /> diff --git a/core/tests/coretests/src/com/android/internal/logging/legacy/LockscreenGestureParserTest.java b/core/tests/coretests/src/com/android/internal/logging/legacy/LockscreenGestureParserTest.java deleted file mode 100644 index c023b572493f..000000000000 --- a/core/tests/coretests/src/com/android/internal/logging/legacy/LockscreenGestureParserTest.java +++ /dev/null @@ -1,100 +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.internal.logging.legacy; - -import static org.mockito.Matchers.anyObject; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -import android.metrics.LogMaker; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - -public class LockscreenGestureParserTest extends ParserTest { - - public LockscreenGestureParserTest() { - mParser = new LockscreenGestureParser(); - } - - public void testSwipeUpUnlock() throws Throwable { - validate(MetricsEvent.ACTION_LS_UNLOCK, 1, 359, 6382); - } - - public void testSwipeToShade() throws Throwable { - validate(MetricsEvent.ACTION_LS_SHADE, 2, 324, 0); - } - - public void testTapLockHint() throws Throwable { - validate(MetricsEvent.ACTION_LS_HINT, 3, 0, 0); - } - - public void testCamera() throws Throwable { - validate(MetricsEvent.ACTION_LS_CAMERA, 4, 223, 1756); - } - - public void testDialer() throws Throwable { - validate(MetricsEvent.ACTION_LS_DIALER, 5, 163, 861); - } - - public void testTapToLock() throws Throwable { - validate(MetricsEvent.ACTION_LS_LOCK, 6, 0, 0); - } - - public void testTapOnNotification() throws Throwable { - validate(MetricsEvent.ACTION_LS_NOTE, 7, 0, 0); - } - - public void testLockscreenQuickSettings() throws Throwable { - validate(MetricsEvent.ACTION_LS_QS, 8, 284, 3824); - } - - public void testShadePullQuickSettings() throws Throwable { - validate(MetricsEvent.ACTION_SHADE_QS_PULL, 9, 175, 3444); - } - - public void testShadeTapQuickSettings() throws Throwable { - validate(MetricsEvent.ACTION_SHADE_QS_TAP, 10, 0, 0); - } - - private void validate(int view, int type, int len, int vel) { - int t = 1000; - Object[] objects = new Object[3]; - objects[0] = type; - objects[1] = len; - objects[2] = vel; - - mParser.parseEvent(mLogger, t, objects); - - verify(mLogger, times(1)).addEvent(mProtoCaptor.capture()); - - LogMaker proto = mProtoCaptor.getValue(); - assertEquals(t, proto.getTimestamp()); - assertEquals(view, proto.getCategory()); - assertEquals(MetricsEvent.TYPE_ACTION, proto.getType()); - } - - public void testIgnoreUnexpectedData() throws Throwable { - int t = 1000; - Object[] objects = new Object[4]; - objects[0] = 1; - objects[1] = 0; - objects[2] = 0; - objects[3] = "foo"; - - mParser.parseEvent(mLogger, t, objects); - - verify(mLogger, times(1)).addEvent((LogMaker) anyObject()); - } -} diff --git a/core/tests/coretests/src/com/android/internal/logging/legacy/StatusBarStateParserTest.java b/core/tests/coretests/src/com/android/internal/logging/legacy/StatusBarStateParserTest.java deleted file mode 100644 index def9628e7fbd..000000000000 --- a/core/tests/coretests/src/com/android/internal/logging/legacy/StatusBarStateParserTest.java +++ /dev/null @@ -1,73 +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.internal.logging.legacy; - -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - - -import android.metrics.LogMaker; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; - -public class StatusBarStateParserTest extends ParserTest { - - public StatusBarStateParserTest() { - mParser = new StatusBarStateParser(); - } - - public void testLockScreen() throws Throwable { - validate(MetricsEvent.LOCKSCREEN, MetricsEvent.TYPE_OPEN, 1, "1,1,0,0,1,0"); - } - - public void testBounce() throws Throwable { - validate(MetricsEvent.BOUNCER, MetricsEvent.TYPE_OPEN, 1, "1,1,0,1,1,0"); - } - - public void testUnlock() throws Throwable { - validate(MetricsEvent.LOCKSCREEN, MetricsEvent.TYPE_CLOSE, 1, "0,0,0,0,1,0"); - } - - public void testSecure() throws Throwable { - validate(MetricsEvent.BOUNCER, MetricsEvent.TYPE_OPEN, 1, "2,1,0,1,1,0"); - } - - public void testInsecure() throws Throwable { - validate(MetricsEvent.LOCKSCREEN, MetricsEvent.TYPE_OPEN, 0, "1,1,0,0,0,0"); - } - - public void testIgnoreUnexpectedData() throws Throwable { - validate(MetricsEvent.LOCKSCREEN, MetricsEvent.TYPE_OPEN, 0, "1,1,0,0,0,0,5"); - } - - private void validate(int view, int type, int subType, String log) { - String[] parts = log.split(","); - int t = 1000; - Object[] objects = new Object[parts.length]; - for (int i = 0; i < parts.length; i++) { - objects[i] = Integer.valueOf(parts[i]); - } - - mParser.parseEvent(mLogger, t, objects); - - verify(mLogger, times(1)).addEvent(mProtoCaptor.capture()); - - LogMaker proto = mProtoCaptor.getValue(); - assertEquals(t, proto.getTimestamp()); - assertEquals(view, proto.getCategory()); - assertEquals(type, proto.getType()); - assertEquals(subType, proto.getSubtype()); - } -} diff --git a/keystore/java/android/security/GateKeeper.java b/keystore/java/android/security/GateKeeper.java index 7a2cbd06eb92..03df5de9b484 100644 --- a/keystore/java/android/security/GateKeeper.java +++ b/keystore/java/android/security/GateKeeper.java @@ -29,6 +29,8 @@ import android.service.gatekeeper.IGateKeeperService; */ public abstract class GateKeeper { + public static final long INVALID_SECURE_USER_ID = 0; + private GateKeeper() {} public static IGateKeeperService getService() { diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java index b234d0f81a89..9701b0ea9308 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java @@ -17,6 +17,7 @@ package android.security.keystore; import android.security.Credentials; +import android.security.GateKeeper; import android.security.KeyStore; import android.security.keymaster.KeyCharacteristics; import android.security.keymaster.KeymasterArguments; @@ -235,7 +236,8 @@ public abstract class AndroidKeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { spec.isUserAuthenticationRequired(), spec.getUserAuthenticationValidityDurationSeconds(), spec.isUserAuthenticationValidWhileOnBody(), - spec.isInvalidatedByBiometricEnrollment()); + spec.isInvalidatedByBiometricEnrollment(), + GateKeeper.INVALID_SECURE_USER_ID /* boundToSpecificSecureUserId */); } catch (IllegalStateException | IllegalArgumentException e) { throw new InvalidAlgorithmParameterException(e); } @@ -275,7 +277,8 @@ public abstract class AndroidKeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { spec.isUserAuthenticationRequired(), spec.getUserAuthenticationValidityDurationSeconds(), spec.isUserAuthenticationValidWhileOnBody(), - spec.isInvalidatedByBiometricEnrollment()); + spec.isInvalidatedByBiometricEnrollment(), + GateKeeper.INVALID_SECURE_USER_ID /* boundToSpecificSecureUserId */); KeymasterUtils.addMinMacLengthAuthorizationIfNecessary( args, mKeymasterAlgorithm, diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java index 1818f52c4fda..dba3949ba98f 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -18,6 +18,7 @@ package android.security.keystore; import android.annotation.Nullable; import android.security.Credentials; +import android.security.GateKeeper; import android.security.KeyPairGeneratorSpec; import android.security.KeyStore; import android.security.keymaster.KeyCharacteristics; @@ -346,7 +347,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato mSpec.isUserAuthenticationRequired(), mSpec.getUserAuthenticationValidityDurationSeconds(), mSpec.isUserAuthenticationValidWhileOnBody(), - mSpec.isInvalidatedByBiometricEnrollment()); + mSpec.isInvalidatedByBiometricEnrollment(), + GateKeeper.INVALID_SECURE_USER_ID /* boundToSpecificSecureUserId */); } catch (IllegalArgumentException | IllegalStateException e) { throw new InvalidAlgorithmParameterException(e); } @@ -533,7 +535,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato mSpec.isUserAuthenticationRequired(), mSpec.getUserAuthenticationValidityDurationSeconds(), mSpec.isUserAuthenticationValidWhileOnBody(), - mSpec.isInvalidatedByBiometricEnrollment()); + mSpec.isInvalidatedByBiometricEnrollment(), + GateKeeper.INVALID_SECURE_USER_ID /* boundToSpecificSecureUserId */); args.addDateIfNotNull(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, mSpec.getKeyValidityStart()); args.addDateIfNotNull(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME, mSpec.getKeyValidityForOriginationEnd()); diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java index fcbb553c7214..64b10ab6eacb 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java @@ -500,7 +500,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { spec.isUserAuthenticationRequired(), spec.getUserAuthenticationValidityDurationSeconds(), spec.isUserAuthenticationValidWhileOnBody(), - spec.isInvalidatedByBiometricEnrollment()); + spec.isInvalidatedByBiometricEnrollment(), + spec.getBoundToSpecificSecureUserId()); importArgs.addDateIfNotNull(KeymasterDefs.KM_TAG_ACTIVE_DATETIME, spec.getKeyValidityStart()); importArgs.addDateIfNotNull(KeymasterDefs.KM_TAG_ORIGINATION_EXPIRE_DATETIME, @@ -696,7 +697,8 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { params.isUserAuthenticationRequired(), params.getUserAuthenticationValidityDurationSeconds(), params.isUserAuthenticationValidWhileOnBody(), - params.isInvalidatedByBiometricEnrollment()); + params.isInvalidatedByBiometricEnrollment(), + params.getBoundToSpecificSecureUserId()); KeymasterUtils.addMinMacLengthAuthorizationIfNecessary( args, keymasterAlgorithm, diff --git a/keystore/java/android/security/keystore/KeyProtection.java b/keystore/java/android/security/keystore/KeyProtection.java index e70d33a3385c..2592a97468d3 100644 --- a/keystore/java/android/security/keystore/KeyProtection.java +++ b/keystore/java/android/security/keystore/KeyProtection.java @@ -21,6 +21,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.KeyguardManager; import android.hardware.fingerprint.FingerprintManager; +import android.security.GateKeeper; import java.security.Key; import java.security.Signature; @@ -225,6 +226,7 @@ public final class KeyProtection implements ProtectionParameter { private final int mUserAuthenticationValidityDurationSeconds; private final boolean mUserAuthenticationValidWhileOnBody; private final boolean mInvalidatedByBiometricEnrollment; + private final long mBoundToSecureUserId; private KeyProtection( Date keyValidityStart, @@ -239,7 +241,8 @@ public final class KeyProtection implements ProtectionParameter { boolean userAuthenticationRequired, int userAuthenticationValidityDurationSeconds, boolean userAuthenticationValidWhileOnBody, - boolean invalidatedByBiometricEnrollment) { + boolean invalidatedByBiometricEnrollment, + long boundToSecureUserId) { mKeyValidityStart = Utils.cloneIfNotNull(keyValidityStart); mKeyValidityForOriginationEnd = Utils.cloneIfNotNull(keyValidityForOriginationEnd); mKeyValidityForConsumptionEnd = Utils.cloneIfNotNull(keyValidityForConsumptionEnd); @@ -255,6 +258,7 @@ public final class KeyProtection implements ProtectionParameter { mUserAuthenticationValidityDurationSeconds = userAuthenticationValidityDurationSeconds; mUserAuthenticationValidWhileOnBody = userAuthenticationValidWhileOnBody; mInvalidatedByBiometricEnrollment = invalidatedByBiometricEnrollment; + mBoundToSecureUserId = boundToSecureUserId; } /** @@ -436,6 +440,24 @@ public final class KeyProtection implements ProtectionParameter { } /** + * Return the secure user id that this key should be bound to. + * + * Normally an authentication-bound key is tied to the secure user id of the current user + * (either the root SID from GateKeeper for auth-bound keys with a timeout, or the authenticator + * id of the current fingerprint set for keys requiring explicit fingerprint authorization). + * If this parameter is set (this method returning non-zero value), the key should be tied to + * the specified secure user id, overriding the logic above. + * + * This is only applicable when {@link #isUserAuthenticationRequired} is {@code true} + * + * @see KeymasterUtils#addUserAuthArgs + * @hide + */ + public long getBoundToSpecificSecureUserId() { + return mBoundToSecureUserId; + } + + /** * Builder of {@link KeyProtection} instances. */ public final static class Builder { @@ -454,6 +476,7 @@ public final class KeyProtection implements ProtectionParameter { private boolean mUserAuthenticationValidWhileOnBody; private boolean mInvalidatedByBiometricEnrollment = true; + private long mBoundToSecureUserId = GateKeeper.INVALID_SECURE_USER_ID; /** * Creates a new instance of the {@code Builder}. * @@ -774,6 +797,26 @@ public final class KeyProtection implements ProtectionParameter { } /** + * Set the secure user id that this key should be bound to. + * + * Normally an authentication-bound key is tied to the secure user id of the current user + * (either the root SID from GateKeeper for auth-bound keys with a timeout, or the + * authenticator id of the current fingerprint set for keys requiring explicit fingerprint + * authorization). If this parameter is set (this method returning non-zero value), the key + * should be tied to the specified secure user id, overriding the logic above. + * + * This is only applicable when {@link #setUserAuthenticationRequired} is set to + * {@code true} + * + * @see KeyProtection#getBoundToSpecificSecureUserId() + * @hide + */ + public Builder setBoundToSpecificSecureUserId(long secureUserId) { + mBoundToSecureUserId = secureUserId; + return this; + } + + /** * Builds an instance of {@link KeyProtection}. * * @throws IllegalArgumentException if a required field is missing @@ -793,7 +836,8 @@ public final class KeyProtection implements ProtectionParameter { mUserAuthenticationRequired, mUserAuthenticationValidityDurationSeconds, mUserAuthenticationValidWhileOnBody, - mInvalidatedByBiometricEnrollment); + mInvalidatedByBiometricEnrollment, + mBoundToSecureUserId); } } } diff --git a/keystore/java/android/security/keystore/KeymasterUtils.java b/keystore/java/android/security/keystore/KeymasterUtils.java index f5272aa233e9..34c8d1f75f60 100644 --- a/keystore/java/android/security/keystore/KeymasterUtils.java +++ b/keystore/java/android/security/keystore/KeymasterUtils.java @@ -89,7 +89,10 @@ public abstract class KeymasterUtils { * @param userAuthenticationValidityDurationSeconds duration of time (seconds) for which user * authentication is valid as authorization for using the key or {@code -1} if every * use of the key needs authorization. - * + * @param boundToSpecificSecureUserId if non-zero, specify which SID the key will be bound to, + * overriding the default logic in this method where the key is bound to either the root + * SID of the current user, or the fingerprint SID if explicit fingerprint authorization + * is requested. * @throws IllegalStateException if user authentication is required but the system is in a wrong * state (e.g., secure lock screen not set up) for generating or importing keys that * require user authentication. @@ -98,7 +101,8 @@ public abstract class KeymasterUtils { boolean userAuthenticationRequired, int userAuthenticationValidityDurationSeconds, boolean userAuthenticationValidWhileOnBody, - boolean invalidatedByBiometricEnrollment) { + boolean invalidatedByBiometricEnrollment, + long boundToSpecificSecureUserId) { if (!userAuthenticationRequired) { args.addBoolean(KeymasterDefs.KM_TAG_NO_AUTH_REQUIRED); return; @@ -120,7 +124,9 @@ public abstract class KeymasterUtils { } long sid; - if (invalidatedByBiometricEnrollment) { + if (boundToSpecificSecureUserId != GateKeeper.INVALID_SECURE_USER_ID) { + sid = boundToSpecificSecureUserId; + } else if (invalidatedByBiometricEnrollment) { // The fingerprint-only SID will change on fingerprint enrollment or removal of all, // enrolled fingerprints, invalidating the key. sid = fingerprintOnlySid; @@ -138,11 +144,16 @@ public abstract class KeymasterUtils { + "supported for keys requiring fingerprint authentication"); } } else { - // The key is authorized for use for the specified amount of time after the user has - // authenticated. Whatever unlocks the secure lock screen should authorize this key. - long rootSid = getRootSid(); + long sid; + if (boundToSpecificSecureUserId != GateKeeper.INVALID_SECURE_USER_ID) { + sid = boundToSpecificSecureUserId; + } else { + // The key is authorized for use for the specified amount of time after the user has + // authenticated. Whatever unlocks the secure lock screen should authorize this key. + sid = getRootSid(); + } args.addUnsignedLong(KeymasterDefs.KM_TAG_USER_SECURE_ID, - KeymasterArguments.toUint64(rootSid)); + KeymasterArguments.toUint64(sid)); args.addEnum(KeymasterDefs.KM_TAG_USER_AUTH_TYPE, KeymasterDefs.HW_AUTH_PASSWORD | KeymasterDefs.HW_AUTH_FINGERPRINT); args.addUnsignedInt(KeymasterDefs.KM_TAG_AUTH_TIMEOUT, diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index 9a08f638f230..fe68ec01e4b7 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -27,16 +27,17 @@ namespace android { -std::unique_ptr<ApkAssets> ApkAssets::Load(const std::string& path) { - return ApkAssets::LoadImpl(path, false /*load_as_shared_library*/); +std::unique_ptr<const ApkAssets> ApkAssets::Load(const std::string& path, bool system) { + return ApkAssets::LoadImpl(path, system, false /*load_as_shared_library*/); } -std::unique_ptr<ApkAssets> ApkAssets::LoadAsSharedLibrary(const std::string& path) { - return ApkAssets::LoadImpl(path, true /*load_as_shared_library*/); +std::unique_ptr<const ApkAssets> ApkAssets::LoadAsSharedLibrary(const std::string& path, + bool system) { + return ApkAssets::LoadImpl(path, system, true /*load_as_shared_library*/); } -std::unique_ptr<ApkAssets> ApkAssets::LoadImpl(const std::string& path, - bool load_as_shared_library) { +std::unique_ptr<const ApkAssets> ApkAssets::LoadImpl(const std::string& path, bool system, + bool load_as_shared_library) { ATRACE_CALL(); ::ZipArchiveHandle unmanaged_handle; int32_t result = ::OpenArchive(path.c_str(), &unmanaged_handle); @@ -70,11 +71,13 @@ std::unique_ptr<ApkAssets> ApkAssets::LoadImpl(const std::string& path, loaded_apk->path_ = path; loaded_apk->loaded_arsc_ = LoadedArsc::Load(loaded_apk->resources_asset_->getBuffer(true /*wordAligned*/), - loaded_apk->resources_asset_->getLength(), load_as_shared_library); + loaded_apk->resources_asset_->getLength(), system, load_as_shared_library); if (loaded_apk->loaded_arsc_ == nullptr) { return {}; } - return loaded_apk; + + // Need to force a move for mingw32. + return std::move(loaded_apk); } std::unique_ptr<Asset> ApkAssets::Open(const std::string& path, Asset::AccessMode /*mode*/) const { diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index d2eff65106cd..542a125f018b 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -18,6 +18,8 @@ #include "androidfw/AssetManager2.h" +#include <set> + #include "android-base/logging.h" #include "android-base/stringprintf.h" #include "utils/ByteOrder.h" @@ -143,6 +145,36 @@ void AssetManager2::SetConfiguration(const ResTable_config& configuration) { } } +std::set<ResTable_config> AssetManager2::GetResourceConfigurations(bool exclude_system, + bool exclude_mipmap) { + ATRACE_CALL(); + std::set<ResTable_config> configurations; + for (const PackageGroup& package_group : package_groups_) { + for (const LoadedPackage* package : package_group.packages_) { + if (exclude_system && package->IsSystem()) { + continue; + } + package->CollectConfigurations(exclude_mipmap, &configurations); + } + } + return configurations; +} + +std::set<std::string> AssetManager2::GetResourceLocales(bool exclude_system, + bool merge_equivalent_languages) { + ATRACE_CALL(); + std::set<std::string> locales; + for (const PackageGroup& package_group : package_groups_) { + for (const LoadedPackage* package : package_group.packages_) { + if (exclude_system && package->IsSystem()) { + continue; + } + package->CollectLocales(merge_equivalent_languages, &locales); + } + } + return locales; +} + std::unique_ptr<Asset> AssetManager2::Open(const std::string& filename, Asset::AccessMode mode) { const std::string new_path = "assets/" + filename; return OpenNonAsset(new_path, mode); @@ -325,8 +357,15 @@ ApkAssetsCookie AssetManager2::GetResource(uint32_t resid, bool may_be_bag, if (dtohl(entry.entry->flags) & ResTable_entry::FLAG_COMPLEX) { if (!may_be_bag) { LOG(ERROR) << base::StringPrintf("Resource %08x is a complex map type.", resid); + return kInvalidCookie; } - return kInvalidCookie; + + // Create a reference since we can't represent this complex type as a Res_value. + out_value->dataType = Res_value::TYPE_REFERENCE; + out_value->data = resid; + *out_selected_config = config; + *out_flags = flags; + return cookie; } const Res_value* device_value = reinterpret_cast<const Res_value*>( @@ -341,6 +380,37 @@ ApkAssetsCookie AssetManager2::GetResource(uint32_t resid, bool may_be_bag, return cookie; } +ApkAssetsCookie AssetManager2::ResolveReference(ApkAssetsCookie cookie, Res_value* in_out_value, + ResTable_config* in_out_selected_config, + uint32_t* in_out_flags, + ResTable_ref* out_last_reference) { + ATRACE_CALL(); + constexpr const int kMaxIterations = 20; + + out_last_reference->ident = 0u; + for (size_t iteration = 0u; in_out_value->dataType == Res_value::TYPE_REFERENCE && + in_out_value->data != 0u && iteration < kMaxIterations; + iteration++) { + if (out_last_reference != nullptr) { + out_last_reference->ident = in_out_value->data; + } + uint32_t new_flags = 0u; + cookie = GetResource(in_out_value->data, true /*may_be_bag*/, 0u /*density_override*/, + in_out_value, in_out_selected_config, &new_flags); + if (cookie == kInvalidCookie) { + return kInvalidCookie; + } + if (in_out_flags != nullptr) { + *in_out_flags |= new_flags; + } + if (out_last_reference->ident == in_out_value->data) { + // This reference can't be resolved, so exit now and let the caller deal with it. + return cookie; + } + } + return cookie; +} + const ResolvedBag* AssetManager2::GetBag(uint32_t resid) { ATRACE_CALL(); @@ -501,6 +571,15 @@ const ResolvedBag* AssetManager2::GetBag(uint32_t resid) { return result; } +uint32_t AssetManager2::GetResourceId(const std::string& resource_name, + const std::string& fallback_type, + const std::string& fallback_package) { + (void)resource_name; + (void)fallback_type; + (void)fallback_package; + return 0u; +} + void AssetManager2::InvalidateCaches(uint32_t diff) { if (diff == 0xffffffffu) { // Everything must go. diff --git a/libs/androidfw/LoadedArsc.cpp b/libs/androidfw/LoadedArsc.cpp index c7d0fa5b0cf3..cb589ec41034 100644 --- a/libs/androidfw/LoadedArsc.cpp +++ b/libs/androidfw/LoadedArsc.cpp @@ -321,6 +321,57 @@ static bool VerifyType(const Chunk& chunk) { return true; } +void LoadedPackage::CollectConfigurations(bool exclude_mipmap, + std::set<ResTable_config>* out_configs) const { + const static std::u16string kMipMap = u"mipmap"; + const size_t type_count = type_specs_.size(); + for (size_t i = 0; i < type_count; i++) { + const util::unique_cptr<TypeSpec>& type_spec = type_specs_[i]; + if (type_spec != nullptr) { + if (exclude_mipmap) { + const int type_idx = type_spec->type_spec->id - 1; + size_t type_name_len; + const char16_t* type_name16 = type_string_pool_.stringAt(type_idx, &type_name_len); + if (type_name16 != nullptr) { + if (kMipMap.compare(0, std::u16string::npos, type_name16, type_name_len) == 0) { + // This is a mipmap type, skip collection. + continue; + } + } + const char* type_name = type_string_pool_.string8At(type_idx, &type_name_len); + if (type_name != nullptr) { + if (strncmp(type_name, "mipmap", type_name_len) == 0) { + // This is a mipmap type, skip collection. + continue; + } + } + } + + for (size_t j = 0; j < type_spec->type_count; j++) { + out_configs->insert(type_spec->types[j].configuration); + } + } + } +} + +void LoadedPackage::CollectLocales(bool canonicalize, std::set<std::string>* out_locales) const { + char temp_locale[RESTABLE_MAX_LOCALE_LEN]; + const size_t type_count = type_specs_.size(); + for (size_t i = 0; i < type_count; i++) { + const util::unique_cptr<TypeSpec>& type_spec = type_specs_[i]; + if (type_spec != nullptr) { + for (size_t j = 0; j < type_spec->type_count; j++) { + const ResTable_config& configuration = type_spec->types[j].configuration; + if (configuration.locale != 0) { + configuration.getBcp47Locale(temp_locale, canonicalize); + std::string locale(temp_locale); + out_locales->insert(std::move(locale)); + } + } + } + } +} + std::unique_ptr<LoadedPackage> LoadedPackage::Load(const Chunk& chunk) { ATRACE_CALL(); std::unique_ptr<LoadedPackage> loaded_package{new LoadedPackage()}; @@ -574,6 +625,7 @@ bool LoadedArsc::LoadTable(const Chunk& chunk, bool load_as_shared_library) { if (loaded_package->package_id_ == kAppPackageId) { loaded_package->dynamic_ = load_as_shared_library; } + loaded_package->system_ = system_; packages_.push_back(std::move(loaded_package)); } break; @@ -590,12 +642,13 @@ bool LoadedArsc::LoadTable(const Chunk& chunk, bool load_as_shared_library) { return true; } -std::unique_ptr<LoadedArsc> LoadedArsc::Load(const void* data, size_t len, - bool load_as_shared_library) { +std::unique_ptr<const LoadedArsc> LoadedArsc::Load(const void* data, size_t len, bool system, + bool load_as_shared_library) { ATRACE_CALL(); // Not using make_unique because the constructor is private. std::unique_ptr<LoadedArsc> loaded_arsc(new LoadedArsc()); + loaded_arsc->system_ = system; ChunkIterator iter(data, len); while (iter.HasNext()) { @@ -617,7 +670,9 @@ std::unique_ptr<LoadedArsc> LoadedArsc::Load(const void* data, size_t len, LOG(ERROR) << iter.GetLastError(); return {}; } - return loaded_arsc; + + // Need to force a move for mingw32. + return std::move(loaded_arsc); } } // namespace android diff --git a/libs/androidfw/include/androidfw/ApkAssets.h b/libs/androidfw/include/androidfw/ApkAssets.h index 9d4fd29d30d7..6d1578c2d50e 100644 --- a/libs/androidfw/include/androidfw/ApkAssets.h +++ b/libs/androidfw/include/androidfw/ApkAssets.h @@ -31,8 +31,9 @@ namespace android { // Holds an APK. class ApkAssets { public: - static std::unique_ptr<ApkAssets> Load(const std::string& path); - static std::unique_ptr<ApkAssets> LoadAsSharedLibrary(const std::string& path); + static std::unique_ptr<const ApkAssets> Load(const std::string& path, bool system = false); + static std::unique_ptr<const ApkAssets> LoadAsSharedLibrary(const std::string& path, + bool system = false); std::unique_ptr<Asset> Open(const std::string& path, Asset::AccessMode mode = Asset::AccessMode::ACCESS_RANDOM) const; @@ -44,7 +45,8 @@ class ApkAssets { private: DISALLOW_COPY_AND_ASSIGN(ApkAssets); - static std::unique_ptr<ApkAssets> LoadImpl(const std::string& path, bool load_as_shared_library); + static std::unique_ptr<const ApkAssets> LoadImpl(const std::string& path, bool system, + bool load_as_shared_library); ApkAssets() = default; @@ -57,7 +59,7 @@ class ApkAssets { ZipArchivePtr zip_handle_; std::string path_; std::unique_ptr<Asset> resources_asset_; - std::unique_ptr<LoadedArsc> loaded_arsc_; + std::unique_ptr<const LoadedArsc> loaded_arsc_; }; } // namespace android diff --git a/libs/androidfw/include/androidfw/AssetManager2.h b/libs/androidfw/include/androidfw/AssetManager2.h index 86553390dadf..81cdc46be0b4 100644 --- a/libs/androidfw/include/androidfw/AssetManager2.h +++ b/libs/androidfw/include/androidfw/AssetManager2.h @@ -21,6 +21,7 @@ #include <array> #include <limits> +#include <set> #include <unordered_map> #include "androidfw/ApkAssets.h" @@ -112,6 +113,24 @@ class AssetManager2 : public ::AAssetManager { inline const ResTable_config& GetConfiguration() const { return configuration_; } + // Returns all configurations for which there are resources defined. This includes resource + // configurations in all the ApkAssets set for this AssetManager. + // If `exclude_system` is set to true, resource configurations from system APKs + // ('android' package, other libraries) will be excluded from the list. + // If `exclude_mipmap` is set to true, resource configurations defined for resource type 'mipmap' + // will be excluded from the list. + std::set<ResTable_config> GetResourceConfigurations(bool exclude_system = false, + bool exclude_mipmap = false); + + // Returns all the locales for which there are resources defined. This includes resource + // locales in all the ApkAssets set for this AssetManager. + // If `exclude_system` is set to true, resource locales from system APKs + // ('android' package, other libraries) will be excluded from the list. + // If `merge_equivalent_languages` is set to true, resource locales will be canonicalized + // and de-duped in the resulting list. + std::set<std::string> GetResourceLocales(bool exclude_system = false, + bool merge_equivalent_languages = false); + // Searches the set of APKs loaded by this AssetManager and opens the first one found located // in the assets/ directory. // `mode` controls how the file is opened. @@ -149,6 +168,14 @@ class AssetManager2 : public ::AAssetManager { // Returns false if the resource was not found. bool GetResourceFlags(uint32_t resid, uint32_t* out_flags); + // Finds the resource ID assigned to `resource_name`. + // `resource_name` must be of the form '[package:][type/]entry'. + // If no package is specified in `resource_name`, then `fallback_package` is used as the package. + // If no type is specified in `resource_name`, then `fallback_type` is used as the type. + // Returns 0x0 if no resource by that name was found. + uint32_t GetResourceId(const std::string& resource_name, const std::string& fallback_type = {}, + const std::string& fallback_package = {}); + // Retrieves the best matching resource with ID `resid`. The resource value is filled into // `out_value` and the configuration for the selected value is populated in `out_selected_config`. // `out_flags` holds the same flags as retrieved with GetResourceFlags(). @@ -162,6 +189,22 @@ class AssetManager2 : public ::AAssetManager { Res_value* out_value, ResTable_config* out_selected_config, uint32_t* out_flags); + // Resolves the resource reference in `in_out_value` if the data type is + // Res_value::TYPE_REFERENCE. + // `cookie` is the ApkAssetsCookie of the reference in `in_out_value`. + // `in_out_value` is the reference to resolve. The result is placed back into this object. + // `in_out_flags` is the type spec flags returned from calls to GetResource() or + // GetResourceFlags(). Configuration flags of the values pointed to by the reference + // are OR'd together with `in_out_flags`. + // `in_out_config` is populated with the configuration for which the resolved value was defined. + // `out_last_reference` is populated with the last reference ID before resolving to an actual + // value. + // Returns the cookie of the APK the resolved resource was defined in, or kInvalidCookie if + // it was not found. + ApkAssetsCookie ResolveReference(ApkAssetsCookie cookie, Res_value* in_out_value, + ResTable_config* in_out_selected_config, uint32_t* in_out_flags, + ResTable_ref* out_last_reference); + // Retrieves the best matching bag/map resource with ID `resid`. // This method will resolve all parent references for this bag and merge keys with the child. // To iterate over the keys, use the following idiom: diff --git a/libs/androidfw/include/androidfw/LoadedArsc.h b/libs/androidfw/include/androidfw/LoadedArsc.h index e8cb164ce201..91a7cb7f45f9 100644 --- a/libs/androidfw/include/androidfw/LoadedArsc.h +++ b/libs/androidfw/include/androidfw/LoadedArsc.h @@ -18,6 +18,7 @@ #define LOADEDARSC_H_ #include <memory> +#include <set> #include <vector> #include "android-base/macros.h" @@ -68,20 +69,38 @@ class LoadedPackage { LoadedArscEntry* out_entry, ResTable_config* out_selected_config, uint32_t* out_flags) const; + // Returns the string pool where type names are stored. inline const ResStringPool* GetTypeStringPool() const { return &type_string_pool_; } + // Returns the string pool where the names of resource entries are stored. inline const ResStringPool* GetKeyStringPool() const { return &key_string_pool_; } inline const std::string& GetPackageName() const { return package_name_; } inline int GetPackageId() const { return package_id_; } + // Returns true if this package is dynamic (shared library) and needs to have an ID assigned. inline bool IsDynamic() const { return dynamic_; } + // Returns true if this package originates from a system provided resource. + inline bool IsSystem() const { return system_; } + + // Returns the map of package name to package ID used in this LoadedPackage. At runtime, a + // package could have been assigned a different package ID than what this LoadedPackage was + // compiled with. AssetManager rewrites the package IDs so that they are compatible at runtime. inline const std::vector<DynamicPackageEntry>& GetDynamicPackageMap() const { return dynamic_package_map_; } + // Populates a set of ResTable_config structs, possibly excluding configurations defined for + // the mipmap type. + void CollectConfigurations(bool exclude_mipmap, std::set<ResTable_config>* out_configs) const; + + // Populates a set of strings representing locales. + // If `canonicalize` is set to true, each locale is transformed into its canonical format + // before being inserted into the set. This may cause some equivalent locales to de-dupe. + void CollectLocales(bool canonicalize, std::set<std::string>* out_locales) const; + private: DISALLOW_COPY_AND_ASSIGN(LoadedPackage); @@ -93,8 +112,9 @@ class LoadedPackage { ResStringPool key_string_pool_; std::string package_name_; int package_id_ = -1; - bool dynamic_ = false; int type_id_offset_ = 0; + bool dynamic_ = false; + bool system_ = false; ByteBucketArray<util::unique_cptr<TypeSpec>> type_specs_; std::vector<DynamicPackageEntry> dynamic_package_map_; @@ -104,10 +124,14 @@ class LoadedPackage { // when loading, including offsets and lengths. class LoadedArsc { public: - // Load the resource table from memory. The data's lifetime must out-live the - // object returned from this method. - static std::unique_ptr<LoadedArsc> Load(const void* data, size_t len, - bool load_as_shared_library = false); + // Load a resource table from memory pointed to by `data` of size `len`. + // The lifetime of `data` must out-live the LoadedArsc returned from this method. + // If `system` is set to true, the LoadedArsc is considered as a system provided resource. + // If `load_as_shared_library` is set to true, the application package (0x7f) is treated + // as a shared library (0x00). When loaded into an AssetManager, the package will be assigned an + // ID. + static std::unique_ptr<const LoadedArsc> Load(const void* data, size_t len, bool system = false, + bool load_as_shared_library = false); ~LoadedArsc(); @@ -125,6 +149,10 @@ class LoadedArsc { // Gets a pointer to the name of the package in `resid`, or nullptr if the package doesn't exist. const LoadedPackage* GetPackageForId(uint32_t resid) const; + // Returns true if this is a system provided resource. + inline bool IsSystem() const { return system_; } + + // Returns a vector of LoadedPackage pointers, representing the packages in this LoadedArsc. inline const std::vector<std::unique_ptr<const LoadedPackage>>& GetPackages() const { return packages_; } @@ -137,6 +165,7 @@ class LoadedArsc { ResStringPool global_string_pool_; std::vector<std::unique_ptr<const LoadedPackage>> packages_; + bool system_ = false; }; } // namespace android diff --git a/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h index 56c22e60e30b..04a5d958c614 100644 --- a/libs/androidfw/include/androidfw/ResourceTypes.h +++ b/libs/androidfw/include/androidfw/ResourceTypes.h @@ -1188,6 +1188,8 @@ struct ResTable_config int compare(const ResTable_config& o) const; int compareLogical(const ResTable_config& o) const; + inline bool operator<(const ResTable_config& o) const { return compare(o) < 0; } + // Flags indicating a set of config values. These flag constants must // match the corresponding ones in android.content.pm.ActivityInfo and // attrs_manifest.xml. diff --git a/libs/androidfw/include/androidfw/Util.h b/libs/androidfw/include/androidfw/Util.h index fd96730d2398..96b42bf45a08 100644 --- a/libs/androidfw/include/androidfw/Util.h +++ b/libs/androidfw/include/androidfw/Util.h @@ -94,8 +94,12 @@ class unique_cptr { inline bool operator==(const unique_cptr& o) const { return ptr_ == o.ptr_; } + inline bool operator!=(const unique_cptr& o) const { return ptr_ != o.ptr_; } + inline bool operator==(std::nullptr_t) const { return ptr_ == nullptr; } + inline bool operator!=(std::nullptr_t) const { return ptr_ != nullptr; } + private: DISALLOW_COPY_AND_ASSIGN(unique_cptr); diff --git a/libs/androidfw/tests/ApkAssets_test.cpp b/libs/androidfw/tests/ApkAssets_test.cpp index 02037120f098..6b4a7199eba4 100644 --- a/libs/androidfw/tests/ApkAssets_test.cpp +++ b/libs/androidfw/tests/ApkAssets_test.cpp @@ -24,7 +24,8 @@ using com::android::basic::R; namespace android { TEST(ApkAssetsTest, LoadApk) { - std::unique_ptr<ApkAssets> loaded_apk = ApkAssets::Load(GetTestDataPath() + "/basic/basic.apk"); + std::unique_ptr<const ApkAssets> loaded_apk = + ApkAssets::Load(GetTestDataPath() + "/basic/basic.apk"); ASSERT_NE(nullptr, loaded_apk); EXPECT_NE(nullptr, loaded_apk->GetLoadedArsc()); @@ -33,7 +34,7 @@ TEST(ApkAssetsTest, LoadApk) { } TEST(ApkAssetsTest, LoadApkAsSharedLibrary) { - std::unique_ptr<ApkAssets> loaded_apk = + std::unique_ptr<const ApkAssets> loaded_apk = ApkAssets::Load(GetTestDataPath() + "/appaslib/appaslib.apk"); ASSERT_NE(nullptr, loaded_apk); const LoadedArsc* loaded_arsc = loaded_apk->GetLoadedArsc(); diff --git a/libs/androidfw/tests/AssetManager2_bench.cpp b/libs/androidfw/tests/AssetManager2_bench.cpp index b3c2dc34cdcf..273290a26050 100644 --- a/libs/androidfw/tests/AssetManager2_bench.cpp +++ b/libs/androidfw/tests/AssetManager2_bench.cpp @@ -38,7 +38,7 @@ constexpr const static char* kFrameworkPath = "/system/framework/framework-res.a static void BM_AssetManagerLoadAssets(benchmark::State& state) { std::string path = GetTestDataPath() + "/basic/basic.apk"; while (state.KeepRunning()) { - std::unique_ptr<ApkAssets> apk = ApkAssets::Load(path); + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(path); AssetManager2 assets; assets.SetApkAssets({apk.get()}); } @@ -61,7 +61,7 @@ BENCHMARK(BM_AssetManagerLoadAssetsOld); static void BM_AssetManagerLoadFrameworkAssets(benchmark::State& state) { std::string path = kFrameworkPath; while (state.KeepRunning()) { - std::unique_ptr<ApkAssets> apk = ApkAssets::Load(path); + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(path); AssetManager2 assets; assets.SetApkAssets({apk.get()}); } @@ -84,10 +84,10 @@ BENCHMARK(BM_AssetManagerLoadFrameworkAssetsOld); static void GetResourceBenchmark(const std::vector<std::string>& paths, const ResTable_config* config, uint32_t resid, benchmark::State& state) { - std::vector<std::unique_ptr<ApkAssets>> apk_assets; + std::vector<std::unique_ptr<const ApkAssets>> apk_assets; std::vector<const ApkAssets*> apk_assets_ptrs; for (const std::string& path : paths) { - std::unique_ptr<ApkAssets> apk = ApkAssets::Load(path); + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(path); if (apk == nullptr) { state.SkipWithError(base::StringPrintf("Failed to load assets %s", path.c_str()).c_str()); return; @@ -187,7 +187,7 @@ static void BM_AssetManagerGetResourceFrameworkLocaleOld(benchmark::State& state BENCHMARK(BM_AssetManagerGetResourceFrameworkLocaleOld); static void BM_AssetManagerGetBag(benchmark::State& state) { - std::unique_ptr<ApkAssets> apk = ApkAssets::Load(GetTestDataPath() + "/styles/styles.apk"); + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(GetTestDataPath() + "/styles/styles.apk"); if (apk == nullptr) { state.SkipWithError("Failed to load assets"); return; @@ -234,4 +234,40 @@ static void BM_AssetManagerGetBagOld(benchmark::State& state) { } BENCHMARK(BM_AssetManagerGetBagOld); +static void BM_AssetManagerGetResourceLocales(benchmark::State& state) { + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(kFrameworkPath); + if (apk == nullptr) { + state.SkipWithError("Failed to load assets"); + return; + } + + AssetManager2 assets; + assets.SetApkAssets({apk.get()}); + + while (state.KeepRunning()) { + std::set<std::string> locales = + assets.GetResourceLocales(false /*exclude_system*/, true /*merge_equivalent_languages*/); + benchmark::DoNotOptimize(locales); + } +} +BENCHMARK(BM_AssetManagerGetResourceLocales); + +static void BM_AssetManagerGetResourceLocalesOld(benchmark::State& state) { + AssetManager assets; + if (!assets.addAssetPath(String8(kFrameworkPath), nullptr /*cookie*/, false /*appAsLib*/, + false /*isSystemAssets*/)) { + state.SkipWithError("Failed to load assets"); + return; + } + + const ResTable& table = assets.getResources(true); + + while (state.KeepRunning()) { + Vector<String8> locales; + table.getLocales(&locales, true /*includeSystemLocales*/, true /*mergeEquivalentLangs*/); + benchmark::DoNotOptimize(locales); + } +} +BENCHMARK(BM_AssetManagerGetResourceLocalesOld); + } // namespace android diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp index 543456afa2f4..557d8d40dfc2 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -26,6 +26,7 @@ #include "data/lib_two/R.h" #include "data/libclient/R.h" #include "data/styles/R.h" +#include "data/system/R.h" namespace app = com::android::app; namespace appaslib = com::android::appaslib::app; @@ -59,16 +60,20 @@ class AssetManager2Test : public ::testing::Test { appaslib_assets_ = ApkAssets::Load(GetTestDataPath() + "/appaslib/appaslib.apk"); ASSERT_NE(nullptr, appaslib_assets_); + + system_assets_ = ApkAssets::Load(GetTestDataPath() + "/system/system.apk", true /*system*/); + ASSERT_NE(nullptr, system_assets_); } protected: - std::unique_ptr<ApkAssets> basic_assets_; - std::unique_ptr<ApkAssets> basic_de_fr_assets_; - std::unique_ptr<ApkAssets> style_assets_; - std::unique_ptr<ApkAssets> lib_one_assets_; - std::unique_ptr<ApkAssets> lib_two_assets_; - std::unique_ptr<ApkAssets> libclient_assets_; - std::unique_ptr<ApkAssets> appaslib_assets_; + std::unique_ptr<const ApkAssets> basic_assets_; + std::unique_ptr<const ApkAssets> basic_de_fr_assets_; + std::unique_ptr<const ApkAssets> style_assets_; + std::unique_ptr<const ApkAssets> lib_one_assets_; + std::unique_ptr<const ApkAssets> lib_two_assets_; + std::unique_ptr<const ApkAssets> libclient_assets_; + std::unique_ptr<const ApkAssets> appaslib_assets_; + std::unique_ptr<const ApkAssets> system_assets_; }; TEST_F(AssetManager2Test, FindsResourceFromSingleApkAssets) { @@ -291,6 +296,131 @@ TEST_F(AssetManager2Test, MergesStylesWithParentFromSingleApkAssets) { EXPECT_EQ(0, bag_two->entries[4].cookie); } +TEST_F(AssetManager2Test, ResolveReferenceToResource) { + AssetManager2 assetmanager; + assetmanager.SetApkAssets({basic_assets_.get()}); + + Res_value value; + ResTable_config selected_config; + uint32_t flags; + ApkAssetsCookie cookie = + assetmanager.GetResource(basic::R::integer::ref1, false /*may_be_bag*/, + 0u /*density_override*/, &value, &selected_config, &flags); + ASSERT_NE(kInvalidCookie, cookie); + + EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType); + EXPECT_EQ(basic::R::integer::ref2, value.data); + + ResTable_ref last_ref; + cookie = assetmanager.ResolveReference(cookie, &value, &selected_config, &flags, &last_ref); + ASSERT_NE(kInvalidCookie, cookie); + EXPECT_EQ(Res_value::TYPE_INT_DEC, value.dataType); + EXPECT_EQ(12000u, value.data); + EXPECT_EQ(basic::R::integer::ref2, last_ref.ident); +} + +TEST_F(AssetManager2Test, ResolveReferenceToBag) { + AssetManager2 assetmanager; + assetmanager.SetApkAssets({basic_assets_.get()}); + + Res_value value; + ResTable_config selected_config; + uint32_t flags; + ApkAssetsCookie cookie = + assetmanager.GetResource(basic::R::integer::number2, true /*may_be_bag*/, + 0u /*density_override*/, &value, &selected_config, &flags); + ASSERT_NE(kInvalidCookie, cookie); + + EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType); + EXPECT_EQ(basic::R::array::integerArray1, value.data); + + ResTable_ref last_ref; + cookie = assetmanager.ResolveReference(cookie, &value, &selected_config, &flags, &last_ref); + ASSERT_NE(kInvalidCookie, cookie); + EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType); + EXPECT_EQ(basic::R::array::integerArray1, value.data); + EXPECT_EQ(basic::R::array::integerArray1, last_ref.ident); +} + +static bool IsConfigurationPresent(const std::set<ResTable_config>& configurations, + const ResTable_config& configuration) { + return configurations.count(configuration) > 0; +} + +TEST_F(AssetManager2Test, GetResourceConfigurations) { + AssetManager2 assetmanager; + assetmanager.SetApkAssets({system_assets_.get(), basic_de_fr_assets_.get()}); + + std::set<ResTable_config> configurations = assetmanager.GetResourceConfigurations(); + + // We expect the locale sv from the system assets, and de and fr from basic_de_fr assets. + // And one extra for the default configuration. + EXPECT_EQ(4u, configurations.size()); + + ResTable_config expected_config; + memset(&expected_config, 0, sizeof(expected_config)); + expected_config.language[0] = 's'; + expected_config.language[1] = 'v'; + EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config)); + + expected_config.language[0] = 'd'; + expected_config.language[1] = 'e'; + EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config)); + + expected_config.language[0] = 'f'; + expected_config.language[1] = 'r'; + EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config)); + + // Take out the system assets. + configurations = assetmanager.GetResourceConfigurations(true /* exclude_system */); + + // We expect de and fr from basic_de_fr assets. + EXPECT_EQ(2u, configurations.size()); + + expected_config.language[0] = 's'; + expected_config.language[1] = 'v'; + EXPECT_FALSE(IsConfigurationPresent(configurations, expected_config)); + + expected_config.language[0] = 'd'; + expected_config.language[1] = 'e'; + EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config)); + + expected_config.language[0] = 'f'; + expected_config.language[1] = 'r'; + EXPECT_TRUE(IsConfigurationPresent(configurations, expected_config)); +} + +TEST_F(AssetManager2Test, GetResourceLocales) { + AssetManager2 assetmanager; + assetmanager.SetApkAssets({system_assets_.get(), basic_de_fr_assets_.get()}); + + std::set<std::string> locales = assetmanager.GetResourceLocales(); + + // We expect the locale sv from the system assets, and de and fr from basic_de_fr assets. + EXPECT_EQ(3u, locales.size()); + EXPECT_GT(locales.count("sv"), 0u); + EXPECT_GT(locales.count("de"), 0u); + EXPECT_GT(locales.count("fr"), 0u); + + locales = assetmanager.GetResourceLocales(true /*exclude_system*/); + // We expect the de and fr locales from basic_de_fr assets. + EXPECT_EQ(2u, locales.size()); + EXPECT_GT(locales.count("de"), 0u); + EXPECT_GT(locales.count("fr"), 0u); +} + +TEST_F(AssetManager2Test, GetResourceId) { + AssetManager2 assetmanager; + assetmanager.SetApkAssets({basic_assets_.get()}); + + EXPECT_EQ(basic::R::layout::main, + assetmanager.GetResourceId("com.android.basic:layout/main", "", "")); + EXPECT_EQ(basic::R::layout::main, + assetmanager.GetResourceId("layout/main", "", "com.android.basic")); + EXPECT_EQ(basic::R::layout::main, + assetmanager.GetResourceId("main", "layout", "com.android.basic")); +} + TEST_F(AssetManager2Test, OpensFileFromSingleApkAssets) {} TEST_F(AssetManager2Test, OpensFileFromMultipleApkAssets) {} diff --git a/libs/androidfw/tests/LoadedArsc_test.cpp b/libs/androidfw/tests/LoadedArsc_test.cpp index f8aa61aa588a..756869f6377d 100644 --- a/libs/androidfw/tests/LoadedArsc_test.cpp +++ b/libs/androidfw/tests/LoadedArsc_test.cpp @@ -32,7 +32,8 @@ TEST(LoadedArscTest, LoadSinglePackageArsc) { ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/styles/styles.apk", "resources.arsc", &contents)); - std::unique_ptr<LoadedArsc> loaded_arsc = LoadedArsc::Load(contents.data(), contents.size()); + std::unique_ptr<const LoadedArsc> loaded_arsc = + LoadedArsc::Load(contents.data(), contents.size()); ASSERT_NE(nullptr, loaded_arsc); const std::vector<std::unique_ptr<const LoadedPackage>>& packages = loaded_arsc->GetPackages(); @@ -58,7 +59,8 @@ TEST(LoadedArscTest, FindDefaultEntry) { ASSERT_TRUE( ReadFileFromZipToString(GetTestDataPath() + "/basic/basic.apk", "resources.arsc", &contents)); - std::unique_ptr<LoadedArsc> loaded_arsc = LoadedArsc::Load(contents.data(), contents.size()); + std::unique_ptr<const LoadedArsc> loaded_arsc = + LoadedArsc::Load(contents.data(), contents.size()); ASSERT_NE(nullptr, loaded_arsc); ResTable_config desired_config; @@ -80,7 +82,8 @@ TEST(LoadedArscTest, LoadSharedLibrary) { ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/lib_one/lib_one.apk", "resources.arsc", &contents)); - std::unique_ptr<LoadedArsc> loaded_arsc = LoadedArsc::Load(contents.data(), contents.size()); + std::unique_ptr<const LoadedArsc> loaded_arsc = + LoadedArsc::Load(contents.data(), contents.size()); ASSERT_NE(nullptr, loaded_arsc); const auto& packages = loaded_arsc->GetPackages(); @@ -101,7 +104,8 @@ TEST(LoadedArscTest, LoadAppLinkedAgainstSharedLibrary) { ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/libclient/libclient.apk", "resources.arsc", &contents)); - std::unique_ptr<LoadedArsc> loaded_arsc = LoadedArsc::Load(contents.data(), contents.size()); + std::unique_ptr<const LoadedArsc> loaded_arsc = + LoadedArsc::Load(contents.data(), contents.size()); ASSERT_NE(nullptr, loaded_arsc); const auto& packages = loaded_arsc->GetPackages(); @@ -128,8 +132,8 @@ TEST(LoadedArscTest, LoadAppAsSharedLibrary) { ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/appaslib/appaslib.apk", "resources.arsc", &contents)); - std::unique_ptr<LoadedArsc> loaded_arsc = - LoadedArsc::Load(contents.data(), contents.size(), true /*load_as_shared_library*/); + std::unique_ptr<const LoadedArsc> loaded_arsc = LoadedArsc::Load( + contents.data(), contents.size(), false /*system*/, true /*load_as_shared_library*/); ASSERT_NE(nullptr, loaded_arsc); const auto& packages = loaded_arsc->GetPackages(); @@ -143,7 +147,8 @@ TEST(LoadedArscTest, LoadFeatureSplit) { std::string contents; ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/feature/feature.apk", "resources.arsc", &contents)); - std::unique_ptr<LoadedArsc> loaded_arsc = LoadedArsc::Load(contents.data(), contents.size()); + std::unique_ptr<const LoadedArsc> loaded_arsc = + LoadedArsc::Load(contents.data(), contents.size()); ASSERT_NE(nullptr, loaded_arsc); ResTable_config desired_config; diff --git a/libs/androidfw/tests/Theme_bench.cpp b/libs/androidfw/tests/Theme_bench.cpp index c471be6cd09d..594c39eb682f 100644 --- a/libs/androidfw/tests/Theme_bench.cpp +++ b/libs/androidfw/tests/Theme_bench.cpp @@ -28,7 +28,7 @@ constexpr const static uint32_t kStyleId = 0x01030237u; // android:style/Theme. constexpr const static uint32_t kAttrId = 0x01010030u; // android:attr/colorForeground static void BM_ThemeApplyStyleFramework(benchmark::State& state) { - std::unique_ptr<ApkAssets> apk = ApkAssets::Load(kFrameworkPath); + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(kFrameworkPath); if (apk == nullptr) { state.SkipWithError("Failed to load assets"); return; @@ -62,7 +62,7 @@ static void BM_ThemeApplyStyleFrameworkOld(benchmark::State& state) { BENCHMARK(BM_ThemeApplyStyleFrameworkOld); static void BM_ThemeGetAttribute(benchmark::State& state) { - std::unique_ptr<ApkAssets> apk = ApkAssets::Load(kFrameworkPath); + std::unique_ptr<const ApkAssets> apk = ApkAssets::Load(kFrameworkPath); AssetManager2 assets; assets.SetApkAssets({apk.get()}); diff --git a/libs/androidfw/tests/Theme_test.cpp b/libs/androidfw/tests/Theme_test.cpp index 59cb18a36e6f..daed28b01a4f 100644 --- a/libs/androidfw/tests/Theme_test.cpp +++ b/libs/androidfw/tests/Theme_test.cpp @@ -46,10 +46,10 @@ class ThemeTest : public ::testing::Test { } protected: - std::unique_ptr<ApkAssets> style_assets_; - std::unique_ptr<ApkAssets> libclient_assets_; - std::unique_ptr<ApkAssets> lib_one_assets_; - std::unique_ptr<ApkAssets> lib_two_assets_; + std::unique_ptr<const ApkAssets> style_assets_; + std::unique_ptr<const ApkAssets> libclient_assets_; + std::unique_ptr<const ApkAssets> lib_one_assets_; + std::unique_ptr<const ApkAssets> lib_two_assets_; }; TEST_F(ThemeTest, EmptyTheme) { diff --git a/libs/androidfw/tests/data/basic/R.h b/libs/androidfw/tests/data/basic/R.h index 9352b5c6629e..8e9741efd2a3 100644 --- a/libs/androidfw/tests/data/basic/R.h +++ b/libs/androidfw/tests/data/basic/R.h @@ -53,6 +53,8 @@ struct R { enum : uint32_t { number1 = 0x7f040000, number2 = 0x7f040001, + ref1 = 0x7f040002, + ref2 = 0x7f040003, // From feature number3 = 0x7f090000, diff --git a/libs/androidfw/tests/data/basic/basic.apk b/libs/androidfw/tests/data/basic/basic.apk Binary files differindex 2c9771b18934..7ee6734e0d6a 100644 --- a/libs/androidfw/tests/data/basic/basic.apk +++ b/libs/androidfw/tests/data/basic/basic.apk diff --git a/libs/androidfw/tests/data/basic/basic_de_fr.apk b/libs/androidfw/tests/data/basic/basic_de_fr.apk Binary files differindex 04814440e0f8..e45258c6a005 100644 --- a/libs/androidfw/tests/data/basic/basic_de_fr.apk +++ b/libs/androidfw/tests/data/basic/basic_de_fr.apk diff --git a/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk Binary files differindex a8d06e7f3c19..4ae1a7c87a70 100644 --- a/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk +++ b/libs/androidfw/tests/data/basic/basic_hdpi-v4.apk diff --git a/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk Binary files differindex d1dfb143f91b..a240d4c06c1d 100644 --- a/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk +++ b/libs/androidfw/tests/data/basic/basic_xhdpi-v4.apk diff --git a/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk b/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk Binary files differindex dca6f2fbc0ca..fd3d9b233084 100644 --- a/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk +++ b/libs/androidfw/tests/data/basic/basic_xxhdpi-v4.apk diff --git a/libs/androidfw/tests/data/basic/res/values/values.xml b/libs/androidfw/tests/data/basic/res/values/values.xml index 11f6b8adbdba..638c9832ab4c 100644 --- a/libs/androidfw/tests/data/basic/res/values/values.xml +++ b/libs/androidfw/tests/data/basic/res/values/values.xml @@ -37,6 +37,12 @@ <public type="integer" name="number2" id="0x7f040001" /> <integer name="number2">@array/integerArray1</integer> + <public type="integer" name="ref1" id="0x7f040002" /> + <integer name="ref1">@integer/ref2</integer> + + <public type="integer" name="ref2" id="0x7f040003" /> + <integer name="ref2">12000</integer> + <public type="style" name="Theme1" id="0x7f050000" /> <style name="Theme1"> <item name="com.android.basic:attr1">100</item> diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp index ee7764302c38..415e850d0fe8 100644 --- a/libs/hwui/DeferredLayerUpdater.cpp +++ b/libs/hwui/DeferredLayerUpdater.cpp @@ -169,13 +169,15 @@ void DeferredLayerUpdater::updateLayer(bool forceFilter, GLenum renderTarget, void DeferredLayerUpdater::detachSurfaceTexture() { if (mSurfaceTexture.get()) { - if (mLayer->getApi() == Layer::Api::OpenGL) { + if (mLayerApi == Layer::Api::OpenGL) { status_t err = mSurfaceTexture->detachFromContext(); if (err != 0) { // TODO: Elevate to fatal exception ALOGE("Failed to detach SurfaceTexture from context %d", err); } - static_cast<GlLayer*>(mLayer)->clearTexture(); + if (mLayer) { + static_cast<GlLayer*>(mLayer)->clearTexture(); + } } mSurfaceTexture = nullptr; } diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index a1f816b27df7..80832f8a2977 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -83,13 +83,17 @@ final public class MediaMuxer { private OutputFormat() {} /** MPEG4 media file format*/ public static final int MUXER_OUTPUT_MPEG_4 = 0; + /** WEBM media file format*/ public static final int MUXER_OUTPUT_WEBM = 1; + /** 3GPP media file format*/ + public static final int MUXER_OUTPUT_3GPP = 2; }; /** @hide */ @IntDef({ OutputFormat.MUXER_OUTPUT_MPEG_4, OutputFormat.MUXER_OUTPUT_WEBM, + OutputFormat.MUXER_OUTPUT_3GPP, }) @Retention(RetentionPolicy.SOURCE) public @interface Format {} @@ -166,8 +170,8 @@ final public class MediaMuxer { } private void setUpMediaMuxer(@NonNull FileDescriptor fd, @Format int format) throws IOException { - if (format != OutputFormat.MUXER_OUTPUT_MPEG_4 && - format != OutputFormat.MUXER_OUTPUT_WEBM) { + if (format != OutputFormat.MUXER_OUTPUT_MPEG_4 && format != OutputFormat.MUXER_OUTPUT_WEBM + && format != OutputFormat.MUXER_OUTPUT_3GPP) { throw new IllegalArgumentException("format: " + format + " is invalid"); } mNativeObject = nativeSetup(fd, format); diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 9a08fbe566c5..8ea0d8a738f5 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -1026,6 +1026,19 @@ public final class TvContract { @SystemApi public static final String COLUMN_TRANSIENT = "transient"; + /** + * The flag indicating whether this TV channel is approved to be shown by the system. + * + * <p>A value of 1 indicates that the channel is approved to be shown by the system, and a + * value of 0 indicates that the channel is blocked by system. If not specified, this value + * is set to 0 (not approved) by default. + * + * <p>Type: INTEGER (boolean) + * @hide + */ + @SystemApi + public static final String COLUMN_SYSTEM_APPROVED = "system_approved"; + private Channels() {} /** @@ -1665,7 +1678,7 @@ public final class TvContract { * * <p>Type: TEXT */ - public static final String COLUMN_LOGO = "logo"; + public static final String COLUMN_LOGO_URI = "logo_uri"; /** * The availability of this TV program. @@ -1860,8 +1873,8 @@ public final class TvContract { * * <p>Type: INTEGER */ - public static final String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = - "preview_last_playback_position"; + public static final String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = + "last_playback_position_millis"; /** * The duration (in milliseconds) of the preview video. @@ -1872,7 +1885,7 @@ public final class TvContract { * * <p>Type: INTEGER */ - public static final String COLUMN_PREVIEW_DURATION = "preview_duration"; + public static final String COLUMN_DURATION_MILLIS = "duration_millis"; /** * The intent URI which is launched when the preview video is selected. @@ -1885,8 +1898,8 @@ public final class TvContract { * * <p>Type: TEXT */ - public static final String COLUMN_PREVIEW_INTENT_URI = - "preview_intent_uri"; + public static final String COLUMN_APP_LINK_INTENT_URI = + "app_link_intent_uri"; /** * The weight of the preview program within the channel. @@ -1900,7 +1913,7 @@ public final class TvContract { * * <p>Type: INTEGER */ - public static final String COLUMN_PREVIEW_WEIGHT = "preview_weight"; + public static final String COLUMN_WEIGHT = "weight"; /** * The flag indicating whether this program is transient or not. diff --git a/native/android/Android.mk b/native/android/Android.mk index 355f52e1b7e4..f510b488548e 100644 --- a/native/android/Android.mk +++ b/native/android/Android.mk @@ -1,6 +1,8 @@ BASE_PATH := $(call my-dir) LOCAL_PATH:= $(call my-dir) +common_cflags := -Wall -Werror -Wunused -Wunreachable-code + include $(CLEAR_VARS) # our source files @@ -43,6 +45,23 @@ LOCAL_C_INCLUDES += \ LOCAL_MODULE := libandroid -LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code +LOCAL_CFLAGS += $(common_cflags) + +include $(BUILD_SHARED_LIBRARY) + +# Network library. +include $(CLEAR_VARS) +LOCAL_MODULE := libandroid_net +LOCAL_CFLAGS := $(common_cflags) +LOCAL_SRC_FILES:= \ + net.c \ + +LOCAL_SHARED_LIBRARIES := \ + libnetd_client \ + +LOCAL_C_INCLUDES += \ + frameworks/base/native/include \ + bionic/libc/dns/include \ + system/netd/include \ include $(BUILD_SHARED_LIBRARY) diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginInstanceManager.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginInstanceManager.java index d71b6bdafe19..dd1614b50ca6 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginInstanceManager.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginInstanceManager.java @@ -51,9 +51,6 @@ public class PluginInstanceManager<T extends Plugin> { private static final String TAG = "PluginInstanceManager"; private static final String PLUGIN_PERMISSION = "com.android.systemui.permission.PLUGIN"; - // must be one of the channels created in NotificationChannels.java - private static final String NOTIFICATION_CHANNEL_ID = "ALR"; - private final Context mContext; private final PluginListener<T> mListener; private final String mAction; @@ -310,14 +307,14 @@ public class PluginInstanceManager<T extends Plugin> { mContext.getPackageName()); final int color = Resources.getSystem().getIdentifier( "system_notification_accent_color", "color", "android"); - final Notification.Builder nb = new Notification.Builder(mContext) - .setStyle(new Notification.BigTextStyle()) - .setSmallIcon(icon) - .setWhen(0) - .setShowWhen(false) - .setChannel(NOTIFICATION_CHANNEL_ID) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setColor(mContext.getColor(color)); + final Notification.Builder nb = new Notification.Builder(mContext, + PluginManager.NOTIFICATION_CHANNEL_ID) + .setStyle(new Notification.BigTextStyle()) + .setSmallIcon(icon) + .setWhen(0) + .setShowWhen(false) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setColor(mContext.getColor(color)); String label = cls; try { label = mPm.getServiceInfo(component, 0).loadLabel(mPm).toString(); diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginManager.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginManager.java index 471454749c2f..cef485e673ad 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginManager.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/PluginManager.java @@ -55,6 +55,9 @@ public class PluginManager extends BroadcastReceiver { static final String DISABLE_PLUGIN = "com.android.systemui.action.DISABLE_PLUGIN"; + // must be one of the channels created in NotificationChannels.java + static final String NOTIFICATION_CHANNEL_ID = "ALR"; + private static PluginManager sInstance; private final HandlerThread mBackgroundThread; @@ -70,7 +73,7 @@ public class PluginManager extends BroadcastReceiver { private boolean mListening; private boolean mHasOneShot; - private PluginManager(Context context) { + public PluginManager(Context context) { this(context, new PluginInstanceManagerFactory(), Build.IS_DEBUGGABLE, Thread.getDefaultUncaughtExceptionHandler()); } @@ -191,15 +194,16 @@ public class PluginManager extends BroadcastReceiver { } catch (NameNotFoundException e) { } // Localization not required as this will never ever appear in a user build. - final Notification.Builder nb = new Notification.Builder(mContext) - .setSmallIcon(icon) - .setWhen(0) - .setShowWhen(false) - .setPriority(Notification.PRIORITY_MAX) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setColor(mContext.getColor(color)) - .setContentTitle("Plugin \"" + label + "\" has updated") - .setContentText("Restart SysUI for changes to take effect."); + final Notification.Builder nb = + new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID) + .setSmallIcon(icon) + .setWhen(0) + .setShowWhen(false) + .setPriority(Notification.PRIORITY_MAX) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setColor(mContext.getColor(color)) + .setContentTitle("Plugin \"" + label + "\" has updated") + .setContentText("Restart SysUI for changes to take effect."); Intent i = new Intent("com.android.systemui.action.RESTART").setData( Uri.parse("package://" + pkg)); PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, i, 0); @@ -252,13 +256,6 @@ public class PluginManager extends BroadcastReceiver { return new PluginContextWrapper(mContext.createApplicationContext(info, 0), classLoader); } - public static PluginManager getInstance(Context context) { - if (sInstance == null) { - sInstance = new PluginManager(context.getApplicationContext()); - } - return sInstance; - } - private class AllPluginClassLoader extends ClassLoader { public AllPluginClassLoader(ClassLoader classLoader) { super(classLoader); diff --git a/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/phone/NavGesture.java b/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/phone/NavGesture.java index 072848263a9b..918d6e96784d 100644 --- a/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/phone/NavGesture.java +++ b/packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/phone/NavGesture.java @@ -32,6 +32,8 @@ public interface NavGesture extends Plugin { public boolean onInterceptTouchEvent(MotionEvent event); public void setBarState(boolean vertical, boolean isRtl); + + public default void destroy() { } } } diff --git a/packages/SystemUI/res/drawable/pip_dismiss_background.xml b/packages/SystemUI/res/drawable/pip_dismiss_background.xml index 3a7529686dfb..8f502318ae14 100644 --- a/packages/SystemUI/res/drawable/pip_dismiss_background.xml +++ b/packages/SystemUI/res/drawable/pip_dismiss_background.xml @@ -1,22 +1,22 @@ <!-- -Copyright (C) 2016 The Android Open Source Project + 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 + 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 + 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. + 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. --> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval"> - <corners - android:radius="100dp" /> - <solid - android:color="#66000000" /> + android:shape="rectangle"> + <gradient + android:startColor="#B3000000" + android:endColor="#00000000" + android:angle="90"/> </shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/pip_dismiss_view.xml b/packages/SystemUI/res/layout/pip_dismiss_view.xml index 141e610d2294..f02a56cd5f81 100644 --- a/packages/SystemUI/res/layout/pip_dismiss_view.xml +++ b/packages/SystemUI/res/layout/pip_dismiss_view.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2016 The Android Open Source Project +<!-- + Copyright (C) 2016 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,12 +14,44 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pip_dismiss_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/pip_dismiss_background" - android:foreground="@drawable/pip_dismiss" - android:alpha="0" - android:forceHasOverlappingRendering="false" /> + android:alpha="0"> + + <!-- The height of the below view needs to be animated from a window + so it needs to be in a container to resize smoothly --> + <View + android:id="@+id/gradient_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="bottom" + android:background="@drawable/pip_dismiss_background" /> + + <LinearLayout + android:id="@+id/pip_dismiss_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center_horizontal" + android:orientation="horizontal" + android:paddingBottom="32dp" > + + <ImageView + android:id="@+id/pip_dismiss_icon" + android:layout_width="24dp" + android:layout_height="24dp" + android:padding="2dp" + android:src="@drawable/pip_dismiss" + android:tint="#FFFFFFFF" /> + + <TextView + android:id="@+id/pip_dismiss_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pip_phone_close" + android:textColor="#FFFFFFFF" + android:textSize="16sp" /> + </LinearLayout> + +</FrameLayout>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/pip_menu_activity.xml b/packages/SystemUI/res/layout/pip_menu_activity.xml index cf65f4aa830b..0f5ca9bdf2fc 100644 --- a/packages/SystemUI/res/layout/pip_menu_activity.xml +++ b/packages/SystemUI/res/layout/pip_menu_activity.xml @@ -27,7 +27,7 @@ android:layout_height="48dp" android:layout_gravity="top|end" android:padding="10dp" - android:contentDescription="@string/pip_phone_dismiss" + android:contentDescription="@string/pip_phone_close" android:src="@drawable/ic_close_white" android:background="?android:selectableItemBackgroundBorderless" /> diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 174776cef205..3e8e72a3d100 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -2,23 +2,22 @@ <!-- ** Copyright 2012, 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 +** 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 +** 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 +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. --> <!-- Extends RelativeLayout --> <com.android.systemui.statusbar.phone.QuickStatusBarHeader xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/header" android:layout_width="match_parent" android:layout_height="@dimen/status_bar_header_height" @@ -29,8 +28,7 @@ android:clipToPadding="false" android:paddingTop="0dp" android:paddingEnd="0dp" - android:paddingStart="0dp" - > + android:paddingStart="0dp"> <LinearLayout android:layout_width="wrap_content" @@ -190,8 +188,7 @@ android:layout_alignParentBottom="true" android:alpha="0" android:background="@color/qs_detail_progress_track" - android:src="@drawable/indeterminate_anim" - /> + android:src="@drawable/indeterminate_anim"/> <TextView android:id="@+id/header_debug_info" @@ -203,7 +200,6 @@ android:textColor="#00A040" android:textSize="11dp" android:textStyle="bold" - android:visibility="invisible" - /> + android:visibility="invisible"/> </com.android.systemui.statusbar.phone.QuickStatusBarHeader> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index f09657f9e486..0852020e779c 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -3,28 +3,27 @@ ** ** Copyright 2006, 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 +** 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 +** 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 +** 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. */ --> -<com.android.systemui.statusbar.phone.NotificationPanelView +<com.android.systemui.statusbar.phone.NotificationPanelView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:systemui="http://schemas.android.com/apk/res-auto" android:id="@+id/notification_panel" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/transparent" - > + android:background="@android:color/transparent" > <include layout="@layout/keyguard_status_view" @@ -77,8 +76,8 @@ </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer> <include - layout="@layout/keyguard_bottom_area" - android:visibility="gone" /> + layout="@layout/keyguard_bottom_area" + android:visibility="gone" /> <com.android.systemui.statusbar.AlphaOptimizedView android:id="@+id/qs_navbar_scrim" @@ -88,4 +87,4 @@ android:visibility="invisible" android:background="@drawable/qs_navbar_scrim" /> -</com.android.systemui.statusbar.phone.NotificationPanelView><!-- end of sliding panel --> +</com.android.systemui.statusbar.phone.NotificationPanelView> diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 285a8ec34abc..92a9da9d0331 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -48,6 +48,7 @@ android:layout_height="match_parent" android:importantForAccessibility="no" sysui:ignoreRightInset="true" + sysui:scrimColor="@color/scrim_behind_color" /> <com.android.systemui.statusbar.AlphaOptimizedView diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index 7fb513cda395..7632f87e7c78 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -115,5 +115,9 @@ <declare-styleable name="PluginInflateContainer"> <attr name="viewType" format="string" /> </declare-styleable> + <declare-styleable name="ScrimView"> + <!-- The initial color for the scrim. --> + <attr name="scrimColor" format="color" /> + </declare-styleable> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 1ec611a43b56..ad5b108f62b5 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -36,6 +36,7 @@ <color name="qs_detail_button">@*android:color/quaternary_device_default_settings</color> <color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white --> <color name="qs_detail_transition">#66FFFFFF</color> + <color name="scrim_behind_color">@android:color/black</color> <color name="status_bar_clock_color">#FFFFFFFF</color> <color name="qs_user_detail_icon_muted">#FFFFFFFF</color> <!-- not so muted after all --> <color name="qs_tile_disabled_color">#9E9E9E</color> <!-- 38% black --> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index d9407ab6b76d..64cac3c001d1 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -302,4 +302,34 @@ <item type="id" name="action_split_task_to_right" /> <item type="id" name="action_split_task_to_top" /> + <!-- Whether or not the gear icon on notifications should be shown. The gear is shown when the + the notification is not swiped enough to dismiss it. --> + <bool name="config_showNotificationGear">true</bool> + + <!-- Whether or not a background should be drawn behind a notification. --> + <bool name="config_drawNotificationBackground">true</bool> + + <!-- Whether or not the edit icon on the quick settings header is shown. --> + <bool name="config_showQuickSettingsEditingIcon">true</bool> + + <!-- Whether or not the multi-user switcher should be visible even if the quick settings are + not expanded. If there are not multiple users on the system, the switcher will still + hide itself. --> + <bool name="config_alwaysShowMultiUserSwitcher">false</bool> + + <!-- Whether or not the expand indicator is visible for manually expanding the quick settings + panel. --> + <bool name="config_showQuickSettingsExpandIndicator">true</bool> + + <!-- Whether or not to display the row of quick settings icons separate from the full quick + settings panel. --> + <bool name="config_showQuickSettingsRow">true</bool> + + <!-- Whether or not the quick settings should be revealed on an overscroll of the + notifications panel. --> + <bool name="config_enableQuickSettingsOverscrollExpansion">true</bool> + + <!-- Whether or the notifications can be shown and dismissed with a drag. --> + <bool name="config_enableNotificationShadeDrag">true</bool> + </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index ddcc4baf8350..b768f9086675 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -69,6 +69,9 @@ <!-- Height of a small notification in the status bar--> <dimen name="notification_min_height">92dp</dimen> + <!-- Height of a small notification in the status bar if it is a large (like messaging)--> + <dimen name="notification_min_height_large">132dp</dimen> + <!-- Height of a small notification in the status bar which was used before android N --> <dimen name="notification_min_height_legacy">64dp</dimen> @@ -347,6 +350,8 @@ <dimen name="keyguard_clock_notifications_margin_max">42dp</dimen> <dimen name="heads_up_scrim_height">250dp</dimen> + <item name="scrim_behind_alpha" format="float" type="dimen">0.62</item> + <!-- The minimum amount the user needs to swipe to go to the camera / phone. --> <dimen name="keyguard_min_swipe_amount">110dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index d3e965aedc98..363b3e20449e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1746,8 +1746,8 @@ <!-- Label for PIP action to Minimize the PIP [CHAR LIMIT=25] --> <string name="pip_phone_minimize">Minimize</string> - <!-- Label for PIP action to Dismiss the PIP --> - <string name="pip_phone_dismiss">Dismiss</string> + <!-- Label for PIP the drag to close zone [CHAR LIMIT=NONE]--> + <string name="pip_phone_close">Close</string> <!-- PIP section of the tuner. Non-translatable since it should not appear on production builds ever. --> @@ -1802,10 +1802,8 @@ <string name="notification_channel_alerts">Alerts</string> <!-- Title for the notification channel dedicated to screenshot progress. [CHAR LIMIT=NONE] --> <string name="notification_channel_screenshot">Screenshots</string> - <!-- Title for the notification channel for urgent security issues. [CHAR LIMIT=NONE] --> - <string name="notification_channel_security">Security</string> - <!-- Title for the notification channel containing multi-user status information. [CHAR LIMIT=NONE] --> - <string name="notification_channel_user_status">User status</string> + <!-- Title for the notification channel for miscellaneous notices. [CHAR LIMIT=NONE] --> + <string name="notification_channel_general">General Messages</string> <!-- Title for the notification channel for problems with storage (i.e. low disk). [CHAR LIMIT=NONE] --> <string name="notification_channel_storage">Storage</string> diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index b30b5968cd10..29a8da0d421c 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -76,7 +76,7 @@ public class BatteryMeterView extends ImageView implements mDrawable.setBatteryController(mBatteryController); mBatteryController.addCallback(this); mDrawable.startListening(); - TunerService.get(getContext()).addTunable(this, StatusBarIconController.ICON_BLACKLIST); + Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_BLACKLIST); } @Override @@ -84,7 +84,7 @@ public class BatteryMeterView extends ImageView implements super.onDetachedFromWindow(); mBatteryController.removeCallback(this); mDrawable.stopListening(); - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 135b12902a25..e1f3176d808e 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -14,6 +14,7 @@ package com.android.systemui; +import android.content.Context; import android.content.res.Configuration; import android.os.Handler; import android.os.HandlerThread; @@ -23,6 +24,7 @@ import android.util.ArrayMap; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.assist.AssistManager; +import com.android.systemui.plugins.PluginManager; import com.android.systemui.statusbar.phone.ManagedProfileController; import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl; import com.android.systemui.statusbar.policy.AccessibilityController; @@ -56,9 +58,11 @@ import com.android.systemui.statusbar.policy.UserInfoControllerImpl; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.policy.ZenModeController; import com.android.systemui.statusbar.policy.ZenModeControllerImpl; +import com.android.systemui.tuner.TunerService; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.util.HashMap; /** * Class to handle ugly dependencies throughout sysui until we determine the @@ -167,12 +171,18 @@ public class Dependency extends SystemUI { mProviders.put(DeviceProvisionedController.class.getName(), () -> new DeviceProvisionedControllerImpl(mContext)); + mProviders.put(PluginManager.class.getName(), () -> + new PluginManager(mContext)); + mProviders.put(AssistManager.class.getName(), () -> new AssistManager(getDependency(DeviceProvisionedController.class), mContext)); mProviders.put(SecurityController.class.getName(), () -> new SecurityControllerImpl(mContext)); + mProviders.put(TunerService.class.getName(), () -> + new TunerService(mContext)); + // Put all dependencies above here so the factory can override them if it wants. SystemUIFactory.getInstance().injectDependencies(mProviders, mContext); } @@ -220,6 +230,17 @@ public class Dependency extends SystemUI { T createDependency(); } + /** + * Used in separate processes (like tuner settings) to init the dependencies. + */ + public static void initDependencies(Context context) { + if (sDependency != null) return; + Dependency d = new Dependency(); + d.mContext = context.getApplicationContext(); + d.mComponents = new HashMap<>(); + d.start(); + } + public static <T> T get(Class<T> cls) { return sDependency.getDependency(cls.getName()); } diff --git a/packages/SystemUI/src/com/android/systemui/EventLogConstants.java b/packages/SystemUI/src/com/android/systemui/EventLogConstants.java index 9238928de9e2..def3c4072d2e 100644 --- a/packages/SystemUI/src/com/android/systemui/EventLogConstants.java +++ b/packages/SystemUI/src/com/android/systemui/EventLogConstants.java @@ -16,30 +16,46 @@ package com.android.systemui; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; + /** * Constants to be passed as sysui_* eventlog parameters. */ public class EventLogConstants { /** The user swiped up on the lockscreen, unlocking the device. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_UP_UNLOCK = 1; + private static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_UP_UNLOCK = 1; /** The user swiped down on the lockscreen, going to the full shade. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_FULL_SHADE = 2; + private static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_FULL_SHADE = 2; /** The user tapped in an empty area, causing the unlock hint to be shown. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_TAP_UNLOCK_HINT = 3; + private static final int SYSUI_LOCKSCREEN_GESTURE_TAP_UNLOCK_HINT = 3; /** The user swiped inward on the camera icon, launching the camera. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_CAMERA = 4; + private static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_CAMERA = 4; /** The user swiped inward on the dialer icon, launching the dialer. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_DIALER = 5; + private static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_DIALER = 5; /** The user tapped the lock, locking the device. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_TAP_LOCK = 6; + private static final int SYSUI_LOCKSCREEN_GESTURE_TAP_LOCK = 6; /** The user tapped a notification, needs to tap again to launch. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_TAP_NOTIFICATION_ACTIVATE = 7; + private static final int SYSUI_LOCKSCREEN_GESTURE_TAP_NOTIFICATION_ACTIVATE = 7; /** The user swiped down to open quick settings, from keyguard. */ - public static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_QS = 8; + private static final int SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_QS = 8; /** The user swiped down to open quick settings, from shade. */ - public static final int SYSUI_SHADE_GESTURE_SWIPE_DOWN_QS = 9; + private static final int SYSUI_SHADE_GESTURE_SWIPE_DOWN_QS = 9; /** The user tapped on the status bar to open quick settings, from shade. */ - public static final int SYSUI_TAP_TO_OPEN_QS = 10; + private static final int SYSUI_TAP_TO_OPEN_QS = 10; + + public static final int[] METRICS_GESTURE_TYPE_MAP = { + MetricsEvent.VIEW_UNKNOWN, // there is no type 0 + MetricsEvent.ACTION_LS_UNLOCK, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_UP_UNLOCK + MetricsEvent.ACTION_LS_SHADE, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_FULL_SHADE + MetricsEvent.ACTION_LS_HINT, // SYSUI_LOCKSCREEN_GESTURE_TAP_UNLOCK_HINT + MetricsEvent.ACTION_LS_CAMERA, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_CAMERA + MetricsEvent.ACTION_LS_DIALER, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_DIALER + MetricsEvent.ACTION_LS_LOCK, // SYSUI_LOCKSCREEN_GESTURE_TAP_LOCK + MetricsEvent.ACTION_LS_NOTE, // SYSUI_LOCKSCREEN_GESTURE_TAP_NOTIFICATION_ACTIVATE + MetricsEvent.ACTION_LS_QS, // SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_QS + MetricsEvent.ACTION_SHADE_QS_PULL, // SYSUI_SHADE_GESTURE_SWIPE_DOWN_QS + MetricsEvent.ACTION_SHADE_QS_TAP // SYSUI_TAP_TO_OPEN_QS + }; /** Secondary user tries binding to the system sysui service */ public static final int SYSUI_RECENTS_CONNECTION_USER_BIND_SERVICE = 1; diff --git a/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java b/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java index efddf206878e..9cc66138cfb4 100644 --- a/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java +++ b/packages/SystemUI/src/com/android/systemui/PluginInflateContainer.java @@ -76,7 +76,7 @@ public class PluginInflateContainer extends AutoReinflateContainer protected void onAttachedToWindow() { super.onAttachedToWindow(); if (mAction != null) { - PluginManager.getInstance(getContext()).addPluginListener(mAction, this, mVersion); + Dependency.get(PluginManager.class).addPluginListener(mAction, this, mVersion); } } @@ -84,7 +84,7 @@ public class PluginInflateContainer extends AutoReinflateContainer protected void onDetachedFromWindow() { super.onDetachedFromWindow(); if (mAction != null) { - PluginManager.getInstance(getContext()).removePluginListener(this); + Dependency.get(PluginManager.class).removePluginListener(this); } } diff --git a/packages/SystemUI/src/com/android/systemui/RecentsComponent.java b/packages/SystemUI/src/com/android/systemui/RecentsComponent.java index 94b2fdbf5ff8..9b74cd62d06b 100644 --- a/packages/SystemUI/src/com/android/systemui/RecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/RecentsComponent.java @@ -21,11 +21,10 @@ import android.view.Display; import android.view.View; public interface RecentsComponent { - void showRecents(boolean triggeredFromAltTab, boolean fromHome); - void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey); + void showRecentApps(boolean triggeredFromAltTab, boolean fromHome); + void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey); void toggleRecents(Display display); void preloadRecents(); - void cancelPreloadingRecents(); void showNextAffiliatedTask(); void showPrevAffiliatedTask(); diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index 9515585df84e..a9ac2d97903b 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -65,7 +65,6 @@ public class SystemUIApplication extends Application implements SysUiServiceProv private final Class<?>[] SERVICES = new Class[] { Dependency.class, FragmentService.class, - TunerService.class, NotificationChannels.class, CommandQueue.CommandQueueStart.class, KeyguardViewMediator.class, @@ -205,7 +204,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv mServices[i].onBootCompleted(); } } - PluginManager.getInstance(this).addPluginListener(OverlayPlugin.ACTION, + Dependency.get(PluginManager.class).addPluginListener(OverlayPlugin.ACTION, new PluginListener<OverlayPlugin>() { @Override public void onPluginConnected(OverlayPlugin plugin, Context pluginContext) { diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java index 828728f0ae9e..94dc9a344a34 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java @@ -19,6 +19,7 @@ package com.android.systemui.doze; import android.service.dreams.DreamService; import android.util.Log; +import com.android.systemui.Dependency; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginManager; import com.android.systemui.plugins.doze.DozeProvider; @@ -47,7 +48,7 @@ public class DozeService extends DreamService implements DozeMachine.Service { return; } - DozeProvider provider = PluginManager.getInstance(this) + DozeProvider provider = Dependency.get(PluginManager.class) .getOneShotPlugin(DozeProvider.ACTION, DozeProvider.VERSION); mDozeMachine = new DozeFactory(provider).assembleMachine(this); } diff --git a/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java b/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java index 2e6de4ac9e35..1eaca6ffd9db 100644 --- a/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java +++ b/packages/SystemUI/src/com/android/systemui/fragments/PluginFragmentListener.java @@ -19,6 +19,7 @@ import android.content.Context; import android.util.Log; import android.view.View; +import com.android.systemui.Dependency; import com.android.systemui.plugins.FragmentBase; import com.android.systemui.plugins.Plugin; import com.android.systemui.plugins.PluginListener; @@ -38,7 +39,7 @@ public class PluginFragmentListener implements PluginListener<Plugin> { Class<? extends FragmentBase> expectedInterface) { mTag = tag; mFragmentHostManager = FragmentHostManager.get(view); - mPluginManager = PluginManager.getInstance(view.getContext()); + mPluginManager = Dependency.get(PluginManager.class); mExpectedInterface = expectedInterface; mDefaultClass = defaultFragment; } diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java index a7ac719149f9..e1821761ba7a 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipDismissViewController.java @@ -17,13 +17,19 @@ package com.android.systemui.pip.phone; import android.content.Context; +import android.content.res.Resources; import android.graphics.PixelFormat; +import android.graphics.Point; +import android.graphics.PointF; import android.graphics.Rect; import android.view.Gravity; import android.view.LayoutInflater; +import android.view.TouchDelegate; import android.view.View; import android.view.View.OnLayoutChangeListener; import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; +import android.widget.FrameLayout; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -35,12 +41,22 @@ public class PipDismissViewController { private static final int SHOW_TARGET_DELAY = 100; private static final int SHOW_TARGET_DURATION = 200; + private static final float DISMISS_TEXT_MAX_SCALE = 2f; + private static final float DISMISS_GRADIENT_MIN_HEIGHT_PERCENT = 0.33f; + private static final float DISMISS_GRADIENT_MAX_HEIGHT_PERCENT = 0.5f; + private static final float DISMISS_THRESHOLD = 0.55f; + private Context mContext; private WindowManager mWindowManager; private View mDismissView; private Rect mDismissTargetScreenBounds = new Rect(); + private View mDismissContainer; + private View mGradientView; + private float mMinHeight; + private float mMaxHeight; + public PipDismissViewController(Context context) { mContext = context; mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); @@ -51,25 +67,37 @@ public class PipDismissViewController { */ public void createDismissTarget() { if (mDismissView == null) { + // Determine sizes for the gradient + Point windowSize = new Point(); + mWindowManager.getDefaultDisplay().getSize(windowSize); + mMinHeight = windowSize.y * DISMISS_GRADIENT_MIN_HEIGHT_PERCENT; + mMaxHeight = windowSize.y * DISMISS_GRADIENT_MAX_HEIGHT_PERCENT; + // Create a new view for the dismiss target - int dismissTargetSize = mContext.getResources().getDimensionPixelSize( - R.dimen.pip_dismiss_target_size); LayoutInflater inflater = LayoutInflater.from(mContext); mDismissView = inflater.inflate(R.layout.pip_dismiss_view, null); - mDismissView.addOnLayoutChangeListener(new OnLayoutChangeListener() { + mGradientView = mDismissView.findViewById(R.id.gradient_view); + FrameLayout.LayoutParams glp = (android.widget.FrameLayout.LayoutParams) mGradientView + .getLayoutParams(); + glp.height = (int) mMaxHeight; + mGradientView.setLayoutParams(glp); + mGradientView.setPivotY(windowSize.y); + mGradientView.setScaleY(mMaxHeight / mMinHeight); // Set to min height via scaling + mDismissContainer = mDismissView.findViewById(R.id.pip_dismiss_container); + mDismissContainer.addOnLayoutChangeListener(new OnLayoutChangeListener() { @Override public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) { - if (mDismissView != null) { - mDismissView.getBoundsOnScreen(mDismissTargetScreenBounds); + if (mDismissContainer != null) { + mDismissContainer.getBoundsOnScreen(mDismissTargetScreenBounds); } } }); // Add the target to the window WindowManager.LayoutParams lp = new WindowManager.LayoutParams( - dismissTargetSize, - dismissTargetSize, + windowSize.x, + (int) mMaxHeight, WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG, WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE @@ -84,7 +112,8 @@ public class PipDismissViewController { /** * Shows the dismiss target. */ - public void showDismissTarget() { + public void showDismissTarget(Rect pinnedStack) { + updateDismissTarget(pinnedStack); mDismissView.animate() .alpha(1f) .setInterpolator(Interpolators.LINEAR_OUT_SLOW_IN) @@ -115,10 +144,46 @@ public class PipDismissViewController { } /** + * Updates the appearance of the dismiss target based on how close the PIP is. + */ + public void updateDismissTarget(Rect pinnedStack) { + // As PIP moves over / away from delete target it grows / shrinks + final float scalePercent = calculateDistancePercent(pinnedStack); + final float newScale = 1 + (DISMISS_TEXT_MAX_SCALE - 1) * scalePercent; + final float minGradientScale = mMinHeight / mMaxHeight; + final float newHeight = Math.max(minGradientScale, scalePercent); + mGradientView.setScaleY(newHeight); + mDismissContainer.setScaleX(newScale); + mDismissContainer.setScaleY(newScale); + } + + /** + * @return the percentage of distance the PIP is away from the dismiss target point. + */ + private float calculateDistancePercent(Rect pinnedStack) { + final int distance = mDismissTargetScreenBounds.height(); + final int textX = mDismissTargetScreenBounds.centerX(); + final int textY = mDismissTargetScreenBounds.bottom; + final float pipCurrX = pinnedStack.centerX(); + final float pipCurrY = pinnedStack.bottom; + final float currentDistance = PointF.length(pipCurrX - textX, pipCurrY - textY); + if (currentDistance <= distance) { + return 1 - (currentDistance / distance); + } + return 0; + } + + /** * @return the dismiss target screen bounds. */ public Rect getDismissBounds() { return mDismissTargetScreenBounds; } + /** + * @return whether the PIP is positioned on the dismiss target enough to be dismissed. + */ + public boolean shouldDismiss(Rect pinnedStack) { + return calculateDistancePercent(pinnedStack) >= DISMISS_THRESHOLD; + } } diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java index 30aa03cb2ceb..10393c65f492 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java @@ -33,6 +33,7 @@ import android.content.Context; import android.graphics.Point; import android.graphics.PointF; import android.graphics.Rect; +import android.os.Handler; import android.os.Looper; import android.os.RemoteException; import android.util.Log; @@ -49,6 +50,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BackgroundThread; import com.android.internal.policy.PipMotionHelper; import com.android.internal.policy.PipSnapAlgorithm; +import com.android.systemui.Dependency; import com.android.systemui.statusbar.FlingAnimationUtils; import com.android.systemui.tuner.TunerService; @@ -71,6 +73,7 @@ public class PipTouchHandler implements TunerService.Tunable { private static final int DISMISS_STACK_DURATION = 375; private static final int EXPAND_STACK_DURATION = 225; private static final int MINIMIZE_STACK_MAX_DURATION = 200; + private static final int SHOW_DISMISS_AFFORDANCE_DELAY = 200; // The fraction of the stack width that the user has to drag offscreen to minimize the PIP private static final float MINIMIZE_OFFSCREEN_FRACTION = 0.2f; @@ -105,6 +108,16 @@ public class PipTouchHandler implements TunerService.Tunable { } }; + private Handler mHandler = new Handler(); + private Runnable mShowDismissAffordance = new Runnable() { + @Override + public void run() { + if (mEnableDragToDismiss) { + mDismissViewController.showDismissTarget(mPinnedStackBounds); + } + } + }; + // Behaviour states private boolean mIsTappingThrough; private boolean mIsMinimized; @@ -193,14 +206,14 @@ public class PipTouchHandler implements TunerService.Tunable { mTouchState = new PipTouchState(mViewConfig); mFlingAnimationUtils = new FlingAnimationUtils(context, 2f); mGestures = new PipTouchGesture[] { - mDragToDismissGesture, mDefaultMovementGesture + mDefaultMovementGesture }; mMotionHelper = new PipMotionHelper(BackgroundThread.getHandler()); registerInputConsumer(); setSnapToEdge(true); // Register any tuner settings changes - TunerService.get(context).addTunable(this, TUNER_KEY_DRAG_TO_DISMISS, + Dependency.get(TunerService.class).addTunable(this, TUNER_KEY_DRAG_TO_DISMISS, TUNER_KEY_ALLOW_MINIMIZE); } @@ -521,6 +534,9 @@ public class PipTouchHandler implements TunerService.Tunable { private void movePinnedStack(Rect bounds) { if (!bounds.equals(mPinnedStackBounds)) { mPinnedStackBounds.set(bounds); + if (mEnableDragToDismiss) { + mDismissViewController.updateDismissTarget(bounds); + } mMotionHelper.resizeToBounds(mPinnedStackBounds); } } @@ -563,57 +579,25 @@ public class PipTouchHandler implements TunerService.Tunable { } /** - * Gesture controlling dragging over a target to dismiss the PIP. + * Gesture controlling normal movement of the PIP. */ - private PipTouchGesture mDragToDismissGesture = new PipTouchGesture() { + private PipTouchGesture mDefaultMovementGesture = new PipTouchGesture() { + @Override public void onDown(PipTouchState touchState) { if (mEnableDragToDismiss) { - // TODO: Consider setting a timer such at after X time, we show the dismiss - // target if the user hasn't already dragged some distance mDismissViewController.createDismissTarget(); + mHandler.postDelayed(mShowDismissAffordance, SHOW_DISMISS_AFFORDANCE_DELAY); } } @Override boolean onMove(PipTouchState touchState) { - if (mEnableDragToDismiss && touchState.startedDragging()) { - mDismissViewController.showDismissTarget(); - } - return false; - } - - @Override - public boolean onUp(PipTouchState touchState) { - if (mEnableDragToDismiss) { - try { - if (touchState.isDragging()) { - Rect dismissBounds = mDismissViewController.getDismissBounds(); - PointF lastTouch = touchState.getLastTouchPosition(); - if (dismissBounds.contains((int) lastTouch.x, (int) lastTouch.y)) { - animateDismissPinnedStack(dismissBounds); - MetricsLogger.action(mContext, - MetricsEvent.ACTION_PICTURE_IN_PICTURE_DISMISSED, - METRIC_VALUE_DISMISSED_BY_DRAG); - return true; - } - } - } finally { - mDismissViewController.destroyDismissTarget(); - } + if (touchState.startedDragging() && mEnableDragToDismiss) { + mHandler.removeCallbacks(mShowDismissAffordance); + mDismissViewController.showDismissTarget(mPinnedStackBounds); } - return false; - } - }; - /**** Gestures ****/ - - /** - * Gesture controlling normal movement of the PIP. - */ - private PipTouchGesture mDefaultMovementGesture = new PipTouchGesture() { - @Override - boolean onMove(PipTouchState touchState) { if (touchState.isDragging()) { // Move the pinned stack freely PointF lastDelta = touchState.getLastTouchDelta(); @@ -635,6 +619,23 @@ public class PipTouchHandler implements TunerService.Tunable { @Override public boolean onUp(PipTouchState touchState) { + try { + if (mEnableDragToDismiss) { + mHandler.removeCallbacks(mShowDismissAffordance); + PointF vel = mTouchState.getVelocity(); + final float velocity = PointF.length(vel.x, vel.y); + if (touchState.isDragging() + && velocity < mFlingAnimationUtils.getMinVelocityPxPerSecond()) { + if (mDismissViewController.shouldDismiss(mPinnedStackBounds)) { + Rect dismissBounds = mDismissViewController.getDismissBounds(); + animateDismissPinnedStack(dismissBounds); + return true; + } + } + } + } finally { + mDismissViewController.destroyDismissTarget(); + } if (touchState.isDragging()) { PointF vel = mTouchState.getVelocity(); if (!mIsMinimized && (shouldMinimizedPinnedStack() diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 82ec69d8cf4e..09ce2ada11e0 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -145,16 +145,16 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { } private void showInvalidChargerNotification() { - final Notification.Builder nb = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_power_low) - .setWhen(0) - .setShowWhen(false) - .setOngoing(true) - .setContentTitle(mContext.getString(R.string.invalid_charger_title)) - .setContentText(mContext.getString(R.string.invalid_charger_text)) - .setChannel(NotificationChannels.ALERTS) - .setColor(mContext.getColor( - com.android.internal.R.color.system_notification_accent_color)); + final Notification.Builder nb = + new Notification.Builder(mContext, NotificationChannels.ALERTS) + .setSmallIcon(R.drawable.ic_power_low) + .setWhen(0) + .setShowWhen(false) + .setOngoing(true) + .setContentTitle(mContext.getString(R.string.invalid_charger_title)) + .setContentText(mContext.getString(R.string.invalid_charger_text)) + .setColor(mContext.getColor( + com.android.internal.R.color.system_notification_accent_color)); SystemUI.overrideNotificationAppName(mContext, nb); final Notification n = nb.build(); mNoMan.cancelAsUser(TAG_BATTERY, SystemMessage.NOTE_POWER_LOW, UserHandle.ALL); @@ -164,19 +164,19 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private void showWarningNotification() { final int textRes = R.string.battery_low_percent_format; final String percentage = NumberFormat.getPercentInstance().format((double) mBatteryLevel / 100.0); - final Notification.Builder nb = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_power_low) - // Bump the notification when the bucket dropped. - .setWhen(mBucketDroppedNegativeTimeMs) - .setShowWhen(false) - .setContentTitle(mContext.getString(R.string.battery_low_title)) - .setContentText(mContext.getString(textRes, percentage)) - .setOnlyAlertOnce(true) - .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_WARNING)) - .setChannel(NotificationChannels.ALERTS) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setColor(mContext.getColor( - com.android.internal.R.color.battery_saver_mode_color)); + final Notification.Builder nb = + new Notification.Builder(mContext, NotificationChannels.ALERTS) + .setSmallIcon(R.drawable.ic_power_low) + // Bump the notification when the bucket dropped. + .setWhen(mBucketDroppedNegativeTimeMs) + .setShowWhen(false) + .setContentTitle(mContext.getString(R.string.battery_low_title)) + .setContentText(mContext.getString(textRes, percentage)) + .setOnlyAlertOnce(true) + .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_WARNING)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setColor(mContext.getColor( + com.android.internal.R.color.battery_saver_mode_color)); if (hasBatterySettings()) { nb.setContentIntent(pendingBroadcast(ACTION_SHOW_BATTERY_SETTINGS)); } @@ -235,18 +235,18 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { return; } mTempWarning = true; - final Notification.Builder nb = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_device_thermostat_24) - .setWhen(0) - .setShowWhen(false) - .setContentTitle(mContext.getString(R.string.high_temp_title)) - .setContentText(mContext.getString(R.string.high_temp_notif_message)) - .setChannel(NotificationChannels.ALERTS) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setContentIntent(pendingBroadcast(ACTION_CLICKED_TEMP_WARNING)) - .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_TEMP_WARNING)) - .setColor(mContext.getColor( - com.android.internal.R.color.battery_saver_mode_color)); + final Notification.Builder nb = + new Notification.Builder(mContext, NotificationChannels.ALERTS) + .setSmallIcon(R.drawable.ic_device_thermostat_24) + .setWhen(0) + .setShowWhen(false) + .setContentTitle(mContext.getString(R.string.high_temp_title)) + .setContentText(mContext.getString(R.string.high_temp_notif_message)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setContentIntent(pendingBroadcast(ACTION_CLICKED_TEMP_WARNING)) + .setDeleteIntent(pendingBroadcast(ACTION_DISMISSED_TEMP_WARNING)) + .setColor(mContext.getColor( + com.android.internal.R.color.battery_saver_mode_color)); SystemUI.overrideNotificationAppName(mContext, nb); final Notification n = nb.build(); mNoMan.notifyAsUser(TAG_TEMPERATURE, SystemMessage.NOTE_HIGH_TEMP, n, UserHandle.ALL); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java index 615063ccd0fc..c85f83ba3588 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java @@ -20,6 +20,7 @@ import android.view.View.OnAttachStateChangeListener; import android.view.View.OnLayoutChangeListener; import android.widget.TextView; +import com.android.systemui.Dependency; import com.android.systemui.plugins.qs.QS; import com.android.systemui.qs.PagedTileLayout.PageListener; import com.android.systemui.qs.QSPanel.QSTileLayout; @@ -105,7 +106,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha @Override public void onViewAttachedToWindow(View v) { - TunerService.get(mQs.getContext()).addTunable(this, ALLOW_FANCY_ANIMATION, + Dependency.get(TunerService.class).addTunable(this, ALLOW_FANCY_ANIMATION, MOVE_FULL_ROWS, QuickQSPanel.NUM_QUICK_TILES); } @@ -114,7 +115,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha if (mHost != null) { mHost.removeCallback(this); } - TunerService.get(mQs.getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java index c8f167063add..95e0301f81c7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java @@ -74,8 +74,14 @@ public class QSFragment extends Fragment implements QS { mContainer = (QSContainerImpl) view; mQSDetail.setQsPanel(mQSPanel, mHeader); - mQSAnimator = new QSAnimator(this, (QuickQSPanel) mHeader.findViewById(R.id.quick_qs_panel), - mQSPanel); + + // If the quick settings row is not shown, then there is no need for the animation from + // the row to the full QS panel. + if (getResources().getBoolean(R.bool.config_showQuickSettingsRow)) { + mQSAnimator = new QSAnimator(this, + (QuickQSPanel) mHeader.findViewById(R.id.quick_qs_panel), mQSPanel); + } + mQSCustomizer = (QSCustomizer) view.findViewById(R.id.qs_customize); mQSCustomizer.setQs(this); } @@ -89,7 +95,10 @@ public class QSFragment extends Fragment implements QS { super.onConfigurationChanged(newConfig); if (newConfig.getLayoutDirection() != mLayoutDirection) { mLayoutDirection = newConfig.getLayoutDirection(); - mQSAnimator.onRtlChanged(); + + if (mQSAnimator != null) { + mQSAnimator.onRtlChanged(); + } } } @@ -108,7 +117,10 @@ public class QSFragment extends Fragment implements QS { mQSPanel.setHost(qsh, mQSCustomizer); mHeader.setQSPanel(mQSPanel); mQSDetail.setHost(qsh); - mQSAnimator.setHost(qsh); + + if (mQSAnimator != null) { + mQSAnimator.setHost(qsh); + } } private void updateQsState() { @@ -155,7 +167,11 @@ public class QSFragment extends Fragment implements QS { public void setKeyguardShowing(boolean keyguardShowing) { if (DEBUG) Log.d(TAG, "setKeyguardShowing " + keyguardShowing); mKeyguardShowing = keyguardShowing; - mQSAnimator.setOnKeyguard(keyguardShowing); + + if (mQSAnimator != null) { + mQSAnimator.setOnKeyguard(keyguardShowing); + } + updateQsState(); } @@ -187,7 +203,10 @@ public class QSFragment extends Fragment implements QS { mHeader.setExpansion(mKeyguardShowing ? 1 : expansion); mQSPanel.setTranslationY(translationScaleY * mQSPanel.getHeight()); mQSDetail.setFullyExpanded(expansion == 1); - mQSAnimator.setPosition(expansion); + + if (mQSAnimator != null) { + mQSAnimator.setPosition(expansion); + } // Set bounds on the QS panel so it doesn't run over the header. mQsBounds.top = (int) (mQSPanel.getHeight() * (1 - expansion)); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index e0048284f669..504678c7f1c5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -29,6 +29,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.qs.QS; import com.android.systemui.plugins.qs.QS.DetailAdapter; @@ -126,7 +127,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - TunerService.get(mContext).addTunable(this, QS_SHOW_BRIGHTNESS); + Dependency.get(TunerService.class).addTunable(this, QS_SHOW_BRIGHTNESS); if (mHost != null) { setTiles(mHost.getTiles()); } @@ -134,8 +135,10 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { @Override protected void onDetachedFromWindow() { - TunerService.get(mContext).removeTunable(this); - mHost.removeCallback(this); + Dependency.get(TunerService.class).removeTunable(this); + if (mHost != null) { + mHost.removeCallback(this); + } for (TileRecord record : mRecords) { record.tile.removeCallbacks(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index 16b351e5b701..d789b446c253 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -24,6 +24,7 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.Space; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.qs.QSTile.SignalState; import com.android.systemui.qs.QSTile.State; @@ -62,13 +63,13 @@ public class QuickQSPanel extends QSPanel { @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - TunerService.get(mContext).addTunable(mNumTiles, NUM_QUICK_TILES); + Dependency.get(TunerService.class).addTunable(mNumTiles, NUM_QUICK_TILES); } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - TunerService.get(mContext).removeTunable(mNumTiles); + Dependency.get(TunerService.class).removeTunable(mNumTiles); } public void setQSPanelAndHeader(QSPanel fullPanel, View header) { @@ -141,7 +142,7 @@ public class QuickQSPanel extends QSPanel { }; public int getNumQuickTiles(Context context) { - return TunerService.get(context).getValue(NUM_QUICK_TILES, 6); + return Dependency.get(TunerService.class).getValue(NUM_QUICK_TILES, 6); } private static class HeaderTileLayout extends LinearLayout implements QSTileLayout { diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index 8d18a75e6bdf..9157e3377dd9 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -16,6 +16,8 @@ package com.android.systemui.recents; +import static com.android.systemui.statusbar.phone.StatusBar.SYSTEM_DIALOG_REASON_RECENT_APPS; + import android.app.ActivityManager; import android.app.UiModeManager; import android.content.ComponentName; @@ -38,6 +40,7 @@ import android.provider.Settings; import android.util.EventLog; import android.util.Log; import android.view.Display; +import android.view.WindowManager; import android.widget.Toast; import com.android.internal.logging.MetricsLogger; @@ -59,6 +62,7 @@ import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.model.RecentsTaskLoader; import com.android.systemui.recents.tv.RecentsTvImpl; import com.android.systemui.stackdivider.Divider; +import com.android.systemui.statusbar.CommandQueue; import java.util.ArrayList; import java.util.HashSet; @@ -70,7 +74,7 @@ import java.util.Set; * users. */ public class Recents extends SystemUI - implements RecentsComponent { + implements RecentsComponent, CommandQueue.Callbacks { private final static String TAG = "Recents"; private final static boolean DEBUG = false; @@ -201,6 +205,7 @@ public class Recents extends SystemUI sTaskLoader = new RecentsTaskLoader(mContext); sConfiguration = new RecentsConfiguration(mContext); mHandler = new Handler(); + getComponent(CommandQueue.class).addCallbacks(this); UiModeManager uiModeManager = (UiModeManager) mContext. getSystemService(Context.UI_MODE_SERVICE); if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) { @@ -247,7 +252,7 @@ public class Recents extends SystemUI * Shows the Recents. */ @Override - public void showRecents(boolean triggeredFromAltTab, boolean fromHome) { + public void showRecentApps(boolean triggeredFromAltTab, boolean fromHome) { // Ensure the device has been provisioned before allowing the user to interact with // recents if (!isUserSetup()) { @@ -257,6 +262,10 @@ public class Recents extends SystemUI if (proxyToOverridePackage(ACTION_SHOW_RECENTS)) { return; } + try { + ActivityManager.getService().closeSystemDialogs(SYSTEM_DIALOG_REASON_RECENT_APPS); + } catch (RemoteException e) { + } int recentsGrowTarget = getComponent(Divider.class).getView().growsRecents(); @@ -287,7 +296,7 @@ public class Recents extends SystemUI * Hides the Recents. */ @Override - public void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { + public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { // Ensure the device has been provisioned before allowing the user to interact with // recents if (!isUserSetup()) { @@ -318,6 +327,11 @@ public class Recents extends SystemUI } } + @Override + public void toggleRecentApps() { + toggleRecents(mContext.getSystemService(WindowManager.class).getDefaultDisplay()); + } + /** * Toggles the Recents activity. */ @@ -387,7 +401,7 @@ public class Recents extends SystemUI } @Override - public void cancelPreloadingRecents() { + public void cancelPreloadRecentApps() { // Ensure the device has been provisioned before allowing the user to interact with // recents if (!isUserSetup()) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 9a8b267037d2..609e3fbc78ff 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -53,6 +53,7 @@ import com.android.systemui.recents.events.activity.DockedTopTaskEvent; import com.android.systemui.recents.events.activity.EnterRecentsWindowLastAnimationFrameEvent; import com.android.systemui.recents.events.activity.HideRecentsEvent; import com.android.systemui.recents.events.activity.IterateRecentsEvent; +import com.android.systemui.recents.events.activity.LaunchMostRecentTaskRequestEvent; import com.android.systemui.recents.events.activity.LaunchNextTaskRequestEvent; import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; import com.android.systemui.recents.events.activity.ToggleRecentsEvent; @@ -311,15 +312,23 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener RecentsConfiguration config = Recents.getConfiguration(); RecentsActivityLaunchState launchState = config.getLaunchState(); if (!launchState.launchedWithAltTab) { - // If the user taps quickly - if (!debugFlags.isPagingEnabled() || - (ViewConfiguration.getDoubleTapMinTime() < elapsedTime && - elapsedTime < ViewConfiguration.getDoubleTapTimeout())) { - // Launch the next focused task - EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); + // Has the user tapped quickly? + boolean isQuickTap = ViewConfiguration.getDoubleTapMinTime() < elapsedTime && + elapsedTime < ViewConfiguration.getDoubleTapTimeout(); + if (Recents.getConfiguration().isGridEnabled) { + if (isQuickTap) { + EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); + } else { + EventBus.getDefault().post(new LaunchMostRecentTaskRequestEvent()); + } } else { - // Notify recents to move onto the next task - EventBus.getDefault().post(new IterateRecentsEvent()); + if (!debugFlags.isPagingEnabled() || isQuickTap) { + // Launch the next focused task + EventBus.getDefault().post(new LaunchNextTaskRequestEvent()); + } else { + // Notify recents to move onto the next task + EventBus.getDefault().post(new IterateRecentsEvent()); + } } } else { // If the user has toggled it too quickly, then just eat up the event here (it's @@ -743,11 +752,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener Task toTask = new Task(); TaskViewTransform toTransform = getThumbnailTransitionTransform(stackView, toTask, windowOverrideRect); - // When using a grid layout, the header is already visible on screen at the target - // location, making it unnecessary to draw it in the transition thumbnail. - Bitmap thumbnail = stackView.useGridLayout() - ? mThumbTransitionBitmapCache.createAshmemBitmap() - : drawThumbnailTransitionBitmap(toTask, toTransform, + Bitmap thumbnail = drawThumbnailTransitionBitmap(toTask, toTransform, mThumbTransitionBitmapCache); if (thumbnail != null) { RectF toTaskRect = toTransform.rect; diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchMostRecentTaskRequestEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchMostRecentTaskRequestEvent.java new file mode 100644 index 000000000000..24913a4c2ca6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/events/activity/LaunchMostRecentTaskRequestEvent.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.recents.events.activity; + +import com.android.systemui.recents.events.EventBus; + +/** + * This event is sent to request that the most recent task is launched. + */ +public class LaunchMostRecentTaskRequestEvent extends EventBus.Event { + // Simple event +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java index a2ee4c565ff8..f1314aba1b46 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java @@ -619,7 +619,7 @@ public class TaskStackAnimationHelper { postAnimationTrigger.addLastDecrementRunnable(() -> { mStackView.getTouchHandler().onChildDismissed(deleteTaskView); }); - deleteTaskView.animate().setDuration(300).scaleX(0).scaleY(0).alpha(0).setListener( + deleteTaskView.animate().setDuration(300).scaleX(0.9f).scaleY(0.9f).alpha(0).setListener( new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 8ae7a838e7f3..fb94c7e785f0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -64,6 +64,7 @@ import com.android.systemui.recents.events.activity.EnterRecentsWindowAnimationC import com.android.systemui.recents.events.activity.HideRecentsEvent; import com.android.systemui.recents.events.activity.HideStackActionButtonEvent; import com.android.systemui.recents.events.activity.IterateRecentsEvent; +import com.android.systemui.recents.events.activity.LaunchMostRecentTaskRequestEvent; import com.android.systemui.recents.events.activity.LaunchNextTaskRequestEvent; import com.android.systemui.recents.events.activity.LaunchTaskEvent; import com.android.systemui.recents.events.activity.LaunchTaskStartedEvent; @@ -1733,6 +1734,13 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mUIDozeTrigger.stopDozing(); } + public final void onBusEvent(LaunchMostRecentTaskRequestEvent event) { + if (mStack.getTaskCount() > 0) { + Task mostRecentTask = mStack.getStackFrontMostTask(true /* includeFreefromTasks */); + launchTask(mostRecentTask); + } + } + public final void onBusEvent(LaunchNextTaskRequestEvent event) { if (mAwaitingFirstLayout) { mLaunchNextAfterFirstMeasure = true; @@ -1741,29 +1749,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal final Task launchTask = mStack.getNextLaunchTarget(); if (launchTask != null) { - // Stop all animations - cancelAllTaskViewAnimations(); - - float curScroll = mStackScroller.getStackScroll(); - float targetScroll = mLayoutAlgorithm.getStackScrollForTaskAtInitialOffset(launchTask); - float absScrollDiff = Math.abs(targetScroll - curScroll); - if (getChildViewForTask(launchTask) == null || absScrollDiff > 0.35f) { - int duration = (int) (LAUNCH_NEXT_SCROLL_BASE_DURATION + - absScrollDiff * LAUNCH_NEXT_SCROLL_INCR_DURATION); - mStackScroller.animateScroll(targetScroll, - duration, new Runnable() { - @Override - public void run() { - EventBus.getDefault().send(new LaunchTaskEvent( - getChildViewForTask(launchTask), launchTask, null, - INVALID_STACK_ID, false /* screenPinningRequested */)); - } - }); - } else { - EventBus.getDefault().send(new LaunchTaskEvent(getChildViewForTask(launchTask), - launchTask, null, INVALID_STACK_ID, false /* screenPinningRequested */)); - } - + launchTask(launchTask); MetricsLogger.action(getContext(), MetricsEvent.OVERVIEW_LAUNCH_PREVIOUS_TASK, launchTask.key.getComponent().toString()); } else if (mStack.getTaskCount() == 0) { @@ -2215,6 +2201,31 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal return -1; } + private void launchTask(Task task) { + // Stop all animations + cancelAllTaskViewAnimations(); + + float curScroll = mStackScroller.getStackScroll(); + float targetScroll = mLayoutAlgorithm.getStackScrollForTaskAtInitialOffset(task); + float absScrollDiff = Math.abs(targetScroll - curScroll); + if (getChildViewForTask(task) == null || absScrollDiff > 0.35f) { + int duration = (int) (LAUNCH_NEXT_SCROLL_BASE_DURATION + + absScrollDiff * LAUNCH_NEXT_SCROLL_INCR_DURATION); + mStackScroller.animateScroll(targetScroll, + duration, new Runnable() { + @Override + public void run() { + EventBus.getDefault().send(new LaunchTaskEvent( + getChildViewForTask(task), task, null, + INVALID_STACK_ID, false /* screenPinningRequested */)); + } + }); + } else { + EventBus.getDefault().send(new LaunchTaskEvent(getChildViewForTask(task), + task, null, INVALID_STACK_ID, false /* screenPinningRequested */)); + } + } + /** * Check whether we should use the grid layout. */ diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java index 7135cafc6bdf..9a4b45a7b0ab 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java @@ -178,20 +178,19 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { .bigPicture(picture.createAshmemBitmap()); // The public notification will show similar info but with the actual screenshot omitted - mPublicNotificationBuilder = new Notification.Builder(context) - .setChannel(NotificationChannels.SCREENSHOTS) - .setContentTitle(r.getString(R.string.screenshot_saving_title)) - .setContentText(r.getString(R.string.screenshot_saving_text)) - .setSmallIcon(R.drawable.stat_notify_image) - .setCategory(Notification.CATEGORY_PROGRESS) - .setWhen(now) - .setShowWhen(true) - .setColor(r.getColor( - com.android.internal.R.color.system_notification_accent_color)); + mPublicNotificationBuilder = + new Notification.Builder(context, NotificationChannels.SCREENSHOTS) + .setContentTitle(r.getString(R.string.screenshot_saving_title)) + .setContentText(r.getString(R.string.screenshot_saving_text)) + .setSmallIcon(R.drawable.stat_notify_image) + .setCategory(Notification.CATEGORY_PROGRESS) + .setWhen(now) + .setShowWhen(true) + .setColor(r.getColor( + com.android.internal.R.color.system_notification_accent_color)); SystemUI.overrideNotificationAppName(context, mPublicNotificationBuilder); - mNotificationBuilder = new Notification.Builder(context) - .setChannel(NotificationChannels.SCREENSHOTS) + mNotificationBuilder = new Notification.Builder(context, NotificationChannels.SCREENSHOTS) .setTicker(r.getString(R.string.screenshot_saving_ticker) + (mTickerAddSpace ? " " : "")) .setContentTitle(r.getString(R.string.screenshot_saving_title)) @@ -335,7 +334,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { // Update the text and the icon for the existing notification mPublicNotificationBuilder - .setChannel(NotificationChannels.SCREENSHOTS) .setContentTitle(r.getString(R.string.screenshot_saved_title)) .setContentText(r.getString(R.string.screenshot_saved_text)) .setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent, 0)) @@ -344,7 +342,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { .setColor(context.getColor( com.android.internal.R.color.system_notification_accent_color)); mNotificationBuilder - .setChannel(NotificationChannels.SCREENSHOTS) .setContentTitle(r.getString(R.string.screenshot_saved_title)) .setContentText(r.getString(R.string.screenshot_saved_text)) .setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent, 0)) @@ -858,7 +855,7 @@ class GlobalScreenshot { String errorMsg = r.getString(msgResId); // Repurpose the existing notification to notify the user of the error - Notification.Builder b = new Notification.Builder(context) + Notification.Builder b = new Notification.Builder(context, NotificationChannels.ALERTS) .setTicker(r.getString(R.string.screenshot_failed_title)) .setContentTitle(r.getString(R.string.screenshot_failed_title)) .setContentText(errorMsg) diff --git a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java index 19eefec2ad8b..7699bb90e611 100644 --- a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java @@ -107,7 +107,7 @@ public class ShortcutKeyDispatcher extends SystemUI List<ActivityManager.RecentTaskInfo> taskList = SystemServicesProxy.getInstance(mContext).getRecentTasks(1, UserHandle.USER_CURRENT, false, new ArraySet<>()); - recents.showRecents( + recents.showRecentApps( false /* triggeredFromAltTab */, false /* fromHome */); if (!taskList.isEmpty()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index d1245b133962..f19d6d7f65ac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -77,6 +77,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { private int mMaxHeadsUpHeightLegacy; private int mMaxHeadsUpHeight; private int mNotificationMinHeight; + private int mNotificationMinHeightLarge; private int mNotificationMaxHeight; private int mNotificationAmbientHeight; private int mIncreasedPaddingBetweenElements; @@ -207,6 +208,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { private Runnable mOnDismissRunnable; private boolean mIsLowPriority; private boolean mIsColorized; + private boolean mUseIncreasedCollapsedHeight; @Override public boolean isGroupExpansionChanging() { @@ -341,8 +343,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { boolean customView = layout.getContractedChild().getId() != com.android.internal.R.id.status_bar_latest_event_content; boolean beforeN = mEntry.targetSdk < Build.VERSION_CODES.N; - int minHeight = customView && beforeN && !mIsSummaryWithChildren ? - mNotificationMinHeightLegacy : mNotificationMinHeight; + int minHeight; + if (customView && beforeN && !mIsSummaryWithChildren) { + minHeight = mNotificationMinHeightLegacy; + } else if (mUseIncreasedCollapsedHeight && layout == mPrivateLayout) { + minHeight = mNotificationMinHeightLarge; + } else { + minHeight = mNotificationMinHeight; + } boolean headsUpCustom = layout.getHeadsUpChild() != null && layout.getHeadsUpChild().getId() != com.android.internal.R.id.status_bar_latest_event_content; @@ -979,6 +987,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { } } + public void setUseIncreasedCollapsedHeight(boolean use) { + mUseIncreasedCollapsedHeight = use; + } + public interface ExpansionLogger { public void logNotificationExpansion(String key, boolean userAction, boolean expanded); } @@ -992,6 +1004,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { private void initDimens() { mNotificationMinHeightLegacy = getFontScaledHeight(R.dimen.notification_min_height_legacy); mNotificationMinHeight = getFontScaledHeight(R.dimen.notification_min_height); + mNotificationMinHeightLarge = getFontScaledHeight( + R.dimen.notification_min_height_large); mNotificationMaxHeight = getFontScaledHeight(R.dimen.notification_max_height); mNotificationAmbientHeight = getFontScaledHeight(R.dimen.notification_ambient_height); mMaxHeadsUpHeightLegacy = getFontScaledHeight( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index e0ddf13d685b..57d2e1c84115 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java @@ -505,7 +505,8 @@ public class NotificationContentView extends FrameLayout { isTransitioningFromTo(VISIBLE_TYPE_HEADSUP, VISIBLE_TYPE_EXPANDED) || isTransitioningFromTo(VISIBLE_TYPE_EXPANDED, VISIBLE_TYPE_HEADSUP); boolean pinned = !isVisibleOrTransitioning(VISIBLE_TYPE_CONTRACTED) - && (mIsHeadsUp || mHeadsUpAnimatingAway); + && (mIsHeadsUp || mHeadsUpAnimatingAway) + && !mContainingNotification.isOnKeyguard(); if (transitioningBetweenHunAndExpanded || pinned) { return Math.min(mHeadsUpChild.getHeight(), mExpandedChild.getHeight()); } @@ -611,7 +612,7 @@ public class NotificationContentView extends FrameLayout { public int getMaxHeight() { if (mExpandedChild != null) { return mExpandedChild.getHeight(); - } else if (mIsHeadsUp && mHeadsUpChild != null) { + } else if (mIsHeadsUp && mHeadsUpChild != null && !mContainingNotification.isOnKeyguard()) { return mHeadsUpChild.getHeight(); } return mContractedChild.getHeight(); @@ -921,7 +922,8 @@ public class NotificationContentView extends FrameLayout { return VISIBLE_TYPE_SINGLELINE; } - if ((mIsHeadsUp || mHeadsUpAnimatingAway) && mHeadsUpChild != null) { + if ((mIsHeadsUp || mHeadsUpAnimatingAway) && mHeadsUpChild != null + && !mContainingNotification.isOnKeyguard()) { if (viewHeight <= mHeadsUpChild.getHeight() || noExpandedChild) { return VISIBLE_TYPE_HEADSUP; } else { @@ -1174,7 +1176,7 @@ public class NotificationContentView extends FrameLayout { mExpandable = expandable; // if the expanded child has the same height as the collapsed one we hide it. if (mExpandedChild != null && mExpandedChild.getHeight() != 0) { - if ((!mIsHeadsUp || mHeadsUpChild == null)) { + if (!mIsHeadsUp || mHeadsUpChild == null || mContainingNotification.isOnKeyguard()) { if (mExpandedChild.getHeight() == mContractedChild.getHeight()) { expandable = false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java index b49ba0cde753..f73a5ea04ae4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java @@ -126,13 +126,13 @@ public class NotificationData { } public boolean cacheContentViews(Context ctx, Notification updatedNotification, - boolean isLowPriority) { + boolean isLowPriority, boolean useIncreasedCollapsedView) { boolean applyInPlace = false; if (updatedNotification != null) { final Notification.Builder updatedNotificationBuilder = Notification.Builder.recoverBuilder(ctx, updatedNotification); final RemoteViews newContentView = createContentView(updatedNotificationBuilder, - isLowPriority); + isLowPriority, useIncreasedCollapsedView); final RemoteViews newBigContentView = createBigContentView( updatedNotificationBuilder, isLowPriority); final RemoteViews newHeadsUpContentView = @@ -162,7 +162,8 @@ public class NotificationData { final Notification.Builder builder = Notification.Builder.recoverBuilder(ctx, notification.getNotification()); - cachedContentView = createContentView(builder, isLowPriority); + cachedContentView = createContentView(builder, isLowPriority, + useIncreasedCollapsedView); cachedBigContentView = createBigContentView(builder, isLowPriority); cachedHeadsUpContentView = builder.createHeadsUpContentView(); cachedPublicContentView = builder.makePublicContentView(); @@ -188,11 +189,11 @@ public class NotificationData { } private RemoteViews createContentView(Notification.Builder builder, - boolean isAmbient) { - if (isAmbient) { + boolean isLowPriority, boolean useLarge) { + if (isLowPriority) { return builder.makeLowPriorityContentView(false /* useRegularSubtext */); } - return builder.createContentView(); + return builder.createContentView(useLarge); } // Returns true if the RemoteViews are the same. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java index fad63dd4f700..355022f9794c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java @@ -30,6 +30,7 @@ import android.widget.FrameLayout; import java.util.ArrayList; +import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.plugins.PluginListener; @@ -82,10 +83,21 @@ public class NotificationMenuRow extends FrameLayout public NotificationMenuRow(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs); - PluginManager.getInstance(getContext()).addPluginListener( + mMenuItems.addAll(getDefaultNotificationMenuItems()); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + Dependency.get(PluginManager.class).addPluginListener( NotificationMenuRowProvider.ACTION, this, NotificationMenuRowProvider.VERSION, false /* Allow multiple */); - mMenuItems.addAll(getDefaultNotificationMenuItems()); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + Dependency.get(PluginManager.class).removePluginListener(this); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java index dba7130793ca..f9d0cd61f037 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -29,6 +30,7 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; +import com.android.systemui.R; /** * A view which can draw a scrim @@ -73,6 +75,14 @@ public class ScrimView extends View public ScrimView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); + + TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.ScrimView); + + try { + mScrimColor = ta.getColor(R.styleable.ScrimView_scrimColor, Color.BLACK); + } finally { + ta.recycle(); + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 9a76ad650829..45eb5df43a06 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -220,7 +220,7 @@ public class SignalClusterView int endPadding = mMobileSignalGroup.getChildCount() > 0 ? mMobileSignalGroupEndPadding : 0; mMobileSignalGroup.setPaddingRelative(0, 0, endPadding, 0); - TunerService.get(mContext).addTunable(this, StatusBarIconController.ICON_BLACKLIST); + Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_BLACKLIST); apply(); applyIconTint(); @@ -231,7 +231,7 @@ public class SignalClusterView @Override protected void onDetachedFromWindow() { mMobileSignalGroup.removeAllViews(); - TunerService.get(mContext).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); mSecurityController.removeCallback(this); mNetworkController.removeCallback(this); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java index 3bbda4be9fd1..7e08d5605f40 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarController.java @@ -24,24 +24,22 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.support.v4.util.SimpleArrayMap; +import android.text.TextUtils; import android.util.Log; import android.util.SparseBooleanArray; import android.view.View; import android.widget.LinearLayout; - import com.android.systemui.R; -import com.android.systemui.ActivityStarter; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** * A controller to populate data for CarNavigationBarView and handle user interactions. - * <p/> - * Each button inside the navigation bar is defined by data in arrays_car.xml. OEMs can customize - * the navigation buttons by updating arrays_car.xml appropriately in an overlay. + * + * <p>Each button inside the navigation bar is defined by data in arrays_car.xml. OEMs can + * customize the navigation buttons by updating arrays_car.xml appropriately in an overlay. */ class CarNavigationBarController { private static final String TAG = "CarNavBarController"; @@ -51,48 +49,49 @@ class CarNavigationBarController { private static final String EXTRA_FACET_ID = "filter_id"; private static final String EXTRA_FACET_LAUNCH_PICKER = "launch_picker"; - // Each facet of the navigation bar maps to a set of package names or categories defined in - // arrays_car.xml. Package names for a given facet are delimited by ";" - private static final String FACET_FILTER_DEMILITER = ";"; + /** + * Each facet of the navigation bar maps to a set of package names or categories defined in + * arrays_car.xml. Package names for a given facet are delimited by ";". + */ + private static final String FACET_FILTER_DELIMITER = ";"; + + private final Context mContext; + private final CarNavigationBarView mNavBar; + private final CarStatusBar mStatusBar; - private Context mContext; - private CarNavigationBarView mNavBar; - private CarStatusBar mStatusBar; + /** + * Set of categories each facet will filter on. + */ + private final List<String[]> mFacetCategories = new ArrayList<>(); - // Set of categories each facet will filter on. - private List<String[]> mFacetCategories = new ArrayList<String[]>(); - // Set of package names each facet will filter on. - private List<String[]> mFacetPackages = new ArrayList<String[]>(); + /** + * Set of package names each facet will filter on. + */ + private final List<String[]> mFacetPackages = new ArrayList<>(); - private SimpleArrayMap<String, Integer> mFacetCategoryMap - = new SimpleArrayMap<String, Integer>(); - private SimpleArrayMap<String, Integer> mFacetPackageMap - = new SimpleArrayMap<String, Integer>(); + private final SimpleArrayMap<String, Integer> mFacetCategoryMap = new SimpleArrayMap<>(); + private final SimpleArrayMap<String, Integer> mFacetPackageMap = new SimpleArrayMap<>(); - private List<Intent> mIntents; - private List<Intent> mLongPressIntents; + private final List<CarNavigationButton> mNavButtons = new ArrayList<>(); - private List<CarNavigationButton> mNavButtons = new ArrayList<CarNavigationButton>(); + private final SparseBooleanArray mFacetHasMultipleAppsCache = new SparseBooleanArray(); private int mCurrentFacetIndex; - private SparseBooleanArray mFacetHasMultipleAppsCache = new SparseBooleanArray(); - private Intent mPersistentTaskIntent; - public CarNavigationBarController(Context context, - CarNavigationBarView navBar, - CarStatusBar activityStarter) { + public CarNavigationBarController(Context context, CarNavigationBarView navBar, + CarStatusBar activityStarter) { mContext = context; mNavBar = navBar; mStatusBar = activityStarter; bind(); if (context.getResources().getBoolean(R.bool.config_enablePersistentDockedActivity)) { - setupPersistentDockedTask(context); + setupPersistentDockedTask(); } } - private void setupPersistentDockedTask(Context context) { + private void setupPersistentDockedTask() { try { mPersistentTaskIntent = Intent.parseUri( mContext.getString(R.string.config_persistentDockedActivityIntentUri), @@ -137,64 +136,85 @@ class CarNavigationBarController { } } + /** + * Iterates through the items in arrays_car.xml and sets up the facet bar buttons to + * perform the task in that configuration file when clicked or long-pressed. + */ private void bind() { - // Read up arrays_car.xml and populate the navigation bar here. - Resources r = mContext.getResources(); - TypedArray icons = r.obtainTypedArray(R.array.car_facet_icons); - TypedArray intents = r.obtainTypedArray(R.array.car_facet_intent_uris); - TypedArray longpressIntents = - r.obtainTypedArray(R.array.car_facet_longpress_intent_uris); - TypedArray facetPackageNames = r.obtainTypedArray(R.array.car_facet_package_filters); - - TypedArray facetCategories = r.obtainTypedArray(R.array.car_facet_category_filters); - - if (icons.length() != intents.length() - || icons.length() != longpressIntents.length() - || icons.length() != facetPackageNames.length() - || icons.length() != facetCategories.length()) { - throw new RuntimeException("car_facet array lengths do not match"); - } + Resources res = mContext.getResources(); - mIntents = createEmptyIntentList(icons.length()); - mLongPressIntents = createEmptyIntentList(icons.length()); + TypedArray icons = res.obtainTypedArray(R.array.car_facet_icons); + TypedArray intents = res.obtainTypedArray(R.array.car_facet_intent_uris); + TypedArray longPressIntents = res.obtainTypedArray(R.array.car_facet_longpress_intent_uris); + TypedArray facetPackageNames = res.obtainTypedArray(R.array.car_facet_package_filters); + TypedArray facetCategories = res.obtainTypedArray(R.array.car_facet_category_filters); - for (int i = 0; i < icons.length(); i++) { - Drawable icon = icons.getDrawable(i); - try { - mIntents.set(i, - Intent.parseUri(intents.getString(i), Intent.URI_INTENT_SCHEME)); + try { + if (icons.length() != intents.length() + || icons.length() != longPressIntents.length() + || icons.length() != facetPackageNames.length() + || icons.length() != facetCategories.length()) { + throw new RuntimeException("car_facet array lengths do not match"); + } - String longpressUri = longpressIntents.getString(i); - boolean hasLongpress = !longpressUri.isEmpty(); - if (hasLongpress) { - mLongPressIntents.set(i, - Intent.parseUri(longpressUri, Intent.URI_INTENT_SCHEME)); - } + for (int i = 0, size = icons.length(); i < size; i++) { + Drawable icon = icons.getDrawable(i); + CarNavigationButton button = createNavButton(icon); + initClickListeners(button, i, intents.getString(i), longPressIntents.getString(i)); - CarNavigationButton button = createNavButton(icon, i, hasLongpress); mNavButtons.add(button); - mNavBar.addButton(button, - createNavButton(icon, i, hasLongpress) /* lightsOutButton */); - - initFacetFilterMaps(i, - facetPackageNames.getString(i).split(FACET_FILTER_DEMILITER), - facetCategories.getString(i).split(FACET_FILTER_DEMILITER)); - mFacetHasMultipleAppsCache.put(i, facetHasMultiplePackages(i)); - } catch (URISyntaxException e) { - throw new RuntimeException("Malformed intent uri", e); + mNavBar.addButton(button, createNavButton(icon) /* lightsOutButton */); + + initFacetFilterMaps(i, facetPackageNames.getString(i).split(FACET_FILTER_DELIMITER), + facetCategories.getString(i).split(FACET_FILTER_DELIMITER)); + mFacetHasMultipleAppsCache.put(i, facetHasMultiplePackages(i)); + } + } finally { + // Clean up all the TypedArrays. + icons.recycle(); + intents.recycle(); + longPressIntents.recycle(); + facetPackageNames.recycle(); + facetCategories.recycle(); + } + } + + /** + * Recreates each of the buttons on a density or font scale change. This manual process is + * necessary since this class is not part of an activity that automatically gets recreated. + */ + public void onDensityOrFontScaleChanged() { + TypedArray icons = mContext.getResources().obtainTypedArray(R.array.car_facet_icons); + + try { + int length = icons.length(); + if (length != mNavButtons.size()) { + // This should not happen since the mNavButtons list is created from the length + // of the icons array in bind(). + throw new RuntimeException("car_facet array lengths do not match number of " + + "created buttons."); + } + + for (int i = 0; i < length; i++) { + Drawable icon = icons.getDrawable(i); + + // Setting a new icon will trigger a requestLayout() call if necessary. + mNavButtons.get(i).setResources(icon); } + } finally { + icons.recycle(); } } private void initFacetFilterMaps(int id, String[] packageNames, String[] categories) { mFacetCategories.add(categories); - for (int i = 0; i < categories.length; i++) { - mFacetCategoryMap.put(categories[i], id); + for (String category : categories) { + mFacetCategoryMap.put(category, id); } mFacetPackages.add(packageNames); - for (int i = 0; i < packageNames.length; i++) { - mFacetPackageMap.put(packageNames[i], id); + for (String packageName : packageNames) { + mFacetPackageMap.put(packageName, id); } } @@ -223,8 +243,10 @@ class CarNavigationBarController { } /** - * Helper method to check if a given facet has multiple packages associated with it. - * This can be resource defined package names or package names filtered by facet category. + * Helper method to check if a given facet has multiple packages associated with it. This can + * be resource defined package names or package names filtered by facet category. + * + * @return {@code true} if the facet at the given index has more than one package. */ private boolean facetHasMultiplePackages(int index) { PackageManager pm = mContext.getPackageManager(); @@ -259,6 +281,10 @@ class CarNavigationBarController { return false; } + /** + * Sets the facet at the given index to be the facet that is currently active. The button will + * be highlighted appropriately. + */ private void setCurrentFacet(int index) { if (index == mCurrentFacetIndex) { return; @@ -273,11 +299,16 @@ class CarNavigationBarController { mNavButtons.get(index).setSelected(true /* selected */, mFacetHasMultipleAppsCache.get(index) /* showMoreIcon */); } + mCurrentFacetIndex = index; } - private CarNavigationButton createNavButton(Drawable icon, final int id, - boolean longClickEnabled) { + /** + * Creates the View that is used for the buttons along the navigation bar. + * + * @param icon The icon to be used for the button. + */ + private CarNavigationButton createNavButton(Drawable icon) { CarNavigationButton button = (CarNavigationButton) View.inflate(mContext, R.layout.car_navigation_button, null); button.setResources(icon); @@ -285,37 +316,49 @@ class CarNavigationBarController { new LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.MATCH_PARENT, 1); button.setLayoutParams(lp); - button.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - onFacetClicked(id); - } - }); - - if (longClickEnabled) { - button.setLongClickable(true); - button.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - onFacetLongClicked(id); - return true; - } - }); - } else { - button.setLongClickable(false); - } - return button; } - private void startActivity(Intent intent, ActivityStarter.Callback callback) { - if (mStatusBar != null && intent != null) { - mStatusBar.startActivity(intent, false, callback); + /** + * Initializes the click and long click listeners that correspond to the given command string. + * The click listeners are attached to the given button. + */ + private void initClickListeners(View button, int index, String clickString, + String longPressString) { + // Each button at least have an action when pressed. + if (TextUtils.isEmpty(clickString)) { + throw new RuntimeException("Facet at index " + index + " does not have click action."); + } + + try { + Intent intent = Intent.parseUri(clickString, Intent.URI_INTENT_SCHEME); + button.setOnClickListener(v -> onFacetClicked(intent, index)); + } catch (URISyntaxException e) { + throw new RuntimeException("Malformed intent uri", e); + } + + if (TextUtils.isEmpty(longPressString)) { + button.setLongClickable(false); + return; + } + + try { + Intent intent = Intent.parseUri(longPressString, Intent.URI_INTENT_SCHEME); + button.setOnLongClickListener(v -> { + onFacetLongClicked(intent, index); + return true; + }); + } catch (URISyntaxException e) { + throw new RuntimeException("Malformed long-press intent uri", e); } } - private void onFacetClicked(int index) { - Intent intent = mIntents.get(index); + /** + * Handles a click on a facet. A click will trigger the given Intent. + * + * @param index The index of the facet that was clicked. + */ + private void onFacetClicked(Intent intent, int index) { String packageName = intent.getPackage(); if (packageName == null) { @@ -341,13 +384,13 @@ class CarNavigationBarController { mStatusBar.startActivityOnStack(intent, stackId); } - private void onFacetLongClicked(int index) { + /** + * Handles a long-press on a facet. The long-press will trigger the given Intent. + * + * @param index The index of the facet that was clicked. + */ + private void onFacetLongClicked(Intent intent, int index) { setCurrentFacet(index); - mStatusBar.startActivityOnStack(mLongPressIntents.get(index), - StackId.FULLSCREEN_WORKSPACE_STACK_ID); - } - - private List<Intent> createEmptyIntentList(int size) { - return Arrays.asList(new Intent[size]); + mStatusBar.startActivityOnStack(intent, StackId.FULLSCREEN_WORKSPACE_STACK_ID); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index f6a56875d6b2..41613894252a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -35,10 +35,12 @@ import android.widget.LinearLayout; import com.android.systemui.BatteryMeterView; import com.android.systemui.Dependency; import com.android.systemui.R; +import com.android.systemui.SwipeHelper; import com.android.systemui.recents.Recents; import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener; import com.android.systemui.statusbar.StatusBarState; +import com.android.systemui.statusbar.phone.NavigationBarView; import com.android.systemui.statusbar.phone.StatusBar; import com.android.systemui.statusbar.phone.PhoneStatusBarView; import com.android.systemui.statusbar.policy.BatteryController; @@ -51,10 +53,8 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.BatteryViewHandler { private static final String TAG = "CarStatusBar"; - private SystemServicesProxy mSystemServicesProxy; private TaskStackListenerImpl mTaskStackListener; - private CarNavigationBarView mCarNavigationBar; private CarNavigationBarController mController; private FullscreenUserSwitcher mFullscreenUserSwitcher; @@ -62,7 +62,6 @@ public class CarStatusBar extends StatusBar implements private BatteryMeterView mBatteryMeterView; private ConnectedDeviceSignalController mConnectedDeviceSignalController; - private View mSignalsView; private CarNavigationBarView mNavigationBarView; @Override @@ -72,6 +71,8 @@ public class CarStatusBar extends StatusBar implements SystemServicesProxy.getInstance(mContext).registerTaskStackListener(mTaskStackListener); registerPackageChangeReceivers(); + mStackScroller.setScrollingEnabled(true); + createBatteryController(); mCarBatteryController.startListening(); mConnectedDeviceSignalController.startListening(); @@ -96,16 +97,16 @@ public class CarStatusBar extends StatusBar implements mBatteryMeterView.setVisibility(View.GONE); ViewStub stub = (ViewStub) statusBarView.findViewById(R.id.connected_device_signals_stub); - mSignalsView = stub.inflate(); + View signalsView = stub.inflate(); // When a ViewStub if inflated, it does not respect the margins on the inflated view. // As a result, manually add the ending margin. - ((LinearLayout.LayoutParams) mSignalsView.getLayoutParams()).setMarginEnd( + ((LinearLayout.LayoutParams) signalsView.getLayoutParams()).setMarginEnd( mContext.getResources().getDimensionPixelOffset( R.dimen.status_bar_connected_device_signal_margin_end)); mConnectedDeviceSignalController = new ConnectedDeviceSignalController(mContext, - mSignalsView); + signalsView); if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, "makeStatusBarView(). mBatteryMeterView: " + mBatteryMeterView); @@ -126,12 +127,11 @@ public class CarStatusBar extends StatusBar implements return; } - mCarNavigationBar = - (CarNavigationBarView) View.inflate(mContext, R.layout.car_navigation_bar, null); - mController = new CarNavigationBarController(mContext, mCarNavigationBar, + mNavigationBarView = (CarNavigationBarView) View.inflate(mContext, + R.layout.car_navigation_bar, null); + mController = new CarNavigationBarController(mContext, mNavigationBarView, this /* ActivityStarter*/); - mNavigationBarView = mCarNavigationBar; - mCarNavigationBar.getBarTransitions().setAlwaysOpaque(true); + mNavigationBarView.getBarTransitions().setAlwaysOpaque(true); WindowManager.LayoutParams lp = new WindowManager.LayoutParams( LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.TYPE_NAVIGATION_BAR, @@ -148,6 +148,31 @@ public class CarStatusBar extends StatusBar implements } @Override + public NavigationBarView getNavigationBarView() { + return mNavigationBarView; + } + + @Override + protected View.OnTouchListener getStatusBarWindowTouchListener() { + // Usually, a touch on the background window will dismiss the notification shade. However, + // for the car use-case, the shade should remain unless the user switches to a different + // facet (e.g. phone). + return null; + } + + /** + * Returns the {@link com.android.systemui.SwipeHelper.LongPressListener} that will be + * triggered when a notification card is long-pressed. + */ + @Override + protected SwipeHelper.LongPressListener getNotificationLongClicker() { + // For the automative use case, we do not want to the user to be able to interact with + // a notification other than a regular click. As a result, just return null for the + // long click listener. + return null; + } + + @Override public void showBatteryView() { if (Log.isLoggable(TAG, Log.DEBUG)) { Log.d(TAG, "showBatteryView(). mBatteryMeterView: " + mBatteryMeterView); @@ -272,4 +297,14 @@ public class CarStatusBar extends StatusBar implements options.setLaunchStackId(stackId); return startActivityWithOptions(intent, options.toBundle()); } + + /** + * Ensures that relevant child views are appropriately recreated when the device's density + * changes. + */ + @Override + protected void onDensityOrFontScaleChanged() { + super.onDensityOrFontScaleChanged(); + mController.onDensityOrFontScaleChanged(); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index bfc0a80b3150..14f991997e35 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -35,6 +35,7 @@ import android.content.ServiceConnection; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.content.res.AssetFileDescriptor.AutoCloseOutputStream; import android.content.res.Configuration; import android.graphics.drawable.Drawable; import android.os.AsyncTask; @@ -58,6 +59,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; import android.widget.TextView; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; @@ -164,6 +166,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL private IntentButton mLeftDefault = mLeftButton; private IntentButton mLeftPlugin; private String mLeftButtonStr; + private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger(); public KeyguardBottomAreaView(Context context) { this(context, null); @@ -257,11 +260,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL protected void onAttachedToWindow() { super.onAttachedToWindow(); mAccessibilityController.addStateChangedCallback(this); - PluginManager.getInstance(getContext()).addPluginListener(RIGHT_BUTTON_PLUGIN, + Dependency.get(PluginManager.class).addPluginListener(RIGHT_BUTTON_PLUGIN, mRightListener, IntentButtonProvider.VERSION, false /* Only allow one */); - PluginManager.getInstance(getContext()).addPluginListener(LEFT_BUTTON_PLUGIN, + Dependency.get(PluginManager.class).addPluginListener(LEFT_BUTTON_PLUGIN, mLeftListener, IntentButtonProvider.VERSION, false /* Only allow one */); - TunerService.get(getContext()).addTunable(this, LockscreenFragment.LOCKSCREEN_LEFT_BUTTON, + Dependency.get(TunerService.class).addTunable(this, LockscreenFragment.LOCKSCREEN_LEFT_BUTTON, LockscreenFragment.LOCKSCREEN_RIGHT_BUTTON); } @@ -269,9 +272,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL protected void onDetachedFromWindow() { super.onDetachedFromWindow(); mAccessibilityController.removeStateChangedCallback(this); - PluginManager.getInstance(getContext()).removePluginListener(mRightListener); - PluginManager.getInstance(getContext()).removePluginListener(mLeftListener); - TunerService.get(getContext()).removeTunable(this); + Dependency.get(PluginManager.class).removePluginListener(mRightListener); + Dependency.get(PluginManager.class).removePluginListener(mLeftListener); + Dependency.get(TunerService.class).removeTunable(this); } private void initAccessibility() { @@ -445,8 +448,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } private void handleTrustCircleClick() { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_TAP_LOCK, 0 /* lengthDp - N/A */, + mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_LOCK, 0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */); mIndicationController.showTransientIndication( R.string.keyguard_indication_trust_disabled); @@ -573,7 +575,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL AsyncTask.execute(runnable); } else { boolean dismissShade = !TextUtils.isEmpty(mRightButtonStr) - && TunerService.get(getContext()).getValue(LOCKSCREEN_RIGHT_UNLOCK, 1) != 0; + && Dependency.get(TunerService.class).getValue(LOCKSCREEN_RIGHT_UNLOCK, 1) != 0; mStatusBar.executeRunnableDismissingKeyguard(runnable, null /* cancelAction */, dismissShade, false /* afterKeyguardGone */, true /* deferred */); } @@ -594,7 +596,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL }); } else { boolean dismissShade = !TextUtils.isEmpty(mLeftButtonStr) - && TunerService.get(getContext()).getValue(LOCKSCREEN_LEFT_UNLOCK, 1) != 0; + && Dependency.get(TunerService.class).getValue(LOCKSCREEN_LEFT_UNLOCK, 1) != 0; mActivityStarter.startActivity(mLeftButton.getIntent(), dismissShade); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java new file mode 100644 index 000000000000..83b96bfc4faf --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenGestureLogger.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.statusbar.phone; + +import android.metrics.LogMaker; +import android.util.ArrayMap; + +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.systemui.EventLogConstants; +import com.android.systemui.EventLogTags; + +/** + * Wrapper that emits both new- and old-style gesture logs. + * TODO: delete this once the old logs are no longer needed. + */ +public class LockscreenGestureLogger { + private ArrayMap<Integer, Integer> mLegacyMap; + private LogMaker mLogMaker = new LogMaker(MetricsEvent.VIEW_UNKNOWN) + .setType(MetricsEvent.TYPE_ACTION); + + public LockscreenGestureLogger() { + mLegacyMap = new ArrayMap<>(EventLogConstants.METRICS_GESTURE_TYPE_MAP.length); + for (int i = 0; i < EventLogConstants.METRICS_GESTURE_TYPE_MAP.length ; i++) { + mLegacyMap.put(EventLogConstants.METRICS_GESTURE_TYPE_MAP[i], i); + } + } + + public void write(int gesture, int length, int velocity) { + MetricsLogger.action(mLogMaker.setCategory(gesture) + .setType(MetricsEvent.TYPE_ACTION) + .addTaggedData(MetricsEvent.FIELD_GESTURE_LENGTH, length) + .addTaggedData(MetricsEvent.FIELD_GESTURE_VELOCITY, velocity)); + // also write old-style logs for backward-0compatibility + EventLogTags.writeSysuiLockscreenGesture(safeLookup(gesture), length, velocity); + } + + private int safeLookup(int gesture) { + Integer value = mLegacyMap.get(gesture); + if (value == null) { + return MetricsEvent.VIEW_UNKNOWN; + } + return value; + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java index 228e8ea843b5..ee9a791585c4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java @@ -29,6 +29,7 @@ import android.view.ViewConfiguration; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.policy.DividerSnapAlgorithm.SnapTarget; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.RecentsComponent; import com.android.systemui.plugins.statusbar.phone.NavGesture.GestureHelper; @@ -87,7 +88,11 @@ public class NavigationBarGestureHelper extends GestureDetector.SimpleOnGestureL mScrollTouchSlop = r.getDimensionPixelSize(R.dimen.navigation_bar_min_swipe_distance); mMinFlingVelocity = configuration.getScaledMinimumFlingVelocity(); mTaskSwitcherDetector = new GestureDetector(context, this); - TunerService.get(context).addTunable(this, KEY_DOCK_WINDOW_GESTURE); + Dependency.get(TunerService.class).addTunable(this, KEY_DOCK_WINDOW_GESTURE); + } + + public void destroy() { + Dependency.get(TunerService.class).removeTunable(this); } public void setComponents(RecentsComponent recentsComponent, Divider divider, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java index 9b4867ec7c9e..5fb99dabfeab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java @@ -30,6 +30,7 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.Space; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.PluginListener; import com.android.systemui.plugins.PluginManager; @@ -135,15 +136,16 @@ public class NavigationBarInflaterView extends FrameLayout @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - TunerService.get(getContext()).addTunable(this, NAV_BAR_VIEWS, NAV_BAR_LEFT, + Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS, NAV_BAR_LEFT, NAV_BAR_RIGHT); - PluginManager.getInstance(getContext()).addPluginListener(NavBarButtonProvider.ACTION, this, + Dependency.get(PluginManager.class).addPluginListener(NavBarButtonProvider.ACTION, this, NavBarButtonProvider.VERSION, true /* Allow multiple */); } @Override protected void onDetachedFromWindow() { - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); + Dependency.get(PluginManager.class).removePluginListener(this); super.onDetachedFromWindow(); } @@ -278,10 +280,10 @@ public class NavigationBarInflaterView extends FrameLayout View v = null; String button = extractButton(buttonSpec); if (LEFT.equals(button)) { - buttonSpec = TunerService.get(mContext).getValue(NAV_BAR_LEFT, NAVSPACE); + buttonSpec = Dependency.get(TunerService.class).getValue(NAV_BAR_LEFT, NAVSPACE); button = extractButton(buttonSpec); } else if (RIGHT.equals(button)) { - buttonSpec = TunerService.get(mContext).getValue(NAV_BAR_RIGHT, MENU_IME); + buttonSpec = Dependency.get(TunerService.class).getValue(NAV_BAR_RIGHT, MENU_IME); button = extractButton(buttonSpec); } // Let plugins go first so they can override a standard view if they want. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 5e988fcaae74..dced747968aa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -46,6 +46,7 @@ import android.view.WindowManagerGlobal; import android.view.inputmethod.InputMethodManager; import android.widget.FrameLayout; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.RecentsComponent; import com.android.systemui.plugins.PluginListener; @@ -200,7 +201,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav mVertical = false; mShowMenu = false; - mGestureHelper = new NavigationBarGestureHelper(context); mConfiguration = new Configuration(); mConfiguration.updateFrom(context.getResources().getConfiguration()); @@ -633,6 +633,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav } private void updateTaskSwitchHelper() { + if (mGestureHelper == null) return; boolean isRtl = (getLayoutDirection() == View.LAYOUT_DIRECTION_RTL); mGestureHelper.setBarState(mVertical, isRtl); } @@ -752,14 +753,18 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); - PluginManager.getInstance(getContext()).addPluginListener(NavGesture.ACTION, this, + onPluginDisconnected(null); // Create default gesture helper + Dependency.get(PluginManager.class).addPluginListener(NavGesture.ACTION, this, NavGesture.VERSION, false /* Only one */); } @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); - PluginManager.getInstance(getContext()).removePluginListener(this); + Dependency.get(PluginManager.class).removePluginListener(this); + if (mGestureHelper != null) { + mGestureHelper.destroy(); + } } @Override @@ -772,6 +777,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav public void onPluginDisconnected(NavGesture plugin) { NavigationBarGestureHelper defaultHelper = new NavigationBarGestureHelper(getContext()); defaultHelper.setComponents(mRecentsComponent, mDivider, this); + if (mGestureHelper != null) { + mGestureHelper.destroy(); + } mGestureHelper = defaultHelper; updateTaskSwitchHelper(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index fe7e915f42f6..5da3a101b4bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -26,6 +26,7 @@ import android.app.StatusBarManager; import android.content.Context; import android.content.pm.ResolveInfo; import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -43,6 +44,7 @@ import android.widget.FrameLayout; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.keyguard.KeyguardStatusView; import com.android.systemui.DejankUtils; import com.android.systemui.EventLogConstants; @@ -137,6 +139,7 @@ public class NotificationPanelView extends PanelView implements protected int mQsMinExpansionHeight; protected int mQsMaxExpansionHeight; private int mQsPeekHeight; + private boolean mQsOverscrollExpansionEnabled; private boolean mStackScrollerOverscrolling; private boolean mQsExpansionFromOverscroll; private float mLastOverscroll; @@ -212,11 +215,14 @@ public class NotificationPanelView extends PanelView implements private int mIndicationBottomPadding; private boolean mIsFullWidth; private boolean mDark; + private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger(); public NotificationPanelView(Context context, AttributeSet attrs) { super(context, attrs); setWillNotDraw(!DEBUG); mFalsingManager = FalsingManager.getInstance(context); + mQsOverscrollExpansionEnabled = + getResources().getBoolean(R.bool.config_enableQuickSettingsOverscrollExpansion); } public void setStatusBar(StatusBar bar) { @@ -596,7 +602,8 @@ public class NotificationPanelView extends PanelView implements MetricsLogger.count(mContext, COUNTER_PANEL_OPEN_PEEK, 1); return true; } - if (!isFullyCollapsed() && onQsIntercept(event)) { + + if (mQsOverscrollExpansionEnabled && !isFullyCollapsed() && onQsIntercept(event)) { return true; } return super.onInterceptTouchEvent(event); @@ -710,10 +717,9 @@ public class NotificationPanelView extends PanelView implements private void logQsSwipeDown(float y) { float vel = getCurrentQSVelocity(); final int gesture = mStatusBarState == StatusBarState.KEYGUARD - ? EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_QS - : EventLogConstants.SYSUI_SHADE_GESTURE_SWIPE_DOWN_QS; - EventLogTags.writeSysuiLockscreenGesture( - gesture, + ? MetricsEvent.ACTION_LS_QS + : MetricsEvent.ACTION_SHADE_QS_PULL; + mLockscreenGestureLogger.write(gesture, (int) ((y - mInitialTouchY) / mStatusBar.getDisplayDensity()), (int) (vel / mStatusBar.getDisplayDensity())); } @@ -770,7 +776,9 @@ public class NotificationPanelView extends PanelView implements return true; } mHeadsUpTouchHelper.onTouchEvent(event); - if (!mHeadsUpTouchHelper.isTrackingHeadsUp() && handleQsTouch(event)) { + + if (mQsOverscrollExpansionEnabled && !mHeadsUpTouchHelper.isTrackingHeadsUp() + && handleQsTouch(event)) { return true; } if (event.getActionMasked() == MotionEvent.ACTION_DOWN && isFullyCollapsed()) { @@ -953,6 +961,10 @@ public class NotificationPanelView extends PanelView implements @Override public void onOverscrollTopChanged(float amount, boolean isRubberbanded) { + if (!mQsOverscrollExpansionEnabled) { + return; + } + cancelQsAnimation(); if (!mQsExpansionEnabled) { amount = 0f; @@ -967,6 +979,10 @@ public class NotificationPanelView extends PanelView implements @Override public void flingTopOverscroll(float velocity, boolean open) { + if (!mQsOverscrollExpansionEnabled) { + return; + } + mLastOverscroll = 0f; mQsExpansionFromOverscroll = false; setQsExpansion(mQsExpansionHeight); @@ -1819,9 +1835,7 @@ public class NotificationPanelView extends PanelView implements if (mQsExpanded) { flingSettings(0 /* vel */, false /* expand */, null, true /* isClick */); } else if (mQsExpansionEnabled) { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_TAP_TO_OPEN_QS, - 0, 0); + mLockscreenGestureLogger.write(MetricsEvent.ACTION_SHADE_QS_TAP, 0, 0); flingSettings(0 /* vel */, true /* expand */, null, true /* isClick */); } } @@ -1836,8 +1850,7 @@ public class NotificationPanelView extends PanelView implements int lengthDp = Math.abs((int) (translation / displayDensity)); int velocityDp = Math.abs((int) (vel / displayDensity)); if (start) { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_DIALER, lengthDp, velocityDp); + mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_DIALER, lengthDp, velocityDp); mFalsingManager.onLeftAffordanceOn(); if (mFalsingManager.shouldEnforceBouncer()) { @@ -1855,9 +1868,7 @@ public class NotificationPanelView extends PanelView implements } else { if (KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE.equals( mLastCameraLaunchSource)) { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_CAMERA, - lengthDp, velocityDp); + mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_CAMERA, lengthDp, velocityDp); } mFalsingManager.onCameraOn(); if (mFalsingManager.shouldEnforceBouncer()) { @@ -2152,8 +2163,8 @@ public class NotificationPanelView extends PanelView implements switch (mStatusBar.getBarState()) { case StatusBarState.KEYGUARD: if (!mDozingOnDown) { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_TAP_UNLOCK_HINT, + mLockscreenGestureLogger.write( + MetricsEvent.ACTION_LS_HINT, 0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */); startUnlockHintAnimation(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 5f674685f885..48a8329d085e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -33,6 +33,7 @@ import android.view.ViewTreeObserver; import android.view.animation.Interpolator; import android.widget.FrameLayout; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.DejankUtils; import com.android.systemui.EventLogConstants; import com.android.systemui.EventLogTags; @@ -55,6 +56,7 @@ public abstract class PanelView extends FrameLayout { private static final int PEEK_ANIMATION_DURATION = 360; private long mDownTime; private float mMinExpandHeight; + private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger(); private final void logf(String fmt, Object... args) { Log.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args)); @@ -110,6 +112,11 @@ public abstract class PanelView extends FrameLayout { private float mInitialTouchX; private boolean mTouchDisabled; + /** + * Whether or not the PanelView can be expanded or collapsed with a drag. + */ + private boolean mNotificationsDragEnabled; + private Interpolator mBounceInterpolator; protected KeyguardBottomAreaView mKeyguardBottomArea; @@ -190,6 +197,8 @@ public abstract class PanelView extends FrameLayout { 0.84f /* y2 */); mBounceInterpolator = new BounceInterpolator(); mFalsingManager = FalsingManager.getInstance(context); + mNotificationsDragEnabled = + getResources().getBoolean(R.bool.config_enableNotificationShadeDrag); } protected void loadDimens() { @@ -232,6 +241,15 @@ public abstract class PanelView extends FrameLayout { return false; } + // If dragging should not expand the notifications shade, then return false. + if (!mNotificationsDragEnabled) { + if (mTracking) { + // Turn off tracking if it's on or the shade can get stuck in the down position. + onTrackingStopped(true /* expand */); + } + return false; + } + // On expanding, single mouse click expands the panel instead of dragging. if (isFullyCollapsed() && event.isFromSource(InputDevice.SOURCE_MOUSE)) { if (event.getAction() == MotionEvent.ACTION_UP) { @@ -423,8 +441,8 @@ public abstract class PanelView extends FrameLayout { float displayDensity = mStatusBar.getDisplayDensity(); int heightDp = (int) Math.abs((y - mInitialTouchY) / displayDensity); int velocityDp = (int) Math.abs(vel / displayDensity); - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_UP_UNLOCK, + mLockscreenGestureLogger.write( + MetricsEvent.ACTION_LS_UNLOCK, heightDp, velocityDp); } fling(vel, expand, isFalseTouch(x, y)); @@ -487,7 +505,7 @@ public abstract class PanelView extends FrameLayout { @Override public boolean onInterceptTouchEvent(MotionEvent event) { - if (mInstantExpanding + if (mInstantExpanding || !mNotificationsDragEnabled || (mMotionAborted && event.getActionMasked() != MotionEvent.ACTION_DOWN)) { return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index dd567e8c802b..a1022c4757a5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -89,7 +89,7 @@ public class QSTileHost implements QSTile.Host, Tunable { mServices = new TileServices(this, Dependency.get(Dependency.BG_LOOPER)); - TunerService.get(mContext).addTunable(this, TILES_SETTING); + Dependency.get(TunerService.class).addTunable(this, TILES_SETTING); // AutoTileManager can modify mTiles so make sure mTiles has already been initialized. mAutoTiles = new AutoTileManager(context, this); } @@ -101,7 +101,7 @@ public class QSTileHost implements QSTile.Host, Tunable { public void destroy() { mTiles.values().forEach(tile -> tile.destroy()); mAutoTiles.destroy(); - TunerService.get(mContext).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); mServices.destroy(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java index c0e96533aaf9..4307a2e1ac6b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java @@ -21,12 +21,14 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.RippleDrawable; import android.icu.text.NumberFormat; import android.os.UserManager; +import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.SparseBooleanArray; @@ -67,9 +69,6 @@ import com.android.systemui.tuner.TunerService; public class QuickStatusBarHeader extends BaseStatusBarHeader implements NextAlarmChangeCallback, OnClickListener, OnUserInfoChangedListener, EmergencyListener, BatteryStateChangeCallback, SignalCallback { - - private static final String TAG = "QuickStatusBarHeader"; - private static final float EXPAND_INDICATOR_THRESHOLD = .93f; private ActivityStarter mActivityStarter; @@ -99,13 +98,16 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements private boolean mShowEmergencyCallsOnly; protected MultiUserSwitch mMultiUserSwitch; private ImageView mMultiUserAvatar; - + private boolean mAlwaysShowMultiUserSwitch; private TouchAnimator mAnimator; protected TouchAnimator mSettingsAlpha; private float mExpansionAmount; protected QSTileHost mHost; + protected View mEdit; + private boolean mShowEditIcon; + private boolean mShowFullAlarm; private float mDateTimeTranslation; private TextView mBatteryLevel; @@ -119,25 +121,37 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements @Override protected void onFinishInflate() { super.onFinishInflate(); + Resources res = getResources(); mEmergencyOnly = (TextView) findViewById(R.id.header_emergency_calls_only); + mShowEditIcon = res.getBoolean(R.bool.config_showQuickSettingsEditingIcon); + mEdit = findViewById(android.R.id.edit); - findViewById(android.R.id.edit).setOnClickListener(view -> - Dependency.get(ActivityStarter.class).postQSRunnableDismissingKeyguard(() -> - mQsPanel.showEdit(view))); + mEdit.setVisibility(mShowEditIcon ? VISIBLE : GONE); + + if (mShowEditIcon) { + findViewById(android.R.id.edit).setOnClickListener(view -> + Dependency.get(ActivityStarter.class).postQSRunnableDismissingKeyguard(() -> + mQsPanel.showEdit(view))); + } mDateTimeAlarmGroup = (ViewGroup) findViewById(R.id.date_time_alarm_group); mDateTimeAlarmGroup.findViewById(R.id.empty_time_view).setVisibility(View.GONE); mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group); mDateTimeGroup.setPivotX(0); mDateTimeGroup.setPivotY(0); - mDateTimeTranslation = getResources().getDimension(R.dimen.qs_date_time_translation); - mShowFullAlarm = getResources().getBoolean(R.bool.quick_settings_show_full_alarm); + mDateTimeTranslation = res.getDimension(R.dimen.qs_date_time_translation); + mShowFullAlarm = res.getBoolean(R.bool.quick_settings_show_full_alarm); mExpandIndicator = (ExpandableIndicator) findViewById(R.id.expand_indicator); + mExpandIndicator.setVisibility( + res.getBoolean(R.bool.config_showQuickSettingsExpandIndicator) + ? VISIBLE : GONE); mHeaderQsPanel = (QuickQSPanel) findViewById(R.id.quick_qs_panel); + mHeaderQsPanel.setVisibility(res.getBoolean(R.bool.config_showQuickSettingsRow) + ? VISIBLE : GONE); mSettingsButton = (SettingsButton) findViewById(R.id.settings_button); mSettingsContainer = findViewById(R.id.settings_button_container); @@ -151,6 +165,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mMultiUserSwitch = (MultiUserSwitch) findViewById(R.id.multi_user_switch); mMultiUserAvatar = (ImageView) mMultiUserSwitch.findViewById(R.id.multi_user_avatar); + mAlwaysShowMultiUserSwitch = res.getBoolean(R.bool.config_alwaysShowMultiUserSwitcher); // RenderThread is doing more harm than good when touching the header (to expand quick // settings), so disable it for this view @@ -200,11 +215,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements updateSettingsAnimator(); } - protected void updateSettingsAnimator() { - mSettingsAlpha = new TouchAnimator.Builder() - .addFloat(mEdit, "alpha", 0, 1) - .addFloat(mMultiUserSwitch, "alpha", 0, 1) - .build(); + private void updateSettingsAnimator() { + mSettingsAlpha = createSettingsAlphaAnimator(); final boolean isRtl = isLayoutRtl(); if (isRtl && mDateTimeGroup.getWidth() == 0) { @@ -221,6 +233,27 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements } } + @Nullable + private TouchAnimator createSettingsAlphaAnimator() { + // If the settings icon is not shown and the user switcher is always shown, then there + // is nothing to animate. + if (!mShowEditIcon && mAlwaysShowMultiUserSwitch) { + return null; + } + + TouchAnimator.Builder animatorBuilder = new TouchAnimator.Builder(); + + if (mShowEditIcon) { + animatorBuilder.addFloat(mEdit, "alpha", 0, 1); + } + + if (!mAlwaysShowMultiUserSwitch) { + animatorBuilder.addFloat(mMultiUserSwitch, "alpha", 0, 1); + } + + return animatorBuilder.build(); + } + @Override public int getCollapsedHeight() { return getHeight(); @@ -261,7 +294,10 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mExpansionAmount = headerExpansionFraction; updateDateTimePosition(); mAnimator.setPosition(headerExpansionFraction); - mSettingsAlpha.setPosition(headerExpansionFraction); + + if (mSettingsAlpha != null) { + mSettingsAlpha.setPosition(headerExpansionFraction); + } updateAlarmVisibilities(); @@ -302,7 +338,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements }); } - protected void updateVisibilities() { + private void updateVisibilities() { updateAlarmVisibilities(); updateDateTimePosition(); mEmergencyOnly.setVisibility(mExpanded && (mShowEmergencyCallsOnly || mIsRoaming) @@ -310,9 +346,14 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility( TunerService.isTunerEnabled(mContext) ? View.VISIBLE : View.INVISIBLE); final boolean isDemo = UserManager.isDeviceInDemoMode(mContext); - mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers() && !isDemo + + mMultiUserSwitch.setVisibility((mExpanded || mAlwaysShowMultiUserSwitch) + && mMultiUserSwitch.hasMultipleUsers() && !isDemo ? View.VISIBLE : View.INVISIBLE); - mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE); + + if (mShowEditIcon) { + mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE); + } } private void updateDateTimePosition() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java index 8fcbf38db2df..b30d3abc2375 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java @@ -23,13 +23,13 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Rect; import android.support.v4.graphics.ColorUtils; +import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; - import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.R; import com.android.systemui.statusbar.ExpandableNotificationRow; @@ -49,7 +49,6 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, = new PathInterpolator(0f, 0, 0.7f, 1f); public static final Interpolator KEYGUARD_FADE_OUT_INTERPOLATOR_LOCKED = new PathInterpolator(0.3f, 0f, 0.8f, 1f); - private static final float SCRIM_BEHIND_ALPHA = 0.62f; protected static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.45f; protected static final float SCRIM_BEHIND_ALPHA_UNLOCKING = 0.2f; private static final float SCRIM_IN_FRONT_ALPHA = 0.75f; @@ -66,7 +65,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, private final View mHeadsUpScrim; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; - protected float mScrimBehindAlpha = SCRIM_BEHIND_ALPHA; + protected float mScrimBehindAlpha; protected float mScrimBehindAlphaKeyguard = SCRIM_BEHIND_ALPHA_KEYGUARD; protected float mScrimBehindAlphaUnlocking = SCRIM_BEHIND_ALPHA_UNLOCKING; @@ -109,6 +108,8 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener, mUnlockMethodCache = UnlockMethodCache.getInstance(context); mKeyguardUpdateMonitor = KeyguardUpdateMonitor.getInstance(context); mLightBarController = lightBarController; + mScrimBehindAlpha = context.getResources().getFloat(R.dimen.scrim_behind_alpha); + updateHeadsUpScrim(false); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 270476e35307..9ac6f6580ba3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -1,3 +1,5 @@ + + /* * Copyright (C) 2010 The Android Open Source Project * @@ -69,6 +71,7 @@ import android.media.session.MediaController; import android.media.session.MediaSession; import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; +import android.metrics.LogMaker; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -112,6 +115,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.statusbar.StatusBarIcon; +import com.android.internal.util.NotificationMessagingUtil; import com.android.keyguard.KeyguardHostView.OnDismissAction; import com.android.keyguard.KeyguardStatusView; import com.android.keyguard.KeyguardUpdateMonitor; @@ -269,8 +273,6 @@ public class StatusBar extends SystemUI implements DemoMode, protected static final int MSG_TOGGLE_RECENTS_APPS = 1021; protected static final int MSG_PRELOAD_RECENT_APPS = 1022; protected static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 1023; - protected static final int MSG_SHOW_NEXT_AFFILIATED_TASK = 1024; - protected static final int MSG_SHOW_PREV_AFFILIATED_TASK = 1025; protected static final int MSG_TOGGLE_KEYBOARD_SHORTCUTS_MENU = 1026; protected static final int MSG_DISMISS_KEYBOARD_SHORTCUTS_MENU = 1027; @@ -280,8 +282,8 @@ public class StatusBar extends SystemUI implements DemoMode, private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF"; // Should match the values in PhoneWindowManager - public static final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps"; public static final String SYSTEM_DIALOG_REASON_HOME_KEY = "homekey"; + public static final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps"; private static final String BANNER_ACTION_CANCEL = "com.android.systemui.statusbar.banner_action_cancel"; @@ -406,7 +408,7 @@ public class StatusBar extends SystemUI implements DemoMode, protected PhoneStatusBarView mStatusBarView; private int mStatusBarWindowState = WINDOW_STATE_SHOWING; protected StatusBarWindowManager mStatusBarWindowManager; - private UnlockMethodCache mUnlockMethodCache; + protected UnlockMethodCache mUnlockMethodCache; private DozeServiceHost mDozeServiceHost; private boolean mWakeUpComingFromTouch; private PointF mWakeUpTouchLocation; @@ -701,11 +703,14 @@ public class StatusBar extends SystemUI implements DemoMode, } }; + private NotificationMessagingUtil mMessagingUtil; private KeyguardUserSwitcher mKeyguardUserSwitcher; private UserSwitcherController mUserSwitcherController; private NetworkController mNetworkController; private KeyguardMonitorImpl mKeyguardMonitor; private BatteryController mBatteryController; + private LogMaker mStatusBarStateLog; + private LockscreenGestureLogger mLockscreenGestureLogger = new LockscreenGestureLogger(); private void recycleAllVisibilityObjects(ArraySet<NotificationVisibility> array) { final int N = array.size(); @@ -763,6 +768,7 @@ public class StatusBar extends SystemUI implements DemoMode, Context.DEVICE_POLICY_SERVICE); mNotificationData = new NotificationData(this); + mMessagingUtil = new NotificationMessagingUtil(mContext); mAccessibilityManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); @@ -948,19 +954,7 @@ public class StatusBar extends SystemUI implements DemoMode, inflateStatusBarWindow(context); mStatusBarWindow.setService(this); - mStatusBarWindow.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - checkUserAutohide(v, event); - checkRemoteInputOutside(event); - if (event.getAction() == MotionEvent.ACTION_DOWN) { - if (mExpandedVisible) { - animateCollapsePanels(); - } - } - return mStatusBarWindow.onTouchEvent(event); - } - }); + mStatusBarWindow.setOnTouchListener(getStatusBarWindowTouchListener()); mNotificationPanel = (NotificationPanelView) mStatusBarWindow.findViewById( R.id.notification_panel); @@ -1223,6 +1217,23 @@ public class StatusBar extends SystemUI implements DemoMode, } } + /** + * Returns the {@link android.view.View.OnTouchListener} that will be invoked when the + * background window of the status bar is clicked. + */ + protected View.OnTouchListener getStatusBarWindowTouchListener() { + return (v, event) -> { + checkUserAutohide(v, event); + checkRemoteInputOutside(event); + if (event.getAction() == MotionEvent.ACTION_DOWN) { + if (mExpandedVisible) { + animateCollapsePanels(); + } + } + return mStatusBarWindow.onTouchEvent(event); + }; + } + private void inflateShelf() { mNotificationShelf = (NotificationShelf) LayoutInflater.from(mContext).inflate( @@ -2752,28 +2763,6 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void handleMessage(Message m) { switch (m.what) { - // start old BaseStatusBar.H handling. - case MSG_SHOW_RECENT_APPS: - showRecents(m.arg1 > 0, m.arg2 != 0); - break; - case MSG_HIDE_RECENT_APPS: - hideRecents(m.arg1 > 0, m.arg2 > 0); - break; - case MSG_TOGGLE_RECENTS_APPS: - toggleRecents(); - break; - case MSG_PRELOAD_RECENT_APPS: - preloadRecents(); - break; - case MSG_CANCEL_PRELOAD_RECENT_APPS: - cancelPreloadingRecents(); - break; - case MSG_SHOW_NEXT_AFFILIATED_TASK: - showRecentsNextAffiliatedTask(); - break; - case MSG_SHOW_PREV_AFFILIATED_TASK: - showRecentsPreviousAffiliatedTask(); - break; case MSG_TOGGLE_KEYBOARD_SHORTCUTS_MENU: toggleKeyboardShortcuts(m.arg1); break; @@ -3828,6 +3817,13 @@ public class StatusBar extends SystemUI implements DemoMode, isSecure, canSkipBouncer); if (stateFingerprint != mLastLoggedStateFingerprint) { + if (mStatusBarStateLog == null) { + mStatusBarStateLog = new LogMaker(MetricsEvent.VIEW_UNKNOWN); + } + MetricsLogger.action(mStatusBarStateLog + .setCategory(isBouncerShowing ? MetricsEvent.BOUNCER : MetricsEvent.LOCKSCREEN) + .setType(isShowing ? MetricsEvent.TYPE_OPEN : MetricsEvent.TYPE_CLOSE) + .setSubtype(isSecure ? 1 : 0)); EventLogTags.writeSysuiStatusBarState(mState, isShowing ? 1 : 0, isOccluded ? 1 : 0, @@ -4508,8 +4504,8 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public void onActivated(ActivatableNotificationView view) { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_TAP_NOTIFICATION_ACTIVATE, + mLockscreenGestureLogger.write( + MetricsEvent.ACTION_LS_NOTE, 0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */); mKeyguardIndicationController.showTransientIndication(R.string.notification_tap_again); ActivatableNotificationView previousView = mStackScroller.getActivatedChild(); @@ -4626,8 +4622,8 @@ public class StatusBar extends SystemUI implements DemoMode, @Override public boolean onDraggedDown(View startingChild, int dragLengthY) { if (hasActiveNotifications() && (!isDozing() || isPulsing())) { - EventLogTags.writeSysuiLockscreenGesture( - EventLogConstants.SYSUI_LOCKSCREEN_GESTURE_SWIPE_DOWN_FULL_SHADE, + mLockscreenGestureLogger.write( + MetricsEvent.ACTION_LS_SHADE, (int) (dragLengthY / mDisplayMetrics.density), 0 /* velocityDp - N/A */); @@ -5779,20 +5775,21 @@ public class StatusBar extends SystemUI implements DemoMode, PendingIntent.FLAG_CANCEL_CURRENT); final int colorRes = com.android.internal.R.color.system_notification_accent_color; - Notification.Builder note = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_android) - .setContentTitle(mContext.getString(R.string.hidden_notifications_title)) - .setContentText(mContext.getString(R.string.hidden_notifications_text)) - .setChannel(NotificationChannels.SECURITY) - .setOngoing(true) - .setColor(mContext.getColor(colorRes)) - .setContentIntent(setupIntent) - .addAction(R.drawable.ic_close, - mContext.getString(R.string.hidden_notifications_cancel), - cancelIntent) - .addAction(R.drawable.ic_settings, - mContext.getString(R.string.hidden_notifications_setup), - setupIntent); + Notification.Builder note = + new Notification.Builder(mContext, NotificationChannels.GENERAL) + .setSmallIcon(R.drawable.ic_android) + .setContentTitle(mContext.getString( + R.string.hidden_notifications_title)) + .setContentText(mContext.getString(R.string.hidden_notifications_text)) + .setOngoing(true) + .setColor(mContext.getColor(colorRes)) + .setContentIntent(setupIntent) + .addAction(R.drawable.ic_close, + mContext.getString(R.string.hidden_notifications_cancel), + cancelIntent) + .addAction(R.drawable.ic_settings, + mContext.getString(R.string.hidden_notifications_setup), + setupIntent); overrideNotificationAppName(mContext, note); NotificationManager noMan = @@ -6072,26 +6069,6 @@ public class StatusBar extends SystemUI implements DemoMode, } @Override - public void showRecentApps(boolean triggeredFromAltTab, boolean fromHome) { - int msg = MSG_SHOW_RECENT_APPS; - mHandler.removeMessages(msg); - mHandler.obtainMessage(msg, triggeredFromAltTab ? 1 : 0, fromHome ? 1 : 0).sendToTarget(); - } - - @Override - public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { - int msg = MSG_HIDE_RECENT_APPS; - mHandler.removeMessages(msg); - mHandler.obtainMessage(msg, triggeredFromAltTab ? 1 : 0, - triggeredFromHomeKey ? 1 : 0).sendToTarget(); - } - - @Override - public void toggleRecentApps() { - toggleRecents(); - } - - @Override public void toggleSplitScreen() { toggleSplitScreenMode(-1 /* metricsDockAction */, -1 /* metricsUndockAction */); } @@ -6124,20 +6101,6 @@ public class StatusBar extends SystemUI implements DemoMode, mHandler.obtainMessage(msg, deviceId, 0).sendToTarget(); } - /** Jumps to the next affiliated task in the group. */ - public void showNextAffiliatedTask() { - int msg = MSG_SHOW_NEXT_AFFILIATED_TASK; - mHandler.removeMessages(msg); - mHandler.sendEmptyMessage(msg); - } - - /** Jumps to the previous affiliated task in the group. */ - public void showPreviousAffiliatedTask() { - int msg = MSG_SHOW_PREV_AFFILIATED_TASK; - mHandler.removeMessages(msg); - mHandler.sendEmptyMessage(msg); - } - protected void sendCloseSystemWindows(String reason) { try { ActivityManager.getService().closeSystemDialogs(reason); @@ -6145,33 +6108,6 @@ public class StatusBar extends SystemUI implements DemoMode, } } - /** Proxy for RecentsComponent */ - - protected void showRecents(boolean triggeredFromAltTab, boolean fromHome) { - if (mRecents != null) { - sendCloseSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS); - mRecents.showRecents(triggeredFromAltTab, fromHome); - } - } - - protected void hideRecents(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) { - if (mRecents != null) { - mRecents.hideRecents(triggeredFromAltTab, triggeredFromHomeKey); - } - } - - protected void toggleRecents() { - if (mRecents != null) { - mRecents.toggleRecents(mDisplay); - } - } - - protected void preloadRecents() { - if (mRecents != null) { - mRecents.preloadRecents(); - } - } - protected void toggleKeyboardShortcuts(int deviceId) { KeyboardShortcuts.toggle(mContext, deviceId); } @@ -6180,24 +6116,6 @@ public class StatusBar extends SystemUI implements DemoMode, KeyboardShortcuts.dismiss(); } - protected void cancelPreloadingRecents() { - if (mRecents != null) { - mRecents.cancelPreloadingRecents(); - } - } - - protected void showRecentsNextAffiliatedTask() { - if (mRecents != null) { - mRecents.showNextAffiliatedTask(); - } - } - - protected void showRecentsPreviousAffiliatedTask() { - if (mRecents != null) { - mRecents.showPrevAffiliatedTask(); - } - } - /** * Save the current "public" (locked and secure) state of the lockscreen. */ @@ -6321,8 +6239,10 @@ public class StatusBar extends SystemUI implements DemoMode, final StatusBarNotification sbn = entry.notification; boolean isLowPriority = mNotificationData.isAmbient(sbn.getKey()); + boolean useIncreasedCollapsedHeight = mMessagingUtil.isImportantMessaging(sbn, + mNotificationData.getImportance(sbn.getKey())); try { - entry.cacheContentViews(mContext, null, isLowPriority); + entry.cacheContentViews(mContext, null, isLowPriority, useIncreasedCollapsedHeight); } catch (RuntimeException e) { Log.e(TAG, "Unable to get notification remote views", e); return false; @@ -6492,6 +6412,7 @@ public class StatusBar extends SystemUI implements DemoMode, row.setUserExpanded(userExpanded); } row.setUserLocked(userLocked); + row.setUseIncreasedCollapsedHeight(useIncreasedCollapsedHeight); row.onNotificationUpdated(entry); return true; } @@ -6981,10 +6902,13 @@ public class StatusBar extends SystemUI implements DemoMode, Notification n = notification.getNotification(); mNotificationData.updateRanking(ranking); + boolean useIncreasedCollapsedHeight = mMessagingUtil.isImportantMessaging(notification, + mNotificationData.getImportance(notification.getKey())); + entry.row.setUseIncreasedCollapsedHeight(useIncreasedCollapsedHeight); boolean applyInPlace; try { applyInPlace = entry.cacheContentViews(mContext, notification.getNotification(), - mNotificationData.isAmbient(key)); + mNotificationData.isAmbient(key), useIncreasedCollapsedHeight); } catch (RuntimeException e) { Log.e(TAG, "Unable to get notification remote views", e); applyInPlace = false; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java index 46ca3c642460..41f8a91566a9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java @@ -36,6 +36,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.BatteryMeterView; +import com.android.systemui.Dependency; import com.android.systemui.FontSizeUtils; import com.android.systemui.Interpolators; import com.android.systemui.R; @@ -127,7 +128,7 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone); loadDimens(); - TunerService.get(mContext).addTunable(this, ICON_BLACKLIST); + Dependency.get(TunerService.class).addTunable(this, ICON_BLACKLIST); mTransitionsController = new LightBarTransitionsController(this::setIconTintInternal); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java index 9cc97492e22c..ffc0d9764966 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -108,7 +108,7 @@ public class Clock extends TextView implements DemoMode, Tunable { getContext().registerReceiverAsUser(mIntentReceiver, UserHandle.ALL, filter, null, Dependency.get(Dependency.TIME_TICK_HANDLER)); - TunerService.get(getContext()).addTunable(this, CLOCK_SECONDS, + Dependency.get(TunerService.class).addTunable(this, CLOCK_SECONDS, StatusBarIconController.ICON_BLACKLIST); } @@ -129,7 +129,7 @@ public class Clock extends TextView implements DemoMode, Tunable { if (mAttached) { getContext().unregisterReceiver(mIntentReceiver); mAttached = false; - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index fd71f43ceacf..7a32bf1c8d86 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -560,18 +560,20 @@ public class UserSwitcherController { private void showLogoutNotification(int userId) { PendingIntent logoutPI = PendingIntent.getBroadcastAsUser(mContext, 0, new Intent(ACTION_LOGOUT_USER), 0, UserHandle.SYSTEM); - Notification.Builder builder = new Notification.Builder(mContext) - .setVisibility(Notification.VISIBILITY_SECRET) - .setChannel(NotificationChannels.USER) - .setSmallIcon(R.drawable.ic_person) - .setContentTitle(mContext.getString(R.string.user_logout_notification_title)) - .setContentText(mContext.getString(R.string.user_logout_notification_text)) - .setContentIntent(logoutPI) - .setOngoing(true) - .setShowWhen(false) - .addAction(R.drawable.ic_delete, - mContext.getString(R.string.user_logout_notification_action), - logoutPI); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.GENERAL) + .setVisibility(Notification.VISIBILITY_SECRET) + .setSmallIcon(R.drawable.ic_person) + .setContentTitle(mContext.getString( + R.string.user_logout_notification_title)) + .setContentText(mContext.getString( + R.string.user_logout_notification_text)) + .setContentIntent(logoutPI) + .setOngoing(true) + .setShowWhen(false) + .addAction(R.drawable.ic_delete, + mContext.getString(R.string.user_logout_notification_action), + logoutPI); SystemUI.overrideNotificationAppName(mContext, builder); NotificationManager.from(mContext).notifyAsUser(TAG_LOGOUT_USER, SystemMessage.NOTE_LOGOUT_USER, builder.build(), new UserHandle(userId)); @@ -584,17 +586,17 @@ public class UserSwitcherController { PendingIntent removeGuestPI = canSwitchUsers ? PendingIntent.getBroadcastAsUser(mContext, 0, new Intent(ACTION_REMOVE_GUEST), 0, UserHandle.SYSTEM) : null; - Notification.Builder builder = new Notification.Builder(mContext) - .setVisibility(Notification.VISIBILITY_SECRET) - .setChannel(NotificationChannels.USER) - .setSmallIcon(R.drawable.ic_person) - .setContentTitle(mContext.getString(R.string.guest_notification_title)) - .setContentText(mContext.getString(R.string.guest_notification_text)) - .setContentIntent(removeGuestPI) - .setShowWhen(false) - .addAction(R.drawable.ic_delete, - mContext.getString(R.string.guest_notification_remove_action), - removeGuestPI); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.GENERAL) + .setVisibility(Notification.VISIBILITY_SECRET) + .setSmallIcon(R.drawable.ic_person) + .setContentTitle(mContext.getString(R.string.guest_notification_title)) + .setContentText(mContext.getString(R.string.guest_notification_text)) + .setContentIntent(removeGuestPI) + .setShowWhen(false) + .addAction(R.drawable.ic_delete, + mContext.getString(R.string.guest_notification_remove_action), + removeGuestPI); SystemUI.overrideNotificationAppName(mContext, builder); NotificationManager.from(mContext).notifyAsUser(TAG_REMOVE_GUEST, SystemMessage.NOTE_REMOVE_GUEST, builder.build(), new UserHandle(guestUserId)); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 85b1c32d7eaf..6006d5af3cd5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -27,6 +27,7 @@ import android.annotation.FloatRange; import android.annotation.Nullable; import android.content.Context; import android.content.res.Configuration; +import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -55,7 +56,6 @@ import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.OverScroller; import android.widget.ScrollView; - import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.ExpandHelper; @@ -114,6 +114,7 @@ public class NotificationStackScrollLayout extends ViewGroup private boolean mSwipingInProgress; private int mCurrentStackHeight = Integer.MAX_VALUE; private final Paint mBackgroundPaint = new Paint(); + private boolean mShouldDrawNotificationBackground; private float mExpandedHeight; private int mOwnScrollY; @@ -229,6 +230,7 @@ public class NotificationStackScrollLayout extends ViewGroup private NotificationMenuRow mCurrIconRow; private View mTranslatingParentView; private View mGearExposedView; + private boolean mShouldShowGear; /** * Should in this touch motion only be scrolling allowed? It's true when the scroller was @@ -378,10 +380,12 @@ public class NotificationStackScrollLayout extends ViewGroup public NotificationStackScrollLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); + Resources res = getResources(); + mAmbientState = new AmbientState(context); mBgColor = context.getColor(R.color.notification_shade_background_color); - int minHeight = getResources().getDimensionPixelSize(R.dimen.notification_min_height); - int maxHeight = getResources().getDimensionPixelSize(R.dimen.notification_max_height); + int minHeight = res.getDimensionPixelSize(R.dimen.notification_min_height); + int maxHeight = res.getDimensionPixelSize(R.dimen.notification_max_height); mExpandHelper = new ExpandHelper(getContext(), this, minHeight, maxHeight); mExpandHelper.setEventSource(this); @@ -390,14 +394,18 @@ public class NotificationStackScrollLayout extends ViewGroup mSwipeHelper.setLongPressListener(mLongPressListener); mStackScrollAlgorithm = createStackScrollAlgorithm(context); initView(context); - setWillNotDraw(false); + mFalsingManager = FalsingManager.getInstance(context); + mShouldShowGear = res.getBoolean(R.bool.config_showNotificationGear); + mShouldDrawNotificationBackground = + res.getBoolean(R.bool.config_drawNotificationBackground); + + updateWillNotDraw(); if (DEBUG) { mDebugPaint = new Paint(); mDebugPaint.setColor(0xffff0000); mDebugPaint.setStrokeWidth(2); mDebugPaint.setStyle(Paint.Style.STROKE); } - mFalsingManager = FalsingManager.getInstance(context); } @Override @@ -424,10 +432,11 @@ public class NotificationStackScrollLayout extends ViewGroup @Override protected void onDraw(Canvas canvas) { - if (mCurrentBounds.top < mCurrentBounds.bottom) { + if (mShouldDrawNotificationBackground && mCurrentBounds.top < mCurrentBounds.bottom) { canvas.drawRect(0, mCurrentBounds.top, getWidth(), mCurrentBounds.bottom, mBackgroundPaint); } + if (DEBUG) { int y = mTopPadding; canvas.drawLine(0, y, getWidth(), y, mDebugPaint); @@ -439,6 +448,11 @@ public class NotificationStackScrollLayout extends ViewGroup } private void updateBackgroundDimming() { + // No need to update the background color if it's not being drawn. + if (!mShouldDrawNotificationBackground) { + return; + } + float alpha = BACKGROUND_ALPHA_DIMMED + (1 - BACKGROUND_ALPHA_DIMMED) * (1.0f - mDimAmount); alpha *= mBackgroundFadeAmount; // We need to manually blend in the background color @@ -487,6 +501,10 @@ public class NotificationStackScrollLayout extends ViewGroup } private void updateSrcDrawing() { + if (!mShouldDrawNotificationBackground) { + return; + } + mBackgroundPaint.setXfermode(mDrawBackgroundAsSrc && !mFadingOut && !mParentNotFullyVisible ? mSrcMode : null); invalidate(); @@ -1967,9 +1985,11 @@ public class NotificationStackScrollLayout extends ViewGroup } private void updateBackground() { - if (mAmbientState.isDark()) { + // No need to update the background color if it's not being drawn. + if (!mShouldDrawNotificationBackground || mAmbientState.isDark()) { return; } + updateBackgroundBounds(); if (!mCurrentBounds.equals(mBackgroundBounds)) { boolean animate = mAnimateNextBackgroundTop || mAnimateNextBackgroundBottom @@ -2119,6 +2139,12 @@ public class NotificationStackScrollLayout extends ViewGroup } private void applyCurrentBackgroundBounds() { + // If the background of the notification is not being drawn, then there is no need to + // exclude an area in the scrim. Rather, the scrim's color should serve as the background. + if (!mShouldDrawNotificationBackground) { + return; + } + mScrimController.setExcludedBackgroundArea( mFadingOut || mParentNotFullyVisible || mAmbientState.isDark() || mIsClipped ? null : mCurrentBounds); @@ -3545,16 +3571,29 @@ public class NotificationStackScrollLayout extends ViewGroup } requestChildrenUpdate(); if (dark) { - setWillNotDraw(!DEBUG); mScrimController.setExcludedBackgroundArea(null); } else { updateBackground(); - setWillNotDraw(false); } + + updateWillNotDraw(); updateContentHeight(); notifyHeightChangeListener(mShelf); } + /** + * Updates whether or not this Layout will perform its own custom drawing (i.e. whether or + * not {@link #onDraw(Canvas)} is called). This method should be called whenever the + * {@link #mAmbientState}'s dark mode is toggled. + */ + private void updateWillNotDraw() { + if (mAmbientState.isDark()) { + setWillNotDraw(!DEBUG); + } else { + setWillNotDraw(!mShouldDrawNotificationBackground && !DEBUG); + } + } + private void setBackgroundFadeAmount(float fadeAmount) { mBackgroundFadeAmount = fadeAmount; updateBackgroundDimming(); @@ -4106,14 +4145,14 @@ public class NotificationStackScrollLayout extends ViewGroup * A listener that is notified when some child locations might have changed. */ public interface OnChildLocationsChangedListener { - public void onChildLocationsChanged(NotificationStackScrollLayout stackScrollLayout); + void onChildLocationsChanged(NotificationStackScrollLayout stackScrollLayout); } /** * A listener that is notified when the empty space below the notifications is clicked on */ public interface OnEmptySpaceClickListener { - public void onEmptySpaceClicked(float x, float y); + void onEmptySpaceClicked(float x, float y); } /** @@ -4129,7 +4168,7 @@ public class NotificationStackScrollLayout extends ViewGroup * unrubberbanded motion to directly expand overscroll view (e.g expand * QS) */ - public void onOverscrollTopChanged(float amount, boolean isRubberbanded); + void onOverscrollTopChanged(float amount, boolean isRubberbanded); /** * Notify a listener that the scroller wants to escape from the scrolling motion and @@ -4138,7 +4177,7 @@ public class NotificationStackScrollLayout extends ViewGroup * @param velocity The velocity that the Scroller had when over flinging * @param open Should the fling open or close the overscroll view. */ - public void flingTopOverscroll(float velocity, boolean open); + void flingTopOverscroll(float velocity, boolean open); } private class NotificationSwipeHelper extends SwipeHelper { @@ -4216,7 +4255,7 @@ public class NotificationStackScrollLayout extends ViewGroup final boolean gutsExposed = (view instanceof ExpandableNotificationRow) && ((ExpandableNotificationRow) view).areGutsExposed(); - if (!isPinnedHeadsUp(view) && !gutsExposed) { + if (mShouldShowGear && !isPinnedHeadsUp(view) && !gutsExposed) { // Only show the gear if we're not a heads up view and guts aren't exposed. checkForDrag(); } @@ -4259,11 +4298,19 @@ public class NotificationStackScrollLayout extends ViewGroup return false; // Let SwipeHelper handle it. } + // If the gear icon should not be shown, then there is no need to check if the a swipe + // should result in a snapping to the gear icon. As a result, just check if the swipe + // was enough to dismiss the notification. + if (!mShouldShowGear) { + dismissOrSnapBack(animView, velocity, ev); + return true; + } + boolean gestureTowardsGear = isTowardsGear(velocity, mCurrIconRow.isMenuOnLeft()); boolean gestureFastEnough = Math.abs(velocity) > getEscapeVelocity(); final double timeForGesture = ev.getEventTime() - ev.getDownTime(); final boolean showGearForSlowOnGoing = !canChildBeDismissed(animView) - && timeForGesture >= SWIPE_GEAR_TIMING; + && timeForGesture >= SWIPE_GEAR_TIMING; if (mGearSnappedTo && mCurrIconRow.isVisible()) { if (mGearSnappedOnLeft == mCurrIconRow.isMenuOnLeft()) { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java index 9998283e1a05..3058c0a1e739 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/BatteryPreference.java @@ -22,6 +22,7 @@ import android.util.ArraySet; import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.StatusBarIconController; import static com.android.systemui.BatteryMeterDrawable.SHOW_PERCENT_SETTING; @@ -49,12 +50,12 @@ public class BatteryPreference extends DropDownPreference implements TunerServic super.onAttached(); mHasPercentage = Settings.System.getInt(getContext().getContentResolver(), SHOW_PERCENT_SETTING, 0) != 0; - TunerService.get(getContext()).addTunable(this, StatusBarIconController.ICON_BLACKLIST); + Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_BLACKLIST); } @Override public void onDetached() { - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); super.onDetached(); } @@ -89,7 +90,7 @@ public class BatteryPreference extends DropDownPreference implements TunerServic } else { mBlacklist.remove(mBattery); } - TunerService.get(getContext()).setValue(StatusBarIconController.ICON_BLACKLIST, + Dependency.get(TunerService.class).setValue(StatusBarIconController.ICON_BLACKLIST, TextUtils.join(",", mBlacklist)); return true; } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java index caa0527625d9..014ec9279395 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/ClockPreference.java @@ -18,6 +18,8 @@ import android.support.v7.preference.DropDownPreference; import android.text.TextUtils; import android.util.ArraySet; import android.util.AttributeSet; + +import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.statusbar.policy.Clock; @@ -44,13 +46,13 @@ public class ClockPreference extends DropDownPreference implements TunerService. @Override public void onAttached() { super.onAttached(); - TunerService.get(getContext()).addTunable(this, StatusBarIconController.ICON_BLACKLIST, + Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_BLACKLIST, Clock.CLOCK_SECONDS); } @Override public void onDetached() { - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); super.onDetached(); } @@ -81,13 +83,14 @@ public class ClockPreference extends DropDownPreference implements TunerService. @Override protected boolean persistString(String value) { - TunerService.get(getContext()).setValue(Clock.CLOCK_SECONDS, SECONDS.equals(value) ? 1 : 0); + Dependency.get(TunerService.class).setValue(Clock.CLOCK_SECONDS, SECONDS.equals(value) ? 1 + : 0); if (DISABLED.equals(value)) { mBlacklist.add(mClock); } else { mBlacklist.remove(mClock); } - TunerService.get(getContext()).setValue(StatusBarIconController.ICON_BLACKLIST, + Dependency.get(TunerService.class).setValue(StatusBarIconController.ICON_BLACKLIST, TextUtils.join(",", mBlacklist)); return true; } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java b/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java index 41786b5e53e5..9d579f561ea8 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/LockscreenFragment.java @@ -43,6 +43,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.plugins.IntentButtonProvider.IntentButton; import com.android.systemui.statusbar.phone.ExpandableIndicator; @@ -71,7 +72,7 @@ public class LockscreenFragment extends PreferenceFragment { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - mTunerService = TunerService.get(getContext()); + mTunerService = Dependency.get(TunerService.class); mHandler = new Handler(); addPreferencesFromResource(R.xml.lockscreen_settings); setupGroup((PreferenceGroup) findPreference(KEY_LEFT), LOCKSCREEN_LEFT_BUTTON, diff --git a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java index 9593c45abd03..28a00570a019 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/NavBarTuner.java @@ -51,6 +51,7 @@ import android.util.TypedValue; import android.view.KeyEvent; import android.widget.EditText; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.statusbar.phone.NavigationBarInflaterView; import com.android.systemui.tuner.TunerService.Tunable; @@ -104,12 +105,12 @@ public class NavBarTuner extends PreferenceFragment { @Override public void onDestroy() { super.onDestroy(); - mTunables.forEach(t -> TunerService.get(getContext()).removeTunable(t)); + mTunables.forEach(t -> Dependency.get(TunerService.class).removeTunable(t)); } private void addTunable(Tunable tunable, String... keys) { mTunables.add(tunable); - TunerService.get(getContext()).addTunable(tunable, keys); + Dependency.get(TunerService.class).addTunable(tunable, keys); } private void bindLayout(ListPreference preference) { @@ -123,7 +124,7 @@ public class NavBarTuner extends PreferenceFragment { preference.setOnPreferenceChangeListener((preference1, newValue) -> { String val = (String) newValue; if ("default".equals(val)) val = null; - TunerService.get(getContext()).setValue(NAV_BAR_VIEWS, val); + Dependency.get(TunerService.class).setValue(NAV_BAR_VIEWS, val); return true; }); } @@ -215,7 +216,7 @@ public class NavBarTuner extends PreferenceFragment { } button = button + KEY_CODE_START + code + KEY_IMAGE_DELIM + uri + KEY_CODE_END; } - TunerService.get(getContext()).setValue(setting, button); + Dependency.get(TunerService.class).setValue(setting, button); } private void setupIcons(ListPreference icon) { diff --git a/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java b/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java index e6e8f4e0a100..e7a695fc3efd 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/PreviewNavInflater.java @@ -18,6 +18,7 @@ import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; +import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.NavigationBarInflaterView; public class PreviewNavInflater extends NavigationBarInflaterView { @@ -31,7 +32,7 @@ public class PreviewNavInflater extends NavigationBarInflaterView { super.onAttachedToWindow(); // Immediately remove tuner listening, since this is a preview, all values will be injected // manually. - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java index dea2f5060c3a..8a2407ac1d08 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/StatusBarSwitch.java @@ -25,6 +25,7 @@ import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.systemui.Dependency; import com.android.systemui.statusbar.phone.StatusBarIconController; import com.android.systemui.tuner.TunerService.Tunable; @@ -41,12 +42,12 @@ public class StatusBarSwitch extends SwitchPreference implements Tunable { @Override public void onAttached() { super.onAttached(); - TunerService.get(getContext()).addTunable(this, StatusBarIconController.ICON_BLACKLIST); + Dependency.get(TunerService.class).addTunable(this, StatusBarIconController.ICON_BLACKLIST); } @Override public void onDetached() { - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); super.onDetached(); } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java index 3b14e6069360..74280a315e67 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java @@ -24,6 +24,7 @@ import android.support.v7.preference.PreferenceScreen; import android.util.Log; import com.android.settingslib.drawer.SettingsDrawerActivity; +import com.android.systemui.Dependency; import com.android.systemui.R; public class TunerActivity extends SettingsDrawerActivity implements @@ -36,6 +37,7 @@ public class TunerActivity extends SettingsDrawerActivity implements protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Dependency.initDependencies(this); if (getFragmentManager().findFragmentByTag(TAG_TUNER) == null) { final String action = getIntent().getAction(); diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java index fb94061f4093..ca582b360a48 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java @@ -40,6 +40,7 @@ import android.util.ArraySet; import com.android.systemui.BatteryMeterDrawable; import com.android.systemui.DemoMode; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.SystemUI; import com.android.systemui.SystemUIApplication; @@ -51,7 +52,7 @@ import java.util.HashMap; import java.util.Set; -public class TunerService extends SystemUI { +public class TunerService { public static final String ACTION_CLEAR = "com.android.systemui.action.CLEAR_TUNER"; @@ -64,13 +65,14 @@ public class TunerService extends SystemUI { private final ArrayMap<Uri, String> mListeningUris = new ArrayMap<>(); // Map of settings keys to the listener. private final HashMap<String, Set<Tunable>> mTunableLookup = new HashMap<>(); + private final Context mContext; private ContentResolver mContentResolver; private int mCurrentUser; private CurrentUserTracker mUserTracker; - @Override - public void start() { + public TunerService(Context context) { + mContext = context; mContentResolver = mContext.getContentResolver(); for (UserInfo user : UserManager.get(mContext).getUsers()) { @@ -79,7 +81,6 @@ public class TunerService extends SystemUI { upgradeTuner(getValue(TUNER_VERSION, 0), CURRENT_TUNER_VERSION); } } - putComponent(TunerService.class, this); mCurrentUser = ActivityManager.getCurrentUser(); mUserTracker = new CurrentUserTracker(mContext) { @@ -209,32 +210,6 @@ public class TunerService extends SystemUI { } } - // Only used in other processes, such as the tuner. - private static TunerService sInstance; - - public static TunerService get(Context context) { - TunerService service = null; - if (context.getApplicationContext() instanceof SystemUIApplication) { - SystemUIApplication sysUi = (SystemUIApplication) context.getApplicationContext(); - service = sysUi.getComponent(TunerService.class); - } - if (service == null) { - // Can't get it as a component, must in the tuner, lets just create one for now. - return getStaticService(context); - } - return service; - } - - private static TunerService getStaticService(Context context) { - if (sInstance == null) { - sInstance = new TunerService(); - sInstance.mContext = context.getApplicationContext(); - sInstance.mComponents = new HashMap<>(); - sInstance.start(); - } - return sInstance; - } - public static final void showResetRequest(final Context context, final Runnable onDisabled) { SystemUIDialog dialog = new SystemUIDialog(context); dialog.setShowForAllUsers(true); @@ -310,7 +285,7 @@ public class TunerService extends SystemUI { @Override public void onReceive(Context context, Intent intent) { if (ACTION_CLEAR.equals(intent.getAction())) { - get(context).clearAll(); + Dependency.get(TunerService.class).clearAll(); } } } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java index 5b9ebd7722c6..d5b6ccdeb320 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerSwitch.java @@ -7,6 +7,7 @@ import android.support.v14.preference.SwitchPreference; import android.util.AttributeSet; import com.android.internal.logging.MetricsLogger; +import com.android.systemui.Dependency; import com.android.systemui.R; import com.android.systemui.tuner.TunerService.Tunable; @@ -26,12 +27,12 @@ public class TunerSwitch extends SwitchPreference implements Tunable { @Override public void onAttached() { super.onAttached(); - TunerService.get(getContext()).addTunable(this, getKey().split(",")); + Dependency.get(TunerService.class).addTunable(this, getKey().split(",")); } @Override public void onDetached() { - TunerService.get(getContext()).removeTunable(this); + Dependency.get(TunerService.class).removeTunable(this); super.onDetached(); } diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java index 9a16d6db4bed..43727e07c712 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java +++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java @@ -198,18 +198,19 @@ public class StorageNotification extends SystemUI { rec.getNickname()); final CharSequence text = mContext.getString(R.string.ext_media_missing_message); - Notification.Builder builder = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_sd_card_48dp) - .setColor(mContext.getColor(R.color.system_notification_accent_color)) - .setContentTitle(title) - .setContentText(text) - .setContentIntent(buildForgetPendingIntent(rec)) - .setStyle(new Notification.BigTextStyle().bigText(text)) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setLocalOnly(true) - .setChannel(NotificationChannels.STORAGE) - .setCategory(Notification.CATEGORY_SYSTEM) - .setDeleteIntent(buildSnoozeIntent(fsUuid)); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.STORAGE) + .setSmallIcon(R.drawable.ic_sd_card_48dp) + .setColor(mContext.getColor( + R.color.system_notification_accent_color)) + .setContentTitle(title) + .setContentText(text) + .setContentIntent(buildForgetPendingIntent(rec)) + .setStyle(new Notification.BigTextStyle().bigText(text)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true) + .setCategory(Notification.CATEGORY_SYSTEM) + .setDeleteIntent(buildSnoozeIntent(fsUuid)); SystemUI.overrideNotificationAppName(mContext, builder); mNotificationManager.notifyAsUser(fsUuid, SystemMessage.NOTE_STORAGE_PRIVATE, @@ -226,17 +227,17 @@ public class StorageNotification extends SystemUI { final CharSequence text = mContext.getString( R.string.ext_media_unsupported_notification_message, disk.getDescription()); - Notification.Builder builder = new Notification.Builder(mContext) - .setChannel(NotificationChannels.STORAGE) - .setSmallIcon(getSmallIcon(disk, VolumeInfo.STATE_UNMOUNTABLE)) - .setColor(mContext.getColor(R.color.system_notification_accent_color)) - .setContentTitle(title) - .setContentText(text) - .setContentIntent(buildInitPendingIntent(disk)) - .setStyle(new Notification.BigTextStyle().bigText(text)) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setLocalOnly(true) - .setCategory(Notification.CATEGORY_ERROR); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.STORAGE) + .setSmallIcon(getSmallIcon(disk, VolumeInfo.STATE_UNMOUNTABLE)) + .setColor(mContext.getColor(R.color.system_notification_accent_color)) + .setContentTitle(title) + .setContentText(text) + .setContentIntent(buildInitPendingIntent(disk)) + .setStyle(new Notification.BigTextStyle().bigText(text)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true) + .setCategory(Notification.CATEGORY_ERROR); SystemUI.overrideNotificationAppName(mContext, builder); mNotificationManager.notifyAsUser(disk.getId(), SystemMessage.NOTE_STORAGE_DISK, @@ -475,19 +476,19 @@ public class StorageNotification extends SystemUI { intent = buildWizardMigratePendingIntent(move); } - Notification.Builder builder = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_sd_card_48dp) - .setColor(mContext.getColor(R.color.system_notification_accent_color)) - .setContentTitle(title) - .setContentText(text) - .setContentIntent(intent) - .setStyle(new Notification.BigTextStyle().bigText(text)) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setLocalOnly(true) - .setChannel(NotificationChannels.STORAGE) - .setCategory(Notification.CATEGORY_PROGRESS) - .setProgress(100, status, false) - .setOngoing(true); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.STORAGE) + .setSmallIcon(R.drawable.ic_sd_card_48dp) + .setColor(mContext.getColor(R.color.system_notification_accent_color)) + .setContentTitle(title) + .setContentText(text) + .setContentIntent(intent) + .setStyle(new Notification.BigTextStyle().bigText(text)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true) + .setCategory(Notification.CATEGORY_PROGRESS) + .setProgress(100, status, false) + .setOngoing(true); SystemUI.overrideNotificationAppName(mContext, builder); mNotificationManager.notifyAsUser(move.packageName, SystemMessage.NOTE_STORAGE_MOVE, @@ -526,18 +527,18 @@ public class StorageNotification extends SystemUI { intent = null; } - Notification.Builder builder = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.ic_sd_card_48dp) - .setColor(mContext.getColor(R.color.system_notification_accent_color)) - .setContentTitle(title) - .setContentText(text) - .setContentIntent(intent) - .setStyle(new Notification.BigTextStyle().bigText(text)) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setLocalOnly(true) - .setCategory(Notification.CATEGORY_SYSTEM) - .setChannel(NotificationChannels.STORAGE) - .setAutoCancel(true); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.STORAGE) + .setSmallIcon(R.drawable.ic_sd_card_48dp) + .setColor(mContext.getColor(R.color.system_notification_accent_color)) + .setContentTitle(title) + .setContentText(text) + .setContentIntent(intent) + .setStyle(new Notification.BigTextStyle().bigText(text)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true) + .setCategory(Notification.CATEGORY_SYSTEM) + .setAutoCancel(true); SystemUI.overrideNotificationAppName(mContext, builder); mNotificationManager.notifyAsUser(move.packageName, SystemMessage.NOTE_STORAGE_MOVE, @@ -562,15 +563,15 @@ public class StorageNotification extends SystemUI { private Notification.Builder buildNotificationBuilder(VolumeInfo vol, CharSequence title, CharSequence text) { - Notification.Builder builder = new Notification.Builder(mContext) - .setChannel(NotificationChannels.STORAGE) - .setSmallIcon(getSmallIcon(vol.getDisk(), vol.getState())) - .setColor(mContext.getColor(R.color.system_notification_accent_color)) - .setContentTitle(title) - .setContentText(text) - .setStyle(new Notification.BigTextStyle().bigText(text)) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setLocalOnly(true); + Notification.Builder builder = + new Notification.Builder(mContext, NotificationChannels.STORAGE) + .setSmallIcon(getSmallIcon(vol.getDisk(), vol.getState())) + .setColor(mContext.getColor(R.color.system_notification_accent_color)) + .setContentTitle(title) + .setContentText(text) + .setStyle(new Notification.BigTextStyle().bigText(text)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); overrideNotificationAppName(mContext, builder); return builder; } diff --git a/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java b/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java index 6bb8aea6c95e..15ad0ce5b51b 100644 --- a/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java +++ b/packages/SystemUI/src/com/android/systemui/util/NotificationChannels.java @@ -27,8 +27,7 @@ import java.util.Arrays; public class NotificationChannels extends SystemUI { public static String ALERTS = "ALR"; public static String SCREENSHOTS = "SCN"; - public static String SECURITY = "SEC"; - public static String USER = "USR"; + public static String GENERAL = "GEN"; public static String STORAGE = "DSK"; @VisibleForTesting @@ -42,14 +41,10 @@ public class NotificationChannels extends SystemUI { new NotificationChannel( SCREENSHOTS, context.getString(R.string.notification_channel_screenshot), - NotificationManager.IMPORTANCE_DEFAULT), + NotificationManager.IMPORTANCE_LOW), new NotificationChannel( - SECURITY, - context.getString(R.string.notification_channel_security), - NotificationManager.IMPORTANCE_HIGH), - new NotificationChannel( - USER, - context.getString(R.string.notification_channel_user_status), + GENERAL, + context.getString(R.string.notification_channel_general), NotificationManager.IMPORTANCE_MIN), new NotificationChannel( STORAGE, diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index d057d863e9ef..b9cb5750e333 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -69,6 +69,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import com.android.settingslib.Utils; +import com.android.systemui.Dependency; import com.android.systemui.Interpolators; import com.android.systemui.R; import com.android.systemui.statusbar.policy.ZenModeController; @@ -165,7 +166,7 @@ public class VolumeDialog implements TunerService.Tunable { controller.addCallback(mControllerCallbackH, mHandler); controller.getState(); - TunerService.get(mContext).addTunable(this, SHOW_FULL_ZEN); + Dependency.get(TunerService.class).addTunable(this, SHOW_FULL_ZEN); final Configuration currentConfig = mContext.getResources().getConfiguration(); mDensity = currentConfig.densityDpi; diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java index 78145fe73dfc..0a1d34ff701e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java @@ -72,7 +72,7 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna mDialog = new VolumeDialog(context, WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY, mController, mZenModeController, mVolumeDialogCallback); applyConfiguration(); - TunerService.get(mContext).addTunable(this, VOLUME_DOWN_SILENT, VOLUME_UP_SILENT, + Dependency.get(TunerService.class).addTunable(this, VOLUME_DOWN_SILENT, VOLUME_UP_SILENT, VOLUME_SILENT_DO_NOT_DISTURB); } diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index c627e224dee8..cefade086795 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -43,6 +43,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v17-leanback LOCAL_STATIC_JAVA_LIBRARIES := \ + metrics-helper-lib \ android-support-test \ mockito-updated-target-minus-junit4 \ SystemUI-proto \ diff --git a/packages/SystemUI/tests/AndroidManifest.xml b/packages/SystemUI/tests/AndroidManifest.xml index 408e8f3298af..6d6243520b5b 100644 --- a/packages/SystemUI/tests/AndroidManifest.xml +++ b/packages/SystemUI/tests/AndroidManifest.xml @@ -17,6 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.systemui.tests"> + <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <uses-permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE" /> <uses-permission android:name="android.permission.INJECT_EVENTS" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" /> diff --git a/packages/SystemUI/tests/src/com/android/systemui/FragmentTestCase.java b/packages/SystemUI/tests/src/com/android/systemui/FragmentTestCase.java index 447edace3028..f8f67bb15c29 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/FragmentTestCase.java +++ b/packages/SystemUI/tests/src/com/android/systemui/FragmentTestCase.java @@ -19,13 +19,17 @@ import android.app.Fragment; import android.app.FragmentController; import android.app.FragmentHostCallback; import android.app.FragmentManagerNonConfig; +import android.graphics.PixelFormat; import android.os.Handler; -import android.os.HandlerThread; +import android.os.Looper; import android.os.Parcelable; import android.view.LayoutInflater; import android.view.View; +import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; import android.widget.FrameLayout; +import com.android.systemui.utils.ViewUtils; import com.android.systemui.utils.leaks.LeakCheckedTest; import org.junit.After; @@ -45,7 +49,6 @@ public abstract class FragmentTestCase extends LeakCheckedTest { private static final int VIEW_ID = 42; private final Class<? extends Fragment> mCls; - private HandlerThread mHandlerThread; private Handler mHandler; private FrameLayout mView; protected FragmentController mFragments; @@ -59,9 +62,7 @@ public abstract class FragmentTestCase extends LeakCheckedTest { public void setupFragment() throws IllegalAccessException, InstantiationException { mView = new FrameLayout(mContext); mView.setId(VIEW_ID); - mHandlerThread = new HandlerThread("FragmentTestThread"); - mHandlerThread.start(); - mHandler = new Handler(mHandlerThread.getLooper()); + mHandler = new Handler(Looper.getMainLooper()); mFragment = mCls.newInstance(); postAndWait(() -> { mFragments = FragmentController.createController(new HostCallbacks()); @@ -78,7 +79,6 @@ public abstract class FragmentTestCase extends LeakCheckedTest { // Set mFragments to null to let it know not to destroy. postAndWait(() -> mFragments.dispatchDestroy()); } - mHandlerThread.quit(); } @Test @@ -100,6 +100,26 @@ public abstract class FragmentTestCase extends LeakCheckedTest { } @Test + public void testAttachDetach() { + WindowManager.LayoutParams lp = new WindowManager.LayoutParams( + LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, + LayoutParams.TYPE_SYSTEM_ALERT, + 0, PixelFormat.TRANSLUCENT); + postAndWait(() -> mFragments.dispatchResume()); + attachFragmentToWindow(); + detachFragmentToWindow(); + postAndWait(() -> mFragments.dispatchPause()); + } + + protected void attachFragmentToWindow() { + ViewUtils.attachView(mView); + } + + protected void detachFragmentToWindow() { + ViewUtils.detachView(mView); + } + + @Test public void testRecreate() { postAndWait(() -> mFragments.dispatchResume()); postAndWait(() -> { diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java index f258e5d17be4..81a50d9fca58 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java @@ -65,7 +65,7 @@ public abstract class SysuiTestCase { waitForIdleSync(mHandler); } - protected void waitForIdleSync(Handler h) { + public static void waitForIdleSync(Handler h) { validateThread(h.getLooper()); Idler idler = new Idler(null); h.getLooper().getQueue().addIdleHandler(idler); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java index 53450317ccf8..29d5a36be0b3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java @@ -42,6 +42,7 @@ import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.UserSwitcherController; import com.android.systemui.statusbar.policy.ZenModeController; import com.android.systemui.tuner.TunerService; +import com.android.systemui.utils.leaks.LeakCheckedTest; import org.junit.Before; import org.junit.Test; @@ -60,11 +61,7 @@ public class QSFragmentTest extends FragmentTestCase { public void addLeakCheckDependencies() { injectTestDependency(Dependency.BG_LOOPER, Looper.getMainLooper()); injectMockDependency(UserSwitcherController.class); - injectLeakCheckedDependencies(BluetoothController.class, LocationController.class, - RotationLockController.class, NetworkController.class, ZenModeController.class, - HotspotController.class, CastController.class, FlashlightController.class, - UserInfoController.class, KeyguardMonitor.class, SecurityController.class, - BatteryController.class, NextAlarmController.class); + injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES); } @Test @@ -88,6 +85,6 @@ public class QSFragmentTest extends FragmentTestCase { host.destroy(); // Ensure the tuner cleans up its persistent listeners. - TunerService.get(mContext).destroy(); + Dependency.get(TunerService.class).destroy(); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java new file mode 100644 index 000000000000..71411706c4a9 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.statusbar; + +import com.android.systemui.utils.ViewUtils; +import com.android.systemui.utils.leaks.LeakCheckedTest; + +import org.junit.Before; +import org.junit.Test; + +public class NotificationMenuRowTest extends LeakCheckedTest { + + @Before + public void setup() { + injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES); + } + + @Test + public void testAttachDetach() { + NotificationMenuRow row = new NotificationMenuRow(mContext); + ViewUtils.attachView(row); + ViewUtils.detachView(row); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java index e28d0773b2f9..a9d6df768fa9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java @@ -40,6 +40,7 @@ public class NavigationBarFragmentTest extends FragmentTestCase { mContext.putComponent(Recents.class, mock(Recents.class)); mContext.putComponent(Divider.class, mock(Divider.class)); mContext.addMockSystemService(Context.WINDOW_SERVICE, mock(WindowManager.class)); + injectLeakCheckedDependencies(ALL_SUPPORTED_CLASSES); } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 309559b6b3ff..21c7fce44579 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -22,11 +22,20 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import android.metrics.LogMaker; +import android.metrics.MetricsReader; import android.support.test.filters.SmallTest; +import android.support.test.metricshelper.MetricsAsserts; import android.support.test.runner.AndroidJUnit4; +import android.util.DisplayMetrics; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.keyguard.KeyguardHostView.OnDismissAction; import com.android.systemui.SysuiTestCase; +import com.android.systemui.statusbar.ActivatableNotificationView; +import com.android.systemui.statusbar.KeyguardIndicationController; +import com.android.systemui.statusbar.NotificationData; +import com.android.systemui.statusbar.stack.NotificationStackScrollLayout; import org.junit.Before; import org.junit.Test; @@ -37,12 +46,22 @@ import org.junit.runner.RunWith; public class StatusBarTest extends SysuiTestCase { StatusBarKeyguardViewManager mStatusBarKeyguardViewManager; + UnlockMethodCache mUnlockMethodCache; + KeyguardIndicationController mKeyguardIndicationController; + NotificationStackScrollLayout mStackScroller; StatusBar mStatusBar; + private MetricsReader mMetricsReader; + private DisplayMetrics mDisplayMetrics = new DisplayMetrics(); + @Before public void setup() { mStatusBarKeyguardViewManager = mock(StatusBarKeyguardViewManager.class); - mStatusBar = new TestableStatusBar(mStatusBarKeyguardViewManager); + mUnlockMethodCache = mock(UnlockMethodCache.class); + mKeyguardIndicationController = mock(KeyguardIndicationController.class); + mStackScroller = mock(NotificationStackScrollLayout.class); + mStatusBar = new TestableStatusBar(mStatusBarKeyguardViewManager, mUnlockMethodCache, + mKeyguardIndicationController, mStackScroller); doAnswer(invocation -> { OnDismissAction onDismissAction = (OnDismissAction) invocation.getArguments()[0]; @@ -55,6 +74,11 @@ public class StatusBarTest extends SysuiTestCase { runnable.run(); return null; }).when(mStatusBarKeyguardViewManager).addAfterKeyguardGoneRunnable(any()); + + when(mStackScroller.getActivatedChild()).thenReturn(null); + + mMetricsReader = new MetricsReader(); + mMetricsReader.checkpoint(); // clear out old logs } @Test @@ -81,9 +105,114 @@ public class StatusBarTest extends SysuiTestCase { mStatusBar.executeRunnableDismissingKeyguard(null, null, false, false, false); } + @Test + public void lockscreenStateMetrics_notShowing() { + // uninteresting state, except that fingerprint must be non-zero + when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false); + when(mUnlockMethodCache.canSkipBouncer()).thenReturn(true); + // interesting state + when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(false); + when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false); + when(mUnlockMethodCache.isMethodSecure()).thenReturn(false); + + mStatusBar.onKeyguardViewManagerStatesUpdated(); + + MetricsAsserts.assertHasLog("missing hidden insecure lockscreen log", mMetricsReader, + new LogMaker(MetricsEvent.LOCKSCREEN) + .setType(MetricsEvent.TYPE_CLOSE) + .setSubtype(0)); + } + + @Test + public void lockscreenStateMetrics_notShowing_secure() { + // uninteresting state, except that fingerprint must be non-zero + when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false); + when(mUnlockMethodCache.canSkipBouncer()).thenReturn(true); + // interesting state + when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(false); + when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false); + when(mUnlockMethodCache.isMethodSecure()).thenReturn(true); + + mStatusBar.onKeyguardViewManagerStatesUpdated(); + + MetricsAsserts.assertHasLog("missing hidden secure lockscreen log", mMetricsReader, + new LogMaker(MetricsEvent.LOCKSCREEN) + .setType(MetricsEvent.TYPE_CLOSE) + .setSubtype(1)); + } + + @Test + public void lockscreenStateMetrics_isShowing() { + // uninteresting state, except that fingerprint must be non-zero + when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false); + when(mUnlockMethodCache.canSkipBouncer()).thenReturn(true); + // interesting state + when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true); + when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false); + when(mUnlockMethodCache.isMethodSecure()).thenReturn(false); + + mStatusBar.onKeyguardViewManagerStatesUpdated(); + + MetricsAsserts.assertHasLog("missing insecure lockscreen showing", mMetricsReader, + new LogMaker(MetricsEvent.LOCKSCREEN) + .setType(MetricsEvent.TYPE_OPEN) + .setSubtype(0)); + } + + @Test + public void lockscreenStateMetrics_isShowing_secure() { + // uninteresting state, except that fingerprint must be non-zero + when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false); + when(mUnlockMethodCache.canSkipBouncer()).thenReturn(true); + // interesting state + when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true); + when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(false); + when(mUnlockMethodCache.isMethodSecure()).thenReturn(true); + + mStatusBar.onKeyguardViewManagerStatesUpdated(); + + MetricsAsserts.assertHasLog("missing secure lockscreen showing log", mMetricsReader, + new LogMaker(MetricsEvent.LOCKSCREEN) + .setType(MetricsEvent.TYPE_OPEN) + .setSubtype(1)); + } + + @Test + public void lockscreenStateMetrics_isShowingBouncer() { + // uninteresting state, except that fingerprint must be non-zero + when(mStatusBarKeyguardViewManager.isOccluded()).thenReturn(false); + when(mUnlockMethodCache.canSkipBouncer()).thenReturn(true); + // interesting state + when(mStatusBarKeyguardViewManager.isShowing()).thenReturn(true); + when(mStatusBarKeyguardViewManager.isBouncerShowing()).thenReturn(true); + when(mUnlockMethodCache.isMethodSecure()).thenReturn(true); + + mStatusBar.onKeyguardViewManagerStatesUpdated(); + + MetricsAsserts.assertHasLog("missing bouncer log", mMetricsReader, + new LogMaker(MetricsEvent.BOUNCER) + .setType(MetricsEvent.TYPE_OPEN) + .setSubtype(1)); + } + + @Test + public void onActivatedMetrics() { + ActivatableNotificationView view = mock(ActivatableNotificationView.class); + mStatusBar.onActivated(view); + + MetricsAsserts.assertHasLog("missing lockscreen note tap log", mMetricsReader, + new LogMaker(MetricsEvent.ACTION_LS_NOTE) + .setType(MetricsEvent.TYPE_ACTION)); + } + static class TestableStatusBar extends StatusBar { - public TestableStatusBar(StatusBarKeyguardViewManager man) { + public TestableStatusBar(StatusBarKeyguardViewManager man, + UnlockMethodCache unlock, KeyguardIndicationController key, + NotificationStackScrollLayout stack) { mStatusBarKeyguardViewManager = man; + mUnlockMethodCache = unlock; + mKeyguardIndicationController = key; + mStackScroller = stack; } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/ChannelsTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/ChannelsTest.java index 8949598b029c..f67296d9905a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/ChannelsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/ChannelsTest.java @@ -55,9 +55,8 @@ public class ChannelsTest extends SysuiTestCase { Set<String> ALL_CHANNELS = new ArraySet<>(Arrays.asList( NotificationChannels.ALERTS, NotificationChannels.SCREENSHOTS, - NotificationChannels.SECURITY, - NotificationChannels.USER, - NotificationChannels.STORAGE + NotificationChannels.STORAGE, + NotificationChannels.GENERAL )); NotificationChannels.createAll(mContext); ArgumentCaptor<List> captor = ArgumentCaptor.forClass(List.class); diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/ViewUtils.java b/packages/SystemUI/tests/src/com/android/systemui/utils/ViewUtils.java new file mode 100644 index 000000000000..01996ca85835 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/ViewUtils.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.utils; + +import android.graphics.PixelFormat; +import android.os.Handler; +import android.os.Looper; +import android.view.View; +import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; +import android.support.test.InstrumentationRegistry; + +import com.android.systemui.SysuiTestCase; + +public class ViewUtils { + + public static void attachView(View view) { + WindowManager.LayoutParams lp = new WindowManager.LayoutParams( + LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, + LayoutParams.TYPE_SYSTEM_ALERT, + 0, PixelFormat.TRANSLUCENT); + Handler handler = new Handler(Looper.getMainLooper()); + handler.post(() -> InstrumentationRegistry.getContext() + .getSystemService(WindowManager.class).addView(view, lp)); + SysuiTestCase.waitForIdleSync(handler); + } + + public static void detachView(View view) { + Handler handler = new Handler(Looper.getMainLooper()); + handler.post(() -> InstrumentationRegistry.getContext() + .getSystemService(WindowManager.class).removeView(view)); + SysuiTestCase.waitForIdleSync(handler); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakePluginManager.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakePluginManager.java new file mode 100644 index 000000000000..d1abccaa6e76 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakePluginManager.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.utils.leaks; + +import android.content.Context; + +import com.android.systemui.plugins.Plugin; +import com.android.systemui.plugins.PluginListener; +import com.android.systemui.plugins.PluginManager; + +public class FakePluginManager extends PluginManager { + + private final BaseLeakChecker<PluginListener> mLeakChecker; + + public FakePluginManager(Context context, LeakCheckedTest test) { + super(context); + mLeakChecker = new BaseLeakChecker<>(test, "Plugin"); + } + + @Override + public <T extends Plugin> void addPluginListener(String action, PluginListener<T> listener, + int version) { + mLeakChecker.addCallback(listener); + } + + @Override + public <T extends Plugin> void addPluginListener(String action, PluginListener<T> listener, + int version, boolean allowMultiple) { + mLeakChecker.addCallback(listener); + } + + @Override + public void removePluginListener(PluginListener<?> listener) { + mLeakChecker.removeCallback(listener); + } + + @Override + public <T extends Plugin> T getOneShotPlugin(String action, int version) { + return null; + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeTunerService.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeTunerService.java new file mode 100644 index 000000000000..f553277e6e33 --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeTunerService.java @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.utils.leaks; + +import android.content.Context; + +import com.android.systemui.tuner.TunerService; + +public class FakeTunerService extends TunerService { + + private final BaseLeakChecker<Tunable> mBaseLeakChecker; + + public FakeTunerService(Context context, LeakCheckedTest test) { + super(context); + mBaseLeakChecker = new BaseLeakChecker<>(test, "tunable"); + } + + @Override + public void addTunable(Tunable tunable, String... keys) { + for (String key : keys) { + tunable.onTuningChanged(key, null); + } + mBaseLeakChecker.addCallback(tunable); + } + + @Override + public void removeTunable(Tunable tunable) { + mBaseLeakChecker.removeCallback(tunable); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java index c182493cf570..c2048c7884de 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/LeakCheckedTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.doAnswer; import android.util.ArrayMap; import com.android.systemui.SysuiTestCase; +import com.android.systemui.plugins.PluginManager; import com.android.systemui.statusbar.phone.ManagedProfileController; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BluetoothController; @@ -35,6 +36,7 @@ import com.android.systemui.statusbar.policy.RotationLockController; import com.android.systemui.statusbar.policy.SecurityController; import com.android.systemui.statusbar.policy.UserInfoController; import com.android.systemui.statusbar.policy.ZenModeController; +import com.android.systemui.tuner.TunerService; import org.junit.Assert; import org.junit.Rule; @@ -56,6 +58,25 @@ public abstract class LeakCheckedTest extends SysuiTestCase { private final Map<String, Tracker> mTrackers = new HashMap<>(); private final Map<Class, Object> mLeakCheckers = new ArrayMap<>(); + public static final Class<?>[] ALL_SUPPORTED_CLASSES = new Class[] { + BluetoothController.class, + LocationController.class, + RotationLockController.class, + ZenModeController.class, + CastController.class, + HotspotController.class, + FlashlightController.class, + UserInfoController.class, + KeyguardMonitor.class, + BatteryController.class, + SecurityController.class, + ManagedProfileController.class, + NextAlarmController.class, + NetworkController.class, + PluginManager.class, + TunerService.class, + }; + @Rule public TestWatcher successWatcher = new TestWatcher() { @Override @@ -96,6 +117,10 @@ public abstract class LeakCheckedTest extends SysuiTestCase { obj = new FakeNextAlarmController(this); } else if (cls == NetworkController.class) { obj = new FakeNetworkController(this); + } else if (cls == PluginManager.class) { + obj = new FakePluginManager(mContext, this); + } else if (cls == TunerService.class) { + obj = new FakeTunerService(mContext, this); } else { Assert.fail(cls.getName() + " is not supported by LeakCheckedTest yet"); } diff --git a/preloaded-classes b/preloaded-classes index 2fad5dd04a82..7dc5a256bb87 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -1,3 +1,28 @@ +# +# Copyright (C) 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +# +# Preloaded-classes filter file for phones. +# +# Classes in this file will be allocated into the boot image, and forcibly initialized in +# the zygote during initialization. This is a trade-off, using virtual address space to share +# common heap between apps. +# +# This file has been derived for mainline phone (and tablet) usage. +# [B [C [D @@ -9,7 +34,6 @@ [Landroid.animation.Keyframe$FloatKeyframe; [Landroid.animation.Keyframe$IntKeyframe; [Landroid.animation.Keyframe$ObjectKeyframe; -[Landroid.animation.Keyframe; [Landroid.animation.PropertyValuesHolder; [Landroid.app.LoaderManagerImpl; [Landroid.content.ContentProviderResult; @@ -57,45 +81,45 @@ [Landroid.hardware.soundtrigger.SoundTrigger$Keyphrase; [Landroid.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionExtra; [Landroid.icu.impl.CacheValue$Strength; +[Landroid.icu.impl.CacheValue; +[Landroid.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingPattern; +[Landroid.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingType; [Landroid.icu.impl.ICUResourceBundle$OpenType; [Landroid.icu.impl.StandardPlural; [Landroid.icu.impl.Trie2$ValueWidth; [Landroid.icu.impl.UCharacterProperty$BinaryProperty; [Landroid.icu.impl.UCharacterProperty$IntProperty; -[Landroid.icu.lang.UScript$ScriptUsage; -[Landroid.icu.text.DateFormat$BooleanAttribute; -[Landroid.icu.text.DateFormat$Field; +[Landroid.icu.text.DateFormatSymbols$CalendarDataSink$AliasType; [Landroid.icu.text.DateFormatSymbols$CapitalizationContextUsage; -[Landroid.icu.text.DateTimePatternGenerator$DTPGflags; [Landroid.icu.text.DisplayContext$Type; [Landroid.icu.text.DisplayContext; -[Landroid.icu.text.MessagePattern$ApostropheMode; -[Landroid.icu.text.MessagePattern$ArgType; -[Landroid.icu.text.MessagePattern$Part$Type; [Landroid.icu.text.PluralRules$Operand; [Landroid.icu.text.PluralRules$PluralType; [Landroid.icu.text.PluralRules$SampleType; +[Landroid.icu.text.TimeZoneNames$NameType; [Landroid.icu.text.UnicodeSet; [Landroid.icu.util.BytesTrie$Result; -[Landroid.icu.util.Calendar$CalType; [Landroid.icu.util.Currency$CurrencyUsage; [Landroid.icu.util.ULocale$Category; [Landroid.icu.util.ULocale; +[Landroid.icu.util.UResourceBundle$RootType; [Landroid.media.AudioGain; +[Landroid.media.MediaCodecInfo$CodecProfileLevel; [Landroid.net.Network; [Landroid.net.NetworkInfo$DetailedState; [Landroid.net.NetworkInfo$State; +[Landroid.net.NetworkRequest$Type; [Landroid.net.Uri; [Landroid.net.wifi.SupplicantState; [Landroid.os.AsyncTask$Status; -[Landroid.os.Bundle; +[Landroid.os.IBinder; [Landroid.os.MessageQueue$IdleHandler; [Landroid.os.Parcel; -[Landroid.os.ParcelFileDescriptor; [Landroid.os.Parcelable; [Landroid.os.PatternMatcher; [Landroid.os.storage.StorageVolume; [Landroid.system.StructPollfd; +[Landroid.telephony.TelephonyManager$MultiSimVariants; [Landroid.text.DynamicLayout$ChangeWatcher; [Landroid.text.InputFilter; [Landroid.text.Layout$Alignment; @@ -124,9 +148,7 @@ [Landroid.util.Range; [Landroid.util.Rational; [Landroid.view.Choreographer$CallbackQueue; -[Landroid.view.Display$ColorTransform; [Landroid.view.Display$Mode; -[Landroid.view.Display; [Landroid.view.HandlerActionQueue$HandlerAction; [Landroid.view.MenuItem; [Landroid.view.View; @@ -146,18 +168,22 @@ [Lcom.android.org.bouncycastle.asn1.ASN1ObjectIdentifier; [Lcom.android.org.conscrypt.OpenSSLX509CertPath$Encoding; [Lcom.android.org.conscrypt.OpenSSLX509Certificate; +[Lcom.android.org.conscrypt.ct.CTLogInfo; [Ldalvik.system.DexPathList$Element; -[Ljava.beans.PropertyChangeListener; +[Ldalvik.system.DexPathList$NativeLibraryElement; [Ljava.io.File$PathStatus; [Ljava.io.File; [Ljava.io.FileDescriptor; [Ljava.io.IOException; +[Ljava.io.ObjectInputStream$HandleTable$HandleList; [Ljava.io.ObjectStreamField; +[Ljava.lang.Boolean; [Ljava.lang.Byte; [Ljava.lang.CharSequence; [Ljava.lang.Character$UnicodeBlock; [Ljava.lang.Character; [Ljava.lang.Class; +[Ljava.lang.Comparable; [Ljava.lang.Enum; [Ljava.lang.Integer; [Ljava.lang.Long; @@ -174,21 +200,20 @@ [Ljava.lang.Throwable; [Ljava.lang.Void; [Ljava.lang.annotation.Annotation; -[Ljava.lang.ref.SoftReference; +[Ljava.lang.invoke.MethodType; [Ljava.lang.ref.WeakReference; [Ljava.lang.reflect.AccessibleObject; [Ljava.lang.reflect.Constructor; [Ljava.lang.reflect.Field; [Ljava.lang.reflect.Method; +[Ljava.lang.reflect.Parameter; [Ljava.lang.reflect.Type; [Ljava.lang.reflect.TypeVariable; -[Ljava.math.BigDecimal; [Ljava.math.BigInteger; [Ljava.math.RoundingMode; [Ljava.net.InetAddress; -[Ljava.net.InterfaceAddress; -[Ljava.net.NetworkInterface; [Ljava.net.Proxy$Type; +[Ljava.nio.file.attribute.FileAttribute; [Ljava.security.CryptoPrimitive; [Ljava.security.Provider; [Ljava.security.cert.Certificate; @@ -200,30 +225,31 @@ [Ljava.util.Enumeration; [Ljava.util.Formatter$Flags; [Ljava.util.Formatter$FormatString; -[Ljava.util.HashMap$HashMapEntry; +[Ljava.util.HashMap$Node; [Ljava.util.Hashtable$HashtableEntry; -[Ljava.util.List; [Ljava.util.Locale$Category; [Ljava.util.Locale; [Ljava.util.Map$Entry; [Ljava.util.WeakHashMap$Entry; +[Ljava.util.concurrent.ConcurrentHashMap$CounterCell; [Ljava.util.concurrent.ConcurrentHashMap$Node; [Ljava.util.concurrent.ConcurrentHashMap$Segment; +[Ljava.util.concurrent.ForkJoinTask$ExceptionNode; [Ljava.util.concurrent.RunnableScheduledFuture; [Ljava.util.concurrent.TimeUnit; [Ljava.util.logging.Handler; [Ljava.util.regex.Pattern; -[Ljavax.crypto.Cipher$InitType; -[Ljavax.crypto.Cipher$NeedToSet; [Ljavax.net.ssl.KeyManager; [Ljavax.net.ssl.TrustManager; [Ljavax.security.cert.X509Certificate; [Llibcore.io.ClassPathURLStreamHandler; +[Llibcore.io.IoTracker$Mode; [Llibcore.reflect.AnnotationMember$DefaultValues; [Llibcore.reflect.AnnotationMember; [Lorg.apache.http.Header; [Lorg.json.JSONStringer$Scope; [Lorg.kxml2.io.KXmlParser$ValueContext; +[Lsun.misc.FDBigInteger; [Lsun.misc.FormattedFloatingDecimal$Form; [Lsun.security.jca.ProviderConfig; [Lsun.security.jca.ServiceId; @@ -244,31 +270,22 @@ [[Ljava.lang.Object; [[Ljava.lang.String; [[Ljava.lang.annotation.Annotation; -[[S [[[I android.R$styleable android.accounts.Account android.accounts.Account$1 android.accounts.AccountManager android.accounts.AccountManager$1 -android.accounts.AccountManager$11 -android.accounts.AccountManager$AmsTask -android.accounts.AccountManager$AmsTask$1 -android.accounts.AccountManager$AmsTask$Response -android.accounts.AccountManagerCallback android.accounts.AccountManagerFuture android.accounts.AccountsException android.accounts.AuthenticatorException android.accounts.IAccountManager android.accounts.IAccountManager$Stub android.accounts.IAccountManager$Stub$Proxy -android.accounts.IAccountManagerResponse -android.accounts.IAccountManagerResponse$Stub android.accounts.OnAccountsUpdateListener android.accounts.OperationCanceledException android.animation.AnimationHandler android.animation.AnimationHandler$1 -android.animation.AnimationHandler$2 android.animation.AnimationHandler$AnimationFrameCallback android.animation.AnimationHandler$AnimationFrameCallbackProvider android.animation.AnimationHandler$MyFrameCallbackProvider @@ -277,12 +294,15 @@ android.animation.Animator$AnimatorConstantState android.animation.Animator$AnimatorListener android.animation.Animator$AnimatorPauseListener android.animation.AnimatorInflater -android.animation.AnimatorInflater$PathDataEvaluator android.animation.AnimatorListenerAdapter android.animation.AnimatorSet -android.animation.AnimatorSet$AnimatorSetListener +android.animation.AnimatorSet$1 +android.animation.AnimatorSet$2 +android.animation.AnimatorSet$3 +android.animation.AnimatorSet$AnimationEvent android.animation.AnimatorSet$Builder android.animation.AnimatorSet$Node +android.animation.AnimatorSet$SeekState android.animation.ArgbEvaluator android.animation.FloatEvaluator android.animation.FloatKeyframeSet @@ -299,14 +319,13 @@ android.animation.Keyframes$IntKeyframes android.animation.LayoutTransition android.animation.LayoutTransition$TransitionListener android.animation.ObjectAnimator -android.animation.PathKeyframes -android.animation.PathKeyframes$1 -android.animation.PathKeyframes$2 android.animation.PathKeyframes$FloatKeyframesBase +android.animation.PathKeyframes$IntKeyframesBase android.animation.PathKeyframes$SimpleKeyframes android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder$FloatPropertyValuesHolder android.animation.PropertyValuesHolder$IntPropertyValuesHolder +android.animation.PropertyValuesHolder$PropertyValues android.animation.RectEvaluator android.animation.StateListAnimator android.animation.StateListAnimator$1 @@ -316,12 +335,15 @@ android.animation.TimeInterpolator android.animation.TypeEvaluator android.animation.ValueAnimator android.animation.ValueAnimator$AnimatorUpdateListener +android.app.-$Lambda$36$c44uHH2WE4sJvw5tZZB6gRzEaHI +android.app.-$Lambda$39$c44uHH2WE4sJvw5tZZB6gRzEaHI +android.app.-$Lambda$7$u_rp3dnwvfyMTggc6hVftcuYJ3E android.app.ActionBar android.app.ActionBar$LayoutParams android.app.Activity android.app.Activity$HostCallbacks android.app.ActivityManager -android.app.ActivityManager$MemoryInfo +android.app.ActivityManager$1 android.app.ActivityManager$RunningAppProcessInfo android.app.ActivityManager$RunningAppProcessInfo$1 android.app.ActivityManager$StackId @@ -357,20 +379,17 @@ android.app.AppGlobals android.app.AppOpsManager android.app.Application android.app.Application$ActivityLifecycleCallbacks -android.app.ApplicationErrorReport android.app.ApplicationErrorReport$CrashInfo android.app.ApplicationLoaders android.app.ApplicationPackageManager android.app.ApplicationPackageManager$ResourceName android.app.BackStackRecord android.app.BackStackRecord$Op -android.app.BackStackRecord$TransitionState android.app.ContentProviderHolder android.app.ContentProviderHolder$1 android.app.ContextImpl android.app.ContextImpl$ApplicationContentResolver android.app.Dialog -android.app.Dialog$-void__init__android_content_Context_context_int_themeResId_boolean_createContextThemeWrapper_LambdaImpl0 android.app.Dialog$ListenersHandler android.app.DialogFragment android.app.DownloadManager @@ -383,7 +402,10 @@ android.app.FragmentManager android.app.FragmentManager$BackStackEntry android.app.FragmentManagerImpl android.app.FragmentManagerImpl$1 +android.app.FragmentManagerImpl$OpGenerator android.app.FragmentTransaction +android.app.FragmentTransition +android.app.FragmentTransition$FragmentContainerTransition android.app.IActivityManager android.app.IActivityManager$Stub android.app.IActivityManager$Stub$Proxy @@ -392,7 +414,6 @@ android.app.IAlarmManager$Stub android.app.IAlarmManager$Stub$Proxy android.app.IApplicationThread android.app.IApplicationThread$Stub -android.app.IApplicationThread$Stub$Proxy android.app.IInstrumentationWatcher android.app.IInstrumentationWatcher$Stub android.app.INotificationManager @@ -409,10 +430,10 @@ android.app.Instrumentation android.app.IntentReceiverLeaked android.app.IntentService android.app.IntentService$ServiceHandler -android.app.JobSchedulerImpl android.app.KeyguardManager android.app.ListActivity android.app.LoadedApk +android.app.LoadedApk$DexLoadReporter android.app.LoadedApk$ReceiverDispatcher android.app.LoadedApk$ReceiverDispatcher$Args android.app.LoadedApk$ReceiverDispatcher$InnerReceiver @@ -426,19 +447,17 @@ android.app.LoaderManager android.app.LoaderManagerImpl android.app.NativeActivity android.app.Notification -android.app.Notification$1 android.app.Notification$Action android.app.Notification$BigTextStyle android.app.Notification$Builder -android.app.Notification$BuilderRemoteViews android.app.Notification$Style android.app.NotificationManager -android.app.OnActivityPausedListener android.app.PendingIntent android.app.PendingIntent$1 android.app.PendingIntent$CanceledException -android.app.ProgressDialog +android.app.PendingIntent$OnMarshaledListener android.app.QueuedWork +android.app.QueuedWork$QueuedWorkHandler android.app.ReceiverRestrictedContext android.app.ResourcesManager android.app.ResourcesManager$1 @@ -530,6 +549,11 @@ android.app.SystemServiceRegistry$71 android.app.SystemServiceRegistry$72 android.app.SystemServiceRegistry$73 android.app.SystemServiceRegistry$74 +android.app.SystemServiceRegistry$75 +android.app.SystemServiceRegistry$76 +android.app.SystemServiceRegistry$77 +android.app.SystemServiceRegistry$78 +android.app.SystemServiceRegistry$79 android.app.SystemServiceRegistry$8 android.app.SystemServiceRegistry$9 android.app.SystemServiceRegistry$CachedServiceFetcher @@ -550,13 +574,11 @@ android.app.backup.BackupDataInput$EntityHeader android.app.backup.BackupDataOutput android.app.backup.BackupHelperDispatcher android.app.backup.BackupHelperDispatcher$Header +android.app.backup.BackupManager android.app.backup.FileBackupHelperBase android.app.backup.FullBackup android.app.backup.FullBackupDataOutput -android.app.job.IJobScheduler -android.app.job.IJobScheduler$Stub android.app.job.JobInfo -android.app.job.JobInfo$Builder android.app.job.JobScheduler android.app.job.JobService android.app.trust.ITrustManager @@ -564,14 +586,15 @@ android.app.trust.ITrustManager$Stub android.app.trust.ITrustManager$Stub$Proxy android.app.trust.TrustManager android.app.usage.NetworkStatsManager +android.app.usage.StorageStatsManager android.app.usage.UsageStatsManager android.appwidget.AppWidgetManager -android.appwidget.AppWidgetProvider android.bluetooth.BluetoothAdapter android.bluetooth.BluetoothAdapter$1 android.bluetooth.BluetoothManager android.bluetooth.IBluetooth android.bluetooth.IBluetooth$Stub +android.bluetooth.IBluetooth$Stub$Proxy android.bluetooth.IBluetoothManager android.bluetooth.IBluetoothManager$Stub android.bluetooth.IBluetoothManager$Stub$Proxy @@ -582,8 +605,6 @@ android.content.BroadcastReceiver android.content.BroadcastReceiver$PendingResult android.content.BroadcastReceiver$PendingResult$1 android.content.ClipData -android.content.ClipData$Item -android.content.ClipDescription android.content.ClipboardManager android.content.ComponentCallbacks android.content.ComponentCallbacks2 @@ -594,7 +615,6 @@ android.content.ContentProvider$Transport android.content.ContentProviderClient android.content.ContentProviderNative android.content.ContentProviderOperation -android.content.ContentProviderOperation$Builder android.content.ContentProviderProxy android.content.ContentProviderResult android.content.ContentResolver @@ -618,10 +638,6 @@ android.content.IIntentReceiver$Stub android.content.IIntentSender android.content.IIntentSender$Stub android.content.IIntentSender$Stub$Proxy -android.content.ISyncAdapter -android.content.ISyncAdapter$Stub -android.content.ISyncContext -android.content.ISyncContext$Stub android.content.Intent android.content.Intent$1 android.content.IntentFilter @@ -635,13 +651,7 @@ android.content.ServiceConnection android.content.SharedPreferences android.content.SharedPreferences$Editor android.content.SharedPreferences$OnSharedPreferenceChangeListener -android.content.SyncResult -android.content.SyncResult$1 -android.content.SyncStats -android.content.SyncStats$1 android.content.UndoManager -android.content.UndoManager$UndoState -android.content.UndoOperation android.content.UndoOwner android.content.UriMatcher android.content.pm.ActivityInfo @@ -714,7 +724,6 @@ android.content.res.ResourcesImpl android.content.res.ResourcesImpl$ThemeImpl android.content.res.ResourcesKey android.content.res.StringBlock -android.content.res.StringBlock$StyleIDs android.content.res.ThemedResourceCache android.content.res.TypedArray android.content.res.XmlBlock @@ -752,7 +761,6 @@ android.database.IContentObserver android.database.IContentObserver$Stub android.database.IContentObserver$Stub$Proxy android.database.MatrixCursor -android.database.MatrixCursor$RowBuilder android.database.Observable android.database.SQLException android.database.sqlite.DatabaseObjectNotClosedException @@ -796,6 +804,7 @@ android.ddm.DdmHandleProfiling android.ddm.DdmHandleThread android.ddm.DdmHandleViewDebug android.ddm.DdmRegister +android.graphics.BaseCanvas android.graphics.Bitmap android.graphics.Bitmap$1 android.graphics.Bitmap$CompressFormat @@ -812,7 +821,6 @@ android.graphics.Canvas$NoImagePreloadHolder android.graphics.CanvasProperty android.graphics.Color android.graphics.ColorFilter -android.graphics.ColorMatrix android.graphics.ColorMatrixColorFilter android.graphics.ComposePathEffect android.graphics.ComposeShader @@ -823,15 +831,17 @@ android.graphics.DrawFilter android.graphics.EmbossMaskFilter android.graphics.FontFamily android.graphics.FontListParser +android.graphics.GraphicBuffer +android.graphics.GraphicBuffer$1 android.graphics.Insets android.graphics.Interpolator android.graphics.Interpolator$Result -android.graphics.LayerRasterizer android.graphics.LightingColorFilter android.graphics.LinearGradient android.graphics.MaskFilter android.graphics.Matrix android.graphics.Matrix$1 +android.graphics.Matrix$NoImagePreloadHolder android.graphics.Matrix$ScaleToFit android.graphics.Movie android.graphics.NinePatch @@ -863,7 +873,6 @@ android.graphics.PorterDuff$Mode android.graphics.PorterDuffColorFilter android.graphics.PorterDuffXfermode android.graphics.RadialGradient -android.graphics.Rasterizer android.graphics.Rect android.graphics.Rect$1 android.graphics.RectF @@ -876,7 +885,6 @@ android.graphics.Shader android.graphics.Shader$TileMode android.graphics.SumPathEffect android.graphics.SurfaceTexture -android.graphics.SurfaceTexture$OnFrameAvailableListener android.graphics.SweepGradient android.graphics.TableMaskFilter android.graphics.TemporaryBuffer @@ -893,7 +901,6 @@ android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState$PendingAnimator android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimator android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimatorRT -android.graphics.drawable.AnimatedVectorDrawable$VectorDrawableAnimatorUI android.graphics.drawable.AnimationDrawable android.graphics.drawable.AnimationDrawable$AnimationState android.graphics.drawable.BitmapDrawable @@ -904,6 +911,7 @@ android.graphics.drawable.Drawable android.graphics.drawable.Drawable$Callback android.graphics.drawable.Drawable$ConstantState android.graphics.drawable.DrawableContainer +android.graphics.drawable.DrawableContainer$BlockInvalidateCallback android.graphics.drawable.DrawableContainer$DrawableContainerState android.graphics.drawable.DrawableInflater android.graphics.drawable.DrawableWrapper @@ -943,11 +951,30 @@ android.graphics.drawable.TransitionDrawable android.graphics.drawable.VectorDrawable android.graphics.drawable.VectorDrawable$VFullPath android.graphics.drawable.VectorDrawable$VFullPath$1 +android.graphics.drawable.VectorDrawable$VFullPath$10 +android.graphics.drawable.VectorDrawable$VFullPath$2 +android.graphics.drawable.VectorDrawable$VFullPath$3 +android.graphics.drawable.VectorDrawable$VFullPath$4 +android.graphics.drawable.VectorDrawable$VFullPath$5 +android.graphics.drawable.VectorDrawable$VFullPath$6 +android.graphics.drawable.VectorDrawable$VFullPath$7 +android.graphics.drawable.VectorDrawable$VFullPath$8 +android.graphics.drawable.VectorDrawable$VFullPath$9 android.graphics.drawable.VectorDrawable$VGroup android.graphics.drawable.VectorDrawable$VGroup$1 +android.graphics.drawable.VectorDrawable$VGroup$2 +android.graphics.drawable.VectorDrawable$VGroup$3 +android.graphics.drawable.VectorDrawable$VGroup$4 +android.graphics.drawable.VectorDrawable$VGroup$5 +android.graphics.drawable.VectorDrawable$VGroup$6 +android.graphics.drawable.VectorDrawable$VGroup$7 +android.graphics.drawable.VectorDrawable$VGroup$8 +android.graphics.drawable.VectorDrawable$VGroup$9 android.graphics.drawable.VectorDrawable$VObject android.graphics.drawable.VectorDrawable$VPath +android.graphics.drawable.VectorDrawable$VPath$1 android.graphics.drawable.VectorDrawable$VectorDrawableState +android.graphics.drawable.VectorDrawable$VectorDrawableState$1 android.graphics.drawable.shapes.OvalShape android.graphics.drawable.shapes.RectShape android.graphics.drawable.shapes.Shape @@ -958,6 +985,8 @@ android.hardware.Camera android.hardware.Camera$CameraInfo android.hardware.Camera$Face android.hardware.ConsumerIrManager +android.hardware.HardwareBuffer +android.hardware.HardwareBuffer$1 android.hardware.Sensor android.hardware.SensorEvent android.hardware.SensorEventListener @@ -966,7 +995,6 @@ android.hardware.SerialManager android.hardware.SerialPort android.hardware.SystemSensorManager android.hardware.SystemSensorManager$BaseEventQueue -android.hardware.SystemSensorManager$SensorEventQueue android.hardware.camera2.CameraCharacteristics$Key android.hardware.camera2.CameraManager android.hardware.camera2.CaptureRequest$Key @@ -996,9 +1024,10 @@ android.hardware.input.InputDeviceIdentifier android.hardware.input.InputDeviceIdentifier$1 android.hardware.input.InputManager android.hardware.input.InputManager$InputDevicesChangedListener +android.hardware.location.ActivityRecognitionHardware android.hardware.location.ContextHubManager -android.hardware.location.IContextHubService -android.hardware.location.IContextHubService$Stub +android.hardware.location.IActivityRecognitionHardware +android.hardware.location.IActivityRecognitionHardware$Stub android.hardware.radio.RadioManager android.hardware.radio.RadioManager$AmBandConfig android.hardware.radio.RadioManager$AmBandConfig$1 @@ -1044,8 +1073,6 @@ android.hardware.soundtrigger.SoundTrigger$SoundModel android.hardware.soundtrigger.SoundTrigger$SoundModelEvent android.hardware.soundtrigger.SoundTrigger$SoundModelEvent$1 android.hardware.soundtrigger.SoundTriggerModule -android.hardware.usb.IUsbManager -android.hardware.usb.IUsbManager$Stub android.hardware.usb.UsbDevice android.hardware.usb.UsbDeviceConnection android.hardware.usb.UsbManager @@ -1056,16 +1083,16 @@ android.icu.impl.CacheValue android.icu.impl.CacheValue$NullValue android.icu.impl.CacheValue$SoftValue android.icu.impl.CacheValue$Strength -android.icu.impl.CalendarData android.icu.impl.CalendarUtil +android.icu.impl.CalendarUtil$CalendarPreferences android.icu.impl.CharTrie android.icu.impl.ClassLoaderUtil android.icu.impl.CurrencyData android.icu.impl.CurrencyData$CurrencyDisplayInfo android.icu.impl.CurrencyData$CurrencyDisplayInfoProvider android.icu.impl.CurrencyData$CurrencySpacingInfo -android.icu.impl.DateNumberFormat -android.icu.impl.Grego +android.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingPattern +android.icu.impl.CurrencyData$CurrencySpacingInfo$SpacingType android.icu.impl.ICUBinary android.icu.impl.ICUBinary$Authenticate android.icu.impl.ICUBinary$DatPackageReader @@ -1076,6 +1103,7 @@ android.icu.impl.ICUCache android.icu.impl.ICUConfig android.icu.impl.ICUCurrencyDisplayInfoProvider android.icu.impl.ICUCurrencyDisplayInfoProvider$ICUCurrencyDisplayInfo +android.icu.impl.ICUCurrencyDisplayInfoProvider$ICUCurrencyDisplayInfo$SpacingInfoSink android.icu.impl.ICUCurrencyMetaInfo android.icu.impl.ICUCurrencyMetaInfo$Collector android.icu.impl.ICUCurrencyMetaInfo$CurrencyCollector @@ -1091,13 +1119,15 @@ android.icu.impl.ICURWLock android.icu.impl.ICUResourceBundle android.icu.impl.ICUResourceBundle$1 android.icu.impl.ICUResourceBundle$2 -android.icu.impl.ICUResourceBundle$2$1 +android.icu.impl.ICUResourceBundle$3 +android.icu.impl.ICUResourceBundle$3$1 +android.icu.impl.ICUResourceBundle$4 android.icu.impl.ICUResourceBundle$AvailEntry +android.icu.impl.ICUResourceBundle$Loader android.icu.impl.ICUResourceBundle$OpenType android.icu.impl.ICUResourceBundle$WholeBundle android.icu.impl.ICUResourceBundleImpl android.icu.impl.ICUResourceBundleImpl$ResourceArray -android.icu.impl.ICUResourceBundleImpl$ResourceBinary android.icu.impl.ICUResourceBundleImpl$ResourceContainer android.icu.impl.ICUResourceBundleImpl$ResourceInt android.icu.impl.ICUResourceBundleImpl$ResourceIntVector @@ -1111,6 +1141,7 @@ android.icu.impl.ICUResourceBundleReader$Container android.icu.impl.ICUResourceBundleReader$IsAcceptable android.icu.impl.ICUResourceBundleReader$ReaderCache android.icu.impl.ICUResourceBundleReader$ReaderCacheKey +android.icu.impl.ICUResourceBundleReader$ReaderValue android.icu.impl.ICUResourceBundleReader$ResourceCache android.icu.impl.ICUResourceBundleReader$ResourceCache$Level android.icu.impl.ICUResourceBundleReader$Table @@ -1121,7 +1152,6 @@ android.icu.impl.ICUService$CacheEntry android.icu.impl.ICUService$Factory android.icu.impl.ICUService$Key android.icu.impl.IDNA2003 -android.icu.impl.JavaTimeZone android.icu.impl.LocaleIDParser android.icu.impl.LocaleIDs android.icu.impl.Norm2AllModes @@ -1129,7 +1159,6 @@ android.icu.impl.Norm2AllModes$1 android.icu.impl.Norm2AllModes$ComposeNormalizer2 android.icu.impl.Norm2AllModes$DecomposeNormalizer2 android.icu.impl.Norm2AllModes$FCDNormalizer2 -android.icu.impl.Norm2AllModes$NFCSingleton android.icu.impl.Norm2AllModes$NFKCSingleton android.icu.impl.Norm2AllModes$NoopNormalizer2 android.icu.impl.Norm2AllModes$Norm2AllModesSingleton @@ -1137,14 +1166,13 @@ android.icu.impl.Norm2AllModes$Normalizer2WithImpl android.icu.impl.Normalizer2Impl android.icu.impl.Normalizer2Impl$1 android.icu.impl.Normalizer2Impl$IsAcceptable -android.icu.impl.OlsonTimeZone android.icu.impl.Pair android.icu.impl.PatternProps -android.icu.impl.PatternTokenizer android.icu.impl.PluralRulesLoader android.icu.impl.ReplaceableUCharacterIterator android.icu.impl.RuleCharacterIterator android.icu.impl.SimpleCache +android.icu.impl.SimpleFormatterImpl android.icu.impl.SoftCache android.icu.impl.StandardPlural android.icu.impl.StringPrepDataReader @@ -1159,7 +1187,6 @@ android.icu.impl.Trie2$UTrie2Header android.icu.impl.Trie2$ValueMapper android.icu.impl.Trie2$ValueWidth android.icu.impl.Trie2_16 -android.icu.impl.Trie2_32 android.icu.impl.UBiDiProps android.icu.impl.UBiDiProps$IsAcceptable android.icu.impl.UCharacterProperty @@ -1194,24 +1221,13 @@ android.icu.impl.UCharacterProperty$IntProperty android.icu.impl.UCharacterProperty$IsAcceptable android.icu.impl.UCharacterProperty$NormInertBinaryProperty android.icu.impl.UCharacterProperty$NormQuickCheckIntProperty -android.icu.impl.UPropertyAliases -android.icu.impl.UPropertyAliases$IsAcceptable android.icu.impl.URLHandler$URLVisitor -android.icu.impl.USerializedSet +android.icu.impl.UResource$Array +android.icu.impl.UResource$Key +android.icu.impl.UResource$Sink +android.icu.impl.UResource$Table +android.icu.impl.UResource$Value android.icu.impl.Utility -android.icu.impl.ZoneMeta -android.icu.impl.ZoneMeta$CustomTimeZoneCache -android.icu.impl.ZoneMeta$SystemTimeZoneCache -android.icu.impl.coll.CollationData -android.icu.impl.coll.CollationDataReader -android.icu.impl.coll.CollationDataReader$IsAcceptable -android.icu.impl.coll.CollationFastLatin -android.icu.impl.coll.CollationLoader -android.icu.impl.coll.CollationRoot -android.icu.impl.coll.CollationSettings -android.icu.impl.coll.CollationTailoring -android.icu.impl.coll.SharedObject -android.icu.impl.coll.SharedObject$Reference android.icu.impl.locale.AsciiUtil android.icu.impl.locale.BaseLocale android.icu.impl.locale.BaseLocale$Cache @@ -1222,8 +1238,6 @@ android.icu.impl.locale.LocaleSyntaxException android.icu.lang.UCharacter android.icu.lang.UCharacterEnums$ECharacterCategory android.icu.lang.UCharacterEnums$ECharacterDirection -android.icu.lang.UScript -android.icu.lang.UScript$ScriptUsage android.icu.math.BigDecimal android.icu.math.MathContext android.icu.text.BreakIterator @@ -1232,51 +1246,26 @@ android.icu.text.BreakIterator$BreakIteratorServiceShim android.icu.text.BreakIteratorFactory android.icu.text.BreakIteratorFactory$BFService android.icu.text.BreakIteratorFactory$BFService$1RBBreakIteratorFactory -android.icu.text.Collator -android.icu.text.Collator$ServiceShim -android.icu.text.CollatorServiceShim -android.icu.text.CollatorServiceShim$CService -android.icu.text.CollatorServiceShim$CService$1CollatorFactory android.icu.text.CurrencyDisplayNames android.icu.text.CurrencyMetaInfo android.icu.text.CurrencyMetaInfo$CurrencyDigits android.icu.text.CurrencyMetaInfo$CurrencyFilter -android.icu.text.DateFormat -android.icu.text.DateFormat$BooleanAttribute -android.icu.text.DateFormat$Field android.icu.text.DateFormatSymbols +android.icu.text.DateFormatSymbols$1 +android.icu.text.DateFormatSymbols$CalendarDataSink +android.icu.text.DateFormatSymbols$CalendarDataSink$AliasType android.icu.text.DateFormatSymbols$CapitalizationContextUsage -android.icu.text.DateIntervalFormat -android.icu.text.DateIntervalFormat$BestMatchInfo -android.icu.text.DateIntervalInfo -android.icu.text.DateIntervalInfo$PatternInfo -android.icu.text.DateTimePatternGenerator -android.icu.text.DateTimePatternGenerator$DTPGflags -android.icu.text.DateTimePatternGenerator$DateTimeMatcher -android.icu.text.DateTimePatternGenerator$DistanceInfo -android.icu.text.DateTimePatternGenerator$FormatParser -android.icu.text.DateTimePatternGenerator$PatternInfo -android.icu.text.DateTimePatternGenerator$PatternWithMatcher -android.icu.text.DateTimePatternGenerator$PatternWithSkeletonFlag -android.icu.text.DateTimePatternGenerator$VariableField android.icu.text.DecimalFormat android.icu.text.DecimalFormat$Unit android.icu.text.DecimalFormatSymbols android.icu.text.DecimalFormatSymbols$1 android.icu.text.DecimalFormatSymbols$CacheData +android.icu.text.DecimalFormatSymbols$DecFmtDataSink android.icu.text.DigitList android.icu.text.DisplayContext android.icu.text.DisplayContext$Type android.icu.text.IDNA android.icu.text.LanguageBreakEngine -android.icu.text.MessageFormat -android.icu.text.MessageFormat$AppendableWrapper -android.icu.text.MessageFormat$Field -android.icu.text.MessagePattern -android.icu.text.MessagePattern$ApostropheMode -android.icu.text.MessagePattern$ArgType -android.icu.text.MessagePattern$Part -android.icu.text.MessagePattern$Part$Type android.icu.text.Normalizer android.icu.text.Normalizer$FCDMode android.icu.text.Normalizer$Mode @@ -1292,6 +1281,9 @@ android.icu.text.Normalizer2 android.icu.text.NumberFormat android.icu.text.NumberFormat$Field android.icu.text.NumberingSystem +android.icu.text.NumberingSystem$1 +android.icu.text.NumberingSystem$2 +android.icu.text.NumberingSystem$LocaleLookupData android.icu.text.PluralRanges android.icu.text.PluralRanges$Matrix android.icu.text.PluralRules @@ -1317,11 +1309,10 @@ android.icu.text.RBBIDataWrapper$TrieFoldingFunc android.icu.text.Replaceable android.icu.text.ReplaceableString android.icu.text.RuleBasedBreakIterator -android.icu.text.RuleBasedCollator -android.icu.text.SimpleDateFormat -android.icu.text.SimpleDateFormat$PatternItem +android.icu.text.RuleBasedBreakIterator$LookAheadResults android.icu.text.StringPrep android.icu.text.StringPrepParseException +android.icu.text.TimeZoneNames$NameType android.icu.text.UCharacterIterator android.icu.text.UFieldPosition android.icu.text.UFormat @@ -1331,48 +1322,36 @@ android.icu.text.UnhandledBreakEngine android.icu.text.UnicodeFilter android.icu.text.UnicodeMatcher android.icu.text.UnicodeSet -android.icu.text.UnicodeSet$Filter -android.icu.text.UnicodeSet$GeneralCategoryMaskFilter -android.icu.text.UnicodeSet$IntPropertyFilter -android.icu.util.BasicTimeZone -android.icu.util.BytesTrie android.icu.util.BytesTrie$Result -android.icu.util.Calendar -android.icu.util.Calendar$CalType -android.icu.util.Calendar$FormatConfiguration -android.icu.util.Calendar$PatternData -android.icu.util.Calendar$WeekData -android.icu.util.Calendar$WeekDataCache android.icu.util.Currency +android.icu.util.Currency$1 android.icu.util.Currency$CurrencyUsage android.icu.util.Currency$EquivalenceRelation android.icu.util.Freezable -android.icu.util.GregorianCalendar android.icu.util.MeasureUnit android.icu.util.MeasureUnit$1 android.icu.util.MeasureUnit$2 android.icu.util.MeasureUnit$3 android.icu.util.MeasureUnit$Factory -android.icu.util.Output -android.icu.util.SimpleTimeZone android.icu.util.TimeUnit android.icu.util.TimeZone android.icu.util.TimeZone$ConstantZone android.icu.util.ULocale +android.icu.util.ULocale$1 +android.icu.util.ULocale$2 android.icu.util.ULocale$Category android.icu.util.ULocale$JDKLocaleHelper android.icu.util.ULocale$Type android.icu.util.UResourceBundle -android.icu.util.UResourceBundle$ResourceCacheKey +android.icu.util.UResourceBundle$RootType android.icu.util.UResourceBundleIterator android.icu.util.UResourceTypeMismatchException android.icu.util.VersionInfo android.location.CountryDetector -android.location.ILocationManager -android.location.ILocationManager$Stub android.location.Location +android.location.Location$1 +android.location.Location$2 android.location.LocationManager -android.media.AmrInputStream android.media.AudioAttributes android.media.AudioAttributes$1 android.media.AudioAttributes$Builder @@ -1386,7 +1365,7 @@ android.media.AudioHandle android.media.AudioManager android.media.AudioManager$1 android.media.AudioManager$2 -android.media.AudioManager$OnAudioFocusChangeListener +android.media.AudioManager$3 android.media.AudioManager$ServiceEventHandlerDelegate android.media.AudioManager$ServiceEventHandlerDelegate$1 android.media.AudioMixPort @@ -1404,7 +1383,6 @@ android.media.CamcorderProfile android.media.CameraProfile android.media.DecoderCapabilities android.media.EncoderCapabilities -android.media.ExifInterface android.media.IAudioFocusDispatcher android.media.IAudioFocusDispatcher$Stub android.media.IAudioService @@ -1412,6 +1390,10 @@ android.media.IAudioService$Stub android.media.IAudioService$Stub$Proxy android.media.IMediaHTTPConnection android.media.IMediaHTTPConnection$Stub +android.media.IPlaybackConfigDispatcher +android.media.IPlaybackConfigDispatcher$Stub +android.media.IPlayer +android.media.IPlayer$Stub android.media.IRecordingConfigDispatcher android.media.IRecordingConfigDispatcher$Stub android.media.Image @@ -1422,6 +1404,8 @@ android.media.ImageWriter$WriterSurfaceImage android.media.JetPlayer android.media.MediaCodec android.media.MediaCodecInfo +android.media.MediaCodecInfo$CodecCapabilities +android.media.MediaCodecInfo$CodecProfileLevel android.media.MediaCodecList android.media.MediaCrypto android.media.MediaDrm @@ -1432,21 +1416,17 @@ android.media.MediaMetadataRetriever android.media.MediaMuxer android.media.MediaPlayer android.media.MediaPlayer$OnCompletionListener -android.media.MediaPlayer$OnErrorListener -android.media.MediaPlayer$OnPreparedListener -android.media.MediaPlayer$OnSeekCompleteListener -android.media.MediaPlayer$OnVideoSizeChangedListener android.media.MediaRecorder android.media.MediaRouter -android.media.MediaRouter$Callback -android.media.MediaRouter$RouteCategory -android.media.MediaRouter$RouteInfo android.media.MediaScanner android.media.MediaSync android.media.PlaybackParams android.media.PlaybackParams$1 android.media.PlayerBase android.media.PlayerBase$1 +android.media.PlayerBase$2 +android.media.PlayerBase$PlayerIdCard +android.media.PlayerBase$PlayerIdCard$1 android.media.RemoteDisplay android.media.ResampleInputStream android.media.SubtitleController$Listener @@ -1456,12 +1436,10 @@ android.media.audiopolicy.AudioMixingRule android.media.audiopolicy.AudioMixingRule$AudioMixMatchCriterion android.media.midi.MidiManager android.media.projection.MediaProjectionManager -android.media.session.MediaController -android.media.session.MediaController$TransportControls -android.media.session.MediaSession$Token android.media.session.MediaSessionManager android.media.soundtrigger.SoundTriggerManager android.media.tv.TvInputManager +android.metrics.LogMaker android.mtp.MtpDatabase android.mtp.MtpDevice android.mtp.MtpDeviceInfo @@ -1476,6 +1454,8 @@ android.net.ConnectivityManager android.net.ConnectivityManager$CallbackHandler android.net.ConnectivityManager$NetworkCallback android.net.ConnectivityThread +# Must not be initialized, creates a thread. +# android.net.ConnectivityThread$Singleton android.net.Credentials android.net.EthernetManager android.net.IConnectivityManager @@ -1504,6 +1484,7 @@ android.net.NetworkPolicyManager android.net.NetworkRequest android.net.NetworkRequest$1 android.net.NetworkRequest$Builder +android.net.NetworkRequest$Type android.net.NetworkScoreManager android.net.NetworkStats android.net.NetworkStats$1 @@ -1512,9 +1493,6 @@ android.net.Proxy android.net.ProxyInfo android.net.RouteInfo android.net.RouteInfo$1 -android.net.SSLCertificateSocketFactory -android.net.SSLCertificateSocketFactory$1 -android.net.SSLSessionCache android.net.TrafficStats android.net.Uri android.net.Uri$1 @@ -1539,29 +1517,13 @@ android.net.wifi.SupplicantState$1 android.net.wifi.WifiInfo android.net.wifi.WifiInfo$1 android.net.wifi.WifiManager -android.net.wifi.WifiManager$WifiLock android.net.wifi.WifiScanner android.net.wifi.WifiSsid android.net.wifi.WifiSsid$1 -android.net.wifi.nan.WifiNanManager +android.net.wifi.aware.WifiAwareManager android.net.wifi.p2p.WifiP2pManager -android.nfc.IAppCallback -android.nfc.IAppCallback$Stub android.nfc.INfcAdapter android.nfc.INfcAdapter$Stub -android.nfc.INfcAdapter$Stub$Proxy -android.nfc.INfcCardEmulation -android.nfc.INfcCardEmulation$Stub -android.nfc.INfcCardEmulation$Stub$Proxy -android.nfc.INfcFCardEmulation -android.nfc.INfcFCardEmulation$Stub -android.nfc.INfcFCardEmulation$Stub$Proxy -android.nfc.INfcTag -android.nfc.INfcTag$Stub -android.nfc.INfcTag$Stub$Proxy -android.nfc.NfcActivityManager -android.nfc.NfcAdapter -android.nfc.NfcAdapter$1 android.nfc.NfcManager android.opengl.EGL14 android.opengl.EGLConfig @@ -1583,6 +1545,7 @@ android.opengl.GLES32 android.opengl.GLUtils android.opengl.Matrix android.opengl.Visibility +android.os.-$Lambda$5$6x30vPJhBKUfNY8tswxuZo3DCe0 android.os.AsyncTask$1 android.os.AsyncTask$2 android.os.AsyncTask$3 @@ -1614,17 +1577,24 @@ android.os.Debug$MemoryInfo$1 android.os.DropBoxManager android.os.Environment android.os.Environment$UserEnvironment +android.os.FactoryTest android.os.FileObserver$ObserverThread android.os.FileUtils +android.os.GraphicsEnvironment android.os.Handler android.os.Handler$Callback android.os.Handler$MessengerImpl android.os.HandlerThread android.os.HardwarePropertiesManager +android.os.HwBinder +android.os.HwBlob +android.os.HwParcel +android.os.HwRemoteBinder android.os.IBinder android.os.IBinder$DeathRecipient android.os.ICancellationSignal android.os.ICancellationSignal$Stub +android.os.IHwBinder android.os.IInterface android.os.IMessenger android.os.IMessenger$Stub @@ -1641,7 +1611,7 @@ android.os.IUserManager$Stub android.os.IUserManager$Stub$Proxy android.os.IVibratorService android.os.IVibratorService$Stub -android.os.IVibratorService$Stub$Proxy +android.os.IncidentManager android.os.LocaleList android.os.LocaleList$1 android.os.Looper @@ -1658,7 +1628,6 @@ android.os.Parcel$1 android.os.ParcelFileDescriptor android.os.ParcelFileDescriptor$1 android.os.ParcelFileDescriptor$AutoCloseInputStream -android.os.ParcelFileDescriptor$AutoCloseOutputStream android.os.Parcelable android.os.Parcelable$ClassLoaderCreator android.os.Parcelable$Creator @@ -1677,8 +1646,11 @@ android.os.RemoteException android.os.ResultReceiver android.os.SELinux android.os.ServiceManager +android.os.ServiceManager$ServiceNotFoundException android.os.ServiceManagerNative android.os.ServiceManagerProxy +android.os.ServiceSpecificException +android.os.ShellCallback android.os.StatFs android.os.StrictMode android.os.StrictMode$1 @@ -1704,6 +1676,7 @@ android.os.StrictMode$ThreadPolicy android.os.StrictMode$ThreadPolicy$Builder android.os.StrictMode$ThreadSpanState android.os.StrictMode$ViolationInfo +android.os.StrictMode$ViolationInfo$1 android.os.StrictMode$VmPolicy android.os.StrictMode$VmPolicy$Builder android.os.SystemClock @@ -1716,6 +1689,7 @@ android.os.UserHandle android.os.UserHandle$1 android.os.UserManager android.os.Vibrator +android.os.ZygoteProcess android.os.ZygoteStartFailedEx android.os.health.SystemHealthManager android.os.storage.IStorageManager @@ -1724,17 +1698,16 @@ android.os.storage.IStorageManager$Stub$Proxy android.os.storage.StorageManager android.os.storage.StorageVolume android.os.storage.StorageVolume$1 -android.preference.Preference$OnPreferenceChangeListener android.preference.PreferenceActivity android.preference.PreferenceFragment$OnPreferenceStartFragmentCallback android.preference.PreferenceManager android.preference.PreferenceManager$OnPreferenceTreeClickListener android.print.PrintManager +android.provider.-$Lambda$46$87WmhkvObehVg0OMBzwa_MTVV8g android.provider.BaseColumns android.provider.ContactsContract android.provider.ContactsContract$CommonDataKinds$BaseTypes android.provider.ContactsContract$CommonDataKinds$CommonColumns -android.provider.ContactsContract$CommonDataKinds$Email android.provider.ContactsContract$CommonDataKinds$Phone android.provider.ContactsContract$ContactCounts android.provider.ContactsContract$ContactNameColumns @@ -1748,13 +1721,12 @@ android.provider.ContactsContract$DataColumnsWithJoins android.provider.ContactsContract$DataUsageStatColumns android.provider.ContactsContract$RawContactsColumns android.provider.ContactsContract$StatusColumns -android.provider.MediaStore$Images$ImageColumns -android.provider.MediaStore$Images$Media android.provider.MediaStore$MediaColumns +android.provider.Settings +android.provider.Settings$ContentProviderHolder android.provider.Settings$GenerationTracker android.provider.Settings$Global android.provider.Settings$NameValueCache -android.provider.Settings$NameValueCache$-java_lang_String_getStringForUser_android_content_ContentResolver_cr_java_lang_String_name_int_userHandle_LambdaImpl0 android.provider.Settings$NameValueTable android.provider.Settings$Secure android.provider.Settings$SettingNotFoundException @@ -1773,8 +1745,6 @@ android.provider.Settings$System$InclusiveFloatRangeValidator android.provider.Settings$System$InclusiveIntegerRangeValidator android.provider.Settings$System$Validator android.renderscript.RenderScriptCacheDir -android.security.FrameworkNetworkSecurityPolicy -android.security.NetworkSecurityPolicy android.security.keystore.AndroidKeyStoreBCWorkaroundProvider android.security.keystore.AndroidKeyStoreProvider android.security.net.config.ApplicationConfig @@ -1797,9 +1767,7 @@ android.security.net.config.PinSet android.security.net.config.RootTrustManager android.security.net.config.RootTrustManagerFactorySpi android.security.net.config.SystemCertificateSource -android.security.net.config.TrustAnchor android.security.net.config.TrustedCertificateStoreAdapter -android.security.net.config.UserCertificateSource android.service.persistentdata.PersistentDataBlockManager android.system.ErrnoException android.system.GaiException @@ -1811,6 +1779,7 @@ android.system.StructAddrinfo android.system.StructFlock android.system.StructGroupReq android.system.StructGroupSourceReq +android.system.StructIfaddrs android.system.StructLinger android.system.StructPasswd android.system.StructPollfd @@ -1824,11 +1793,11 @@ android.telecom.TelecomManager android.telephony.CarrierConfigManager android.telephony.PhoneNumberUtils android.telephony.PhoneStateListener -android.telephony.PhoneStateListener$1 -android.telephony.PhoneStateListener$IPhoneStateListenerStub android.telephony.Rlog +android.telephony.ServiceState android.telephony.SubscriptionManager android.telephony.TelephonyManager +android.telephony.TelephonyManager$MultiSimVariants android.text.AndroidBidi android.text.AndroidCharacter android.text.BoringLayout @@ -1839,15 +1808,19 @@ android.text.DynamicLayout$ChangeWatcher android.text.Editable android.text.Editable$Factory android.text.FontConfig +android.text.FontConfig$1 android.text.FontConfig$Alias +android.text.FontConfig$Alias$1 android.text.FontConfig$Axis +android.text.FontConfig$Axis$1 android.text.FontConfig$Family +android.text.FontConfig$Family$1 android.text.FontConfig$Font +android.text.FontConfig$Font$1 +android.text.FontManager android.text.GetChars android.text.GraphicsOperations android.text.Html -android.text.Html$HtmlParser -android.text.HtmlToSpannedConverter android.text.Hyphenator android.text.InputFilter android.text.InputType @@ -1889,15 +1862,11 @@ android.text.TextPaint android.text.TextUtils android.text.TextUtils$1 android.text.TextUtils$EllipsizeCallback -android.text.TextUtils$SimpleStringSplitter -android.text.TextUtils$StringSplitter android.text.TextUtils$TruncateAt android.text.TextWatcher android.text.format.DateFormat android.text.format.DateUtils -android.text.format.Formatter android.text.format.Time -android.text.format.Time$TimeCalculator android.text.method.AllCapsTransformationMethod android.text.method.ArrowKeyMovementMethod android.text.method.BaseKeyListener @@ -1919,10 +1888,8 @@ android.text.method.TransformationMethod2 android.text.style.AlignmentSpan android.text.style.CharacterStyle android.text.style.ClickableSpan -android.text.style.DynamicDrawableSpan android.text.style.EasyEditSpan android.text.style.ForegroundColorSpan -android.text.style.ImageSpan android.text.style.LeadingMarginSpan android.text.style.LineBackgroundSpan android.text.style.LineHeightSpan @@ -1933,9 +1900,7 @@ android.text.style.SpellCheckSpan android.text.style.StyleSpan android.text.style.SuggestionSpan android.text.style.TabStopSpan -android.text.style.TextAppearanceSpan android.text.style.URLSpan -android.text.style.UnderlineSpan android.text.style.UpdateAppearance android.text.style.UpdateLayout android.text.style.WrapTogetherSpan @@ -1956,7 +1921,6 @@ android.transition.ChangeTransform$1 android.transition.ChangeTransform$2 android.transition.Fade android.transition.PathMotion -android.transition.Scene android.transition.Transition android.transition.Transition$1 android.transition.Transition$EpicenterCallback @@ -1976,18 +1940,20 @@ android.util.Base64 android.util.Base64$Coder android.util.Base64$Decoder android.util.Base64$Encoder +android.util.BootTimingsTraceLog android.util.ContainerHelpers android.util.DisplayMetrics android.util.EventLog android.util.EventLog$Event android.util.FloatProperty +android.util.IntArray android.util.IntProperty -android.util.JsonReader android.util.Log android.util.Log$1 android.util.Log$ImmediateLogWriter android.util.Log$TerribleFailureHandler android.util.LogPrinter +android.util.LongArray android.util.LongSparseArray android.util.LongSparseLongArray android.util.LruCache @@ -2002,6 +1968,7 @@ android.util.MutableLong android.util.Pair android.util.PathParser android.util.PathParser$PathData +android.util.Patterns android.util.Pools$Pool android.util.Pools$SimplePool android.util.Pools$SynchronizedPool @@ -2011,24 +1978,24 @@ android.util.Range android.util.Rational android.util.Singleton android.util.Size +android.util.SizeF android.util.Slog android.util.SparseArray android.util.SparseBooleanArray android.util.SparseIntArray -android.util.SparseLongArray android.util.StateSet android.util.SuperNotCalledException -android.util.TimeFormatException android.util.TypedValue android.util.Xml android.util.jar.StrictJarFile +android.view.-$Lambda$48$iU_USrtPm1XIm5H9QYQvXfBGDE4 +android.view.-$Lambda$49$iU_USrtPm1XIm5H9QYQvXfBGDE4 android.view.AbsSavedState android.view.AbsSavedState$1 android.view.AbsSavedState$2 android.view.ActionMode android.view.ActionMode$Callback android.view.ActionProvider -android.view.ActionProvider$SubUiVisibilityListener android.view.Choreographer android.view.Choreographer$1 android.view.Choreographer$2 @@ -2041,8 +2008,6 @@ android.view.ContextMenu android.view.ContextMenu$ContextMenuInfo android.view.ContextThemeWrapper android.view.Display -android.view.Display$ColorTransform -android.view.Display$ColorTransform$1 android.view.Display$HdrCapabilities android.view.Display$HdrCapabilities$1 android.view.Display$Mode @@ -2052,6 +2017,7 @@ android.view.DisplayEventReceiver android.view.DisplayInfo android.view.DisplayInfo$1 android.view.DisplayListCanvas +android.view.DragEvent android.view.FallbackEventHandler android.view.FocusFinder android.view.FocusFinder$1 @@ -2066,8 +2032,6 @@ android.view.GestureDetector$OnContextClickListener android.view.GestureDetector$OnDoubleTapListener android.view.GestureDetector$OnGestureListener android.view.GestureDetector$SimpleOnGestureListener -android.view.GraphicBuffer -android.view.GraphicBuffer$1 android.view.Gravity android.view.HandlerActionQueue android.view.HandlerActionQueue$HandlerAction @@ -2092,7 +2056,6 @@ android.view.InputChannel android.view.InputChannel$1 android.view.InputDevice android.view.InputDevice$1 -android.view.InputDevice$MotionRange android.view.InputEvent android.view.InputEvent$1 android.view.InputEventConsistencyVerifier @@ -2125,9 +2088,12 @@ android.view.MotionEvent$PointerCoords android.view.MotionEvent$PointerProperties android.view.PointerIcon android.view.PointerIcon$1 +android.view.RecordingCanvas android.view.RenderNode +android.view.RenderNode$NoImagePreloadHolder android.view.RenderNodeAnimator android.view.RenderNodeAnimator$1 +android.view.RenderNodeAnimatorSetHelper android.view.SearchEvent android.view.SoundEffectConstants android.view.SubMenu @@ -2143,9 +2109,8 @@ android.view.SurfaceHolder$Callback2 android.view.SurfaceSession android.view.SurfaceView android.view.TextureView -android.view.TextureView$SurfaceTextureListener android.view.ThreadedRenderer -android.view.ThreadedRenderer$HardwareDrawCallbacks +android.view.ThreadedRenderer$DrawCallbacks android.view.ThreadedRenderer$ProcessInitializer android.view.VelocityTracker android.view.VelocityTracker$Estimator @@ -2182,6 +2147,7 @@ android.view.View$OnLongClickListener android.view.View$OnTouchListener android.view.View$PerformClick android.view.View$ScrollabilityCache +android.view.View$TooltipInfo android.view.View$TransformationInfo android.view.View$UnsetPressedState android.view.ViewConfiguration @@ -2193,11 +2159,13 @@ android.view.ViewGroup$LayoutParams android.view.ViewGroup$MarginLayoutParams android.view.ViewGroup$OnHierarchyChangeListener android.view.ViewGroup$TouchTarget +android.view.ViewGroupOverlay android.view.ViewManager android.view.ViewOutlineProvider android.view.ViewOutlineProvider$1 android.view.ViewOutlineProvider$2 android.view.ViewOutlineProvider$3 +android.view.ViewOverlay android.view.ViewParent android.view.ViewPropertyAnimator android.view.ViewPropertyAnimator$1 @@ -2245,6 +2213,7 @@ android.view.ViewTreeObserver$OnTouchModeChangeListener android.view.Window android.view.Window$Callback android.view.Window$OnWindowDismissedCallback +android.view.Window$OnWindowSwipeDismissedCallback android.view.Window$WindowControllerCallback android.view.WindowAnimationFrameStats android.view.WindowAnimationFrameStats$1 @@ -2254,7 +2223,6 @@ android.view.WindowContentFrameStats$1 android.view.WindowInsets android.view.WindowLeaked android.view.WindowManager -android.view.WindowManager$BadTokenException android.view.WindowManager$LayoutParams android.view.WindowManager$LayoutParams$1 android.view.WindowManagerGlobal @@ -2272,9 +2240,6 @@ android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeProvider android.view.accessibility.AccessibilityRecord android.view.accessibility.CaptioningManager -android.view.accessibility.CaptioningManager$1 -android.view.accessibility.CaptioningManager$CaptioningChangeListener -android.view.accessibility.CaptioningManager$MyContentObserver android.view.accessibility.IAccessibilityManager android.view.accessibility.IAccessibilityManager$Stub android.view.accessibility.IAccessibilityManager$Stub$Proxy @@ -2291,24 +2256,23 @@ android.view.animation.Animation$AnimationListener android.view.animation.Animation$NoImagePreloadHolder android.view.animation.AnimationSet android.view.animation.AnimationUtils +android.view.animation.AnimationUtils$1 +android.view.animation.AnimationUtils$AnimationState android.view.animation.BaseInterpolator android.view.animation.DecelerateInterpolator android.view.animation.Interpolator android.view.animation.LinearInterpolator -android.view.animation.OvershootInterpolator android.view.animation.PathInterpolator android.view.animation.ScaleAnimation android.view.animation.Transformation android.view.animation.TranslateAnimation +android.view.autofill.AutoFillManager android.view.inputmethod.BaseInputConnection android.view.inputmethod.ComposingText android.view.inputmethod.CursorAnchorInfo$Builder android.view.inputmethod.EditorInfo android.view.inputmethod.EditorInfo$1 -android.view.inputmethod.ExtractedText -android.view.inputmethod.ExtractedText$1 android.view.inputmethod.InputConnection -android.view.inputmethod.InputConnectionInspector android.view.inputmethod.InputMethodManager android.view.inputmethod.InputMethodManager$1 android.view.inputmethod.InputMethodManager$ControlledInputConnectionWrapper @@ -2316,6 +2280,7 @@ android.view.inputmethod.InputMethodManager$FinishedInputEventCallback android.view.inputmethod.InputMethodManager$H android.view.inputmethod.InputMethodManager$ImeInputEventSender android.view.inputmethod.InputMethodManager$PendingEvent +android.view.textclassifier.TextClassificationManager android.view.textservice.SpellCheckerSubtype android.view.textservice.SpellCheckerSubtype$1 android.view.textservice.TextServicesManager @@ -2323,7 +2288,6 @@ android.webkit.IWebViewUpdateService android.webkit.IWebViewUpdateService$Stub android.webkit.IWebViewUpdateService$Stub$Proxy android.webkit.MimeTypeMap -android.webkit.WebSettings android.webkit.WebView android.webkit.WebViewFactory android.webkit.WebViewFactory$MissingWebViewPackageException @@ -2339,14 +2303,6 @@ android.widget.AbsListView$SavedState$1 android.widget.AbsSeekBar android.widget.AbsSpinner android.widget.AbsoluteLayout -android.widget.ActionMenuPresenter -android.widget.ActionMenuPresenter$1 -android.widget.ActionMenuPresenter$2 -android.widget.ActionMenuPresenter$OverflowMenuButton -android.widget.ActionMenuPresenter$OverflowMenuButton$1 -android.widget.ActionMenuPresenter$PopupPresenterCallback -android.widget.ActionMenuView -android.widget.ActionMenuView$ActionMenuChildView android.widget.ActionMenuView$OnMenuItemClickListener android.widget.Adapter android.widget.AdapterView @@ -2367,24 +2323,16 @@ android.widget.EditText android.widget.Editor android.widget.Editor$1 android.widget.Editor$2 -android.widget.Editor$Blink android.widget.Editor$CursorAnchorInfoNotifier -android.widget.Editor$CursorController -android.widget.Editor$EditOperation -android.widget.Editor$EditOperation$1 android.widget.Editor$InputContentType -android.widget.Editor$InputMethodState -android.widget.Editor$InsertionPointCursorController android.widget.Editor$PositionListener android.widget.Editor$ProcessTextIntentActionsHandler -android.widget.Editor$SelectionModifierCursorController android.widget.Editor$SpanController android.widget.Editor$SuggestionHelper android.widget.Editor$SuggestionHelper$SuggestionSpanComparator android.widget.Editor$TextRenderNode android.widget.Editor$TextViewPositionListener android.widget.Editor$UndoInputFilter -android.widget.Filter android.widget.Filter$FilterListener android.widget.Filterable android.widget.ForwardingListener @@ -2392,8 +2340,6 @@ android.widget.FrameLayout android.widget.FrameLayout$LayoutParams android.widget.HeaderViewListAdapter android.widget.HorizontalScrollView -android.widget.HorizontalScrollView$SavedState -android.widget.HorizontalScrollView$SavedState$1 android.widget.ImageButton android.widget.ImageView android.widget.ImageView$ScaleType @@ -2402,12 +2348,12 @@ android.widget.LinearLayout$LayoutParams android.widget.ListAdapter android.widget.ListPopupWindow android.widget.ListPopupWindow$ListSelectorHider +android.widget.ListPopupWindow$PopupDataSetObserver android.widget.ListPopupWindow$PopupScrollListener android.widget.ListPopupWindow$PopupTouchInterceptor android.widget.ListPopupWindow$ResizePopupRunnable android.widget.ListView android.widget.ListView$ArrowScrollFocusResult -android.widget.ListView$FixedViewInfo android.widget.MultiAutoCompleteTextView android.widget.OverScroller android.widget.OverScroller$SplineOverScroller @@ -2415,8 +2361,6 @@ android.widget.PopupWindow android.widget.PopupWindow$1 android.widget.PopupWindow$2 android.widget.PopupWindow$OnDismissListener -android.widget.PopupWindow$PopupDecorView -android.widget.PopupWindow$PopupDecorView$1 android.widget.ProgressBar android.widget.ProgressBar$1 android.widget.ProgressBar$SavedState @@ -2428,30 +2372,17 @@ android.widget.RelativeLayout$DependencyGraph android.widget.RelativeLayout$DependencyGraph$Node android.widget.RelativeLayout$LayoutParams android.widget.RemoteViews -android.widget.RemoteViews$1 -android.widget.RemoteViews$2 -android.widget.RemoteViews$3 -android.widget.RemoteViews$Action -android.widget.RemoteViews$ActionException -android.widget.RemoteViews$BitmapCache -android.widget.RemoteViews$MemoryUsageCounter -android.widget.RemoteViews$MutablePair -android.widget.RemoteViews$OnClickHandler -android.widget.RemoteViews$ReflectionAction -android.widget.RemoteViews$RuntimeAction -android.widget.RemoteViews$SetOnClickPendingIntent +android.widget.RemoteViews$RemoteView android.widget.RemoteViewsAdapter$RemoteAdapterConnectionCallback android.widget.RtlSpacingHelper android.widget.ScrollBarDrawable android.widget.ScrollView android.widget.Scroller android.widget.Scroller$ViscousFluidInterpolator -android.widget.SectionIndexer android.widget.SeekBar android.widget.Space android.widget.Spinner android.widget.SpinnerAdapter -android.widget.Switch android.widget.TextView android.widget.TextView$BufferType android.widget.TextView$ChangeWatcher @@ -2465,7 +2396,6 @@ android.widget.Toast android.widget.Toolbar android.widget.Toolbar$1 android.widget.Toolbar$2 -android.widget.Toolbar$ExpandedActionViewMenuPresenter android.widget.Toolbar$LayoutParams android.widget.WrapperListAdapter com.android.dex.ClassData @@ -2497,9 +2427,6 @@ com.android.dex.util.FileUtils com.android.i18n.phonenumbers.NumberParseException com.android.i18n.phonenumbers.PhoneNumberUtil com.android.internal.R$styleable -com.android.internal.app.AlertController -com.android.internal.app.AlertController$1 -com.android.internal.app.AlertController$ButtonHandler com.android.internal.app.IAppOpsCallback com.android.internal.app.IAppOpsCallback$Stub com.android.internal.app.IAppOpsService @@ -2507,42 +2434,47 @@ com.android.internal.app.IAppOpsService$Stub com.android.internal.app.IAppOpsService$Stub$Proxy com.android.internal.app.IBatteryStats com.android.internal.app.IBatteryStats$Stub +com.android.internal.app.IBatteryStats$Stub$Proxy com.android.internal.app.IVoiceInteractor com.android.internal.app.IVoiceInteractor$Stub -com.android.internal.appwidget.IAppWidgetService -com.android.internal.appwidget.IAppWidgetService$Stub -com.android.internal.appwidget.IAppWidgetService$Stub$Proxy com.android.internal.content.NativeLibraryHelper com.android.internal.content.ReferrerIntent com.android.internal.content.ReferrerIntent$1 +com.android.internal.graphics.drawable.AnimationScaleListDrawable +com.android.internal.graphics.drawable.AnimationScaleListDrawable$AnimationScaleListState com.android.internal.inputmethod.InputMethodUtils com.android.internal.inputmethod.InputMethodUtils$1 com.android.internal.inputmethod.LocaleUtils$LocaleExtractor com.android.internal.logging.AndroidConfig com.android.internal.logging.AndroidHandler com.android.internal.logging.AndroidHandler$1 +com.android.internal.logging.EventLogTags +com.android.internal.logging.MetricsLogger com.android.internal.net.NetworkStatsFactory com.android.internal.os.AndroidPrintStream com.android.internal.os.BinderInternal com.android.internal.os.BinderInternal$GcWatcher -com.android.internal.os.InstallerConnection$InstallerException +com.android.internal.os.FuseAppLoop +com.android.internal.os.FuseAppLoop$1 +com.android.internal.os.FuseAppLoop$UnmountedException com.android.internal.os.LoggingPrintStream com.android.internal.os.LoggingPrintStream$1 com.android.internal.os.PathClassLoaderFactory +com.android.internal.os.RoSystemProperties com.android.internal.os.RuntimeInit com.android.internal.os.RuntimeInit$1 com.android.internal.os.RuntimeInit$Arguments com.android.internal.os.RuntimeInit$KillApplicationHandler com.android.internal.os.RuntimeInit$LoggingHandler -com.android.internal.os.RoSystemProperties com.android.internal.os.SamplingProfilerIntegration com.android.internal.os.SomeArgs com.android.internal.os.Zygote +com.android.internal.os.Zygote$MethodAndArgsCaller com.android.internal.os.ZygoteConnection com.android.internal.os.ZygoteConnection$Arguments com.android.internal.os.ZygoteInit -com.android.internal.os.ZygoteInit$MethodAndArgsCaller com.android.internal.os.ZygoteSecurityException +com.android.internal.os.ZygoteServer com.android.internal.policy.DecorContext com.android.internal.policy.DecorView com.android.internal.policy.DecorView$ColorViewState @@ -2554,8 +2486,6 @@ com.android.internal.policy.PhoneWindow$PanelFeatureState com.android.internal.policy.PhoneWindow$PhoneWindowMenuCallback com.android.internal.policy.PhoneWindow$RotationWatcher com.android.internal.policy.PhoneWindow$RotationWatcher$1 -com.android.internal.telephony.IPhoneStateListener -com.android.internal.telephony.IPhoneStateListener$Stub com.android.internal.telephony.ISub com.android.internal.telephony.ISub$Stub com.android.internal.telephony.ISub$Stub$Proxy @@ -2569,6 +2499,8 @@ com.android.internal.telephony.PhoneConstants$State com.android.internal.textservice.ITextServicesManager com.android.internal.textservice.ITextServicesManager$Stub com.android.internal.textservice.ITextServicesManager$Stub$Proxy +com.android.internal.transition.EpicenterTranslateClipReveal +com.android.internal.transition.TransitionConstants com.android.internal.util.ArrayUtils com.android.internal.util.FastPrintWriter com.android.internal.util.FastPrintWriter$DummyWriter @@ -2579,15 +2511,10 @@ com.android.internal.util.Preconditions com.android.internal.util.VirtualRefBasePtr com.android.internal.util.XmlUtils com.android.internal.util.XmlUtils$WriteMapCallback -com.android.internal.view.ActionBarPolicy com.android.internal.view.IInputConnectionWrapper com.android.internal.view.IInputConnectionWrapper$MyHandler -com.android.internal.view.IInputConnectionWrapper$SomeArgs com.android.internal.view.IInputContext com.android.internal.view.IInputContext$Stub -com.android.internal.view.IInputContextCallback -com.android.internal.view.IInputContextCallback$Stub -com.android.internal.view.IInputContextCallback$Stub$Proxy com.android.internal.view.IInputMethodClient com.android.internal.view.IInputMethodClient$Stub com.android.internal.view.IInputMethodManager @@ -2603,23 +2530,13 @@ com.android.internal.view.animation.FallbackLUTInterpolator com.android.internal.view.animation.HasNativeInterpolator com.android.internal.view.animation.NativeInterpolatorFactory com.android.internal.view.animation.NativeInterpolatorFactoryHelper -com.android.internal.view.menu.ActionMenuItem -com.android.internal.view.menu.BaseMenuPresenter com.android.internal.view.menu.MenuBuilder com.android.internal.view.menu.MenuBuilder$Callback -com.android.internal.view.menu.MenuBuilder$ItemInvoker com.android.internal.view.menu.MenuItemImpl -com.android.internal.view.menu.MenuPresenter com.android.internal.view.menu.MenuPresenter$Callback -com.android.internal.view.menu.MenuView com.android.internal.view.menu.ShowableListMenu com.android.internal.widget.BackgroundFallback com.android.internal.widget.DecorContentParent -com.android.internal.widget.DecorToolbar -com.android.internal.widget.EditableInputConnection -com.android.internal.widget.ScrollBarUtils -com.android.internal.widget.ToolbarWidgetWrapper -com.android.internal.widget.ToolbarWidgetWrapper$1 com.android.okhttp.Address com.android.okhttp.Authenticator com.android.okhttp.CacheControl @@ -2635,6 +2552,8 @@ com.android.okhttp.ConnectionPool$1 com.android.okhttp.ConnectionSpec com.android.okhttp.ConnectionSpec$Builder com.android.okhttp.Dispatcher +com.android.okhttp.Dns +com.android.okhttp.Dns$1 com.android.okhttp.Handshake com.android.okhttp.Headers com.android.okhttp.Headers$Builder @@ -2659,8 +2578,6 @@ com.android.okhttp.Route com.android.okhttp.TlsVersion com.android.okhttp.internal.ConnectionSpecSelector com.android.okhttp.internal.Internal -com.android.okhttp.internal.Network -com.android.okhttp.internal.Network$1 com.android.okhttp.internal.OptionalMethod com.android.okhttp.internal.Platform com.android.okhttp.internal.RouteDatabase @@ -2670,14 +2587,14 @@ com.android.okhttp.internal.Util$1 com.android.okhttp.internal.http.AuthenticatorAdapter com.android.okhttp.internal.http.CacheStrategy com.android.okhttp.internal.http.CacheStrategy$Factory -com.android.okhttp.internal.http.HttpConnection -com.android.okhttp.internal.http.HttpConnection$AbstractSource -com.android.okhttp.internal.http.HttpConnection$ChunkedSource -com.android.okhttp.internal.http.HttpConnection$FixedLengthSource +com.android.okhttp.internal.http.Http1xStream +com.android.okhttp.internal.http.Http1xStream$AbstractSource +com.android.okhttp.internal.http.Http1xStream$ChunkedSource +com.android.okhttp.internal.http.Http1xStream$FixedLengthSource com.android.okhttp.internal.http.HttpEngine com.android.okhttp.internal.http.HttpEngine$1 com.android.okhttp.internal.http.HttpMethod -com.android.okhttp.internal.http.HttpTransport +com.android.okhttp.internal.http.HttpStream com.android.okhttp.internal.http.OkHeaders com.android.okhttp.internal.http.OkHeaders$1 com.android.okhttp.internal.http.RealResponseBody @@ -2687,10 +2604,11 @@ com.android.okhttp.internal.http.RetryableSink com.android.okhttp.internal.http.RouteException com.android.okhttp.internal.http.RouteSelector com.android.okhttp.internal.http.StatusLine -com.android.okhttp.internal.http.Transport +com.android.okhttp.internal.http.StreamAllocation com.android.okhttp.internal.huc.DelegatingHttpsURLConnection com.android.okhttp.internal.huc.HttpURLConnectionImpl com.android.okhttp.internal.huc.HttpsURLConnectionImpl +com.android.okhttp.internal.io.RealConnection com.android.okhttp.internal.tls.OkHostnameVerifier com.android.okhttp.okio.AsyncTimeout com.android.okhttp.okio.AsyncTimeout$1 @@ -2771,8 +2689,12 @@ com.android.org.bouncycastle.jcajce.provider.symmetric.DES com.android.org.bouncycastle.jcajce.provider.symmetric.DES$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.DESede com.android.org.bouncycastle.jcajce.provider.symmetric.DESede$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2 +com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPBKDF2$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12 com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.PBES2AlgorithmParameters +com.android.org.bouncycastle.jcajce.provider.symmetric.PBES2AlgorithmParameters$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.RC2 com.android.org.bouncycastle.jcajce.provider.symmetric.RC2$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.SymmetricAlgorithmProvider @@ -2792,18 +2714,20 @@ com.android.org.bouncycastle.util.Arrays com.android.org.bouncycastle.util.Encodable com.android.org.bouncycastle.util.Strings com.android.org.bouncycastle.util.Strings$1 +com.android.org.conscrypt.AbstractOpenSSLSession com.android.org.conscrypt.AbstractSessionContext com.android.org.conscrypt.AbstractSessionContext$1 com.android.org.conscrypt.AddressUtils com.android.org.conscrypt.ByteArray -com.android.org.conscrypt.CertPinManager +com.android.org.conscrypt.CertBlacklist com.android.org.conscrypt.CertificatePriorityComparator com.android.org.conscrypt.ChainStrengthAnalyzer com.android.org.conscrypt.ClientSessionContext com.android.org.conscrypt.ClientSessionContext$HostAndPort com.android.org.conscrypt.CryptoUpcalls -com.android.org.conscrypt.FileClientSessionCache -com.android.org.conscrypt.FileClientSessionCache$Impl +com.android.org.conscrypt.EvpMdRef$MD5 +com.android.org.conscrypt.EvpMdRef$SHA1 +com.android.org.conscrypt.EvpMdRef$SHA256 com.android.org.conscrypt.Hex com.android.org.conscrypt.JSSEProvider com.android.org.conscrypt.KeyManagerFactoryImpl @@ -2817,10 +2741,7 @@ com.android.org.conscrypt.NativeRef$EC_POINT com.android.org.conscrypt.NativeRef$EVP_MD_CTX com.android.org.conscrypt.NativeRef$EVP_PKEY com.android.org.conscrypt.OpenSSLBIOInputStream -com.android.org.conscrypt.OpenSSLContextImpl -com.android.org.conscrypt.OpenSSLContextImpl$TLSv12 com.android.org.conscrypt.OpenSSLECGroupContext -com.android.org.conscrypt.OpenSSLECKeyFactory com.android.org.conscrypt.OpenSSLECPointContext com.android.org.conscrypt.OpenSSLECPublicKey com.android.org.conscrypt.OpenSSLExtendedSessionImpl @@ -2829,6 +2750,7 @@ com.android.org.conscrypt.OpenSSLKeyHolder com.android.org.conscrypt.OpenSSLMessageDigestJDK com.android.org.conscrypt.OpenSSLMessageDigestJDK$MD5 com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA1 +com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA256 com.android.org.conscrypt.OpenSSLProvider com.android.org.conscrypt.OpenSSLRSAKeyFactory com.android.org.conscrypt.OpenSSLRSAPublicKey @@ -2847,11 +2769,7 @@ com.android.org.conscrypt.OpenSSLX509CertificateFactory$1 com.android.org.conscrypt.OpenSSLX509CertificateFactory$2 com.android.org.conscrypt.OpenSSLX509CertificateFactory$Parser com.android.org.conscrypt.OpenSSLX509CertificateFactory$ParsingException -com.android.org.conscrypt.PinEntryException -com.android.org.conscrypt.PinListEntry -com.android.org.conscrypt.PinManagerException com.android.org.conscrypt.Platform -com.android.org.conscrypt.SSLClientSessionCache com.android.org.conscrypt.SSLParametersImpl com.android.org.conscrypt.SSLParametersImpl$AliasChooser com.android.org.conscrypt.SSLParametersImpl$PSKCallbacks @@ -2863,6 +2781,17 @@ com.android.org.conscrypt.TrustManagerImpl$TrustAnchorComparator com.android.org.conscrypt.TrustedCertificateIndex com.android.org.conscrypt.TrustedCertificateKeyStoreSpi com.android.org.conscrypt.TrustedCertificateStore +com.android.org.conscrypt.TrustedCertificateStore$1 +com.android.org.conscrypt.TrustedCertificateStore$CertSelector +com.android.org.conscrypt.ct.CTLogInfo +com.android.org.conscrypt.ct.CTLogStore +com.android.org.conscrypt.ct.CTLogStoreImpl +com.android.org.conscrypt.ct.CTLogStoreImpl$InvalidLogFileException +com.android.org.conscrypt.ct.CTPolicy +com.android.org.conscrypt.ct.CTPolicyImpl +com.android.org.conscrypt.ct.CTVerifier +com.android.org.conscrypt.ct.KnownLogs +com.android.org.conscrypt.ct.SerializationException com.android.org.conscrypt.util.ArrayUtils com.android.server.NetworkManagementSocketTagger com.android.server.NetworkManagementSocketTagger$1 @@ -2871,20 +2800,31 @@ com.google.android.collect.Lists com.google.android.collect.Maps com.google.android.gles_jni.EGLImpl com.google.android.gles_jni.GLImpl +dalvik.annotation.optimization.CriticalNative +dalvik.annotation.optimization.FastNative dalvik.system.BaseDexClassLoader +dalvik.system.BaseDexClassLoader$Reporter dalvik.system.BlockGuard dalvik.system.BlockGuard$1 dalvik.system.BlockGuard$2 dalvik.system.BlockGuard$BlockGuardPolicyException dalvik.system.BlockGuard$Policy +dalvik.system.ClassExt dalvik.system.CloseGuard dalvik.system.CloseGuard$DefaultReporter +dalvik.system.CloseGuard$DefaultTracker dalvik.system.CloseGuard$Reporter +dalvik.system.CloseGuard$Tracker dalvik.system.DalvikLogHandler +dalvik.system.DexClassLoader dalvik.system.DexFile dalvik.system.DexFile$DFEnum dalvik.system.DexPathList dalvik.system.DexPathList$Element +dalvik.system.DexPathList$NativeLibraryElement +dalvik.system.EmulatedStackFrame +dalvik.system.EmulatedStackFrame$Range +dalvik.system.InMemoryDexClassLoader$DexData dalvik.system.PathClassLoader dalvik.system.SocketTagger dalvik.system.SocketTagger$1 @@ -2892,11 +2832,6 @@ dalvik.system.VMDebug dalvik.system.VMRuntime dalvik.system.VMStack dalvik.system.ZygoteHooks -java.beans.ChangeListenerMap -java.beans.PropertyChangeEvent -java.beans.PropertyChangeListener -java.beans.PropertyChangeSupport -java.beans.PropertyChangeSupport$PropertyChangeListenerMap java.io.Bits java.io.BufferedInputStream java.io.BufferedOutputStream @@ -2911,6 +2846,7 @@ java.io.DataInput java.io.DataInputStream java.io.DataOutput java.io.DataOutputStream +java.io.DefaultFileSystem java.io.EOFException java.io.ExpiringCache java.io.ExpiringCache$1 @@ -2919,6 +2855,7 @@ java.io.Externalizable java.io.File java.io.File$PathStatus java.io.FileDescriptor +java.io.FileDescriptor$1 java.io.FileFilter java.io.FileInputStream java.io.FileInputStream$UseManualSkipException @@ -2930,18 +2867,33 @@ java.io.FileWriter java.io.FilenameFilter java.io.FilterInputStream java.io.FilterOutputStream -java.io.FilterReader java.io.Flushable java.io.IOException java.io.InputStream java.io.InputStreamReader java.io.InterruptedIOException +java.io.InvalidClassException java.io.InvalidObjectException java.io.ObjectInput java.io.ObjectInputStream +java.io.ObjectInputStream$BlockDataInputStream +java.io.ObjectInputStream$HandleTable +java.io.ObjectInputStream$HandleTable$HandleList +java.io.ObjectInputStream$PeekInputStream +java.io.ObjectInputStream$ValidationList java.io.ObjectOutput java.io.ObjectOutputStream +java.io.ObjectOutputStream$BlockDataOutputStream +java.io.ObjectOutputStream$HandleTable +java.io.ObjectOutputStream$PutField +java.io.ObjectOutputStream$ReplaceTable java.io.ObjectStreamClass +java.io.ObjectStreamClass$2 +java.io.ObjectStreamClass$Caches +java.io.ObjectStreamClass$EntryFuture +java.io.ObjectStreamClass$FieldReflector +java.io.ObjectStreamClass$FieldReflectorKey +java.io.ObjectStreamClass$WeakClassKey java.io.ObjectStreamConstants java.io.ObjectStreamException java.io.ObjectStreamField @@ -2950,7 +2902,6 @@ java.io.OutputStreamWriter java.io.PrintStream java.io.PrintWriter java.io.PushbackInputStream -java.io.PushbackReader java.io.RandomAccessFile java.io.Reader java.io.SequenceInputStream @@ -2962,10 +2913,13 @@ java.io.UTFDataFormatException java.io.UnixFileSystem java.io.UnsupportedEncodingException java.io.Writer +java.lang.-$Lambda$250$S9HjrJh0nDg7IyU6wZdPArnZWRQ +java.lang.-$Lambda$251$S9HjrJh0nDg7IyU6wZdPArnZWRQ java.lang.AbstractMethodError java.lang.AbstractStringBuilder java.lang.AndroidHardcodedSystemProperties java.lang.Appendable +java.lang.ArithmeticException java.lang.ArrayIndexOutOfBoundsException java.lang.ArrayStoreException java.lang.AssertionError @@ -2977,8 +2931,6 @@ java.lang.Byte$ByteCache java.lang.CaseMapper java.lang.CaseMapper$1 java.lang.CharSequence -java.lang.CharSequence$-java_util_stream_IntStream_chars__LambdaImpl0 -java.lang.CharSequence$-java_util_stream_IntStream_codePoints__LambdaImpl0 java.lang.CharSequence$1CharIterator java.lang.CharSequence$1CodePointIterator java.lang.Character @@ -3008,9 +2960,7 @@ java.lang.EnumConstantNotPresentException java.lang.Error java.lang.Exception java.lang.Float -java.lang.FloatingDecimal -java.lang.FloatingDecimal$1 -java.lang.FloatingDecimal$2 +java.lang.IllegalAccessError java.lang.IllegalAccessException java.lang.IllegalArgumentException java.lang.IllegalStateException @@ -3029,7 +2979,7 @@ java.lang.LinkageError java.lang.Long java.lang.Long$LongCache java.lang.Math -java.lang.Math$NoImagePreloadHolder +java.lang.Math$RandomNumberGeneratorHolder java.lang.NoClassDefFoundError java.lang.NoSuchFieldError java.lang.NoSuchFieldException @@ -3042,6 +2992,7 @@ java.lang.Object java.lang.OutOfMemoryError java.lang.Package java.lang.Process +java.lang.ProcessBuilder java.lang.ProcessEnvironment java.lang.Readable java.lang.ReflectiveOperationException @@ -3053,7 +3004,6 @@ java.lang.SecurityException java.lang.SecurityManager java.lang.Short java.lang.Short$ShortCache -java.lang.Shutdown java.lang.StackOverflowError java.lang.StackTraceElement java.lang.StrictMath @@ -3061,7 +3011,6 @@ java.lang.String java.lang.String$CaseInsensitiveComparator java.lang.StringBuffer java.lang.StringBuilder -java.lang.StringCoding java.lang.StringFactory java.lang.StringIndexOutOfBoundsException java.lang.System @@ -3095,6 +3044,22 @@ java.lang.annotation.IncompleteAnnotationException java.lang.annotation.Inherited java.lang.annotation.Retention java.lang.annotation.Target +java.lang.invoke.MethodHandle +java.lang.invoke.MethodHandleImpl +java.lang.invoke.MethodHandleImpl$HandleInfo +java.lang.invoke.MethodHandleInfo +java.lang.invoke.MethodHandleStatics +java.lang.invoke.MethodHandles +java.lang.invoke.MethodType +java.lang.invoke.MethodType$ConcurrentWeakInternSet +java.lang.invoke.MethodType$ConcurrentWeakInternSet$WeakEntry +java.lang.invoke.MethodTypeForm +java.lang.invoke.Transformers$BindTo +java.lang.invoke.Transformers$Collector +java.lang.invoke.Transformers$Spreader +java.lang.invoke.Transformers$Transformer +java.lang.invoke.Transformers$VarargsCollector +java.lang.invoke.WrongMethodTypeException java.lang.ref.FinalizerReference java.lang.ref.FinalizerReference$Sentinel java.lang.ref.PhantomReference @@ -3102,47 +3067,54 @@ java.lang.ref.Reference java.lang.ref.ReferenceQueue java.lang.ref.SoftReference java.lang.ref.WeakReference -java.lang.reflect.AbstractMethod -java.lang.reflect.AbstractMethod$GenericInfo java.lang.reflect.AccessibleObject java.lang.reflect.AnnotatedElement java.lang.reflect.Array java.lang.reflect.Constructor +java.lang.reflect.Executable +java.lang.reflect.Executable$GenericInfo java.lang.reflect.Field -java.lang.reflect.GenericArrayType java.lang.reflect.GenericDeclaration java.lang.reflect.InvocationHandler java.lang.reflect.InvocationTargetException +java.lang.reflect.MalformedParametersException java.lang.reflect.Member java.lang.reflect.Method java.lang.reflect.Method$1 java.lang.reflect.Modifier +java.lang.reflect.Parameter java.lang.reflect.ParameterizedType java.lang.reflect.Proxy java.lang.reflect.Proxy$1 +java.lang.reflect.Proxy$Key1 +java.lang.reflect.Proxy$Key2 +java.lang.reflect.Proxy$KeyFactory +java.lang.reflect.Proxy$KeyX +java.lang.reflect.Proxy$ProxyClassFactory java.lang.reflect.Type java.lang.reflect.TypeVariable -java.lang.reflect.WildcardType +java.lang.reflect.WeakCache +java.lang.reflect.WeakCache$CacheKey +java.lang.reflect.WeakCache$CacheValue +java.lang.reflect.WeakCache$Factory +java.lang.reflect.WeakCache$LookupValue +java.lang.reflect.WeakCache$Value java.math.BigDecimal java.math.BigInt java.math.BigInteger -java.math.BitLevel java.math.NativeBN java.math.RoundingMode -java.net.AbstractPlainDatagramSocketImpl java.net.AbstractPlainSocketImpl java.net.AddressCache java.net.AddressCache$AddressCacheEntry java.net.AddressCache$AddressCacheKey java.net.ConnectException java.net.CookieHandler -java.net.DatagramPacket -java.net.DatagramSocketImpl -java.net.DefaultInterface java.net.HttpURLConnection java.net.IDN java.net.Inet4Address java.net.Inet6Address +java.net.Inet6Address$Inet6AddressHolder java.net.Inet6AddressImpl java.net.InetAddress java.net.InetAddress$1 @@ -3150,12 +3122,10 @@ java.net.InetAddress$InetAddressHolder java.net.InetAddressImpl java.net.InetSocketAddress java.net.InetSocketAddress$InetSocketAddressHolder -java.net.InterfaceAddress java.net.JarURLConnection java.net.MalformedURLException java.net.NetworkInterface java.net.Parts -java.net.PlainDatagramSocketImpl java.net.PlainSocketImpl java.net.ProtocolException java.net.Proxy @@ -3164,6 +3134,8 @@ java.net.ProxySelector java.net.ResponseCache java.net.ServerSocket java.net.Socket +java.net.Socket$2 +java.net.Socket$3 java.net.SocketAddress java.net.SocketException java.net.SocketImpl @@ -3173,7 +3145,6 @@ java.net.SocketOutputStream java.net.SocketTimeoutException java.net.SocksConsts java.net.SocksSocketImpl -java.net.SocksSocketImpl$3 java.net.URI java.net.URI$Parser java.net.URISyntaxException @@ -3222,6 +3193,7 @@ java.nio.channels.FileChannel$MapMode java.nio.channels.FileLock java.nio.channels.GatheringByteChannel java.nio.channels.InterruptibleChannel +java.nio.channels.MulticastChannel java.nio.channels.NetworkChannel java.nio.channels.ReadableByteChannel java.nio.channels.ScatteringByteChannel @@ -3248,6 +3220,7 @@ java.nio.charset.CodingErrorAction java.nio.charset.IllegalCharsetNameException java.nio.charset.StandardCharsets java.nio.charset.UnsupportedCharsetException +java.nio.file.attribute.FileAttribute java.security.AccessControlContext java.security.AccessControlException java.security.AccessController @@ -3338,7 +3311,6 @@ java.security.interfaces.RSAPrivateKey java.security.interfaces.RSAPublicKey java.security.spec.AlgorithmParameterSpec java.security.spec.ECField -java.security.spec.ECFieldF2m java.security.spec.ECFieldFp java.security.spec.ECParameterSpec java.security.spec.ECPoint @@ -3346,15 +3318,12 @@ java.security.spec.ECPublicKeySpec java.security.spec.EllipticCurve java.security.spec.EncodedKeySpec java.security.spec.InvalidKeySpecException -java.security.spec.InvalidParameterSpecException java.security.spec.KeySpec java.security.spec.RSAPublicKeySpec java.security.spec.X509EncodedKeySpec -java.sql.Timestamp java.text.AttributedCharacterIterator$Attribute java.text.CalendarBuilder java.text.CharacterIterator -java.text.Collator java.text.DateFormat java.text.DateFormat$Field java.text.DateFormatSymbols @@ -3371,13 +3340,19 @@ java.text.Normalizer$Form java.text.NumberFormat java.text.ParseException java.text.ParsePosition -java.text.RuleBasedCollator java.text.SimpleDateFormat java.text.StringCharacterIterator -java.text.spi.DateFormatProvider -java.text.spi.DateFormatSymbolsProvider -java.text.spi.DecimalFormatSymbolsProvider -java.text.spi.NumberFormatProvider +java.time.DateTimeException +java.util.-$Lambda$181$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$182$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$183$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$184$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$267$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$268$4EqhxufgNKat19m0CB0-toH_lzo +java.util.-$Lambda$291$aUGKT4ItCOku5-JSG-x8Aqj2pJw +java.util.-$Lambda$292$aUGKT4ItCOku5-JSG-x8Aqj2pJw +java.util.-$Lambda$293$aUGKT4ItCOku5-JSG-x8Aqj2pJw +java.util.-$Lambda$294$aUGKT4ItCOku5-JSG-x8Aqj2pJw java.util.AbstractCollection java.util.AbstractList java.util.AbstractList$Itr @@ -3397,8 +3372,21 @@ java.util.ArrayList$Itr java.util.ArrayList$ListItr java.util.ArrayList$SubList java.util.ArrayList$SubList$1 +java.util.ArrayPrefixHelpers$CumulateTask +java.util.ArrayPrefixHelpers$DoubleCumulateTask +java.util.ArrayPrefixHelpers$IntCumulateTask +java.util.ArrayPrefixHelpers$LongCumulateTask java.util.Arrays java.util.Arrays$ArrayList +java.util.Arrays$NaturalOrder +java.util.ArraysParallelSortHelpers$FJByte$Sorter +java.util.ArraysParallelSortHelpers$FJChar$Sorter +java.util.ArraysParallelSortHelpers$FJDouble$Sorter +java.util.ArraysParallelSortHelpers$FJFloat$Sorter +java.util.ArraysParallelSortHelpers$FJInt$Sorter +java.util.ArraysParallelSortHelpers$FJLong$Sorter +java.util.ArraysParallelSortHelpers$FJObject$Sorter +java.util.ArraysParallelSortHelpers$FJShort$Sorter java.util.BitSet java.util.Calendar java.util.Collection @@ -3410,6 +3398,9 @@ java.util.Collections$AsLIFOQueue java.util.Collections$CheckedCollection java.util.Collections$CheckedList java.util.Collections$CheckedMap +java.util.Collections$CheckedNavigableMap +java.util.Collections$CheckedNavigableSet +java.util.Collections$CheckedQueue java.util.Collections$CheckedRandomAccessList java.util.Collections$CheckedSet java.util.Collections$CheckedSortedMap @@ -3430,6 +3421,8 @@ java.util.Collections$SingletonSet java.util.Collections$SynchronizedCollection java.util.Collections$SynchronizedList java.util.Collections$SynchronizedMap +java.util.Collections$SynchronizedNavigableMap +java.util.Collections$SynchronizedNavigableSet java.util.Collections$SynchronizedRandomAccessList java.util.Collections$SynchronizedSet java.util.Collections$SynchronizedSortedMap @@ -3442,18 +3435,16 @@ java.util.Collections$UnmodifiableMap java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$1 java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableEntry +java.util.Collections$UnmodifiableNavigableMap +java.util.Collections$UnmodifiableNavigableMap$EmptyNavigableMap +java.util.Collections$UnmodifiableNavigableSet +java.util.Collections$UnmodifiableNavigableSet$EmptyNavigableSet java.util.Collections$UnmodifiableRandomAccessList java.util.Collections$UnmodifiableSet java.util.Collections$UnmodifiableSortedMap java.util.Collections$UnmodifiableSortedSet java.util.ComparableTimSort java.util.Comparator -java.util.Comparator$-java_util_Comparator_comparingDouble_java_util_function_ToDoubleFunction_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparingInt_java_util_function_ToIntFunction_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparingLong_java_util_function_ToLongFunction_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparing_java_util_function_Function_keyExtractor_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_comparing_java_util_function_Function_keyExtractor_java_util_Comparator_keyComparator_LambdaImpl0 -java.util.Comparator$-java_util_Comparator_thenComparing_java_util_Comparator_other_LambdaImpl0 java.util.Comparators$NaturalOrderComparator java.util.Comparators$NullComparator java.util.ConcurrentModificationException @@ -3467,7 +3458,6 @@ java.util.EnumMap$1 java.util.EnumSet java.util.Enumeration java.util.EventListener -java.util.EventObject java.util.Formattable java.util.Formatter java.util.Formatter$Conversion @@ -3481,14 +3471,14 @@ java.util.HashMap java.util.HashMap$EntryIterator java.util.HashMap$EntrySet java.util.HashMap$HashIterator -java.util.HashMap$HashMapEntry java.util.HashMap$KeyIterator java.util.HashMap$KeySet +java.util.HashMap$Node +java.util.HashMap$TreeNode java.util.HashMap$ValueIterator java.util.HashMap$Values java.util.HashSet java.util.Hashtable -java.util.Hashtable$EntrySet java.util.Hashtable$Enumerator java.util.Hashtable$HashtableEntry java.util.IdentityHashMap @@ -3498,11 +3488,14 @@ java.util.IllegalFormatException java.util.IllformedLocaleException java.util.Iterator java.util.LinkedHashMap -java.util.LinkedHashMap$EntryIterator -java.util.LinkedHashMap$KeyIterator +java.util.LinkedHashMap$LinkedEntryIterator +java.util.LinkedHashMap$LinkedEntrySet java.util.LinkedHashMap$LinkedHashIterator java.util.LinkedHashMap$LinkedHashMapEntry -java.util.LinkedHashMap$ValueIterator +java.util.LinkedHashMap$LinkedKeyIterator +java.util.LinkedHashMap$LinkedKeySet +java.util.LinkedHashMap$LinkedValueIterator +java.util.LinkedHashMap$LinkedValues java.util.LinkedHashSet java.util.LinkedList java.util.LinkedList$ListItr @@ -3513,6 +3506,8 @@ java.util.Locale java.util.Locale$Builder java.util.Locale$Cache java.util.Locale$Category +java.util.Locale$FilteringMode +java.util.Locale$LanguageRange java.util.Locale$LocaleKey java.util.Map java.util.Map$Entry @@ -3524,30 +3519,16 @@ java.util.Objects java.util.PrimitiveIterator java.util.PrimitiveIterator$OfInt java.util.PriorityQueue -java.util.PriorityQueue$Itr java.util.Properties java.util.Properties$LineReader -java.util.PropertyResourceBundle java.util.Queue java.util.Random java.util.RandomAccess java.util.RandomAccessSubList java.util.RegularEnumSet -java.util.RegularEnumSet$EnumSetIterator java.util.ResourceBundle java.util.ResourceBundle$1 -java.util.ResourceBundle$BundleReference -java.util.ResourceBundle$CacheKey -java.util.ResourceBundle$CacheKeyReference -java.util.ResourceBundle$Control -java.util.ResourceBundle$Control$1 -java.util.ResourceBundle$Control$CandidateListCache -java.util.ResourceBundle$LoaderReference -java.util.ResourceBundle$RBClassLoader -java.util.ResourceBundle$RBClassLoader$1 -java.util.ServiceLoader -java.util.ServiceLoader$1 -java.util.ServiceLoader$LazyIterator +java.util.Scanner java.util.Set java.util.SimpleTimeZone java.util.SortedMap @@ -3564,12 +3545,11 @@ java.util.Spliterators$EmptySpliterator$OfInt java.util.Spliterators$EmptySpliterator$OfLong java.util.Spliterators$EmptySpliterator$OfRef java.util.Stack +java.util.StringJoiner java.util.StringTokenizer java.util.SubList java.util.TimSort java.util.TimeZone -java.util.Timer -java.util.TimerTask java.util.TreeMap java.util.TreeMap$EntryIterator java.util.TreeMap$EntrySet @@ -3591,31 +3571,69 @@ java.util.WeakHashMap$HashIterator java.util.WeakHashMap$KeyIterator java.util.WeakHashMap$KeySet java.util.WeakHashMap$Values +java.util.concurrent.-$Lambda$269$xR9BLpu6SifNikvFgr4lEiECBsk java.util.concurrent.AbstractExecutorService java.util.concurrent.BlockingQueue java.util.concurrent.Callable java.util.concurrent.CancellationException java.util.concurrent.ConcurrentHashMap java.util.concurrent.ConcurrentHashMap$BaseIterator +java.util.concurrent.ConcurrentHashMap$BulkTask java.util.concurrent.ConcurrentHashMap$CollectionView +java.util.concurrent.ConcurrentHashMap$CounterCell java.util.concurrent.ConcurrentHashMap$EntryIterator java.util.concurrent.ConcurrentHashMap$EntrySetView +java.util.concurrent.ConcurrentHashMap$ForEachEntryTask +java.util.concurrent.ConcurrentHashMap$ForEachKeyTask +java.util.concurrent.ConcurrentHashMap$ForEachMappingTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedEntryTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedKeyTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedMappingTask +java.util.concurrent.ConcurrentHashMap$ForEachTransformedValueTask +java.util.concurrent.ConcurrentHashMap$ForEachValueTask java.util.concurrent.ConcurrentHashMap$ForwardingNode java.util.concurrent.ConcurrentHashMap$KeyIterator java.util.concurrent.ConcurrentHashMap$KeySetView +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesTask +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceEntriesToLongTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceKeysToLongTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceMappingsToLongTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesToDoubleTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesToIntTask +java.util.concurrent.ConcurrentHashMap$MapReduceValuesToLongTask java.util.concurrent.ConcurrentHashMap$Node +java.util.concurrent.ConcurrentHashMap$ReduceEntriesTask +java.util.concurrent.ConcurrentHashMap$ReduceKeysTask +java.util.concurrent.ConcurrentHashMap$ReduceValuesTask +java.util.concurrent.ConcurrentHashMap$ReservationNode +java.util.concurrent.ConcurrentHashMap$SearchEntriesTask +java.util.concurrent.ConcurrentHashMap$SearchKeysTask +java.util.concurrent.ConcurrentHashMap$SearchMappingsTask +java.util.concurrent.ConcurrentHashMap$SearchValuesTask java.util.concurrent.ConcurrentHashMap$Segment java.util.concurrent.ConcurrentHashMap$Traverser java.util.concurrent.ConcurrentHashMap$TreeBin java.util.concurrent.ConcurrentHashMap$TreeNode +java.util.concurrent.ConcurrentHashMap$ValueIterator +java.util.concurrent.ConcurrentHashMap$ValuesView java.util.concurrent.ConcurrentLinkedQueue java.util.concurrent.ConcurrentLinkedQueue$Node java.util.concurrent.ConcurrentMap java.util.concurrent.CopyOnWriteArrayList -java.util.concurrent.CopyOnWriteArrayList$CowIterator +java.util.concurrent.CopyOnWriteArrayList$COWIterator java.util.concurrent.CopyOnWriteArraySet java.util.concurrent.CountDownLatch java.util.concurrent.CountDownLatch$Sync +java.util.concurrent.CountedCompleter java.util.concurrent.Delayed java.util.concurrent.ExecutionException java.util.concurrent.Executor @@ -3626,6 +3644,9 @@ java.util.concurrent.Executors$DelegatedExecutorService java.util.concurrent.Executors$DelegatedScheduledExecutorService java.util.concurrent.Executors$FinalizableDelegatedExecutorService java.util.concurrent.Executors$RunnableAdapter +java.util.concurrent.ForkJoinPool +java.util.concurrent.ForkJoinTask +java.util.concurrent.ForkJoinTask$ExceptionNode java.util.concurrent.Future java.util.concurrent.FutureTask java.util.concurrent.FutureTask$WaitNode @@ -3649,6 +3670,7 @@ java.util.concurrent.SynchronousQueue$TransferStack java.util.concurrent.SynchronousQueue$TransferStack$SNode java.util.concurrent.SynchronousQueue$Transferer java.util.concurrent.ThreadFactory +java.util.concurrent.ThreadLocalRandom java.util.concurrent.ThreadPoolExecutor java.util.concurrent.ThreadPoolExecutor$AbortPolicy java.util.concurrent.ThreadPoolExecutor$Worker @@ -3684,19 +3706,33 @@ java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock java.util.concurrent.locks.ReentrantReadWriteLock$Sync java.util.concurrent.locks.ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock +java.util.function.-$Lambda$276$1MZdIZ-DL_fjy9l0o8IMJk57T2g java.util.function.BiConsumer java.util.function.BiFunction +java.util.function.BinaryOperator java.util.function.Consumer +java.util.function.DoubleBinaryOperator java.util.function.Function +java.util.function.IntBinaryOperator +java.util.function.IntConsumer +java.util.function.IntFunction +java.util.function.IntToDoubleFunction +java.util.function.IntToLongFunction +java.util.function.IntUnaryOperator +java.util.function.LongBinaryOperator +java.util.function.LongUnaryOperator java.util.function.Predicate java.util.function.Supplier +java.util.function.ToDoubleBiFunction java.util.function.ToDoubleFunction +java.util.function.ToIntBiFunction java.util.function.ToIntFunction +java.util.function.ToLongBiFunction java.util.function.ToLongFunction java.util.function.UnaryOperator java.util.jar.JarEntry java.util.jar.JarFile -java.util.jar.JarFile$1 +java.util.jar.JarFile$JarEntryIterator java.util.jar.JarFile$JarFileEntry java.util.logging.ErrorManager java.util.logging.Formatter @@ -3706,7 +3742,8 @@ java.util.logging.Level$KnownLevel java.util.logging.LogManager java.util.logging.LogManager$1 java.util.logging.LogManager$2 -java.util.logging.LogManager$4 +java.util.logging.LogManager$3 +java.util.logging.LogManager$5 java.util.logging.LogManager$Cleaner java.util.logging.LogManager$LogNode java.util.logging.LogManager$LoggerContext @@ -3714,8 +3751,8 @@ java.util.logging.LogManager$LoggerContext$1 java.util.logging.LogManager$LoggerWeakRef java.util.logging.LogManager$RootLogger java.util.logging.LogManager$SystemLoggerContext -java.util.logging.LogRecord java.util.logging.Logger +java.util.logging.Logger$LoggerBundle java.util.logging.LoggingPermission java.util.logging.LoggingProxyImpl java.util.prefs.AbstractPreferences @@ -3725,9 +3762,10 @@ java.util.regex.MatchResult java.util.regex.Matcher java.util.regex.Pattern java.util.regex.PatternSyntaxException -java.util.spi.LocaleServiceProvider java.util.stream.BaseStream +java.util.stream.DoubleStream java.util.stream.IntStream +java.util.stream.LongStream java.util.stream.Stream java.util.stream.StreamSupport java.util.zip.Adler32 @@ -3746,24 +3784,15 @@ java.util.zip.ZipCoder java.util.zip.ZipConstants java.util.zip.ZipEntry java.util.zip.ZipFile -java.util.zip.ZipFile$1 +java.util.zip.ZipFile$ZipEntryIterator java.util.zip.ZipFile$ZipFileInflaterInputStream java.util.zip.ZipFile$ZipFileInputStream +java.util.zip.ZipUtils javax.crypto.BadPaddingException javax.crypto.Cipher -javax.crypto.Cipher$CipherSpiAndProvider -javax.crypto.Cipher$InitParams -javax.crypto.Cipher$InitType -javax.crypto.Cipher$NeedToSet -javax.crypto.Cipher$SpiAndProviderUpdater -javax.crypto.Cipher$Transform -javax.crypto.CipherSpi javax.crypto.IllegalBlockSizeException -javax.crypto.JceSecurity javax.crypto.NoSuchPaddingException -javax.crypto.NullCipher javax.crypto.SecretKey -javax.crypto.ShortBufferException javax.crypto.spec.IvParameterSpec javax.crypto.spec.SecretKeySpec javax.microedition.khronos.egl.EGL @@ -3799,7 +3828,6 @@ javax.net.ssl.SSLSession javax.net.ssl.SSLSessionContext javax.net.ssl.SSLSocket javax.net.ssl.SSLSocketFactory -javax.net.ssl.SSLSocketFactory$1 javax.net.ssl.TrustManager javax.net.ssl.TrustManagerFactory javax.net.ssl.TrustManagerFactory$1 @@ -3808,13 +3836,12 @@ javax.net.ssl.X509ExtendedKeyManager javax.net.ssl.X509ExtendedTrustManager javax.net.ssl.X509KeyManager javax.net.ssl.X509TrustManager +javax.security.auth.Destroyable javax.security.auth.callback.UnsupportedCallbackException javax.security.auth.x500.X500Principal javax.security.cert.Certificate javax.security.cert.CertificateException javax.security.cert.X509Certificate -libcore.icu.DateIntervalFormat -libcore.icu.DateUtilsBridge libcore.icu.ICU libcore.icu.LocaleData libcore.icu.NativeConverter @@ -3834,8 +3861,9 @@ libcore.io.EventLogger$DefaultReporter libcore.io.EventLogger$Reporter libcore.io.ForwardingOs libcore.io.IoBridge +libcore.io.IoTracker +libcore.io.IoTracker$Mode libcore.io.IoUtils -libcore.io.IoUtils$FileReader libcore.io.Libcore libcore.io.Memory libcore.io.MemoryMappedFile @@ -3854,8 +3882,6 @@ libcore.reflect.AnnotationMember$DefaultValues libcore.reflect.GenericSignatureParser libcore.reflect.InternalNames libcore.reflect.ListOfTypes -libcore.reflect.ListOfVariables -libcore.reflect.ParameterizedTypeImpl libcore.reflect.Types libcore.util.BasicLruCache libcore.util.CharsetUtils @@ -3865,8 +3891,6 @@ libcore.util.NativeAllocationRegistry libcore.util.NativeAllocationRegistry$CleanerRunner libcore.util.NativeAllocationRegistry$CleanerThunk libcore.util.ZoneInfo -libcore.util.ZoneInfo$CheckedArithmeticException -libcore.util.ZoneInfo$WallTime libcore.util.ZoneInfoDB libcore.util.ZoneInfoDB$TzData libcore.util.ZoneInfoDB$TzData$1 @@ -3879,54 +3903,22 @@ org.apache.harmony.luni.internal.util.TimezoneGetter org.apache.harmony.xml.ExpatAttributes org.apache.harmony.xml.ExpatParser org.apache.http.Header -org.apache.http.HeaderIterator org.apache.http.HttpEntity org.apache.http.HttpEntityEnclosingRequest -org.apache.http.HttpHost org.apache.http.HttpMessage org.apache.http.HttpRequest org.apache.http.HttpResponse -org.apache.http.HttpVersion -org.apache.http.NameValuePair org.apache.http.ProtocolVersion org.apache.http.StatusLine org.apache.http.client.HttpClient -org.apache.http.client.ResponseHandler -org.apache.http.client.methods.AbortableHttpRequest -org.apache.http.client.methods.HttpEntityEnclosingRequestBase -org.apache.http.client.methods.HttpPost -org.apache.http.client.methods.HttpRequestBase org.apache.http.client.methods.HttpUriRequest -org.apache.http.client.utils.URLEncodedUtils -org.apache.http.conn.ClientConnectionManager org.apache.http.conn.ConnectTimeoutException org.apache.http.entity.AbstractHttpEntity -org.apache.http.entity.BasicHttpEntity -org.apache.http.impl.cookie.DateParseException -org.apache.http.impl.cookie.DateUtils org.apache.http.message.AbstractHttpMessage org.apache.http.message.BasicHeader org.apache.http.message.BasicHttpResponse org.apache.http.message.BasicStatusLine org.apache.http.message.HeaderGroup -org.apache.http.params.AbstractHttpParams -org.apache.http.params.BasicHttpParams -org.apache.http.params.CoreConnectionPNames -org.apache.http.params.HttpConnectionParams -org.apache.http.params.HttpParams -org.apache.http.protocol.HttpContext -org.ccil.cowan.tagsoup.AttributesImpl -org.ccil.cowan.tagsoup.AutoDetector -org.ccil.cowan.tagsoup.Element -org.ccil.cowan.tagsoup.ElementType -org.ccil.cowan.tagsoup.HTMLModels -org.ccil.cowan.tagsoup.HTMLScanner -org.ccil.cowan.tagsoup.HTMLSchema -org.ccil.cowan.tagsoup.Parser -org.ccil.cowan.tagsoup.Parser$1 -org.ccil.cowan.tagsoup.ScanHandler -org.ccil.cowan.tagsoup.Scanner -org.ccil.cowan.tagsoup.Schema org.json.JSON org.json.JSONArray org.json.JSONException @@ -3938,31 +3930,30 @@ org.json.JSONTokener org.kxml2.io.KXmlParser org.kxml2.io.KXmlParser$ValueContext org.xml.sax.Attributes -org.xml.sax.ContentHandler -org.xml.sax.DTDHandler -org.xml.sax.EntityResolver -org.xml.sax.ErrorHandler -org.xml.sax.InputSource -org.xml.sax.Locator org.xml.sax.SAXException -org.xml.sax.SAXNotRecognizedException -org.xml.sax.SAXNotSupportedException -org.xml.sax.XMLReader -org.xml.sax.ext.LexicalHandler -org.xml.sax.helpers.DefaultHandler org.xmlpull.v1.XmlPullParser org.xmlpull.v1.XmlPullParserException org.xmlpull.v1.XmlSerializer +sun.invoke.util.BytecodeDescriptor +sun.invoke.util.Wrapper sun.misc.Cleaner sun.misc.CompoundEnumeration +sun.misc.FDBigInteger +sun.misc.FloatingDecimal +sun.misc.FloatingDecimal$1 +sun.misc.FloatingDecimal$ASCIIToBinaryBuffer +sun.misc.FloatingDecimal$ASCIIToBinaryConverter +sun.misc.FloatingDecimal$BinaryToASCIIBuffer +sun.misc.FloatingDecimal$BinaryToASCIIConverter +sun.misc.FloatingDecimal$ExceptionalBinaryToASCIIBuffer +sun.misc.FloatingDecimal$PreparedASCIIToBinaryBuffer sun.misc.FormattedFloatingDecimal sun.misc.FormattedFloatingDecimal$1 sun.misc.FormattedFloatingDecimal$Form -sun.misc.FpUtils -sun.misc.Hashing sun.misc.IOUtils -sun.misc.IoTrace +sun.misc.JavaIOFileDescriptorAccess sun.misc.REException +sun.misc.SharedSecrets sun.misc.Unsafe sun.misc.VM sun.misc.Version @@ -3978,10 +3969,10 @@ sun.net.util.IPAddressUtil sun.net.www.ParseUtil sun.net.www.protocol.file.Handler sun.net.www.protocol.jar.Handler -sun.nio.ch.AbstractPollArrayWrapper sun.nio.ch.DatagramChannelImpl sun.nio.ch.DatagramDispatcher sun.nio.ch.DirectBuffer +sun.nio.ch.EPollArrayWrapper sun.nio.ch.FileChannelImpl sun.nio.ch.FileChannelImpl$Unmapper sun.nio.ch.FileDispatcher @@ -3991,13 +3982,11 @@ sun.nio.ch.FileLockImpl sun.nio.ch.FileLockTable sun.nio.ch.IOStatus sun.nio.ch.IOUtil -sun.nio.ch.InheritedChannel sun.nio.ch.Interruptible sun.nio.ch.NativeDispatcher sun.nio.ch.NativeThread sun.nio.ch.NativeThreadSet sun.nio.ch.Net -sun.nio.ch.PollArrayWrapper sun.nio.ch.SelChImpl sun.nio.ch.ServerSocketChannelImpl sun.nio.ch.SharedFileLockTable @@ -4006,14 +3995,8 @@ sun.nio.ch.SocketChannelImpl sun.nio.cs.ArrayEncoder sun.nio.cs.StreamDecoder sun.nio.cs.StreamEncoder -sun.reflect.annotation.AnnotationType sun.security.action.GetBooleanAction sun.security.action.GetPropertyAction -sun.security.ec.ECKeyFactory -sun.security.ec.ECKeyFactory$1 -sun.security.ec.ECKeyFactory$2 -sun.security.ec.ECParameters -sun.security.ec.NamedCurve sun.security.jca.GetInstance sun.security.jca.GetInstance$Instance sun.security.jca.ProviderConfig @@ -4027,7 +4010,6 @@ sun.security.jca.ProviderList$ServiceList$1 sun.security.jca.Providers sun.security.jca.ServiceId sun.security.pkcs.PKCS9Attribute -sun.security.pkcs.ParsingException sun.security.pkcs.SignerInfo sun.security.provider.CertPathProvider sun.security.provider.X509Factory @@ -4043,7 +4025,9 @@ sun.security.provider.certpath.PKIXCertPathValidator sun.security.provider.certpath.PKIXMasterCertPathValidator sun.security.provider.certpath.PolicyChecker sun.security.provider.certpath.PolicyNodeImpl -sun.security.provider.certpath.UntrustedChecker +sun.security.util.-$Lambda$179$Kli5xKA4dAwmFO1sy_hpNWmbfH4 +sun.security.util.AbstractAlgorithmConstraints +sun.security.util.AlgorithmDecomposer sun.security.util.BitArray sun.security.util.ByteArrayLexOrder sun.security.util.ByteArrayTagOrder @@ -4057,7 +4041,6 @@ sun.security.util.DerInputStream sun.security.util.DerOutputStream sun.security.util.DerValue sun.security.util.DisabledAlgorithmConstraints -sun.security.util.DisabledAlgorithmConstraints$1 sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraint sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraint$Operator sun.security.util.DisabledAlgorithmConstraints$KeySizeConstraints @@ -4067,7 +4050,6 @@ sun.security.util.MemoryCache sun.security.util.MemoryCache$CacheEntry sun.security.util.MemoryCache$SoftCacheEntry sun.security.util.ObjectIdentifier -sun.security.util.UntrustedCertificates sun.security.x509.AVA sun.security.x509.AVAKeyword sun.security.x509.AccessDescription @@ -4124,8 +4106,6 @@ sun.security.x509.X509AttributeName sun.security.x509.X509CertImpl sun.security.x509.X509CertInfo sun.security.x509.X509Key -sun.util.LocaleServiceProviderPool -sun.util.LocaleServiceProviderPool$1 sun.util.calendar.AbstractCalendar sun.util.calendar.BaseCalendar sun.util.calendar.BaseCalendar$Date @@ -4139,18 +4119,15 @@ sun.util.calendar.LocalGregorianCalendar sun.util.locale.BaseLocale sun.util.locale.BaseLocale$Cache sun.util.locale.BaseLocale$Key -sun.util.locale.Extension sun.util.locale.InternalLocaleBuilder sun.util.locale.InternalLocaleBuilder$CaseInsensitiveChar sun.util.locale.LanguageTag -sun.util.locale.LocaleExtensions sun.util.locale.LocaleObjectCache sun.util.locale.LocaleObjectCache$CacheEntry sun.util.locale.LocaleSyntaxException sun.util.locale.LocaleUtils sun.util.locale.ParseStatus sun.util.locale.StringTokenIterator -sun.util.locale.UnicodeLocaleExtension sun.util.logging.LoggingProxy sun.util.logging.LoggingSupport sun.util.logging.LoggingSupport$1 diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 59d982a5286f..a590805cf745 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -3275,7 +3275,6 @@ message MetricsEvent { // OPEN: Settings > Apps > Default Apps > Warning dialog to confirm selection DEFAULT_APP_PICKER_CONFIRMATION_DIALOG = 791; - // OPEN: Settings > Apps > Default Apps > Default autofill app DEFAULT_AUTOFILL_PICKER = 792; @@ -3352,7 +3351,8 @@ message MetricsEvent { BACKUP_SETTINGS = 818; // ACTION: Picture-in-picture was explicitly entered for an activity - // VALUE: true if it was entered while hiding as a result of moving to another task, false otherwise + // VALUE: true if it was entered while hiding as a result of moving to + // another task, false otherwise ACTION_PICTURE_IN_PICTURE_ENTERED = 819; // ACTION: The activity currently in picture-in-picture was expanded back to fullscreen @@ -3378,6 +3378,16 @@ message MetricsEvent { // The current aspect ratio of the PiP, logged when it changes. PICTURE_IN_PICTURE_ASPECT_RATIO = 825; + // FIELD - length in dp of ACTION_LS_* gestures, or zero if not applicable + // CATEGORY: GLOBAL_SYSTEM_UI + // OS: O + FIELD_GESTURE_LENGTH = 826; + + // FIELD - velocity in dp (per second?) of ACTION_LS_* gestures, or zero if not applicable + // CATEGORY: GLOBAL_SYSTEM_UI + // OS: O + FIELD_GESTURE_VELOCITY = 827; + // ---- End O Constants, all O constants go above this line ---- // Add new aosp constants above this line. diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 3ba8915d8c99..a861522c0576 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -3899,6 +3899,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { case WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG: case WindowManager.LayoutParams.TYPE_SYSTEM_ERROR: case WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY: + case WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY: case WindowManager.LayoutParams.TYPE_SCREENSHOT: { return AccessibilityWindowInfo.TYPE_SYSTEM; } diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 3e711ec05c75..22eca77c3a06 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -3028,22 +3028,22 @@ public class InputMethodManagerService extends IInputMethodManager.Stub PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, mSettings.getCurrentUserId()); - final HashMap<String, List<InputMethodSubtype>> additionalSubtypes = + final HashMap<String, List<InputMethodSubtype>> additionalSubtypeMap = mFileManager.getAllAdditionalInputMethodSubtypes(); for (int i = 0; i < services.size(); ++i) { ResolveInfo ri = services.get(i); ServiceInfo si = ri.serviceInfo; - ComponentName compName = new ComponentName(si.packageName, si.name); - if (!android.Manifest.permission.BIND_INPUT_METHOD.equals( - si.permission)) { - Slog.w(TAG, "Skipping input method " + compName + final String imeId = InputMethodInfo.computeId(ri); + if (!android.Manifest.permission.BIND_INPUT_METHOD.equals(si.permission)) { + Slog.w(TAG, "Skipping input method " + imeId + ": it does not require the permission " + android.Manifest.permission.BIND_INPUT_METHOD); continue; } - if (DEBUG) Slog.d(TAG, "Checking " + compName); + if (DEBUG) Slog.d(TAG, "Checking " + imeId); + final List<InputMethodSubtype> additionalSubtypes = additionalSubtypeMap.get(imeId); try { InputMethodInfo p = new InputMethodInfo(mContext, ri, additionalSubtypes); mMethodList.add(p); @@ -3054,7 +3054,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub Slog.d(TAG, "Found an input method " + p); } } catch (Exception e) { - Slog.wtf(TAG, "Unable to load input method " + compName, e); + Slog.wtf(TAG, "Unable to load input method " + imeId, e); } } diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 962056f25fd1..3573b8b3e2d6 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -37,6 +37,8 @@ import static android.content.pm.ActivityInfo.FLAG_MULTIPROCESS; import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS; import static android.content.pm.ActivityInfo.FLAG_STATE_NOT_NEEDED; import static android.content.pm.ActivityInfo.LAUNCH_MULTIPLE; +import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE; +import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TASK; import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_TOP; import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZEABLE; import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; @@ -773,7 +775,10 @@ final class ActivityRecord implements AppWindowContainerListener { // Remove the activity from the old task and add it to the new task prevTask.removeActivity(this); - setTask(newTask, null); + // TODO(b/34179495): This should really be set to null in removeActivity() call above, + // but really bad things that I can't track down right now happen when I do that. + // So, setting it here now and will change later when there is time for investigation. + task = null; newTask.addActivityAtIndex(position, this); } @@ -821,19 +826,8 @@ final class ActivityRecord implements AppWindowContainerListener { } } - void setTask(TaskRecord newTask, TaskRecord taskToAffiliateWith) { - if (task != null && task.removeActivity(this) && task != newTask - && task.getStack() != null) { - task.getStack().removeTask(task, "setTask"); - } - task = newTask; - setTaskToAffiliateWith(taskToAffiliateWith); - } - void setTaskToAffiliateWith(TaskRecord taskToAffiliateWith) { - if (taskToAffiliateWith != null && - launchMode != ActivityInfo.LAUNCH_SINGLE_INSTANCE && - launchMode != ActivityInfo.LAUNCH_SINGLE_TASK) { + if (launchMode != LAUNCH_SINGLE_INSTANCE && launchMode != LAUNCH_SINGLE_TASK) { task.setTaskToAffiliateWith(taskToAffiliateWith); } } diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 54082ea55b7d..10d108b6a677 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -2775,7 +2775,12 @@ final class ActivityStack extends ConfigurationContainer implements StackWindowL // Slot the activity into the history stack and proceed if (DEBUG_ADD_REMOVE) Slog.i(TAG, "Adding activity " + r + " to stack to task " + task, new RuntimeException("here").fillInStackTrace()); - r.createWindowContainer(); + // TODO: Need to investigate if it is okay for the controller to already be created by the + // time we get to this point. I think it is, but need to double check. + // Use test in b/34179495 to trace the call path. + if (r.getWindowContainerController() == null) { + r.createWindowContainer(); + } task.setFrontOfTask(); if (!isHomeOrRecentsStack() || numActivities() > 0) { @@ -2952,8 +2957,7 @@ final class ActivityStack extends ConfigurationContainer implements StackWindowL + targetTask + " Callers=" + Debug.getCallers(4)); if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Pushing next activity " + p + " out to target's task " + target.task); - p.setTask(targetTask, null); - targetTask.addActivityAtBottom(p); + p.reparent(targetTask, 0 /* position - bottom */, "resetTargetTaskIfNeeded"); } mWindowContainerController.positionChildAtBottom( diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index 73ef88b5c9a8..f5874af74657 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1615,7 +1615,7 @@ class ActivityStarter { mNewTaskInfo != null ? mNewTaskInfo : mStartActivity.info, mNewTaskIntent != null ? mNewTaskIntent : mIntent, mVoiceSession, mVoiceInteractor, !mLaunchTaskBehind /* toTop */, mStartActivity.mActivityType); - mStartActivity.setTask(task, taskToAffiliate); + addOrReparentStartingActivity(task, "setTaskFromReuseOrCreateNewTask - mReuseTask"); if (mLaunchBounds != null) { final int stackId = mTargetStack.mStackId; if (StackId.resizeStackWithLaunchBounds(stackId)) { @@ -1625,11 +1625,14 @@ class ActivityStarter { mStartActivity.task.updateOverrideConfiguration(mLaunchBounds); } } - if (DEBUG_TASKS) Slog.v(TAG_TASKS, - "Starting new activity " + - mStartActivity + " in new task " + mStartActivity.task); + if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Starting new activity " + mStartActivity + + " in new task " + mStartActivity.task); } else { - mStartActivity.setTask(mReuseTask, taskToAffiliate); + addOrReparentStartingActivity(mReuseTask, "setTaskFromReuseOrCreateNewTask"); + } + + if (taskToAffiliate != null) { + mStartActivity.setTaskToAffiliateWith(taskToAffiliate); } if (mSupervisor.isLockTaskModeViolation(mStartActivity.task)) { @@ -1719,7 +1722,7 @@ class ActivityStarter { // An existing activity is starting this new activity, so we want to keep the new one in // the same task as the one that is starting it. - mStartActivity.setTask(sourceTask, null); + addOrReparentStartingActivity(sourceTask, "setTaskFromSourceRecord"); if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Starting new activity " + mStartActivity + " in existing task " + mStartActivity.task + " from source " + mSourceRecord); return START_SUCCESS; @@ -1752,7 +1755,8 @@ class ActivityStarter { // Check whether we should actually launch the new activity in to the task, // or just reuse the current activity on top. ActivityRecord top = mInTask.getTopActivity(); - if (top != null && top.realActivity.equals(mStartActivity.realActivity) && top.userId == mStartActivity.userId) { + if (top != null && top.realActivity.equals(mStartActivity.realActivity) + && top.userId == mStartActivity.userId) { if ((mLaunchFlags & FLAG_ACTIVITY_SINGLE_TOP) != 0 || mLaunchSingleTop || mLaunchSingleTask) { ActivityStack.logStartActivity(AM_NEW_INTENT, top, top.task); @@ -1761,7 +1765,8 @@ class ActivityStarter { // anything if that is the case, so this is it! return START_RETURN_INTENT_TO_CALLER; } - top.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); + top.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, + mStartActivity.launchedFromPackage); return START_DELIVERED_TO_TOP; } } @@ -1773,9 +1778,9 @@ class ActivityStarter { return START_TASK_TO_FRONT; } - mStartActivity.setTask(mInTask, null); - if (DEBUG_TASKS) Slog.v(TAG_TASKS, - "Starting new activity " + mStartActivity + " in explicit task " + mStartActivity.task); + addOrReparentStartingActivity(mInTask, "setTaskFromInTask"); + if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Starting new activity " + mStartActivity + + " in explicit task " + mStartActivity.task); return START_SUCCESS; } @@ -1790,10 +1795,18 @@ class ActivityStarter { final TaskRecord task = (prev != null) ? prev.task : mTargetStack.createTaskRecord( mSupervisor.getNextTaskIdForUserLocked(mStartActivity.userId), mStartActivity.info, mIntent, null, null, true, mStartActivity.mActivityType); - mStartActivity.setTask(task, null); - mStartActivity.task.getStack().positionChildWindowContainerAtTop(mStartActivity.task); - if (DEBUG_TASKS) Slog.v(TAG_TASKS, - "Starting new activity " + mStartActivity + " in new guessed " + mStartActivity.task); + addOrReparentStartingActivity(task, "setTaskToCurrentTopOrCreateNewTask"); + mTargetStack.positionChildWindowContainerAtTop(task); + if (DEBUG_TASKS) Slog.v(TAG_TASKS, "Starting new activity " + mStartActivity + + " in new guessed " + mStartActivity.task); + } + + private void addOrReparentStartingActivity(TaskRecord parent, String reason) { + if (mStartActivity.task == null || mStartActivity.task == parent) { + parent.addActivityToTop(mStartActivity); + } else { + mStartActivity.reparent(parent, parent.mActivities.size() /* top */, reason); + } } private int adjustLaunchFlagsToDocumentMode(ActivityRecord r, boolean launchSingleInstance, diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index f1f8bb20652d..35713025a2f5 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -51,8 +51,8 @@ import android.telephony.SignalStrength; import android.telephony.TelephonyManager; import android.util.IntArray; import android.util.Slog; - import android.util.TimeUtils; + import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IBatteryStats; import com.android.internal.os.BatteryStatsHelper; @@ -1127,6 +1127,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub pw.println(" full-history: include additional detailed events in battery history:"); pw.println(" wake_lock_in, alarms and proc events"); pw.println(" no-auto-reset: don't automatically reset stats when unplugged"); + pw.println(" pretend-screen-off: pretend the screen is off, even if screen state changes"); } private int doEnableOrDisable(PrintWriter pw, int i, String[] args, boolean enable) { @@ -1144,6 +1145,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub synchronized (mStats) { mStats.setNoAutoReset(enable); } + } else if ("pretend-screen-off".equals(args[i])) { + synchronized (mStats) { + mStats.setPretendScreenOff(enable); + } } else { pw.println("Unknown enable/disable option: " + args[i]); dumpHelp(pw); diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index fef4073922c6..9e09cbbfb0c7 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -51,6 +51,7 @@ import android.util.Slog; import com.android.internal.app.IVoiceInteractor; import com.android.internal.util.XmlUtils; +import com.android.server.wm.AppWindowContainerController; import com.android.server.wm.TaskWindowContainerController; import com.android.server.wm.TaskWindowContainerListener; @@ -1033,6 +1034,12 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta * be in the current task or unparented to any task. */ void addActivityAtIndex(int index, ActivityRecord r) { + if (r.task != null && r.task != this) { + throw new IllegalArgumentException("Can not add r=" + " to task=" + this + + " current parent=" + r.task); + } + r.task = this; + // Remove r first, and if it wasn't already in the list and it's fullscreen, count it. if (!mActivities.remove(r) && r.fullscreen) { // Was not previously in list. @@ -1063,6 +1070,7 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta } } + index = Math.min(size, index); mActivities.add(index, r); updateEffectiveIntent(); if (r.isPersistable()) { @@ -1071,7 +1079,12 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta // Sync. with window manager updateOverrideConfigurationFromLaunchBounds(); - mWindowContainerController.positionChildAt(r.getWindowContainerController(), index); + final AppWindowContainerController appController = r.getWindowContainerController(); + if (appController != null) { + // Only attempt to move in WM if the child has a controller. It is possible we haven't + // created controller for the activity we are starting yet. + mWindowContainerController.positionChildAt(appController, index); + } r.onOverrideConfigurationSent(); } diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index ef792b0b84f8..1d60946129a7 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -5933,7 +5933,7 @@ public class AudioService extends IAudioService.Stub final AccessibilityManager accessibilityManager = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); updateDefaultStreamOverrideDelay(accessibilityManager.isTouchExplorationEnabled()); - updateA11yVolumeAlias(accessibilityManager.isEnabled()); + updateA11yVolumeAlias(accessibilityManager.isAccessibilityVolumeStreamActive()); accessibilityManager.addTouchExplorationStateChangeListener(this); accessibilityManager.addAccessibilityServicesStateChangeListener(this); } @@ -6066,6 +6066,7 @@ public class AudioService extends IAudioService.Stub pw.print(" mSafeMediaVolumeState="); pw.println(safeMediaVolumeStateToString(mSafeMediaVolumeState)); pw.print(" mSafeMediaVolumeIndex="); pw.println(mSafeMediaVolumeIndex); + pw.print(" sIndependentA11yVolume="); pw.println(sIndependentA11yVolume); pw.print(" mPendingVolumeCommand="); pw.println(mPendingVolumeCommand); pw.print(" mMusicActiveMs="); pw.println(mMusicActiveMs); pw.print(" mMcc="); pw.println(mMcc); diff --git a/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java b/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java index 08a333230793..017c5fb4d4ec 100644 --- a/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java +++ b/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java @@ -66,9 +66,9 @@ public class UpstreamNetworkMonitor { public static final int EVENT_ON_LINKPROPERTIES = 3; public static final int EVENT_ON_LOST = 4; - private static final int LISTEN_ALL = 1; - private static final int TRACK_DEFAULT = 2; - private static final int MOBILE_REQUEST = 3; + private static final int CALLBACK_LISTEN_ALL = 1; + private static final int CALLBACK_TRACK_DEFAULT = 2; + private static final int CALLBACK_MOBILE_REQUEST = 3; private final Context mContext; private final StateMachine mTarget; @@ -98,10 +98,10 @@ public class UpstreamNetworkMonitor { final NetworkRequest listenAllRequest = new NetworkRequest.Builder() .clearCapabilities().build(); - mListenAllCallback = new UpstreamNetworkCallback(LISTEN_ALL); + mListenAllCallback = new UpstreamNetworkCallback(CALLBACK_LISTEN_ALL); cm().registerNetworkCallback(listenAllRequest, mListenAllCallback); - mDefaultNetworkCallback = new UpstreamNetworkCallback(TRACK_DEFAULT); + mDefaultNetworkCallback = new UpstreamNetworkCallback(CALLBACK_TRACK_DEFAULT); cm().registerDefaultNetworkCallback(mDefaultNetworkCallback); } @@ -136,30 +136,25 @@ public class UpstreamNetworkMonitor { return; } - final NetworkRequest.Builder builder = new NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR); - if (mDunRequired) { - builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED) - .addCapability(NetworkCapabilities.NET_CAPABILITY_DUN); - } else { - builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); - } - final NetworkRequest mobileUpstreamRequest = builder.build(); + // The following use of the legacy type system cannot be removed until + // after upstream selection no longer finds networks by legacy type. + // See also http://b/34364553 . + final int legacyType = mDunRequired ? TYPE_MOBILE_DUN : TYPE_MOBILE_HIPRI; + + final NetworkRequest mobileUpstreamRequest = new NetworkRequest.Builder() + .setCapabilities(ConnectivityManager.networkCapabilitiesForType(legacyType)) + .build(); // The existing default network and DUN callbacks will be notified. // Therefore, to avoid duplicate notifications, we only register a no-op. - mMobileNetworkCallback = new UpstreamNetworkCallback(MOBILE_REQUEST); + mMobileNetworkCallback = new UpstreamNetworkCallback(CALLBACK_MOBILE_REQUEST); // TODO: Change the timeout from 0 (no onUnavailable callback) to some // moderate callback timeout. This might be useful for updating some UI. // Additionally, we log a message to aid in any subsequent debugging. Log.d(TAG, "requesting mobile upstream network: " + mobileUpstreamRequest); - // The following use of the legacy type system cannot be removed until - // after upstream selection no longer finds networks by legacy type. - // See also b/34364553. - final int apnType = mDunRequired ? TYPE_MOBILE_DUN : TYPE_MOBILE_HIPRI; - cm().requestNetwork(mobileUpstreamRequest, mMobileNetworkCallback, 0, apnType); + cm().requestNetwork(mobileUpstreamRequest, mMobileNetworkCallback, 0, legacyType); } public void releaseMobileNetworkRequest() { @@ -184,17 +179,18 @@ public class UpstreamNetworkMonitor { // Always request whatever extra information we can, in case this // was already up when start() was called, in which case we would // not have been notified of any information that had not changed. - final NetworkCallback cb = - (callbackType == TRACK_DEFAULT) ? mDefaultNetworkCallback : - (callbackType == MOBILE_REQUEST) ? mMobileNetworkCallback : null; - if (cb != null) { - final ConnectivityManager cm = cm(); - cm.requestNetworkCapabilities(mDefaultNetworkCallback); - cm.requestLinkProperties(mDefaultNetworkCallback); - } - - if (callbackType == TRACK_DEFAULT) { - mCurrentDefault = network; + switch (callbackType) { + case CALLBACK_LISTEN_ALL: + break; + case CALLBACK_TRACK_DEFAULT: + cm().requestNetworkCapabilities(mDefaultNetworkCallback); + cm().requestLinkProperties(mDefaultNetworkCallback); + mCurrentDefault = network; + break; + case CALLBACK_MOBILE_REQUEST: + cm().requestNetworkCapabilities(mMobileNetworkCallback); + cm().requestLinkProperties(mMobileNetworkCallback); + break; } // Requesting updates for mListenAllCallback is not currently possible @@ -262,7 +258,7 @@ public class UpstreamNetworkMonitor { } private void handleLost(int callbackType, Network network) { - if (callbackType == TRACK_DEFAULT) { + if (callbackType == CALLBACK_TRACK_DEFAULT) { mCurrentDefault = null; // Receiving onLost() for a default network does not necessarily // mean the network is gone. We wait for a separate notification diff --git a/services/core/java/com/android/server/notification/NotificationComparator.java b/services/core/java/com/android/server/notification/NotificationComparator.java index 6f49df479565..279bf9005fe3 100644 --- a/services/core/java/com/android/server/notification/NotificationComparator.java +++ b/services/core/java/com/android/server/notification/NotificationComparator.java @@ -31,6 +31,8 @@ import android.telecom.TelecomManager; import android.text.TextUtils; import android.util.ArrayMap; +import com.android.internal.util.NotificationMessagingUtil; + import java.util.Comparator; import java.util.Objects; @@ -40,18 +42,15 @@ import java.util.Objects; public class NotificationComparator implements Comparator<NotificationRecord> { - private final String DEFAULT_SMS_APP_SETTING = Settings.Secure.SMS_DEFAULT_APPLICATION; - private final Context mContext; + private final NotificationMessagingUtil mMessagingUtil; private String mDefaultPhoneApp; - private ArrayMap<Integer, String> mDefaultSmsApp = new ArrayMap<>(); public NotificationComparator(Context context) { mContext = context; mContext.registerReceiver(mPhoneAppBroadcastReceiver, new IntentFilter(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED)); - mContext.getContentResolver().registerContentObserver( - Settings.Secure.getUriFor(DEFAULT_SMS_APP_SETTING), false, mSmsContentObserver); + mMessagingUtil = new NotificationMessagingUtil(mContext); } @Override @@ -73,9 +72,15 @@ public class NotificationComparator return -1 * Boolean.compare(leftImportantOngoing, rightImportantOngoing); } + boolean leftMessaging = isImportantMessaging(left); + boolean rightMessaging = isImportantMessaging(right); + if (leftMessaging != rightMessaging) { + return -1 * Boolean.compare(leftMessaging, rightMessaging); + } + // Next: sufficiently import person to person communication - boolean leftPeople = isImportantMessaging(left); - boolean rightPeople = isImportantMessaging(right); + boolean leftPeople = isImportantPeople(left); + boolean rightPeople = isImportantPeople(right); if (leftPeople && rightPeople){ // by contact proximity, close to far. if same proximity, check further fields. @@ -128,50 +133,31 @@ public class NotificationComparator if (record.getImportance() < NotificationManager.IMPORTANCE_LOW) { return false; } - // TODO: add whitelist return isCall(record) || isMediaNotification(record); } - protected boolean isImportantMessaging(NotificationRecord record) { + protected boolean isImportantPeople(NotificationRecord record) { if (record.getImportance() < NotificationManager.IMPORTANCE_LOW) { return false; } - - Class<? extends Notification.Style> style = getNotificationStyle(record); - if (Notification.MessagingStyle.class.equals(style)) { - return true; - } - if (record.getContactAffinity() > ValidateNotificationPeople.NONE) { return true; } - - if (record.getNotification().category == Notification.CATEGORY_MESSAGE - && isDefaultMessagingApp(record)) { - return true; - } - return false; } + protected boolean isImportantMessaging(NotificationRecord record) { + return mMessagingUtil.isImportantMessaging(record.sbn, record.getImportance()); + } + private boolean isOngoing(NotificationRecord record) { final int ongoingFlags = Notification.FLAG_FOREGROUND_SERVICE | Notification.FLAG_ONGOING_EVENT; return (record.getNotification().flags & ongoingFlags) != 0; } - private Class<? extends Notification.Style> getNotificationStyle(NotificationRecord record) { - String templateClass = - record.getNotification().extras.getString(Notification.EXTRA_TEMPLATE); - - if (!TextUtils.isEmpty(templateClass)) { - return Notification.getNotificationStyleClass(templateClass); - } - return null; - } - private boolean isMediaNotification(NotificationRecord record) { return record.getNotification().extras.getParcelable( Notification.EXTRA_MEDIA_SESSION) != null; @@ -191,18 +177,6 @@ public class NotificationComparator return Objects.equals(pkg, mDefaultPhoneApp); } - @SuppressWarnings("deprecation") - private boolean isDefaultMessagingApp(NotificationRecord record) { - final int userId = record.getUserId(); - if (userId == UserHandle.USER_NULL || userId == UserHandle.USER_ALL) return false; - if (mDefaultSmsApp.get(userId) == null) { - mDefaultSmsApp.put(userId, Settings.Secure.getStringForUser( - mContext.getContentResolver(), - Settings.Secure.SMS_DEFAULT_APPLICATION, userId)); - } - return Objects.equals(mDefaultSmsApp.get(userId), record.sbn.getPackageName()); - } - private final BroadcastReceiver mPhoneAppBroadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -210,17 +184,4 @@ public class NotificationComparator intent.getStringExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME); } }; - - private final ContentObserver mSmsContentObserver = new ContentObserver( - new Handler(Looper.getMainLooper())) { - @Override - public void onChange(boolean selfChange, Uri uri, int userId) { - if (Settings.Secure.getUriFor(DEFAULT_SMS_APP_SETTING).equals(uri)) { - mDefaultSmsApp.put(userId, Settings.Secure.getStringForUser( - mContext.getContentResolver(), - Settings.Secure.SMS_DEFAULT_APPLICATION, userId)); - - } - } - }; } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 37fff68750d2..180f6c9ae963 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -16,17 +16,24 @@ package com.android.server.policy; +import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW; +import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID; import static android.app.ActivityManager.StackId.HOME_STACK_ID; +import static android.app.AppOpsManager.OP_SYSTEM_ALERT_WINDOW; +import static android.app.AppOpsManager.OP_TOAST_WINDOW; import static android.content.Context.DISPLAY_SERVICE; import static android.content.Context.WINDOW_SERVICE; import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE; import static android.content.pm.PackageManager.FEATURE_TELEVISION; import static android.content.pm.PackageManager.FEATURE_WATCH; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.res.Configuration.EMPTY; import static android.content.res.Configuration.UI_MODE_TYPE_CAR; import static android.content.res.Configuration.UI_MODE_TYPE_MASK; +import static android.os.Build.VERSION_CODES.M; +import static android.os.Build.VERSION_CODES.O; import static android.view.WindowManager.DOCKED_LEFT; import static android.view.WindowManager.DOCKED_RIGHT; import static android.view.WindowManager.DOCKED_TOP; @@ -63,21 +70,14 @@ import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; import static android.view.WindowManager.LayoutParams.SOFT_INPUT_MASK_ADJUST; import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS; import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; -import static android.view.WindowManager.LayoutParams.TYPE_DRAG; import static android.view.WindowManager.LayoutParams.TYPE_DREAM; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_CONSUMER; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; -import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; @@ -103,8 +103,11 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION; import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; +import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType; import static android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN; import static android.view.WindowManager.TAKE_SCREENSHOT_SELECTED_REGION; +import static android.view.WindowManagerGlobal.ADD_OKAY; +import static android.view.WindowManagerGlobal.ADD_PERMISSION_DENIED; import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVERED; import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVER_ABSENT; import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_UNCOVERED; @@ -156,7 +159,6 @@ import android.media.session.MediaSessionLegacyHelper; import android.os.Binder; import android.os.Build; import android.os.Bundle; -import android.os.Debug; import android.os.FactoryTest; import android.os.Handler; import android.os.IBinder; @@ -314,12 +316,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Nav bar is always translucent when the freeform stack is visible, otherwise always opaque. static final int NAV_BAR_TRANSLUCENT_WHEN_FREEFORM_OPAQUE_OTHERWISE = 1; - static final int APPLICATION_MEDIA_SUBLAYER = -2; - static final int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1; - static final int APPLICATION_PANEL_SUBLAYER = 1; - static final int APPLICATION_SUB_PANEL_SUBLAYER = 2; - static final int APPLICATION_ABOVE_SUB_PANEL_SUBLAYER = 3; - static public final String SYSTEM_DIALOG_REASON_KEY = "reason"; static public final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions"; static public final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps"; @@ -2315,86 +2311,82 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (type < FIRST_SYSTEM_WINDOW || type > LAST_SYSTEM_WINDOW) { // Window manager will make sure these are okay. - return WindowManagerGlobal.ADD_OKAY; - } - String permission = null; - switch (type) { - case TYPE_TOAST: - // XXX right now the app process has complete control over - // this... should introduce a token to let the system - // monitor/control what they are doing. - outAppOp[0] = AppOpsManager.OP_TOAST_WINDOW; - break; - case TYPE_DREAM: - case TYPE_INPUT_METHOD: - case TYPE_WALLPAPER: - case TYPE_PRESENTATION: - case TYPE_PRIVATE_PRESENTATION: - case TYPE_VOICE_INTERACTION: - case TYPE_ACCESSIBILITY_OVERLAY: - case TYPE_QS_DIALOG: - // The window manager will check these. - break; - case TYPE_PHONE: - case TYPE_PRIORITY_PHONE: - case TYPE_SYSTEM_ALERT: - case TYPE_SYSTEM_ERROR: - case TYPE_SYSTEM_OVERLAY: - permission = android.Manifest.permission.SYSTEM_ALERT_WINDOW; - outAppOp[0] = AppOpsManager.OP_SYSTEM_ALERT_WINDOW; - break; - default: - permission = android.Manifest.permission.INTERNAL_SYSTEM_WINDOW; - } - if (permission != null) { - if (android.Manifest.permission.SYSTEM_ALERT_WINDOW.equals(permission)) { - final int callingUid = Binder.getCallingUid(); - // system processes will be automatically allowed privilege to draw - if (callingUid == Process.SYSTEM_UID) { - return WindowManagerGlobal.ADD_OKAY; - } - - // check if user has enabled this operation. SecurityException will be thrown if - // this app has not been allowed by the user - final int mode = mAppOpsManager.checkOpNoThrow(outAppOp[0], callingUid, - attrs.packageName); - switch (mode) { - case AppOpsManager.MODE_ALLOWED: - case AppOpsManager.MODE_IGNORED: - // although we return ADD_OKAY for MODE_IGNORED, the added window will - // actually be hidden in WindowManagerService - return WindowManagerGlobal.ADD_OKAY; - case AppOpsManager.MODE_ERRORED: - try { - ApplicationInfo appInfo = mContext.getPackageManager() - .getApplicationInfo(attrs.packageName, - UserHandle.getUserId(callingUid)); - // Don't crash legacy apps - if (appInfo.targetSdkVersion < Build.VERSION_CODES.M) { - return WindowManagerGlobal.ADD_OKAY; - } - } catch (PackageManager.NameNotFoundException e) { - /* ignore */ - } - return WindowManagerGlobal.ADD_PERMISSION_DENIED; - default: - // in the default mode, we will make a decision here based on - // checkCallingPermission() - if (mContext.checkCallingPermission(permission) != - PackageManager.PERMISSION_GRANTED) { - return WindowManagerGlobal.ADD_PERMISSION_DENIED; - } else { - return WindowManagerGlobal.ADD_OKAY; - } + return ADD_OKAY; + } + + if (!isSystemAlertWindowType(type)) { + switch (type) { + case TYPE_TOAST: + // Only apps that target older than O SDK can add window without a token, after + // that we require a token so apps cannot add toasts directly as the token is + // added by the notification system. + // Window manager does the checking for this. + outAppOp[0] = OP_TOAST_WINDOW; + return ADD_OKAY; + case TYPE_DREAM: + case TYPE_INPUT_METHOD: + case TYPE_WALLPAPER: + case TYPE_PRESENTATION: + case TYPE_PRIVATE_PRESENTATION: + case TYPE_VOICE_INTERACTION: + case TYPE_ACCESSIBILITY_OVERLAY: + case TYPE_QS_DIALOG: + // The window manager will check these. + return ADD_OKAY; + } + return mContext.checkCallingOrSelfPermission(INTERNAL_SYSTEM_WINDOW) + == PERMISSION_GRANTED ? ADD_OKAY : ADD_PERMISSION_DENIED; + } + + // Things get a little more interesting for alert windows... + outAppOp[0] = OP_SYSTEM_ALERT_WINDOW; + + final int callingUid = Binder.getCallingUid(); + // system processes will be automatically granted privilege to draw + if (UserHandle.getAppId(callingUid) == Process.SYSTEM_UID) { + return ADD_OKAY; + } + + ApplicationInfo appInfo; + try { + appInfo = mContext.getPackageManager().getApplicationInfo(attrs.packageName, + UserHandle.getUserId(callingUid)); + } catch (PackageManager.NameNotFoundException e) { + appInfo = null; + } + + if (appInfo == null || (type != TYPE_APPLICATION_OVERLAY && appInfo.targetSdkVersion >= O)) { + /** + * Apps targeting >= {@link Build.VERSION_CODES#O} are required to hold + * {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW} (system signature apps) + * permission to add alert windows that aren't + * {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY}. + */ + return (mContext.checkCallingPermission(INTERNAL_SYSTEM_WINDOW) == PERMISSION_GRANTED) + ? ADD_OKAY : ADD_PERMISSION_DENIED; + } + + // check if user has enabled this operation. SecurityException will be thrown if this app + // has not been allowed by the user + final int mode = mAppOpsManager.checkOpNoThrow(outAppOp[0], callingUid, attrs.packageName); + switch (mode) { + case AppOpsManager.MODE_ALLOWED: + case AppOpsManager.MODE_IGNORED: + // although we return ADD_OKAY for MODE_IGNORED, the added window will + // actually be hidden in WindowManagerService + return ADD_OKAY; + case AppOpsManager.MODE_ERRORED: + // Don't crash legacy apps + if (appInfo.targetSdkVersion < M) { + return ADD_OKAY; } - } - - if (mContext.checkCallingOrSelfPermission(permission) - != PackageManager.PERMISSION_GRANTED) { - return WindowManagerGlobal.ADD_PERMISSION_DENIED; - } + return ADD_PERMISSION_DENIED; + default: + // in the default mode, we will make a decision here based on + // checkCallingPermission() + return (mContext.checkCallingPermission(SYSTEM_ALERT_WINDOW) == PERMISSION_GRANTED) + ? ADD_OKAY : ADD_PERMISSION_DENIED; } - return WindowManagerGlobal.ADD_OKAY; } @Override @@ -2440,9 +2432,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } // Check if third party app has set window to system window type. - return mContext.checkCallingOrSelfPermission( - android.Manifest.permission.INTERNAL_SYSTEM_WINDOW) - != PackageManager.PERMISSION_GRANTED; + return mContext.checkCallingOrSelfPermission(INTERNAL_SYSTEM_WINDOW) != PERMISSION_GRANTED; } @Override @@ -2591,130 +2581,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } - /** {@inheritDoc} */ - @Override - public int windowTypeToLayerLw(int type) { - if (type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW) { - return 2; - } - switch (type) { - case TYPE_WALLPAPER: - // wallpaper is at the bottom, though the window manager may move it. - return 1; - case TYPE_PRESENTATION: - case TYPE_PRIVATE_PRESENTATION: - return 2; - case TYPE_DOCK_DIVIDER: - return 2; - case TYPE_QS_DIALOG: - return 2; - case TYPE_PHONE: - return 3; - case TYPE_SEARCH_BAR: - case TYPE_VOICE_INTERACTION_STARTING: - return 4; - case TYPE_VOICE_INTERACTION: - // voice interaction layer is almost immediately above apps. - return 5; - case TYPE_INPUT_CONSUMER: - return 6; - case TYPE_SYSTEM_DIALOG: - return 7; - case TYPE_TOAST: - // toasts and the plugged-in battery thing - return 8; - case TYPE_PRIORITY_PHONE: - // SIM errors and unlock. Not sure if this really should be in a high layer. - return 9; - case TYPE_DREAM: - // used for Dreams (screensavers with TYPE_DREAM windows) - return 10; - case TYPE_SYSTEM_ALERT: - // like the ANR / app crashed dialogs - return 11; - case TYPE_INPUT_METHOD: - // on-screen keyboards and other such input method user interfaces go here. - return 12; - case TYPE_INPUT_METHOD_DIALOG: - // on-screen keyboards and other such input method user interfaces go here. - return 13; - case TYPE_STATUS_BAR_SUB_PANEL: - return 15; - case TYPE_STATUS_BAR: - return 16; - case TYPE_STATUS_BAR_PANEL: - return 17; - case TYPE_KEYGUARD_DIALOG: - return 18; - case TYPE_VOLUME_OVERLAY: - // the on-screen volume indicator and controller shown when the user - // changes the device volume - return 19; - case TYPE_SYSTEM_OVERLAY: - // the on-screen volume indicator and controller shown when the user - // changes the device volume - return 20; - case TYPE_NAVIGATION_BAR: - // the navigation bar, if available, shows atop most things - return 21; - case TYPE_NAVIGATION_BAR_PANEL: - // some panels (e.g. search) need to show on top of the navigation bar - return 22; - case TYPE_SCREENSHOT: - // screenshot selection layer shouldn't go above system error, but it should cover - // navigation bars at the very least. - return 23; - case TYPE_SYSTEM_ERROR: - // system-level error dialogs - return 24; - case TYPE_MAGNIFICATION_OVERLAY: - // used to highlight the magnified portion of a display - return 25; - case TYPE_DISPLAY_OVERLAY: - // used to simulate secondary display devices - return 26; - case TYPE_DRAG: - // the drag layer: input for drag-and-drop is associated with this window, - // which sits above all other focusable windows - return 27; - case TYPE_ACCESSIBILITY_OVERLAY: - // overlay put by accessibility services to intercept user interaction - return 28; - case TYPE_SECURE_SYSTEM_OVERLAY: - return 29; - case TYPE_BOOT_PROGRESS: - return 30; - case TYPE_POINTER: - // the (mouse) pointer layer - return 31; - } - Log.e(TAG, "Unknown window type: " + type); - return 2; - } - - /** {@inheritDoc} */ - @Override - public int subWindowTypeToLayerLw(int type) { - switch (type) { - case TYPE_APPLICATION_PANEL: - case TYPE_APPLICATION_ATTACHED_DIALOG: - return APPLICATION_PANEL_SUBLAYER; - case TYPE_APPLICATION_MEDIA: - return APPLICATION_MEDIA_SUBLAYER; - case TYPE_APPLICATION_MEDIA_OVERLAY: - return APPLICATION_MEDIA_OVERLAY_SUBLAYER; - case TYPE_APPLICATION_SUB_PANEL: - return APPLICATION_SUB_PANEL_SUBLAYER; - case TYPE_APPLICATION_ABOVE_SUB_PANEL: - return APPLICATION_ABOVE_SUB_PANEL_SUBLAYER; - } - Log.e(TAG, "Unknown sub-window type: " + type); - return 0; - } - @Override public int getMaxWallpaperLayer() { - return windowTypeToLayerLw(TYPE_STATUS_BAR); + return getWindowLayerFromTypeLw(TYPE_STATUS_BAR); } private int getNavigationBarWidth(int rotation, int uiMode) { @@ -2797,8 +2666,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { return false; default: // Hide only windows below the keyguard host window. - return windowTypeToLayerLw(win.getBaseType()) - < windowTypeToLayerLw(TYPE_STATUS_BAR); + return getWindowLayerLw(win) < getWindowLayerFromTypeLw(TYPE_STATUS_BAR); } } @@ -3043,7 +2911,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { "PhoneWindowManager"); break; } - return WindowManagerGlobal.ADD_OKAY; + return ADD_OKAY; } /** {@inheritDoc} */ @@ -7837,8 +7705,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { immersiveSticky = (vis & View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0; final boolean navAllowedHidden = immersive || immersiveSticky; - if (hideNavBarSysui && !navAllowedHidden && windowTypeToLayerLw(win.getBaseType()) - > windowTypeToLayerLw(TYPE_INPUT_CONSUMER)) { + if (hideNavBarSysui && !navAllowedHidden + && getWindowLayerLw(win) > getWindowLayerFromTypeLw(TYPE_INPUT_CONSUMER)) { // We can't hide the navbar from this window otherwise the input consumer would not get // the input events. vis = (vis & ~View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java index fedd55a9b5b6..83e77ec3f9ae 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java @@ -630,6 +630,10 @@ public class WebViewUpdateServiceImpl { */ public boolean isValidProvider(WebViewProviderInfo configInfo, PackageInfo packageInfo) { + // Ensure the provider targets this framework release (or a later one). + if (!UserPackage.hasCorrectTargetSdkVersion(packageInfo)) { + return false; + } if (!versionCodeGE(packageInfo.versionCode, getMinimumVersionCode()) && !mSystemInterface.systemIsDebuggable()) { // Webview providers may be downgraded arbitrarily low, prevent that by enforcing diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 49ffa22b53e3..f7a9e41ba706 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -369,6 +369,7 @@ final class AccessibilityController { case WindowManager.LayoutParams.TYPE_SYSTEM_ALERT: case WindowManager.LayoutParams.TYPE_TOAST: case WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY: + case WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY: case WindowManager.LayoutParams.TYPE_PRIORITY_PHONE: case WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG: case WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG: @@ -687,7 +688,7 @@ final class AccessibilityController { mSurfaceControl = surfaceControl; mSurfaceControl.setLayerStack(mWindowManager.getDefaultDisplay() .getLayerStack()); - mSurfaceControl.setLayer(mWindowManagerService.mPolicy.windowTypeToLayerLw( + mSurfaceControl.setLayer(mWindowManagerService.mPolicy.getWindowLayerFromTypeLw( WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY) * WindowManagerService.TYPE_LAYER_MULTIPLIER); mSurfaceControl.setPosition(0, 0); diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index 3eb529b568f2..4eb8e0291d0c 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -951,9 +951,9 @@ public class AppTransition implements Dump { float scaleW = appWidth / thumbWidth; getNextAppTransitionStartRect(taskId, mTmpRect); final float fromX; - final float fromY; + float fromY; final float toX; - final float toY; + float toY; final float pivotX; final float pivotY; if (shouldScaleDownThumbnailTransition(uiMode, orientation)) { @@ -966,6 +966,12 @@ public class AppTransition implements Dump { toY = appRect.height() / 2 * (1 - 1 / scaleW) + appRect.top; pivotX = mTmpRect.width() / 2; pivotY = appRect.height() / 2 / scaleW; + if (mGridLayoutRecentsEnabled) { + // In the grid layout, the header is displayed above the thumbnail instead of + // overlapping it. + fromY -= thumbHeightI; + toY -= thumbHeightI * scaleW; + } } else { pivotX = 0; pivotY = 0; @@ -1014,7 +1020,10 @@ public class AppTransition implements Dump { // This AnimationSet uses the Interpolators assigned above. AnimationSet set = new AnimationSet(false); set.addAnimation(scale); - set.addAnimation(alpha); + if (!mGridLayoutRecentsEnabled) { + // In the grid layout, the header should be shown for the whole animation. + set.addAnimation(alpha); + } set.addAnimation(translate); set.addAnimation(clipAnim); a = set; @@ -1033,7 +1042,10 @@ public class AppTransition implements Dump { // This AnimationSet uses the Interpolators assigned above. AnimationSet set = new AnimationSet(false); set.addAnimation(scale); - set.addAnimation(alpha); + if (!mGridLayoutRecentsEnabled) { + // In the grid layout, the header should be shown for the whole animation. + set.addAnimation(alpha); + } set.addAnimation(translate); a = set; diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index d64376973616..061aa832086a 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -192,7 +192,8 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree AppWindowToken(WindowManagerService service, IApplicationToken token, boolean voiceInteraction, DisplayContent dc) { - super(service, token != null ? token.asBinder() : null, TYPE_APPLICATION, true, dc); + super(service, token != null ? token.asBinder() : null, TYPE_APPLICATION, true, dc, + false /* ownerCanManageAppTokens */); appToken = token; mVoiceInteraction = voiceInteraction; mInputApplicationHandle = new InputApplicationHandle(this); diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 679f178fd6df..c45136ca2472 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -2185,7 +2185,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo && !mService.mInputMethodTarget.isInMultiWindowMode(); } - final int aboveAppLayer = (mService.mPolicy.windowTypeToLayerLw(TYPE_APPLICATION) + 1) + final int aboveAppLayer = (mService.mPolicy.getWindowLayerFromTypeLw(TYPE_APPLICATION) + 1) * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET; final MutableBoolean mutableIncludeFullDisplay = new MutableBoolean(includeFullDisplay); synchronized(mService.mWindowMap) { @@ -2728,8 +2728,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo */ private final Comparator<WindowToken> mWindowComparator = (token1, token2) -> // Tokens with higher base layer are z-ordered on-top. - mService.mPolicy.windowTypeToLayerLw(token1.windowType) - < mService.mPolicy.windowTypeToLayerLw(token2.windowType) ? -1 : 1; + mService.mPolicy.getWindowLayerFromTypeLw(token1.windowType, + token1.mOwnerCanManageAppTokens) + < mService.mPolicy.getWindowLayerFromTypeLw(token2.windowType, + token2.mOwnerCanManageAppTokens) ? -1 : 1; private final Predicate<WindowState> mGetOrientingWindow = w -> { if (!w.isVisibleLw() || !w.mPolicyVisibilityAfterAnim) { diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java index 1ae987f6072d..3fdafc7bebdf 100644 --- a/services/core/java/com/android/server/wm/DragState.java +++ b/services/core/java/com/android/server/wm/DragState.java @@ -239,7 +239,7 @@ class DragState { } int getDragLayerLw() { - return mService.mPolicy.windowTypeToLayerLw(WindowManager.LayoutParams.TYPE_DRAG) + return mService.mPolicy.getWindowLayerFromTypeLw(WindowManager.LayoutParams.TYPE_DRAG) * WindowManagerService.TYPE_LAYER_MULTIPLIER + WindowManagerService.TYPE_LAYER_OFFSET; } diff --git a/services/core/java/com/android/server/wm/InputConsumerImpl.java b/services/core/java/com/android/server/wm/InputConsumerImpl.java index b92bfb962d95..36753b7d5e04 100644 --- a/services/core/java/com/android/server/wm/InputConsumerImpl.java +++ b/services/core/java/com/android/server/wm/InputConsumerImpl.java @@ -77,7 +77,7 @@ class InputConsumerImpl { } private int getLayerLw(int windowType) { - return mService.mPolicy.windowTypeToLayerLw(windowType) + return mService.mPolicy.getWindowLayerFromTypeLw(windowType) * WindowManagerService.TYPE_LAYER_MULTIPLIER + WindowManagerService.TYPE_LAYER_OFFSET; } diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index 5f53d84cb5fe..37b8deb0a24f 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -24,6 +24,7 @@ import static android.view.WindowManager.INPUT_CONSUMER_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DRAG; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS_LIGHT; @@ -237,8 +238,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { // Figure out whether this window is layered above system windows. // We need to do this here to help the activity manager know how to // layer its ANR dialog. - int systemAlertLayer = mService.mPolicy.windowTypeToLayerLw( - WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); + int systemAlertLayer = mService.mPolicy.getWindowLayerFromTypeLw( + TYPE_APPLICATION_OVERLAY, windowState.mOwnerCanAddInternalSystemWindow); aboveSystem = windowState.mBaseLayer > systemAlertLayer; } else if (appWindowToken != null) { Slog.i(TAG_WM, "Input event dispatching timed out " @@ -471,7 +472,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { /* Callback to get pointer layer. */ @Override public int getPointerLayer() { - return mService.mPolicy.windowTypeToLayerLw(WindowManager.LayoutParams.TYPE_POINTER) + return mService.mPolicy.getWindowLayerFromTypeLw(WindowManager.LayoutParams.TYPE_POINTER) * WindowManagerService.TYPE_LAYER_MULTIPLIER + WindowManagerService.TYPE_LAYER_OFFSET; } diff --git a/services/core/java/com/android/server/wm/WallpaperWindowToken.java b/services/core/java/com/android/server/wm/WallpaperWindowToken.java index 8ea1b3b1355a..28aebbbb281c 100644 --- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java +++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java @@ -40,8 +40,8 @@ class WallpaperWindowToken extends WindowToken { private static final String TAG = TAG_WITH_CLASS_NAME ? "WallpaperWindowToken" : TAG_WM; WallpaperWindowToken(WindowManagerService service, IBinder token, boolean explicit, - DisplayContent dc) { - super(service, token, TYPE_WALLPAPER, explicit, dc); + DisplayContent dc, boolean ownerCanManageAppTokens) { + super(service, token, TYPE_WALLPAPER, explicit, dc, ownerCanManageAppTokens); dc.mWallpaperController.addWallpaperToken(this); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 9b96523af73f..971794be2cbb 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -16,13 +16,14 @@ package com.android.server.wm; +import static android.Manifest.permission.INTERNAL_SYSTEM_WINDOW; import static android.Manifest.permission.MANAGE_APP_TOKENS; import static android.Manifest.permission.REGISTER_WINDOW_MANAGER_LISTENERS; import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT; -import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.app.StatusBarManager.DISABLE_MASK; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; +import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.DOCKED_INVALID; import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; @@ -101,7 +102,6 @@ import android.app.ActivityManager.TaskSnapshot; import android.app.ActivityManagerInternal; import android.app.AppOpsManager; import android.app.IActivityManager; -import android.app.RemoteAction; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -236,7 +236,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import static android.Manifest.permission.MANAGE_ACTIVITY_STACKS; import static android.Manifest.permission.READ_FRAME_BUFFER; /** {@hide} */ public class WindowManagerService extends IWindowManager.Stub @@ -523,7 +522,7 @@ public class WindowManagerService extends IWindowManager.Stub boolean mSupportsPictureInPicture = false; int getDragLayerLocked() { - return mPolicy.windowTypeToLayerLw(TYPE_DRAG) * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET; + return mPolicy.getWindowLayerFromTypeLw(TYPE_DRAG) * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET; } class RotationWatcher { @@ -1099,6 +1098,8 @@ public class WindowManagerService extends IWindowManager.Stub long origId; final int callingUid = Binder.getCallingUid(); final int type = attrs.type; + final boolean ownerCanAddInternalSystemWindow = + mContext.checkCallingPermission(INTERNAL_SYSTEM_WINDOW) == PERMISSION_GRANTED; synchronized(mWindowMap) { if (!mDisplayReady) { @@ -1200,7 +1201,8 @@ public class WindowManagerService extends IWindowManager.Stub return WindowManagerGlobal.ADD_BAD_APP_TOKEN; } } - token = new WindowToken(this, attrs.token, type, false, displayContent); + token = new WindowToken(this, attrs.token, type, false, displayContent, + ownerCanAddInternalSystemWindow); } else if (rootType >= FIRST_APPLICATION_WINDOW && rootType <= LAST_APPLICATION_WINDOW) { atoken = token.asAppWindowToken(); if (atoken == null) { @@ -1270,11 +1272,13 @@ public class WindowManagerService extends IWindowManager.Stub // It is not valid to use an app token with other system types; we will // instead make a new token for it (as if null had been passed in for the token). attrs.token = null; - token = new WindowToken(this, null, type, false, displayContent); + token = new WindowToken(this, null, type, false, displayContent, + ownerCanAddInternalSystemWindow); } - WindowState win = new WindowState(this, session, client, token, parentWindow, - appOp[0], seq, attrs, viewVisibility, session.mUid); + final WindowState win = new WindowState(this, session, client, token, parentWindow, + appOp[0], seq, attrs, viewVisibility, session.mUid, + ownerCanAddInternalSystemWindow); if (win.mDeathRecipient == null) { // Client has apparently died, so there is no reason to // continue. @@ -2405,9 +2409,10 @@ public class WindowManagerService extends IWindowManager.Stub return; } if (type == TYPE_WALLPAPER) { - new WallpaperWindowToken(this, binder, true, dc); + new WallpaperWindowToken(this, binder, true, dc, + true /* ownerCanManageAppTokens */); } else { - new WindowToken(this, binder, type, true, dc); + new WindowToken(this, binder, type, true, dc, true /* ownerCanManageAppTokens */); } } } @@ -3606,7 +3611,7 @@ public class WindowManagerService extends IWindowManager.Stub mCircularDisplayMask = new CircularDisplayMask( getDefaultDisplayContentLocked().getDisplay(), mFxSession, - mPolicy.windowTypeToLayerLw( + mPolicy.getWindowLayerFromTypeLw( WindowManager.LayoutParams.TYPE_POINTER) * TYPE_LAYER_MULTIPLIER + 10, screenOffset, maskThickness); } @@ -3635,7 +3640,7 @@ public class WindowManagerService extends IWindowManager.Stub mContext, getDefaultDisplayContentLocked().getDisplay(), mFxSession, - mPolicy.windowTypeToLayerLw( + mPolicy.getWindowLayerFromTypeLw( WindowManager.LayoutParams.TYPE_POINTER) * TYPE_LAYER_MULTIPLIER + 10); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 050adfebfc01..867080ed2450 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -18,7 +18,6 @@ package com.android.server.wm; import static android.app.ActivityManager.ENABLE_TASK_SNAPSHOTS; import static android.app.ActivityManager.StackId; -import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import static android.app.ActivityManager.isLowRamDeviceStatic; import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER; @@ -164,6 +163,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final int mAppOp; // UserId and appId of the owner. Don't display windows of non-current user. final int mOwnerUid; + /** The owner has {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW} */ + final boolean mOwnerCanAddInternalSystemWindow; final IWindowId mWindowId; WindowToken mToken; // The same object as mToken if this is an app window and null for non-app windows. @@ -561,7 +562,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP WindowState(WindowManagerService service, Session s, IWindow c, WindowToken token, WindowState parentWindow, int appOp, int seq, WindowManager.LayoutParams a, - int viewVisibility, int ownerId) { + int viewVisibility, int ownerId, boolean ownerCanAddInternalSystemWindow) { mService = service; mSession = s; mClient = c; @@ -569,6 +570,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mToken = token; mAppToken = mToken.asAppWindowToken(); mOwnerUid = ownerId; + mOwnerCanAddInternalSystemWindow = ownerCanAddInternalSystemWindow; mWindowId = new IWindowId.Stub() { @Override public void registerFocusObserver(IWindowFocusObserver observer) { @@ -613,9 +615,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP if (mAttrs.type >= FIRST_SUB_WINDOW && mAttrs.type <= LAST_SUB_WINDOW) { // The multiplier here is to reserve space for multiple // windows in the same type layer. - mBaseLayer = mPolicy.windowTypeToLayerLw(parentWindow.mAttrs.type) + mBaseLayer = mPolicy.getWindowLayerLw(parentWindow) * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET; - mSubLayer = mPolicy.subWindowTypeToLayerLw(a.type); + mSubLayer = mPolicy.getSubWindowLayerFromTypeLw(a.type); mIsChildWindow = true; if (DEBUG_ADD_REMOVE) Slog.v(TAG, "Adding " + this + " to " + parentWindow); @@ -629,7 +631,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP } else { // The multiplier here is to reserve space for multiple // windows in the same type layer. - mBaseLayer = mPolicy.windowTypeToLayerLw(a.type) + mBaseLayer = mPolicy.getWindowLayerLw(this) * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET; mSubLayer = 0; mIsChildWindow = false; @@ -676,6 +678,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return mAttrs.packageName; } + @Override + public boolean canAddInternalSystemWindow() { + return mOwnerCanAddInternalSystemWindow; + } + /** * Subtracts the insets calculated by intersecting {@param layoutFrame} with {@param insetFrame} * from {@param frame}. In other words, it applies the insets that would result if diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index 4b94d1566681..8beb87d3354b 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -77,6 +77,9 @@ class WindowToken extends WindowContainer<WindowState> { // The display this token is on. protected DisplayContent mDisplayContent; + /** The owner has {@link android.Manifest.permission#MANAGE_APP_TOKENS} */ + final boolean mOwnerCanManageAppTokens; + /** * Compares two child window of this token and returns -1 if the first is lesser than the * second in terms of z-order and 1 otherwise. @@ -98,11 +101,12 @@ class WindowToken extends WindowContainer<WindowState> { }; WindowToken(WindowManagerService service, IBinder _token, int type, boolean persistOnEmpty, - DisplayContent dc) { + DisplayContent dc, boolean ownerCanManageAppTokens) { mService = service; token = _token; windowType = type; mPersistOnEmpty = persistOnEmpty; + mOwnerCanManageAppTokens = ownerCanManageAppTokens; onDisplayChanged(dc); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 3c1d2744dd2e..578e0b3bd06c 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -8564,18 +8564,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } - /** - * Sets which packages may enter lock task mode. - * - * <p>This function can only be called by the device owner or alternatively by the profile owner - * in case the user is affiliated. - * - * @param packages The list of packages allowed to enter lock task mode. - */ @Override public void setLockTaskPackages(ComponentName who, String[] packages) throws SecurityException { Preconditions.checkNotNull(who, "ComponentName is null"); + Preconditions.checkNotNull(packages, "packages is null"); synchronized (this) { getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); @@ -8598,48 +8591,51 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { updateLockTaskPackagesLocked(packages, userHandle); } + private void maybeClearLockTaskPackagesLocked() { + final long ident = mInjector.binderClearCallingIdentity(); + try { + final List<UserInfo> userInfos = mUserManager.getUsers(/*excludeDying=*/ true); + for (int i = 0; i < userInfos.size(); i++) { + int userId = userInfos.get(i).id; + final List<String> lockTaskPackages = getUserData(userId).mLockTaskPackages; + if (!lockTaskPackages.isEmpty() && + !isUserAffiliatedWithDeviceLocked(userId)) { + Slog.d(LOG_TAG, + "User id " + userId + " not affiliated. Clearing lock task packages"); + setLockTaskPackagesLocked(userId, Collections.<String>emptyList()); + } + } + } finally { + mInjector.binderRestoreCallingIdentity(ident); + } + } + /** * This function returns the list of components allowed to start the task lock mode. */ @Override public String[] getLockTaskPackages(ComponentName who) { Preconditions.checkNotNull(who, "ComponentName is null"); + + final int userHandle = mInjector.binderGetCallingUserHandle().getIdentifier(); synchronized (this) { - getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER); - int userHandle = mInjector.binderGetCallingUserHandle().getIdentifier(); - final List<String> packages = getLockTaskPackagesLocked(userHandle); + getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); + if (!isUserAffiliatedWithDeviceLocked(userHandle)) { + throw new SecurityException("Admin " + who + + " is neither the device owner or affiliated user's profile owner."); + } + + final List<String> packages = getUserData(userHandle).mLockTaskPackages; return packages.toArray(new String[packages.size()]); } } - private List<String> getLockTaskPackagesLocked(int userHandle) { - final DevicePolicyData policy = getUserData(userHandle); - return policy.mLockTaskPackages; - } - - /** - * This function lets the caller know whether the given package is allowed to start the - * lock task mode. - * @param pkg The package to check - */ @Override public boolean isLockTaskPermitted(String pkg) { - // Get current user's devicepolicy - int uid = mInjector.binderGetCallingUid(); - int userHandle = UserHandle.getUserId(uid); - DevicePolicyData policy = getUserData(userHandle); + final int userHandle = mInjector.userHandleGetCallingUserId(); synchronized (this) { - for (int i = 0; i < policy.mLockTaskPackages.size(); i++) { - String lockTaskPackage = policy.mLockTaskPackages.get(i); - - // If the given package equals one of the packages stored our list, - // we allow this package to start lock task mode. - if (lockTaskPackage.equals(pkg)) { - return true; - } - } + return getUserData(userHandle).mLockTaskPackages.contains(pkg); } - return false; } @Override @@ -9848,6 +9844,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // but as a result of that other users might become affiliated or un-affiliated. maybePauseDeviceWideLoggingLocked(); maybeResumeDeviceWideLoggingLocked(); + maybeClearLockTaskPackagesLocked(); } } diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index f4e4e089dec6..7df638cb53d4 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -3332,6 +3332,75 @@ public class DevicePolicyManagerTest extends DpmTestBase { MoreAsserts.assertEmpty(targetUsers); } + public void testLockTaskPackagesAllowedForAffiliatedUsers() throws Exception { + // Setup a device owner. + mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; + setupDeviceOwner(); + // Lock task packages are updated when loading user data. + verify(mContext.iactivityManager) + .updateLockTaskPackages(eq(UserHandle.USER_SYSTEM), eq(new String[0])); + + // Set up a managed profile managed by different package (package name shouldn't matter) + final int MANAGED_PROFILE_USER_ID = 15; + final int MANAGED_PROFILE_ADMIN_UID = UserHandle.getUid(MANAGED_PROFILE_USER_ID, 20456); + final ComponentName adminDifferentPackage = + new ComponentName("another.package", "whatever.class"); + addManagedProfile(adminDifferentPackage, MANAGED_PROFILE_ADMIN_UID, admin2); + verify(mContext.iactivityManager) + .updateLockTaskPackages(eq(MANAGED_PROFILE_USER_ID), eq(new String[0])); + + // The DO can still set lock task packages + mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; + final String[] doPackages = {"doPackage1", "doPackage2"}; + dpm.setLockTaskPackages(admin1, doPackages); + MoreAsserts.assertEquals(doPackages, dpm.getLockTaskPackages(admin1)); + assertTrue(dpm.isLockTaskPermitted("doPackage1")); + assertFalse(dpm.isLockTaskPermitted("anotherPackage")); + verify(mContext.iactivityManager) + .updateLockTaskPackages(eq(UserHandle.USER_SYSTEM), eq(doPackages)); + + // Managed profile is unaffiliated - shouldn't be able to setLockTaskPackages. + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + final String[] poPackages = {"poPackage1", "poPackage2"}; + try { + dpm.setLockTaskPackages(adminDifferentPackage, poPackages); + fail("Didn't throw expected security exception."); + } catch (SecurityException expected) { + } + try { + dpm.getLockTaskPackages(adminDifferentPackage); + fail("Didn't throw expected security exception."); + } catch (SecurityException expected) { + } + assertFalse(dpm.isLockTaskPermitted("doPackage1")); + + // Setting same affiliation ids + final List<String> userAffiliationIds = Arrays.asList("some-affiliation-id"); + mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; + dpm.setAffiliationIds(admin1, userAffiliationIds); + + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + dpm.setAffiliationIds(adminDifferentPackage, userAffiliationIds); + + // Now the managed profile can set lock task packages. + dpm.setLockTaskPackages(adminDifferentPackage, poPackages); + MoreAsserts.assertEquals(poPackages, dpm.getLockTaskPackages(adminDifferentPackage)); + assertTrue(dpm.isLockTaskPermitted("poPackage1")); + assertFalse(dpm.isLockTaskPermitted("doPackage2")); + verify(mContext.iactivityManager) + .updateLockTaskPackages(eq(MANAGED_PROFILE_USER_ID), eq(poPackages)); + + // Unaffiliate the profile, lock task mode no longer available on the profile. + dpm.setAffiliationIds(adminDifferentPackage, Collections.<String>emptyList()); + assertFalse(dpm.isLockTaskPermitted("poPackage1")); + // Lock task packages cleared when loading user data and when the user becomes unaffiliated. + verify(mContext.iactivityManager, times(2)) + .updateLockTaskPackages(eq(MANAGED_PROFILE_USER_ID), eq(new String[0])); + + mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; + assertTrue(dpm.isLockTaskPermitted("doPackage1")); + } + public void testIsDeviceManaged() throws Exception { mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; setupDeviceOwner(); diff --git a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java index 4c0f0424cf18..e4b74eb07264 100644 --- a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java @@ -16,6 +16,7 @@ package com.android.server.webkit; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,6 +25,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.Signature; +import android.os.Build; import android.os.Bundle; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; @@ -174,6 +176,8 @@ public class WebViewUpdateServiceTest { // no flag means invalid p.applicationInfo.metaData.putString(WEBVIEW_LIBRARY_FLAG, "blah"); } + // Default to this package being valid in terms of targetSdkVersion. + p.applicationInfo.targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT; return p; } @@ -1614,4 +1618,42 @@ public class WebViewUpdateServiceTest { checkPreparationPhasesForPackage(primaryPackage, 3); assertTrue(mWebViewUpdateServiceImpl.isMultiProcessEnabled()); } + + /** + * Ensure that packages with a targetSdkVersion targeting the current platform are valid, and + * that packages targeting an older version are not valid. + */ + @Test + public void testTargetSdkVersionValidity() { + PackageInfo newSdkPackage = createPackageInfo("newTargetSdkPackage", + true /* enabled */, true /* valid */, true /* installed */); + newSdkPackage.applicationInfo.targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT; + PackageInfo currentSdkPackage = createPackageInfo("currentTargetSdkPackage", + true /* enabled */, true /* valid */, true /* installed */); + currentSdkPackage.applicationInfo.targetSdkVersion = Build.VERSION_CODES.N_MR1+1; + PackageInfo oldSdkPackage = createPackageInfo("oldTargetSdkPackage", + true /* enabled */, true /* valid */, true /* installed */); + oldSdkPackage.applicationInfo.targetSdkVersion = Build.VERSION_CODES.N_MR1; + + WebViewProviderInfo newSdkProviderInfo = + new WebViewProviderInfo(newSdkPackage.packageName, "", true, false, null); + WebViewProviderInfo currentSdkProviderInfo = + new WebViewProviderInfo(currentSdkPackage.packageName, "", true, false, null); + WebViewProviderInfo[] packages = new WebViewProviderInfo[] { + new WebViewProviderInfo(oldSdkPackage.packageName, "", true, false, null), + currentSdkProviderInfo, newSdkProviderInfo}; + setupWithPackages(packages, true); +; + mTestSystemImpl.setPackageInfo(newSdkPackage); + mTestSystemImpl.setPackageInfo(currentSdkPackage); + mTestSystemImpl.setPackageInfo(oldSdkPackage); + + assertArrayEquals(new WebViewProviderInfo[]{currentSdkProviderInfo, newSdkProviderInfo}, + mWebViewUpdateServiceImpl.getValidWebViewPackages()); + + runWebViewBootPreparationOnMainSync(); + + checkPreparationPhasesForPackage(currentSdkPackage.packageName, + 1 /* first preparation phase */); + } } diff --git a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java index ec429a05e3ca..1e471e3322d5 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java +++ b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java @@ -16,49 +16,7 @@ package com.android.server.wm; -import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; -import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; -import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL; -import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS; -import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER; -import static android.view.WindowManager.LayoutParams.TYPE_DRAG; -import static android.view.WindowManager.LayoutParams.TYPE_DREAM; -import static android.view.WindowManager.LayoutParams.TYPE_INPUT_CONSUMER; -import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; -import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; -import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; -import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR; -import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; -import static android.view.WindowManager.LayoutParams.TYPE_PHONE; -import static android.view.WindowManager.LayoutParams.TYPE_POINTER; -import static android.view.WindowManager.LayoutParams.TYPE_PRESENTATION; -import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE; -import static android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION; -import static android.view.WindowManager.LayoutParams.TYPE_QS_DIALOG; -import static android.view.WindowManager.LayoutParams.TYPE_SCREENSHOT; -import static android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR; -import static android.view.WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR; -import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL; -import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL; -import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; -import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; -import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR; -import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_TOAST; -import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION; -import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION_STARTING; -import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; -import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static org.mockito.Mockito.mock; import android.annotation.Nullable; @@ -70,12 +28,10 @@ import android.hardware.display.DisplayManagerInternal; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; -import android.util.Log; import android.view.Display; import android.view.IWindowManager; import android.view.KeyEvent; import android.view.WindowManager; -import android.view.WindowManagerGlobal; import android.view.WindowManagerPolicy; import android.view.animation.Animation; import android.os.PowerManagerInternal; @@ -163,127 +119,6 @@ class TestWindowManagerPolicy implements WindowManagerPolicy { } @Override - public int windowTypeToLayerLw(int type) { - // TODO: figure-out a good way to keep this in-sync with PhoneWindowManager...sigh! - if (type >= FIRST_APPLICATION_WINDOW && type <= LAST_APPLICATION_WINDOW) { - return 2; - } - switch (type) { - case TYPE_PRESENTATION: - case TYPE_PRIVATE_PRESENTATION: - return 2; - case TYPE_WALLPAPER: - // wallpaper is at the bottom, though the window manager may move it. - return 2; - case TYPE_DOCK_DIVIDER: - return 2; - case TYPE_QS_DIALOG: - return 2; - case TYPE_PHONE: - return 3; - case TYPE_SEARCH_BAR: - case TYPE_VOICE_INTERACTION_STARTING: - return 4; - case TYPE_VOICE_INTERACTION: - // voice interaction layer is almost immediately above apps. - return 5; - case TYPE_INPUT_CONSUMER: - return 6; - case TYPE_SYSTEM_DIALOG: - return 7; - case TYPE_TOAST: - // toasts and the plugged-in battery thing - return 8; - case TYPE_PRIORITY_PHONE: - // SIM errors and unlock. Not sure if this really should be in a high layer. - return 9; - case TYPE_DREAM: - // used for Dreams (screensavers with TYPE_DREAM windows) - return 10; - case TYPE_SYSTEM_ALERT: - // like the ANR / app crashed dialogs - return 11; - case TYPE_INPUT_METHOD: - // on-screen keyboards and other such input method user interfaces go here. - return 12; - case TYPE_INPUT_METHOD_DIALOG: - // on-screen keyboards and other such input method user interfaces go here. - return 13; - case TYPE_STATUS_BAR_SUB_PANEL: - return 15; - case TYPE_STATUS_BAR: - return 16; - case TYPE_STATUS_BAR_PANEL: - return 17; - case TYPE_KEYGUARD_DIALOG: - return 18; - case TYPE_VOLUME_OVERLAY: - // the on-screen volume indicator and controller shown when the user - // changes the device volume - return 19; - case TYPE_SYSTEM_OVERLAY: - // the on-screen volume indicator and controller shown when the user - // changes the device volume - return 20; - case TYPE_NAVIGATION_BAR: - // the navigation bar, if available, shows atop most things - return 21; - case TYPE_NAVIGATION_BAR_PANEL: - // some panels (e.g. search) need to show on top of the navigation bar - return 22; - case TYPE_SCREENSHOT: - // screenshot selection layer shouldn't go above system error, but it should cover - // navigation bars at the very least. - return 23; - case TYPE_SYSTEM_ERROR: - // system-level error dialogs - return 24; - case TYPE_MAGNIFICATION_OVERLAY: - // used to highlight the magnified portion of a display - return 25; - case TYPE_DISPLAY_OVERLAY: - // used to simulate secondary display devices - return 26; - case TYPE_DRAG: - // the drag layer: input for drag-and-drop is associated with this window, - // which sits above all other focusable windows - return 27; - case TYPE_ACCESSIBILITY_OVERLAY: - // overlay put by accessibility services to intercept user interaction - return 28; - case TYPE_SECURE_SYSTEM_OVERLAY: - return 29; - case TYPE_BOOT_PROGRESS: - return 30; - case TYPE_POINTER: - // the (mouse) pointer layer - return 31; - } - Log.e(TAG, "Unknown window type: " + type); - return 2; - } - - @Override - public int subWindowTypeToLayerLw(int type) { - // TODO: figure-out a good way to keep this in-sync with PhoneWindowManager... - switch (type) { - case TYPE_APPLICATION_PANEL: - case TYPE_APPLICATION_ATTACHED_DIALOG: - return 1; - case TYPE_APPLICATION_MEDIA: - return -2; - case TYPE_APPLICATION_MEDIA_OVERLAY: - return -1; - case TYPE_APPLICATION_SUB_PANEL: - return 2; - case TYPE_APPLICATION_ABOVE_SUB_PANEL: - return 3; - } - Log.e(TAG, "Unknown sub-window type: " + type); - return 0; - } - - @Override public int getMaxWallpaperLayer() { return 0; } diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java index 186884b01d21..4cad4e8e40f1 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowFrameTests.java @@ -57,7 +57,8 @@ public class WindowFrameTests { final Task mTask; boolean mDockedResizingForTest = false; WindowStateWithTask(WindowManager.LayoutParams attrs, Task t) { - super(sWm, null, mIWindow, mWindowToken, null, 0, 0, attrs, 0, 0); + super(sWm, null, mIWindow, mWindowToken, null, 0, 0, attrs, 0, 0, + false /* ownerCanAddInternalSystemWindow */); mTask = t; } @@ -106,7 +107,7 @@ public class WindowFrameTests { sWm.mSystemDecorLayer = 10000; mWindowToken = new WindowToken(sWm, new Binder(), 0, false, - sWm.getDefaultDisplayContentLocked()); + sWm.getDefaultDisplayContentLocked(), false /* ownerCanManageAppTokens */); mStubStack = new TaskStack(sWm, 0); } diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java index c6f88ed3a711..7dec52df9109 100644 --- a/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java @@ -181,7 +181,7 @@ class WindowTestsBase { attrs.setTitle(name); final WindowState w = new WindowState(sWm, sMockSession, sIWindow, token, parent, OP_NONE, - 0, attrs, 0, 0); + 0, attrs, 0, 0, false /* ownerCanAddInternalSystemWindow */); // TODO: Probably better to make this call in the WindowState ctor to avoid errors with // adding it to the token... token.addWindow(w); @@ -223,7 +223,8 @@ class WindowTestsBase { } TestWindowToken(int type, DisplayContent dc, boolean persistOnEmpty) { - super(sWm, mock(IBinder.class), type, persistOnEmpty, dc); + super(sWm, mock(IBinder.class), type, persistOnEmpty, dc, + false /* ownerCanManageAppTokens */); } int getWindowsCount() { @@ -403,7 +404,8 @@ class WindowTestsBase { boolean resizeReported; TestWindowState(WindowManager.LayoutParams attrs, WindowToken token) { - super(sWm, sMockSession, sIWindow, token, null, OP_NONE, 0, attrs, 0, 0); + super(sWm, sMockSession, sIWindow, token, null, OP_NONE, 0, attrs, 0, 0, + false /* ownerCanAddInternalSystemWindow */); } @Override diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 4d2c3b958c56..07b4ca12171f 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -17,6 +17,7 @@ package com.android.server.usb; import android.app.Notification; +import android.app.NotificationChannel; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.BroadcastReceiver; @@ -134,6 +135,8 @@ public class UsbDeviceManager { private static final String BOOT_MODE_PROPERTY = "ro.bootmode"; + private static final String ADB_NOTIFICATION_CHANNEL_ID_TV = "usbdevicemanager.adb.tv"; + private UsbHandler mHandler; private boolean mBootCompleted; @@ -239,6 +242,16 @@ public class UsbDeviceManager { mNotificationManager = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE); + // Ensure that the notification channels are set up + if (isTv()) { + // TV-specific notification channel + mNotificationManager.createNotificationChannel( + new NotificationChannel(ADB_NOTIFICATION_CHANNEL_ID_TV, + mContext.getString( + com.android.internal.R.string.adb_debugging_notification_channel_tv), + NotificationManager.IMPORTANCE_HIGH)); + } + // We do not show the USB notification if the primary volume supports mass storage. // The legacy mass storage UI will be used instead. boolean massStorageSupported = false; @@ -325,6 +338,10 @@ public class UsbDeviceManager { } } + private boolean isTv() { + return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK); + } + private final class UsbHandler extends Handler { // current USB state @@ -928,9 +945,9 @@ public class UsbDeviceManager { CharSequence message = r.getText( com.android.internal.R.string.adb_active_notification_message); - Intent intent = Intent.makeRestartActivityTask( - new ComponentName("com.android.settings", - "com.android.settings.DevelopmentSettings")); + Intent intent = new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_CLEAR_TASK); PendingIntent pi = PendingIntent.getActivityAsUser(mContext, 0, intent, 0, null, UserHandle.CURRENT); @@ -947,6 +964,8 @@ public class UsbDeviceManager { .setContentText(message) .setContentIntent(pi) .setVisibility(Notification.VISIBILITY_PUBLIC) + .extend(new Notification.TvExtender() + .setChannel(ADB_NOTIFICATION_CHANNEL_ID_TV)) .build(); mAdbNotificationShown = true; mNotificationManager.notifyAsUser(null, id, notification, diff --git a/tests/net/java/android/net/ConnectivityManagerTest.java b/tests/net/java/android/net/ConnectivityManagerTest.java new file mode 100644 index 000000000000..b984bbfddac3 --- /dev/null +++ b/tests/net/java/android/net/ConnectivityManagerTest.java @@ -0,0 +1,176 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net; + +import static android.net.NetworkCapabilities.NET_CAPABILITY_CBS; +import static android.net.NetworkCapabilities.NET_CAPABILITY_DUN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_FOTA; +import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS; +import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; +import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN; +import static android.net.NetworkCapabilities.NET_CAPABILITY_SUPL; +import static android.net.NetworkCapabilities.NET_CAPABILITY_TRUSTED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_WIFI_P2P; +import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH; +import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; +import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET; +import static android.net.NetworkCapabilities.TRANSPORT_WIFI; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import android.net.ConnectivityManager; +import android.net.NetworkCapabilities; + +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.runner.RunWith; +import org.junit.Test; + + + +@RunWith(AndroidJUnit4.class) +@SmallTest +public class ConnectivityManagerTest { + static NetworkCapabilities verifyNetworkCapabilities( + int legacyType, int transportType, int... capabilities) { + final NetworkCapabilities nc = ConnectivityManager.networkCapabilitiesForType(legacyType); + assertNotNull(nc); + assertTrue(nc.hasTransport(transportType)); + for (int capability : capabilities) { + assertTrue(nc.hasCapability(capability)); + } + + return nc; + } + + static void verifyUnrestrictedNetworkCapabilities(int legacyType, int transportType) { + verifyNetworkCapabilities( + legacyType, + transportType, + NET_CAPABILITY_INTERNET, + NET_CAPABILITY_NOT_RESTRICTED, + NET_CAPABILITY_NOT_VPN, + NET_CAPABILITY_TRUSTED); + } + + static void verifyRestrictedMobileNetworkCapabilities(int legacyType, int capability) { + final NetworkCapabilities nc = verifyNetworkCapabilities( + legacyType, + TRANSPORT_CELLULAR, + capability, + NET_CAPABILITY_NOT_VPN, + NET_CAPABILITY_TRUSTED); + + assertFalse(nc.hasCapability(NET_CAPABILITY_INTERNET)); + assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)); + } + + @Test + public void testNetworkCapabilitiesForTypeMobile() { + verifyUnrestrictedNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE, TRANSPORT_CELLULAR); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileCbs() { + verifyRestrictedMobileNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_CBS, NET_CAPABILITY_CBS); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileDun() { + verifyRestrictedMobileNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_DUN, NET_CAPABILITY_DUN); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileFota() { + verifyRestrictedMobileNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_FOTA, NET_CAPABILITY_FOTA); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileHipri() { + verifyUnrestrictedNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_HIPRI, TRANSPORT_CELLULAR); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileIms() { + verifyRestrictedMobileNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_IMS, NET_CAPABILITY_IMS); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileMms() { + final NetworkCapabilities nc = verifyNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_MMS, + TRANSPORT_CELLULAR, + NET_CAPABILITY_MMS, + NET_CAPABILITY_NOT_VPN, + NET_CAPABILITY_TRUSTED); + + assertFalse(nc.hasCapability(NET_CAPABILITY_INTERNET)); + } + + @Test + public void testNetworkCapabilitiesForTypeMobileSupl() { + final NetworkCapabilities nc = verifyNetworkCapabilities( + ConnectivityManager.TYPE_MOBILE_SUPL, + TRANSPORT_CELLULAR, + NET_CAPABILITY_SUPL, + NET_CAPABILITY_NOT_VPN, + NET_CAPABILITY_TRUSTED); + + assertFalse(nc.hasCapability(NET_CAPABILITY_INTERNET)); + } + + @Test + public void testNetworkCapabilitiesForTypeWifi() { + verifyUnrestrictedNetworkCapabilities( + ConnectivityManager.TYPE_WIFI, TRANSPORT_WIFI); + } + + @Test + public void testNetworkCapabilitiesForTypeWifiP2p() { + final NetworkCapabilities nc = verifyNetworkCapabilities( + ConnectivityManager.TYPE_WIFI_P2P, + TRANSPORT_WIFI, + NET_CAPABILITY_NOT_RESTRICTED, NET_CAPABILITY_NOT_VPN, + NET_CAPABILITY_TRUSTED, NET_CAPABILITY_WIFI_P2P); + + assertFalse(nc.hasCapability(NET_CAPABILITY_INTERNET)); + } + + @Test + public void testNetworkCapabilitiesForTypeBluetooth() { + verifyUnrestrictedNetworkCapabilities( + ConnectivityManager.TYPE_BLUETOOTH, TRANSPORT_BLUETOOTH); + } + + @Test + public void testNetworkCapabilitiesForTypeEthernet() { + verifyUnrestrictedNetworkCapabilities( + ConnectivityManager.TYPE_ETHERNET, TRANSPORT_ETHERNET); + } +} diff --git a/tests/net/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java b/tests/net/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java index b8c739b64090..3ed56dff3f83 100644 --- a/tests/net/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java @@ -23,7 +23,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import android.content.Context; import android.net.ConnectivityManager; @@ -40,6 +46,7 @@ import org.junit.Before; import org.junit.runner.RunWith; import org.junit.Test; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.util.HashMap; @@ -64,7 +71,7 @@ public class UpstreamNetworkMonitorTest { reset(mContext); reset(mCS); - mCM = new TestConnectivityManager(mContext, mCS); + mCM = spy(new TestConnectivityManager(mContext, mCS)); mUNM = new UpstreamNetworkMonitor(null, EVENT_UNM_UPDATE, (ConnectivityManager) mCM); } @@ -126,6 +133,42 @@ public class UpstreamNetworkMonitorTest { } @Test + public void testDuplicateMobileRequestsIgnored() throws Exception { + assertFalse(mUNM.mobileNetworkRequested()); + assertEquals(0, mCM.requested.size()); + + mUNM.start(); + verify(mCM, Mockito.times(1)).registerNetworkCallback( + any(NetworkRequest.class), any(NetworkCallback.class)); + verify(mCM, Mockito.times(1)).registerDefaultNetworkCallback(any(NetworkCallback.class)); + assertFalse(mUNM.mobileNetworkRequested()); + assertEquals(0, mCM.requested.size()); + + mUNM.updateMobileRequiresDun(true); + mUNM.registerMobileNetworkRequest(); + verify(mCM, Mockito.times(1)).requestNetwork( + any(NetworkRequest.class), any(NetworkCallback.class), anyInt(), anyInt()); + + assertTrue(mUNM.mobileNetworkRequested()); + assertUpstreamTypeRequested(TYPE_MOBILE_DUN); + assertTrue(mCM.isDunRequested()); + + // Try a few things that must not result in any state change. + mUNM.registerMobileNetworkRequest(); + mUNM.updateMobileRequiresDun(true); + mUNM.registerMobileNetworkRequest(); + + assertTrue(mUNM.mobileNetworkRequested()); + assertUpstreamTypeRequested(TYPE_MOBILE_DUN); + assertTrue(mCM.isDunRequested()); + + mUNM.stop(); + verify(mCM, times(3)).unregisterNetworkCallback(any(NetworkCallback.class)); + + verifyNoMoreInteractions(mCM); + } + + @Test public void testRequestsDunNetwork() throws Exception { assertFalse(mUNM.mobileNetworkRequested()); assertEquals(0, mCM.requested.size()); @@ -149,7 +192,7 @@ public class UpstreamNetworkMonitorTest { } @Test - public void testUpdateMobileRequiredDun() throws Exception { + public void testUpdateMobileRequiresDun() throws Exception { mUNM.start(); // Test going from no-DUN to DUN correctly re-registers callbacks. @@ -180,7 +223,7 @@ public class UpstreamNetworkMonitorTest { mCM.legacyTypeMap.values().iterator().next()); } - private static class TestConnectivityManager extends ConnectivityManager { + public static class TestConnectivityManager extends ConnectivityManager { public Set<NetworkCallback> trackingDefault = new HashSet<>(); public Map<NetworkCallback, NetworkRequest> listening = new HashMap<>(); public Map<NetworkCallback, NetworkRequest> requested = new HashMap<>(); diff --git a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java index 9d9d71f66de9..8c6740c41052 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java @@ -636,6 +636,20 @@ public final class Bitmap_Delegate { Bitmap.getDefaultDensity()); } + @LayoutlibDelegate + /*package*/ static Bitmap nativeCreateHardwareBitmap(GraphicBuffer buffer) { + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, + "Bitmap.nativeCreateHardwareBitmap() is not supported", null /*data*/); + return null; + } + + @LayoutlibDelegate + /*package*/ static GraphicBuffer nativeCreateGraphicBufferHandle(long nativeBitmap) { + Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED, + "Bitmap.nativeCreateGraphicBufferHandle() is not supported", null /*data*/); + return null; + } + // ---- Private delegate/helper methods ---- private Bitmap_Delegate(BufferedImage image, Config config) { diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index c599e9d6d6bc..47216eec03bd 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -209,20 +209,20 @@ public final class Canvas_Delegate extends BaseCanvas_Delegate { } @LayoutlibDelegate - public static void nRestore(long nativeCanvas, boolean throwOnUnderflow) { + public static boolean nRestore(long nativeCanvas) { // FIXME: implement throwOnUnderflow. // get the delegate from the native int. Canvas_Delegate canvasDelegate = Canvas_Delegate.getDelegate(nativeCanvas); if (canvasDelegate == null) { - return; + return false; } canvasDelegate.restore(); + return true; } @LayoutlibDelegate - public static void nRestoreToCount(long nativeCanvas, int saveCount, - boolean throwOnUnderflow) { + public static void nRestoreToCount(long nativeCanvas, int saveCount) { // FIXME: implement throwOnUnderflow. // get the delegate from the native int. Canvas_Delegate canvasDelegate = Canvas_Delegate.getDelegate(nativeCanvas); @@ -427,7 +427,7 @@ public final class Canvas_Delegate extends BaseCanvas_Delegate { } @LayoutlibDelegate - public static void nGetCTM(long canvas, long matrix) { + public static void nGetMatrix(long canvas, long matrix) { // get the delegate from the native int. Canvas_Delegate canvasDelegate = Canvas_Delegate.getDelegate(canvas); if (canvasDelegate == null) { diff --git a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java index 147ed99ee047..a43e54579da2 100644 --- a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java @@ -313,7 +313,8 @@ public class FontFamily_Delegate { } @LayoutlibDelegate - /*package*/ static boolean nAddFontFromAsset(long builderPtr, AssetManager mgr, String path) { + /*package*/ static boolean nAddFontFromAssetManager(long builderPtr, AssetManager mgr, String path, + int cookie, boolean isAsset) { FontFamily_Delegate ffd = sManager.getDelegate(builderPtr); if (ffd == null) { return false; @@ -388,6 +389,10 @@ public class FontFamily_Delegate { return false; } + @LayoutlibDelegate + /*package*/ static void nAbort(long builderPtr) { + sManager.removeJavaReferenceFor(builderPtr); + } // ---- private helper methods ---- diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java index 9b8fa996a017..aa1f00dee42e 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java @@ -1062,8 +1062,6 @@ public class Paint_Delegate { @LayoutlibDelegate /*package*/ static void nSetWordSpacing(long nativePaint, float wordSpacing) { - Bridge.getLog().fidelityWarning(LayoutLog.TAG_TEXT_RENDERING, - "Paint.setWordSpacing() not supported.", null, null); Paint_Delegate delegate = sManager.getDelegate(nativePaint); if (delegate == null) { return; diff --git a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java index f6c463f1b578..11328dce94e1 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Typeface_Delegate.java @@ -16,12 +16,14 @@ package android.graphics; -import android.text.FontConfig; +import com.android.ide.common.rendering.api.LayoutLog; +import com.android.layoutlib.bridge.Bridge; import com.android.layoutlib.bridge.impl.DelegateManager; import com.android.tools.layoutlib.annotations.LayoutlibDelegate; import android.annotation.NonNull; import android.graphics.FontFamily_Delegate.FontVariant; +import android.text.FontConfig; import java.awt.Font; import java.io.File; @@ -160,6 +162,18 @@ public final class Typeface_Delegate { } @LayoutlibDelegate + /*package*/ static synchronized long nativeCreateFromTypefaceWithVariation(long native_instance, + List<FontConfig.Axis> axes) { + long newInstance = nativeCreateFromTypeface(native_instance, 0); + + if (newInstance != 0) { + Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED, + "nativeCreateFromTypefaceWithVariation is not supported", null, null); + } + return newInstance; + } + + @LayoutlibDelegate /*package*/ static long nativeCreateWeightAlias(long native_instance, int weight) { Typeface_Delegate delegate = sManager.getDelegate(native_instance); if (delegate == null) { diff --git a/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java index 430607aa178b..eee74734fde5 100644 --- a/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/drawable/VectorDrawable_Delegate.java @@ -156,7 +156,7 @@ public class VectorDrawable_Delegate { bounds.offsetTo(0, 0); nativePathRenderer.draw(canvasWrapperPtr, colorFilterPtr, bounds.width(), bounds.height()); - Canvas_Delegate.nRestore(canvasWrapperPtr, true); + Canvas_Delegate.nRestore(canvasWrapperPtr); return bounds.width() * bounds.height(); } @@ -1122,7 +1122,7 @@ public class VectorDrawable_Delegate { drawPath(currentGroup, childPath, canvasPtr, w, h, filterPtr); } } - Canvas_Delegate.nRestore(canvasPtr, true); + Canvas_Delegate.nRestore(canvasPtr); } public void draw(long canvasPtr, long filterPtr, int w, int h) { diff --git a/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java b/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java index 65c0a07bbac4..970c7d577c51 100644 --- a/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java +++ b/tools/layoutlib/bridge/src/android/text/StaticLayout_Delegate.java @@ -75,7 +75,8 @@ public class StaticLayout_Delegate { /*package*/ static void nSetupParagraph(long nativeBuilder, char[] text, int length, float firstWidth, int firstWidthLineCount, float restWidth, int[] variableTabStops, int defaultTabStop, int breakStrategy, - int hyphenationFrequency) { + int hyphenationFrequency, boolean isJustified) { + // TODO: implement justified alignment Builder builder = sBuilderManager.getDelegate(nativeBuilder); if (builder == null) { return; diff --git a/tools/layoutlib/bridge/src/android/view/RenderNode_Delegate.java b/tools/layoutlib/bridge/src/android/view/RenderNode_Delegate.java index a801cb0606e0..152878bb0fd5 100644 --- a/tools/layoutlib/bridge/src/android/view/RenderNode_Delegate.java +++ b/tools/layoutlib/bridge/src/android/view/RenderNode_Delegate.java @@ -57,7 +57,7 @@ public class RenderNode_Delegate { private String mName; @LayoutlibDelegate - /*package*/ static long nCreate(RenderNode thisRenderNode, String name) { + /*package*/ static long nCreate(String name) { RenderNode_Delegate renderNodeDelegate = new RenderNode_Delegate(); renderNodeDelegate.mName = name; return sManager.addNewDelegate(renderNodeDelegate); diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java index a2f8372d6eb8..bed5806aadad 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java @@ -36,6 +36,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; +import java.util.stream.Collectors; /** * Class that generates a new JAR from a list of classes, some of which are to be kept as-is @@ -78,6 +79,8 @@ public class AsmGenerator { private final Map<String, ICreateInfo.InjectMethodRunnable> mInjectedMethodsMap; /** A map { FQCN => set { field names } } which should be promoted to public visibility */ private final Map<String, Set<String>> mPromotedFields; + /** A list of classes to be promoted to public visibility */ + private final Set<String> mPromotedClasses; /** * Creates a new generator that can generate the output JAR with the stubbed classes. @@ -179,6 +182,9 @@ public class AsmGenerator { addToMap(createInfo.getPromotedFields(), mPromotedFields); mInjectedMethodsMap = createInfo.getInjectedMethodsMap(); + + mPromotedClasses = + Arrays.stream(createInfo.getPromotedClasses()).collect(Collectors.toSet()); } /** @@ -400,7 +406,11 @@ public class AsmGenerator { if (promoteFields != null && !promoteFields.isEmpty()) { cv = new PromoteFieldClassAdapter(cv, promoteFields); } + if (!mPromotedClasses.isEmpty()) { + cv = new PromoteClassClassAdapter(cv, mPromotedClasses); + } cr.accept(cv, 0); + return cw.toByteArray(); } diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java index 741eb27558ed..94302d328313 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -113,6 +113,11 @@ public final class CreateInfo implements ICreateInfo { } @Override + public String[] getPromotedClasses() { + return PROMOTED_CLASSES; + } + + @Override public Map<String, InjectMethodRunnable> getInjectedMethodsMap() { return INJECTED_METHODS; } @@ -344,6 +349,13 @@ public final class CreateInfo implements ICreateInfo { }; /** + * List of classes to be promoted to public visibility. Prefer using PROMOTED_FIELDS to this + * if possible. + */ + private final static String[] PROMOTED_CLASSES = new String[] { + }; + + /** * List of classes for which the methods returning them should be deleted. * The array contains a list of null terminated section starting with the name of the class * to rename in which the methods are deleted, followed by a list of return types identifying diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java index 535a9a8c0b77..48abde4517e6 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/ICreateInfo.java @@ -78,6 +78,11 @@ public interface ICreateInfo { String[] getPromotedFields(); /** + * Returns a list of classes to be promoted to public visibility. + */ + String[] getPromotedClasses(); + + /** * Returns a map from binary FQCN className to {@link InjectMethodRunnable} which will be * called to inject methods into a class. * Can be empty but must not be null. diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteClassClassAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteClassClassAdapter.java new file mode 100644 index 000000000000..99e3089115d6 --- /dev/null +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteClassClassAdapter.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.tools.layoutlib.create; + +import org.objectweb.asm.ClassVisitor; + +import java.util.Set; +import java.util.stream.Collectors; + +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_PROTECTED; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; + +/** + * Promotes given classes to public visibility. + */ +public class PromoteClassClassAdapter extends ClassVisitor { + + private final Set<String> mClassNames; + private static final int CLEAR_PRIVATE_MASK = ~(ACC_PRIVATE | ACC_PROTECTED); + + public PromoteClassClassAdapter(ClassVisitor cv, Set<String> classNames) { + super(Main.ASM_VERSION, cv); + mClassNames = + classNames.stream().map(name -> name.replace(".", "/")).collect(Collectors.toSet()); + } + + @Override + public void visit(int version, int access, String name, String signature, String superName, + String[] interfaces) { + if (mClassNames.contains(name)) { + if ((access & ACC_PUBLIC) == 0) { + access = (access & CLEAR_PRIVATE_MASK) | ACC_PUBLIC; + } + } + + super.visit(version, access, name, signature, superName, interfaces); + } + + @Override + public void visitInnerClass(String name, String outerName, String innerName, int access) { + if (mClassNames.contains(name)) { + if ((access & ACC_PUBLIC) == 0) { + access = (access & CLEAR_PRIVATE_MASK) | ACC_PUBLIC; + } + } + + super.visitInnerClass(name, outerName, innerName, access); + } +} diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java index 05af0337a397..ba778602546d 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/PromoteFieldClassAdapter.java @@ -31,7 +31,7 @@ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; public class PromoteFieldClassAdapter extends ClassVisitor { private final Set<String> mFieldNames; - private static final int ACC_NOT_PUBLIC = ~(ACC_PRIVATE | ACC_PROTECTED); + private static final int CLEAR_PRIVATE_MASK = ~(ACC_PRIVATE | ACC_PROTECTED); public PromoteFieldClassAdapter(ClassVisitor cv, Set<String> fieldNames) { super(Main.ASM_VERSION, cv); @@ -43,7 +43,7 @@ public class PromoteFieldClassAdapter extends ClassVisitor { Object value) { if (mFieldNames.contains(name)) { if ((access & ACC_PUBLIC) == 0) { - access = (access & ACC_NOT_PUBLIC) | ACC_PUBLIC; + access = (access & CLEAR_PRIVATE_MASK) | ACC_PUBLIC; } } return super.visitField(access, name, desc, signature, value); diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java index 0560d8aca1bd..4d5d5d2c4a6e 100644 --- a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java +++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/AsmGeneratorTest.java @@ -137,6 +137,11 @@ public class AsmGeneratorTest { } @Override + public String[] getPromotedClasses() { + return EMPTY_STRING_ARRAY; + } + + @Override public Map<String, InjectMethodRunnable> getInjectedMethodsMap() { return Collections.emptyMap(); } @@ -211,6 +216,11 @@ public class AsmGeneratorTest { } @Override + public String[] getPromotedClasses() { + return EMPTY_STRING_ARRAY; + } + + @Override public Map<String, InjectMethodRunnable> getInjectedMethodsMap() { return Collections.emptyMap(); } @@ -293,6 +303,11 @@ public class AsmGeneratorTest { } @Override + public String[] getPromotedClasses() { + return EMPTY_STRING_ARRAY; + } + + @Override public Map<String, InjectMethodRunnable> getInjectedMethodsMap() { return Collections.emptyMap(); } @@ -370,6 +385,11 @@ public class AsmGeneratorTest { } @Override + public String[] getPromotedClasses() { + return EMPTY_STRING_ARRAY; + } + + @Override public Map<String, InjectMethodRunnable> getInjectedMethodsMap() { return Collections.singletonMap("mock_android.util.EmptyArray", InjectMethodRunnables.CONTEXT_GET_FRAMEWORK_CLASS_LOADER); diff --git a/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/PromoteClassClassAdapterTest.java b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/PromoteClassClassAdapterTest.java new file mode 100644 index 000000000000..eeb0b10c1e2b --- /dev/null +++ b/tools/layoutlib/create/tests/com/android/tools/layoutlib/create/PromoteClassClassAdapterTest.java @@ -0,0 +1,170 @@ +/* + * 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.tools.layoutlib.create; + +import org.junit.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Opcodes; + +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.StringJoiner; + +import static org.junit.Assert.assertTrue; + +/** + * {@link ClassVisitor} that logs all the calls to the different visit methods so they can be later + * inspected. + */ +class LoggingClassVisitor extends ClassVisitor { + List<String> mLog = new LinkedList<String>(); + + public LoggingClassVisitor() { + super(Main.ASM_VERSION); + } + + public LoggingClassVisitor(ClassVisitor cv) { + super(Main.ASM_VERSION, cv); + } + + private static String formatAccess(int access) { + StringJoiner modifiers = new StringJoiner(","); + + if ((access & Opcodes.ACC_PUBLIC) != 0) { + modifiers.add("public"); + } + if ((access & Opcodes.ACC_PRIVATE) != 0) { + modifiers.add("private"); + } + if ((access & Opcodes.ACC_PROTECTED) != 0) { + modifiers.add("protected"); + } + if ((access & Opcodes.ACC_STATIC) != 0) { + modifiers.add("static"); + } + if ((access & Opcodes.ACC_FINAL) != 0) { + modifiers.add("static"); + } + + return "[" + modifiers.toString() + "]"; + } + + private void log(String method, String format, Object...args) { + mLog.add( + String.format("[%s] - %s", method, String.format(format, (Object[]) args)) + ); + } + + @Override + public void visitOuterClass(String owner, String name, String desc) { + log( + "visitOuterClass", + "owner=%s, name=%s, desc=%s", + owner, name, desc + ); + + super.visitOuterClass(owner, name, desc); + } + + @Override + public void visitInnerClass(String name, String outerName, String innerName, int access) { + log( + "visitInnerClass", + "name=%s, outerName=%s, innerName=%s, access=%s", + name, outerName, innerName, formatAccess(access) + ); + + super.visitInnerClass(name, outerName, innerName, access); + } + + @Override + public void visit(int version, int access, String name, String signature, String superName, + String[] interfaces) { + log( + "visit", + "version=%d, access=%s, name=%s, signature=%s, superName=%s, interfaces=%s", + version, formatAccess(access), name, signature, superName, Arrays.toString(interfaces) + ); + + super.visit(version, access, name, signature, superName, interfaces); + } +} + +class PackageProtectedClass {} + +public class PromoteClassClassAdapterTest { + private static class PrivateClass {} + private static class ClassWithPrivateInnerClass { + private class InnerPrivateClass {} + } + + @Test + public void testInnerClassPromotion() throws IOException { + ClassReader reader = new ClassReader(PrivateClass.class.getName()); + LoggingClassVisitor log = new LoggingClassVisitor(); + + PromoteClassClassAdapter adapter = new PromoteClassClassAdapter(log, new HashSet<String>() { + { + add("com.android.tools.layoutlib.create.PromoteClassClassAdapterTest$PrivateClass"); + add("com.android.tools.layoutlib.create" + + ".PromoteClassClassAdapterTest$ClassWithPrivateInnerClass$InnerPrivateClass"); + } + }); + reader.accept(adapter, 0); + assertTrue(log.mLog.contains( + "[visitInnerClass] - " + + "name=com/android/tools/layoutlib/create" + + "/PromoteClassClassAdapterTest$PrivateClass, " + + "outerName=com/android/tools/layoutlib/create" + + "/PromoteClassClassAdapterTest, innerName=PrivateClass, access=[public,static]")); + + // Test inner of inner class + log.mLog.clear(); + reader = new ClassReader(ClassWithPrivateInnerClass.class.getName()); + reader.accept(adapter, 0); + + assertTrue(log.mLog.contains("[visitInnerClass] - " + + "name=com/android/tools/layoutlib/create" + + "/PromoteClassClassAdapterTest$ClassWithPrivateInnerClass$InnerPrivateClass, " + + "outerName=com/android/tools/layoutlib/create" + + "/PromoteClassClassAdapterTest$ClassWithPrivateInnerClass, " + + "innerName=InnerPrivateClass, access=[public]")); + + } + + @Test + public void testProtectedClassPromotion() throws IOException { + ClassReader reader = new ClassReader(PackageProtectedClass.class.getName()); + LoggingClassVisitor log = new LoggingClassVisitor(); + + PromoteClassClassAdapter adapter = new PromoteClassClassAdapter(log, new HashSet<String>() { + { + add("com.android.tools.layoutlib.create.PackageProtectedClass"); + } + }); + + reader.accept(adapter, 0); + assertTrue(log.mLog.contains("[visit] - version=52, access=[public], " + + "name=com/android/tools/layoutlib/create/PackageProtectedClass, signature=null, " + + "superName=java/lang/Object, interfaces=[]")); + + } +}
\ No newline at end of file |