diff options
264 files changed, 4019 insertions, 4139 deletions
diff --git a/Android.bp b/Android.bp index e8f35611e74b..5f81191955b2 100644 --- a/Android.bp +++ b/Android.bp @@ -736,7 +736,7 @@ java_defaults { "updatable_media_stubs", ], - jarjar_rules: "jarjar_rules_hidl.txt", + jarjar_rules: ":framework-jarjar-rules", static_libs: [ "apex_aidl_interface-java", @@ -789,6 +789,11 @@ java_defaults { } filegroup { + name: "framework-jarjar-rules", + srcs: ["jarjar_rules_hidl.txt"], +} + +filegroup { name: "libincident_aidl", srcs: [ "core/java/android/os/IIncidentManager.aidl", diff --git a/api/current.txt b/api/current.txt index 5e0f996c166f..c753691ee0ec 100644 --- a/api/current.txt +++ b/api/current.txt @@ -6641,7 +6641,7 @@ package android.app.admin { method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String); method public CharSequence getDeviceOwnerLockScreenInfo(); method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName); - method public String getGlobalPrivateDnsHost(@NonNull android.content.ComponentName); + method @Nullable public String getGlobalPrivateDnsHost(@NonNull android.content.ComponentName); method public int getGlobalPrivateDnsMode(@NonNull android.content.ComponentName); method @NonNull public java.util.List<byte[]> getInstalledCaCerts(@Nullable android.content.ComponentName); method @Nullable public java.util.List<java.lang.String> getKeepUninstalledPackages(@Nullable android.content.ComponentName); @@ -15802,7 +15802,7 @@ package android.graphics.fonts { ctor public Font.Builder(@NonNull android.os.ParcelFileDescriptor, @IntRange(from=0) long, @IntRange(from=0xffffffff) long); ctor public Font.Builder(@NonNull android.content.res.AssetManager, @NonNull String); ctor public Font.Builder(@NonNull android.content.res.Resources, int); - method @Nullable public android.graphics.fonts.Font build() throws java.io.IOException; + method @NonNull public android.graphics.fonts.Font build() throws java.io.IOException; method @NonNull public android.graphics.fonts.Font.Builder setFontVariationSettings(@Nullable String); method @NonNull public android.graphics.fonts.Font.Builder setFontVariationSettings(@Nullable android.graphics.fonts.FontVariationAxis[]); method @NonNull public android.graphics.fonts.Font.Builder setSlant(int); @@ -15929,13 +15929,13 @@ package android.graphics.text { public static class LineBreaker.ParagraphConstraints { ctor public LineBreaker.ParagraphConstraints(); - method @Px @IntRange(from=0) public int getDefaultTabStop(); + method @Px @FloatRange(from=0) public float getDefaultTabStop(); method @Px @FloatRange(from=0.0f) public float getFirstWidth(); method @Px @IntRange(from=0) public int getFirstWidthLineCount(); - method @Nullable public int[] getTabStops(); + method @Nullable public float[] getTabStops(); method @Px @FloatRange(from=0.0f) public float getWidth(); method public void setIndent(@Px @FloatRange(from=0.0f) float, @Px @IntRange(from=0) int); - method public void setTabStops(@Nullable int[], @Px @IntRange(from=0) int); + method public void setTabStops(@Nullable float[], @Px @FloatRange(from=0) float); method public void setWidth(@Px @FloatRange(from=0.0f) float); } @@ -22850,6 +22850,24 @@ package android.location { method @Deprecated public boolean usedInFix(); } + @Deprecated public final class GpsStatus { + method @Deprecated public int getMaxSatellites(); + method @Deprecated public Iterable<android.location.GpsSatellite> getSatellites(); + method @Deprecated public int getTimeToFirstFix(); + field @Deprecated public static final int GPS_EVENT_FIRST_FIX = 3; // 0x3 + field @Deprecated public static final int GPS_EVENT_SATELLITE_STATUS = 4; // 0x4 + field @Deprecated public static final int GPS_EVENT_STARTED = 1; // 0x1 + field @Deprecated public static final int GPS_EVENT_STOPPED = 2; // 0x2 + } + + @Deprecated public static interface GpsStatus.Listener { + method @Deprecated public void onGpsStatusChanged(int); + } + + @Deprecated public static interface GpsStatus.NmeaListener { + method @Deprecated public void onNmeaReceived(long, String); + } + public class Location implements android.os.Parcelable { ctor public Location(String); ctor public Location(android.location.Location); @@ -22918,6 +22936,7 @@ package android.location { } public class LocationManager { + method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(android.location.GpsStatus.Listener); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener, @Nullable android.os.Handler); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void addProximityAlert(double, double, float, long, @NonNull android.app.PendingIntent); @@ -22929,6 +22948,7 @@ package android.location { method @Nullable public String getBestProvider(@NonNull android.location.Criteria, boolean); method @Nullable public String getGnssHardwareModelName(); method public int getGnssYearOfHardware(); + method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.location.GpsStatus getGpsStatus(@Nullable android.location.GpsStatus); method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) @Nullable public android.location.Location getLastKnownLocation(@NonNull String); method @Nullable public android.location.LocationProvider getProvider(@NonNull String); method @NonNull public java.util.List<java.lang.String> getProviders(boolean); @@ -22941,6 +22961,7 @@ package android.location { method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssNavigationMessageCallback(@NonNull android.location.GnssNavigationMessage.Callback, @Nullable android.os.Handler); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull android.location.GnssStatus.Callback); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull android.location.GnssStatus.Callback, @Nullable android.os.Handler); + method @Deprecated public void removeGpsStatusListener(android.location.GpsStatus.Listener); method public void removeNmeaListener(@NonNull android.location.OnNmeaMessageListener); method @RequiresPermission(anyOf={"android.permission.ACCESS_COARSE_LOCATION", "android.permission.ACCESS_FINE_LOCATION"}, apis="..22") public void removeProximityAlert(@NonNull android.app.PendingIntent); method public void removeTestProvider(@NonNull String); @@ -30120,8 +30141,8 @@ package android.net.wifi { method @NonNull public android.net.wifi.WifiNetworkSpecifier build(); method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setBssid(@NonNull android.net.MacAddress); method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setBssidPattern(@NonNull android.net.MacAddress, @NonNull android.net.MacAddress); - method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setIsEnhancedOpen(); - method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setIsHiddenSsid(); + method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setIsEnhancedOpen(boolean); + method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setIsHiddenSsid(boolean); method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setSsid(@NonNull String); method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setSsidPattern(@NonNull android.os.PatternMatcher); method @NonNull public android.net.wifi.WifiNetworkSpecifier.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig); @@ -30140,12 +30161,12 @@ package android.net.wifi { ctor public WifiNetworkSuggestion.Builder(); method @NonNull public android.net.wifi.WifiNetworkSuggestion build(); method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setBssid(@NonNull android.net.MacAddress); - method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsAppInteractionRequired(); - method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsEnhancedOpen(); - method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsHiddenSsid(); - method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsMetered(); - method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsUserInteractionRequired(); - method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(int); + method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsAppInteractionRequired(boolean); + method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsEnhancedOpen(boolean); + method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsHiddenSsid(boolean); + method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsMetered(boolean); + method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setIsUserInteractionRequired(boolean); + method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(@IntRange(from=0) int); method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSsid(@NonNull String); method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig); method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2Passphrase(@NonNull String); @@ -39002,12 +39023,10 @@ package android.provider { method public static long getLong(android.content.ContentResolver, String) throws android.provider.Settings.SettingNotFoundException; method public static String getString(android.content.ContentResolver, String); method public static android.net.Uri getUriFor(String); - method @Deprecated public static boolean isLocationProviderEnabled(android.content.ContentResolver, String); method public static boolean putFloat(android.content.ContentResolver, String, float); method public static boolean putInt(android.content.ContentResolver, String, int); method public static boolean putLong(android.content.ContentResolver, String, long); method public static boolean putString(android.content.ContentResolver, String, String); - method @Deprecated public static void setLocationProviderEnabled(android.content.ContentResolver, String, boolean); field public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED = "accessibility_display_inversion_enabled"; field public static final String ACCESSIBILITY_ENABLED = "accessibility_enabled"; field @Deprecated public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password"; @@ -44410,12 +44429,12 @@ package android.telephony { } public final class CellIdentityNr extends android.telephony.CellIdentity { - method public String getMccString(); - method public String getMncString(); + method @Nullable public String getMccString(); + method @Nullable public String getMncString(); method public long getNci(); - method public int getNrarfcn(); - method public int getPci(); - method public int getTac(); + method @IntRange(from=0, to=3279165) public int getNrarfcn(); + method @IntRange(from=0, to=1007) public int getPci(); + method @IntRange(from=0, to=65535) public int getTac(); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityNr> CREATOR; } @@ -44482,8 +44501,8 @@ package android.telephony { } public final class CellInfoNr extends android.telephony.CellInfo { - method public android.telephony.CellIdentity getCellIdentity(); - method public android.telephony.CellSignalStrength getCellSignalStrength(); + method @NonNull public android.telephony.CellIdentity getCellIdentity(); + method @NonNull public android.telephony.CellSignalStrength getCellSignalStrength(); method public void writeToParcel(android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoNr> CREATOR; } @@ -56395,10 +56414,12 @@ package android.widget { method public int getWindowLayoutType(); method public boolean isAboveAnchor(); method public boolean isAttachedInDecor(); + method @Deprecated public boolean isClipToScreenEnabled(); method public boolean isClippedToScreen(); method public boolean isClippingEnabled(); method public boolean isFocusable(); method public boolean isLaidOutInScreen(); + method @Deprecated public boolean isLayoutInScreenEnabled(); method public boolean isOutsideTouchable(); method public boolean isShowing(); method public boolean isSplitTouchEnabled(); @@ -56407,6 +56428,7 @@ package android.widget { method public void setAnimationStyle(int); method public void setAttachedInDecor(boolean); method public void setBackgroundDrawable(android.graphics.drawable.Drawable); + method @Deprecated public void setClipToScreenEnabled(boolean); method public void setClippingEnabled(boolean); method public void setContentView(android.view.View); method public void setElevation(float); @@ -56419,6 +56441,7 @@ package android.widget { method public void setInputMethodMode(int); method public void setIsClippedToScreen(boolean); method public void setIsLaidOutInScreen(boolean); + method @Deprecated public void setLayoutInScreenEnabled(boolean); method public void setOnDismissListener(android.widget.PopupWindow.OnDismissListener); method public void setOutsideTouchable(boolean); method public void setOverlapAnchor(boolean); diff --git a/api/removed.txt b/api/removed.txt index 93d06928e3d0..5108dd0d8514 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -282,24 +282,6 @@ package android.hardware { package android.location { - @Deprecated public final class GpsStatus { - method public int getMaxSatellites(); - method public Iterable<android.location.GpsSatellite> getSatellites(); - method public int getTimeToFirstFix(); - field public static final int GPS_EVENT_FIRST_FIX = 3; // 0x3 - field public static final int GPS_EVENT_SATELLITE_STATUS = 4; // 0x4 - field public static final int GPS_EVENT_STARTED = 1; // 0x1 - field public static final int GPS_EVENT_STOPPED = 2; // 0x2 - } - - @Deprecated public static interface GpsStatus.Listener { - method public void onGpsStatusChanged(int); - } - - @Deprecated public static interface GpsStatus.NmeaListener { - method public void onNmeaReceived(long, String); - } - public class Location implements android.os.Parcelable { method @Deprecated public void removeBearingAccuracy(); method @Deprecated public void removeSpeedAccuracy(); @@ -307,10 +289,7 @@ package android.location { } public class LocationManager { - method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(android.location.GpsStatus.Listener); method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(android.location.GpsStatus.NmeaListener); - method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.location.GpsStatus getGpsStatus(@Nullable android.location.GpsStatus); - method @Deprecated public void removeGpsStatusListener(android.location.GpsStatus.Listener); method @Deprecated public void removeNmeaListener(android.location.GpsStatus.NmeaListener); } @@ -574,6 +553,11 @@ package android.provider { field @Deprecated public static final String CONTACT_METADATA_SYNC = "contact_metadata_sync"; } + public static final class Settings.Secure extends android.provider.Settings.NameValueTable { + method @Deprecated public static boolean isLocationProviderEnabled(android.content.ContentResolver, String); + method @Deprecated public static void setLocationProviderEnabled(android.content.ContentResolver, String, boolean); + } + public static final class Settings.System extends android.provider.Settings.NameValueTable { field public static final String APPEND_FOR_LAST_AUDIBLE = "_last_audible"; field public static final String VOLUME_ALARM = "volume_alarm"; diff --git a/api/system-current.txt b/api/system-current.txt index 921a6bf2f272..cba378aff832 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -680,7 +680,7 @@ package android.app.admin { method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean packageHasActiveAdmins(String); method @Deprecated @RequiresPermission("android.permission.MANAGE_DEVICE_ADMINS") public boolean setActiveProfileOwner(@NonNull android.content.ComponentName, String) throws java.lang.IllegalArgumentException; method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public void setDeviceProvisioningConfigApplied(); - method @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIdsForUser(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle); + method @RequiresPermission(value=android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional=true) public void setProfileOwnerCanAccessDeviceIds(@NonNull android.content.ComponentName); field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED"; field public static final String ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED = "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED"; field public static final String ACTION_PROVISION_FINALIZATION = "android.app.action.PROVISION_FINALIZATION"; @@ -1198,7 +1198,7 @@ package android.app.usage { method public int getUsageSource(); method @RequiresPermission(allOf={android.Manifest.permission.SUSPEND_APPS, android.Manifest.permission.OBSERVE_APP_USAGE}) public void registerAppUsageLimitObserver(int, @NonNull String[], @NonNull java.time.Duration, @NonNull java.time.Duration, @Nullable android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerAppUsageObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent); - method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent, @Nullable android.app.PendingIntent); + method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], @NonNull java.time.Duration, @NonNull java.time.Duration, @NonNull android.app.PendingIntent, @Nullable android.app.PendingIntent); method public void reportUsageStart(@NonNull android.app.Activity, @NonNull String); method public void reportUsageStart(@NonNull android.app.Activity, @NonNull String, long); method public void reportUsageStop(@NonNull android.app.Activity, @NonNull String); @@ -5846,49 +5846,41 @@ package android.provider { public final class DeviceConfig { method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static void addOnPropertiesChangedListener(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static void addOnPropertyChangedListener(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.OnPropertyChangedListener); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static boolean getBoolean(String, String, boolean); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static float getFloat(String, String, float); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static int getInt(String, String, int); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static long getLong(String, String, long); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getProperty(String, String); - method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getString(String, String, String); + method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static boolean getBoolean(@NonNull String, @NonNull String, boolean); + method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static float getFloat(@NonNull String, @NonNull String, float); + method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static int getInt(@NonNull String, @NonNull String, int); + method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static long getLong(@NonNull String, @NonNull String, long); + method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getProperty(@NonNull String, @NonNull String); + method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public static String getString(@NonNull String, @NonNull String, @Nullable String); method public static void removeOnPropertiesChangedListener(@NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); method public static void removeOnPropertyChangedListener(@NonNull android.provider.DeviceConfig.OnPropertyChangedListener); method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static void resetToDefaults(int, @Nullable String); - method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(String, String, String, boolean); + method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean); field public static final String NAMESPACE_ACTIVITY_MANAGER = "activity_manager"; field public static final String NAMESPACE_ACTIVITY_MANAGER_NATIVE_BOOT = "activity_manager_native_boot"; + field public static final String NAMESPACE_ATTENTION_MANAGER_SERVICE = "attention_manager_service"; field public static final String NAMESPACE_AUTOFILL = "autofill"; field public static final String NAMESPACE_CONNECTIVITY = "connectivity"; field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; field public static final String NAMESPACE_DEX_BOOT = "dex_boot"; field public static final String NAMESPACE_GAME_DRIVER = "game_driver"; field public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot"; + field public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; field public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; field public static final String NAMESPACE_NETD_NATIVE = "netd_native"; + field public static final String NAMESPACE_RUNTIME = "runtime"; + field public static final String NAMESPACE_RUNTIME_NATIVE = "runtime_native"; field public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot"; field public static final String NAMESPACE_SYSTEMUI = "systemui"; field public static final String NAMESPACE_TEXTCLASSIFIER = "textclassifier"; } - public static interface DeviceConfig.AttentionManagerService { - field public static final String COMPONENT_NAME = "component_name"; - field public static final String NAMESPACE = "attention_manager_service"; - field public static final String SERVICE_ENABLED = "service_enabled"; - } - - public static interface DeviceConfig.IntelligenceAttention { - field public static final String ATTENTION_ENABLED = "attention_enabled"; - field public static final String ATTENTION_SETTINGS = "attention_settings"; - field public static final String NAMESPACE = "intelligence_attention"; - } - public static interface DeviceConfig.OnPropertiesChangedListener { method public void onPropertiesChanged(@NonNull android.provider.DeviceConfig.Properties); } public static interface DeviceConfig.OnPropertyChangedListener { - method public void onPropertyChanged(String, String, String); + method public void onPropertyChanged(@NonNull String, @NonNull String, @Nullable String); } public static interface DeviceConfig.Privacy { @@ -5914,15 +5906,6 @@ package android.provider { field public static final String ROLLBACK_LIFETIME_IN_MILLIS = "rollback_lifetime_in_millis"; } - public static interface DeviceConfig.Runtime { - field public static final String NAMESPACE = "runtime"; - field public static final String USE_PRECOMPILED_LAYOUT = "view.precompiled_layout_enabled"; - } - - public static interface DeviceConfig.RuntimeNative { - field public static final String NAMESPACE = "runtime_native"; - } - public static interface DeviceConfig.Scheduler { field public static final String ENABLE_FAST_METRICS_COLLECTION = "enable_fast_metrics_collection"; field public static final String NAMESPACE = "scheduler"; @@ -6133,7 +6116,6 @@ package android.provider { field public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode"; field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications"; field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications"; - field public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count"; field public static final String THEME_CUSTOMIZATION_OVERLAY_PACKAGES = "theme_customization_overlay_packages"; field public static final String USER_SETUP_COMPLETE = "user_setup_complete"; field public static final int USER_SETUP_PERSONALIZATION_COMPLETE = 10; // 0xa @@ -6142,6 +6124,9 @@ package android.provider { field public static final int USER_SETUP_PERSONALIZATION_STARTED = 1; // 0x1 field public static final String USER_SETUP_PERSONALIZATION_STATE = "user_setup_personalization_state"; field public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture"; + field public static final int VOLUME_HUSH_MUTE = 2; // 0x2 + field public static final int VOLUME_HUSH_OFF = 0; // 0x0 + field public static final int VOLUME_HUSH_VIBRATE = 1; // 0x1 } public static final class Telephony.Carriers implements android.provider.BaseColumns { @@ -6337,7 +6322,7 @@ package android.service.attention { public abstract class AttentionService extends android.app.Service { ctor public AttentionService(); - method public final android.os.IBinder onBind(android.content.Intent); + method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent); method public abstract void onCancelAttentionCheck(int); method public abstract void onCheckAttention(int, @NonNull android.service.attention.AttentionService.AttentionCallback); field public static final int ATTENTION_FAILURE_PREEMPTED = 2; // 0x2 @@ -8046,7 +8031,7 @@ package android.telephony { method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst(); method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.util.Pair<java.lang.Integer,java.lang.Integer>> getLogicalToPhysicalSlotMapping(); method public static long getMaxNumberVerificationTimeoutMillis(); - method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmap(); + method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask(); method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState(); method public int getSimApplicationState(); method public int getSimCardState(); @@ -8083,7 +8068,7 @@ package android.telephony { method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(int, boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataRoamingEnabled(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultisimCarrierRestriction(boolean); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmap(long); + method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadioPower(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setSimPowerState(int); @@ -9535,6 +9520,7 @@ package android.view.contentcapture { method public int getTaskId(); field public static final int FLAG_DISABLED_BY_APP = 1; // 0x1 field public static final int FLAG_DISABLED_BY_FLAG_SECURE = 2; // 0x2 + field public static final int FLAG_RECONNECTED = 4; // 0x4 } public final class ContentCaptureEvent implements android.os.Parcelable { diff --git a/api/system-removed.txt b/api/system-removed.txt index 18d0ec02f077..2c65029c30b2 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -28,6 +28,14 @@ package android.app.admin { } +package android.app.usage { + + public final class UsageStatsManager { + method @Deprecated @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent, @Nullable android.app.PendingIntent); + } + +} + package android.content { public class Intent implements java.lang.Cloneable android.os.Parcelable { diff --git a/api/test-current.txt b/api/test-current.txt index 29137438384e..af93d17a3a28 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -599,6 +599,7 @@ package android.content { method public void setAutofillOptions(@Nullable android.content.AutofillOptions); method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); field public static final String ROLLBACK_SERVICE = "rollback"; + field public static final String TEST_NETWORK_SERVICE = "test_network"; } public class ContextWrapper extends android.content.Context { @@ -2055,16 +2056,16 @@ package android.provider { public final class DeviceConfig { method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static void addOnPropertiesChangedListener(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static void addOnPropertyChangedListener(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.provider.DeviceConfig.OnPropertyChangedListener); - method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static boolean getBoolean(String, String, boolean); - method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static float getFloat(String, String, float); - method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static int getInt(String, String, int); - method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static long getLong(String, String, long); - method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static String getProperty(String, String); - method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static String getString(String, String, String); + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static boolean getBoolean(@NonNull String, @NonNull String, boolean); + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static float getFloat(@NonNull String, @NonNull String, float); + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static int getInt(@NonNull String, @NonNull String, int); + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static long getLong(@NonNull String, @NonNull String, long); + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static String getProperty(@NonNull String, @NonNull String); + method @RequiresPermission("android.permission.READ_DEVICE_CONFIG") public static String getString(@NonNull String, @NonNull String, @Nullable String); method public static void removeOnPropertiesChangedListener(@NonNull android.provider.DeviceConfig.OnPropertiesChangedListener); method public static void removeOnPropertyChangedListener(@NonNull android.provider.DeviceConfig.OnPropertyChangedListener); method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static void resetToDefaults(int, @Nullable String); - method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(String, String, String, boolean); + method @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static boolean setProperty(@NonNull String, @NonNull String, @Nullable String, boolean); field public static final String NAMESPACE_AUTOFILL = "autofill"; field public static final String NAMESPACE_CONTENT_CAPTURE = "content_capture"; } @@ -2074,7 +2075,7 @@ package android.provider { } public static interface DeviceConfig.OnPropertyChangedListener { - method public void onPropertyChanged(String, String, String); + method public void onPropertyChanged(@NonNull String, @NonNull String, @Nullable String); } public static interface DeviceConfig.Privacy { @@ -3055,6 +3056,7 @@ package android.view.contentcapture { method public int getTaskId(); field public static final int FLAG_DISABLED_BY_APP = 1; // 0x1 field public static final int FLAG_DISABLED_BY_FLAG_SECURE = 2; // 0x2 + field public static final int FLAG_RECONNECTED = 4; // 0x4 } public final class ContentCaptureEvent implements android.os.Parcelable { diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 69372cd379ea..3246d19e6202 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -253,7 +253,7 @@ message Atom { } // Pulled events will start at field 10000. - // Next: 10056 + // Next: 10057 oneof pulled { WifiBytesTransfer wifi_bytes_transfer = 10000; WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 10001; @@ -311,6 +311,7 @@ message Atom { SDCardInfo sdcard_info = 10053; GpuStatsGlobalInfo gpu_stats_global_info = 10054; GpuStatsAppInfo gpu_stats_app_info = 10055; + SystemIonHeapSize system_ion_heap_size = 10056; } // DO NOT USE field numbers above 100,000 in AOSP. @@ -5822,3 +5823,13 @@ message GpuStatsAppInfo { optional GpuDriverLoadingTime vk_driver_loading_time = 4 [(android.os.statsd.log_mode) = MODE_BYTES]; } + +/* + * Logs the size of the system ion heap. + * + * Pulled from StatsCompanionService. + */ +message SystemIonHeapSize { + // Size of the system ion heap in bytes. + optional int64 size_in_bytes = 1; +} diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp index 4f872727cdfd..c7ae656920b8 100644 --- a/cmds/statsd/src/external/StatsPullerManager.cpp +++ b/cmds/statsd/src/external/StatsPullerManager.cpp @@ -148,10 +148,14 @@ std::map<int, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { {android::util::NATIVE_PROCESS_MEMORY_STATE, {.additiveFields = {3, 4, 5, 6}, .puller = new StatsCompanionServicePuller(android::util::NATIVE_PROCESS_MEMORY_STATE)}}, + // process_memory_high_water_mark {android::util::PROCESS_MEMORY_HIGH_WATER_MARK, {.additiveFields = {3}, .puller = new StatsCompanionServicePuller(android::util::PROCESS_MEMORY_HIGH_WATER_MARK)}}, + // system_ion_heap_size + {android::util::SYSTEM_ION_HEAP_SIZE, + {.puller = new StatsCompanionServicePuller(android::util::SYSTEM_ION_HEAP_SIZE)}}, // temperature {android::util::TEMPERATURE, {.puller = new StatsCompanionServicePuller(android::util::TEMPERATURE)}}, diff --git a/cmds/statsd/src/storage/StorageManager.cpp b/cmds/statsd/src/storage/StorageManager.cpp index 5df8fb5c0e29..65b183c6fc96 100644 --- a/cmds/statsd/src/storage/StorageManager.cpp +++ b/cmds/statsd/src/storage/StorageManager.cpp @@ -116,14 +116,16 @@ bool StorageManager::writeTrainInfo(int64_t trainVersionCode, const std::string& const size_t trainNameSizeByteCount = sizeof(trainNameSize); result = write(fd, (uint8_t*)&trainNameSize, trainNameSizeByteCount); if (result != trainNameSizeByteCount) { - VLOG("Failed to write %s", file_name.c_str()); + VLOG("Failed to write train name size for %s", file_name.c_str()); + close(fd); return false; } // Write trainName to file result = write(fd, trainName.c_str(), trainNameSize); if (result != trainNameSize) { - VLOG("Failed to write %s", file_name.c_str()); + VLOG("Failed to write train name for%s", file_name.c_str()); + close(fd); return false; } @@ -131,7 +133,18 @@ bool StorageManager::writeTrainInfo(int64_t trainVersionCode, const std::string& const size_t statusByteCount = sizeof(status); result = write(fd, (uint8_t*)&status, statusByteCount); if (result != statusByteCount) { - VLOG("Failed to write %s", file_name.c_str()); + VLOG("Failed to write status for %s", file_name.c_str()); + close(fd); + return false; + } + + // Write experiment id size to file. + const size_t experimentIdSize = experimentIds.size(); + const size_t experimentIdsSizeByteCount = sizeof(experimentIdSize); + result = write(fd, (uint8_t*) &experimentIdSize, experimentIdsSizeByteCount); + if (result != experimentIdsSizeByteCount) { + VLOG("Failed to write experiment id size for %s", file_name.c_str()); + close(fd); return false; } @@ -140,13 +153,15 @@ bool StorageManager::writeTrainInfo(int64_t trainVersionCode, const std::string& if (result == experimentIds.size()) { VLOG("Successfully wrote %s", file_name.c_str()); } else { - VLOG("Failed to write %s", file_name.c_str()); + VLOG("Failed to write experiment ids for %s", file_name.c_str()); + close(fd); return false; } result = fchown(fd, AID_STATSD, AID_STATSD); if (result) { VLOG("Failed to chown %s to statsd", file_name.c_str()); + close(fd); return false; } @@ -170,39 +185,73 @@ bool StorageManager::readTrainInfo(InstallTrainInfo& trainInfo) { if (name[0] == '.') { continue; } + + size_t result; + trainInfo.trainVersionCode = StrToInt64(name); string fullPath = StringPrintf("%s/%s", TRAIN_INFO_DIR, name); int fd = open(fullPath.c_str(), O_RDONLY | O_CLOEXEC); - if (fd != -1) { - string str; - if (android::base::ReadFdToString(fd, &str)) { - close(fd); + if (fd == -1) { + return false; + } - auto it = str.begin(); + // Read # of bytes taken by trainName in the file. + size_t trainNameSize; + result = read(fd, &trainNameSize, sizeof(size_t)); + if (result != sizeof(size_t)) { + VLOG("Failed to read train name size from file %s", fullPath.c_str()); + close(fd); + return false; + } - // Read # of bytes taken by trainName in the file - size_t trainNameSize; - const size_t trainNameSizeByteCount = sizeof(trainNameSize); - std::copy_n(it, trainNameSizeByteCount, &trainNameSize); - it += trainNameSizeByteCount; + // Read trainName + trainInfo.trainName.resize(trainNameSize); + result = read(fd, trainInfo.trainName.data(), trainNameSize); + if (result != trainNameSize) { + VLOG("Failed to read train name from file %s", fullPath.c_str()); + close(fd); + return false; + } - // Read trainName - std::copy_n(it, trainNameSize, std::back_inserter(trainInfo.trainName)); - it += trainNameSize; + // Read status + const size_t statusByteCount = sizeof(trainInfo.status); + result = read(fd, &trainInfo.status, statusByteCount); + if (result != statusByteCount) { + VLOG("Failed to read train status from file %s", fullPath.c_str()); + close(fd); + return false; + } - // Read status - const size_t statusByteCount = sizeof(trainInfo.status); - std::copy_n(it, statusByteCount, &trainInfo.status); - it += statusByteCount; + // Read experiment ids size. + size_t experimentIdSize; + result = read(fd, &experimentIdSize, sizeof(size_t)); + if (result != sizeof(size_t)) { + VLOG("Failed to read train experiment id size from file %s", fullPath.c_str()); + close(fd); + return false; + } - // Read experimentIds - std::copy(it, str.end(), std::back_inserter(trainInfo.experimentIds)); + // Read experimentIds + trainInfo.experimentIds.resize(experimentIdSize); + result = read(fd, trainInfo.experimentIds.data(), experimentIdSize); + if (result != experimentIdSize) { + VLOG("Failed to read train experiment ids from file %s", fullPath.c_str()); + close(fd); + return false; + } - VLOG("Read train info file successful: %s", fullPath.c_str()); - return true; - } + // Expect to be at EOF. + char c; + result = read(fd, &c, 1); + if (result != 0) { + VLOG("Failed to read train info from file %s. Did not get expected EOF.", fullPath.c_str()); + close(fd); + return false; } + + VLOG("Read train info file successful: %s", fullPath.c_str()); close(fd); + return true; } return false; } diff --git a/config/hiddenapi-greylist.txt b/config/hiddenapi-greylist.txt index ff8dec19ad1c..c6a3d804c67c 100644 --- a/config/hiddenapi-greylist.txt +++ b/config/hiddenapi-greylist.txt @@ -1756,48 +1756,6 @@ Lcom/android/internal/statusbar/IStatusBar$Stub;->asInterface(Landroid/os/IBinde Lcom/android/internal/statusbar/IStatusBarService$Stub;-><init>()V Lcom/android/internal/statusbar/IStatusBarService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/statusbar/IStatusBarService; Lcom/android/internal/telecom/ITelecomService$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telecom/ITelecomService; -Lcom/android/internal/telephony/BaseCommands;->mCallStateRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mCallWaitingInfoRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mCatCallSetUpRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mCatCcAlphaRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mCatEventRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mCatProCmdRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mCatSessionEndRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mCdmaPrlChangedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mCdmaSmsRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mCdmaSubscriptionChangedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/BaseCommands;->mEmergencyCallbackModeRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mExitEmergencyCallbackModeRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mGsmBroadcastSmsRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mGsmSmsRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mHardwareConfigChangeRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mIccRefreshRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mIccSmsFullRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mIccStatusChangedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mImsNetworkStateChangedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mNITZTimeRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mOtaProvisionRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mPhoneRadioCapabilityChangedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mPhoneType:I -Lcom/android/internal/telephony/BaseCommands;->mPreferredNetworkType:I -Lcom/android/internal/telephony/BaseCommands;->mResendIncallMuteRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mRestrictedStateRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mRilCellInfoListRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mRingbackToneRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mRingRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mSignalStrengthRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mSmsOnSimRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mSmsStatusRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mSrvccStateRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mSsnRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mSsRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mStateMonitor:Ljava/lang/Object; -Lcom/android/internal/telephony/BaseCommands;->mSubscriptionStatusRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/BaseCommands;->mUnsolOemHookRawRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mUSSDRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/BaseCommands;->mVoiceRadioTechChangedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/Call$State;->ACTIVE:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call$State;->ALERTING:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call$State;->DIALING:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call$State;->DISCONNECTED:Lcom/android/internal/telephony/Call$State; @@ -1805,232 +1763,22 @@ Lcom/android/internal/telephony/Call$State;->DISCONNECTING:Lcom/android/internal Lcom/android/internal/telephony/Call$State;->HOLDING:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call$State;->IDLE:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call$State;->INCOMING:Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call$State;->isAlive()Z -Lcom/android/internal/telephony/Call$State;->isRinging()Z Lcom/android/internal/telephony/Call$State;->values()[Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call$State;->WAITING:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/Call;-><init>()V -Lcom/android/internal/telephony/Call;->getConnections()Ljava/util/List; -Lcom/android/internal/telephony/Call;->getEarliestConnection()Lcom/android/internal/telephony/Connection; -Lcom/android/internal/telephony/Call;->getLatestConnection()Lcom/android/internal/telephony/Connection; -Lcom/android/internal/telephony/Call;->getPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/Call;->getState()Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Call;->hangup()V -Lcom/android/internal/telephony/Call;->isIdle()Z -Lcom/android/internal/telephony/Call;->isMultiparty()Z -Lcom/android/internal/telephony/Call;->mConnections:Ljava/util/ArrayList; -Lcom/android/internal/telephony/Call;->mState:Lcom/android/internal/telephony/Call$State; Lcom/android/internal/telephony/CallerInfoAsyncQuery$CallerInfoAsyncQueryHandler;-><init>(Lcom/android/internal/telephony/CallerInfoAsyncQuery;Landroid/content/Context;)V Lcom/android/internal/telephony/CallerInfoAsyncQuery$CookieWrapper;-><init>()V Lcom/android/internal/telephony/CallerInfoAsyncQuery;->release()V Lcom/android/internal/telephony/CallForwardInfo;-><init>()V -Lcom/android/internal/telephony/CallForwardInfo;->number:Ljava/lang/String; -Lcom/android/internal/telephony/CallForwardInfo;->reason:I -Lcom/android/internal/telephony/CallForwardInfo;->serviceClass:I -Lcom/android/internal/telephony/CallForwardInfo;->status:I -Lcom/android/internal/telephony/CallForwardInfo;->timeSeconds:I -Lcom/android/internal/telephony/CallForwardInfo;->toa:I -Lcom/android/internal/telephony/CallManager;->canConference(Lcom/android/internal/telephony/Call;I)Z -Lcom/android/internal/telephony/CallManager;->canDial(Lcom/android/internal/telephony/Phone;)Z -Lcom/android/internal/telephony/CallManager;->conference(Lcom/android/internal/telephony/Call;)V -Lcom/android/internal/telephony/CallManager;->getActiveFgCall(I)Lcom/android/internal/telephony/Call; -Lcom/android/internal/telephony/CallManager;->getActiveFgCallState(I)Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/CallManager;->getBackgroundCalls()Ljava/util/List; -Lcom/android/internal/telephony/CallManager;->getBgCallConnections()Ljava/util/List; -Lcom/android/internal/telephony/CallManager;->getBgPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/CallManager;->getContext()Landroid/content/Context; -Lcom/android/internal/telephony/CallManager;->getDefaultPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/CallManager;->getFgCallConnections()Ljava/util/List; -Lcom/android/internal/telephony/CallManager;->getFgPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/CallManager;->getFgPhone(I)Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/CallManager;->getFirstActiveBgCall()Lcom/android/internal/telephony/Call; -Lcom/android/internal/telephony/CallManager;->getFirstActiveBgCall(I)Lcom/android/internal/telephony/Call; -Lcom/android/internal/telephony/CallManager;->getFirstActiveRingingCall()Lcom/android/internal/telephony/Call; -Lcom/android/internal/telephony/CallManager;->getFirstActiveRingingCall(I)Lcom/android/internal/telephony/Call; -Lcom/android/internal/telephony/CallManager;->getInstance()Lcom/android/internal/telephony/CallManager; -Lcom/android/internal/telephony/CallManager;->getPhoneInCall()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/CallManager;->getRingingCalls()Ljava/util/List; -Lcom/android/internal/telephony/CallManager;->getRingingPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/CallManager;->getState()Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/CallManager;->getState(I)Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/CallManager;->hasActiveBgCall()Z -Lcom/android/internal/telephony/CallManager;->hasActiveBgCall(I)Z -Lcom/android/internal/telephony/CallManager;->hasActiveFgCall()Z -Lcom/android/internal/telephony/CallManager;->hasActiveFgCall(I)Z -Lcom/android/internal/telephony/CallManager;->hasActiveRingingCall(I)Z -Lcom/android/internal/telephony/CallManager;->hasMoreThanOneRingingCall()Z -Lcom/android/internal/telephony/CallManager;->hasMoreThanOneRingingCall(I)Z -Lcom/android/internal/telephony/CallManager;->mBackgroundCalls:Ljava/util/ArrayList; -Lcom/android/internal/telephony/CallManager;->mEmptyConnections:Ljava/util/ArrayList; -Lcom/android/internal/telephony/CallManager;->mForegroundCalls:Ljava/util/ArrayList; -Lcom/android/internal/telephony/CallManager;->mPhones:Ljava/util/ArrayList; -Lcom/android/internal/telephony/CallManager;->mRingingCalls:Ljava/util/ArrayList; -Lcom/android/internal/telephony/CallManager;->registerForDisconnect(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CallManager;->registerForNewRingingConnection(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CallManager;->registerForPreciseCallStateChanged(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CallManager;->registerPhone(Lcom/android/internal/telephony/Phone;)Z -Lcom/android/internal/telephony/CallManager;->unregisterForDisconnect(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CallManager;->unregisterForNewRingingConnection(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CallManager;->unregisterForPreciseCallStateChanged(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CallManager;->unregisterPhone(Lcom/android/internal/telephony/Phone;)V -Lcom/android/internal/telephony/CallStateException;-><init>(Ljava/lang/String;)V Lcom/android/internal/telephony/CallTracker;-><init>()V -Lcom/android/internal/telephony/CallTracker;->getState()Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/CallTracker;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/CallTracker;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/CallTracker;->mNeedsPoll:Z -Lcom/android/internal/telephony/CallTracker;->mNumberConverted:Z -Lcom/android/internal/telephony/CallTracker;->mPendingOperations:I -Lcom/android/internal/telephony/CallTracker;->registerForVoiceCallEnded(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CarrierServiceBindHelper;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/CarrierServiceBindHelper;->mHandler:Landroid/os/Handler; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->CLOSE_CHANNEL:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->DISPLAY_TEXT:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->fromInt(I)Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->GET_CHANNEL_STATUS:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->GET_INKEY:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->GET_INPUT:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->LANGUAGE_NOTIFICATION:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->LAUNCH_BROWSER:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->OPEN_CHANNEL:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->PLAY_TONE:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->PROVIDE_LOCAL_INFORMATION:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->RECEIVE_DATA:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->REFRESH:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SELECT_ITEM:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SEND_DATA:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SEND_DTMF:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SEND_SMS:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SEND_SS:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SEND_USSD:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SET_UP_CALL:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SET_UP_EVENT_LIST:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SET_UP_IDLE_MODE_TEXT:Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/AppInterface$CommandType;->SET_UP_MENU:Lcom/android/internal/telephony/cat/AppInterface$CommandType; Lcom/android/internal/telephony/cat/AppInterface$CommandType;->values()[Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/CatCmdMessage$CallSettings;->callMsg:Lcom/android/internal/telephony/cat/TextMessage; -Lcom/android/internal/telephony/cat/CatCmdMessage$CallSettings;->confirmMsg:Lcom/android/internal/telephony/cat/TextMessage; -Lcom/android/internal/telephony/cat/CatCmdMessage$SetupEventListSettings;->eventList:[I -Lcom/android/internal/telephony/cat/CatCmdMessage;->getCallSettings()Lcom/android/internal/telephony/cat/CatCmdMessage$CallSettings; -Lcom/android/internal/telephony/cat/CatCmdMessage;->getCmdType()Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/CatCmdMessage;->geTextMessage()Lcom/android/internal/telephony/cat/TextMessage; -Lcom/android/internal/telephony/cat/CatCmdMessage;->getSetEventList()Lcom/android/internal/telephony/cat/CatCmdMessage$SetupEventListSettings; -Lcom/android/internal/telephony/cat/CatCmdMessage;->hasIconLoadFailed()Z -Lcom/android/internal/telephony/cat/CatCmdMessage;->mCallSettings:Lcom/android/internal/telephony/cat/CatCmdMessage$CallSettings; -Lcom/android/internal/telephony/cat/CatCmdMessage;->mCmdDet:Lcom/android/internal/telephony/cat/CommandDetails; -Lcom/android/internal/telephony/cat/CatCmdMessage;->mInput:Lcom/android/internal/telephony/cat/Input; -Lcom/android/internal/telephony/cat/CatCmdMessage;->mMenu:Lcom/android/internal/telephony/cat/Menu; -Lcom/android/internal/telephony/cat/CatCmdMessage;->mTextMsg:Lcom/android/internal/telephony/cat/TextMessage; -Lcom/android/internal/telephony/cat/CatLog;->d(Ljava/lang/Object;Ljava/lang/String;)V -Lcom/android/internal/telephony/cat/CatLog;->d(Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/cat/CatLog;->e(Ljava/lang/Object;Ljava/lang/String;)V -Lcom/android/internal/telephony/cat/CatResponseMessage;->setEventDownload(I[B)V -Lcom/android/internal/telephony/cat/CatService;->dispose()V -Lcom/android/internal/telephony/cat/CatService;->isStkAppInstalled()Z -Lcom/android/internal/telephony/cat/CatService;->mCmdIf:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/cat/CatService;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/cat/CatService;->mCurrntCmd:Lcom/android/internal/telephony/cat/CatCmdMessage; -Lcom/android/internal/telephony/cat/CatService;->mMenuCmd:Lcom/android/internal/telephony/cat/CatCmdMessage; -Lcom/android/internal/telephony/cat/CatService;->mMsgDecoder:Lcom/android/internal/telephony/cat/RilMessageDecoder; -Lcom/android/internal/telephony/cat/CatService;->mSlotId:I -Lcom/android/internal/telephony/cat/CatService;->mStkAppInstalled:Z -Lcom/android/internal/telephony/cat/CatService;->mUiccController:Lcom/android/internal/telephony/uicc/UiccController; -Lcom/android/internal/telephony/cat/CatService;->sendTerminalResponse(Lcom/android/internal/telephony/cat/CommandDetails;Lcom/android/internal/telephony/cat/ResultCode;ZILcom/android/internal/telephony/cat/ResponseData;)V -Lcom/android/internal/telephony/cat/CatService;->sInstance:[Lcom/android/internal/telephony/cat/CatService; -Lcom/android/internal/telephony/cat/CatService;->sInstanceLock:Ljava/lang/Object; -Lcom/android/internal/telephony/cat/CommandDetails;->commandNumber:I -Lcom/android/internal/telephony/cat/CommandDetails;->commandQualifier:I -Lcom/android/internal/telephony/cat/CommandDetails;->compRequired:Z -Lcom/android/internal/telephony/cat/CommandDetails;->typeOfCommand:I -Lcom/android/internal/telephony/cat/CommandParams;-><init>(Lcom/android/internal/telephony/cat/CommandDetails;)V -Lcom/android/internal/telephony/cat/CommandParams;->getCommandType()Lcom/android/internal/telephony/cat/AppInterface$CommandType; -Lcom/android/internal/telephony/cat/CommandParams;->mCmdDet:Lcom/android/internal/telephony/cat/CommandDetails; -Lcom/android/internal/telephony/cat/CommandParamsFactory;->dispose()V -Lcom/android/internal/telephony/cat/CommandParamsFactory;->mIconLoader:Lcom/android/internal/telephony/cat/IconLoader; -Lcom/android/internal/telephony/cat/CommandParamsFactory;->searchForNextTag(Lcom/android/internal/telephony/cat/ComprehensionTlvTag;Ljava/util/Iterator;)Lcom/android/internal/telephony/cat/ComprehensionTlv; -Lcom/android/internal/telephony/cat/CommandParamsFactory;->searchForTag(Lcom/android/internal/telephony/cat/ComprehensionTlvTag;Ljava/util/List;)Lcom/android/internal/telephony/cat/ComprehensionTlv; -Lcom/android/internal/telephony/cat/ComprehensionTlv;->getLength()I -Lcom/android/internal/telephony/cat/ComprehensionTlv;->getRawValue()[B -Lcom/android/internal/telephony/cat/ComprehensionTlv;->getTag()I -Lcom/android/internal/telephony/cat/ComprehensionTlv;->getValueIndex()I -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->ADDRESS:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->ALPHA_ID:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->COMMAND_DETAILS:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->DEVICE_IDENTITIES:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->ICON_ID:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->RESULT:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->SMS_TPDU:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->TEXT_ATTRIBUTE:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->TEXT_STRING:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->USSD_STRING:Lcom/android/internal/telephony/cat/ComprehensionTlvTag; -Lcom/android/internal/telephony/cat/ComprehensionTlvTag;->value()I -Lcom/android/internal/telephony/cat/DeviceIdentities;->destinationId:I -Lcom/android/internal/telephony/cat/DisplayTextParams;-><init>(Lcom/android/internal/telephony/cat/CommandDetails;Lcom/android/internal/telephony/cat/TextMessage;)V -Lcom/android/internal/telephony/cat/DisplayTextParams;->mTextMsg:Lcom/android/internal/telephony/cat/TextMessage; -Lcom/android/internal/telephony/cat/Duration$TimeUnit;->value()I -Lcom/android/internal/telephony/cat/Duration;->timeInterval:I -Lcom/android/internal/telephony/cat/Duration;->timeUnit:Lcom/android/internal/telephony/cat/Duration$TimeUnit; -Lcom/android/internal/telephony/cat/GetInputParams;-><init>(Lcom/android/internal/telephony/cat/CommandDetails;Lcom/android/internal/telephony/cat/Input;)V -Lcom/android/internal/telephony/cat/IconId;->recordNumber:I -Lcom/android/internal/telephony/cat/IconLoader;->loadIcon(ILandroid/os/Message;)V -Lcom/android/internal/telephony/cat/Menu;->titleAttrs:Ljava/util/List; -Lcom/android/internal/telephony/cat/PlayToneParams;-><init>(Lcom/android/internal/telephony/cat/CommandDetails;Lcom/android/internal/telephony/cat/TextMessage;Lcom/android/internal/telephony/cat/Tone;Lcom/android/internal/telephony/cat/Duration;Z)V Lcom/android/internal/telephony/cat/ResponseData;-><init>()V -Lcom/android/internal/telephony/cat/ResponseData;->format(Ljava/io/ByteArrayOutputStream;)V -Lcom/android/internal/telephony/cat/ResultCode;->BACKWARD_MOVE_BY_USER:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->BEYOND_TERMINAL_CAPABILITY:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->BIP_ERROR:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->CMD_DATA_NOT_UNDERSTOOD:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->HELP_INFO_REQUIRED:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->LAUNCH_BROWSER_ERROR:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->NETWORK_CRNTLY_UNABLE_TO_PROCESS:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->NO_RESPONSE_FROM_USER:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->OK:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_ICON_NOT_DISPLAYED:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_LIMITED_SERVICE:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_MODIFIED_BY_NAA:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_NAA_NOT_ACTIVE:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_TONE_NOT_PLAYED:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_WITH_ADDITIONAL_EFS_READ:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_WITH_MISSING_INFO:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_WITH_MODIFICATION:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->PRFRMD_WITH_PARTIAL_COMPREHENSION:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->REQUIRED_VALUES_MISSING:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->TERMINAL_CRNTLY_UNABLE_TO_PROCESS:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->UICC_SESSION_TERM_BY_USER:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->USER_NOT_ACCEPT:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->USIM_CALL_CONTROL_PERMANENT:Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultCode;->value()I Lcom/android/internal/telephony/cat/ResultCode;->values()[Lcom/android/internal/telephony/cat/ResultCode; -Lcom/android/internal/telephony/cat/ResultException;-><init>(Lcom/android/internal/telephony/cat/ResultCode;)V -Lcom/android/internal/telephony/cat/RilMessage;-><init>(ILjava/lang/String;)V -Lcom/android/internal/telephony/cat/RilMessage;->mData:Ljava/lang/Object; -Lcom/android/internal/telephony/cat/RilMessage;->mId:I -Lcom/android/internal/telephony/cat/RilMessageDecoder;->getInstance(Landroid/os/Handler;Lcom/android/internal/telephony/uicc/IccFileHandler;I)Lcom/android/internal/telephony/cat/RilMessageDecoder; -Lcom/android/internal/telephony/cat/RilMessageDecoder;->mCmdParamsFactory:Lcom/android/internal/telephony/cat/CommandParamsFactory; Lcom/android/internal/telephony/cat/RilMessageDecoder;->mCurrentRilMessage:Lcom/android/internal/telephony/cat/RilMessage; -Lcom/android/internal/telephony/cat/RilMessageDecoder;->mInstance:[Lcom/android/internal/telephony/cat/RilMessageDecoder; -Lcom/android/internal/telephony/cat/RilMessageDecoder;->mStateStart:Lcom/android/internal/telephony/cat/RilMessageDecoder$StateStart; Lcom/android/internal/telephony/cat/RilMessageDecoder;->sendCmdForExecution(Lcom/android/internal/telephony/cat/RilMessage;)V Lcom/android/internal/telephony/cat/RilMessageDecoder;->sendStartDecodingMessageParams(Lcom/android/internal/telephony/cat/RilMessage;)V -Lcom/android/internal/telephony/cat/SelectItemParams;-><init>(Lcom/android/internal/telephony/cat/CommandDetails;Lcom/android/internal/telephony/cat/Menu;Z)V -Lcom/android/internal/telephony/cat/TextMessage;-><init>()V -Lcom/android/internal/telephony/cat/TextMessage;->iconSelfExplanatory:Z -Lcom/android/internal/telephony/cat/TextMessage;->text:Ljava/lang/String; Lcom/android/internal/telephony/cat/ValueObject;-><init>()V -Lcom/android/internal/telephony/cat/ValueParser;->retrieveAlphaId(Lcom/android/internal/telephony/cat/ComprehensionTlv;)Ljava/lang/String; Lcom/android/internal/telephony/cat/ValueParser;->retrieveDeviceIdentities(Lcom/android/internal/telephony/cat/ComprehensionTlv;)Lcom/android/internal/telephony/cat/DeviceIdentities; -Lcom/android/internal/telephony/cat/ValueParser;->retrieveTextAttribute(Lcom/android/internal/telephony/cat/ComprehensionTlv;)Ljava/util/List; -Lcom/android/internal/telephony/cat/ValueParser;->retrieveTextString(Lcom/android/internal/telephony/cat/ComprehensionTlv;)Ljava/lang/String; -Lcom/android/internal/telephony/cdma/CdmaCallWaitingNotification;->number:Ljava/lang/String; -Lcom/android/internal/telephony/cdma/CdmaMmiCode;->makeEmptyNull(Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/cdma/CdmaMmiCode;->mSc:Ljava/lang/String; -Lcom/android/internal/telephony/cdma/CdmaSMSDispatcher;->getFormat()Ljava/lang/String; -Lcom/android/internal/telephony/cdma/CdmaSMSDispatcher;->handleCdmaStatusReport(Lcom/android/internal/telephony/cdma/SmsMessage;)V -Lcom/android/internal/telephony/cdma/CdmaSubscriptionSourceManager;->getCdmaSubscriptionSource()I -Lcom/android/internal/telephony/cdma/CdmaSubscriptionSourceManager;->getInstance(Landroid/content/Context;Lcom/android/internal/telephony/CommandsInterface;Landroid/os/Handler;ILjava/lang/Object;)Lcom/android/internal/telephony/cdma/CdmaSubscriptionSourceManager; -Lcom/android/internal/telephony/cdma/EriManager$EriDisplayInformation;->mEriIconText:Ljava/lang/String; -Lcom/android/internal/telephony/cdma/EriManager;->getEriDisplayInformation(II)Lcom/android/internal/telephony/cdma/EriManager$EriDisplayInformation; Lcom/android/internal/telephony/cdma/sms/BearerData$CodingException;-><init>(Ljava/lang/String;)V Lcom/android/internal/telephony/cdma/sms/BearerData$TimeStamp;-><init>()V Lcom/android/internal/telephony/cdma/sms/BearerData;-><init>()V @@ -2084,130 +1832,6 @@ Lcom/android/internal/telephony/cdma/SmsMessage;->mBearerData:Lcom/android/inter Lcom/android/internal/telephony/cdma/SmsMessage;->mEnvelope:Lcom/android/internal/telephony/cdma/sms/SmsEnvelope; Lcom/android/internal/telephony/cdma/SmsMessage;->parseSms()V Lcom/android/internal/telephony/cdma/SmsMessage;->privateGetSubmitPdu(Ljava/lang/String;ZLcom/android/internal/telephony/cdma/sms/UserData;)Lcom/android/internal/telephony/cdma/SmsMessage$SubmitPdu; -Lcom/android/internal/telephony/CommandException$Error;->GENERIC_FAILURE:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException$Error;->PASSWORD_INCORRECT:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException$Error;->RADIO_NOT_AVAILABLE:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException$Error;->REQUEST_NOT_SUPPORTED:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException$Error;->SIM_PUK2:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException$Error;->SMS_FAIL_RETRY:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException;-><init>(Lcom/android/internal/telephony/CommandException$Error;)V -Lcom/android/internal/telephony/CommandException;->fromRilErrno(I)Lcom/android/internal/telephony/CommandException; -Lcom/android/internal/telephony/CommandException;->getCommandError()Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandException;->mError:Lcom/android/internal/telephony/CommandException$Error; -Lcom/android/internal/telephony/CommandsInterface;->acceptCall(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->acknowledgeLastIncomingCdmaSms(ZILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->acknowledgeLastIncomingGsmSms(ZILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->changeBarringPassword(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->deleteSmsOnRuim(ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->deleteSmsOnSim(ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->exitEmergencyCallbackMode(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getBasebandVersion(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getCdmaBroadcastConfig(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getCDMASubscription(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getDataCallList(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getIccCardStatus(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getIMEISV(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getIMSI(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getLastDataCallFailCause(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getLastPdpFailCause(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getNetworkSelectionMode(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getOperator(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getPDPContextList(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getPreferredNetworkType(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getSignalStrength(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getSmscAddress(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->getVoiceRegistrationState(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->handleCallSetupRequestFromSim(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->iccIO(IILjava/lang/String;IIILjava/lang/String;Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->iccIOForApp(IILjava/lang/String;IIILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->invokeOemRilRequestRaw([BLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->queryCallForwardStatus(IILjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->queryCallWaiting(ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->queryFacilityLock(Ljava/lang/String;Ljava/lang/String;ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->queryTTYMode(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForAvailable(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForCdmaOtaProvision(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForCellInfoList(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForIccRefresh(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForImsNetworkStateChanged(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForNotAvailable(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForOffOrNotAvailable(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForOn(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForRadioStateChanged(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->registerForRilConnected(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->reportSmsMemoryStatus(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->reportStkServiceIsRunning(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->requestIccSimAuthentication(ILjava/lang/String;Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->requestShutdown(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->sendDtmf(CLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->sendEnvelope(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->sendTerminalResponse(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setCallForward(IIILjava/lang/String;ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setCallWaiting(ZILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setCdmaBroadcastActivation(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setDataAllowed(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setEmergencyCallbackMode(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setFacilityLock(Ljava/lang/String;ZLjava/lang/String;ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setNetworkSelectionModeAutomatic(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setNetworkSelectionModeManual(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnCallRing(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnCatCallSetUp(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnCatCcAlphaNotify(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnCatEvent(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnCatProactiveCmd(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnCatSessionEnd(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnIccRefresh(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnIccSmsFull(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnNewGsmBroadcastSms(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnNITZTime(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnSignalStrengthUpdate(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnSmsOnSim(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnSmsStatus(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setOnSuppServiceNotification(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/CommandsInterface;->setPhoneType(I)V -Lcom/android/internal/telephony/CommandsInterface;->setPreferredNetworkType(ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setRadioPower(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setSmscAddress(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setTTYMode(ILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->setUiccSubscription(IIIILandroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->supplyIccPin(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->switchWaitingOrHoldingAndActive(Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->unregisterForAvailable(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CommandsInterface;->unregisterForCdmaOtaProvision(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CommandsInterface;->unregisterForOffOrNotAvailable(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CommandsInterface;->unregisterForOn(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CommandsInterface;->unregisterForRilConnected(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CommandsInterface;->unregisterForVoiceRadioTechChanged(Landroid/os/Handler;)V -Lcom/android/internal/telephony/CommandsInterface;->writeSmsToRuim(ILjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/CommandsInterface;->writeSmsToSim(ILjava/lang/String;Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/Connection$PostDialState;->CANCELLED:Lcom/android/internal/telephony/Connection$PostDialState; -Lcom/android/internal/telephony/Connection$PostDialState;->COMPLETE:Lcom/android/internal/telephony/Connection$PostDialState; -Lcom/android/internal/telephony/Connection$PostDialState;->NOT_STARTED:Lcom/android/internal/telephony/Connection$PostDialState; -Lcom/android/internal/telephony/Connection$PostDialState;->STARTED:Lcom/android/internal/telephony/Connection$PostDialState; -Lcom/android/internal/telephony/Connection$PostDialState;->WAIT:Lcom/android/internal/telephony/Connection$PostDialState; -Lcom/android/internal/telephony/Connection$PostDialState;->WILD:Lcom/android/internal/telephony/Connection$PostDialState; -Lcom/android/internal/telephony/Connection;-><init>(I)V -Lcom/android/internal/telephony/Connection;->getAddress()Ljava/lang/String; -Lcom/android/internal/telephony/Connection;->getCall()Lcom/android/internal/telephony/Call; -Lcom/android/internal/telephony/Connection;->getConnectTime()J -Lcom/android/internal/telephony/Connection;->getCreateTime()J -Lcom/android/internal/telephony/Connection;->getDisconnectCause()I -Lcom/android/internal/telephony/Connection;->getDisconnectTime()J -Lcom/android/internal/telephony/Connection;->getDurationMillis()J -Lcom/android/internal/telephony/Connection;->getState()Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/Connection;->getUserData()Ljava/lang/Object; -Lcom/android/internal/telephony/Connection;->hangup()V -Lcom/android/internal/telephony/Connection;->isAlive()Z -Lcom/android/internal/telephony/Connection;->isIncoming()Z -Lcom/android/internal/telephony/Connection;->LOG_TAG:Ljava/lang/String; -Lcom/android/internal/telephony/Connection;->mAddress:Ljava/lang/String; -Lcom/android/internal/telephony/Connection;->mCnapName:Ljava/lang/String; -Lcom/android/internal/telephony/Connection;->mCnapNamePresentation:I -Lcom/android/internal/telephony/Connection;->mDialString:Ljava/lang/String; -Lcom/android/internal/telephony/Connection;->mDuration:J -Lcom/android/internal/telephony/Connection;->mIsIncoming:Z -Lcom/android/internal/telephony/Connection;->mNumberPresentation:I -Lcom/android/internal/telephony/Connection;->setVideoState(I)V Lcom/android/internal/telephony/DctConstants$Activity;->DATAIN:Lcom/android/internal/telephony/DctConstants$Activity; Lcom/android/internal/telephony/DctConstants$Activity;->DATAINANDOUT:Lcom/android/internal/telephony/DctConstants$Activity; Lcom/android/internal/telephony/DctConstants$Activity;->DATAOUT:Lcom/android/internal/telephony/DctConstants$Activity; @@ -2220,22 +1844,7 @@ Lcom/android/internal/telephony/DctConstants$State;->FAILED:Lcom/android/interna Lcom/android/internal/telephony/DctConstants$State;->IDLE:Lcom/android/internal/telephony/DctConstants$State; Lcom/android/internal/telephony/DctConstants$State;->RETRYING:Lcom/android/internal/telephony/DctConstants$State; Lcom/android/internal/telephony/DctConstants$State;->values()[Lcom/android/internal/telephony/DctConstants$State; -Lcom/android/internal/telephony/DefaultPhoneNotifier;->mRegistry:Lcom/android/internal/telephony/ITelephonyRegistry; -Lcom/android/internal/telephony/DriverCall$State;->ACTIVE:Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/DriverCall$State;->ALERTING:Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/DriverCall$State;->DIALING:Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/DriverCall$State;->HOLDING:Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/DriverCall$State;->INCOMING:Lcom/android/internal/telephony/DriverCall$State; Lcom/android/internal/telephony/DriverCall$State;->values()[Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/DriverCall$State;->WAITING:Lcom/android/internal/telephony/DriverCall$State; -Lcom/android/internal/telephony/DriverCall;-><init>()V -Lcom/android/internal/telephony/DriverCall;->index:I -Lcom/android/internal/telephony/DriverCall;->isMT:Z -Lcom/android/internal/telephony/DriverCall;->isVoice:Z -Lcom/android/internal/telephony/DriverCall;->name:Ljava/lang/String; -Lcom/android/internal/telephony/DriverCall;->number:Ljava/lang/String; -Lcom/android/internal/telephony/DriverCall;->numberPresentation:I -Lcom/android/internal/telephony/DriverCall;->state:Lcom/android/internal/telephony/DriverCall$State; Lcom/android/internal/telephony/gsm/GsmCellBroadcastHandler$SmsCbConcatInfo;-><init>(Lcom/android/internal/telephony/gsm/SmsCbHeader;Landroid/telephony/SmsCbLocation;)V Lcom/android/internal/telephony/gsm/GsmCellBroadcastHandler$SmsCbConcatInfo;->matchesLocation(Ljava/lang/String;II)Z Lcom/android/internal/telephony/gsm/GsmCellBroadcastHandler;->mSmsCbPageMap:Ljava/util/HashMap; @@ -2314,79 +1923,7 @@ Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->mLock:Ljava/lang/Obje Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->mPhoneBookRecords:Ljava/util/ArrayList; Lcom/android/internal/telephony/gsm/UsimPhoneBookManager;->reset()V Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails;-><init>()V -Lcom/android/internal/telephony/GsmCdmaCall;->attachFake(Lcom/android/internal/telephony/Connection;Lcom/android/internal/telephony/Call$State;)V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->clearDisconnected()V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->disableDataCallInEmergencyCall(Ljava/lang/String;)V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->fakeHoldForegroundBeforeDial()V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->getPhone()Lcom/android/internal/telephony/GsmCdmaPhone; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->handleEcmTimer(I)V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->isPhoneTypeGsm()Z -Lcom/android/internal/telephony/GsmCdmaCallTracker;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->mBackgroundCall:Lcom/android/internal/telephony/GsmCdmaCall; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->mForegroundCall:Lcom/android/internal/telephony/GsmCdmaCall; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->mPendingMO:Lcom/android/internal/telephony/GsmCdmaConnection; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->mPhone:Lcom/android/internal/telephony/GsmCdmaPhone; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->mRingingCall:Lcom/android/internal/telephony/GsmCdmaCall; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->mState:Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->obtainCompleteMessage()Landroid/os/Message; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->obtainCompleteMessage(I)Landroid/os/Message; -Lcom/android/internal/telephony/GsmCdmaCallTracker;->setMute(Z)V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->switchWaitingOrHoldingAndActive()V -Lcom/android/internal/telephony/GsmCdmaCallTracker;->updatePhoneState()V Lcom/android/internal/telephony/GsmCdmaConnection$MyHandler;-><init>(Lcom/android/internal/telephony/GsmCdmaConnection;Landroid/os/Looper;)V -Lcom/android/internal/telephony/GsmCdmaConnection;->acquireWakeLock()V -Lcom/android/internal/telephony/GsmCdmaConnection;->createWakeLock(Landroid/content/Context;)V -Lcom/android/internal/telephony/GsmCdmaConnection;->disconnectCauseFromCode(I)I -Lcom/android/internal/telephony/GsmCdmaConnection;->fetchDtmfToneDelay(Lcom/android/internal/telephony/GsmCdmaPhone;)V -Lcom/android/internal/telephony/GsmCdmaConnection;->findNextPCharOrNonPOrNonWCharIndex(Ljava/lang/String;I)I -Lcom/android/internal/telephony/GsmCdmaConnection;->findPOrWCharToAppend(Ljava/lang/String;II)C -Lcom/android/internal/telephony/GsmCdmaConnection;->formatDialString(Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/GsmCdmaConnection;->getState()Lcom/android/internal/telephony/Call$State; -Lcom/android/internal/telephony/GsmCdmaConnection;->isPause(C)Z -Lcom/android/internal/telephony/GsmCdmaConnection;->isPhoneTypeGsm()Z -Lcom/android/internal/telephony/GsmCdmaConnection;->isWait(C)Z -Lcom/android/internal/telephony/GsmCdmaConnection;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/GsmCdmaConnection;->maskDialString(Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/GsmCdmaConnection;->mIndex:I -Lcom/android/internal/telephony/GsmCdmaConnection;->mOwner:Lcom/android/internal/telephony/GsmCdmaCallTracker; -Lcom/android/internal/telephony/GsmCdmaConnection;->onConnectedInOrOut()V -Lcom/android/internal/telephony/GsmCdmaConnection;->updateParent(Lcom/android/internal/telephony/GsmCdmaCall;Lcom/android/internal/telephony/GsmCdmaCall;)V -Lcom/android/internal/telephony/GsmCdmaPhone$Cfu;-><init>(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/GsmCdmaPhone;->exitEmergencyCallbackMode()V -Lcom/android/internal/telephony/GsmCdmaPhone;->getCallTracker()Lcom/android/internal/telephony/CallTracker; -Lcom/android/internal/telephony/GsmCdmaPhone;->getCdmaEriText()Ljava/lang/String; -Lcom/android/internal/telephony/GsmCdmaPhone;->getEsn()Ljava/lang/String; -Lcom/android/internal/telephony/GsmCdmaPhone;->getLine1Number()Ljava/lang/String; -Lcom/android/internal/telephony/GsmCdmaPhone;->getPhoneType()I -Lcom/android/internal/telephony/GsmCdmaPhone;->getServiceState()Landroid/telephony/ServiceState; -Lcom/android/internal/telephony/GsmCdmaPhone;->getState()Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/GsmCdmaPhone;->getSystemProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/GsmCdmaPhone;->handleInCallMmiCommands(Ljava/lang/String;)Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isCfEnable(I)Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isEriFileLoaded()Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isInCall()Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isManualSelProhibitedInGlobalMode()Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isPhoneTypeGsm()Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isValidCommandInterfaceCFAction(I)Z -Lcom/android/internal/telephony/GsmCdmaPhone;->isValidCommandInterfaceCFReason(I)Z -Lcom/android/internal/telephony/GsmCdmaPhone;->logd(Ljava/lang/String;)V -Lcom/android/internal/telephony/GsmCdmaPhone;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/GsmCdmaPhone;->mCT:Lcom/android/internal/telephony/GsmCdmaCallTracker; -Lcom/android/internal/telephony/GsmCdmaPhone;->mEcmExitRespRegistrant:Landroid/os/Registrant; -Lcom/android/internal/telephony/GsmCdmaPhone;->mEriManager:Lcom/android/internal/telephony/cdma/EriManager; -Lcom/android/internal/telephony/GsmCdmaPhone;->mIccSmsInterfaceManager:Lcom/android/internal/telephony/IccSmsInterfaceManager; -Lcom/android/internal/telephony/GsmCdmaPhone;->mIsimUiccRecords:Lcom/android/internal/telephony/uicc/IsimUiccRecords; -Lcom/android/internal/telephony/GsmCdmaPhone;->mPendingMMIs:Ljava/util/ArrayList; -Lcom/android/internal/telephony/GsmCdmaPhone;->mSST:Lcom/android/internal/telephony/ServiceStateTracker; -Lcom/android/internal/telephony/GsmCdmaPhone;->notifyPreciseCallStateChanged()V -Lcom/android/internal/telephony/GsmCdmaPhone;->notifyServiceStateChanged(Landroid/telephony/ServiceState;)V -Lcom/android/internal/telephony/GsmCdmaPhone;->setOnEcbModeExitResponse(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/GsmCdmaPhone;->syncClirSetting()V -Lcom/android/internal/telephony/IccCard;->getState()Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccCard;->registerForNetworkLocked(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/IccCard;->supplyNetworkDepersonalization(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/IccCard;->supplyPin(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/IccCard;->supplyPuk(Ljava/lang/String;Ljava/lang/String;Landroid/os/Message;)V Lcom/android/internal/telephony/IccCardConstants$State;->ABSENT:Lcom/android/internal/telephony/IccCardConstants$State; Lcom/android/internal/telephony/IccCardConstants$State;->CARD_IO_ERROR:Lcom/android/internal/telephony/IccCardConstants$State; Lcom/android/internal/telephony/IccCardConstants$State;->NETWORK_LOCKED:Lcom/android/internal/telephony/IccCardConstants$State; @@ -2397,47 +1934,7 @@ Lcom/android/internal/telephony/IccCardConstants$State;->PUK_REQUIRED:Lcom/andro Lcom/android/internal/telephony/IccCardConstants$State;->READY:Lcom/android/internal/telephony/IccCardConstants$State; Lcom/android/internal/telephony/IccCardConstants$State;->UNKNOWN:Lcom/android/internal/telephony/IccCardConstants$State; Lcom/android/internal/telephony/IccCardConstants$State;->values()[Lcom/android/internal/telephony/IccCardConstants$State; -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->checkThread()V -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->DBG:Z -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->logd(Ljava/lang/String;)V -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->mAdnCache:Lcom/android/internal/telephony/uicc/AdnRecordCache; -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->mBaseHandler:Landroid/os/Handler; -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->mPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/IccPhoneBookInterfaceManager;->updateEfForIccType(I)I Lcom/android/internal/telephony/IccProvider;-><init>()V -Lcom/android/internal/telephony/IccProvider;->ADDRESS_BOOK_COLUMN_NAMES:[Ljava/lang/String; -Lcom/android/internal/telephony/IccProvider;->DBG:Z -Lcom/android/internal/telephony/IccProvider;->loadRecord(Lcom/android/internal/telephony/uicc/AdnRecord;Landroid/database/MatrixCursor;I)V -Lcom/android/internal/telephony/IccProvider;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->copyMessageToIccEf(Ljava/lang/String;I[B[B)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->disableCdmaBroadcastRange(II)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->disableGsmBroadcastRange(II)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->enableCdmaBroadcastRange(II)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->enableGsmBroadcastRange(II)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->enforceReceiveAndSend(Ljava/lang/String;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->filterDestAddress(Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->getAllMessagesFromIccEf(Ljava/lang/String;)Ljava/util/List; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->getImsSmsFormat()Ljava/lang/String; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->getPremiumSmsPermission(Ljava/lang/String;)I -Lcom/android/internal/telephony/IccSmsInterfaceManager;->injectSmsPdu([BLjava/lang/String;Landroid/app/PendingIntent;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->isImsSmsSupported()Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mAppOps:Landroid/app/AppOpsManager; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mCellBroadcastRangeManager:Lcom/android/internal/telephony/IccSmsInterfaceManager$CellBroadcastRangeManager; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mHandler:Landroid/os/Handler; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mSms:Ljava/util/List; -Lcom/android/internal/telephony/IccSmsInterfaceManager;->mSuccess:Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->sendData(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I[BLandroid/app/PendingIntent;Landroid/app/PendingIntent;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->sendStoredMultipartText(Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Ljava/util/List;Ljava/util/List;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->sendStoredText(Ljava/lang/String;Landroid/net/Uri;Ljava/lang/String;Landroid/app/PendingIntent;Landroid/app/PendingIntent;)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->setCdmaBroadcastConfig([Lcom/android/internal/telephony/cdma/CdmaSmsBroadcastConfigInfo;)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->setCellBroadcastConfig([Lcom/android/internal/telephony/gsm/SmsBroadcastConfigInfo;)Z -Lcom/android/internal/telephony/IccSmsInterfaceManager;->setPremiumSmsPermission(Ljava/lang/String;I)V -Lcom/android/internal/telephony/IccSmsInterfaceManager;->updateMessageOnIccEf(Ljava/lang/String;II[B)Z Lcom/android/internal/telephony/IIccPhoneBook$Stub$Proxy;->mRemote:Landroid/os/IBinder; Lcom/android/internal/telephony/IIccPhoneBook$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IIccPhoneBook; Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsInEf(I)Ljava/util/List; @@ -2446,142 +1943,24 @@ Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsSize(I)[I Lcom/android/internal/telephony/IIccPhoneBook;->getAdnRecordsSizeForSubscriber(II)[I Lcom/android/internal/telephony/IIccPhoneBook;->updateAdnRecordsInEfBySearch(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z Lcom/android/internal/telephony/IMms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IMms; -Lcom/android/internal/telephony/imsphone/ImsExternalCall;-><init>(Lcom/android/internal/telephony/Phone;Lcom/android/internal/telephony/imsphone/ImsExternalConnection;)V Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker$ExternalCallStateListener;-><init>(Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker;)V Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker$ExternalConnectionListener;-><init>(Lcom/android/internal/telephony/imsphone/ImsExternalCallTracker;)V -Lcom/android/internal/telephony/imsphone/ImsExternalConnection;->rebuildCapabilities()V -Lcom/android/internal/telephony/imsphone/ImsExternalConnection;->setActive()V -Lcom/android/internal/telephony/imsphone/ImsPhone$Cf;-><init>(Ljava/lang/String;ZLandroid/os/Message;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->getActionFromCFAction(I)I -Lcom/android/internal/telephony/imsphone/ImsPhone;->getBackgroundCall()Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhone;->getCallForwardingOption(ILandroid/os/Message;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->getCallWaiting(Landroid/os/Message;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->getConditionFromCFReason(I)I -Lcom/android/internal/telephony/imsphone/ImsPhone;->getForegroundCall()Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhone;->getRingingCall()Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhone;->getServiceState()Landroid/telephony/ServiceState; -Lcom/android/internal/telephony/imsphone/ImsPhone;->getState()Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/imsphone/ImsPhone;->handleEnterEmergencyCallbackMode()V -Lcom/android/internal/telephony/imsphone/ImsPhone;->handleExitEmergencyCallbackMode()V -Lcom/android/internal/telephony/imsphone/ImsPhone;->handleInCallMmiCommands(Ljava/lang/String;)Z -Lcom/android/internal/telephony/imsphone/ImsPhone;->isCfEnable(I)Z -Lcom/android/internal/telephony/imsphone/ImsPhone;->isUtEnabled()Z -Lcom/android/internal/telephony/imsphone/ImsPhone;->isValidCommandInterfaceCFAction(I)Z -Lcom/android/internal/telephony/imsphone/ImsPhone;->isValidCommandInterfaceCFReason(I)Z -Lcom/android/internal/telephony/imsphone/ImsPhone;->isVolteEnabled()Z -Lcom/android/internal/telephony/imsphone/ImsPhone;->mCT:Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker; -Lcom/android/internal/telephony/imsphone/ImsPhone;->mPendingMMIs:Ljava/util/ArrayList; -Lcom/android/internal/telephony/imsphone/ImsPhone;->mSS:Landroid/telephony/ServiceState; Lcom/android/internal/telephony/imsphone/ImsPhone;->notifyCallForwardingIndicator()V Lcom/android/internal/telephony/imsphone/ImsPhone;->notifyPreciseCallStateChanged()V -Lcom/android/internal/telephony/imsphone/ImsPhone;->notifyUnknownConnection(Lcom/android/internal/telephony/Connection;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->onMMIDone(Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->sendErrorResponse(Landroid/os/Message;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->sendErrorResponse(Landroid/os/Message;Ljava/lang/Throwable;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->setCallForwardingOption(IILjava/lang/String;IILandroid/os/Message;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->setCallWaiting(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->setImsRegistered(Z)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->setOnEcbModeExitResponse(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/imsphone/ImsPhone;->setServiceState(I)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->attach(Lcom/android/internal/telephony/Connection;Lcom/android/internal/telephony/Call$State;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->attachFake(Lcom/android/internal/telephony/Connection;Lcom/android/internal/telephony/Call$State;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->getConnections()Ljava/util/List; Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->getImsCall()Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->hangup()V -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->merge(Lcom/android/internal/telephony/imsphone/ImsPhoneCall;Lcom/android/internal/telephony/Call$State;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCall;->onHangupLocal()V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->addConnection(Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->clearDisconnected()V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->dial(Ljava/lang/String;ILandroid/os/Bundle;)Lcom/android/internal/telephony/Connection; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->dialPendingMO()V Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->findConnection(Lcom/android/ims/ImsCall;)Lcom/android/internal/telephony/imsphone/ImsPhoneConnection; Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->getEcbmInterface()Lcom/android/ims/ImsEcbm; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->getUtInterface()Lcom/android/ims/ImsUtInterface; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->handleEcmTimer(I)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mAllowEmergencyVideoCalls:Z -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mBackgroundCall:Lcom/android/internal/telephony/imsphone/ImsPhoneCall; Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mCallExpectedToResume:Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mConnections:Ljava/util/ArrayList; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mForegroundCall:Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mHandoverCall:Lcom/android/internal/telephony/imsphone/ImsPhoneCall; Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mImsCallListener:Lcom/android/ims/ImsCall$Listener; Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mImsManager:Lcom/android/ims/ImsManager; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mOnHoldToneId:I -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mOnHoldToneStarted:Z -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mPendingMO:Lcom/android/internal/telephony/imsphone/ImsPhoneConnection; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mPendingUssd:Landroid/os/Message; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mPhone:Lcom/android/internal/telephony/imsphone/ImsPhone; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mRingingCall:Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mSwitchingFgAndBgCalls:Z -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mSyncHold:Ljava/lang/Object; Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->mUssdSession:Lcom/android/ims/ImsCall; Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->processCallStateChange(Lcom/android/ims/ImsCall;Lcom/android/internal/telephony/Call$State;I)V Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->processCallStateChange(Lcom/android/ims/ImsCall;Lcom/android/internal/telephony/Call$State;IZ)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->removeConnection(Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;)V Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->setVideoCallProvider(Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;Lcom/android/ims/ImsCall;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->switchAfterConferenceSuccess()V -Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker;->updatePhoneState()V Lcom/android/internal/telephony/imsphone/ImsPhoneConnection$MyHandler;-><init>(Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;Landroid/os/Looper;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->acquireWakeLock()V -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->createWakeLock(Landroid/content/Context;)V -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->getCall()Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->getOwner()Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker; -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->isMultiparty()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->mDisconnected:Z Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->mImsCall:Lcom/android/ims/ImsCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->mOwner:Lcom/android/internal/telephony/imsphone/ImsPhoneCallTracker; -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->mParent:Lcom/android/internal/telephony/imsphone/ImsPhoneCall; -Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->onDisconnect()Z Lcom/android/internal/telephony/imsphone/ImsPhoneConnection;->update(Lcom/android/ims/ImsCall;Lcom/android/internal/telephony/Call$State;)Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->getCLIRMode()I -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->getDialingNumber()Ljava/lang/String; -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->getErrorMessage(Landroid/os/AsyncResult;)Ljava/lang/CharSequence; -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->getScString()Ljava/lang/CharSequence; -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isActivate()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isDeactivate()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isEmptyOrNull(Ljava/lang/CharSequence;)Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isErasure()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isRegister()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isSupportedOverImsPhone()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->isTemporaryModeCLIR()Z -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->mPhone:Lcom/android/internal/telephony/imsphone/ImsPhone; -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->newFromDialString(Ljava/lang/String;Lcom/android/internal/telephony/imsphone/ImsPhone;)Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode; -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->processCode()V -Lcom/android/internal/telephony/imsphone/ImsPhoneMmiCode;->serviceClassToCFString(I)Ljava/lang/CharSequence; Lcom/android/internal/telephony/InboundSmsHandler$SmsBroadcastReceiver;-><init>(Lcom/android/internal/telephony/InboundSmsHandler;Lcom/android/internal/telephony/InboundSmsTracker;)V -Lcom/android/internal/telephony/InboundSmsHandler$SmsBroadcastReceiver;->mDeleteWhere:Ljava/lang/String; -Lcom/android/internal/telephony/InboundSmsHandler$SmsBroadcastReceiver;->mDeleteWhereArgs:[Ljava/lang/String; -Lcom/android/internal/telephony/InboundSmsHandler;->acknowledgeLastIncomingSms(ZILandroid/os/Message;)V -Lcom/android/internal/telephony/InboundSmsHandler;->deleteFromRawTable(Ljava/lang/String;[Ljava/lang/String;I)V -Lcom/android/internal/telephony/InboundSmsHandler;->dispatchIntent(Landroid/content/Intent;Ljava/lang/String;ILandroid/os/Bundle;Landroid/content/BroadcastReceiver;Landroid/os/UserHandle;)V -Lcom/android/internal/telephony/InboundSmsHandler;->dispatchNormalMessage(Lcom/android/internal/telephony/SmsMessageBase;)I -Lcom/android/internal/telephony/InboundSmsHandler;->getPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/InboundSmsHandler;->handleInjectSms(Landroid/os/AsyncResult;)V -Lcom/android/internal/telephony/InboundSmsHandler;->handleNewSms(Landroid/os/AsyncResult;)V -Lcom/android/internal/telephony/InboundSmsHandler;->handleSmsWhitelisting(Landroid/content/ComponentName;)Landroid/os/Bundle; -Lcom/android/internal/telephony/InboundSmsHandler;->isSkipNotifyFlagSet(I)Z -Lcom/android/internal/telephony/InboundSmsHandler;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/InboundSmsHandler;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/InboundSmsHandler;->mCellBroadcastHandler:Lcom/android/internal/telephony/CellBroadcastHandler; -Lcom/android/internal/telephony/InboundSmsHandler;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/InboundSmsHandler;->mDeliveringState:Lcom/android/internal/telephony/InboundSmsHandler$DeliveringState; -Lcom/android/internal/telephony/InboundSmsHandler;->mDeviceIdleController:Landroid/os/IDeviceIdleController; -Lcom/android/internal/telephony/InboundSmsHandler;->mIdleState:Lcom/android/internal/telephony/InboundSmsHandler$IdleState; -Lcom/android/internal/telephony/InboundSmsHandler;->mPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/InboundSmsHandler;->mResolver:Landroid/content/ContentResolver; -Lcom/android/internal/telephony/InboundSmsHandler;->mUserManager:Landroid/os/UserManager; -Lcom/android/internal/telephony/InboundSmsHandler;->mWaitingState:Lcom/android/internal/telephony/InboundSmsHandler$WaitingState; -Lcom/android/internal/telephony/InboundSmsHandler;->mWakeLock:Landroid/os/PowerManager$WakeLock; -Lcom/android/internal/telephony/InboundSmsHandler;->mWapPush:Lcom/android/internal/telephony/WapPushOverSms; -Lcom/android/internal/telephony/InboundSmsHandler;->processMessagePart(Lcom/android/internal/telephony/InboundSmsTracker;)Z -Lcom/android/internal/telephony/InboundSmsHandler;->showNewMessageNotification()V -Lcom/android/internal/telephony/InboundSmsHandler;->writeInboxMessage(Landroid/content/Intent;)Landroid/net/Uri; -Lcom/android/internal/telephony/InboundSmsTracker;->getFormat()Ljava/lang/String; -Lcom/android/internal/telephony/InboundSmsTracker;->getIndexOffset()I -Lcom/android/internal/telephony/IntRangeManager;->mRanges:Ljava/util/ArrayList; Lcom/android/internal/telephony/IPhoneStateListener$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IPhoneStateListener; Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/IPhoneSubInfo$Stub$Proxy;->getDeviceId(Ljava/lang/String;)Ljava/lang/String; @@ -2603,91 +1982,6 @@ Lcom/android/internal/telephony/ITelephony$Stub;->TRANSACTION_getDeviceId:I Lcom/android/internal/telephony/ITelephonyRegistry$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/telephony/ITelephonyRegistry$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ITelephonyRegistry; Lcom/android/internal/telephony/IWapPushManager$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/IWapPushManager; -Lcom/android/internal/telephony/MccTable$MccEntry;->mIso:Ljava/lang/String; -Lcom/android/internal/telephony/MccTable;->countryCodeForMcc(I)Ljava/lang/String; -Lcom/android/internal/telephony/MccTable;->defaultLanguageForMcc(I)Ljava/lang/String; -Lcom/android/internal/telephony/MccTable;->defaultTimeZoneForMcc(I)Ljava/lang/String; -Lcom/android/internal/telephony/MccTable;->entryForMcc(I)Lcom/android/internal/telephony/MccTable$MccEntry; -Lcom/android/internal/telephony/MccTable;->getLocaleForLanguageCountry(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Ljava/util/Locale; -Lcom/android/internal/telephony/MccTable;->smallestDigitsMccForMnc(I)I -Lcom/android/internal/telephony/MmiCode$State;->CANCELLED:Lcom/android/internal/telephony/MmiCode$State; -Lcom/android/internal/telephony/MmiCode$State;->COMPLETE:Lcom/android/internal/telephony/MmiCode$State; -Lcom/android/internal/telephony/MmiCode$State;->FAILED:Lcom/android/internal/telephony/MmiCode$State; -Lcom/android/internal/telephony/MmiCode$State;->PENDING:Lcom/android/internal/telephony/MmiCode$State; -Lcom/android/internal/telephony/MmiCode;->getPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/Phone;->dispose()V -Lcom/android/internal/telephony/Phone;->exitEmergencyCallbackMode()V -Lcom/android/internal/telephony/Phone;->getActiveApnTypes()[Ljava/lang/String; -Lcom/android/internal/telephony/Phone;->getCallTracker()Lcom/android/internal/telephony/CallTracker; -Lcom/android/internal/telephony/Phone;->getCellLocation()Landroid/telephony/CellLocation; -Lcom/android/internal/telephony/Phone;->getContext()Landroid/content/Context; -Lcom/android/internal/telephony/Phone;->getDataConnectionState()Lcom/android/internal/telephony/PhoneConstants$DataState; -Lcom/android/internal/telephony/Phone;->getIccCard()Lcom/android/internal/telephony/IccCard; -Lcom/android/internal/telephony/Phone;->getIccFileHandler()Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/Phone;->getIccSerialNumber()Ljava/lang/String; -Lcom/android/internal/telephony/Phone;->getIccSmsInterfaceManager()Lcom/android/internal/telephony/IccSmsInterfaceManager; -Lcom/android/internal/telephony/Phone;->getImsPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/Phone;->getIsimRecords()Lcom/android/internal/telephony/uicc/IsimRecords; -Lcom/android/internal/telephony/Phone;->getMsisdn()Ljava/lang/String; -Lcom/android/internal/telephony/Phone;->getNai()Ljava/lang/String; -Lcom/android/internal/telephony/Phone;->getPhoneId()I -Lcom/android/internal/telephony/Phone;->getPhoneName()Ljava/lang/String; -Lcom/android/internal/telephony/Phone;->getPhoneType()I -Lcom/android/internal/telephony/Phone;->getServiceStateTracker()Lcom/android/internal/telephony/ServiceStateTracker; -Lcom/android/internal/telephony/Phone;->getSmscAddress(Landroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->getState()Lcom/android/internal/telephony/PhoneConstants$State; -Lcom/android/internal/telephony/Phone;->getSubId()I -Lcom/android/internal/telephony/Phone;->getSystemProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/Phone;->getUiccCard()Lcom/android/internal/telephony/uicc/UiccCard; -Lcom/android/internal/telephony/Phone;->getVideoState(Lcom/android/internal/telephony/Call;)I -Lcom/android/internal/telephony/Phone;->invokeOemRilRequestRaw([BLandroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->invokeOemRilRequestStrings([Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->isCspPlmnEnabled()Z -Lcom/android/internal/telephony/Phone;->isUtEnabled()Z -Lcom/android/internal/telephony/Phone;->isVideoEnabled()Z -Lcom/android/internal/telephony/Phone;->isVolteEnabled()Z -Lcom/android/internal/telephony/Phone;->isWifiCallingEnabled()Z -Lcom/android/internal/telephony/Phone;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/Phone;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/Phone;->mIccRecords:Ljava/util/concurrent/atomic/AtomicReference; -Lcom/android/internal/telephony/Phone;->mImsPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/Phone;->mMmiRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/Phone;->mNotifier:Lcom/android/internal/telephony/PhoneNotifier; -Lcom/android/internal/telephony/Phone;->mPhoneId:I -Lcom/android/internal/telephony/Phone;->mSmsStorageMonitor:Lcom/android/internal/telephony/SmsStorageMonitor; -Lcom/android/internal/telephony/Phone;->mUiccApplication:Ljava/util/concurrent/atomic/AtomicReference; -Lcom/android/internal/telephony/Phone;->mUiccController:Lcom/android/internal/telephony/uicc/UiccController; -Lcom/android/internal/telephony/Phone;->needsOtaServiceProvisioning()Z -Lcom/android/internal/telephony/Phone;->notifyOtaspChanged(I)V -Lcom/android/internal/telephony/Phone;->registerForDisconnect(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForEcmTimerReset(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForIncomingRing(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForMmiComplete(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForMmiInitiate(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForNewRingingConnection(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForPreciseCallStateChanged(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForRingbackTone(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForServiceStateChanged(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForSimRecordsLoaded(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->registerForUnknownConnection(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->selectNetworkManually(Lcom/android/internal/telephony/OperatorInfo;ZLandroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->setNetworkSelectionModeAutomatic(Landroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->setOnEcbModeExitResponse(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->setOnPostDialCharacter(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/Phone;->setPreferredNetworkType(ILandroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->setSmscAddress(Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/Phone;->unregisterForDisconnect(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForEcmTimerReset(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForIncomingRing(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForMmiComplete(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForMmiInitiate(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForNewRingingConnection(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForPreciseCallStateChanged(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForRingbackTone(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForServiceStateChanged(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForSimRecordsLoaded(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unregisterForUnknownConnection(Landroid/os/Handler;)V -Lcom/android/internal/telephony/Phone;->unsetOnEcbModeExitResponse(Landroid/os/Handler;)V Lcom/android/internal/telephony/PhoneConstants$DataState;->CONNECTED:Lcom/android/internal/telephony/PhoneConstants$DataState; Lcom/android/internal/telephony/PhoneConstants$DataState;->CONNECTING:Lcom/android/internal/telephony/PhoneConstants$DataState; Lcom/android/internal/telephony/PhoneConstants$DataState;->DISCONNECTED:Lcom/android/internal/telephony/PhoneConstants$DataState; @@ -2701,152 +1995,7 @@ Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_ALLOWED:I Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_PAYPHONE:I Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_RESTRICTED:I Lcom/android/internal/telephony/PhoneConstants;->PRESENTATION_UNKNOWN:I -Lcom/android/internal/telephony/PhoneFactory;->calculatePreferredNetworkType(Landroid/content/Context;I)I -Lcom/android/internal/telephony/PhoneFactory;->getDefaultPhone()Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/PhoneFactory;->getDefaultSubscription()I -Lcom/android/internal/telephony/PhoneFactory;->getPhone(I)Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/PhoneFactory;->getPhones()[Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/PhoneFactory;->makeDefaultPhone(Landroid/content/Context;)V -Lcom/android/internal/telephony/PhoneFactory;->sCommandsInterface:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/PhoneFactory;->sContext:Landroid/content/Context; -Lcom/android/internal/telephony/PhoneFactory;->sMadeDefaults:Z -Lcom/android/internal/telephony/PhoneFactory;->sPhoneNotifier:Lcom/android/internal/telephony/PhoneNotifier; -Lcom/android/internal/telephony/PhoneInternalInterface$DataActivityState;->NONE:Lcom/android/internal/telephony/PhoneInternalInterface$DataActivityState; -Lcom/android/internal/telephony/PhoneInternalInterface;->PREFERRED_NT_MODE:I -Lcom/android/internal/telephony/PhoneNotifier;->notifyMessageWaitingChanged(Lcom/android/internal/telephony/Phone;)V -Lcom/android/internal/telephony/PhoneNotifier;->notifySignalStrength(Lcom/android/internal/telephony/Phone;)V -Lcom/android/internal/telephony/PhoneStateIntentReceiver;-><init>(Landroid/content/Context;Landroid/os/Handler;)V -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->getSignalStrengthDbm()I -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->mSignalStrength:Landroid/telephony/SignalStrength; -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->mWants:I -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->notifyServiceState(I)V -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->notifySignalStrength(I)V -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->registerIntent()V -Lcom/android/internal/telephony/PhoneStateIntentReceiver;->unregisterIntent()V -Lcom/android/internal/telephony/PhoneSubInfoController;->getDefaultSubscription()I -Lcom/android/internal/telephony/PhoneSubInfoController;->getPhone(I)Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/PhoneSubInfoController;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/PhoneSubInfoController;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/PhoneSubInfoController;->mPhone:[Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/PhoneSwitcher;->activate(I)V -Lcom/android/internal/telephony/PhoneSwitcher;->deactivate(I)V -Lcom/android/internal/telephony/PhoneSwitcher;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/PhoneSwitcher;->mMaxActivePhones:I -Lcom/android/internal/telephony/PhoneSwitcher;->mNumPhones:I -Lcom/android/internal/telephony/PhoneSwitcher;->mPhones:[Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/ProxyController;->completeRadioCapabilityTransaction()V -Lcom/android/internal/telephony/ProxyController;->getInstance()Lcom/android/internal/telephony/ProxyController; -Lcom/android/internal/telephony/ProxyController;->logd(Ljava/lang/String;)V -Lcom/android/internal/telephony/ProxyController;->mOldRadioAccessFamily:[I -Lcom/android/internal/telephony/ProxyController;->mRadioCapabilitySessionId:I -Lcom/android/internal/telephony/ProxyController;->mSetRadioAccessFamilyStatus:[I -Lcom/android/internal/telephony/ProxyController;->mUniqueIdGenerator:Ljava/util/concurrent/atomic/AtomicInteger; -Lcom/android/internal/telephony/ProxyController;->sendRadioCapabilityRequest(IIIILjava/lang/String;II)V -Lcom/android/internal/telephony/ProxyController;->sProxyController:Lcom/android/internal/telephony/ProxyController; -Lcom/android/internal/telephony/RadioCapability;->getRadioAccessFamily()I -Lcom/android/internal/telephony/RetryManager;->configure(Ljava/lang/String;)Z -Lcom/android/internal/telephony/RetryManager;->getRetryTimer()I -Lcom/android/internal/telephony/RetryManager;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/RetryManager;->mApnType:Ljava/lang/String; -Lcom/android/internal/telephony/RetryManager;->mFailFastInterApnDelay:J -Lcom/android/internal/telephony/RetryManager;->mInterApnDelay:J -Lcom/android/internal/telephony/RetryManager;->mPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/RIL;-><init>(Landroid/content/Context;II)V -Lcom/android/internal/telephony/RIL;-><init>(Landroid/content/Context;IILjava/lang/Integer;)V -Lcom/android/internal/telephony/RIL;->acquireWakeLock(Lcom/android/internal/telephony/RILRequest;I)V -Lcom/android/internal/telephony/RIL;->clearRequestList(IZ)V -Lcom/android/internal/telephony/RIL;->clearWakeLock(I)Z -Lcom/android/internal/telephony/RIL;->decrementWakeLock(Lcom/android/internal/telephony/RILRequest;)V -Lcom/android/internal/telephony/RIL;->findAndRemoveRequestFromList(I)Lcom/android/internal/telephony/RILRequest; -Lcom/android/internal/telephony/RIL;->getResponseForTimedOutRILRequest(Lcom/android/internal/telephony/RILRequest;)Ljava/lang/Object; -Lcom/android/internal/telephony/RIL;->hangupForegroundResumeBackground(Landroid/os/Message;)V -Lcom/android/internal/telephony/RIL;->hangupWaitingOrBackground(Landroid/os/Message;)V -Lcom/android/internal/telephony/RIL;->invokeOemRilRequestRaw([BLandroid/os/Message;)V -Lcom/android/internal/telephony/RIL;->makeStaticRadioCapability()Lcom/android/internal/telephony/RadioCapability; -Lcom/android/internal/telephony/RIL;->mRequestList:Landroid/util/SparseArray; -Lcom/android/internal/telephony/RIL;->mTestingEmergencyCall:Ljava/util/concurrent/atomic/AtomicBoolean; -Lcom/android/internal/telephony/RIL;->mWakeLock:Landroid/os/PowerManager$WakeLock; -Lcom/android/internal/telephony/RIL;->notifyRegistrantsCdmaInfoRec(Lcom/android/internal/telephony/cdma/CdmaInformationRecords;)V -Lcom/android/internal/telephony/RIL;->notifyRegistrantsRilConnectionChanged(I)V -Lcom/android/internal/telephony/RIL;->requestToString(I)Ljava/lang/String; -Lcom/android/internal/telephony/RIL;->responseToString(I)Ljava/lang/String; -Lcom/android/internal/telephony/RIL;->retToString(ILjava/lang/Object;)Ljava/lang/String; -Lcom/android/internal/telephony/RIL;->riljLog(Ljava/lang/String;)V -Lcom/android/internal/telephony/RIL;->setRadioPower(ZLandroid/os/Message;)V -Lcom/android/internal/telephony/RIL;->unsljLog(I)V -Lcom/android/internal/telephony/RIL;->unsljLogMore(ILjava/lang/String;)V -Lcom/android/internal/telephony/RIL;->unsljLogRet(ILjava/lang/Object;)V -Lcom/android/internal/telephony/RIL;->unsljLogvRet(ILjava/lang/Object;)V Lcom/android/internal/telephony/RILConstants;->PREFERRED_NETWORK_MODE:I -Lcom/android/internal/telephony/RILRequest;->mRequest:I -Lcom/android/internal/telephony/RILRequest;->mResult:Landroid/os/Message; -Lcom/android/internal/telephony/RILRequest;->mSerial:I -Lcom/android/internal/telephony/RILRequest;->obtain(ILandroid/os/Message;)Lcom/android/internal/telephony/RILRequest; -Lcom/android/internal/telephony/RILRequest;->onError(ILjava/lang/Object;)V -Lcom/android/internal/telephony/RILRequest;->release()V -Lcom/android/internal/telephony/RILRequest;->serialString()Ljava/lang/String; -Lcom/android/internal/telephony/ServiceStateTracker;->fixUnknownMcc(Ljava/lang/String;I)Ljava/lang/String; -Lcom/android/internal/telephony/ServiceStateTracker;->getCurrentDataConnectionState()I -Lcom/android/internal/telephony/ServiceStateTracker;->getDesiredPowerState()Z -Lcom/android/internal/telephony/ServiceStateTracker;->getPhoneId()I -Lcom/android/internal/telephony/ServiceStateTracker;->getSystemProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/ServiceStateTracker;->isConcurrentVoiceAndDataAllowed()Z -Lcom/android/internal/telephony/ServiceStateTracker;->isGprsConsistent(II)Z -Lcom/android/internal/telephony/ServiceStateTracker;->isImsRegistered()Z -Lcom/android/internal/telephony/ServiceStateTracker;->isInHomeSidNid(II)Z -Lcom/android/internal/telephony/ServiceStateTracker;->isInvalidOperatorNumeric(Ljava/lang/String;)Z -Lcom/android/internal/telephony/ServiceStateTracker;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/ServiceStateTracker;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/ServiceStateTracker;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/ServiceStateTracker;->mCr:Landroid/content/ContentResolver; -Lcom/android/internal/telephony/ServiceStateTracker;->mCurDataSpn:Ljava/lang/String; -Lcom/android/internal/telephony/ServiceStateTracker;->mCurPlmn:Ljava/lang/String; -Lcom/android/internal/telephony/ServiceStateTracker;->mCurShowPlmn:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mCurShowSpn:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mCurSpn:Ljava/lang/String; -Lcom/android/internal/telephony/ServiceStateTracker;->mDataRoamingOffRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/ServiceStateTracker;->mDataRoamingOnRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/ServiceStateTracker;->mDefaultRoamingIndicator:I -Lcom/android/internal/telephony/ServiceStateTracker;->mDesiredPowerState:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mDeviceShuttingDown:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mEmergencyOnly:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mIccRecords:Lcom/android/internal/telephony/uicc/IccRecords; -Lcom/android/internal/telephony/ServiceStateTracker;->mIntentReceiver:Landroid/content/BroadcastReceiver; -Lcom/android/internal/telephony/ServiceStateTracker;->mIsSubscriptionFromRuim:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mMaxDataCalls:I -Lcom/android/internal/telephony/ServiceStateTracker;->mNetworkAttachedRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/ServiceStateTracker;->mNewMaxDataCalls:I -Lcom/android/internal/telephony/ServiceStateTracker;->mNewReasonDataDenied:I -Lcom/android/internal/telephony/ServiceStateTracker;->mNewSS:Landroid/telephony/ServiceState; -Lcom/android/internal/telephony/ServiceStateTracker;->mOnSubscriptionsChangedListener:Lcom/android/internal/telephony/ServiceStateTracker$SstSubscriptionsChangedListener; -Lcom/android/internal/telephony/ServiceStateTracker;->mPhone:Lcom/android/internal/telephony/GsmCdmaPhone; -Lcom/android/internal/telephony/ServiceStateTracker;->mPreferredNetworkType:I -Lcom/android/internal/telephony/ServiceStateTracker;->mReasonDataDenied:I -Lcom/android/internal/telephony/ServiceStateTracker;->mReportedGprsNoReg:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mRoamingIndicator:I -Lcom/android/internal/telephony/ServiceStateTracker;->mSignalStrength:Landroid/telephony/SignalStrength; -Lcom/android/internal/telephony/ServiceStateTracker;->mSpnUpdatePending:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mSS:Landroid/telephony/ServiceState; -Lcom/android/internal/telephony/ServiceStateTracker;->mStartedGprsRegCheck:Z -Lcom/android/internal/telephony/ServiceStateTracker;->mSubId:I -Lcom/android/internal/telephony/ServiceStateTracker;->mSubscriptionController:Lcom/android/internal/telephony/SubscriptionController; -Lcom/android/internal/telephony/ServiceStateTracker;->mSubscriptionManager:Landroid/telephony/SubscriptionManager; -Lcom/android/internal/telephony/ServiceStateTracker;->mUiccApplcation:Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/ServiceStateTracker;->mUiccController:Lcom/android/internal/telephony/uicc/UiccController; -Lcom/android/internal/telephony/ServiceStateTracker;->mVoiceRoamingOffRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/ServiceStateTracker;->mVoiceRoamingOnRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/ServiceStateTracker;->notifySignalStrength()Z -Lcom/android/internal/telephony/ServiceStateTracker;->pollState()V -Lcom/android/internal/telephony/ServiceStateTracker;->reRegisterNetwork(Landroid/os/Message;)V -Lcom/android/internal/telephony/ServiceStateTracker;->resetServiceStateInIwlanMode()V -Lcom/android/internal/telephony/ServiceStateTracker;->setOperatorIdd(Ljava/lang/String;)V -Lcom/android/internal/telephony/ServiceStateTracker;->setRoamingType(Landroid/telephony/ServiceState;)V -Lcom/android/internal/telephony/ServiceStateTracker;->setSignalStrengthDefaultValues()V -Lcom/android/internal/telephony/ServiceStateTracker;->updateOtaspState()V -Lcom/android/internal/telephony/ServiceStateTracker;->updatePhoneObject()V -Lcom/android/internal/telephony/ServiceStateTracker;->updateRoamingState()V -Lcom/android/internal/telephony/ServiceStateTracker;->updateSpnDisplay()V -Lcom/android/internal/telephony/ServiceStateTracker;->useDataRegStateForDataOnlyDevices()V Lcom/android/internal/telephony/sip/SipPhone$SipCall;->hold()V Lcom/android/internal/telephony/sip/SipPhone$SipCall;->switchWith(Lcom/android/internal/telephony/sip/SipPhone$SipCall;)V Lcom/android/internal/telephony/sip/SipPhone$SipCall;->unhold()V @@ -2870,100 +2019,14 @@ Lcom/android/internal/telephony/SmsApplication;->getSmsApplicationData(Ljava/lan Lcom/android/internal/telephony/SmsApplication;->isDefaultSmsApplication(Landroid/content/Context;Ljava/lang/String;)Z Lcom/android/internal/telephony/SmsApplication;->setDefaultApplication(Ljava/lang/String;Landroid/content/Context;)V Lcom/android/internal/telephony/SmsApplication;->shouldWriteMessageForPackage(Ljava/lang/String;Landroid/content/Context;)Z -Lcom/android/internal/telephony/SmsBroadcastUndelivered;-><init>(Landroid/content/Context;Lcom/android/internal/telephony/gsm/GsmInboundSmsHandler;Lcom/android/internal/telephony/cdma/CdmaInboundSmsHandler;)V -Lcom/android/internal/telephony/SMSDispatcher$ConfirmDialogListener;->mNegativeButton:Landroid/widget/Button; -Lcom/android/internal/telephony/SMSDispatcher$ConfirmDialogListener;->mPositiveButton:Landroid/widget/Button; -Lcom/android/internal/telephony/SMSDispatcher$ConfirmDialogListener;->mRememberUndoInstruction:Landroid/widget/TextView; Lcom/android/internal/telephony/SMSDispatcher$DataSmsSender;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSender;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Ljava/util/ArrayList;[Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSender;->sendSmsByCarrierApp(Ljava/lang/String;Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSenderCallback;)V Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSenderCallback;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$MultipartSmsSender;)V Lcom/android/internal/telephony/SMSDispatcher$SmsSenderCallback;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$SmsSender;)V -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->isMultipart()Z -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mAppInfo:Landroid/content/pm/PackageInfo; -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mData:Ljava/util/HashMap; -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mDeliveryIntent:Landroid/app/PendingIntent; -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mDestAddress:Ljava/lang/String; -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mMessageRef:I -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mMessageUri:Landroid/net/Uri; -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mPersistMessage:Z -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mSentIntent:Landroid/app/PendingIntent; -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->mTimestamp:J -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->onFailed(Landroid/content/Context;II)V -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->onSent(Landroid/content/Context;)V -Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;->updateSentMessageStatus(Landroid/content/Context;I)V Lcom/android/internal/telephony/SMSDispatcher$TextSmsSender;-><init>(Lcom/android/internal/telephony/SMSDispatcher;Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher;->calculateLength(Ljava/lang/CharSequence;Z)Lcom/android/internal/telephony/GsmAlphabet$TextEncodingDetails; -Lcom/android/internal/telephony/SMSDispatcher;->checkCallerIsPhoneOrCarrierApp()V -Lcom/android/internal/telephony/SMSDispatcher;->deliveryPendingList:Ljava/util/ArrayList; -Lcom/android/internal/telephony/SMSDispatcher;->dispose()V -Lcom/android/internal/telephony/SMSDispatcher;->getCarrierAppPackageName()Ljava/lang/String; -Lcom/android/internal/telephony/SMSDispatcher;->getMultipartMessageText(Ljava/util/ArrayList;)Ljava/lang/String; -Lcom/android/internal/telephony/SMSDispatcher;->getNextConcatenatedRef()I -Lcom/android/internal/telephony/SMSDispatcher;->getSubId()I -Lcom/android/internal/telephony/SMSDispatcher;->handleConfirmShortCode(ZLcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/SMSDispatcher;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/SMSDispatcher;->mPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/SMSDispatcher;->mResolver:Landroid/content/ContentResolver; -Lcom/android/internal/telephony/SMSDispatcher;->mTelephonyManager:Landroid/telephony/TelephonyManager; -Lcom/android/internal/telephony/SMSDispatcher;->processSendSmsResponse(Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;II)V -Lcom/android/internal/telephony/SMSDispatcher;->sendData(Ljava/lang/String;Ljava/lang/String;I[BLandroid/app/PendingIntent;Landroid/app/PendingIntent;)V -Lcom/android/internal/telephony/SMSDispatcher;->sendMultipartSms(Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher;->sendSms(Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V -Lcom/android/internal/telephony/SMSDispatcher;->sendSubmitPdu(Lcom/android/internal/telephony/SMSDispatcher$SmsTracker;)V Lcom/android/internal/telephony/SmsHeader$ConcatRef;-><init>()V Lcom/android/internal/telephony/SmsHeader$PortAddrs;-><init>()V Lcom/android/internal/telephony/SmsMessageBase;-><init>()V -Lcom/android/internal/telephony/SmsResponse;-><init>(ILjava/lang/String;I)V -Lcom/android/internal/telephony/SmsResponse;->mAckPdu:Ljava/lang/String; -Lcom/android/internal/telephony/SmsResponse;->mErrorCode:I -Lcom/android/internal/telephony/SmsResponse;->mMessageRef:I -Lcom/android/internal/telephony/SmsStorageMonitor;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/SmsUsageMonitor;-><init>(Landroid/content/Context;)V -Lcom/android/internal/telephony/SmsUsageMonitor;->check(Ljava/lang/String;I)Z -Lcom/android/internal/telephony/SubscriptionController;->broadcastDefaultDataSubIdChanged(I)V -Lcom/android/internal/telephony/SubscriptionController;->colorArr:[I -Lcom/android/internal/telephony/SubscriptionController;->enforceModifyPhoneState(Ljava/lang/String;)V -Lcom/android/internal/telephony/SubscriptionController;->getActiveSubInfoCount(Ljava/lang/String;)I -Lcom/android/internal/telephony/SubscriptionController;->getActiveSubscriptionInfo(ILjava/lang/String;)Landroid/telephony/SubscriptionInfo; -Lcom/android/internal/telephony/SubscriptionController;->getActiveSubscriptionInfoList(Ljava/lang/String;)Ljava/util/List; -Lcom/android/internal/telephony/SubscriptionController;->getDefaultDataSubId()I -Lcom/android/internal/telephony/SubscriptionController;->getDefaultSmsSubId()I -Lcom/android/internal/telephony/SubscriptionController;->getDefaultSubId()I -Lcom/android/internal/telephony/SubscriptionController;->getDefaultVoiceSubId()I -Lcom/android/internal/telephony/SubscriptionController;->getInstance()Lcom/android/internal/telephony/SubscriptionController; -Lcom/android/internal/telephony/SubscriptionController;->getPhoneId(I)I -Lcom/android/internal/telephony/SubscriptionController;->getSubId(I)[I -Lcom/android/internal/telephony/SubscriptionController;->getSubIdUsingPhoneId(I)I -Lcom/android/internal/telephony/SubscriptionController;->getSubInfo(Ljava/lang/String;Ljava/lang/Object;)Ljava/util/List; -Lcom/android/internal/telephony/SubscriptionController;->getSubInfoRecord(Landroid/database/Cursor;)Landroid/telephony/SubscriptionInfo; -Lcom/android/internal/telephony/SubscriptionController;->isActiveSubId(I)Z -Lcom/android/internal/telephony/SubscriptionController;->isSubInfoReady()Z -Lcom/android/internal/telephony/SubscriptionController;->logd(Ljava/lang/String;)V -Lcom/android/internal/telephony/SubscriptionController;->logdl(Ljava/lang/String;)V -Lcom/android/internal/telephony/SubscriptionController;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/SubscriptionController;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/SubscriptionController;->mDefaultPhoneId:I -Lcom/android/internal/telephony/SubscriptionController;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/SubscriptionController;->notifySubscriptionInfoChanged()V -Lcom/android/internal/telephony/SubscriptionController;->setDefaultDataSubId(I)V -Lcom/android/internal/telephony/SubscriptionController;->setDefaultFallbackSubId(II)V -Lcom/android/internal/telephony/SubscriptionController;->setDefaultSmsSubId(I)V -Lcom/android/internal/telephony/SubscriptionController;->setDefaultVoiceSubId(I)V -Lcom/android/internal/telephony/SubscriptionController;->setPlmnSpn(IZLjava/lang/String;ZLjava/lang/String;)Z -Lcom/android/internal/telephony/SubscriptionController;->updateAllDataConnectionTrackers()V -Lcom/android/internal/telephony/SubscriptionController;->validateSubId(I)V -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->broadcastSimStateChanged(ILjava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->isAllIccIdQueryDone()Z -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->logd(Ljava/lang/String;)V -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->mCurrentlyActiveUserId:I -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->mIccId:[Ljava/lang/String; -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->mPackageManager:Landroid/content/pm/IPackageManager; -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->mPhone:[Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/SubscriptionInfoUpdater;->PROJECT_SIM_NUM:I -Lcom/android/internal/telephony/TelephonyCapabilities;->supportsAdn(I)Z Lcom/android/internal/telephony/TelephonyProperties;->PROPERTY_ICC_OPERATOR_NUMERIC:Ljava/lang/String; Lcom/android/internal/telephony/test/InterpreterEx;-><init>(Ljava/lang/String;)V Lcom/android/internal/telephony/test/SimulatedCommands;->acceptCall(Landroid/os/Message;)V @@ -2980,143 +2043,11 @@ Lcom/android/internal/telephony/test/SimulatedGsmCallState;->releaseActiveAccept Lcom/android/internal/telephony/test/SimulatedGsmCallState;->releaseHeldOrUDUB()Z Lcom/android/internal/telephony/test/SimulatedGsmCallState;->separateCall(I)Z Lcom/android/internal/telephony/test/SimulatedGsmCallState;->switchActiveAndHeldOrWaiting()Z -Lcom/android/internal/telephony/uicc/AdnRecord;-><init>(IILjava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/AdnRecord;-><init>(IILjava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/AdnRecord;-><init>(II[B)V -Lcom/android/internal/telephony/uicc/AdnRecord;-><init>(Ljava/lang/String;Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/AdnRecord;-><init>(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/AdnRecord;-><init>([B)V -Lcom/android/internal/telephony/uicc/AdnRecord;->buildAdnString(I)[B -Lcom/android/internal/telephony/uicc/AdnRecord;->CREATOR:Landroid/os/Parcelable$Creator; -Lcom/android/internal/telephony/uicc/AdnRecord;->getEmails()[Ljava/lang/String; -Lcom/android/internal/telephony/uicc/AdnRecord;->getNumber()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/AdnRecord;->isEmpty()Z -Lcom/android/internal/telephony/uicc/AdnRecord;->mAlphaTag:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/AdnRecord;->mEfid:I -Lcom/android/internal/telephony/uicc/AdnRecord;->mEmails:[Ljava/lang/String; -Lcom/android/internal/telephony/uicc/AdnRecord;->mExtRecord:I -Lcom/android/internal/telephony/uicc/AdnRecord;->mNumber:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/AdnRecord;->mRecordNumber:I -Lcom/android/internal/telephony/uicc/AdnRecord;->setEmails([Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/AdnRecordCache;->extensionEfForEf(I)I -Lcom/android/internal/telephony/uicc/AdnRecordCache;->getRecordsIfLoaded(I)Ljava/util/ArrayList; -Lcom/android/internal/telephony/uicc/AdnRecordCache;->mAdnLikeWaiters:Landroid/util/SparseArray; -Lcom/android/internal/telephony/uicc/AdnRecordCache;->mFh:Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/uicc/AdnRecordCache;->mUserWriteResponse:Landroid/util/SparseArray; -Lcom/android/internal/telephony/uicc/AdnRecordCache;->mUsimPhoneBookManager:Lcom/android/internal/telephony/gsm/UsimPhoneBookManager; -Lcom/android/internal/telephony/uicc/AdnRecordCache;->reset()V -Lcom/android/internal/telephony/uicc/AdnRecordCache;->sendErrorResponse(Landroid/os/Message;Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/AdnRecordCache;->updateAdnByIndex(ILcom/android/internal/telephony/uicc/AdnRecord;ILjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/AdnRecordLoader;-><init>(Lcom/android/internal/telephony/uicc/IccFileHandler;)V -Lcom/android/internal/telephony/uicc/AdnRecordLoader;->getEFPath(I)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/AdnRecordLoader;->loadFromEF(IIILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/AdnRecordLoader;->mFh:Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/uicc/AdnRecordLoader;->updateEF(Lcom/android/internal/telephony/uicc/AdnRecord;IIILjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->APPSTATE_DETECTED:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->APPSTATE_PIN:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->APPSTATE_PUK:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->APPSTATE_READY:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->APPSTATE_SUBSCRIPTION_PERSO:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->APPSTATE_UNKNOWN:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState;->values()[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->APPTYPE_CSIM:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->APPTYPE_ISIM:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->APPTYPE_RUIM:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->APPTYPE_SIM:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->APPTYPE_UNKNOWN:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->APPTYPE_USIM:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;->values()[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->PERSOSUBSTATE_SIM_NETWORK:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->PERSOSUBSTATE_SIM_NETWORK_SUBSET:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->PERSOSUBSTATE_SIM_SERVICE_PROVIDER:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->PERSOSUBSTATE_UNKNOWN:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState;->values()[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; Lcom/android/internal/telephony/uicc/IccCardApplicationStatus;-><init>()V -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus;->AppTypeFromRILInt(I)Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardApplicationStatus;->app_type:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/IccCardStatus$CardState;->CARDSTATE_ABSENT:Lcom/android/internal/telephony/uicc/IccCardStatus$CardState; -Lcom/android/internal/telephony/uicc/IccCardStatus$CardState;->CARDSTATE_ERROR:Lcom/android/internal/telephony/uicc/IccCardStatus$CardState; -Lcom/android/internal/telephony/uicc/IccCardStatus$CardState;->CARDSTATE_PRESENT:Lcom/android/internal/telephony/uicc/IccCardStatus$CardState; -Lcom/android/internal/telephony/uicc/IccCardStatus$CardState;->isCardPresent()Z -Lcom/android/internal/telephony/uicc/IccCardStatus$PinState;->PINSTATE_DISABLED:Lcom/android/internal/telephony/uicc/IccCardStatus$PinState; -Lcom/android/internal/telephony/uicc/IccCardStatus$PinState;->PINSTATE_ENABLED_BLOCKED:Lcom/android/internal/telephony/uicc/IccCardStatus$PinState; -Lcom/android/internal/telephony/uicc/IccCardStatus$PinState;->PINSTATE_ENABLED_PERM_BLOCKED:Lcom/android/internal/telephony/uicc/IccCardStatus$PinState; -Lcom/android/internal/telephony/uicc/IccCardStatus;->mApplications:[Lcom/android/internal/telephony/uicc/IccCardApplicationStatus; -Lcom/android/internal/telephony/uicc/IccCardStatus;->mCardState:Lcom/android/internal/telephony/uicc/IccCardStatus$CardState; -Lcom/android/internal/telephony/uicc/IccCardStatus;->mCdmaSubscriptionAppIndex:I -Lcom/android/internal/telephony/uicc/IccCardStatus;->mGsmUmtsSubscriptionAppIndex:I -Lcom/android/internal/telephony/uicc/IccCardStatus;->mImsSubscriptionAppIndex:I -Lcom/android/internal/telephony/uicc/IccCardStatus;->mUniversalPinState:Lcom/android/internal/telephony/uicc/IccCardStatus$PinState; -Lcom/android/internal/telephony/uicc/IccFileHandler$LoadLinearFixedContext;-><init>(IILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler$LoadLinearFixedContext;->mRecordSize:I -Lcom/android/internal/telephony/uicc/IccFileHandler$LoadLinearFixedContext;->results:Ljava/util/ArrayList; -Lcom/android/internal/telephony/uicc/IccFileHandler;->getEFLinearRecordSize(ILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->getEFLinearRecordSize(ILjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->getEFPath(I)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccFileHandler;->loadEFLinearFixed(IILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->loadEFLinearFixed(ILjava/lang/String;ILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->loadEFLinearFixedAll(ILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->loadEFLinearFixedAll(ILjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->loadEFTransparent(ILandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->mAid:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccFileHandler;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/uicc/IccFileHandler;->mParentApp:Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/uicc/IccFileHandler;->updateEFLinearFixed(II[BLjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->updateEFLinearFixed(ILjava/lang/String;I[BLjava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccFileHandler;->updateEFTransparent(I[BLandroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccIoResult;-><init>(IILjava/lang/String;)V -Lcom/android/internal/telephony/uicc/IccIoResult;-><init>(II[B)V -Lcom/android/internal/telephony/uicc/IccIoResult;->payload:[B -Lcom/android/internal/telephony/uicc/IccIoResult;->success()Z -Lcom/android/internal/telephony/uicc/IccIoResult;->sw1:I -Lcom/android/internal/telephony/uicc/IccIoResult;->sw2:I -Lcom/android/internal/telephony/uicc/IccRecords;->auth_rsp:Lcom/android/internal/telephony/uicc/IccIoResult; -Lcom/android/internal/telephony/uicc/IccRecords;->getGid1()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getIccId()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getIccSimChallengeResponse(ILjava/lang/String;)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getIMSI()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getMsisdnNumber()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getOperatorNumeric()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getRecordsLoaded()Z -Lcom/android/internal/telephony/uicc/IccRecords;->getServiceProviderName()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->getUsimServiceTable()Lcom/android/internal/telephony/uicc/UsimServiceTable; -Lcom/android/internal/telephony/uicc/IccRecords;->handleRefresh(Lcom/android/internal/telephony/uicc/IccRefreshResponse;)V -Lcom/android/internal/telephony/uicc/IccRecords;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/IccRecords;->mAdnCache:Lcom/android/internal/telephony/uicc/AdnRecordCache; -Lcom/android/internal/telephony/uicc/IccRecords;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/uicc/IccRecords;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/uicc/IccRecords;->mDestroyed:Ljava/util/concurrent/atomic/AtomicBoolean; -Lcom/android/internal/telephony/uicc/IccRecords;->mFh:Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/uicc/IccRecords;->mGid1:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->mIccId:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->mImsi:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->mIsVoiceMailFixed:Z -Lcom/android/internal/telephony/uicc/IccRecords;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/uicc/IccRecords;->mMncLength:I -Lcom/android/internal/telephony/uicc/IccRecords;->mParentApp:Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/uicc/IccRecords;->mRecordsEventsRegistrants:Landroid/os/RegistrantList; -Lcom/android/internal/telephony/uicc/IccRecords;->mRecordsToLoad:I -Lcom/android/internal/telephony/uicc/IccRecords;->mSpn:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->mTelephonyManager:Landroid/telephony/TelephonyManager; -Lcom/android/internal/telephony/uicc/IccRecords;->mVoiceMailNum:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRecords;->registerForNetworkSelectionModeAutomatic(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/uicc/IccRecords;->registerForNewSms(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/uicc/IccRecords;->registerForRecordsEvents(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/uicc/IccRecords;->registerForRecordsLoaded(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/uicc/IccRecords;->setMsisdnNumber(Ljava/lang/String;Ljava/lang/String;Landroid/os/Message;)V -Lcom/android/internal/telephony/uicc/IccRecords;->setVoiceCallForwardingFlag(IZLjava/lang/String;)V -Lcom/android/internal/telephony/uicc/IccRecords;->unregisterForNetworkSelectionModeAutomatic(Landroid/os/Handler;)V -Lcom/android/internal/telephony/uicc/IccRecords;->unregisterForNewSms(Landroid/os/Handler;)V -Lcom/android/internal/telephony/uicc/IccRecords;->unregisterForRecordsEvents(Landroid/os/Handler;)V -Lcom/android/internal/telephony/uicc/IccRecords;->unregisterForRecordsLoaded(Landroid/os/Handler;)V Lcom/android/internal/telephony/uicc/IccRefreshResponse;-><init>()V -Lcom/android/internal/telephony/uicc/IccRefreshResponse;->aid:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccRefreshResponse;->efId:I -Lcom/android/internal/telephony/uicc/IccRefreshResponse;->refreshResult:I -Lcom/android/internal/telephony/uicc/IccServiceTable;->getTag()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IccServiceTable;->mServiceTable:[B Lcom/android/internal/telephony/uicc/IccUtils;->adnStringFieldToString([BII)Ljava/lang/String; Lcom/android/internal/telephony/uicc/IccUtils;->bcdToString([BII)Ljava/lang/String; Lcom/android/internal/telephony/uicc/IccUtils;->bytesToHexString([B)Ljava/lang/String; @@ -3128,175 +2059,7 @@ Lcom/android/internal/telephony/uicc/IccUtils;->hexStringToBytes(Ljava/lang/Stri Lcom/android/internal/telephony/uicc/IccUtils;->networkNameToString([BII)Ljava/lang/String; Lcom/android/internal/telephony/uicc/IccUtils;->parseToBnW([BI)Landroid/graphics/Bitmap; Lcom/android/internal/telephony/uicc/IccUtils;->parseToRGB([BIZ)Landroid/graphics/Bitmap; -Lcom/android/internal/telephony/uicc/IsimRecords;->getIsimDomain()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimRecords;->getIsimImpi()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimRecords;->getIsimImpu()[Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->auth_rsp:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->fetchIsimRecords()V -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->isimTlvToString([B)Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->mIsimDomain:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->mIsimImpi:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->mIsimImpu:[Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->mIsimIst:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->mIsimPcscf:[Ljava/lang/String; -Lcom/android/internal/telephony/uicc/IsimUiccRecords;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/uicc/RuimRecords;->adjstMinDigits(I)I -Lcom/android/internal/telephony/uicc/RuimRecords;->fetchRuimRecords()V -Lcom/android/internal/telephony/uicc/RuimRecords;->getAssetLanguages(Landroid/content/Context;)[Ljava/lang/String; -Lcom/android/internal/telephony/uicc/RuimRecords;->getCsimSpnDisplayCondition()Z -Lcom/android/internal/telephony/uicc/RuimRecords;->getMdn()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/RuimRecords;->getMdnNumber()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/RuimRecords;->getRUIMOperatorNumeric()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/RuimRecords;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/RuimRecords;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/RuimRecords;->mEFli:[B -Lcom/android/internal/telephony/uicc/RuimRecords;->mEFpl:[B -Lcom/android/internal/telephony/uicc/RuimRecords;->mMin:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/RuimRecords;->mNai:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/RuimRecords;->onGetCSimEprlDone(Landroid/os/AsyncResult;)V -Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState;->INIT:Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState; -Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState;->READ_SPN_3GPP:Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState; -Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState;->READ_SPN_CPHS:Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState; -Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState;->READ_SPN_SHORT_CPHS:Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState; Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState;->values()[Lcom/android/internal/telephony/uicc/SIMRecords$GetSpnFsmState; -Lcom/android/internal/telephony/uicc/SIMRecords;->fetchSimRecords()V -Lcom/android/internal/telephony/uicc/SIMRecords;->getExtFromEf(I)I -Lcom/android/internal/telephony/uicc/SIMRecords;->getMsisdnNumber()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/SIMRecords;->getOperatorNumeric()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/SIMRecords;->getSpnFsm(ZLandroid/os/AsyncResult;)V -Lcom/android/internal/telephony/uicc/SIMRecords;->getVoiceMailNumber()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/SIMRecords;->isCphsMailboxEnabled()Z -Lcom/android/internal/telephony/uicc/SIMRecords;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/SIMRecords;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/SIMRecords;->logv(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/SIMRecords;->mEfCff:[B -Lcom/android/internal/telephony/uicc/SIMRecords;->mEfCfis:[B -Lcom/android/internal/telephony/uicc/SIMRecords;->mEfCPHS_MWI:[B -Lcom/android/internal/telephony/uicc/SIMRecords;->mEfLi:[B -Lcom/android/internal/telephony/uicc/SIMRecords;->mEfMWIS:[B -Lcom/android/internal/telephony/uicc/SIMRecords;->mEfPl:[B -Lcom/android/internal/telephony/uicc/SIMRecords;->mSpnDisplayCondition:I -Lcom/android/internal/telephony/uicc/SIMRecords;->mUsimServiceTable:Lcom/android/internal/telephony/uicc/UsimServiceTable; -Lcom/android/internal/telephony/uicc/SIMRecords;->mVmConfig:Lcom/android/internal/telephony/uicc/VoiceMailConstants; -Lcom/android/internal/telephony/uicc/SIMRecords;->setVoiceCallForwardingFlag(IZLjava/lang/String;)V -Lcom/android/internal/telephony/uicc/UiccCard;->getApplication(I)Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/uicc/UiccCard;->getApplicationByType(I)Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/uicc/UiccCard;->getApplicationIndex(I)Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/uicc/UiccCard;->getCardState()Lcom/android/internal/telephony/uicc/IccCardStatus$CardState; -Lcom/android/internal/telephony/uicc/UiccCard;->getCarrierPackageNamesForIntent(Landroid/content/pm/PackageManager;Landroid/content/Intent;)Ljava/util/List; -Lcom/android/internal/telephony/uicc/UiccCard;->getIccId()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/UiccCard;->getNumApplications()I -Lcom/android/internal/telephony/uicc/UiccCard;->getOperatorBrandOverride()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/UiccCard;->isApplicationOnIcc(Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType;)Z -Lcom/android/internal/telephony/uicc/UiccCard;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/UiccCard;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/UiccCard;->mCardState:Lcom/android/internal/telephony/uicc/IccCardStatus$CardState; -Lcom/android/internal/telephony/uicc/UiccCard;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/uicc/UiccCard;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/uicc/UiccCard;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/uicc/UiccCard;->mPhoneId:I -Lcom/android/internal/telephony/uicc/UiccCardApplication;->dispose()V -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getAid()Ljava/lang/String; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getAuthContext()I -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getIccFileHandler()Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getIccRecords()Lcom/android/internal/telephony/uicc/IccRecords; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getPersoSubState()Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getPhoneId()I -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getPin1State()Lcom/android/internal/telephony/uicc/IccCardStatus$PinState; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getState()Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->getType()Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/UiccCardApplication;->loge(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mAid:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mAppState:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppState; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mAppType:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$AppType; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mCi:Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mDestroyed:Z -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mPersoSubState:Lcom/android/internal/telephony/uicc/IccCardApplicationStatus$PersoSubState; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->mPin1State:Lcom/android/internal/telephony/uicc/IccCardStatus$PinState; -Lcom/android/internal/telephony/uicc/UiccCardApplication;->registerForReady(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/uicc/UiccCardApplication;->unregisterForReady(Landroid/os/Handler;)V -Lcom/android/internal/telephony/uicc/UiccCardApplication;->update(Lcom/android/internal/telephony/uicc/IccCardApplicationStatus;Landroid/content/Context;Lcom/android/internal/telephony/CommandsInterface;)V -Lcom/android/internal/telephony/uicc/UiccCarrierPrivilegeRules$TLV;->length:Ljava/lang/Integer; -Lcom/android/internal/telephony/uicc/UiccCarrierPrivilegeRules$TLV;->value:Ljava/lang/String; -Lcom/android/internal/telephony/uicc/UiccCarrierPrivilegeRules;->mLoadedCallback:Landroid/os/Message; -Lcom/android/internal/telephony/uicc/UiccCarrierPrivilegeRules;->mState:Ljava/util/concurrent/atomic/AtomicInteger; -Lcom/android/internal/telephony/uicc/UiccController;->getIccFileHandler(II)Lcom/android/internal/telephony/uicc/IccFileHandler; -Lcom/android/internal/telephony/uicc/UiccController;->getIccRecords(II)Lcom/android/internal/telephony/uicc/IccRecords; -Lcom/android/internal/telephony/uicc/UiccController;->getInstance()Lcom/android/internal/telephony/uicc/UiccController; -Lcom/android/internal/telephony/uicc/UiccController;->getUiccCard(I)Lcom/android/internal/telephony/uicc/UiccCard; -Lcom/android/internal/telephony/uicc/UiccController;->getUiccCardApplication(II)Lcom/android/internal/telephony/uicc/UiccCardApplication; -Lcom/android/internal/telephony/uicc/UiccController;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/uicc/UiccController;->mCis:[Lcom/android/internal/telephony/CommandsInterface; -Lcom/android/internal/telephony/uicc/UiccController;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/uicc/UiccController;->mInstance:Lcom/android/internal/telephony/uicc/UiccController; -Lcom/android/internal/telephony/uicc/UiccController;->mLock:Ljava/lang/Object; -Lcom/android/internal/telephony/uicc/UiccController;->registerForIccChanged(Landroid/os/Handler;ILjava/lang/Object;)V -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->ALLOWED_CSG_LISTS_AND_INDICATIONS:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->CFI_STATUS:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->CSG_DISPLAY_CONTROL:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->FDN:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->MBDN:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->MSISDN:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->MWI_STATUS:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->OPERATOR_CSG_LISTS_AND_INDICATIONS:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->OPERATOR_PLMN_LIST:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->PLMN_NETWORK_NAME:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->SDN:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->SM_OVER_IP:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->SM_SERVICE_PARAMS:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->SM_STORAGE:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;->SPN:Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService; -Lcom/android/internal/telephony/uicc/UsimServiceTable;->isAvailable(Lcom/android/internal/telephony/uicc/UsimServiceTable$UsimService;)Z -Lcom/android/internal/telephony/uicc/VoiceMailConstants;-><init>()V -Lcom/android/internal/telephony/UiccPhoneBookController;-><init>([Lcom/android/internal/telephony/Phone;)V -Lcom/android/internal/telephony/UiccPhoneBookController;->getDefaultSubscription()I -Lcom/android/internal/telephony/UiccPhoneBookController;->getIccPhoneBookInterfaceManager(I)Lcom/android/internal/telephony/IccPhoneBookInterfaceManager; -Lcom/android/internal/telephony/UiccPhoneBookController;->mPhone:[Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/UiccSmsController;->copyMessageToIccEfForSubscriber(ILjava/lang/String;I[B[B)Z -Lcom/android/internal/telephony/UiccSmsController;->disableCellBroadcastForSubscriber(III)Z -Lcom/android/internal/telephony/UiccSmsController;->disableCellBroadcastRangeForSubscriber(IIII)Z -Lcom/android/internal/telephony/UiccSmsController;->enableCellBroadcastForSubscriber(III)Z -Lcom/android/internal/telephony/UiccSmsController;->enableCellBroadcastRangeForSubscriber(IIII)Z -Lcom/android/internal/telephony/UiccSmsController;->getAllMessagesFromIccEfForSubscriber(ILjava/lang/String;)Ljava/util/List; -Lcom/android/internal/telephony/UiccSmsController;->getIccSmsInterfaceManager(I)Lcom/android/internal/telephony/IccSmsInterfaceManager; -Lcom/android/internal/telephony/UiccSmsController;->getImsSmsFormatForSubscriber(I)Ljava/lang/String; -Lcom/android/internal/telephony/UiccSmsController;->getPreferredSmsSubscription()I -Lcom/android/internal/telephony/UiccSmsController;->isImsSmsSupportedForSubscriber(I)Z -Lcom/android/internal/telephony/UiccSmsController;->sendDataForSubscriber(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I[BLandroid/app/PendingIntent;Landroid/app/PendingIntent;)V -Lcom/android/internal/telephony/UiccSmsController;->sendErrorInPendingIntent(Landroid/app/PendingIntent;I)V -Lcom/android/internal/telephony/UiccSmsController;->sendErrorInPendingIntents(Ljava/util/List;I)V -Lcom/android/internal/telephony/UiccSmsController;->updateMessageOnIccEfForSubscriber(ILjava/lang/String;II[B)Z -Lcom/android/internal/telephony/UUSInfo;->getDcs()I -Lcom/android/internal/telephony/UUSInfo;->getType()I -Lcom/android/internal/telephony/UUSInfo;->getUserData()[B -Lcom/android/internal/telephony/WakeLockStateMachine;->log(Ljava/lang/String;)V -Lcom/android/internal/telephony/WakeLockStateMachine;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/WakeLockStateMachine;->mIdleState:Lcom/android/internal/telephony/WakeLockStateMachine$IdleState; -Lcom/android/internal/telephony/WakeLockStateMachine;->mPhone:Lcom/android/internal/telephony/Phone; -Lcom/android/internal/telephony/WapPushOverSms;->dispatchWapPdu([BLandroid/content/BroadcastReceiver;Lcom/android/internal/telephony/InboundSmsHandler;)I -Lcom/android/internal/telephony/WapPushOverSms;->getDeliveryOrReadReportThreadId(Landroid/content/Context;Lcom/google/android/mms/pdu/GenericPdu;)J -Lcom/android/internal/telephony/WapPushOverSms;->isDuplicateNotification(Landroid/content/Context;Lcom/google/android/mms/pdu/NotificationInd;)Z -Lcom/android/internal/telephony/WapPushOverSms;->isWapPushForMms([BLcom/android/internal/telephony/InboundSmsHandler;)Z -Lcom/android/internal/telephony/WapPushOverSms;->mContext:Landroid/content/Context; -Lcom/android/internal/telephony/WapPushOverSms;->mDeviceIdleController:Landroid/os/IDeviceIdleController; -Lcom/android/internal/telephony/WapPushOverSms;->mWapPushManager:Lcom/android/internal/telephony/IWapPushManager; -Lcom/android/internal/telephony/WspTypeDecoder;-><init>([B)V -Lcom/android/internal/telephony/WspTypeDecoder;->decodeContentType(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->decodeIntegerValue(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->decodeShortInteger(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->decodeTextString(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->decodeUintvarInteger(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->decodeValueLength(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->decodeXWapApplicationId(I)Z -Lcom/android/internal/telephony/WspTypeDecoder;->getContentParameters()Ljava/util/HashMap; -Lcom/android/internal/telephony/WspTypeDecoder;->getDecodedDataLength()I -Lcom/android/internal/telephony/WspTypeDecoder;->getValue32()J -Lcom/android/internal/telephony/WspTypeDecoder;->getValueString()Ljava/lang/String; -Lcom/android/internal/telephony/WspTypeDecoder;->mWspData:[B -Lcom/android/internal/telephony/WspTypeDecoder;->seekXWapApplicationId(II)Z Lcom/android/internal/textservice/ITextServicesManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V Lcom/android/internal/util/ArrayUtils;->appendElement(Ljava/lang/Class;[Ljava/lang/Object;Ljava/lang/Object;)[Ljava/lang/Object; Lcom/android/internal/util/ArrayUtils;->appendInt([II)[I diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 694f6b061375..b039a60fbab3 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -8344,7 +8344,7 @@ public class Activity extends ContextThemeWrapper try { ActivityTaskManager.getService().setDisablePreviewScreenshots(mToken, disable); } catch (RemoteException e) { - Log.e(TAG, "Failed to call setDisablePreviewScreenshots", e); + throw e.rethrowFromSystemServer(); } } @@ -8365,7 +8365,7 @@ public class Activity extends ContextThemeWrapper try { ActivityTaskManager.getService().setShowWhenLocked(mToken, showWhenLocked); } catch (RemoteException e) { - Log.e(TAG, "Failed to call setShowWhenLocked", e); + throw e.rethrowFromSystemServer(); } } @@ -8389,7 +8389,7 @@ public class Activity extends ContextThemeWrapper ActivityTaskManager.getService().setInheritShowWhenLocked( mToken, inheritShowWhenLocked); } catch (RemoteException e) { - Log.e(TAG, "Failed to call setInheritShowWhenLocked", e); + throw e.rethrowFromSystemServer(); } } @@ -8415,7 +8415,7 @@ public class Activity extends ContextThemeWrapper try { ActivityTaskManager.getService().setTurnScreenOn(mToken, turnScreenOn); } catch (RemoteException e) { - Log.e(TAG, "Failed to call setTurnScreenOn", e); + throw e.rethrowFromSystemServer(); } } @@ -8432,7 +8432,7 @@ public class Activity extends ContextThemeWrapper try { ActivityTaskManager.getService().registerRemoteAnimations(mToken, definition); } catch (RemoteException e) { - Log.e(TAG, "Failed to call registerRemoteAnimations", e); + throw e.rethrowFromSystemServer(); } } diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 90bc0a6dd11e..6103818254f7 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -104,11 +104,13 @@ import android.net.IEthernetManager; import android.net.IIpMemoryStore; import android.net.IIpSecService; import android.net.INetworkPolicyManager; +import android.net.ITestNetworkManager; import android.net.IpMemoryStore; import android.net.IpSecManager; import android.net.NetworkPolicyManager; import android.net.NetworkScoreManager; import android.net.NetworkWatchlistManager; +import android.net.TestNetworkManager; import android.net.lowpan.ILowpanManager; import android.net.lowpan.LowpanManager; import android.net.nsd.INsdManager; @@ -146,6 +148,7 @@ import android.os.IUserManager; import android.os.IncidentManager; import android.os.PowerManager; import android.os.RecoverySystem; +import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceManager.ServiceNotFoundException; import android.os.SystemUpdateManager; @@ -357,6 +360,29 @@ final class SystemServiceRegistry { return new IpSecManager(ctx, service); }}); + registerService( + Context.TEST_NETWORK_SERVICE, + TestNetworkManager.class, + new StaticApplicationContextServiceFetcher<TestNetworkManager>() { + @Override + public TestNetworkManager createService(Context context) + throws ServiceNotFoundException { + IBinder csBinder = + ServiceManager.getServiceOrThrow(Context.CONNECTIVITY_SERVICE); + IConnectivityManager csMgr = + IConnectivityManager.Stub.asInterface(csBinder); + + final IBinder tnBinder; + try { + tnBinder = csMgr.startOrGetTestNetworkService(); + } catch (RemoteException e) { + throw new ServiceNotFoundException(Context.TEST_NETWORK_SERVICE); + } + ITestNetworkManager tnMgr = ITestNetworkManager.Stub.asInterface(tnBinder); + return new TestNetworkManager(context, tnMgr); + } + }); + registerService(Context.COUNTRY_DETECTOR, CountryDetector.class, new StaticServiceFetcher<CountryDetector>() { @Override diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index f8ccb13b6b53..9a4e2151dd3b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3393,9 +3393,6 @@ public class DevicePolicyManager { * explicitly querying the parent profile screen lock complexity via {@link * #getParentProfileInstance}. * - * <p>On devices not supporting {@link PackageManager#FEATURE_SECURE_LOCK_SCREEN} feature, the - * password is always empty and this method returns {@link #PASSWORD_COMPLEXITY_NONE}. - * * @throws IllegalStateException if the user is not unlocked. * @throws SecurityException if the calling application does not have the permission * {@link permission#REQUEST_PASSWORD_COMPLEXITY} @@ -10628,10 +10625,10 @@ public class DevicePolicyManager { * Returns the system-wide Private DNS host. * * @param admin which {@link DeviceAdminReceiver} this request is associated with. - * @return The hostname used for Private DNS queries. + * @return The hostname used for Private DNS queries, null if none is set. * @throws SecurityException if the caller is not the device owner. */ - public String getGlobalPrivateDnsHost(@NonNull ComponentName admin) { + public @Nullable String getGlobalPrivateDnsHost(@NonNull ComponentName admin) { throwIfParentInstance("setGlobalPrivateDns"); if (mService == null) { return null; @@ -10661,13 +10658,12 @@ public class DevicePolicyManager { @SystemApi @RequiresPermission(value = android.Manifest.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS, conditional = true) - public void setProfileOwnerCanAccessDeviceIdsForUser( - @NonNull ComponentName who, @NonNull UserHandle userHandle) { + public void setProfileOwnerCanAccessDeviceIds(@NonNull ComponentName who) { if (mService == null) { return; } try { - mService.grantDeviceIdsAccessToProfileOwner(who, userHandle.getIdentifier()); + mService.grantDeviceIdsAccessToProfileOwner(who, myUserId()); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index e47ec22310aa..b5224c7fac55 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -660,6 +660,30 @@ public final class UsageStatsManager { } } + + /** + * @deprecated use {@link #registerUsageSessionObserver(int, String[], Duration, Duration, + * PendingIntent, PendingIntent)}. + * + * @removed + * @hide + */ + @Deprecated + @SystemApi + @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) + // STOPSHIP b/128455269: remove this method + public void registerUsageSessionObserver(int sessionObserverId, + @NonNull String[] observedEntities, long timeLimit, @NonNull TimeUnit timeUnit, + long sessionThresholdTime, @NonNull TimeUnit sessionThresholdTimeUnit, + @NonNull PendingIntent limitReachedCallbackIntent, + @Nullable PendingIntent sessionEndCallbackIntent) { + final Duration timeLimitDuration = Duration.ofMillis(timeUnit.toMillis(timeLimit)); + final Duration sessionThresholdDuration = + Duration.ofMillis(sessionThresholdTimeUnit.toMillis(sessionThresholdTime)); + registerUsageSessionObserver(sessionObserverId, observedEntities, timeLimitDuration, + sessionThresholdDuration, limitReachedCallbackIntent, sessionEndCallbackIntent); + } + /** * Register a usage session observer that receives a callback on the provided {@code * limitReachedCallbackIntent} when the sum of usages of apps and tokens in the {@code @@ -679,11 +703,8 @@ public final class UsageStatsManager { * null and must include at least one package or token. * @param timeLimit The total time the set of apps can be used continuously before the {@code * limitReachedCallbackIntent} is delivered. Must be at least one minute. - * @param timeUnit The unit for time specified in {@code timeLimit}. Cannot be null. * @param sessionThresholdTime The time that can take place between usage sessions before the * next session is considered a new session. Must be non-negative. - * @param sessionThresholdTimeUnit The unit for time specified in {@code sessionThreshold}. - * Cannot be null. * @param limitReachedCallbackIntent The {@link PendingIntent} that will be dispatched when the * usage limit is exceeded by the group of apps. The * delivered Intent will also contain the extras {@link @@ -703,14 +724,13 @@ public final class UsageStatsManager { @SystemApi @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int sessionObserverId, - @NonNull String[] observedEntities, long timeLimit, @NonNull TimeUnit timeUnit, - long sessionThresholdTime, @NonNull TimeUnit sessionThresholdTimeUnit, + @NonNull String[] observedEntities, @NonNull Duration timeLimit, + @NonNull Duration sessionThresholdTime, @NonNull PendingIntent limitReachedCallbackIntent, @Nullable PendingIntent sessionEndCallbackIntent) { try { mService.registerUsageSessionObserver(sessionObserverId, observedEntities, - timeUnit.toMillis(timeLimit), - sessionThresholdTimeUnit.toMillis(sessionThresholdTime), + timeLimit.toMillis(), sessionThresholdTime.toMillis(), limitReachedCallbackIntent, sessionEndCallbackIntent, mContext.getOpPackageName()); } catch (RemoteException e) { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 5c9931970d5c..efb3bfc1f6d2 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3136,6 +3136,7 @@ public abstract class Context { CONNECTIVITY_SERVICE, //@hide: IP_MEMORY_STORE_SERVICE, IPSEC_SERVICE, + TEST_NETWORK_SERVICE, //@hide: UPDATE_LOCK_SERVICE, //@hide: NETWORKMANAGEMENT_SERVICE, NETWORK_STATS_SERVICE, @@ -3298,11 +3299,16 @@ public abstract class Context { * {@link #USB_SERVICE}, {@link #WALLPAPER_SERVICE}, {@link #WIFI_P2P_SERVICE}, * {@link #WIFI_SERVICE}, {@link #WIFI_AWARE_SERVICE}. For these services this method will * return <code>null</code>. Generally, if you are running as an instant app you should always - * check whether the result of this method is null. + * check whether the result of this method is {@code null}. + * + * <p>Note: When implementing this method, keep in mind that new services can be added on newer + * Android releases, so if you're looking for just the explicit names mentioned above, make sure + * to return {@code null} when you don't recognize the name — if you throw a + * {@link RuntimeException} exception instead, you're app might break on new Android releases. * * @param name The name of the desired service. * - * @return The service or null if the name does not exist. + * @return The service or {@code null} if the name does not exist. * * @see #WINDOW_SERVICE * @see android.view.WindowManager @@ -3376,7 +3382,9 @@ public abstract class Context { * {@link android.app.UiModeManager}, {@link android.app.DownloadManager}, * {@link android.os.BatteryManager}, {@link android.app.job.JobScheduler}, * {@link android.app.usage.NetworkStatsManager}. - * </p><p> + * </p> + * + * <p> * Note: System services obtained via this API may be closely associated with * the Context in which they are obtained from. In general, do not share the * service objects between various different contexts (Activities, Applications, @@ -3388,11 +3396,13 @@ public abstract class Context { * {@link #FINGERPRINT_SERVICE}, {@link #KEYGUARD_SERVICE}, {@link #SHORTCUT_SERVICE}, * {@link #USB_SERVICE}, {@link #WALLPAPER_SERVICE}, {@link #WIFI_P2P_SERVICE}, * {@link #WIFI_SERVICE}, {@link #WIFI_AWARE_SERVICE}. For these services this method will - * return <code>null</code>. Generally, if you are running as an instant app you should always - * check whether the result of this method is null. + * return {@code null}. Generally, if you are running as an instant app you should always + * check whether the result of this method is {@code null}. + * </p> * * @param serviceClass The class of the desired service. - * @return The service or null if the class is not a supported system service. + * @return The service or {@code null} if the class is not a supported system service. Note: + * <b>never</b> throw a {@link RuntimeException} if the name is not supported. */ @SuppressWarnings("unchecked") public final @Nullable <T> T getSystemService(@NonNull Class<T> serviceClass) { @@ -3700,6 +3710,15 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve a {@link + * android.net.TestNetworkManager} for building TUNs and limited-use Networks + * + * @see #getSystemService(String) + * @hide + */ + @TestApi public static final String TEST_NETWORK_SERVICE = "test_network"; + + /** + * Use with {@link #getSystemService(String)} to retrieve a {@link * android.os.IUpdateLock} for managing runtime sequences that * must not be interrupted by headless OTA application or similar. * diff --git a/core/java/android/content/pm/AndroidHidlUpdater.java b/core/java/android/content/pm/AndroidHidlUpdater.java index b7ae8f4a1291..d0657e5eb8ec 100644 --- a/core/java/android/content/pm/AndroidHidlUpdater.java +++ b/core/java/android/content/pm/AndroidHidlUpdater.java @@ -34,8 +34,14 @@ public class AndroidHidlUpdater extends PackageSharedLibraryUpdater { @Override public void updatePackage(Package pkg) { + ApplicationInfo info = pkg.applicationInfo; + // This was the default <= P and is maintained for backwards compatibility. - if (pkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.P) { + boolean isLegacy = info.targetSdkVersion <= Build.VERSION_CODES.P; + // Only system apps use these libraries + boolean isSystem = info.isSystemApp() || info.isUpdatedSystemApp(); + + if (isLegacy && isSystem) { prefixRequiredLibrary(pkg, ANDROID_HIDL_BASE); prefixRequiredLibrary(pkg, ANDROID_HIDL_MANAGER); } else { diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java index 0ef765693c49..b3cc627712e4 100644 --- a/core/java/android/content/pm/PackageManagerInternal.java +++ b/core/java/android/content/pm/PackageManagerInternal.java @@ -22,6 +22,7 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.content.ComponentName; import android.content.Intent; +import android.content.IntentSender; import android.content.pm.PackageManager.ApplicationInfoFlags; import android.content.pm.PackageManager.ComponentInfoFlags; import android.content.pm.PackageManager.PackageInfoFlags; @@ -925,4 +926,21 @@ public abstract class PackageManagerInternal { * @param provider the provider */ public abstract void setDefaultHomeProvider(@NonNull DefaultHomeProvider provider); + + /** + * Returns {@code true} if given {@code packageName} is an apex package. + */ + public abstract boolean isApexPackage(String packageName); + + /** + * Uninstalls given {@code packageName}. + * + * @param packageName apex package to uninstall. + * @param versionCode version of a package to uninstall. + * @param userId user to uninstall apex package for. Must be + * {@link android.os.UserHandle#USER_ALL}, otherwise failure will be reported. + * @param intentSender a {@link IntentSender} to send result of an uninstall to. + */ + public abstract void uninstallApex(String packageName, long versionCode, int userId, + IntentSender intentSender); } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index ec4213405f39..9d0ece0220b4 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3993,8 +3993,6 @@ public class PackageParser { setMaxAspectRatio(owner); setMinAspectRatio(owner); - PackageBackwardCompatibility.modifySharedLibraries(owner); - if (hasDomainURLs(owner)) { owner.applicationInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_HAS_DOMAIN_URLS; } else { diff --git a/core/java/android/hardware/OWNERS b/core/java/android/hardware/OWNERS index 29a339a7d286..47dbf2d960e3 100644 --- a/core/java/android/hardware/OWNERS +++ b/core/java/android/hardware/OWNERS @@ -1,2 +1,2 @@ # Camera -per-file *Camera* = cychen@google.com,epeev@google.com,etalvala@google.com,shuzhenwang@google.com,yinchiayeh@google.com,zhijunhe@google.com +per-file *Camera*=cychen@google.com,epeev@google.com,etalvala@google.com,shuzhenwang@google.com,yinchiayeh@google.com,zhijunhe@google.com,jchowdhary@google.com diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index f8b2a5bd61bf..7ae673c1eded 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -85,8 +85,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * * @hide */ - @UnsupportedAppUsage - public Key(@NonNull String name, @NonNull String fallbackName, @NonNull Class<T> type) { + public Key(String name, String fallbackName, Class<T> type) { mKey = new CameraMetadataNative.Key<T>(name, fallbackName, type); } diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 7382ac46c2be..ba451e585d27 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -89,8 +89,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * * @hide */ - @UnsupportedAppUsage - public Key(@NonNull String name, @NonNull String fallbackName, @NonNull Class<T> type) { + public Key(String name, String fallbackName, Class<T> type) { mKey = new CameraMetadataNative.Key<T>(name, fallbackName, type); } @@ -4252,7 +4251,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * @see CaptureResult#SENSOR_TIMESTAMP * @hide */ - @UnsupportedAppUsage public static final Key<long[]> STATISTICS_OIS_TIMESTAMPS = new Key<long[]>("android.statistics.oisTimestamps", long[].class); @@ -4272,7 +4270,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> * @hide */ - @UnsupportedAppUsage public static final Key<float[]> STATISTICS_OIS_X_SHIFTS = new Key<float[]>("android.statistics.oisXShifts", float[].class); @@ -4292,7 +4289,6 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p> * @hide */ - @UnsupportedAppUsage public static final Key<float[]> STATISTICS_OIS_Y_SHIFTS = new Key<float[]>("android.statistics.oisYShifts", float[].class); diff --git a/core/java/android/hardware/camera2/OWNERS b/core/java/android/hardware/camera2/OWNERS index 18acfee14555..f48a95c5b3a3 100644 --- a/core/java/android/hardware/camera2/OWNERS +++ b/core/java/android/hardware/camera2/OWNERS @@ -1,6 +1 @@ -cychen@google.com -epeev@google.com -etalvala@google.com -shuzhenwang@google.com -yinchiayeh@google.com -zhijunhe@google.com +include platform/frameworks/av:/camera/OWNERS diff --git a/core/java/android/hardware/radio/RadioManager.java b/core/java/android/hardware/radio/RadioManager.java index 92653d188893..a7ff64412fc3 100644 --- a/core/java/android/hardware/radio/RadioManager.java +++ b/core/java/android/hardware/radio/RadioManager.java @@ -1761,7 +1761,7 @@ public class RadioManager { TunerCallbackAdapter halCallback = new TunerCallbackAdapter(callback, handler); try { tuner = mService.openTuner(moduleId, config, withAudio, halCallback); - } catch (RemoteException | IllegalArgumentException ex) { + } catch (RemoteException | IllegalArgumentException | IllegalStateException ex) { Log.e(TAG, "Failed to open tuner", ex); return null; } diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 403b44d6d7d7..f1e4f64ef87e 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -219,4 +219,6 @@ interface IConnectivityManager void registerTetheringEventCallback(ITetheringEventCallback callback, String callerPkg); void unregisterTetheringEventCallback(ITetheringEventCallback callback, String callerPkg); + + IBinder startOrGetTestNetworkService(); } diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index ff551d46fb2a..6f0a1f29a3cf 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -21,12 +21,12 @@ import android.annotation.Nullable; import android.content.pm.ApplicationInfo; import android.net.LocalSocket; import android.net.LocalSocketAddress; -import android.provider.DeviceConfig; import android.util.Log; import android.util.Slog; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.Zygote; +import com.android.internal.os.ZygoteConfig; import java.io.BufferedWriter; import java.io.DataInputStream; @@ -147,7 +147,7 @@ public class ZygoteProcess { final DataInputStream mZygoteInputStream; final BufferedWriter mZygoteOutputWriter; - private final List<String> mABIList; + private final List<String> mAbiList; private boolean mClosed; @@ -162,7 +162,7 @@ public class ZygoteProcess { this.mZygoteSessionSocket = zygoteSessionSocket; this.mZygoteInputStream = zygoteInputStream; this.mZygoteOutputWriter = zygoteOutputWriter; - this.mABIList = abiList; + this.mAbiList = abiList; } /** @@ -215,7 +215,7 @@ public class ZygoteProcess { } boolean matches(String abi) { - return mABIList.contains(abi); + return mAbiList.contains(abi); } public void close() { @@ -338,7 +338,7 @@ public class ZygoteProcess { try { return startViaZygote(processClass, niceName, uid, gid, gids, runtimeFlags, mountExternal, targetSdkVersion, seInfo, - abi, instructionSet, appDataDir, invokeWith, /*startChildZygote=*/false, + abi, instructionSet, appDataDir, invokeWith, /*startChildZygote=*/ false, packageName, packagesForUid, sandboxId, useUsapPool, zygoteArgs); } catch (ZygoteStartFailedEx ex) { @@ -374,7 +374,7 @@ public class ZygoteProcess { byte[] bytes = new byte[numBytes]; inputStream.readFully(bytes); - String rawList = new String(bytes, StandardCharsets.US_ASCII); + final String rawList = new String(bytes, StandardCharsets.US_ASCII); return Arrays.asList(rawList.split(",")); } @@ -659,16 +659,13 @@ public class ZygoteProcess { private boolean fetchUsapPoolEnabledProp() { boolean origVal = mUsapPoolEnabled; - final String propertyString = - Zygote.getSystemProperty( - DeviceConfig.RuntimeNative.USAP_POOL_ENABLED, - USAP_POOL_ENABLED_DEFAULT); + final String propertyString = Zygote.getConfigurationProperty( + ZygoteConfig.USAP_POOL_ENABLED, USAP_POOL_ENABLED_DEFAULT); if (!propertyString.isEmpty()) { - mUsapPoolEnabled = - Zygote.getSystemPropertyBoolean( - DeviceConfig.RuntimeNative.USAP_POOL_ENABLED, - Boolean.parseBoolean(USAP_POOL_ENABLED_DEFAULT)); + mUsapPoolEnabled = Zygote.getConfigurationPropertyBoolean( + ZygoteConfig.USAP_POOL_ENABLED, + Boolean.parseBoolean(USAP_POOL_ENABLED_DEFAULT)); } if (origVal != mUsapPoolEnabled) { diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl index f114b12cc3d1..25f67f81b70a 100644 --- a/core/java/android/os/storage/IStorageManager.aidl +++ b/core/java/android/os/storage/IStorageManager.aidl @@ -191,4 +191,6 @@ interface IStorageManager { String translateAppToSystem(String path, int pid, int uid) = 81; String translateSystemToApp(String path, int pid, int uid) = 82; void commitChanges() = 83; + boolean supportsCheckpoint() = 84; + void startCheckpoint(int numTries) = 85; } diff --git a/core/java/android/preference/DialogPreference.java b/core/java/android/preference/DialogPreference.java index e6564664d522..32511e9afbea 100644 --- a/core/java/android/preference/DialogPreference.java +++ b/core/java/android/preference/DialogPreference.java @@ -19,6 +19,7 @@ package android.preference; import android.annotation.CallSuper; import android.annotation.DrawableRes; +import android.annotation.Nullable; import android.annotation.StringRes; import android.annotation.UnsupportedAppUsage; import android.app.AlertDialog; @@ -354,6 +355,7 @@ public abstract class DialogPreference extends Preference implements * @return the DecorView for the current dialog window, if it exists. * If the window does not exist, null is returned. */ + @Nullable private View getDecorView() { if (mDialog != null && mDialog.getWindow() != null) { return mDialog.getWindow().getDecorView(); diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 7a0bb91d9f36..046ed2f9d3ad 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -78,6 +78,14 @@ public final class DeviceConfig { "activity_manager_native_boot"; /** + * Namespace for AttentionManagerService related features. + * + * @hide + */ + @SystemApi + public static final String NAMESPACE_ATTENTION_MANAGER_SERVICE = "attention_manager_service"; + + /** * Namespace for autofill feature that provides suggestions across all apps when * the user interacts with input fields. * @@ -131,118 +139,69 @@ public final class DeviceConfig { public static final String NAMESPACE_INPUT_NATIVE_BOOT = "input_native_boot"; /** - * Namespace for all media native related features. + * Namespace for attention-based features provided by on-device machine intelligence. * * @hide */ @SystemApi - public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; + public static final String NAMESPACE_INTELLIGENCE_ATTENTION = "intelligence_attention"; /** - * Namespace for all netd related features. + * Namespace for all media native related features. * * @hide */ @SystemApi - public static final String NAMESPACE_NETD_NATIVE = "netd_native"; + public static final String NAMESPACE_MEDIA_NATIVE = "media_native"; /** - * Namespace for all runtime native boot related features. Boot in this case refers to the - * fact that the properties only take affect after rebooting the device. + * Namespace for all netd related features. * * @hide */ @SystemApi - public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot"; + public static final String NAMESPACE_NETD_NATIVE = "netd_native"; /** - * Namespace for System UI related features. + * Namespace for all runtime related features. * * @hide */ @SystemApi - public static final String NAMESPACE_SYSTEMUI = "systemui"; + public static final String NAMESPACE_RUNTIME = "runtime"; /** - * Namespace for TextClassifier related features. + * Namespace for all runtime native related features. * * @hide */ @SystemApi - public static final String NAMESPACE_TEXTCLASSIFIER = "textclassifier"; + public static final String NAMESPACE_RUNTIME_NATIVE = "runtime_native"; /** - * Namespace for all runtime related features. + * Namespace for all runtime native boot related features. Boot in this case refers to the + * fact that the properties only take affect after rebooting the device. * * @hide */ @SystemApi - public interface Runtime { - String NAMESPACE = "runtime"; - - /** - * Whether or not we use the precompiled layout. - */ - String USE_PRECOMPILED_LAYOUT = "view.precompiled_layout_enabled"; - } + public static final String NAMESPACE_RUNTIME_NATIVE_BOOT = "runtime_native_boot"; /** - * Namespace for all runtime native related features. + * Namespace for System UI related features. * * @hide */ @SystemApi - public interface RuntimeNative { - String NAMESPACE = "runtime_native"; - - /** - * Zygote flags. See {@link com.internal.os.Zygote}. - */ - - /** - * If {@code true}, enables the unspecialized app process (USAP) pool feature. - * - * @hide for internal use only - */ - String USAP_POOL_ENABLED = "usap_pool_enabled"; - - /** - * The maximum number of processes to keep in the USAP pool. - * - * @hide for internal use only - */ - String USAP_POOL_SIZE_MAX = "usap_pool_size_max"; - - /** - * The minimum number of processes to keep in the USAP pool. - * - * @hide for internal use only - */ - String USAP_POOL_SIZE_MIN = "usap_pool_size_min"; - - /** - * The threshold used to determine if the pool should be refilled. - * - * @hide for internal use only - */ - String USAP_POOL_REFILL_THRESHOLD = "usap_refill_threshold"; - } + public static final String NAMESPACE_SYSTEMUI = "systemui"; /** - * Namespace for attention-based features provided by on-device machine intelligence. + * Namespace for TextClassifier related features. * * @hide */ @SystemApi - public interface IntelligenceAttention { - String NAMESPACE = "intelligence_attention"; - - /** If {@code true}, enables the attention features. */ - String ATTENTION_ENABLED = "attention_enabled"; - - /** Settings for the attention features. */ - String ATTENTION_SETTINGS = "attention_settings"; - } + public static final String NAMESPACE_TEXTCLASSIFIER = "textclassifier"; /** * Privacy related properties definitions. @@ -299,22 +258,6 @@ public final class DeviceConfig { } /** - * Namespace for {@link AttentionManagerService} related features. - * - * @hide - */ - @SystemApi - public interface AttentionManagerService { - String NAMESPACE = "attention_manager_service"; - - /** If {@code true}, enables {@link AttentionManagerService} features. */ - String SERVICE_ENABLED = "service_enabled"; - - /** Allows a CTS to inject a fake implementation. */ - String COMPONENT_NAME = "component_name"; - } - - /** * Namespace for Rollback. * * @hide @@ -420,7 +363,7 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(READ_DEVICE_CONFIG) - public static String getProperty(String namespace, String name) { + public static String getProperty(@NonNull String namespace, @NonNull String name) { ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); String compositeName = createCompositeName(namespace, name); return Settings.Config.getString(contentResolver, compositeName); @@ -439,7 +382,8 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(READ_DEVICE_CONFIG) - public static String getString(String namespace, String name, String defaultValue) { + public static String getString(@NonNull String namespace, @NonNull String name, + @Nullable String defaultValue) { String value = getProperty(namespace, name); return value != null ? value : defaultValue; } @@ -457,7 +401,8 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(READ_DEVICE_CONFIG) - public static boolean getBoolean(String namespace, String name, boolean defaultValue) { + public static boolean getBoolean(@NonNull String namespace, @NonNull String name, + boolean defaultValue) { String value = getProperty(namespace, name); return value != null ? Boolean.parseBoolean(value) : defaultValue; } @@ -475,7 +420,7 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(READ_DEVICE_CONFIG) - public static int getInt(String namespace, String name, int defaultValue) { + public static int getInt(@NonNull String namespace, @NonNull String name, int defaultValue) { String value = getProperty(namespace, name); if (value == null) { return defaultValue; @@ -501,7 +446,7 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(READ_DEVICE_CONFIG) - public static long getLong(String namespace, String name, long defaultValue) { + public static long getLong(@NonNull String namespace, @NonNull String name, long defaultValue) { String value = getProperty(namespace, name); if (value == null) { return defaultValue; @@ -527,7 +472,8 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(READ_DEVICE_CONFIG) - public static float getFloat(String namespace, String name, float defaultValue) { + public static float getFloat(@NonNull String namespace, @NonNull String name, + float defaultValue) { String value = getProperty(namespace, name); if (value == null) { return defaultValue; @@ -562,10 +508,10 @@ public final class DeviceConfig { @SystemApi @TestApi @RequiresPermission(WRITE_DEVICE_CONFIG) - public static boolean setProperty( - String namespace, String name, String value, boolean makeDefault) { - ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); + public static boolean setProperty(@NonNull String namespace, @NonNull String name, + @Nullable String value, boolean makeDefault) { String compositeName = createCompositeName(namespace, name); + ContentResolver contentResolver = ActivityThread.currentApplication().getContentResolver(); return Settings.Config.putString(contentResolver, compositeName, value, makeDefault); } @@ -708,11 +654,14 @@ public final class DeviceConfig { } } - private static String createCompositeName(String namespace, String name) { + private static String createCompositeName(@NonNull String namespace, @NonNull String name) { + Preconditions.checkNotNull(namespace); + Preconditions.checkNotNull(name); return namespace + "/" + name; } - private static Uri createNamespaceUri(String namespace) { + private static Uri createNamespaceUri(@NonNull String namespace) { + Preconditions.checkNotNull(namespace); return CONTENT_URI.buildUpon().appendPath(namespace).build(); } @@ -724,7 +673,8 @@ public final class DeviceConfig { * @param namespace The namespace to increment the count for. */ @GuardedBy("sLock") - private static void incrementNamespace(String namespace) { + private static void incrementNamespace(@NonNull String namespace) { + Preconditions.checkNotNull(namespace); Pair<ContentObserver, Integer> namespaceCount = sNamespaces.get(namespace); if (namespaceCount != null) { sNamespaces.put(namespace, new Pair<>(namespaceCount.first, namespaceCount.second + 1)); @@ -733,7 +683,9 @@ public final class DeviceConfig { ContentObserver contentObserver = new ContentObserver(null) { @Override public void onChange(boolean selfChange, Uri uri) { - handleChange(uri); + if (uri != null) { + handleChange(uri); + } } }; ActivityThread.currentApplication().getContentResolver() @@ -750,7 +702,8 @@ public final class DeviceConfig { * @param namespace The namespace to decrement the count for. */ @GuardedBy("sLock") - private static void decrementNamespace(String namespace) { + private static void decrementNamespace(@NonNull String namespace) { + Preconditions.checkNotNull(namespace); Pair<ContentObserver, Integer> namespaceCount = sNamespaces.get(namespace); if (namespaceCount == null) { // This namespace is not registered and does not need to be decremented @@ -765,7 +718,8 @@ public final class DeviceConfig { } } - private static void handleChange(Uri uri) { + private static void handleChange(@NonNull Uri uri) { + Preconditions.checkNotNull(uri); List<String> pathSegments = uri.getPathSegments(); // pathSegments(0) is "config" final String namespace = pathSegments.get(1); @@ -821,7 +775,8 @@ public final class DeviceConfig { * @param name The name of the property which has changed. * @param value The new value of the property which has changed. */ - void onPropertyChanged(String namespace, String name, String value); + void onPropertyChanged(@NonNull String namespace, @NonNull String name, + @Nullable String value); } /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a750c7917fc2..df5da6c6a5e3 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6344,7 +6344,6 @@ public final class Settings { * Number of times the user has manually clicked the ringer toggle * @hide */ - @SystemApi public static final String MANUAL_RINGER_TOGGLE_COUNT = "manual_ringer_toggle_count"; private static final Validator MANUAL_RINGER_TOGGLE_COUNT_VALIDATOR = @@ -8517,9 +8516,15 @@ public final class Settings { @SystemApi public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture"; - /** @hide */ public static final int VOLUME_HUSH_OFF = 0; - /** @hide */ public static final int VOLUME_HUSH_VIBRATE = 1; - /** @hide */ public static final int VOLUME_HUSH_MUTE = 2; + /** @hide */ + @SystemApi + public static final int VOLUME_HUSH_OFF = 0; + /** @hide */ + @SystemApi + public static final int VOLUME_HUSH_VIBRATE = 1; + /** @hide */ + @SystemApi + public static final int VOLUME_HUSH_MUTE = 2; private static final Validator VOLUME_HUSH_GESTURE_VALIDATOR = NON_NEGATIVE_INTEGER_VALIDATOR; @@ -9048,27 +9053,12 @@ public final class Settings { * @return true if the provider is enabled * * @deprecated use {@link LocationManager#isProviderEnabled(String)} + * @removed no longer supported */ @Deprecated - public static final boolean isLocationProviderEnabled(ContentResolver cr, String provider) { - return isLocationProviderEnabledForUser(cr, provider, cr.getUserId()); - } - - /** - * Helper method for determining if a location provider is enabled. - * @param cr the content resolver to use - * @param provider the location provider to query - * @param userId the userId to query - * @return true if the provider is enabled - * - * @deprecated use {@link LocationManager#isProviderEnabled(String)} - * @hide - */ - @Deprecated - public static final boolean isLocationProviderEnabledForUser( - ContentResolver cr, String provider, int userId) { + public static boolean isLocationProviderEnabled(ContentResolver cr, String provider) { String allowedProviders = Settings.Secure.getStringForUser(cr, - LOCATION_PROVIDERS_ALLOWED, userId); + LOCATION_PROVIDERS_ALLOWED, cr.getUserId()); return TextUtils.delimitedStringContains(allowedProviders, ',', provider); } @@ -9077,42 +9067,12 @@ public final class Settings { * @param cr the content resolver to use * @param provider the location provider to enable or disable * @param enabled true if the provider should be enabled - * @deprecated This API is deprecated. It requires WRITE_SECURE_SETTINGS permission to - * change location settings. + * @deprecated This API is deprecated + * @removed no longer supported */ @Deprecated - public static final void setLocationProviderEnabled(ContentResolver cr, + public static void setLocationProviderEnabled(ContentResolver cr, String provider, boolean enabled) { - setLocationProviderEnabledForUser(cr, provider, enabled, cr.getUserId()); - } - - /** - * Thread-safe method for enabling or disabling a single location provider. - * - * @param cr the content resolver to use - * @param provider the location provider to enable or disable - * @param enabled true if the provider should be enabled - * @param userId the userId for which to enable/disable providers - * @return true if the value was set, false on database errors - * - * @deprecated use {@link LocationManager#setProviderEnabledForUser(String, boolean, int)} - * @hide - */ - @Deprecated - public static final boolean setLocationProviderEnabledForUser(ContentResolver cr, - String provider, boolean enabled, int userId) { - synchronized (mLocationSettingsLock) { - // to ensure thread safety, we write the provider name with a '+' or '-' - // and let the SettingsProvider handle it rather than reading and modifying - // the list of enabled providers. - if (enabled) { - provider = "+" + provider; - } else { - provider = "-" + provider; - } - return putStringForUser(cr, Settings.Secure.LOCATION_PROVIDERS_ALLOWED, provider, - userId); - } } } @@ -12018,6 +11978,8 @@ public final class Settings { * notification_conversation_action_types_default (String[]) * lang_id_threshold_override (float) * template_intent_factory_enabled (boolean) + * translate_in_classification_enabled (boolean) + * detect_language_from_text_enabled (boolean) * </pre> * * <p> diff --git a/core/java/android/service/attention/AttentionService.java b/core/java/android/service/attention/AttentionService.java index 24d74ffd747d..32f4ea9a23ed 100644 --- a/core/java/android/service/attention/AttentionService.java +++ b/core/java/android/service/attention/AttentionService.java @@ -18,6 +18,7 @@ package android.service.attention; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.SystemApi; import android.app.Service; import android.content.Intent; @@ -111,8 +112,9 @@ public abstract class AttentionService extends Service { } }; + @Nullable @Override - public final IBinder onBind(Intent intent) { + public final IBinder onBind(@NonNull Intent intent) { if (SERVICE_INTERFACE.equals(intent.getAction())) { return mBinder; } diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java index 192abd5912ab..6f4114d1d81a 100644 --- a/core/java/android/service/contentcapture/ContentCaptureService.java +++ b/core/java/android/service/contentcapture/ContentCaptureService.java @@ -102,9 +102,10 @@ public abstract class ContentCaptureService extends Service { @Override public void onSessionStarted(ContentCaptureContext context, String sessionId, int uid, - IResultReceiver clientReceiver) { + IResultReceiver clientReceiver, int initialState) { mHandler.sendMessage(obtainMessage(ContentCaptureService::handleOnCreateSession, - ContentCaptureService.this, context, sessionId, uid, clientReceiver)); + ContentCaptureService.this, context, sessionId, uid, clientReceiver, + initialState)); } @Override @@ -335,7 +336,7 @@ public abstract class ContentCaptureService extends Service { // so we don't need to create a temporary InteractionSessionId for each event. private void handleOnCreateSession(@NonNull ContentCaptureContext context, - @NonNull String sessionId, int uid, IResultReceiver clientReceiver) { + @NonNull String sessionId, int uid, IResultReceiver clientReceiver, int initialState) { mSessionUids.put(sessionId, uid); onCreateContentCaptureSession(context, new ContentCaptureSessionId(sessionId)); @@ -348,7 +349,7 @@ public abstract class ContentCaptureService extends Service { stateFlags |= ContentCaptureSession.STATE_BY_APP; } if (stateFlags == 0) { - stateFlags = ContentCaptureSession.STATE_ACTIVE; + stateFlags = initialState; } else { stateFlags |= ContentCaptureSession.STATE_DISABLED; diff --git a/core/java/android/service/contentcapture/IContentCaptureService.aidl b/core/java/android/service/contentcapture/IContentCaptureService.aidl index f32432f099c0..6be7a80653e9 100644 --- a/core/java/android/service/contentcapture/IContentCaptureService.aidl +++ b/core/java/android/service/contentcapture/IContentCaptureService.aidl @@ -36,7 +36,7 @@ oneway interface IContentCaptureService { void onConnected(IBinder callback, boolean verbose, boolean debug); void onDisconnected(); void onSessionStarted(in ContentCaptureContext context, String sessionId, int uid, - in IResultReceiver clientReceiver); + in IResultReceiver clientReceiver, int initialState); void onSessionFinished(String sessionId); void onActivitySnapshot(String sessionId, in SnapshotData snapshotData); void onUserDataRemovalRequest(in UserDataRemovalRequest request); diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index fb6dc228e786..bf0ef9465fcd 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -2192,26 +2192,26 @@ public abstract class Layout { */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) public static class TabStops { - private int[] mStops; + private float[] mStops; private int mNumStops; - private int mIncrement; + private float mIncrement; - public TabStops(int increment, Object[] spans) { + public TabStops(float increment, Object[] spans) { reset(increment, spans); } - void reset(int increment, Object[] spans) { + void reset(float increment, Object[] spans) { this.mIncrement = increment; int ns = 0; if (spans != null) { - int[] stops = this.mStops; + float[] stops = this.mStops; for (Object o : spans) { if (o instanceof TabStopSpan) { if (stops == null) { - stops = new int[10]; + stops = new float[10]; } else if (ns == stops.length) { - int[] nstops = new int[ns * 2]; + float[] nstops = new float[ns * 2]; for (int i = 0; i < ns; ++i) { nstops[i] = stops[i]; } @@ -2233,9 +2233,9 @@ public abstract class Layout { float nextTab(float h) { int ns = this.mNumStops; if (ns > 0) { - int[] stops = this.mStops; + float[] stops = this.mStops; for (int i = 0; i < ns; ++i) { - int stop = stops[i]; + float stop = stops[i]; if (stop > h) { return stop; } @@ -2244,7 +2244,10 @@ public abstract class Layout { return nextDefaultStop(h, mIncrement); } - public static float nextDefaultStop(float h, int inc) { + /** + * Returns the position of next tab stop. + */ + public static float nextDefaultStop(float h, float inc) { return ((int) ((h + inc) / inc)) * inc; } } @@ -2582,7 +2585,7 @@ public abstract class Layout { ALIGN_RIGHT, } - private static final int TAB_INCREMENT = 20; + private static final float TAB_INCREMENT = 20; /** @hide */ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 9fefc83056ac..69cfc03a7ff8 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -737,14 +737,14 @@ public class StaticLayout extends Layout { } } // tab stop locations - int[] variableTabStops = null; + float[] variableTabStops = null; if (spanned != null) { TabStopSpan[] spans = getParagraphSpans(spanned, paraStart, paraEnd, TabStopSpan.class); if (spans.length > 0) { - int[] stops = new int[spans.length]; + float[] stops = new float[spans.length]; for (int i = 0; i < spans.length; i++) { - stops[i] = spans[i].getTabStop(); + stops[i] = (float) spans[i].getTabStop(); } Arrays.sort(stops, 0, stops.length); variableTabStops = stops; @@ -1422,7 +1422,7 @@ public class StaticLayout extends Layout { private static final int START_HYPHEN_MASK = 0x18; // 0b11000 private static final int END_HYPHEN_MASK = 0x7; // 0b00111 - private static final int TAB_INCREMENT = 20; // same as Layout, but that's private + private static final float TAB_INCREMENT = 20; // same as Layout, but that's private private static final char CHAR_NEW_LINE = '\n'; diff --git a/core/java/android/view/LayoutInflater.java b/core/java/android/view/LayoutInflater.java index 2e27737782fa..35cf129d81b8 100644 --- a/core/java/android/view/LayoutInflater.java +++ b/core/java/android/view/LayoutInflater.java @@ -83,6 +83,10 @@ public abstract class LayoutInflater { private static final boolean DEBUG = false; private static final String COMPILED_VIEW_DEX_FILE_NAME = "/compiled_view.dex"; + /** + * Whether or not we use the precompiled layout. + */ + private static final String USE_PRECOMPILED_LAYOUT = "view.precompiled_layout_enabled"; /** Empty stack trace used to avoid log spam in re-throw exceptions. */ private static final StackTraceElement[] EMPTY_STACK_TRACE = new StackTraceElement[0]; @@ -416,15 +420,15 @@ public abstract class LayoutInflater { String usePrecompiledLayout = null; try { usePrecompiledLayout = DeviceConfig.getProperty( - DeviceConfig.Runtime.NAMESPACE, - DeviceConfig.Runtime.USE_PRECOMPILED_LAYOUT); + DeviceConfig.NAMESPACE_RUNTIME, + USE_PRECOMPILED_LAYOUT); } catch (Exception e) { // May be caused by permission errors reading the property (i.e. instant apps). } boolean enabled = false; if (TextUtils.isEmpty(usePrecompiledLayout)) { enabled = SystemProperties.getBoolean( - DeviceConfig.Runtime.USE_PRECOMPILED_LAYOUT, + USE_PRECOMPILED_LAYOUT, false); } else { enabled = Boolean.parseBoolean(usePrecompiledLayout); diff --git a/core/java/android/view/contentcapture/ContentCaptureContext.java b/core/java/android/view/contentcapture/ContentCaptureContext.java index b9dc0dd99a1d..019ebffccc13 100644 --- a/core/java/android/view/contentcapture/ContentCaptureContext.java +++ b/core/java/android/view/contentcapture/ContentCaptureContext.java @@ -71,10 +71,21 @@ public final class ContentCaptureContext implements Parcelable { @TestApi public static final int FLAG_DISABLED_BY_FLAG_SECURE = 0x2; + /** + * Flag used when the event is sent because the Android System reconnected to the service (for + * example, after its process died). + * + * @hide + */ + @SystemApi + @TestApi + public static final int FLAG_RECONNECTED = 0x4; + /** @hide */ @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_DISABLED_BY_APP, - FLAG_DISABLED_BY_FLAG_SECURE + FLAG_DISABLED_BY_FLAG_SECURE, + FLAG_RECONNECTED }) @Retention(RetentionPolicy.SOURCE) @interface ContextCreationFlags{} @@ -126,6 +137,17 @@ public final class ContentCaptureContext implements Parcelable { mDisplayId = Display.INVALID_DISPLAY; } + /** @hide */ + public ContentCaptureContext(@Nullable ContentCaptureContext original, int extraFlags) { + mHasClientContext = original.mHasClientContext; + mExtras = original.mExtras; + mId = original.mId; + mComponentName = original.mComponentName; + mTaskId = original.mTaskId; + mFlags = original.mFlags | extraFlags; + mDisplayId = original.mDisplayId; + } + /** * Gets the (optional) extras set by the app (through {@link Builder#setExtras(Bundle)}). * @@ -199,8 +221,8 @@ public final class ContentCaptureContext implements Parcelable { /** * Gets the flags associated with this context. * - * @return any combination of {@link #FLAG_DISABLED_BY_FLAG_SECURE} and - * {@link #FLAG_DISABLED_BY_APP}. + * @return any combination of {@link #FLAG_DISABLED_BY_FLAG_SECURE}, + * {@link #FLAG_DISABLED_BY_APP} and {@link #FLAG_RECONNECTED}. * * @hide */ diff --git a/core/java/android/view/contentcapture/ContentCaptureEvent.java b/core/java/android/view/contentcapture/ContentCaptureEvent.java index 67d3629eeb49..8188e0592b9d 100644 --- a/core/java/android/view/contentcapture/ContentCaptureEvent.java +++ b/core/java/android/view/contentcapture/ContentCaptureEvent.java @@ -303,6 +303,47 @@ public final class ContentCaptureEvent implements Parcelable { return mText; } + /** + * Merges event of the same type, either {@link #TYPE_VIEW_TEXT_CHANGED} + * or {@link #TYPE_VIEW_DISAPPEARED}. + * + * @hide + */ + public void mergeEvent(@NonNull ContentCaptureEvent event) { + Preconditions.checkNotNull(event); + final int eventType = event.getType(); + if (mType != eventType) { + Log.e(TAG, "mergeEvent(" + getTypeAsString(eventType) + ") cannot be merged " + + "with different eventType=" + getTypeAsString(mType)); + return; + } + + if (eventType == TYPE_VIEW_DISAPPEARED) { + final List<AutofillId> ids = event.getIds(); + final AutofillId id = event.getId(); + if (ids != null) { + if (id != null) { + Log.w(TAG, "got TYPE_VIEW_DISAPPEARED event with both id and ids: " + event); + } + for (int i = 0; i < ids.size(); i++) { + addAutofillId(ids.get(i)); + } + return; + } + if (id != null) { + addAutofillId(id); + return; + } + throw new IllegalArgumentException("mergeEvent(): got " + + "TYPE_VIEW_DISAPPEARED event with neither id or ids: " + event); + } else if (eventType == TYPE_VIEW_TEXT_CHANGED) { + setText(event.getText()); + } else { + Log.e(TAG, "mergeEvent(" + getTypeAsString(eventType) + + ") does not support this event type."); + } + } + /** @hide */ public void dump(@NonNull PrintWriter pw) { pw.print("type="); pw.print(getTypeAsString(mType)); diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index 1f0971e7d6c5..ebac6293d376 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java @@ -127,6 +127,20 @@ public abstract class ContentCaptureSession implements AutoCloseable { */ public static final int STATE_NOT_WHITELISTED = 0x200; + /** + * Session is disabled because the service died. + * + * @hide + */ + public static final int STATE_SERVICE_DIED = 0x400; + + /** + * Session is enabled, after the service died and came back to live. + * + * @hide + */ + public static final int STATE_SERVICE_RESURRECTED = 0x800; + private static final int INITIAL_CHILDREN_CAPACITY = 5; /** @hide */ diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index dce8ebe66111..f9fd0c6ffe00 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -128,6 +128,12 @@ public final class MainContentCaptureSession extends ContentCaptureSession { @Nullable private final LocalLog mFlushHistory; + /** + * Binder object used to update the session state. + */ + @NonNull + private final IResultReceiver.Stub mSessionStateReceiver; + protected MainContentCaptureSession(@NonNull Context context, @NonNull ContentCaptureManager manager, @NonNull Handler handler, @NonNull IContentCaptureManager systemServerInterface) { @@ -138,6 +144,26 @@ public final class MainContentCaptureSession extends ContentCaptureSession { final int logHistorySize = mManager.mOptions.logHistorySize; mFlushHistory = logHistorySize > 0 ? new LocalLog(logHistorySize) : null; + + mSessionStateReceiver = new IResultReceiver.Stub() { + @Override + public void send(int resultCode, Bundle resultData) { + final IBinder binder; + if (resultData != null) { + binder = resultData.getBinder(EXTRA_BINDER); + if (binder == null) { + Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result"); + mHandler.post(() -> resetSession( + STATE_DISABLED | STATE_INTERNAL_ERROR)); + return; + } + } else { + binder = null; + } + mHandler.post(() -> onSessionStarted(resultCode, binder)); + } + }; + } @Override @@ -185,24 +211,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { try { mSystemServerInterface.startSession(mApplicationToken, component, mId, flags, - new IResultReceiver.Stub() { - @Override - public void send(int resultCode, Bundle resultData) { - final IBinder binder; - if (resultData != null) { - binder = resultData.getBinder(EXTRA_BINDER); - if (binder == null) { - Log.wtf(TAG, "No " + EXTRA_BINDER + " extra result"); - mHandler.post(() -> resetSession( - STATE_DISABLED | STATE_INTERNAL_ERROR)); - return; - } - } else { - binder = null; - } - mHandler.post(() -> onSessionStarted(resultCode, binder)); - } - }); + mSessionStateReceiver); } catch (RemoteException e) { Log.w(TAG, "Error starting session for " + component.flattenToShortString() + ": " + e); } @@ -216,8 +225,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { /** * Callback from {@code system_server} after call to - * {@link IContentCaptureManager#startSession(IBinder, ComponentName, String, int, - * IResultReceiver)} + * {@link IContentCaptureManager#startSession(IBinder, ComponentName, String, int, IBinder)} * * @param resultCode session state * @param binder handle to {@code IContentCaptureDirectManager} @@ -227,8 +235,9 @@ public final class MainContentCaptureSession extends ContentCaptureSession { if (binder != null) { mDirectServiceInterface = IContentCaptureDirectManager.Stub.asInterface(binder); mDirectServiceVulture = () -> { - Log.w(TAG, "Destroying session " + mId + " because service died"); - destroy(); + Log.w(TAG, "Keeping session " + mId + " when service died"); + mState = STATE_SERVICE_DIED; + mDisabled.set(true); }; try { binder.linkToDeath(mDirectServiceVulture, 0); @@ -295,8 +304,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { Log.v(TAG, "Buffering VIEW_TEXT_CHANGED event, updated text=" + getSanitizedString(event.getText())); } - // TODO(b/124107816): should call lastEvent.merge(event) instead - lastEvent.setText(event.getText()); + lastEvent.mergeEvent(event); addEvent = false; } } @@ -309,7 +317,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { Log.v(TAG, "Buffering TYPE_VIEW_DISAPPEARED events for session " + lastEvent.getSessionId()); } - mergeViewsDisappearedEvent(lastEvent, event); + lastEvent.mergeEvent(event); addEvent = false; } } @@ -357,30 +365,6 @@ public final class MainContentCaptureSession extends ContentCaptureSession { flush(flushReason); } - // TODO(b/124107816): should be ContentCaptureEvent Event.merge(event) instead (which would - // replace the addAutofillId() method - we would also need unit tests on ContentCaptureEventTest - // to check these scenarios) - private void mergeViewsDisappearedEvent(@NonNull ContentCaptureEvent lastEvent, - @NonNull ContentCaptureEvent event) { - final List<AutofillId> ids = event.getIds(); - final AutofillId id = event.getId(); - if (ids != null) { - if (id != null) { - Log.w(TAG, "got TYPE_VIEW_DISAPPEARED event with both id and ids: " + event); - } - for (int i = 0; i < ids.size(); i++) { - lastEvent.addAutofillId(ids.get(i)); - } - return; - } - if (id != null) { - lastEvent.addAutofillId(id); - return; - } - throw new IllegalArgumentException( - "got TYPE_VIEW_DISAPPEARED event with neither id or ids: " + event); - } - @UiThread private boolean hasStarted() { return mState != UNKNOWN_STATE; diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index e63a406411d8..5e00425407ba 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -2559,6 +2559,12 @@ public final class InputMethodManager { mPendingEventPool.release(p); } + /** + * Show IME picker popup window. + * + * <p>Requires the {@link PackageManager#FEATURE_INPUT_METHODS} feature which can be detected + * using {@link PackageManager#hasSystemFeature(String)}. + */ public void showInputMethodPicker() { synchronized (mH) { showInputMethodPickerLocked(); diff --git a/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java b/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java index ddbff7bc915f..17edf5c209de 100644 --- a/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java +++ b/core/java/android/view/textclassifier/ActionsSuggestionsHelper.java @@ -82,9 +82,12 @@ public final class ActionsSuggestionsHelper { long referenceTime = message.getReferenceTime() == null ? 0 : message.getReferenceTime().toInstant().toEpochMilli(); + String timeZone = message.getReferenceTime() == null + ? null + : message.getReferenceTime().getZone().getId(); nativeMessages.push(new ActionsSuggestionsModel.ConversationMessage( personEncoder.encode(message.getAuthor()), - message.getText().toString(), referenceTime, + message.getText().toString(), referenceTime, timeZone, languageDetector.apply(message.getText()))); } return nativeMessages.toArray( diff --git a/core/java/android/view/textclassifier/TextClassificationConstants.java b/core/java/android/view/textclassifier/TextClassificationConstants.java index 125b0d311511..38e72e34facf 100644 --- a/core/java/android/view/textclassifier/TextClassificationConstants.java +++ b/core/java/android/view/textclassifier/TextClassificationConstants.java @@ -48,6 +48,8 @@ import java.util.StringJoiner; * notification_conversation_action_types_default (String[]) * lang_id_threshold_override (float) * template_intent_factory_enabled (boolean) + * translate_in_classification_enabled (boolean) + * detect_languages_from_text_enabled (boolean) * </pre> * * <p> @@ -139,7 +141,7 @@ public final class TextClassificationConstants { private static final String NOTIFICATION_CONVERSATION_ACTION_TYPES_DEFAULT = "notification_conversation_action_types_default"; /** - * Threshold in classifyText to consider a text is in a foreign language. + * Threshold to accept a suggested language from LangID model. */ private static final String LANG_ID_THRESHOLD_OVERRIDE = "lang_id_threshold_override"; /** @@ -147,6 +149,18 @@ public final class TextClassificationConstants { */ private static final String TEMPLATE_INTENT_FACTORY_ENABLED = "template_intent_factory_enabled"; + /** + * Whether to enable "translate" action in classifyText. + */ + private static final String TRANSLATE_IN_CLASSIFICATION_ENABLED = + "translate_in_classification_enabled"; + /** + * Whether to detect the languages of the text in request by using langId for the native + * model. + */ + private static final String DETECT_LANGUAGES_FROM_TEXT_ENABLED = + "detect_languages_from_text_enabled"; + private static final boolean LOCAL_TEXT_CLASSIFIER_ENABLED_DEFAULT = true; private static final boolean SYSTEM_TEXT_CLASSIFIER_ENABLED_DEFAULT = true; private static final boolean MODEL_DARK_LAUNCH_ENABLED_DEFAULT = false; @@ -183,11 +197,13 @@ public final class TextClassificationConstants { /** * < 0 : Not set. Use value from LangId model. * 0 - 1: Override value in LangId model. - * > 1 : Effectively turns off the foreign language detection. Scores should never be > 1. + * * @see EntityConfidence */ private static final float LANG_ID_THRESHOLD_OVERRIDE_DEFAULT = -1f; private static final boolean TEMPLATE_INTENT_FACTORY_ENABLED_DEFAULT = true; + private static final boolean TRANSLATE_IN_CLASSIFICATION_ENABLED_DEFAULT = true; + private static final boolean DETECT_LANGUAGES_FROM_TEXT_ENABLED_DEFAULT = true; private final boolean mSystemTextClassifierEnabled; private final boolean mLocalTextClassifierEnabled; @@ -207,6 +223,8 @@ public final class TextClassificationConstants { private final List<String> mNotificationConversationActionTypesDefault; private final float mLangIdThresholdOverride; private final boolean mTemplateIntentFactoryEnabled; + private final boolean mTranslateInClassificationEnabled; + private final boolean mDetectLanguagesFromTextEnabled; private TextClassificationConstants(@Nullable String settings) { ConfigParser configParser = new ConfigParser(settings); @@ -280,6 +298,10 @@ public final class TextClassificationConstants { mTemplateIntentFactoryEnabled = configParser.getBoolean( TEMPLATE_INTENT_FACTORY_ENABLED, TEMPLATE_INTENT_FACTORY_ENABLED_DEFAULT); + mTranslateInClassificationEnabled = configParser.getBoolean( + TRANSLATE_IN_CLASSIFICATION_ENABLED, TRANSLATE_IN_CLASSIFICATION_ENABLED_DEFAULT); + mDetectLanguagesFromTextEnabled = configParser.getBoolean( + DETECT_LANGUAGES_FROM_TEXT_ENABLED, DETECT_LANGUAGES_FROM_TEXT_ENABLED_DEFAULT); } /** Load from a settings string. */ @@ -359,6 +381,14 @@ public final class TextClassificationConstants { return mTemplateIntentFactoryEnabled; } + public boolean isTranslateInClassificationEnabled() { + return mTranslateInClassificationEnabled; + } + + public boolean isDetectLanguagesFromTextEnabled() { + return mDetectLanguagesFromTextEnabled; + } + private static List<String> parseStringList(String listStr) { return Collections.unmodifiableList(Arrays.asList(listStr.split(STRING_LIST_DELIMITER))); } @@ -385,6 +415,8 @@ public final class TextClassificationConstants { mNotificationConversationActionTypesDefault); pw.printPair("getLangIdThresholdOverride", mLangIdThresholdOverride); pw.printPair("isTemplateIntentFactoryEnabled", mTemplateIntentFactoryEnabled); + pw.printPair("isTranslateInClassificationEnabled", mTranslateInClassificationEnabled); + pw.printPair("isDetectLanguageFromTextEnabled", mDetectLanguagesFromTextEnabled); pw.decreaseIndent(); pw.println(); } diff --git a/core/java/android/view/textclassifier/TextClassifierImpl.java b/core/java/android/view/textclassifier/TextClassifierImpl.java index 35cd678dedbb..0f3a8cfc6c43 100644 --- a/core/java/android/view/textclassifier/TextClassifierImpl.java +++ b/core/java/android/view/textclassifier/TextClassifierImpl.java @@ -164,6 +164,7 @@ public final class TextClassifierImpl implements TextClassifier { if (string.length() > 0 && rangeLength <= mSettings.getSuggestSelectionMaxRangeLength()) { final String localesString = concatenateLocales(request.getDefaultLocales()); + final String detectLanguageTags = detectLanguageTagsFromText(request.getText()); final ZonedDateTime refTime = ZonedDateTime.now(); final AnnotatorModel annotatorImpl = getAnnotatorImpl(request.getDefaultLocales()); @@ -175,7 +176,7 @@ public final class TextClassifierImpl implements TextClassifier { } else { final int[] startEnd = annotatorImpl.suggestSelection( string, request.getStartIndex(), request.getEndIndex(), - new AnnotatorModel.SelectionOptions(localesString)); + new AnnotatorModel.SelectionOptions(localesString, detectLanguageTags)); start = startEnd[0]; end = startEnd[1]; } @@ -189,7 +190,8 @@ public final class TextClassifierImpl implements TextClassifier { new AnnotatorModel.ClassificationOptions( refTime.toInstant().toEpochMilli(), refTime.getZone().getId(), - localesString), + localesString, + detectLanguageTags), // Passing null here to suppress intent generation // TODO: Use an explicit flag to suppress it. /* appContext */ null, @@ -227,6 +229,7 @@ public final class TextClassifierImpl implements TextClassifier { final String string = request.getText().toString(); if (string.length() > 0 && rangeLength <= mSettings.getClassifyTextMaxRangeLength()) { final String localesString = concatenateLocales(request.getDefaultLocales()); + final String detectLanguageTags = detectLanguageTagsFromText(request.getText()); final ZonedDateTime refTime = request.getReferenceTime() != null ? request.getReferenceTime() : ZonedDateTime.now(); final AnnotatorModel.ClassificationResult[] results = @@ -236,9 +239,10 @@ public final class TextClassifierImpl implements TextClassifier { new AnnotatorModel.ClassificationOptions( refTime.toInstant().toEpochMilli(), refTime.getZone().getId(), - localesString), + localesString, + detectLanguageTags), mContext, - getResourceLocaleString() + getResourceLocalesString() ); if (results.length > 0) { return createClassificationResult( @@ -276,6 +280,8 @@ public final class TextClassifierImpl implements TextClassifier { ? request.getEntityConfig().resolveEntityListModifications( getEntitiesForHints(request.getEntityConfig().getHints())) : mSettings.getEntityListDefault(); + final String localesString = concatenateLocales(request.getDefaultLocales()); + final String detectLanguageTags = detectLanguageTagsFromText(request.getText()); final AnnotatorModel annotatorImpl = getAnnotatorImpl(request.getDefaultLocales()); final AnnotatorModel.AnnotatedSpan[] annotations = @@ -284,7 +290,8 @@ public final class TextClassifierImpl implements TextClassifier { new AnnotatorModel.AnnotationOptions( refTime.toInstant().toEpochMilli(), refTime.getZone().getId(), - concatenateLocales(request.getDefaultLocales()))); + localesString, + detectLanguageTags)); for (AnnotatorModel.AnnotatedSpan span : annotations) { final AnnotatorModel.ClassificationResult[] results = span.getClassification(); @@ -386,8 +393,8 @@ public final class TextClassifierImpl implements TextClassifier { return mFallback.suggestConversationActions(request); } ActionsSuggestionsModel.ConversationMessage[] nativeMessages = - ActionsSuggestionsHelper.toNativeMessages(request.getConversation(), - this::detectLanguageTagsFromText); + ActionsSuggestionsHelper.toNativeMessages( + request.getConversation(), this::detectLanguageTagsFromText); if (nativeMessages.length == 0) { return mFallback.suggestConversationActions(request); } @@ -399,7 +406,7 @@ public final class TextClassifierImpl implements TextClassifier { nativeConversation, null, mContext, - getResourceLocaleString()); + getResourceLocalesString()); return createConversationActionResult(request, nativeSuggestions); } catch (Throwable t) { // Avoid throwing from this method. Log the error. @@ -463,19 +470,28 @@ public final class TextClassifierImpl implements TextClassifier { @Nullable private String detectLanguageTagsFromText(CharSequence text) { + if (!mSettings.isDetectLanguagesFromTextEnabled()) { + return null; + } + final float threshold = getLangIdThreshold(); + if (threshold < 0 || threshold > 1) { + Log.w(LOG_TAG, + "[detectLanguageTagsFromText] unexpected threshold is found: " + threshold); + return null; + } TextLanguage.Request request = new TextLanguage.Request.Builder(text).build(); TextLanguage textLanguage = detectLanguage(request); int localeHypothesisCount = textLanguage.getLocaleHypothesisCount(); List<String> languageTags = new ArrayList<>(); for (int i = 0; i < localeHypothesisCount; i++) { ULocale locale = textLanguage.getLocale(i); - if (textLanguage.getConfidenceScore(locale) < getForeignLanguageThreshold()) { + if (textLanguage.getConfidenceScore(locale) < threshold) { break; } languageTags.add(locale.toLanguageTag()); } if (languageTags.isEmpty()) { - return LocaleList.getDefault().toLanguageTags(); + return null; } return String.join(",", languageTags); } @@ -644,10 +660,14 @@ public final class TextClassifierImpl implements TextClassifier { // TODO: Consider making this public API. @Nullable private Bundle detectForeignLanguage(String text) { + if (!mSettings.isTranslateInClassificationEnabled()) { + return null; + } try { - final float threshold = getForeignLanguageThreshold(); - if (threshold > 1) { - Log.v(LOG_TAG, "Foreign language detection disabled."); + final float threshold = getLangIdThreshold(); + if (threshold < 0 || threshold > 1) { + Log.w(LOG_TAG, + "[detectForeignLanguage] unexpected threshold is found: " + threshold); return null; } @@ -686,11 +706,11 @@ public final class TextClassifierImpl implements TextClassifier { return null; } - private float getForeignLanguageThreshold() { + private float getLangIdThreshold() { try { return mSettings.getLangIdThresholdOverride() >= 0 ? mSettings.getLangIdThresholdOverride() - : getLangIdImpl().getTranslateThreshold(); + : getLangIdImpl().getLangIdThreshold(); } catch (FileNotFoundException e) { final float defaultThreshold = 0.5f; Log.v(LOG_TAG, "Using default foreign language threshold: " + defaultThreshold); @@ -746,15 +766,14 @@ public final class TextClassifierImpl implements TextClassifier { } /** - * Returns the locale string for the current resources configuration. + * Returns the locales string for the current resources configuration. */ - private String getResourceLocaleString() { - // TODO: Pass the locale list once it is supported in native side. + private String getResourceLocalesString() { try { - return mContext.getResources().getConfiguration().getLocales().get(0).toLanguageTag(); + return mContext.getResources().getConfiguration().getLocales().toLanguageTags(); } catch (NullPointerException e) { // NPE is unexpected. Erring on the side of caution. - return LocaleList.getDefault().get(0).toLanguageTag(); + return LocaleList.getDefault().toLanguageTags(); } } } diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index 528a6a84c630..6d88530f29d9 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -448,7 +448,8 @@ public final class WebViewFactory { Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.getChromiumProviderClass()"); try { - new WebViewDelegate().addWebViewAssetPath(initialApplication); + initialApplication.getAssets().addAssetPathAsSharedLibrary( + webViewContext.getApplicationInfo().sourceDir); ClassLoader clazzLoader = webViewContext.getClassLoader(); Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "WebViewFactory.loadNativeLibrary()"); diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 89e205caa693..8785251b0a64 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -17,6 +17,7 @@ package android.widget; import android.annotation.DrawableRes; +import android.annotation.IntDef; import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources.Theme; @@ -44,6 +45,8 @@ import android.view.inspector.InspectableProperty; import com.android.internal.R; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.ref.WeakReference; /** @@ -1259,9 +1262,20 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe } /** + * The valid input method modes for the {@link AutoCompleteTextView}: + * + * {@hide} + */ + @IntDef({ListPopupWindow.INPUT_METHOD_FROM_FOCUSABLE, + ListPopupWindow.INPUT_METHOD_NEEDED, + ListPopupWindow.INPUT_METHOD_NOT_NEEDED}) + @Retention(RetentionPolicy.SOURCE) + public @interface InputMethodMode {} + + /** * Returns the input method mode used by the auto complete dropdown. */ - public int getInputMethodMode() { + public @InputMethodMode int getInputMethodMode() { return mPopup.getInputMethodMode(); } @@ -1277,7 +1291,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe * {@link ListPopupWindow#INPUT_METHOD_NOT_NEEDED}. The auto-complete suggestions are always * displayed, even if the suggestions cover/hide the input method. */ - public void setInputMethodMode(int mode) { + public void setInputMethodMode(@InputMethodMode int mode) { mPopup.setInputMethodMode(mode); } diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 03e7e10aaf84..20fc0b1a9f0b 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -886,6 +886,32 @@ public class PopupWindow { * containing window<p/> * * @return true if popup will be clipped to the screen instead of the window, false otherwise + * @deprecated Use {@link #isClippedToScreen()} instead + */ + @Deprecated + public boolean isClipToScreenEnabled() { + return mClipToScreen; + } + + /** + * <p>Clip this popup window to the screen, but not to the containing window.</p> + * + * <p>If the popup is showing, calling this method will take effect only + * the next time the popup is shown or through a manual call to one of + * the {@link #update()} methods.</p> + * + * @deprecated Use {@link #setIsClippedToScreen(boolean)} instead + */ + @Deprecated + public void setClipToScreenEnabled(boolean enabled) { + mClipToScreen = enabled; + } + + /** + * <p>Indicates whether this popup will be clipped to the screen and not to the + * containing window<p/> + * + * @return true if popup will be clipped to the screen instead of the window, false otherwise * * @see #setIsClippedToScreen(boolean) */ @@ -961,6 +987,32 @@ public class PopupWindow { * * @return true if the window will always be positioned in screen coordinates. * + * @deprecated Use {@link #isLaidOutInScreen()} instead + */ + @Deprecated + public boolean isLayoutInScreenEnabled() { + return mLayoutInScreen; + } + + /** + * <p>Allows the popup window to force the flag + * {@link WindowManager.LayoutParams#FLAG_LAYOUT_IN_SCREEN}, overriding default behavior. + * This will cause the popup to be positioned in absolute screen coordinates.</p> + * + * @param enabled true if the popup should always be positioned in screen coordinates + * @deprecated Use {@link #setIsLaidOutInScreen(boolean)} instead + */ + @Deprecated + public void setLayoutInScreenEnabled(boolean enabled) { + mLayoutInScreen = enabled; + } + + /** + * <p>Indicates whether the popup window will be forced into using absolute screen coordinates + * for positioning.</p> + * + * @return true if the window will always be positioned in screen coordinates. + * * @see #setIsLaidOutInScreen(boolean) */ public boolean isLaidOutInScreen() { diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 8d8ec4df4433..f250666012f6 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -42,7 +42,6 @@ import android.content.IntentFilter; import android.content.IntentSender; import android.content.IntentSender.SendIntentException; import android.content.ServiceConnection; -import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.LabeledIntent; import android.content.pm.LauncherApps; @@ -65,7 +64,6 @@ import android.metrics.LogMaker; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.os.Environment; import android.os.Handler; import android.os.IBinder; import android.os.Message; @@ -75,7 +73,6 @@ import android.os.RemoteException; import android.os.ResultReceiver; import android.os.UserHandle; import android.os.UserManager; -import android.os.storage.StorageManager; import android.provider.DocumentsContract; import android.provider.Downloads; import android.provider.OpenableColumns; @@ -114,7 +111,6 @@ import com.android.internal.util.ImageUtils; import com.google.android.collect.Lists; -import java.io.File; import java.io.IOException; import java.lang.annotation.Retention; import java.util.ArrayList; @@ -188,10 +184,7 @@ public class ChooserActivity extends ResolverActivity { private Drawable mChooserRowLayer; private int mChooserRowServiceSpacing; - private SharedPreferences mPinnedSharedPrefs; - private static final float PINNED_TARGET_SCORE_BOOST = 1000.f; private static final float CALLER_TARGET_SCORE_BOOST = 900.f; - private static final String PINNED_SHARED_PREFS_NAME = "chooser_pin_settings"; private static final String TARGET_DETAILS_FRAGMENT_TAG = "targetDetailsFragment"; private final List<ChooserTargetServiceConnection> mServiceConnections = new ArrayList<>(); @@ -385,7 +378,6 @@ public class ChooserActivity extends ResolverActivity { mCallerChooserTargets = targets; } - mPinnedSharedPrefs = getPinnedSharedPrefs(this); setRetainInOnStop(intent.getBooleanExtra(EXTRA_PRIVATE_RETAIN_IN_ON_STOP, false)); super.onCreate(savedInstanceState, target, title, defaultTitleRes, initialIntents, null, false); @@ -461,29 +453,6 @@ public class ChooserActivity extends ResolverActivity { .getUserInfo(UserHandle.myUserId()).isManagedProfile(); } - /** - * Override method to add content preview area, specific to the chooser activity. - */ - @Override - public void setHeader() { - super.setHeader(); - - final Intent targetIntent = getTargetIntent(); - if (!isSendAction(targetIntent)) { - return; - } - - if (mChooserListAdapter == null || mChooserListAdapter.getCount() == 0) { - return; - } - - int previewType = findPreferredContentPreview(targetIntent, getContentResolver()); - - getMetricsLogger().write(new LogMaker(MetricsEvent.ACTION_SHARE_WITH_PREVIEW) - .setSubtype(previewType)); - displayContentPreview(previewType, targetIntent); - } - private void onCopyButtonClicked(View v) { Intent targetIntent = getTargetIntent(); if (targetIntent == null) { @@ -543,46 +512,56 @@ public class ChooserActivity extends ResolverActivity { private void updateLayoutWidth(int layoutResourceId, int width) { View view = findViewById(layoutResourceId); - LayoutParams params = view.getLayoutParams(); - params.width = width; - view.setLayoutParams(params); + if (view != null && view.getLayoutParams() != null) { + LayoutParams params = view.getLayoutParams(); + params.width = width; + view.setLayoutParams(params); + } } - private void displayContentPreview(@ContentPreviewType int previewType, Intent targetIntent) { + private ViewGroup displayContentPreview(@ContentPreviewType int previewType, + Intent targetIntent, LayoutInflater layoutInflater, ViewGroup convertView, + ViewGroup parent) { switch (previewType) { case CONTENT_PREVIEW_TEXT: - displayTextContentPreview(targetIntent); - break; + return displayTextContentPreview(targetIntent, layoutInflater, convertView, parent); case CONTENT_PREVIEW_IMAGE: - displayImageContentPreview(targetIntent); - break; + return displayImageContentPreview(targetIntent, layoutInflater, convertView, + parent); case CONTENT_PREVIEW_FILE: - displayFileContentPreview(targetIntent); - break; + return displayFileContentPreview(targetIntent, layoutInflater, convertView, parent); default: Log.e(TAG, "Unexpected content preview type: " + previewType); } + + return null; } - private void displayTextContentPreview(Intent targetIntent) { - ViewGroup contentPreviewLayout = findViewById(R.id.content_preview_text_area); - contentPreviewLayout.setVisibility(View.VISIBLE); + private ViewGroup displayTextContentPreview(Intent targetIntent, LayoutInflater layoutInflater, + ViewGroup convertView, ViewGroup parent) { + ViewGroup contentPreviewLayout = + convertView != null ? convertView : (ViewGroup) layoutInflater.inflate( + R.layout.chooser_grid_preview_text, parent, false); - findViewById(R.id.copy_button).setOnClickListener(this::onCopyButtonClicked); + contentPreviewLayout.findViewById(R.id.copy_button).setOnClickListener( + this::onCopyButtonClicked); CharSequence sharingText = targetIntent.getCharSequenceExtra(Intent.EXTRA_TEXT); if (sharingText == null) { - findViewById(R.id.content_preview_text_layout).setVisibility(View.GONE); + contentPreviewLayout.findViewById(R.id.content_preview_text_layout).setVisibility( + View.GONE); } else { - TextView textView = findViewById(R.id.content_preview_text); + TextView textView = contentPreviewLayout.findViewById(R.id.content_preview_text); textView.setText(sharingText); } String previewTitle = targetIntent.getStringExtra(Intent.EXTRA_TITLE); if (TextUtils.isEmpty(previewTitle)) { - findViewById(R.id.content_preview_title_layout).setVisibility(View.GONE); + contentPreviewLayout.findViewById(R.id.content_preview_title_layout).setVisibility( + View.GONE); } else { - TextView previewTitleView = findViewById(R.id.content_preview_title); + TextView previewTitleView = contentPreviewLayout.findViewById( + R.id.content_preview_title); previewTitleView.setText(previewTitle); ClipData previewData = targetIntent.getClipData(); @@ -594,7 +573,8 @@ public class ChooserActivity extends ResolverActivity { } } - ImageView previewThumbnailView = findViewById(R.id.content_preview_thumbnail); + ImageView previewThumbnailView = contentPreviewLayout.findViewById( + R.id.content_preview_thumbnail); if (previewThumbnail == null) { previewThumbnailView.setVisibility(View.GONE); } else { @@ -606,16 +586,20 @@ public class ChooserActivity extends ResolverActivity { } } } + + return contentPreviewLayout; } - private void displayImageContentPreview(Intent targetIntent) { - ViewGroup contentPreviewLayout = findViewById(R.id.content_preview_image_area); - contentPreviewLayout.setVisibility(View.VISIBLE); + private ViewGroup displayImageContentPreview(Intent targetIntent, LayoutInflater layoutInflater, + ViewGroup convertView, ViewGroup parent) { + ViewGroup contentPreviewLayout = + convertView != null ? convertView : (ViewGroup) layoutInflater.inflate( + R.layout.chooser_grid_preview_image, parent, false); String action = targetIntent.getAction(); if (Intent.ACTION_SEND.equals(action)) { Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM); - loadUriIntoView(R.id.content_preview_image_1_large, uri); + loadUriIntoView(R.id.content_preview_image_1_large, uri, contentPreviewLayout); } else { ContentResolver resolver = getContentResolver(); @@ -631,23 +615,28 @@ public class ChooserActivity extends ResolverActivity { Log.i(TAG, "Attempted to display image preview area with zero" + " available images detected in EXTRA_STREAM list"); contentPreviewLayout.setVisibility(View.GONE); - return; + return contentPreviewLayout; } - loadUriIntoView(R.id.content_preview_image_1_large, imageUris.get(0)); + loadUriIntoView(R.id.content_preview_image_1_large, imageUris.get(0), + contentPreviewLayout); if (imageUris.size() == 2) { - loadUriIntoView(R.id.content_preview_image_2_large, imageUris.get(1)); + loadUriIntoView(R.id.content_preview_image_2_large, imageUris.get(1), + contentPreviewLayout); } else if (imageUris.size() > 2) { - loadUriIntoView(R.id.content_preview_image_2_small, imageUris.get(1)); + loadUriIntoView(R.id.content_preview_image_2_small, imageUris.get(1), + contentPreviewLayout); RoundedRectImageView imageView = loadUriIntoView( - R.id.content_preview_image_3_small, imageUris.get(2)); + R.id.content_preview_image_3_small, imageUris.get(2), contentPreviewLayout); if (imageUris.size() > 3) { imageView.setExtraImageCount(imageUris.size() - 3); } } } + + return contentPreviewLayout; } private static class FileInfo { @@ -706,18 +695,21 @@ public class ChooserActivity extends ResolverActivity { return new FileInfo(fileName, hasThumbnail); } - private void displayFileContentPreview(Intent targetIntent) { - ViewGroup contentPreviewLayout = findViewById(R.id.content_preview_file_area); - contentPreviewLayout.setVisibility(View.VISIBLE); + private ViewGroup displayFileContentPreview(Intent targetIntent, LayoutInflater layoutInflater, + ViewGroup convertView, ViewGroup parent) { + + ViewGroup contentPreviewLayout = + convertView != null ? convertView : (ViewGroup) layoutInflater.inflate( + R.layout.chooser_grid_preview_file, parent, false); // TODO(b/120417119): Disable file copy until after moving to sysui, // due to permissions issues - findViewById(R.id.file_copy_button).setVisibility(View.GONE); + contentPreviewLayout.findViewById(R.id.file_copy_button).setVisibility(View.GONE); String action = targetIntent.getAction(); if (Intent.ACTION_SEND.equals(action)) { Uri uri = targetIntent.getParcelableExtra(Intent.EXTRA_STREAM); - loadFileUriIntoView(uri); + loadFileUriIntoView(uri, contentPreviewLayout); } else { List<Uri> uris = targetIntent.getParcelableArrayListExtra(Intent.EXTRA_STREAM); int uriCount = uris.size(); @@ -727,42 +719,46 @@ public class ChooserActivity extends ResolverActivity { Log.i(TAG, "Appears to be no uris available in EXTRA_STREAM, removing " + "preview area"); - return; + return contentPreviewLayout; } else if (uriCount == 1) { - loadFileUriIntoView(uris.get(0)); + loadFileUriIntoView(uris.get(0), contentPreviewLayout); } else { FileInfo fileInfo = extractFileInfo(uris.get(0), getContentResolver()); int remUriCount = uriCount - 1; String fileName = getResources().getQuantityString(R.plurals.file_count, remUriCount, fileInfo.name, remUriCount); - TextView fileNameView = findViewById(R.id.content_preview_filename); + TextView fileNameView = contentPreviewLayout.findViewById( + R.id.content_preview_filename); fileNameView.setText(fileName); - ImageView fileIconView = findViewById(R.id.content_preview_file_icon); + ImageView fileIconView = contentPreviewLayout.findViewById( + R.id.content_preview_file_icon); fileIconView.setVisibility(View.VISIBLE); fileIconView.setImageResource(R.drawable.ic_file_copy); } } + + return contentPreviewLayout; } - private void loadFileUriIntoView(Uri uri) { + private void loadFileUriIntoView(Uri uri, View parent) { FileInfo fileInfo = extractFileInfo(uri, getContentResolver()); - TextView fileNameView = findViewById(R.id.content_preview_filename); + TextView fileNameView = parent.findViewById(R.id.content_preview_filename); fileNameView.setText(fileInfo.name); if (fileInfo.hasThumbnail) { - loadUriIntoView(R.id.content_preview_file_thumbnail, uri); + loadUriIntoView(R.id.content_preview_file_thumbnail, uri, parent); } else { - ImageView fileIconView = findViewById(R.id.content_preview_file_icon); + ImageView fileIconView = parent.findViewById(R.id.content_preview_file_icon); fileIconView.setVisibility(View.VISIBLE); fileIconView.setImageResource(R.drawable.ic_doc_generic); } } - private RoundedRectImageView loadUriIntoView(int imageResourceId, Uri uri) { - RoundedRectImageView imageView = findViewById(imageResourceId); + private RoundedRectImageView loadUriIntoView(int imageResourceId, Uri uri, View parent) { + RoundedRectImageView imageView = parent.findViewById(imageResourceId); Bitmap bmp = loadThumbnail(uri, new Size(200, 200)); if (bmp != null) { imageView.setVisibility(View.VISIBLE); @@ -817,22 +813,6 @@ public class ChooserActivity extends ResolverActivity { return CONTENT_PREVIEW_TEXT; } - static SharedPreferences getPinnedSharedPrefs(Context context) { - // The code below is because in the android:ui process, no one can hear you scream. - // The package info in the context isn't initialized in the way it is for normal apps, - // so the standard, name-based context.getSharedPreferences doesn't work. Instead, we - // build the path manually below using the same policy that appears in ContextImpl. - // This fails silently under the hood if there's a problem, so if we find ourselves in - // the case where we don't have access to credential encrypted storage we just won't - // have our pinned target info. - final File prefsFile = new File(new File( - Environment.getDataUserCePackageDirectory(StorageManager.UUID_PRIVATE_INTERNAL, - context.getUserId(), context.getPackageName()), - "shared_prefs"), - PINNED_SHARED_PREFS_NAME + ".xml"); - return context.getSharedPreferences(prefsFile, MODE_PRIVATE); - } - @Override protected void onDestroy() { super.onDestroy(); @@ -928,10 +908,9 @@ public class ChooserActivity extends ResolverActivity { } ComponentName name = ri.activityInfo.getComponentName(); - boolean pinned = mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); ResolverTargetActionsDialogFragment f = new ResolverTargetActionsDialogFragment(ri.loadLabel(getPackageManager()), - name, pinned); + name); f.show(getFragmentManager(), TARGET_DETAILS_FRAGMENT_TAG); } @@ -991,15 +970,15 @@ public class ChooserActivity extends ResolverActivity { switch (mChooserListAdapter.getPositionTargetType(which)) { case ChooserListAdapter.TARGET_CALLER: cat = MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET; + value -= mChooserListAdapter.getSelectableServiceTargetCount(); break; case ChooserListAdapter.TARGET_SERVICE: cat = MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET; - value -= mChooserListAdapter.getCallerTargetCount(); break; case ChooserListAdapter.TARGET_STANDARD: cat = MetricsEvent.ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET; value -= mChooserListAdapter.getCallerTargetCount() - + mChooserListAdapter.getServiceTargetCount(); + + mChooserListAdapter.getSelectableServiceTargetCount(); break; } @@ -1385,11 +1364,6 @@ public class ChooserActivity extends ResolverActivity { } @Override - boolean isComponentPinned(ComponentName name) { - return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); - } - - @Override boolean isComponentFiltered(ComponentName name) { if (mFilteredComponentNames == null) { return false; @@ -1407,11 +1381,8 @@ public class ChooserActivity extends ResolverActivity { if (target == null) { return CALLER_TARGET_SCORE_BOOST; } - float score = super.getScore(target); - if (target.isPinned()) { - score += PINNED_TARGET_SCORE_BOOST; - } - return score; + + return super.getScore(target); } } @@ -1508,10 +1479,6 @@ public class ChooserActivity extends ResolverActivity { return null; } - public boolean isPinned() { - return false; - } - public float getModifiedScore() { return 0.1f; } @@ -1742,11 +1709,6 @@ public class ChooserActivity extends ResolverActivity { } return results; } - - @Override - public boolean isPinned() { - return mSourceInfo != null ? mSourceInfo.isPinned() : false; - } } private void handleScroll(View view, int x, int y, int oldx, int oldy) { @@ -1855,11 +1817,6 @@ public class ChooserActivity extends ResolverActivity { } @Override - public boolean isComponentPinned(ComponentName name) { - return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false); - } - - @Override public View onCreateView(ViewGroup parent) { return mInflater.inflate( com.android.internal.R.layout.resolve_grid_item, parent, false); @@ -2109,6 +2066,7 @@ public class ChooserActivity extends ResolverActivity { private static final int VIEW_TYPE_DIRECT_SHARE = 0; private static final int VIEW_TYPE_NORMAL = 1; + private static final int VIEW_TYPE_CONTENT_PREVIEW = 2; public ChooserRowAdapter(ChooserListAdapter wrappedAdapter) { mChooserListAdapter = wrappedAdapter; @@ -2137,7 +2095,8 @@ public class ChooserActivity extends ResolverActivity { @Override public int getCount() { return (int) ( - getCallerTargetRowCount() + getContentPreviewRowCount() + + getCallerTargetRowCount() + getServiceTargetRowCount() + Math.ceil( (float) mChooserListAdapter.getStandardTargetCount() @@ -2145,6 +2104,18 @@ public class ChooserActivity extends ResolverActivity { ); } + public int getContentPreviewRowCount() { + if (!isSendAction(getTargetIntent())) { + return 0; + } + + if (mChooserListAdapter == null || mChooserListAdapter.getCount() == 0) { + return 0; + } + + return 1; + } + public int getCallerTargetRowCount() { return (int) Math.ceil( (float) mChooserListAdapter.getCallerTargetCount() / getMaxTargetsPerRow()); @@ -2175,20 +2146,29 @@ public class ChooserActivity extends ResolverActivity { final RowViewHolder holder; int viewType = getItemViewType(position); + if (viewType == VIEW_TYPE_CONTENT_PREVIEW) { + return createContentPreviewView(convertView, parent); + } + if (convertView == null) { holder = createViewHolder(viewType, parent); } else { holder = (RowViewHolder) convertView.getTag(); } - bindViewHolder(position, holder, viewType == VIEW_TYPE_DIRECT_SHARE - ? ChooserListAdapter.MAX_SERVICE_TARGETS : getMaxTargetsPerRow()); + bindViewHolder(position, holder, + viewType == VIEW_TYPE_DIRECT_SHARE + ? ChooserListAdapter.MAX_SERVICE_TARGETS : getMaxTargetsPerRow()); return holder.getViewGroup(); } @Override public int getItemViewType(int position) { + if (position == 0 && getContentPreviewRowCount() == 1) { + return VIEW_TYPE_CONTENT_PREVIEW; + } + final int start = getFirstRowPosition(position); final int startType = mChooserListAdapter.getPositionTargetType(start); @@ -2201,7 +2181,20 @@ public class ChooserActivity extends ResolverActivity { @Override public int getViewTypeCount() { - return 2; + return 3; + } + + private ViewGroup createContentPreviewView(View convertView, ViewGroup parent) { + Intent targetIntent = getTargetIntent(); + int previewType = findPreferredContentPreview(targetIntent, getContentResolver()); + + if (convertView == null) { + getMetricsLogger().write(new LogMaker(MetricsEvent.ACTION_SHARE_WITH_PREVIEW) + .setSubtype(previewType)); + } + + return displayContentPreview(previewType, targetIntent, mLayoutInflater, + (ViewGroup) convertView, parent); } private RowViewHolder loadViewsIntoRow(RowViewHolder holder) { @@ -2291,7 +2284,7 @@ public class ChooserActivity extends ResolverActivity { final ViewGroup row = holder.getViewGroup(); - if (startType != lastStartType || rowPosition == 0) { + if (startType != lastStartType || rowPosition == getContentPreviewRowCount()) { row.setBackground(mChooserRowLayer); setVertPadding(row, mChooserRowServiceSpacing, 0); } else { @@ -2368,6 +2361,8 @@ public class ChooserActivity extends ResolverActivity { } int getFirstRowPosition(int row) { + row -= getContentPreviewRowCount(); + final int serviceCount = mChooserListAdapter.getServiceTargetCount(); final int serviceRows = (int) Math.ceil((float) serviceCount / ChooserListAdapter.MAX_SERVICE_TARGETS); @@ -2559,7 +2554,9 @@ public class ChooserActivity extends ResolverActivity { return; } - ViewGroup expansionGroup = (ViewGroup) view.getChildAt(0); + int index = mChooserRowAdapter.getContentPreviewRowCount(); + + ViewGroup expansionGroup = (ViewGroup) view.getChildAt(index); int widthSpec = MeasureSpec.makeMeasureSpec(expansionGroup.getWidth(), MeasureSpec.EXACTLY); int heightSpec = MeasureSpec.makeMeasureSpec(mDirectShareCurrHeight, @@ -2572,7 +2569,7 @@ public class ChooserActivity extends ResolverActivity { // reposition list items int items = view.getChildCount(); - for (int i = 1; i < items; i++) { + for (int i = index + 1; i < items; i++) { view.getChildAt(i).offsetTopAndBottom(yDiff); } } @@ -2749,7 +2746,7 @@ public class ChooserActivity extends ResolverActivity { final int chooserTargetRows = mChooserRowAdapter.getServiceTargetRowCount(); int offset = 0; for (int i = 0; i < chooserTargetRows; i++) { - final int pos = mChooserRowAdapter.getCallerTargetRowCount() + i; + final int pos = mChooserRowAdapter.getContentPreviewRowCount() + i; final int vt = mChooserRowAdapter.getItemViewType(pos); if (vt != mCachedViewType) { mCachedView = null; diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index c5fdc787d566..12942abc8159 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1210,7 +1210,6 @@ public class ResolverActivity extends Activity { private final CharSequence mExtendedInfo; private final Intent mResolvedIntent; private final List<Intent> mSourceIntents = new ArrayList<>(); - private boolean mPinned; public DisplayResolveInfo(Intent originalIntent, ResolveInfo pri, CharSequence pLabel, CharSequence pInfo, Intent pOrigIntent) { @@ -1237,7 +1236,6 @@ public class ResolverActivity extends Activity { mExtendedInfo = other.mExtendedInfo; mResolvedIntent = new Intent(other.mResolvedIntent); mResolvedIntent.fillIn(fillInIntent, flags); - mPinned = other.mPinned; } public ResolveInfo getResolveInfo() { @@ -1337,15 +1335,6 @@ public class ResolverActivity extends Activity { activity.startActivityAsUser(mResolvedIntent, options, user); return false; } - - @Override - public boolean isPinned() { - return mPinned; - } - - public void setPinned(boolean pinned) { - mPinned = pinned; - } } /** @@ -1447,11 +1436,6 @@ public class ResolverActivity extends Activity { * @return the list of supported source intents deduped against this single target */ List<Intent> getAllSourceIntents(); - - /** - * @return true if this target should be pinned to the front by the request of the user - */ - boolean isPinned(); } public class ResolveListAdapter extends BaseAdapter { @@ -1809,7 +1793,6 @@ public class ResolverActivity extends Activity { final Intent replaceIntent = getReplacementIntent(add.activityInfo, intent); final DisplayResolveInfo dri = new DisplayResolveInfo(intent, add, roLabel, extraInfo, replaceIntent); - dri.setPinned(rci.isPinned()); addResolveInfo(dri); if (replaceIntent == intent) { // Only add alternates if we didn't get a specific replacement from @@ -1954,10 +1937,6 @@ public class ResolverActivity extends Activity { return !TextUtils.isEmpty(info.getExtendedInfo()); } - public boolean isComponentPinned(ComponentName name) { - return false; - } - public final void bindView(int position, View view) { onBindView(view, getItem(position)); } @@ -2000,7 +1979,6 @@ public class ResolverActivity extends Activity { @VisibleForTesting public static final class ResolvedComponentInfo { public final ComponentName name; - private boolean mPinned; private final List<Intent> mIntents = new ArrayList<>(); private final List<ResolveInfo> mResolveInfos = new ArrayList<>(); @@ -2043,14 +2021,6 @@ public class ResolverActivity extends Activity { } return -1; } - - public boolean isPinned() { - return mPinned; - } - - public void setPinned(boolean pinned) { - mPinned = pinned; - } } static class ViewHolder { diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java index f61a03bccb78..b9f67e6e0521 100644 --- a/core/java/com/android/internal/app/ResolverComparator.java +++ b/core/java/com/android/internal/app/ResolverComparator.java @@ -325,30 +325,18 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> { } } - final boolean lPinned = lhsp.isPinned(); - final boolean rPinned = rhsp.isPinned(); - - if (lPinned && !rPinned) { - return -1; - } else if (!lPinned && rPinned) { - return 1; - } - - // Pinned items stay stable within a normal lexical sort and ignore scoring. - if (!lPinned && !rPinned) { - if (mStats != null) { - final ResolverTarget lhsTarget = mTargetsDict.get(new ComponentName( - lhs.activityInfo.packageName, lhs.activityInfo.name)); - final ResolverTarget rhsTarget = mTargetsDict.get(new ComponentName( - rhs.activityInfo.packageName, rhs.activityInfo.name)); - - if (lhsTarget != null && rhsTarget != null) { - final int selectProbabilityDiff = Float.compare( + if (mStats != null) { + final ResolverTarget lhsTarget = mTargetsDict.get(new ComponentName( + lhs.activityInfo.packageName, lhs.activityInfo.name)); + final ResolverTarget rhsTarget = mTargetsDict.get(new ComponentName( + rhs.activityInfo.packageName, rhs.activityInfo.name)); + + if (lhsTarget != null && rhsTarget != null) { + final int selectProbabilityDiff = Float.compare( rhsTarget.getSelectProbability(), lhsTarget.getSelectProbability()); - if (selectProbabilityDiff != 0) { - return selectProbabilityDiff > 0 ? 1 : -1; - } + if (selectProbabilityDiff != 0) { + return selectProbabilityDiff > 0 ? 1 : -1; } } } diff --git a/core/java/com/android/internal/app/ResolverListController.java b/core/java/com/android/internal/app/ResolverListController.java index 61aeca679303..f48102a9fcd4 100644 --- a/core/java/com/android/internal/app/ResolverListController.java +++ b/core/java/com/android/internal/app/ResolverListController.java @@ -30,14 +30,13 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.RemoteException; import android.util.Log; -import com.android.internal.annotations.GuardedBy; + import com.android.internal.annotations.VisibleForTesting; -import java.lang.InterruptedException; import java.util.ArrayList; import java.util.Collections; -import java.util.concurrent.CountDownLatch; import java.util.List; +import java.util.concurrent.CountDownLatch; /** * A helper for the ResolverActivity that exposes methods to retrieve, filter and sort its list of @@ -147,7 +146,6 @@ public class ResolverListController { newInfo.activityInfo.packageName, newInfo.activityInfo.name); final ResolverActivity.ResolvedComponentInfo rci = new ResolverActivity.ResolvedComponentInfo(name, intent, newInfo); - rci.setPinned(isComponentPinned(name)); into.add(rci); } } @@ -270,10 +268,6 @@ public class ResolverListController { && ai.name.equals(b.name.getClassName()); } - boolean isComponentPinned(ComponentName name) { - return false; - } - boolean isComponentFiltered(ComponentName componentName) { return false; } diff --git a/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java b/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java index 8156f79f3be3..a49240cd0019 100644 --- a/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java +++ b/core/java/com/android/internal/app/ResolverTargetActionsDialogFragment.java @@ -23,7 +23,6 @@ import android.app.DialogFragment; import android.content.ComponentName; import android.content.DialogInterface; import android.content.Intent; -import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; @@ -36,34 +35,27 @@ import com.android.internal.R; public class ResolverTargetActionsDialogFragment extends DialogFragment implements DialogInterface.OnClickListener { private static final String NAME_KEY = "componentName"; - private static final String PINNED_KEY = "pinned"; private static final String TITLE_KEY = "title"; // Sync with R.array.resolver_target_actions_* resources - private static final int TOGGLE_PIN_INDEX = 0; - private static final int APP_INFO_INDEX = 1; + private static final int APP_INFO_INDEX = 0; public ResolverTargetActionsDialogFragment() { } - public ResolverTargetActionsDialogFragment(CharSequence title, ComponentName name, - boolean pinned) { + public ResolverTargetActionsDialogFragment(CharSequence title, ComponentName name) { Bundle args = new Bundle(); args.putCharSequence(TITLE_KEY, title); args.putParcelable(NAME_KEY, name); - args.putBoolean(PINNED_KEY, pinned); setArguments(args); } @Override public Dialog onCreateDialog(Bundle savedInstanceState) { final Bundle args = getArguments(); - final int itemRes = args.getBoolean(PINNED_KEY, false) - ? R.array.resolver_target_actions_unpin - : R.array.resolver_target_actions_pin; return new Builder(getContext()) .setCancelable(true) - .setItems(itemRes, this) + .setItems(R.array.resolver_target_actions, this) .setTitle(args.getCharSequence(TITLE_KEY)) .create(); } @@ -73,19 +65,6 @@ public class ResolverTargetActionsDialogFragment extends DialogFragment final Bundle args = getArguments(); ComponentName name = args.getParcelable(NAME_KEY); switch (which) { - case TOGGLE_PIN_INDEX: - SharedPreferences sp = ChooserActivity.getPinnedSharedPrefs(getContext()); - final String key = name.flattenToString(); - boolean currentVal = sp.getBoolean(name.flattenToString(), false); - if (currentVal) { - sp.edit().remove(key).apply(); - } else { - sp.edit().putBoolean(key, true).apply(); - } - - // Force the chooser to requery and resort things - getActivity().recreate(); - break; case APP_INFO_INDEX: Intent in = new Intent().setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) .setData(Uri.fromParts("package", name.getPackageName(), null)) diff --git a/core/java/com/android/internal/infra/AbstractRemoteService.java b/core/java/com/android/internal/infra/AbstractRemoteService.java index 2e709de5ad53..eb881def5d67 100644 --- a/core/java/com/android/internal/infra/AbstractRemoteService.java +++ b/core/java/com/android/internal/infra/AbstractRemoteService.java @@ -614,6 +614,7 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I if (remoteService != null) { // TODO(b/117779333): we should probably ignore it if service is destroyed. Slog.w(mTag, "timed out after " + service.getRemoteRequestMillis() + " ms"); + remoteService.finishRequest(this); onTimeout(remoteService); } else { Slog.w(mTag, "timed out (no service)"); diff --git a/core/java/com/android/internal/os/KernelCpuThreadReader.java b/core/java/com/android/internal/os/KernelCpuThreadReader.java index 6a9db1004912..248e0266b70b 100644 --- a/core/java/com/android/internal/os/KernelCpuThreadReader.java +++ b/core/java/com/android/internal/os/KernelCpuThreadReader.java @@ -198,8 +198,8 @@ public class KernelCpuThreadReader { * * <p>This function will crawl through all process {@code proc} directories found by the pattern * {@code /proc/[0-9]*}, and then check the UID using {@code /proc/$PID/status}. This takes - * approximately 500ms on a Pixel 2. Therefore, this method can be computationally expensive, - * and should not be called more than once an hour. + * approximately 500ms on a 2017 device. Therefore, this method can be computationally + * expensive, and should not be called more than once an hour. * * <p>Data is only collected for UIDs passing the predicate supplied in {@link * #setUidPredicate}. @@ -283,7 +283,7 @@ public class KernelCpuThreadReader { if (threadCpuUsage == null) { continue; } - if (mMinimumTotalCpuUsageMillis < totalCpuUsage(threadCpuUsage.usageTimesMillis)) { + if (mMinimumTotalCpuUsageMillis > totalCpuUsage(threadCpuUsage.usageTimesMillis)) { if (filteredThreadsCpuUsage == null) { filteredThreadsCpuUsage = new int[mFrequenciesKhz.length]; } diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 70d8b453f5ae..992ddd8f1525 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -408,11 +408,11 @@ public final class Zygote { * TODO (chriswailes): Cache the system property location in native code and then write a JNI * function to fetch it. */ - public static String getSystemProperty(String propertyName, String defaultValue) { + public static String getConfigurationProperty(String propertyName, String defaultValue) { return SystemProperties.get( String.join(".", "persist.device_config", - DeviceConfig.RuntimeNative.NAMESPACE, + DeviceConfig.NAMESPACE_RUNTIME_NATIVE, propertyName), defaultValue); } @@ -433,12 +433,14 @@ public final class Zygote { * * TODO (chriswailes): Cache the system property location in native code and then write a JNI * function to fetch it. + * TODO (chriswailes): Move into ZygoteConfig.java once the necessary CL lands (go/ag/6580627) */ - public static boolean getSystemPropertyBoolean(String propertyName, Boolean defaultValue) { + public static boolean getConfigurationPropertyBoolean( + String propertyName, Boolean defaultValue) { return SystemProperties.getBoolean( String.join(".", "persist.device_config", - DeviceConfig.RuntimeNative.NAMESPACE, + DeviceConfig.NAMESPACE_RUNTIME_NATIVE, propertyName), defaultValue); } diff --git a/core/java/com/android/internal/os/ZygoteConfig.java b/core/java/com/android/internal/os/ZygoteConfig.java new file mode 100644 index 000000000000..c8ff51e77866 --- /dev/null +++ b/core/java/com/android/internal/os/ZygoteConfig.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 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.os; + +/** + * Flag names for configuring the zygote. + * + * @hide + */ +public class ZygoteConfig { + + /** If {@code true}, enables the unspecialized app process (USAP) pool feature */ + public static final String USAP_POOL_ENABLED = "blastula_pool_enabled"; + + /** The threshold used to determine if the pool should be refilled */ + public static final String USAP_POOL_REFILL_THRESHOLD = "blastula_refill_threshold"; + + /** The maximum number of processes to keep in the USAP pool */ + public static final String USAP_POOL_SIZE_MAX = "blastula_pool_size_max"; + + /** The minimum number of processes to keep in the USAP pool */ + public static final String USAP_POOL_SIZE_MIN = "blastula_pool_size_min"; +} diff --git a/core/java/com/android/internal/os/ZygoteServer.java b/core/java/com/android/internal/os/ZygoteServer.java index 4aff912104f5..3f3aba9b6682 100644 --- a/core/java/com/android/internal/os/ZygoteServer.java +++ b/core/java/com/android/internal/os/ZygoteServer.java @@ -22,7 +22,6 @@ import android.net.LocalServerSocket; import android.net.LocalSocket; import android.os.SystemClock; import android.os.Trace; -import android.provider.DeviceConfig; import android.system.ErrnoException; import android.system.Os; import android.system.StructPollfd; @@ -242,44 +241,33 @@ class ZygoteServer { private void fetchUsapPoolPolicyProps() { if (mUsapPoolSupported) { - final String usapPoolSizeMaxPropString = - Zygote.getSystemProperty( - DeviceConfig.RuntimeNative.USAP_POOL_SIZE_MAX, - USAP_POOL_SIZE_MAX_DEFAULT); + final String usapPoolSizeMaxPropString = Zygote.getConfigurationProperty( + ZygoteConfig.USAP_POOL_SIZE_MAX, USAP_POOL_SIZE_MAX_DEFAULT); if (!usapPoolSizeMaxPropString.isEmpty()) { - mUsapPoolSizeMax = - Integer.min( - Integer.parseInt(usapPoolSizeMaxPropString), - USAP_POOL_SIZE_MAX_LIMIT); + mUsapPoolSizeMax = Integer.min(Integer.parseInt( + usapPoolSizeMaxPropString), USAP_POOL_SIZE_MAX_LIMIT); } - final String usapPoolSizeMinPropString = - Zygote.getSystemProperty( - DeviceConfig.RuntimeNative.USAP_POOL_SIZE_MIN, - USAP_POOL_SIZE_MIN_DEFAULT); + final String usapPoolSizeMinPropString = Zygote.getConfigurationProperty( + ZygoteConfig.USAP_POOL_SIZE_MIN, USAP_POOL_SIZE_MIN_DEFAULT); if (!usapPoolSizeMinPropString.isEmpty()) { - mUsapPoolSizeMin = - Integer.max( - Integer.parseInt(usapPoolSizeMinPropString), - USAP_POOL_SIZE_MIN_LIMIT); + mUsapPoolSizeMin = Integer.max( + Integer.parseInt(usapPoolSizeMinPropString), USAP_POOL_SIZE_MIN_LIMIT); } - final String usapPoolRefillThresholdPropString = - Zygote.getSystemProperty( - DeviceConfig.RuntimeNative.USAP_POOL_REFILL_THRESHOLD, - Integer.toString(mUsapPoolSizeMax / 2)); + final String usapPoolRefillThresholdPropString = Zygote.getConfigurationProperty( + ZygoteConfig.USAP_POOL_REFILL_THRESHOLD, + Integer.toString(mUsapPoolSizeMax / 2)); if (!usapPoolRefillThresholdPropString.isEmpty()) { - mUsapPoolRefillThreshold = - Integer.min( - Integer.parseInt(usapPoolRefillThresholdPropString), - mUsapPoolSizeMax); + mUsapPoolRefillThreshold = Integer.min( + Integer.parseInt(usapPoolRefillThresholdPropString), + mUsapPoolSizeMax); } // Sanity check - if (mUsapPoolSizeMin >= mUsapPoolSizeMax) { Log.w(TAG, "The max size of the USAP pool must be greater than the minimum size." + " Restoring default values."); diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index 958bb18192fb..561dcad390a9 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -938,6 +938,7 @@ public class SystemConfig { } else { mBugreportWhitelistedPackages.add(pkgname); } + XmlUtils.skipCurrentTag(parser); } break; default: { Slog.w(TAG, "Tag " + name + " is unknown in " diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 8f007594dd67..e0b7629013fb 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -206,13 +206,14 @@ jobject createBitmap(JNIEnv* env, Bitmap* bitmap, // The caller needs to have already set the alpha type properly, so the // native SkBitmap stays in sync with the Java Bitmap. assert_premultiplied(bitmap->info(), isPremultiplied); + bool fromMalloc = bitmap->pixelStorageType() == PixelStorageType::Heap; BitmapWrapper* bitmapWrapper = new BitmapWrapper(bitmap); if (!isMutable) { bitmapWrapper->bitmap().setImmutable(); } jobject obj = env->NewObject(gBitmap_class, gBitmap_constructorMethodID, reinterpret_cast<jlong>(bitmapWrapper), bitmap->width(), bitmap->height(), density, - isPremultiplied, ninePatchChunk, ninePatchInsets); + isPremultiplied, ninePatchChunk, ninePatchInsets, fromMalloc); if (env->ExceptionCheck() != 0) { ALOGE("*** Uncaught exception returned from Java call!\n"); @@ -1224,7 +1225,7 @@ int register_android_graphics_Bitmap(JNIEnv* env) { gBitmap_class = MakeGlobalRefOrDie(env, FindClassOrDie(env, "android/graphics/Bitmap")); gBitmap_nativePtr = GetFieldIDOrDie(env, gBitmap_class, "mNativePtr", "J"); - gBitmap_constructorMethodID = GetMethodIDOrDie(env, gBitmap_class, "<init>", "(JIIIZ[BLandroid/graphics/NinePatch$InsetStruct;)V"); + gBitmap_constructorMethodID = GetMethodIDOrDie(env, gBitmap_class, "<init>", "(JIIIZ[BLandroid/graphics/NinePatch$InsetStruct;Z)V"); gBitmap_reinitMethodID = GetMethodIDOrDie(env, gBitmap_class, "reinit", "(IIZ)V"); gBitmap_getAllocationByteCountMethodID = GetMethodIDOrDie(env, gBitmap_class, "getAllocationByteCount", "()I"); return android::RegisterMethodsOrDie(env, "android/graphics/Bitmap", gBitmapMethods, diff --git a/core/jni/android/graphics/text/LineBreaker.cpp b/core/jni/android/graphics/text/LineBreaker.cpp index c23f1e956cd4..a23f99af5f9d 100644 --- a/core/jni/android/graphics/text/LineBreaker.cpp +++ b/core/jni/android/graphics/text/LineBreaker.cpp @@ -80,13 +80,13 @@ static jlong nComputeLineBreaks(JNIEnv* env, jclass, jlong nativePtr, jfloat firstWidth, jint firstWidthLineCount, jfloat restWidth, - jintArray variableTabStops, - jint defaultTabStop, + jfloatArray variableTabStops, + jfloat defaultTabStop, jint indentsOffset) { minikin::android::StaticLayoutNative* builder = toNative(nativePtr); ScopedCharArrayRO text(env, javaText); - ScopedNullableIntArrayRO tabStops(env, variableTabStops); + ScopedNullableFloatArrayRO tabStops(env, variableTabStops); minikin::U16StringPiece u16Text(text.get(), length); minikin::MeasuredText* measuredText = reinterpret_cast<minikin::MeasuredText*>(measuredTextPtr); @@ -151,8 +151,8 @@ static const JNINativeMethod gMethods[] = { "F" // firstWidth "I" // firstWidthLineCount "F" // restWidth - "[I" // variableTabStops - "I" // defaultTabStop + "[F" // variableTabStops + "F" // defaultTabStop "I" // indentsOffset ")J", (void*) nComputeLineBreaks}, diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index c6f62ca5ae5b..009a6ca70df2 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -352,7 +352,7 @@ static void SigChldHandler(int /*signal_number*/) { } if (usaps_removed > 0) { - if (write(gUsapPoolEventFD, &usaps_removed, sizeof(usaps_removed)) == -1) { + if (TEMP_FAILURE_RETRY(write(gUsapPoolEventFD, &usaps_removed, sizeof(usaps_removed))) == -1) { // If this write fails something went terribly wrong. We will now kill // the zygote and let the system bring it back up. async_safe_format_log(ANDROID_LOG_ERROR, LOG_TAG, diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ea300aa170ee..c7417bffb790 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -867,6 +867,7 @@ android:label="@string/permgrouplab_visual" android:description="@string/permgroupdesc_visual" android:request="@string/permgrouprequest_visual" + android:requestDetail="@string/permgrouprequestdetail_visual" android:priority="920" /> <!-- Allows an application to read the user's shared images collection. --> @@ -1516,6 +1517,13 @@ <permission android:name="android.permission.MANAGE_IPSEC_TUNNELS" android:protectionLevel="signature|appop" /> + <!-- @hide Allows apps to create and manage Test Networks. + <p>Granted only to shell. CTS tests will use + UiAutomation.AdoptShellPermissionIdentity() to gain access. + --> + <permission android:name="android.permission.MANAGE_TEST_NETWORKS" + android:protectionLevel="signature" /> + <!-- @SystemApi @hide Allows applications to read Wi-Fi credential. <p>Not for use by third-party applications. --> <permission android:name="android.permission.READ_WIFI_CREDENTIAL" diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index 10798ad51792..2860ee478db8 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -70,209 +70,6 @@ android:layout_centerHorizontal="true"/> </RelativeLayout> - <!-- The following 3 layouts are mutually exclusive. One of them will be - set VISIBLE programatically, when the optimal preview type can be - determined by inspecting the data being shared. This path was chosen - b/c inflating layouts in code had sizing problems with this widget. --> - - <!-- Layout Option 1: Supporting up to 3 images for preview --> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:background="?attr/colorBackgroundFloating"> - <RelativeLayout - android:id="@+id/content_preview_image_area" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:paddingBottom="@dimen/chooser_view_spacing" - android:visibility="gone" - android:background="?attr/colorBackgroundFloating"> - - <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" - android:id="@+id/content_preview_image_1_large" - android:visibility="gone" - android:layout_width="120dp" - android:layout_height="140dp" - android:layout_alignParentTop="true" - android:adjustViewBounds="true" - android:gravity="center" - android:scaleType="centerCrop"/> - - <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" - android:id="@+id/content_preview_image_2_large" - android:visibility="gone" - android:layout_width="120dp" - android:layout_height="140dp" - android:layout_alignParentTop="true" - android:layout_toRightOf="@id/content_preview_image_1_large" - android:layout_marginLeft="10dp" - android:adjustViewBounds="true" - android:gravity="center" - android:scaleType="centerCrop"/> - - <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" - android:id="@+id/content_preview_image_2_small" - android:visibility="gone" - android:layout_width="120dp" - android:layout_height="65dp" - android:layout_alignParentTop="true" - android:layout_toRightOf="@id/content_preview_image_1_large" - android:layout_marginLeft="10dp" - android:adjustViewBounds="true" - android:gravity="center" - android:scaleType="centerCrop"/> - - <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" - android:id="@+id/content_preview_image_3_small" - android:visibility="gone" - android:layout_width="120dp" - android:layout_height="65dp" - android:layout_below="@id/content_preview_image_2_small" - android:layout_toRightOf="@id/content_preview_image_1_large" - android:layout_marginLeft="10dp" - android:layout_marginTop="10dp" - android:adjustViewBounds="true" - android:gravity="center" - android:scaleType="centerCrop"/> - - </RelativeLayout> - </LinearLayout> - - <!-- Layout Option 2: Text preview, with optional title and thumbnail --> - <LinearLayout - android:id="@+id/content_preview_text_area" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="@dimen/chooser_view_spacing" - android:visibility="gone" - android:background="?attr/colorBackgroundFloating"> - - <LinearLayout - android:layout_width="@dimen/chooser_preview_width" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:orientation="horizontal" - android:paddingLeft="@dimen/chooser_edge_margin_normal" - android:paddingRight="@dimen/chooser_edge_margin_normal" - android:layout_marginBottom="@dimen/chooser_view_spacing" - android:id="@+id/content_preview_text_layout"> - <TextView - android:id="@+id/content_preview_text" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:ellipsize="end" - android:gravity="start|top" - android:paddingRight="24dp" - android:maxLines="2"/> - <Button - android:id="@+id/copy_button" - android:layout_width="24dp" - android:layout_height="24dp" - android:gravity="center" - android:layout_gravity="center_vertical" - android:background="@drawable/ic_content_copy_gm2"/> - </LinearLayout> - - <!-- Required sub-layout so we can get the nice rounded corners--> - <!-- around this section --> - <LinearLayout - android:layout_width="@dimen/chooser_preview_width" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:orientation="horizontal" - android:layout_marginLeft="@dimen/chooser_edge_margin_thin" - android:layout_marginRight="@dimen/chooser_edge_margin_thin" - android:minHeight="80dp" - android:background="@drawable/chooser_content_preview_rounded" - android:id="@+id/content_preview_title_layout"> - - <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" - android:id="@+id/content_preview_thumbnail" - android:layout_width="75dp" - android:layout_height="75dp" - android:layout_marginRight="16dp" - android:adjustViewBounds="true" - android:layout_gravity="center_vertical" - android:gravity="center" - android:scaleType="centerCrop"/> - - <TextView - android:id="@+id/content_preview_title" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:ellipsize="end" - android:maxLines="2" - android:textAppearance="?attr/textAppearanceMedium"/> - </LinearLayout> - </LinearLayout> - - <!-- Layout Option 3: File preview, icon, filename, copy--> - <LinearLayout - android:id="@+id/content_preview_file_area" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="@dimen/chooser_view_spacing" - android:visibility="gone" - android:background="?attr/colorBackgroundFloating"> - - <LinearLayout - android:layout_width="@dimen/chooser_preview_width" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:orientation="horizontal" - android:paddingLeft="@dimen/chooser_edge_margin_normal" - android:paddingRight="@dimen/chooser_edge_margin_normal" - android:layout_marginBottom="@dimen/chooser_view_spacing" - android:id="@+id/content_preview_file_layout"> - - <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" - android:id="@+id/content_preview_file_thumbnail" - android:layout_width="75dp" - android:layout_height="75dp" - android:layout_marginRight="16dp" - android:adjustViewBounds="true" - android:layout_gravity="center_vertical" - android:gravity="center" - android:scaleType="centerCrop" - android:visibility="gone"/> - <ImageView - android:id="@+id/content_preview_file_icon" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_marginRight="16dp" - android:adjustViewBounds="true" - android:layout_gravity="center_vertical" - android:gravity="center" - android:scaleType="fitCenter" - android:visibility="gone"/> - <TextView - android:id="@+id/content_preview_filename" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:ellipsize="middle" - android:gravity="start|top" - android:paddingRight="24dp" - android:singleLine="true"/> - <Button - android:id="@+id/file_copy_button" - android:layout_width="24dp" - android:layout_height="24dp" - android:gravity="center" - android:layout_gravity="center_vertical" - android:background="@drawable/ic_content_copy_gm2"/> - </LinearLayout> - </LinearLayout> - <ListView android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/core/res/res/layout/chooser_grid_preview_file.xml b/core/res/res/layout/chooser_grid_preview_file.xml new file mode 100644 index 000000000000..27c6041ba257 --- /dev/null +++ b/core/res/res/layout/chooser_grid_preview_file.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright 2019, 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. +*/ +--> +<!-- Layout Option: File preview, icon, filename, copy--> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_preview_file_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="@dimen/chooser_view_spacing" + android:background="?attr/colorBackgroundFloating"> + + <LinearLayout + android:layout_width="@dimen/chooser_preview_width" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="horizontal" + android:paddingLeft="@dimen/chooser_edge_margin_normal" + android:paddingRight="@dimen/chooser_edge_margin_normal" + android:layout_marginBottom="@dimen/chooser_view_spacing" + android:id="@+id/content_preview_file_layout"> + + <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" + android:id="@+id/content_preview_file_thumbnail" + android:layout_width="75dp" + android:layout_height="75dp" + android:layout_marginRight="16dp" + android:adjustViewBounds="true" + android:layout_gravity="center_vertical" + android:gravity="center" + android:scaleType="centerCrop" + android:visibility="gone"/> + <ImageView + android:id="@+id/content_preview_file_icon" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_marginRight="16dp" + android:adjustViewBounds="true" + android:layout_gravity="center_vertical" + android:gravity="center" + android:scaleType="fitCenter" + android:visibility="gone"/> + <TextView + android:id="@+id/content_preview_filename" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:ellipsize="middle" + android:gravity="start|top" + android:paddingRight="24dp" + android:singleLine="true"/> + <Button + android:id="@+id/file_copy_button" + android:layout_width="24dp" + android:layout_height="24dp" + android:gravity="center" + android:layout_gravity="center_vertical" + android:background="@drawable/ic_content_copy_gm2"/> + </LinearLayout> +</LinearLayout> + diff --git a/core/res/res/layout/chooser_grid_preview_image.xml b/core/res/res/layout/chooser_grid_preview_image.xml new file mode 100644 index 000000000000..ad31e0d0c194 --- /dev/null +++ b/core/res/res/layout/chooser_grid_preview_image.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright 2019, 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. +*/ +--> +<!-- Layout Option: Supporting up to 3 images for preview --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="?attr/colorBackgroundFloating"> + <RelativeLayout + android:id="@+id/content_preview_image_area" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:paddingBottom="@dimen/chooser_view_spacing" + android:background="?attr/colorBackgroundFloating"> + + <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" + android:id="@+id/content_preview_image_1_large" + android:visibility="gone" + android:layout_width="120dp" + android:layout_height="140dp" + android:layout_alignParentTop="true" + android:adjustViewBounds="true" + android:gravity="center" + android:scaleType="centerCrop"/> + + <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" + android:id="@+id/content_preview_image_2_large" + android:visibility="gone" + android:layout_width="120dp" + android:layout_height="140dp" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/content_preview_image_1_large" + android:layout_marginLeft="10dp" + android:adjustViewBounds="true" + android:gravity="center" + android:scaleType="centerCrop"/> + + <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" + android:id="@+id/content_preview_image_2_small" + android:visibility="gone" + android:layout_width="120dp" + android:layout_height="65dp" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/content_preview_image_1_large" + android:layout_marginLeft="10dp" + android:adjustViewBounds="true" + android:gravity="center" + android:scaleType="centerCrop"/> + + <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" + android:id="@+id/content_preview_image_3_small" + android:visibility="gone" + android:layout_width="120dp" + android:layout_height="65dp" + android:layout_below="@id/content_preview_image_2_small" + android:layout_toRightOf="@id/content_preview_image_1_large" + android:layout_marginLeft="10dp" + android:layout_marginTop="10dp" + android:adjustViewBounds="true" + android:gravity="center" + android:scaleType="centerCrop"/> + + </RelativeLayout> +</LinearLayout> + diff --git a/core/res/res/layout/chooser_grid_preview_text.xml b/core/res/res/layout/chooser_grid_preview_text.xml new file mode 100644 index 000000000000..7cfbb1b2a9a4 --- /dev/null +++ b/core/res/res/layout/chooser_grid_preview_text.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright 2019, 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. +*/ +--> +<!-- Layout Option: Text preview, with optional title and thumbnail --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_preview_text_area" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="@dimen/chooser_view_spacing" + android:background="?attr/colorBackgroundFloating"> + + <LinearLayout + android:layout_width="@dimen/chooser_preview_width" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="horizontal" + android:paddingLeft="@dimen/chooser_edge_margin_normal" + android:paddingRight="@dimen/chooser_edge_margin_normal" + android:layout_marginBottom="@dimen/chooser_view_spacing" + android:id="@+id/content_preview_text_layout"> + <TextView + android:id="@+id/content_preview_text" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:ellipsize="end" + android:gravity="start|top" + android:paddingRight="24dp" + android:maxLines="2"/> + <Button + android:id="@+id/copy_button" + android:layout_width="24dp" + android:layout_height="24dp" + android:gravity="center" + android:layout_gravity="center_vertical" + android:background="@drawable/ic_content_copy_gm2"/> + </LinearLayout> + + <!-- Required sub-layout so we can get the nice rounded corners--> + <!-- around this section --> + <LinearLayout + android:layout_width="@dimen/chooser_preview_width" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="horizontal" + android:layout_marginLeft="@dimen/chooser_edge_margin_thin" + android:layout_marginRight="@dimen/chooser_edge_margin_thin" + android:minHeight="80dp" + android:background="@drawable/chooser_content_preview_rounded" + android:id="@+id/content_preview_title_layout"> + + <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" + android:id="@+id/content_preview_thumbnail" + android:layout_width="75dp" + android:layout_height="75dp" + android:layout_marginRight="16dp" + android:adjustViewBounds="true" + android:layout_gravity="center_vertical" + android:gravity="center" + android:scaleType="centerCrop"/> + + <TextView + android:id="@+id/content_preview_title" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:ellipsize="end" + android:maxLines="2" + android:textAppearance="?attr/textAppearanceMedium"/> + </LinearLayout> +</LinearLayout> + diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index 8f2d6c3e02f4..f05898561b8a 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -175,13 +175,7 @@ </array> <!-- Used in ResolverTargetActionsDialogFragment --> - <string-array name="resolver_target_actions_pin"> - <item>@string/pin_target</item> - <item>@string/app_info</item> - </string-array> - - <string-array name="resolver_target_actions_unpin"> - <item>@string/unpin_target</item> + <string-array name="resolver_target_actions"> <item>@string/app_info</item> </string-array> diff --git a/core/res/res/values/dimens_car.xml b/core/res/res/values/dimens_car.xml index 5014a29f4eab..d2cf40a6bc1f 100644 --- a/core/res/res/values/dimens_car.xml +++ b/core/res/res/values/dimens_car.xml @@ -102,4 +102,7 @@ <!-- Progress Bar --> <dimen name="car_progress_bar_height">@dimen/car_seekbar_height</dimen> + <!-- TextView --> + <dimen name="car_textview_fading_edge_length">40dp</dimen> + </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index bf7c8f276cee..f9532081f86a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -800,7 +800,9 @@ <string name="permgroupdesc_visual">access your photos & videos</string> <!-- Message shown to the user when the apps requests permission from this group. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] --> <string name="permgrouprequest_visual">Allow - <b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to access your photos and videos, including tagged locations?</string> + <b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g></b> to access your photos and videos?</string> + <!-- Subtitle of the message shown to the user when the apps requests permission to access photos and videos [CHAR LIMIT=150]--> + <string name="permgrouprequestdetail_visual">Locations and other people in your photos and videos can be identified by the app</string> <!-- Title for the capability of an accessibility service to retrieve window content. --> <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string> @@ -3372,9 +3374,9 @@ <string name="wifi_available_action_all_networks">All networks</string> <!-- Notification title for a connection to a app suggested wireless network.--> - <string name="wifi_suggestion_title">A Wi\u2011Fi network proposed by <xliff:g id="name" example="App123">%s</xliff:g> is available</string> + <string name="wifi_suggestion_title">Connect to Wi\u2011Fi networks?</string> <!-- Notification content for a connection to a app suggested wireless network.--> - <string name="wifi_suggestion_content">Do you want to connect to networks proposed by <xliff:g id="name" example="App123">%s</xliff:g>?</string> + <string name="wifi_suggestion_content">Suggested by <xliff:g id="name" example="App123">%s</xliff:g></string> <!-- Notification action for allowing app specified in the notification body.--> <string name="wifi_suggestion_action_allow_app">Yes</string> <!-- Notification action for disallowing app specified in the notification body.--> @@ -5046,12 +5048,6 @@ <string name="usb_mtp_launch_notification_description">Tap to view files</string> <!-- Resolver target actions strings --> - - <!-- Pin (as in to a bulletin board with a pushpin) a resolver - target to the front of the list. --> - <string name="pin_target">Pin</string> - <!-- Unpin a resolver target such that it sorts normally. --> - <string name="unpin_target">Unpin</string> <!-- View application info for a target. --> <string name="app_info">App info</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 86f44897ff93..6629b4c7f585 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2762,6 +2762,9 @@ <java-symbol type="dimen" name="chooser_preview_image_font_size"/> <java-symbol type="dimen" name="chooser_preview_width" /> <java-symbol type="layout" name="chooser_grid" /> + <java-symbol type="layout" name="chooser_grid_preview_text" /> + <java-symbol type="layout" name="chooser_grid_preview_image" /> + <java-symbol type="layout" name="chooser_grid_preview_file" /> <java-symbol type="id" name="chooser_row_text_option" /> <java-symbol type="dimen" name="chooser_row_text_option_translate" /> <java-symbol type="layout" name="resolve_grid_item" /> @@ -2990,8 +2993,7 @@ <java-symbol type="color" name="notification_material_background_color" /> <!-- Resolver target actions --> - <java-symbol type="array" name="resolver_target_actions_pin" /> - <java-symbol type="array" name="resolver_target_actions_unpin" /> + <java-symbol type="array" name="resolver_target_actions" /> <java-symbol type="array" name="non_removable_euicc_slots" /> diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml index 37913056fe8d..9955c512686a 100644 --- a/core/tests/coretests/AndroidManifest.xml +++ b/core/tests/coretests/AndroidManifest.xml @@ -55,6 +55,7 @@ <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INJECT_EVENTS" /> + <uses-permission android:name="android.permission.MANAGE_APP_PREDICTIONS"/> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> <uses-permission android:name="android.permission.READ_DREAM_STATE" /> diff --git a/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java b/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java index 9b360db023d0..cc48239c4526 100644 --- a/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java +++ b/core/tests/coretests/src/android/content/pm/AndroidHidlUpdaterTest.java @@ -42,8 +42,17 @@ public class AndroidHidlUpdaterTest extends PackageSharedLibraryUpdaterTest { PackageBuilder before = builder() .targetSdkVersion(Build.VERSION_CODES.P); + // no change, not system + checkBackwardsCompatibility(before, before); + } + + @Test + public void targeted_at_P_system() { + PackageBuilder before = builder().asSystemApp() + .targetSdkVersion(Build.VERSION_CODES.P); + // Should add both HIDL libraries - PackageBuilder after = builder() + PackageBuilder after = builder().asSystemApp() .targetSdkVersion(Build.VERSION_CODES.P) .requiredLibraries(ANDROID_HIDL_MANAGER, ANDROID_HIDL_BASE); @@ -56,9 +65,19 @@ public class AndroidHidlUpdaterTest extends PackageSharedLibraryUpdaterTest { .targetSdkVersion(Build.VERSION_CODES.P) .requiredLibraries(OTHER_LIBRARY); + // no change, not system + checkBackwardsCompatibility(before, before); + } + + @Test + public void targeted_at_P_not_empty_usesLibraries_system() { + PackageBuilder before = builder().asSystemApp() + .targetSdkVersion(Build.VERSION_CODES.P) + .requiredLibraries(OTHER_LIBRARY); + // The hidl jars should be added at the start of the list because it // is not on the bootclasspath and the package targets pre-P. - PackageBuilder after = builder() + PackageBuilder after = builder().asSystemApp() .targetSdkVersion(Build.VERSION_CODES.P) .requiredLibraries(ANDROID_HIDL_MANAGER, ANDROID_HIDL_BASE, OTHER_LIBRARY); @@ -71,8 +90,21 @@ public class AndroidHidlUpdaterTest extends PackageSharedLibraryUpdaterTest { .targetSdkVersion(Build.VERSION_CODES.P) .requiredLibraries(ANDROID_HIDL_MANAGER, ANDROID_HIDL_BASE); - // No change is required because although the HIDL libraries has been removed from - // the bootclasspath the package explicitly requests it. + PackageBuilder after = builder() + .targetSdkVersion(Build.VERSION_CODES.P); + + // Libraries are removed because they are not available for non-system apps + checkBackwardsCompatibility(before, after); + } + + @Test + public void targeted_at_P_in_usesLibraries_system() { + PackageBuilder before = builder().asSystemApp() + .targetSdkVersion(Build.VERSION_CODES.P) + .requiredLibraries(ANDROID_HIDL_MANAGER, ANDROID_HIDL_BASE); + + // No change is required because the package explicitly requests the HIDL libraries + // and is targeted at the current version so does not need backwards compatibility. checkBackwardsCompatibility(before, before); } @@ -83,8 +115,7 @@ public class AndroidHidlUpdaterTest extends PackageSharedLibraryUpdaterTest { // Dependency is removed, it is not available. PackageBuilder after = builder(); - // No change is required because the package explicitly requests the HIDL libraries - // and is targeted at the current version so does not need backwards compatibility. + // Libraries are removed because they are not available for apps targetting Q+ checkBackwardsCompatibility(before, after); } @@ -95,8 +126,7 @@ public class AndroidHidlUpdaterTest extends PackageSharedLibraryUpdaterTest { // Dependency is removed, it is not available. PackageBuilder after = builder(); - // No change is required because the package explicitly requests the HIDL libraries - // and is targeted at the current version so does not need backwards compatibility. + // Libraries are removed because they are not available for apps targetting Q+ checkBackwardsCompatibility(before, after); } diff --git a/core/tests/coretests/src/android/content/pm/PackageBuilder.java b/core/tests/coretests/src/android/content/pm/PackageBuilder.java index c5db9622b60d..f7544af43461 100644 --- a/core/tests/coretests/src/android/content/pm/PackageBuilder.java +++ b/core/tests/coretests/src/android/content/pm/PackageBuilder.java @@ -31,6 +31,8 @@ class PackageBuilder { private int mTargetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT; + private int mFlags = 0; + private ArrayList<String> mRequiredLibraries; private ArrayList<String> mOptionalLibraries; @@ -42,6 +44,7 @@ class PackageBuilder { public PackageParser.Package build() { PackageParser.Package pkg = new PackageParser.Package("org.package.name"); pkg.applicationInfo.targetSdkVersion = mTargetSdkVersion; + pkg.applicationInfo.flags = mFlags; pkg.usesLibraries = mRequiredLibraries; pkg.usesOptionalLibraries = mOptionalLibraries; return pkg; @@ -52,6 +55,11 @@ class PackageBuilder { return this; } + PackageBuilder asSystemApp() { + this.mFlags |= ApplicationInfo.FLAG_SYSTEM; + return this; + } + PackageBuilder requiredLibraries(String... names) { this.mRequiredLibraries = arrayListOrNull(names); return this; diff --git a/core/tests/coretests/src/android/provider/DeviceConfigTest.java b/core/tests/coretests/src/android/provider/DeviceConfigTest.java index 04fa52426f01..7a4fa3ab4b63 100644 --- a/core/tests/coretests/src/android/provider/DeviceConfigTest.java +++ b/core/tests/coretests/src/android/provider/DeviceConfigTest.java @@ -61,6 +61,26 @@ public class DeviceConfigTest { } @Test + public void getProperty_nullNamespace() { + try { + DeviceConfig.getProperty(null, sKey); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void getProperty_nullName() { + try { + DeviceConfig.getProperty(sNamespace, null); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test public void getString_empty() { final String default_value = "default_value"; final String result = DeviceConfig.getString(sNamespace, sKey, default_value); @@ -68,6 +88,12 @@ public class DeviceConfigTest { } @Test + public void getString_nullDefault() { + final String result = DeviceConfig.getString(sNamespace, sKey, null); + assertThat(result).isNull(); + } + + @Test public void getString_nonEmpty() { final String value = "new_value"; final String default_value = "default"; @@ -78,6 +104,26 @@ public class DeviceConfigTest { } @Test + public void getString_nullNamespace() { + try { + DeviceConfig.getString(null, sKey, "default_value"); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void getString_nullName() { + try { + DeviceConfig.getString(sNamespace, null, "default_value"); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test public void getBoolean_empty() { final boolean default_value = true; final boolean result = DeviceConfig.getBoolean(sNamespace, sKey, default_value); @@ -105,6 +151,26 @@ public class DeviceConfigTest { } @Test + public void getBoolean_nullNamespace() { + try { + DeviceConfig.getBoolean(null, sKey, false); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void getBoolean_nullName() { + try { + DeviceConfig.getBoolean(sNamespace, null, false); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test public void getInt_empty() { final int default_value = 999; final int result = DeviceConfig.getInt(sNamespace, sKey, default_value); @@ -132,6 +198,26 @@ public class DeviceConfigTest { } @Test + public void getInt_nullNamespace() { + try { + DeviceConfig.getInt(null, sKey, 0); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void getInt_nullName() { + try { + DeviceConfig.getInt(sNamespace, null, 0); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test public void getLong_empty() { final long default_value = 123456; final long result = DeviceConfig.getLong(sNamespace, sKey, default_value); @@ -159,6 +245,26 @@ public class DeviceConfigTest { } @Test + public void getLong_nullNamespace() { + try { + DeviceConfig.getLong(null, sKey, 0); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void getLong_nullName() { + try { + DeviceConfig.getLong(sNamespace, null, 0); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test public void getFloat_empty() { final float default_value = 123.456f; final float result = DeviceConfig.getFloat(sNamespace, sKey, default_value); @@ -186,6 +292,46 @@ public class DeviceConfigTest { } @Test + public void getFloat_nullNamespace() { + try { + DeviceConfig.getFloat(null, sKey, 0); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void getFloat_nullName() { + try { + DeviceConfig.getFloat(sNamespace, null, 0); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void setProperty_nullNamespace() { + try { + DeviceConfig.setProperty(null, sKey, sValue, false); + Assert.fail("Null namespace should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test + public void setProperty_nullName() { + try { + DeviceConfig.setProperty(sNamespace, null, sValue, false); + Assert.fail("Null name should have resulted in an NPE."); + } catch (NullPointerException e) { + // expected + } + } + + @Test public void setAndGetProperty_sameNamespace() { DeviceConfig.setProperty(sNamespace, sKey, sValue, false); String result = DeviceConfig.getProperty(sNamespace, sKey); diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureContextTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureContextTest.java new file mode 100644 index 000000000000..4680a640a7ff --- /dev/null +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureContextTest.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2019 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.view.contentcapture; + +import static com.google.common.truth.Truth.assertThat; + +import android.content.ComponentName; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** + * Unit test for {@link ContentCaptureEvent}. + * + * <p>To run it: + * {@code atest FrameworksCoreTests:android.view.contentcapture.ContentCaptureContextTest} + */ +@RunWith(JUnit4.class) +public class ContentCaptureContextTest { + + @Test + public void testConstructorAdditionalFlags() { + final ComponentName componentName = new ComponentName("component", "name"); + final ContentCaptureContext ctx = new ContentCaptureContext(/* clientContext= */ null, + componentName, /* taskId= */ 666, /* displayId= */ 42, /* flags= */ 1); + final ContentCaptureContext newCtx = new ContentCaptureContext(ctx, /* extraFlags= */ 2); + assertThat(newCtx.getFlags()).isEqualTo(3); + + assertThat(newCtx.getActivityComponent()).isEqualTo(componentName); + assertThat(newCtx.getTaskId()).isEqualTo(666); + assertThat(newCtx.getDisplayId()).isEqualTo(42); + assertThat(newCtx.getExtras()).isNull(); + assertThat(newCtx.getLocusId()).isNull(); + assertThat(newCtx.getParentSessionId()).isNull(); + } +} diff --git a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java index de2edc3637e4..2416de1b7d36 100644 --- a/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java +++ b/core/tests/coretests/src/android/view/contentcapture/ContentCaptureEventTest.java @@ -19,6 +19,7 @@ import static android.view.contentcapture.ContentCaptureEvent.TYPE_CONTEXT_UPDAT import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_FINISHED; import static android.view.contentcapture.ContentCaptureEvent.TYPE_SESSION_STARTED; import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_DISAPPEARED; +import static android.view.contentcapture.ContentCaptureEvent.TYPE_VIEW_TEXT_CHANGED; import static com.google.common.truth.Truth.assertThat; @@ -230,6 +231,68 @@ public class ContentCaptureEventTest { assertContextUpdatedEvent(clone); } + @Test + public void testMergeEvent_typeViewTextChanged() { + final ContentCaptureEvent event = new ContentCaptureEvent("42", TYPE_VIEW_TEXT_CHANGED) + .setText("test"); + final ContentCaptureEvent event2 = new ContentCaptureEvent("43", TYPE_VIEW_TEXT_CHANGED) + .setText("empty"); + + event.mergeEvent(event2); + assertThat(event.getText()).isEqualTo(event2.getText()); + } + + @Test + public void testMergeEvent_typeViewDisappeared() { + final ContentCaptureEvent event = new ContentCaptureEvent("42", TYPE_VIEW_DISAPPEARED) + .setAutofillId(new AutofillId(1)); + final ContentCaptureEvent event2 = new ContentCaptureEvent("43", TYPE_VIEW_DISAPPEARED) + .setAutofillId(new AutofillId(2)); + final ArrayList<AutofillId> autofillIds = new ArrayList<>(); + autofillIds.add(new AutofillId(3)); + autofillIds.add(new AutofillId(4)); + final ContentCaptureEvent event3 = new ContentCaptureEvent("17", TYPE_VIEW_DISAPPEARED) + .setAutofillIds(autofillIds); + + event.mergeEvent(event2); + assertThat(event.getIds()).containsExactly(new AutofillId(1), new AutofillId(2)); + + event2.mergeEvent(event3); + assertThat(event2.getIds()).containsExactly(new AutofillId(2), new AutofillId(3), + new AutofillId(4)); + } + + @Test + public void testMergeEvent_typeViewDisappeared_noIds() { + final ContentCaptureEvent event = new ContentCaptureEvent("42", TYPE_VIEW_DISAPPEARED) + .setAutofillId(new AutofillId(1)); + final ContentCaptureEvent event2 = new ContentCaptureEvent("43", TYPE_VIEW_DISAPPEARED); + + assertThrows(IllegalArgumentException.class, () -> event.mergeEvent(event2)); + } + + @Test + public void testMergeEvent_nullArgument() { + final ContentCaptureEvent event = new ContentCaptureEvent("42", TYPE_VIEW_DISAPPEARED); + assertThrows(NullPointerException.class, () -> event.mergeEvent(null)); + } + + @Test + public void testMergeEvent_differentEventTypes() { + final ContentCaptureEvent event = new ContentCaptureEvent("42", TYPE_VIEW_DISAPPEARED) + .setText("test").setAutofillId(new AutofillId(1)); + final ContentCaptureEvent event2 = new ContentCaptureEvent("17", TYPE_VIEW_TEXT_CHANGED) + .setText("empty").setAutofillId(new AutofillId(2)); + + event.mergeEvent(event2); + assertThat(event.getText()).isEqualTo("test"); + assertThat(event.getId()).isEqualTo(new AutofillId(1)); + + event2.mergeEvent(event); + assertThat(event2.getText()).isEqualTo("empty"); + assertThat(event2.getId()).isEqualTo(new AutofillId(2)); + } + private void assertContextUpdatedEvent(ContentCaptureEvent event) { assertThat(event.getType()).isEqualTo(TYPE_CONTEXT_UPDATED); assertThat(event.getEventTime()).isAtLeast(MY_EPOCH); diff --git a/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java b/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java index f4409534250b..7150d81fca72 100644 --- a/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java @@ -215,7 +215,7 @@ public class ActionsSuggestionsHelperTest { long referenceTimeInMsUtc) { assertThat(nativeMessage.getText()).isEqualTo(text.toString()); assertThat(nativeMessage.getUserId()).isEqualTo(userId); - assertThat(nativeMessage.getLocales()).isEqualTo(LOCALE_TAG); + assertThat(nativeMessage.getDetectedTextLanguageTags()).isEqualTo(LOCALE_TAG); assertThat(nativeMessage.getReferenceTimeMsUtc()).isEqualTo(referenceTimeInMsUtc); } } diff --git a/core/tests/coretests/src/android/view/textclassifier/LegacyIntentFactoryTest.java b/core/tests/coretests/src/android/view/textclassifier/LegacyIntentFactoryTest.java index 743818cd3d4e..2a79c1c11ca0 100644 --- a/core/tests/coretests/src/android/view/textclassifier/LegacyIntentFactoryTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/LegacyIntentFactoryTest.java @@ -61,6 +61,7 @@ public class LegacyIntentFactoryTest { null, null, null, + null, null); List<LabeledIntent> intents = mLegacyIntentFactory.create( @@ -95,6 +96,7 @@ public class LegacyIntentFactoryTest { null, null, null, + null, null); List<LabeledIntent> intents = mLegacyIntentFactory.create( diff --git a/core/tests/coretests/src/android/view/textclassifier/TemplateClassificationIntentFactoryTest.java b/core/tests/coretests/src/android/view/textclassifier/TemplateClassificationIntentFactoryTest.java index 9fd9e8eb2690..fac58f83dd24 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TemplateClassificationIntentFactoryTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TemplateClassificationIntentFactoryTest.java @@ -72,6 +72,7 @@ public class TemplateClassificationIntentFactoryTest { null, null, null, + null, createRemoteActionTemplates()); List<LabeledIntent> intents = @@ -111,6 +112,7 @@ public class TemplateClassificationIntentFactoryTest { null, null, null, + null, createRemoteActionTemplates()); List<LabeledIntent> intents = diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java index 4277b5a918f7..185fa0750ff1 100644 --- a/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java +++ b/core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java @@ -599,7 +599,7 @@ public class ChooserActivityTest { mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); waitForIdle(); - verify(mockLogger, Mockito.times(3)).write(logMakerCaptor.capture()); + verify(mockLogger, Mockito.times(2)).write(logMakerCaptor.capture()); // First invocation is from onCreate assertThat(logMakerCaptor.getAllValues().get(1).getCategory(), is(MetricsEvent.ACTION_SHARE_WITH_PREVIEW)); @@ -629,16 +629,12 @@ public class ChooserActivityTest { ArgumentCaptor<LogMaker> logMakerCaptor = ArgumentCaptor.forClass(LogMaker.class); mActivityRule.launchActivity(Intent.createChooser(sendIntent, null)); waitForIdle(); - verify(mockLogger, Mockito.times(3)).write(logMakerCaptor.capture()); + verify(mockLogger, Mockito.times(2)).write(logMakerCaptor.capture()); // First invocation is from onCreate assertThat(logMakerCaptor.getAllValues().get(1).getCategory(), is(MetricsEvent.ACTION_SHARE_WITH_PREVIEW)); assertThat(logMakerCaptor.getAllValues().get(1).getSubtype(), is(CONTENT_PREVIEW_IMAGE)); - assertThat(logMakerCaptor.getAllValues().get(2).getCategory(), - is(MetricsEvent.ACTION_SHARE_WITH_PREVIEW)); - assertThat(logMakerCaptor.getAllValues().get(2).getSubtype(), - is(CONTENT_PREVIEW_IMAGE)); } @Test diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 2e56e09522e9..4bd344f1964f 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -122,13 +122,22 @@ public final class Bitmap implements Parcelable { } /** - * Private constructor that must received an already allocated native bitmap + * Private constructor that must receive an already allocated native bitmap * int (pointer). */ - // called from JNI - @UnsupportedAppUsage - Bitmap(long nativeBitmap, int width, int height, int density, boolean requestPremultiplied, - byte[] ninePatchChunk, NinePatch.InsetStruct ninePatchInsets) { + // JNI now calls the version below this one. This is preserved due to UnsupportedAppUsage. + @UnsupportedAppUsage(maxTargetSdk = 28) + Bitmap(long nativeBitmap, int width, int height, int density, + boolean requestPremultiplied, byte[] ninePatchChunk, + NinePatch.InsetStruct ninePatchInsets) { + this(nativeBitmap, width, height, density, requestPremultiplied, ninePatchChunk, + ninePatchInsets, true); + } + + // called from JNI and Bitmap_Delegate. + Bitmap(long nativeBitmap, int width, int height, int density, + boolean requestPremultiplied, byte[] ninePatchChunk, + NinePatch.InsetStruct ninePatchInsets, boolean fromMalloc) { if (nativeBitmap == 0) { throw new RuntimeException("internal error: native bitmap is 0"); } @@ -144,13 +153,21 @@ public final class Bitmap implements Parcelable { } mNativePtr = nativeBitmap; - long nativeSize = NATIVE_ALLOCATION_SIZE + getAllocationByteCount(); - NativeAllocationRegistry registry = new NativeAllocationRegistry( - Bitmap.class.getClassLoader(), nativeGetNativeFinalizer(), nativeSize); + + final int allocationByteCount = getAllocationByteCount(); + NativeAllocationRegistry registry; + if (fromMalloc) { + registry = NativeAllocationRegistry.createMalloced( + Bitmap.class.getClassLoader(), nativeGetNativeFinalizer(), allocationByteCount); + } else { + registry = NativeAllocationRegistry.createNonmalloced( + Bitmap.class.getClassLoader(), nativeGetNativeFinalizer(), allocationByteCount); + } registry.registerNativeAllocation(this, nativeBitmap); if (ResourcesImpl.TRACE_FOR_DETAILED_PRELOAD) { sPreloadTracingNumInstantiatedBitmaps++; + long nativeSize = NATIVE_ALLOCATION_SIZE + allocationByteCount; sPreloadTracingTotalBitmapsSize += nativeSize; } } diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 8f46e1acc2ba..7b3f3da111d5 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -76,14 +76,11 @@ public class Canvas extends BaseCanvas { // (see SkCanvas.cpp, SkDraw.cpp) private static final int MAXMIMUM_BITMAP_SIZE = 32766; - // The approximate size of the native allocation associated with - // a Canvas object. - private static final long NATIVE_ALLOCATION_SIZE = 525; - // Use a Holder to allow static initialization of Canvas in the boot image. private static class NoImagePreloadHolder { - public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Canvas.class.getClassLoader(), nGetNativeFinalizer(), NATIVE_ALLOCATION_SIZE); + public static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Canvas.class.getClassLoader(), nGetNativeFinalizer()); } // This field is used to finalize the native Canvas properly diff --git a/graphics/java/android/graphics/ColorFilter.java b/graphics/java/android/graphics/ColorFilter.java index b24b9885d1b0..4c2ef84404e2 100644 --- a/graphics/java/android/graphics/ColorFilter.java +++ b/graphics/java/android/graphics/ColorFilter.java @@ -26,8 +26,9 @@ import libcore.util.NativeAllocationRegistry; public class ColorFilter { private static class NoImagePreloadHolder { - public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - ColorFilter.class.getClassLoader(), nativeGetFinalizer(), 50); + public static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + ColorFilter.class.getClassLoader(), nativeGetFinalizer()); } /** diff --git a/graphics/java/android/graphics/FontFamily.java b/graphics/java/android/graphics/FontFamily.java index 5d8ba938f6d5..5af0da85bb39 100644 --- a/graphics/java/android/graphics/FontFamily.java +++ b/graphics/java/android/graphics/FontFamily.java @@ -44,13 +44,15 @@ public class FontFamily { private static String TAG = "FontFamily"; - private static final NativeAllocationRegistry sBuilderRegistry = new NativeAllocationRegistry( - FontFamily.class.getClassLoader(), nGetBuilderReleaseFunc(), 64); + private static final NativeAllocationRegistry sBuilderRegistry = + NativeAllocationRegistry.createMalloced( + FontFamily.class.getClassLoader(), nGetBuilderReleaseFunc()); private @Nullable Runnable mNativeBuilderCleaner; - private static final NativeAllocationRegistry sFamilyRegistry = new NativeAllocationRegistry( - FontFamily.class.getClassLoader(), nGetFamilyReleaseFunc(), 64); + private static final NativeAllocationRegistry sFamilyRegistry = + NativeAllocationRegistry.createMalloced( + FontFamily.class.getClassLoader(), nGetFamilyReleaseFunc()); /** * @hide diff --git a/graphics/java/android/graphics/Matrix.java b/graphics/java/android/graphics/Matrix.java index f8cb366c7b92..22b6401fdc2e 100644 --- a/graphics/java/android/graphics/Matrix.java +++ b/graphics/java/android/graphics/Matrix.java @@ -16,12 +16,13 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; import libcore.util.NativeAllocationRegistry; -import android.annotation.UnsupportedAppUsage; import java.io.PrintWriter; /** @@ -222,12 +223,10 @@ public class Matrix { } }; - // sizeof(SkMatrix) is 9 * sizeof(float) + uint32_t - private static final long NATIVE_ALLOCATION_SIZE = 40; - private static class NoImagePreloadHolder { - public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Matrix.class.getClassLoader(), nGetNativeFinalizer(), NATIVE_ALLOCATION_SIZE); + public static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Matrix.class.getClassLoader(), nGetNativeFinalizer()); } /** diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 452f7c93f8aa..650865d442c2 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -58,13 +58,11 @@ public class Paint { private long mNativeShader; private long mNativeColorFilter; - // The approximate size of a native paint object. - private static final long NATIVE_PAINT_SIZE = 98; - // Use a Holder to allow static initialization of Paint in the boot image. private static class NoImagePreloadHolder { - public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Paint.class.getClassLoader(), nGetNativeFinalizer(), NATIVE_PAINT_SIZE); + public static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Paint.class.getClassLoader(), nGetNativeFinalizer()); } @ColorLong private long mColor; @@ -231,7 +229,8 @@ public class Paint { public static final int VERTICAL_TEXT_FLAG = 0x1000; // These flags are always set on a new/reset paint, even if flags 0 is passed. - static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG; + static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG + | FILTER_BITMAP_FLAG; /** * Font hinter option that disables font hinting. diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 405ab0bbcb34..7282d52d6e23 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -36,8 +36,9 @@ import libcore.util.NativeAllocationRegistry; */ public class Path { - private static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Path.class.getClassLoader(), nGetFinalizer(), 48 /* dummy size */); + private static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Path.class.getClassLoader(), nGetFinalizer()); /** * @hide diff --git a/graphics/java/android/graphics/RenderNode.java b/graphics/java/android/graphics/RenderNode.java index 760f83baec9b..9b4f2c1b51d5 100644 --- a/graphics/java/android/graphics/RenderNode.java +++ b/graphics/java/android/graphics/RenderNode.java @@ -70,8 +70,7 @@ import java.lang.annotation.RetentionPolicy; * canvas.drawRect(...); * } finally { * renderNode.endRecording(); - * } - * </pre> + * }</pre> * * <h3>Drawing a RenderNode in a View</h3> * <pre class="prettyprint"> @@ -84,8 +83,7 @@ import java.lang.annotation.RetentionPolicy; * // Draw the RenderNode into this canvas. * canvas.drawRenderNode(myRenderNode); * } - * } - * </pre> + * }</pre> * * <h3>Releasing resources</h3> * <p>This step is not mandatory but recommended if you want to release resources @@ -93,8 +91,7 @@ import java.lang.annotation.RetentionPolicy; * <pre class="prettyprint"> * // Discards the display list content allowing for any held resources to be released. * // After calling this - * renderNode.discardDisplayList(); - * </pre> + * renderNode.discardDisplayList();</pre> * * * <h3>Properties</h3> @@ -132,8 +129,7 @@ import java.lang.annotation.RetentionPolicy; * // will be invoked and will execute very quickly * mRenderNode.offsetLeftAndRight(x); * invalidate(); - * } - * </pre> + * }</pre> * * <p>A few of the properties may at first appear redundant, such as {@link #setElevation(float)} * and {@link #setTranslationZ(float)}. The reason for these duplicates are to allow for a @@ -146,24 +142,26 @@ import java.lang.annotation.RetentionPolicy; * overlap with {@link #setPosition(Rect)}. * * <p>The RenderNode's transform matrix is computed at render time as follows: - * First a setTranslate(getTranslationX(), getTranslationY()) is applied to a {@link Matrix}. - * Second a preRotate(getRotationZ(), getPivotX(), getPivotY()) is applied to the matrix. And - * finally a preScale(getScaleX(), getScaleY(), getPivotX(), getPivotY()) is applied. The current - * canvas transform matrix, which is translated to the RenderNode's position, - * is then multiplied by the RenderNode's transform matrix. Therefore there is no implicit - * ordering in setting various RenderNode properties. That is to say that: + * <pre class="prettyprint"> + * Matrix transform = new Matrix(); + * transform.setTranslate(renderNode.getTranslationX(), renderNode.getTranslationY()); + * transform.preRotate(renderNode.getRotationZ(), + * renderNode.getPivotX(), renderNode.getPivotY()); + * transform.preScale(renderNode.getScaleX(), renderNode.getScaleY(), + * renderNode.getPivotX(), renderNode.getPivotY());</pre> + * The current canvas transform matrix, which is translated to the RenderNode's position, + * is then multiplied by the RenderNode's transform matrix. Therefore the ordering of calling + * property setters does not affect the result. That is to say that: * * <pre class="prettyprint"> * renderNode.setTranslationX(100); - * renderNode.setScaleX(100); - * </pre> + * renderNode.setScaleX(100);</pre> * - * is equivalent to + * is equivalent to: * * <pre class="prettyprint"> * renderNode.setScaleX(100); - * renderNode.setTranslationX(100); - * </pre> + * renderNode.setTranslationX(100);</pre> * * <h3>Threading</h3> * <p>RenderNode may be created and used on any thread but they are not thread-safe. Only @@ -182,8 +180,7 @@ import java.lang.annotation.RetentionPolicy; * if (needsUpdate) { * myOwningView.invalidate(); * } - * } - * </pre> + * }</pre> * This is marginally faster than doing a more explicit up-front check if the value changed by * comparing the desired value against {@link #getTranslationX()} as it minimizes JNI transitions. * The actual mechanism of requesting a new frame to be rendered will depend on how this @@ -198,8 +195,9 @@ public final class RenderNode { // Use a Holder to allow static initialization in the boot image. private static class NoImagePreloadHolder { - public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - RenderNode.class.getClassLoader(), nGetNativeFinalizer(), 1024); + public static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + RenderNode.class.getClassLoader(), nGetNativeFinalizer()); } /** diff --git a/graphics/java/android/graphics/Shader.java b/graphics/java/android/graphics/Shader.java index d555128d0bba..3050d1dae5e4 100644 --- a/graphics/java/android/graphics/Shader.java +++ b/graphics/java/android/graphics/Shader.java @@ -33,8 +33,9 @@ import libcore.util.NativeAllocationRegistry; public class Shader { private static class NoImagePreloadHolder { - public static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Shader.class.getClassLoader(), nativeGetFinalizer(), 50); + public static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Shader.class.getClassLoader(), nativeGetFinalizer()); } /** diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index 86f658b4a48e..64f75913f8de 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -74,8 +74,9 @@ public class Typeface { private static String TAG = "Typeface"; - private static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Typeface.class.getClassLoader(), nativeGetReleaseFunc(), 64); + private static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Typeface.class.getClassLoader(), nativeGetReleaseFunc()); /** The default NORMAL typeface object */ public static final Typeface DEFAULT; diff --git a/graphics/java/android/graphics/drawable/AnimatedImageDrawable.java b/graphics/java/android/graphics/drawable/AnimatedImageDrawable.java index bb6bf243bc76..82f587086428 100644 --- a/graphics/java/android/graphics/drawable/AnimatedImageDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedImageDrawable.java @@ -313,7 +313,7 @@ public class AnimatedImageDrawable extends Drawable implements Animatable2 { extended, cropRect), inputStream, afd); final long nativeSize = nNativeByteSize(mState.mNativePtr); - NativeAllocationRegistry registry = new NativeAllocationRegistry( + NativeAllocationRegistry registry = NativeAllocationRegistry.createMalloced( AnimatedImageDrawable.class.getClassLoader(), nGetNativeFinalizer(), nativeSize); registry.registerNativeAllocation(mState, mState.mNativePtr); } diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index d7aee7767524..d9dab98c2be1 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -1253,7 +1253,6 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { private boolean mInitialized = false; private boolean mIsReversible = false; private boolean mIsInfinite = false; - // TODO: Consider using NativeAllocationRegistery to track native allocation private final VirtualRefBasePtr mSetRefBasePtr; private WeakReference<RenderNode> mLastSeenTarget = null; private int mLastListenerId = 0; diff --git a/graphics/java/android/graphics/fonts/Font.java b/graphics/java/android/graphics/fonts/Font.java index f92802f5b574..b8574654e95a 100644 --- a/graphics/java/android/graphics/fonts/Font.java +++ b/graphics/java/android/graphics/fonts/Font.java @@ -54,13 +54,13 @@ public final class Font { * A builder class for creating new Font. */ public static final class Builder { - private static final NativeAllocationRegistry sAssetByteBufferRegistroy = - new NativeAllocationRegistry(ByteBuffer.class.getClassLoader(), - nGetReleaseNativeAssetFunc(), 64); + private static final NativeAllocationRegistry sAssetByteBufferRegistry = + NativeAllocationRegistry.createMalloced(ByteBuffer.class.getClassLoader(), + nGetReleaseNativeAssetFunc()); - private static final NativeAllocationRegistry sFontRegistory = - new NativeAllocationRegistry(Font.class.getClassLoader(), - nGetReleaseNativeFont(), 64); + private static final NativeAllocationRegistry sFontRegistry = + NativeAllocationRegistry.createMalloced(Font.class.getClassLoader(), + nGetReleaseNativeFont()); private @Nullable ByteBuffer mBuffer; private @Nullable File mFile; @@ -171,7 +171,7 @@ public final class Font { return; } final ByteBuffer b = nGetAssetBuffer(nativeAsset); - sAssetByteBufferRegistroy.registerNativeAllocation(b, nativeAsset); + sAssetByteBufferRegistry.registerNativeAllocation(b, nativeAsset); if (b == null) { mException = new FileNotFoundException(path + " not found"); return; @@ -206,7 +206,7 @@ public final class Font { return; } final ByteBuffer b = nGetAssetBuffer(nativeAsset); - sAssetByteBufferRegistroy.registerNativeAllocation(b, nativeAsset); + sAssetByteBufferRegistry.registerNativeAllocation(b, nativeAsset); if (b == null) { mException = new FileNotFoundException(str + " not found"); return; @@ -360,7 +360,7 @@ public final class Font { * * @return the Font object */ - public @Nullable Font build() throws IOException { + public @NonNull Font build() throws IOException { if (mException != null) { throw new IOException("Failed to read font contents", mException); } @@ -395,7 +395,7 @@ public final class Font { mTtcIndex); final Font font = new Font(ptr, readonlyBuffer, mFile, new FontStyle(mWeight, slant), mTtcIndex, mAxes, mLocaleList); - sFontRegistory.registerNativeAllocation(font, ptr); + sFontRegistry.registerNativeAllocation(font, ptr); return font; } diff --git a/graphics/java/android/graphics/fonts/FontFamily.java b/graphics/java/android/graphics/fonts/FontFamily.java index 4772c1cff7eb..75ea12062929 100644 --- a/graphics/java/android/graphics/fonts/FontFamily.java +++ b/graphics/java/android/graphics/fonts/FontFamily.java @@ -63,8 +63,8 @@ public final class FontFamily { */ public static final class Builder { private static final NativeAllocationRegistry sFamilyRegistory = - new NativeAllocationRegistry(FontFamily.class.getClassLoader(), - nGetReleaseNativeFamily(), 64); + NativeAllocationRegistry.createMalloced(FontFamily.class.getClassLoader(), + nGetReleaseNativeFamily()); private final ArrayList<Font> mFonts = new ArrayList<>(); private final HashSet<Integer> mStyleHashSet = new HashSet<>(); diff --git a/graphics/java/android/graphics/text/LineBreaker.java b/graphics/java/android/graphics/text/LineBreaker.java index 9cabf1ce185d..54622c5e74df 100644 --- a/graphics/java/android/graphics/text/LineBreaker.java +++ b/graphics/java/android/graphics/text/LineBreaker.java @@ -69,7 +69,7 @@ import java.lang.annotation.RetentionPolicy; * } * * // Draw text to the canvas - * Bitmap bmp = new Bitmap.createBitmap(240, totalHeight, Bitmap.Config.ARGB_8888); + * Bitmap bmp = Bitmap.createBitmap(240, totalHeight, Bitmap.Config.ARGB_8888); * Canvas c = new Canvas(bmp); * float yOffset = 0f; * int prevOffset = 0; @@ -248,8 +248,8 @@ public class LineBreaker { private @FloatRange(from = 0.0f) float mWidth = 0; private @FloatRange(from = 0.0f) float mFirstWidth = 0; private @IntRange(from = 0) int mFirstWidthLineCount = 0; - private @Nullable int[] mVariableTabStops = null; - private @IntRange(from = 0) int mDefaultTabStop = 0; + private @Nullable float[] mVariableTabStops = null; + private @FloatRange(from = 0) float mDefaultTabStop = 0; public ParagraphConstraints() {} @@ -284,8 +284,8 @@ public class LineBreaker { * @see #getTabStops() * @see #getDefaultTabStop() */ - public void setTabStops(@Nullable int[] tabStops, - @Px @IntRange(from = 0) int defaultTabStop) { + public void setTabStops(@Nullable float[] tabStops, + @Px @FloatRange(from = 0) float defaultTabStop) { mVariableTabStops = tabStops; mDefaultTabStop = defaultTabStop; } @@ -320,18 +320,18 @@ public class LineBreaker { /** * Returns the array of tab stops in pixels. * - * @see #setTabStops(int[], int) + * @see #setTabStops(float[], int) */ - public @Nullable int[] getTabStops() { + public @Nullable float[] getTabStops() { return mVariableTabStops; } /** * Returns the default tab stops in pixels. * - * @see #setTabStop(int[], int) + * @see #setTabStop(float[], int) */ - public @Px @IntRange(from = 0) int getDefaultTabStop() { + public @Px @FloatRange(from = 0) float getDefaultTabStop() { return mDefaultTabStop; } } @@ -349,8 +349,9 @@ public class LineBreaker { private static final int END_HYPHEN_MASK = 0x7; // 0b00111 private static final int START_HYPHEN_BITS_SHIFT = 3; - private static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - Result.class.getClassLoader(), nGetReleaseResultFunc(), 32); + private static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + Result.class.getClassLoader(), nGetReleaseResultFunc()); private final long mPtr; private Result(long ptr) { @@ -444,8 +445,9 @@ public class LineBreaker { } } - private static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - LineBreaker.class.getClassLoader(), nGetReleaseFunc(), 64); + private static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + LineBreaker.class.getClassLoader(), nGetReleaseFunc()); private final long mNativePtr; @@ -513,8 +515,8 @@ public class LineBreaker { @FloatRange(from = 0.0f) float firstWidth, @IntRange(from = 0) int firstWidthLineCount, @FloatRange(from = 0.0f) float restWidth, - @Nullable int[] variableTabStops, - int defaultTabStop, + @Nullable float[] variableTabStops, + float defaultTabStop, @IntRange(from = 0) int indentsOffset); // Result accessors diff --git a/graphics/java/android/graphics/text/MeasuredText.java b/graphics/java/android/graphics/text/MeasuredText.java index 480aff289dfc..66bcd8650b95 100644 --- a/graphics/java/android/graphics/text/MeasuredText.java +++ b/graphics/java/android/graphics/text/MeasuredText.java @@ -169,8 +169,9 @@ public class MeasuredText { * Note: The appendStyle and appendReplacementRun should be called to cover the text length. */ public static final class Builder { - private static final NativeAllocationRegistry sRegistry = new NativeAllocationRegistry( - MeasuredText.class.getClassLoader(), nGetReleaseFunc(), 1024); + private static final NativeAllocationRegistry sRegistry = + NativeAllocationRegistry.createMalloced( + MeasuredText.class.getClassLoader(), nGetReleaseFunc()); private long mNativePtr; diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp index 3bbee18c6dd1..219d04055eae 100644 --- a/libs/hwui/hwui/Bitmap.cpp +++ b/libs/hwui/hwui/Bitmap.cpp @@ -287,6 +287,8 @@ size_t Bitmap::getAllocationByteCount() const { switch (mPixelStorageType) { case PixelStorageType::Heap: return mPixelStorage.heap.size; + case PixelStorageType::Ashmem: + return mPixelStorage.ashmem.size; default: return rowBytes() * height(); } diff --git a/libs/hwui/hwui/Bitmap.h b/libs/hwui/hwui/Bitmap.h index 01e45166e0a3..dd98b25ac7e8 100644 --- a/libs/hwui/hwui/Bitmap.h +++ b/libs/hwui/hwui/Bitmap.h @@ -103,6 +103,8 @@ public: bool isHardware() const { return mPixelStorageType == PixelStorageType::Hardware; } + PixelStorageType pixelStorageType() const { return mPixelStorageType; } + GraphicBuffer* graphicBuffer(); /** diff --git a/libs/hwui/tests/scripts/prep_generic.sh b/libs/hwui/tests/scripts/prep_generic.sh new file mode 100755 index 000000000000..223bf373c65a --- /dev/null +++ b/libs/hwui/tests/scripts/prep_generic.sh @@ -0,0 +1,249 @@ +# +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +################################################################# +### +### DO NOT MODIFY THIS FILE +### This is a copy of androidx's benchmark/lockClocks.sh +### Make changes there instead then copy here! +### +################################################################# + +# This script can be used to lock device clocks to stable levels for comparing +# different versions of software. Since the clock levels are not necessarily +# indicative of real world behavior, this should **never** be used to compare +# performance between different device models. + +# Fun notes for maintaining this file: +# `expr` can deal with ints > INT32_MAX, but if compares cannot. This is why we use MHz. +# `expr` can sometimes evaluate right-to-left. This is why we use parens. +# Everything below the initial host-check isn't bash - Android uses mksh +# mksh allows `\n` in an echo, bash doesn't +# can't use `awk` + +CPU_TARGET_FREQ_PERCENT=50 +GPU_TARGET_FREQ_PERCENT=50 + +if [ "`command -v getprop`" == "" ]; then + if [ -n "`command -v adb`" ]; then + echo "" + echo "Pushing $0 and running it on device..." + dest=/data/local/tmp/`basename $0` + adb push $0 ${dest} + adb shell ${dest} + adb shell rm ${dest} + exit + else + echo "Could not find adb. Options are:" + echo " 1. Ensure adb is on your \$PATH" + echo " 2. Use './gradlew lockClocks'" + echo " 3. Manually adb push this script to your device, and run it there" + exit -1 + fi +fi + +# require root +if [ "`id -u`" -ne "0" ]; then + echo "Not running as root, cannot lock clocks, aborting" + exit -1 +fi + +DEVICE=`getprop ro.product.device` +MODEL=`getprop ro.product.model` + +# Find CPU max frequency, and lock big cores to an available frequency +# that's >= $CPU_TARGET_FREQ_PERCENT% of max. Disable other cores. +function_lock_cpu() { + CPU_BASE=/sys/devices/system/cpu + GOV=cpufreq/scaling_governor + + # Find max CPU freq, and associated list of available freqs + cpuMaxFreq=0 + cpuAvailFreqCmpr=0 + cpuAvailFreq=0 + enableIndices='' + disableIndices='' + cpu=0 + while [ -f ${CPU_BASE}/cpu${cpu}/online ]; do + # enable core, so we can find its frequencies + echo 1 > ${CPU_BASE}/cpu${cpu}/online + + maxFreq=`cat ${CPU_BASE}/cpu$cpu/cpufreq/cpuinfo_max_freq` + availFreq=`cat ${CPU_BASE}/cpu$cpu/cpufreq/scaling_available_frequencies` + availFreqCmpr=${availFreq// /-} + + if [ ${maxFreq} -gt ${cpuMaxFreq} ]; then + # new highest max freq, look for cpus with same max freq and same avail freq list + cpuMaxFreq=${maxFreq} + cpuAvailFreq=${availFreq} + cpuAvailFreqCmpr=${availFreqCmpr} + + if [ -z ${disableIndices} ]; then + disableIndices="$enableIndices" + else + disableIndices="$disableIndices $enableIndices" + fi + enableIndices=${cpu} + elif [ ${maxFreq} == ${cpuMaxFreq} ] && [ ${availFreqCmpr} == ${cpuAvailFreqCmpr} ]; then + enableIndices="$enableIndices $cpu" + else + disableIndices="$disableIndices $cpu" + fi + cpu=$(($cpu + 1)) + done + + # Chose a frequency to lock to that's >= $CPU_TARGET_FREQ_PERCENT% of max + # (below, 100M = 1K for KHz->MHz * 100 for %) + TARGET_FREQ_MHZ=`expr \( ${cpuMaxFreq} \* ${CPU_TARGET_FREQ_PERCENT} \) \/ 100000` + chosenFreq=0 + for freq in ${cpuAvailFreq}; do + freqMhz=`expr ${freq} \/ 1000` + if [ ${freqMhz} -ge ${TARGET_FREQ_MHZ} ]; then + chosenFreq=${freq} + break + fi + done + + # enable 'big' CPUs + for cpu in ${enableIndices}; do + freq=${CPU_BASE}/cpu$cpu/cpufreq + + echo 1 > ${CPU_BASE}/cpu${cpu}/online + echo userspace > ${CPU_BASE}/cpu${cpu}/${GOV} + echo ${chosenFreq} > ${freq}/scaling_max_freq + echo ${chosenFreq} > ${freq}/scaling_min_freq + echo ${chosenFreq} > ${freq}/scaling_setspeed + + # validate setting the freq worked + obsCur=`cat ${freq}/scaling_cur_freq` + obsMin=`cat ${freq}/scaling_min_freq` + obsMax=`cat ${freq}/scaling_max_freq` + if [ obsCur -ne ${chosenFreq} ] || [ obsMin -ne ${chosenFreq} ] || [ obsMax -ne ${chosenFreq} ]; then + echo "Failed to set CPU$cpu to $chosenFreq Hz! Aborting..." + echo "scaling_cur_freq = $obsCur" + echo "scaling_min_freq = $obsMin" + echo "scaling_max_freq = $obsMax" + exit -1 + fi + done + + # disable other CPUs (Note: important to enable big cores first!) + for cpu in ${disableIndices}; do + echo 0 > ${CPU_BASE}/cpu${cpu}/online + done + + echo "\nLocked CPUs ${enableIndices// /,} to $chosenFreq / $maxFreq KHz" + echo "Disabled CPUs ${disableIndices// /,}" +} + +# If we have a Qualcomm GPU, find its max frequency, and lock to +# an available frequency that's >= GPU_TARGET_FREQ_PERCENT% of max. +function_lock_gpu_kgsl() { + if [ ! -d /sys/class/kgsl/kgsl-3d0/ ]; then + # not kgsl, abort + echo "\nCurrently don't support locking GPU clocks of $MODEL ($DEVICE)" + return -1 + fi + if [ ${DEVICE} == "walleye" ] || [ ${DEVICE} == "taimen" ]; then + # Workaround crash + echo "\nUnable to lock GPU clocks of $MODEL ($DEVICE)" + return -1 + fi + + GPU_BASE=/sys/class/kgsl/kgsl-3d0 + + gpuMaxFreq=0 + gpuAvailFreq=`cat $GPU_BASE/devfreq/available_frequencies` + for freq in ${gpuAvailFreq}; do + if [ ${freq} -gt ${gpuMaxFreq} ]; then + gpuMaxFreq=${freq} + fi + done + + # (below, 100M = 1M for MHz * 100 for %) + TARGET_FREQ_MHZ=`expr \( ${gpuMaxFreq} \* ${GPU_TARGET_FREQ_PERCENT} \) \/ 100000000` + + chosenFreq=${gpuMaxFreq} + index=0 + chosenIndex=0 + for freq in ${gpuAvailFreq}; do + freqMhz=`expr ${freq} \/ 1000000` + if [ ${freqMhz} -ge ${TARGET_FREQ_MHZ} ] && [ ${chosenFreq} -ge ${freq} ]; then + # note avail freq are generally in reverse order, so we don't break out of this loop + chosenFreq=${freq} + chosenIndex=${index} + fi + index=$(($index + 1)) + done + lastIndex=$(($index - 1)) + + firstFreq=`echo $gpuAvailFreq | cut -d" " -f1` + + if [ ${gpuMaxFreq} != ${firstFreq} ]; then + # pwrlevel is index of desired freq among available frequencies, from highest to lowest. + # If gpuAvailFreq appears to be in-order, reverse the index + chosenIndex=$(($lastIndex - $chosenIndex)) + fi + + echo 0 > ${GPU_BASE}/bus_split + echo 1 > ${GPU_BASE}/force_clk_on + echo 10000 > ${GPU_BASE}/idle_timer + + echo performance > ${GPU_BASE}/devfreq/governor + + # NOTE: we store in min/max twice, because we don't know if we're increasing + # or decreasing, and it's invalid to try and set min > max, or max < min + echo ${chosenFreq} > ${GPU_BASE}/devfreq/min_freq + echo ${chosenFreq} > ${GPU_BASE}/devfreq/max_freq + echo ${chosenFreq} > ${GPU_BASE}/devfreq/min_freq + echo ${chosenFreq} > ${GPU_BASE}/devfreq/max_freq + echo ${chosenIndex} > ${GPU_BASE}/min_pwrlevel + echo ${chosenIndex} > ${GPU_BASE}/max_pwrlevel + echo ${chosenIndex} > ${GPU_BASE}/min_pwrlevel + echo ${chosenIndex} > ${GPU_BASE}/max_pwrlevel + + obsCur=`cat ${GPU_BASE}/devfreq/cur_freq` + obsMin=`cat ${GPU_BASE}/devfreq/min_freq` + obsMax=`cat ${GPU_BASE}/devfreq/max_freq` + if [ obsCur -ne ${chosenFreq} ] || [ obsMin -ne ${chosenFreq} ] || [ obsMax -ne ${chosenFreq} ]; then + echo "Failed to set GPU to $chosenFreq Hz! Aborting..." + echo "cur_freq = $obsCur" + echo "min_freq = $obsMin" + echo "max_freq = $obsMax" + echo "index = $chosenIndex" + exit -1 + fi + echo "\nLocked GPU to $chosenFreq / $gpuMaxFreq Hz" +} + +# kill processes that manage thermals / scaling +stop thermal-engine +stop perfd +stop vendor.thermal-engine +stop vendor.perfd + +function_lock_cpu + +function_lock_gpu_kgsl + +# Memory bus - hardcoded per-device for now +if [ ${DEVICE} == "marlin" ] || [ ${DEVICE} == "sailfish" ]; then + echo 13763 > /sys/class/devfreq/soc:qcom,gpubw/max_freq +else + echo "\nUnable to lock memory bus of $MODEL ($DEVICE)." +fi + +echo "\n$DEVICE clocks have been locked - to reset, reboot the device\n"
\ No newline at end of file diff --git a/libs/hwui/tests/scripts/prep_ryu.sh b/libs/hwui/tests/scripts/prep_ryu.sh index 7c6c0df8d58e..7c6c0df8d58e 100644..100755 --- a/libs/hwui/tests/scripts/prep_ryu.sh +++ b/libs/hwui/tests/scripts/prep_ryu.sh diff --git a/location/java/android/location/GpsStatus.java b/location/java/android/location/GpsStatus.java index 4e37654e7c65..609a15e1be7e 100644 --- a/location/java/android/location/GpsStatus.java +++ b/location/java/android/location/GpsStatus.java @@ -30,7 +30,6 @@ import java.util.NoSuchElementException; * <p>This class is used in conjunction with the {@link Listener} interface. * * @deprecated use {@link GnssStatus} and {@link GnssStatus.Callback}. - * @removed */ @Deprecated public final class GpsStatus { @@ -113,7 +112,6 @@ public final class GpsStatus { /** * Used for receiving notifications when GPS status has changed. * @deprecated use {@link GnssStatus.Callback} instead. - * @removed */ @Deprecated public interface Listener { @@ -144,7 +142,6 @@ public final class GpsStatus { * You can implement this interface and call {@link LocationManager#addNmeaListener} * to receive NMEA data from the GPS engine. * @deprecated use {@link OnNmeaMessageListener} instead. - * @removed */ @Deprecated public interface NmeaListener { diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index db6a4d02b04e..dd179f3e9bab 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -1360,10 +1360,10 @@ public class LocationManager { @NonNull String provider, boolean enabled, @NonNull UserHandle userHandle) { checkProvider(provider); - return Settings.Secure.setLocationProviderEnabledForUser( + return Settings.Secure.putStringForUser( mContext.getContentResolver(), - provider, - enabled, + Settings.Secure.LOCATION_PROVIDERS_ALLOWED, + (enabled ? "+" : "-") + provider, userHandle.getIdentifier()); } @@ -1749,7 +1749,6 @@ public class LocationManager { * * @throws SecurityException if the ACCESS_FINE_LOCATION permission is not present * @deprecated use {@link #registerGnssStatusCallback(GnssStatus.Callback)} instead. - * @removed */ @Deprecated @RequiresPermission(ACCESS_FINE_LOCATION) @@ -1762,7 +1761,6 @@ public class LocationManager { * * @param listener GPS status listener object to remove * @deprecated use {@link #unregisterGnssStatusCallback(GnssStatus.Callback)} instead. - * @removed */ @Deprecated public void removeGpsStatusListener(GpsStatus.Listener listener) {} @@ -2088,7 +2086,6 @@ public class LocationManager { * * @param status object containing GPS status details, or null. * @return status object containing updated GPS status. - * @removed */ @Deprecated @RequiresPermission(ACCESS_FINE_LOCATION) diff --git a/media/native/midi/include/Doxyfile b/media/native/midi/include/Doxyfile index 2828f4816342..e40bbdc9fa67 100644 --- a/media/native/midi/include/Doxyfile +++ b/media/native/midi/include/Doxyfile @@ -790,7 +790,7 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = "midi.h" +INPUT = "amidi/AMidi.h" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/media/native/midi/include/amidi/AMidi.h b/media/native/midi/include/amidi/AMidi.h index 0d60b0dd63d4..cbe410f46af9 100644 --- a/media/native/midi/include/amidi/AMidi.h +++ b/media/native/midi/include/amidi/AMidi.h @@ -13,6 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** + * @addtogroup Midi + * @{ + */ + +/** + * @file AMidi.h + */ #ifndef ANDROID_MEDIA_AMIDI_H_ #define ANDROID_MEDIA_AMIDI_H_ @@ -244,3 +252,6 @@ void AMIDI_API AMidiInputPort_close(const AMidiInputPort *inputPort) __INTRODUCE #endif #endif /* ANDROID_MEDIA_AMIDI_H_ */ +/** +@} +*/ diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 8732524de07d..45459fc337b5 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -161,6 +161,11 @@ public class CarStatusBar extends StatusBar implements } buildNavBarContent(); + // If the UI was rebuilt (day/night change) while the keyguard was up we need to + // correctly respect that state. + if (mIsKeyguard) { + updateNavBarForKeyguardContent(); + } } private void addTemperatureViewToController(View v) { @@ -211,6 +216,13 @@ public class CarStatusBar extends StatusBar implements @Override public void showKeyguard() { super.showKeyguard(); + updateNavBarForKeyguardContent(); + } + + /** + * Switch to the keyguard applicable content contained in the nav bars + */ + private void updateNavBarForKeyguardContent() { getComponent(NotificationsUI.class).closeCarNotifications(0); if (mNavigationBarView != null) { mNavigationBarView.showKeyguardButtons(); diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java index 8c6b9b0107a4..59218688ce7a 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java @@ -64,4 +64,12 @@ public class CarStatusBarKeyguardViewManager extends StatusBarKeyguardViewManage CarStatusBar statusBar = (CarStatusBar) mStatusBar; statusBar.showUserSwitcher(); } + + /** + * Do nothing on this change. + * The base class hides the keyguard which for automotive we want to avoid b/c this would happen + * on a configuration change due to day/night (headlight state). + */ + @Override + public void onDensityOrFontScaleChanged() { } } diff --git a/packages/CtsShim/build/shim/AndroidManifest.xml b/packages/CtsShim/build/shim/AndroidManifest.xml index 9b813ace8b80..3e546f1e02db 100644 --- a/packages/CtsShim/build/shim/AndroidManifest.xml +++ b/packages/CtsShim/build/shim/AndroidManifest.xml @@ -20,7 +20,7 @@ package="com.android.cts.ctsshim" > <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="24" /> + android:targetSdkVersion="28" /> <restrict-update android:hash="__CAN_NOT_BE_UPDATED__" /> diff --git a/packages/CtsShim/build/shim_priv/AndroidManifest.xml b/packages/CtsShim/build/shim_priv/AndroidManifest.xml index 9bf454c29768..9ab12c9743c0 100644 --- a/packages/CtsShim/build/shim_priv/AndroidManifest.xml +++ b/packages/CtsShim/build/shim_priv/AndroidManifest.xml @@ -20,7 +20,7 @@ package="com.android.cts.priv.ctsshim" > <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="24" /> + android:targetSdkVersion="28" /> <restrict-update android:hash="__HASH__" /> diff --git a/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml b/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml index 023e93e1449e..2354061fe351 100644 --- a/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml +++ b/packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml @@ -20,7 +20,7 @@ package="com.android.cts.priv.ctsshim" > <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="24" /> + android:targetSdkVersion="28" /> <application android:hasCode="false" diff --git a/packages/DynamicAndroidInstallationService/res/values/strings.xml b/packages/DynamicAndroidInstallationService/res/values/strings.xml index aee67e10692a..03c7c28c7036 100644 --- a/packages/DynamicAndroidInstallationService/res/values/strings.xml +++ b/packages/DynamicAndroidInstallationService/res/values/strings.xml @@ -30,6 +30,9 @@ <!-- Action on notification: Reboot to AndroidOnTap [CHAR LIMIT=16] --> <string name="notification_action_reboot_to_dynandroid">Reboot</string> - <!-- Toast when installed AndroidOnTap is discarded [CHAR LIMIT=64] --> + <!-- Toast when installed DynamicAndroid is discarded [CHAR LIMIT=64] --> <string name="toast_dynandroid_discarded">Installed AndroidOnTap is discarded.</string> + <!-- Toast when we fail to launch into DynamicAndroid [CHAR LIMIT=64] --> + <string name="toast_failed_to_reboot_to_dynandroid">Failed to reboot into AndroidOnTap.</string> + </resources> diff --git a/packages/DynamicAndroidInstallationService/src/com/android/dynandroid/DynamicAndroidInstallationService.java b/packages/DynamicAndroidInstallationService/src/com/android/dynandroid/DynamicAndroidInstallationService.java index 63ac8c73decf..d942babf78a6 100644 --- a/packages/DynamicAndroidInstallationService/src/com/android/dynandroid/DynamicAndroidInstallationService.java +++ b/packages/DynamicAndroidInstallationService/src/com/android/dynandroid/DynamicAndroidInstallationService.java @@ -278,10 +278,15 @@ public class DynamicAndroidInstallationService extends Service } if (!mInstallTask.commit()) { - // TODO: b/123673280 better UI response Log.e(TAG, "Failed to commit installation because of native runtime error."); mNM.cancel(NOTIFICATION_ID); + Toast.makeText(this, + getString(R.string.toast_failed_to_reboot_to_dynandroid), + Toast.LENGTH_LONG).show(); + + mDynAndroid.remove(); + return; } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index 274acad2b1e4..36bb8ef62320 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -16,10 +16,6 @@ package com.android.providers.settings; -import android.os.Process; -import com.android.internal.app.LocalePicker; -import com.android.internal.annotations.VisibleForTesting; - import android.annotation.NonNull; import android.app.ActivityManager; import android.app.IActivityManager; @@ -30,7 +26,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.icu.util.ULocale; -import android.location.LocationManager; import android.media.AudioManager; import android.media.RingtoneManager; import android.net.Uri; @@ -38,13 +33,14 @@ import android.os.LocaleList; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.os.UserManager; import android.provider.Settings; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.ArraySet; -import java.lang.IllegalArgumentException; +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.app.LocalePicker; + import java.util.ArrayList; import java.util.HashMap; import java.util.Locale; @@ -145,9 +141,6 @@ public class SettingsHelper { if (Settings.System.SOUND_EFFECTS_ENABLED.equals(name)) { setSoundEffects(Integer.parseInt(value) == 1); // fall through to the ordinary write to settings - } else if (Settings.Secure.LOCATION_PROVIDERS_ALLOWED.equals(name)) { - setGpsLocation(value); - return; } else if (Settings.Secure.BACKUP_AUTO_RESTORE.equals(name)) { setAutoRestore(Integer.parseInt(value) == 1); } else if (isAlreadyConfiguredCriticalAccessibilitySetting(name)) { @@ -297,21 +290,6 @@ public class SettingsHelper { } catch (RemoteException e) {} } - private void setGpsLocation(String value) { - UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE); - if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) { - return; - } - final String GPS = LocationManager.GPS_PROVIDER; - boolean enabled = - GPS.equals(value) || - value.startsWith(GPS + ",") || - value.endsWith("," + GPS) || - value.contains("," + GPS + ","); - LocationManager lm = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE); - lm.setProviderEnabledForUser(GPS, enabled, Process.myUserHandle()); - } - private void setSoundEffects(boolean enable) { if (enable) { mAudioManager.loadSoundEffects(); diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index fc6ef2bcede2..d639e5eca43d 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -175,6 +175,9 @@ <uses-permission android:name="android.permission.MANAGE_APPOPS" /> + <!-- Permission needed to run network tests in CTS --> + <uses-permission android:name="android.permission.MANAGE_TEST_NETWORKS" /> + <application android:label="@string/app_label" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true"> diff --git a/packages/SystemUI/res/layout/assistant_handle.xml b/packages/SystemUI/res/layout/assistant_handle.xml deleted file mode 100644 index a952ca5e596f..000000000000 --- a/packages/SystemUI/res/layout/assistant_handle.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2019 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 - --> - -<com.android.systemui.statusbar.phone.NavigationHandle - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/assistant_handle" - android:layout_width="@dimen/navigation_assistant_handle_width" - android:layout_height="match_parent" - android:layout_weight="0" -/> - diff --git a/packages/SystemUI/res/layout/notification_info.xml b/packages/SystemUI/res/layout/notification_info.xml index 725ace403ba3..0d44931463bd 100644 --- a/packages/SystemUI/res/layout/notification_info.xml +++ b/packages/SystemUI/res/layout/notification_info.xml @@ -255,6 +255,7 @@ asked for it --> android:layout_width="40dp" android:layout_height="40dp" android:clickable="false" + android:contentDescription="@string/inline_block_button" android:tint="@color/GM2_grey_400" style="@style/TextAppearance.NotificationInfo.Button"/> </FrameLayout> @@ -289,6 +290,7 @@ asked for it --> android:layout_width="40dp" android:layout_height="40dp" android:clickable="false" + android:contentDescription="@string/inline_silent_button_silent" android:tint="@color/GM2_grey_400" style="@style/TextAppearance.NotificationInfo.Button"/> </FrameLayout> @@ -322,6 +324,7 @@ asked for it --> android:layout_gravity="center" android:layout_width="40dp" android:layout_height="40dp" + android:contentDescription="@string/inline_silent_button_alert" android:clickable="false" android:tint="@color/GM2_grey_400" style="@style/TextAppearance.NotificationInfo.Button"/> diff --git a/packages/SystemUI/res/layout/ongoing_privacy_chip.xml b/packages/SystemUI/res/layout/ongoing_privacy_chip.xml index f64a64e619a0..b16e06207ca3 100644 --- a/packages/SystemUI/res/layout/ongoing_privacy_chip.xml +++ b/packages/SystemUI/res/layout/ongoing_privacy_chip.xml @@ -28,7 +28,7 @@ android:orientation="horizontal" android:focusable="true"> - <LinearLayout + <FrameLayout android:id="@+id/background" android:layout_height="@dimen/ongoing_appops_chip_height" android:layout_width="wrap_content" @@ -37,25 +37,8 @@ android:id="@+id/icons_container" android:layout_height="match_parent" android:layout_width="wrap_content" - android:layout_marginStart="@dimen/ongoing_appops_chip_items_margin" - android:layout_gravity="center_vertical" + android:layout_gravity="center" android:gravity="center_vertical" /> - - <TextView - android:id="@+id/text_container" - android:layout_height="match_parent" - android:layout_width="wrap_content" - android:layout_gravity="center_vertical|end" - android:paddingStart="@dimen/ongoing_appops_chip_text_padding" - android:paddingEnd="@dimen/ongoing_appops_chip_text_padding" - android:gravity="center_vertical" - android:singleLine="true" - android:ellipsize="end" - android:lines="1" - android:textAppearance="@style/TextAppearance.StatusBar.Clock" - android:textSize="@dimen/ongoing_appops_chip_text_size" - android:textColor="@color/status_bar_clock_color" - /> - </LinearLayout> + </FrameLayout> </com.android.systemui.privacy.OngoingPrivacyChip>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/status_bar_notification_footer.xml b/packages/SystemUI/res/layout/status_bar_notification_footer.xml index 056f16a93626..174a3b8e004b 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_footer.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_footer.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" android:layout_gravity="start" android:focusable="true" + android:contentDescription="@string/accessibility_manage_notification" android:text="@string/manage_notifications_text" android:textColor="?attr/wallpaperTextColor" android:textAllCaps="false"/> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 8b4f66de2f92..f8295ebff027 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -330,7 +330,7 @@ <!-- Nav bar button default ordering/layout --> <string name="config_navBarLayout" translatable="false">left[.5W],back[1WC];home;recent[1WC],right[.5W]</string> <string name="config_navBarLayoutQuickstep" translatable="false">back[1.7WC];home;contextual[1.7WC]</string> - <string name="config_navBarLayoutHandle" translatable="false">";home_handle;assistant_handle[.18WC]"</string> + <string name="config_navBarLayoutHandle" translatable="false">";home_handle;"</string> <bool name="quick_settings_show_full_alarm">false</bool> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 30c29dcff9e0..30cbaaad33df 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -34,11 +34,10 @@ <dimen name="navigation_bar_deadzone_size_max">32dp</dimen> <!-- dimensions for the navigation bar handle --> - <dimen name="navigation_handle_radius">2dp</dimen> - <dimen name="navigation_handle_bottom">8dp</dimen> + <dimen name="navigation_handle_radius">1dp</dimen> + <dimen name="navigation_handle_bottom">6dp</dimen> <dimen name="navigation_handle_horizontal_margin">30dp</dimen> - <dimen name="navigation_home_handle_width">180dp</dimen> - <dimen name="navigation_assistant_handle_width">36dp</dimen> + <dimen name="navigation_home_handle_width">280dp</dimen> <!-- Height of notification icons in the status bar --> <dimen name="status_bar_icon_size">@*android:dimen/status_bar_icon_size</dimen> @@ -1003,10 +1002,8 @@ <dimen name="ongoing_appops_chip_margin">0dp</dimen> <!-- Height of the Ongoing App Ops chip --> <dimen name="ongoing_appops_chip_height">32dp</dimen> - <!-- Start and End padding for Ongoing App Ops chip --> - <dimen name="ongoing_appops_chip_text_padding">8dp</dimen> <!-- Padding between background of Ongoing App Ops chip and content --> - <dimen name="ongoing_appops_chip_bg_padding">0dp</dimen> + <dimen name="ongoing_appops_chip_bg_padding">8dp</dimen> <!-- Side padding between background of Ongoing App Ops chip and content --> <dimen name="ongoing_appops_chip_side_padding">8dp</dimen> <!-- Margin between icons of Ongoing App Ops chip when QQS--> @@ -1017,10 +1014,7 @@ <dimen name="ongoing_appops_chip_icon_size">@*android:dimen/status_bar_icon_size</dimen> <!-- Radius of Ongoing App Ops chip corners --> <dimen name="ongoing_appops_chip_bg_corner_radius">16dp</dimen> - <!-- Size of text of Ongoing App Ops chip --> - <dimen name="ongoing_appops_chip_text_size">12sp</dimen> - <!-- Margin between items in Ongoing App Ops chip --> - <dimen name="ongoing_appops_chip_items_margin">8dp</dimen> + <!-- How much a bubble is elevated --> <dimen name="bubble_elevation">8dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 16222f7ebd8d..da433913bfa3 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -266,6 +266,8 @@ <string name="accessibility_scanning_face">Scanning face</string> <!-- Click action label for accessibility for the smart reply buttons (not shown on-screen).". [CHAR LIMIT=NONE] --> <string name="accessibility_send_smart_reply">Send</string> + <!-- Content description of the manage notification button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_manage_notification">Manage notifications</string> <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] --> <string name="unlock_label">unlock</string> <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] --> @@ -2318,26 +2320,12 @@ app for debugging. Will not be seen by users. [CHAR LIMIT=20] --> <string name="heap_dump_tile_name">Dump SysUI Heap</string> - <!-- Text on chip for multiple apps using a single app op [CHAR LIMIT=12] --> - <plurals name="ongoing_privacy_chip_multiple_apps"> - <item quantity="one"><xliff:g id="num_apps" example="1">%d</xliff:g> app</item> - <item quantity="few"><xliff:g id="num_apps" example="3">%d</xliff:g> apps</item> - <item quantity="other"><xliff:g id="num_apps" example="3">%d</xliff:g> apps</item> - </plurals> - <!-- Content description for ongoing privacy chip. Use with a single app [CHAR LIMIT=NONE]--> <string name="ongoing_privacy_chip_content_single_app"><xliff:g id="app" example="Example App">%1$s</xliff:g> is using your <xliff:g id="types_list" example="camera, location">%2$s</xliff:g>.</string> <!-- Content description for ongoing privacy chip. Use with multiple apps [CHAR LIMIT=NONE]--> <string name="ongoing_privacy_chip_content_multiple_apps">Applications are using your <xliff:g id="types_list" example="camera, location">%s</xliff:g>.</string> - <!-- Content description for ongoing privacy chip. Use with multiple apps using same app op[CHAR LIMIT=NONE]--> - <plurals name="ongoing_privacy_chip_content_multiple_apps_single_op"> - <item quantity="one"><xliff:g id="num_apps" example="1">%1$d</xliff:g> application is using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</item> - <item quantity="few"><xliff:g id="num_apps" example="3">%1$d</xliff:g> applications are using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</item> - <item quantity="other"><xliff:g id="num_apps" example="3">%1$d</xliff:g> applications are using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</item> - </plurals> - <!-- Action for accepting the Ongoing privacy dialog [CHAR LIMIT=10]--> <string name="ongoing_privacy_dialog_ok">Got it</string> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 97160b6a6f2c..63f8cd6d2025 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -105,11 +105,6 @@ import java.util.function.Consumer; * Watches for updates that may be interesting to the keyguard, and provides * the up to date information as well as a registration for callbacks that care * to be updated. - * - * Note: under time crunch, this has been extended to include some stuff that - * doesn't really belong here. see {@link #handleBatteryUpdate} where it shutdowns - * the device, and {@link #getFailedUnlockAttempts()}, {@link #reportFailedAttempt()} - * and {@link #clearFailedUnlockAttempts()}. Maybe we should rename this 'KeyguardContext'... */ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { @@ -1568,6 +1563,15 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { updateFaceListeningState(); } + /** + * Requests face authentication if we're on a state where it's allowed. + * This will re-trigger auth in case it fails. + */ + public void requestFaceAuth() { + if (DEBUG) Log.d(TAG, "requestFaceAuth()"); + updateFaceListeningState(); + } + private void updateFaceListeningState() { // If this message exists, we should not authenticate again until this message is // consumed by the handler @@ -1629,7 +1633,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { return; } if (DEBUG) Log.v(TAG, "startListeningForFingerprint()"); - int userId = ActivityManager.getCurrentUser(); + int userId = getCurrentUser(); if (isUnlockWithFingerprintPossible(userId)) { if (mFingerprintCancelSignal != null) { mFingerprintCancelSignal.cancel(); @@ -1647,7 +1651,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { return; } if (DEBUG) Log.v(TAG, "startListeningForFace()"); - int userId = ActivityManager.getCurrentUser(); + int userId = getCurrentUser(); if (isUnlockWithFacePossible(userId)) { if (mFaceCancelSignal != null) { mFaceCancelSignal.cancel(); diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ImageClock.java b/packages/SystemUI/src/com/android/keyguard/clock/ImageClock.java index 22753805c95e..95f100433137 100644 --- a/packages/SystemUI/src/com/android/keyguard/clock/ImageClock.java +++ b/packages/SystemUI/src/com/android/keyguard/clock/ImageClock.java @@ -59,7 +59,7 @@ public class ImageClock extends FrameLayout { */ public void onTimeChanged() { mTime.setTimeInMillis(System.currentTimeMillis()); - final float hourAngle = mTime.get(Calendar.HOUR) * 30f; + final float hourAngle = mTime.get(Calendar.HOUR) * 30f + mTime.get(Calendar.MINUTE) * 0.5f; mHourHand.setRotation(hourAngle); final float minuteAngle = mTime.get(Calendar.MINUTE) * 6f; mMinuteHand.setRotation(minuteAngle); diff --git a/packages/SystemUI/src/com/android/keyguard/clock/StretchAnalogClock.java b/packages/SystemUI/src/com/android/keyguard/clock/StretchAnalogClock.java index 34c855bc33d3..8cdd6325638e 100644 --- a/packages/SystemUI/src/com/android/keyguard/clock/StretchAnalogClock.java +++ b/packages/SystemUI/src/com/android/keyguard/clock/StretchAnalogClock.java @@ -103,7 +103,8 @@ public class StretchAnalogClock extends View { final float centerY = getHeight() / 2f; final float minutesRotation = mTime.get(Calendar.MINUTE) * 6f; - final float hoursRotation = (mTime.get(Calendar.HOUR) * 30); + final float hoursRotation = mTime.get(Calendar.HOUR) * 30 + + mTime.get(Calendar.MINUTE) * 0.5f; // Compute length of clock hands. Hour hand is 60% the length from center to edge // and minute hand is twice the length to make sure it extends past screen edge. diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index ff68d2be087e..97a277b5236a 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -14,6 +14,7 @@ import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.PixelFormat; +import android.graphics.Rect; import android.os.AsyncTask; import android.os.Binder; import android.os.Bundle; @@ -173,6 +174,26 @@ public class AssistManager implements ConfigurationChangedReceiver { startAssistInternal(args, assistComponent, isService); } + /** + * Returns a {@code Rect} containing system UI presented on behalf of the assistant that + * consumes touches. + */ + @Nullable + public Rect getTouchableRegion() { + // intentional no-op, vendor's AssistManager implementation should override if needed. + return null; + } + + /** Registers a listener for changes to system UI presented on behalf of the assistant. */ + public void setAssistSysUiChangeListener(AssistSysUiChangeListener listener) { + // intentional no-op, vendor's AssistManager implementation should override if needed. + } + + /** Returns {@code true} if the system UI is showing UI for the assistant. */ + public boolean hasAssistUi() { + return false; + } + public void hideAssist() { mAssistUtils.hideCurrentSession(); } diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistSysUiChangeListener.java b/packages/SystemUI/src/com/android/systemui/assist/AssistSysUiChangeListener.java new file mode 100644 index 000000000000..d03afb6e4ebd --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistSysUiChangeListener.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2019 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.assist; + +/** + * Used to notify when system UI is showing UI for the assistant. + */ +public interface AssistSysUiChangeListener { + + /** Called when the visibility of system UI for the assistant has changed. */ + void onChange(boolean isVisible); + +} diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index 888e3fe282a8..f3a701e0152f 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -426,7 +426,9 @@ public class BubbleStackView extends FrameLayout { if (reason == BubbleController.DISMISS_USER_GESTURE) { Notification.BubbleMetadata bubbleMetadata = bubble.entry.getBubbleMetadata(); - PendingIntent deleteIntent = bubbleMetadata.getDeleteIntent(); + PendingIntent deleteIntent = bubbleMetadata != null + ? bubbleMetadata.getDeleteIntent() + : null; if (deleteIntent != null) { try { deleteIntent.send(); diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java b/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java index 06dbdbf1efa8..a4592d554f0e 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java @@ -121,11 +121,17 @@ public class DozeDockHandler implements DozeMachine.Part { if (dozeState == State.DOZE && mConfig.alwaysOnEnabled(UserHandle.USER_CURRENT)) { mMachine.requestState(State.DOZE_AOD); - break; } - // continue below + else { + requestPulseOutNow(dozeState); + } + break; case DockManager.STATE_DOCKED_HIDE: - requestPulseOutNow(dozeState); + if (dozeState == State.DOZE_AOD) { + mMachine.requestState(State.DOZE); + } else { + requestPulseOutNow(dozeState); + } break; default: // no-op diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt index 15dc43f041f4..23742c0953bb 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt @@ -17,9 +17,9 @@ package com.android.systemui.privacy import android.content.Context import android.util.AttributeSet import android.view.ViewGroup +import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout -import android.widget.TextView import com.android.systemui.Dependency import com.android.systemui.R import com.android.systemui.statusbar.policy.KeyguardMonitor @@ -42,9 +42,8 @@ class OngoingPrivacyChip @JvmOverloads constructor( private val sidePadding = context.resources.getDimensionPixelSize(R.dimen.ongoing_appops_chip_side_padding) private val backgroundDrawable = context.getDrawable(R.drawable.privacy_chip_bg) - private lateinit var text: TextView private lateinit var iconsContainer: LinearLayout - private lateinit var back: LinearLayout + private lateinit var back: FrameLayout var expanded = false set(value) { if (value != field) { @@ -66,14 +65,14 @@ class OngoingPrivacyChip @JvmOverloads constructor( super.onFinishInflate() back = findViewById(R.id.background) - text = findViewById(R.id.text_container) iconsContainer = findViewById(R.id.icons_container) } // Should only be called if the builder icons or app changed private fun updateView() { back.background = if (expanded) backgroundDrawable else null - back.setPaddingRelative(0, 0, if (expanded) sidePadding else 0, 0) + val padding = if (expanded) sidePadding else 0 + back.setPaddingRelative(padding, 0, padding, 0) fun setIcons(dialogBuilder: PrivacyDialogBuilder, iconsContainer: ViewGroup) { iconsContainer.removeAllViews() dialogBuilder.generateIcons().forEachIndexed { i, it -> @@ -95,44 +94,17 @@ class OngoingPrivacyChip @JvmOverloads constructor( if (!privacyList.isEmpty()) { generateContentDescription() setIcons(builder, iconsContainer) - setApplicationText() } else { - text.visibility = GONE iconsContainer.removeAllViews() } requestLayout() } - private fun setApplicationText() { - text.visibility = if (builder.types.size == 1 && expanded) VISIBLE else GONE - if (builder.types.size == 1 && expanded) { - if (builder.app != null && !amISecure()) { - text.setText(builder.app?.applicationName) - } else { - text.text = context.resources.getQuantityString( - R.plurals.ongoing_privacy_chip_multiple_apps, - builder.appsAndTypes.size, builder.appsAndTypes.size) - } - } - } - private fun amISecure() = keyguardMonitor.isShowing && keyguardMonitor.isSecure private fun generateContentDescription() { val typesText = builder.joinTypes() - if (builder.types.size > 1) { - contentDescription = context.getString( - R.string.ongoing_privacy_chip_content_multiple_apps, typesText) - } else { - if (builder.app != null && !amISecure()) { - contentDescription = - context.getString(R.string.ongoing_privacy_chip_content_single_app, - builder.app?.applicationName, typesText) - } else { - contentDescription = context.resources.getQuantityString( - R.plurals.ongoing_privacy_chip_content_multiple_apps_single_op, - builder.appsAndTypes.size, builder.appsAndTypes.size, typesText) - } - } + contentDescription = context.getString( + R.string.ongoing_privacy_chip_content_multiple_apps, typesText) } }
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt index bbea6b277e90..59b3c3464a69 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt @@ -22,7 +22,6 @@ class PrivacyDialogBuilder(private val context: Context, itemsList: List<Privacy val appsAndTypes: List<Pair<PrivacyApplication, List<PrivacyType>>> val types: List<PrivacyType> - val app: PrivacyApplication? private val separator = context.getString(R.string.ongoing_privacy_dialog_separator) private val lastSeparator = context.getString(R.string.ongoing_privacy_dialog_last_separator) @@ -32,8 +31,6 @@ class PrivacyDialogBuilder(private val context: Context, itemsList: List<Privacy .sortedWith(compareBy({ -it.second.size }, // Sort by number of AppOps { it.second.min() })) // Sort by "smallest" AppOpp (Location is largest) types = itemsList.map { it.privacyType }.distinct().sorted() - val singleApp = appsAndTypes.size == 1 - app = if (singleApp) appsAndTypes[0].first else null } fun generateIconsForApp(types: List<PrivacyType>): List<Drawable> { @@ -58,11 +55,7 @@ class PrivacyDialogBuilder(private val context: Context, itemsList: List<Privacy } fun getDialogTitle(): String { - if (app != null) { - return context.getString(R.string.ongoing_privacy_dialog_single_app_title, joinTypes()) - } else { - return context.getString(R.string.ongoing_privacy_dialog_multiple_apps_title, + return context.getString(R.string.ongoing_privacy_dialog_multiple_apps_title, joinTypes()) - } } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 4da8ca28f4c7..92195942ca06 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -107,6 +107,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis private IOverviewProxy mOverviewProxy; private int mConnectionBackoffAttempts; private @InteractionType int mInteractionFlags; + private boolean mBound; private boolean mIsEnabled; private int mCurrentBoundedUserId = -1; private float mBackButtonAlpha; @@ -510,16 +511,15 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis mHandler.removeCallbacks(mConnectionRunnable); Intent launcherServiceIntent = new Intent(ACTION_QUICKSTEP) .setPackage(mRecentsComponentName.getPackageName()); - boolean bound = false; try { - bound = mContext.bindServiceAsUser(launcherServiceIntent, + mBound = mContext.bindServiceAsUser(launcherServiceIntent, mOverviewServiceConnection, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE, UserHandle.of(mDeviceProvisionedController.getCurrentUser())); } catch (SecurityException e) { Log.e(TAG_OPS, "Unable to bind because of security error", e); } - if (bound) { + if (mBound) { // Ensure that connection has been established even if it thinks it is bound mHandler.postDelayed(mDeferredConnectionCallback, DEFERRED_CALLBACK_MILLIS); } else { @@ -573,9 +573,14 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis } private void disconnectFromLauncherService() { + if (mBound) { + // Always unbind the service (ie. if called through onNullBinding or onBindingDied) + mContext.unbindService(mOverviewServiceConnection); + mBound = false; + } + if (mOverviewProxy != null) { mOverviewProxy.asBinder().unlinkToDeath(mOverviewServiceDeathRcpt, 0); - mContext.unbindService(mOverviewServiceConnection); mOverviewProxy = null; notifyBackButtonAlphaChanged(1f, false /* animate */); notifyConnectionChanged(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index dfbb32e451d6..8faeb155b1e6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -664,6 +664,9 @@ public class KeyguardIndicationController implements StateListener { public void onBiometricRunningStateChanged(boolean running, BiometricSourceType biometricSourceType) { if (running) { + // Let's hide any previous messages when authentication starts, otherwise + // multiple auth attempts would overlap. + hideTransientIndication(); mMessageToShowOnScreenOn = null; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java index 311bf7a244c1..c2da51777210 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/FooterView.java @@ -79,6 +79,8 @@ public class FooterView extends StackScrollerDecorView { mDismissButton.setContentDescription( mContext.getString(R.string.accessibility_clear_all)); mManageButton.setText(R.string.manage_notifications_text); + mManageButton.setContentDescription( + mContext.getString(R.string.accessibility_manage_notification)); } public boolean isButtonVisible() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java index fea01ef61df9..54bdaa23ea1d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java @@ -122,11 +122,22 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx } /** - * Sends an intent to open the app settings for a particular package and optional + * Sends an intent to open the notification settings for a particular package and optional * channel. */ private void startAppNotificationSettingsActivity(String packageName, final int appUid, final NotificationChannel channel, ExpandableNotificationRow row) { + final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS); + intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName); + intent.putExtra(Settings.EXTRA_APP_UID, appUid); + if (channel != null) { + intent.putExtra(EXTRA_FRAGMENT_ARG_KEY, channel.getId()); + } + mNotificationActivityStarter.startNotificationGutsIntent(intent, appUid, row); + } + + private void startAppDetailsSettingsActivity(String packageName, final int appUid, + final NotificationChannel channel, ExpandableNotificationRow row) { final Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); intent.setData(Uri.fromParts("package", packageName, null)); intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName); @@ -141,7 +152,7 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx ExpandableNotificationRow row) { if (ops.contains(OP_SYSTEM_ALERT_WINDOW)) { if (ops.contains(OP_CAMERA) || ops.contains(OP_RECORD_AUDIO)) { - startAppNotificationSettingsActivity(pkg, uid, null, row); + startAppDetailsSettingsActivity(pkg, uid, null, row); } else { Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION); intent.setData(Uri.fromParts("package", pkg, null)); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java index de0e194ef90c..9844d8e5a67a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java @@ -37,7 +37,6 @@ import com.android.systemui.Dependency; import com.android.systemui.Dumpable; import com.android.systemui.R; import com.android.systemui.ScreenDecorations; -import com.android.systemui.bubbles.BubbleController; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener; import com.android.systemui.statusbar.StatusBarState; @@ -57,14 +56,14 @@ import java.util.Stack; * A implementation of HeadsUpManager for phone and car. */ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, - ViewTreeObserver.OnComputeInternalInsetsListener, VisualStabilityManager.Callback, - OnHeadsUpChangedListener, ConfigurationController.ConfigurationListener, StateListener { + VisualStabilityManager.Callback, OnHeadsUpChangedListener, + ConfigurationController.ConfigurationListener, StateListener { private static final String TAG = "HeadsUpManagerPhone"; private final View mStatusBarWindowView; private final NotificationGroupManager mGroupManager; - private final StatusBar mBar; private final VisualStabilityManager mVisualStabilityManager; + private final StatusBarTouchableRegionManager mStatusBarTouchableRegionManager; private boolean mReleaseOnExpandFinish; private int mStatusBarHeight; @@ -78,13 +77,9 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, private boolean mIsExpanded; private int[] mTmpTwoArray = new int[2]; private boolean mHeadsUpGoingAway; - private boolean mWaitingOnCollapseWhenGoingAway; - private boolean mBubbleGoingAway; - private boolean mIsObserving; private int mStatusBarState; private AnimationStateHandler mAnimationStateHandler; - private BubbleController mBubbleController = Dependency.get(BubbleController.class); private final Pools.Pool<HeadsUpEntryPhone> mEntryPool = new Pools.Pool<HeadsUpEntryPhone>() { private Stack<HeadsUpEntryPhone> mPoolObjects = new Stack<>(); @@ -107,14 +102,17 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, /////////////////////////////////////////////////////////////////////////////////////////////// // Constructor: - public HeadsUpManagerPhone(@NonNull final Context context, @NonNull View statusBarWindowView, - @NonNull NotificationGroupManager groupManager, @NonNull StatusBar bar, - @NonNull VisualStabilityManager visualStabilityManager) { + public HeadsUpManagerPhone(@NonNull final Context context, + @NonNull View statusBarWindowView, + @NonNull NotificationGroupManager groupManager, + @NonNull StatusBar bar, + @NonNull VisualStabilityManager visualStabilityManager) { super(context); mStatusBarWindowView = statusBarWindowView; + mStatusBarTouchableRegionManager = new StatusBarTouchableRegionManager(context, this, bar, + statusBarWindowView); mGroupManager = groupManager; - mBar = bar; mVisualStabilityManager = visualStabilityManager; initResources(); @@ -125,16 +123,10 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, if (Log.isLoggable(TAG, Log.WARN)) { Log.w(TAG, "onHeadsUpPinnedModeChanged"); } - updateTouchableRegionListener(); + mStatusBarTouchableRegionManager.updateTouchableRegion(); } }); Dependency.get(StatusBarStateController.class).addCallback(this); - mBubbleController.setBubbleStateChangeListener((hasBubbles) -> { - if (!hasBubbles) { - mBubbleGoingAway = true; - } - updateTouchableRegionListener(); - }); } public void setAnimationStateHandler(AnimationStateHandler handler) { @@ -209,14 +201,10 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, if (isExpanded != mIsExpanded) { mIsExpanded = isExpanded; if (isExpanded) { - // make sure our state is sane - mWaitingOnCollapseWhenGoingAway = false; mHeadsUpGoingAway = false; - updateTouchableRegionListener(); - } - if (mBubbleController.hasBubbles() || !mIsExpanded) { - updateTouchableRegionListener(); } + mStatusBarTouchableRegionManager.setIsStatusBarExpanded(isExpanded); + mStatusBarTouchableRegionManager.updateTouchableRegion(); } } @@ -233,15 +221,21 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, if (headsUpGoingAway != mHeadsUpGoingAway) { mHeadsUpGoingAway = headsUpGoingAway; if (!headsUpGoingAway) { - waitForStatusBarLayout(); + mStatusBarTouchableRegionManager.updateTouchableRegionAfterLayout(); + } else { + mStatusBarTouchableRegionManager.updateTouchableRegion(); } - updateTouchableRegionListener(); } } + public boolean isHeadsUpGoingAway() { + return mHeadsUpGoingAway; + } + /** * Notifies that a remote input textbox in notification gets active or inactive. - * @param entry The entry of the target notification. + * + * @param entry The entry of the target notification. * @param remoteInputActive True to notify active, False to notify inactive. */ public void setRemoteInputActive( @@ -295,23 +289,23 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, dumpInternal(fd, pw, args); } - /////////////////////////////////////////////////////////////////////////////////////////////// - // ViewTreeObserver.OnComputeInternalInsetsListener overrides: - /** - * Overridden from TreeObserver. + * Update touch insets to include any area needed for touching a heads up notification. + * + * @param info Insets that will include heads up notification touch area after execution. */ - @Override - public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo info) { - if (mIsExpanded || mBar.isBouncerShowing()) { - // The touchable region is always the full area when expanded - return; - } - if (hasPinnedHeadsUp()) { + @Nullable + public void updateTouchableRegion(ViewTreeObserver.InternalInsetsInfo info) { + info.setTouchableInsets(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION); + + if (!hasPinnedHeadsUp()) { + info.touchableRegion.set(0, 0, mStatusBarWindowView.getWidth(), mStatusBarHeight); + updateRegionForNotch(info.touchableRegion); + } else { NotificationEntry topEntry = getTopEntry(); if (topEntry.isChildInGroup()) { - final NotificationEntry groupSummary - = mGroupManager.getGroupSummary(topEntry.notification); + final NotificationEntry groupSummary = + mGroupManager.getGroupSummary(topEntry.notification); if (groupSummary != null) { topEntry = groupSummary; } @@ -321,23 +315,8 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, int minX = mTmpTwoArray[0]; int maxX = mTmpTwoArray[0] + topRow.getWidth(); int height = topRow.getIntrinsicHeight(); - - info.setTouchableInsets(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION); info.touchableRegion.set(minX, 0, maxX, mHeadsUpInset + height); - } else { - setCollapsedTouchableInsets(info); } - Rect r = mBubbleController.getTouchableRegion(); - if (r != null) { - info.touchableRegion.union(r); - } - mBubbleGoingAway = false; - } - - private void setCollapsedTouchableInsets(ViewTreeObserver.InternalInsetsInfo info) { - info.setTouchableInsets(ViewTreeObserver.InternalInsetsInfo.TOUCHABLE_INSETS_REGION); - info.touchableRegion.set(0, 0, mStatusBarWindowView.getWidth(), mStatusBarHeight); - updateRegionForNotch(info.touchableRegion); } private void updateRegionForNotch(Region region) { @@ -364,9 +343,7 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, @Override public void onConfigChanged(Configuration newConfig) { - Resources resources = mContext.getResources(); - mStatusBarHeight = resources.getDimensionPixelSize( - com.android.internal.R.dimen.status_bar_height); + initResources(); } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -401,14 +378,15 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, @Override protected boolean shouldHeadsUpBecomePinned(NotificationEntry entry) { - return mStatusBarState != StatusBarState.KEYGUARD && !mIsExpanded - || super.shouldHeadsUpBecomePinned(entry); + return mStatusBarState != StatusBarState.KEYGUARD && !mIsExpanded + || super.shouldHeadsUpBecomePinned(entry); } @Override protected void dumpInternal(FileDescriptor fd, PrintWriter pw, String[] args) { super.dumpInternal(fd, pw, args); - pw.print(" mBarState="); pw.println(mStatusBarState); + pw.print(" mBarState="); + pw.println(mStatusBarState); } /////////////////////////////////////////////////////////////////////////////////////////////// @@ -438,45 +416,6 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, return headsUpEntry == null || headsUpEntry != topEntry || super.canRemoveImmediately(key); } - /** - * We need to wait on the whole panel to collapse, before we can remove the touchable region - * listener. - */ - private void waitForStatusBarLayout() { - mWaitingOnCollapseWhenGoingAway = true; - mStatusBarWindowView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() { - @Override - public void onLayoutChange(View v, int left, int top, int right, int bottom, - int oldLeft, - int oldTop, int oldRight, int oldBottom) { - if (mStatusBarWindowView.getHeight() <= mStatusBarHeight) { - mStatusBarWindowView.removeOnLayoutChangeListener(this); - mWaitingOnCollapseWhenGoingAway = false; - updateTouchableRegionListener(); - } - } - }); - } - - // TODO: some kind of TouchableRegionManager to deal with this, HeadsUpManager is not really - // the right place - private void updateTouchableRegionListener() { - boolean shouldObserve = hasPinnedHeadsUp() || mHeadsUpGoingAway - || mBubbleController.hasBubbles() || mBubbleGoingAway - || mWaitingOnCollapseWhenGoingAway - || mStatusBarWindowView.getRootWindowInsets().getDisplayCutout() != null; - if (shouldObserve == mIsObserving) { - return; - } - if (shouldObserve) { - mStatusBarWindowView.getViewTreeObserver().addOnComputeInternalInsetsListener(this); - mStatusBarWindowView.requestLayout(); - } else { - mStatusBarWindowView.getViewTreeObserver().removeOnComputeInternalInsetsListener(this); - } - mIsObserving = shouldObserve; - } - /////////////////////////////////////////////////////////////////////////////////////////////// // HeadsUpEntryPhone: @@ -490,7 +429,7 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, } public void setEntry(@NonNull final NotificationEntry entry) { - Runnable removeHeadsUpRunnable = () -> { + Runnable removeHeadsUpRunnable = () -> { if (!mVisualStabilityManager.isReorderingAllowed()) { mEntriesToRemoveWhenReorderingAllowed.add(entry); mVisualStabilityManager.addReorderingAllowedCallback( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index e953ad53527b..c8ce39230da8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -483,7 +483,9 @@ public class KeyguardStatusBarView extends RelativeLayout R.color.light_mode_icon_color_single_tone); float intensity = textColor == Color.WHITE ? 0 : 1; mCarrierLabel.setTextColor(iconColor); - mIconManager.setTint(iconColor); + if (mIconManager != null) { + mIconManager.setTint(iconColor); + } applyDarkness(R.id.battery, mEmptyRect, intensity * (1f - mDarkAmount), iconColor); applyDarkness(R.id.clock, mEmptyRect, intensity, iconColor); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index b7d1fc697f2a..df3a66b18381 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -236,7 +236,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange return com.android.internal.R.anim.lock_lock; } else if (newState == STATE_SCANNING_FACE) { return com.android.internal.R.anim.lock_scanning; - } else if (!wasPulsing && pulsing) { + } else if (!wasPulsing && pulsing && newState != STATE_LOCK_OPEN) { return com.android.internal.R.anim.lock_in; } return -1; 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 2a38f771e921..faa2ab105816 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarInflaterView.java @@ -63,7 +63,6 @@ public class NavigationBarInflaterView extends FrameLayout public static final String NAVSPACE = "space"; public static final String CLIPBOARD = "clipboard"; public static final String HOME_HANDLE = "home_handle"; - public static final String ASSISTANT_HANDLE = "assistant_handle"; public static final String KEY = "key"; public static final String LEFT = "left"; public static final String RIGHT = "right"; @@ -399,8 +398,6 @@ public class NavigationBarInflaterView extends FrameLayout v = inflater.inflate(R.layout.contextual, parent, false); } else if (HOME_HANDLE.equals(button)) { v = inflater.inflate(R.layout.home_handle, parent, false); - } else if (ASSISTANT_HANDLE.equals(button)) { - v = inflater.inflate(R.layout.assistant_handle, parent, false); } else if (button.startsWith(KEY)) { String uri = extractImage(button); int code = extractKeycode(button); 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 a64ff0fce73c..18612c359dae 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -434,7 +434,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav mButtonDispatchers.put(R.id.back, new ButtonDispatcher(R.id.back)); mButtonDispatchers.put(R.id.home, new ButtonDispatcher(R.id.home)); mButtonDispatchers.put(R.id.home_handle, new ButtonDispatcher(R.id.home_handle)); - mButtonDispatchers.put(R.id.assistant_handle, new ButtonDispatcher(R.id.assistant_handle)); mButtonDispatchers.put(R.id.recent_apps, new ButtonDispatcher(R.id.recent_apps)); mButtonDispatchers.put(R.id.menu, menuButton); mButtonDispatchers.put(R.id.ime_switcher, imeSwitcherButton); @@ -638,10 +637,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav return mButtonDispatchers.get(R.id.home_handle); } - public ButtonDispatcher getAssistantHandle() { - return mButtonDispatchers.get(R.id.assistant_handle); - } - public SparseArray<ButtonDispatcher> getButtonDispatchers() { return mButtonDispatchers; } @@ -1008,7 +1003,6 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav // TODO(b/112934365): move this back to NavigationBarFragment when prototype is removed private void updateAssistantAvailability() { boolean available = mAssistantAvailable && mPrototypeController.isAssistantGestureEnabled(); - getAssistantHandle().setVisibility(available ? View.VISIBLE : View.GONE); if (mOverviewProxyService.getProxy() != null) { try { mOverviewProxyService.getProxy().onAssistantAvailable(available); 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 142f398cd881..babee5393e8c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -326,6 +326,14 @@ public class NotificationPanelView extends PanelView implements Dependency.get(ShadeController.class); private int mDisplayId; + /** + * Cache the resource id of the theme to avoid unnecessary work in onThemeChanged. + * + * onThemeChanged is forced when the theme might not have changed. So, to avoid unncessary + * work, check the current id with the cached id. + */ + private int mThemeResId; + @Inject public NotificationPanelView(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs, NotificationWakeUpCoordinator coordinator, @@ -342,6 +350,7 @@ public class NotificationPanelView extends PanelView implements mCommandQueue = getComponent(context, CommandQueue.class); mDisplayId = context.getDisplayId(); mPulseExpansionHandler = pulseExpansionHandler; + mThemeResId = context.getThemeResId(); } /** @@ -390,6 +399,9 @@ public class NotificationPanelView extends PanelView implements Dependency.get(StatusBarStateController.class).addCallback(this); Dependency.get(ZenModeController.class).addCallback(this); Dependency.get(ConfigurationController.class).addCallback(this); + // Theme might have changed between inflating this view and attaching it to the window, so + // force a call to onThemeChanged + onThemeChanged(); } @Override @@ -452,6 +464,12 @@ public class NotificationPanelView extends PanelView implements @Override public void onThemeChanged() { + final int themeResId = getContext().getThemeResId(); + if (mThemeResId == themeResId) { + return; + } + mThemeResId = themeResId; + updateShowEmptyShadeView(); // Re-inflate the status view group. @@ -1217,6 +1235,12 @@ public class NotificationPanelView extends PanelView implements setQsExpansion(height); requestPanelHeightUpdate(); mNotificationStackScroller.checkSnoozeLeavebehind(); + + // When expanding QS, let's authenticate the user if possible, + // this will speed up notification actions. + if (height == 0) { + mStatusBar.requestFaceAuth(); + } } private void setQsExpanded(boolean expanded) { 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 60b16593bd73..8db08221ef73 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -538,7 +538,7 @@ public class StatusBar extends SystemUI implements DemoMode, private BatteryController mBatteryController; protected boolean mPanelExpanded; private UiModeManager mUiModeManager; - private boolean mIsKeyguard; + protected boolean mIsKeyguard; private LogMaker mStatusBarStateLog; protected NotificationIconAreaController mNotificationIconAreaController; @Nullable private View mAmbientIndicationContainer; @@ -1315,6 +1315,15 @@ public class StatusBar extends SystemUI implements DemoMode, mEntryManager.updateNotifications(); } + /** + * Asks {@link KeyguardUpdateMonitor} to run face auth. + */ + public void requestFaceAuth() { + if (!mUnlockMethodCache.canSkipBouncer()) { + mKeyguardUpdateMonitor.requestFaceAuth(); + } + } + public void updateAreThereNotifications() { if (SPEW) { final boolean clearable = hasActiveNotifications() && diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java index b0e006d75f81..74c00187bd07 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java @@ -248,7 +248,6 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit ActivityManager.getService().resumeAppSwitches(); } catch (RemoteException e) { } - int launchResult; // If we are launching a work activity and require to launch // separate work challenge, we defer the activity action and cancel // notification until work challenge is unlocked. @@ -277,24 +276,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit fillInIntent = new Intent().putExtra(Notification.EXTRA_REMOTE_INPUT_DRAFT, remoteInputText.toString()); } - RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation( - row, wasOccluded); - try { - if (adapter != null) { - ActivityTaskManager.getService() - .registerRemoteAnimationForNextActivityStart( - intent.getCreatorPackage(), adapter); - } - launchResult = intent.sendAndReturnResult(mContext, 0, fillInIntent, null, - null, null, getActivityOptions(adapter)); - mActivityLaunchAnimator.setLaunchResult(launchResult, isActivityIntent); - } catch (RemoteException | PendingIntent.CanceledException e) { - // the stack trace isn't very helpful here. - // Just log the exception message. - Log.w(TAG, "Sending contentIntent failed: " + e); - - // TODO: Dismiss Keyguard. - } + startNotificationIntent(intent, fillInIntent, row, wasOccluded, isActivityIntent); if (isActivityIntent) { mAssistManager.hideAssist(); } @@ -327,6 +309,27 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit mIsCollapsingToShowActivityOverLockscreen = false; } + private void startNotificationIntent(PendingIntent intent, Intent fillInIntent, + ExpandableNotificationRow row, boolean wasOccluded, boolean isActivityIntent) { + RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation(row, + wasOccluded); + try { + if (adapter != null) { + ActivityTaskManager.getService() + .registerRemoteAnimationForNextActivityStart( + intent.getCreatorPackage(), adapter); + } + int launchResult = intent.sendAndReturnResult(mContext, 0, fillInIntent, null, + null, null, getActivityOptions(adapter)); + mActivityLaunchAnimator.setLaunchResult(launchResult, isActivityIntent); + } catch (RemoteException | PendingIntent.CanceledException e) { + // the stack trace isn't very helpful here. + // Just log the exception message. + Log.w(TAG, "Sending contentIntent failed: " + e); + // TODO: Dismiss Keyguard. + } + } + @Override public void startNotificationGutsIntent(final Intent intent, final int appUid, ExpandableNotificationRow row) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java new file mode 100644 index 000000000000..603c969a9de9 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarTouchableRegionManager.java @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2019 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.annotation.NonNull; +import android.content.Context; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.graphics.Rect; +import android.view.View; +import android.view.ViewTreeObserver; +import android.view.ViewTreeObserver.OnComputeInternalInsetsListener; + +import com.android.systemui.Dependency; +import com.android.systemui.assist.AssistManager; +import com.android.systemui.bubbles.BubbleController; +import com.android.systemui.statusbar.policy.ConfigurationController; +import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener; + +/** + * Manages what parts of the status bar are touchable. Clients are primarily UI that displays in the + * status bar even though the UI doesn't look like part of the status bar. + */ +public final class StatusBarTouchableRegionManager implements + OnComputeInternalInsetsListener, ConfigurationListener { + + private final AssistManager mAssistManager = Dependency.get(AssistManager.class); + private final BubbleController mBubbleController = Dependency.get(BubbleController.class); + private final Context mContext; + private final HeadsUpManagerPhone mHeadsUpManager; + private boolean mIsStatusBarExpanded = false; + private boolean mShouldAdjustInsets = false; + private final StatusBar mStatusBar; + private int mStatusBarHeight; + private final View mStatusBarWindowView; + private boolean mForceCollapsedUntilLayout = false; + + public StatusBarTouchableRegionManager(@NonNull Context context, + HeadsUpManagerPhone headsUpManager, + @NonNull StatusBar statusBar, + @NonNull View statusBarWindowView) { + mContext = context; + mHeadsUpManager = headsUpManager; + mStatusBar = statusBar; + mStatusBarWindowView = statusBarWindowView; + + initResources(); + + mAssistManager.setAssistSysUiChangeListener((isVisible) -> { + updateTouchableRegion(); + }); + mBubbleController.setBubbleStateChangeListener((hasBubbles) -> { + updateTouchableRegion(); + }); + Dependency.get(ConfigurationController.class).addCallback(this); + } + + /** + * Set the touchable portion of the status bar based on what elements are visible. + */ + public void updateTouchableRegion() { + boolean hasCutoutInset = (mStatusBarWindowView != null) + && (mStatusBarWindowView.getRootWindowInsets() != null) + && (mStatusBarWindowView.getRootWindowInsets().getDisplayCutout() != null); + boolean shouldObserve = + mHeadsUpManager.hasPinnedHeadsUp() || mHeadsUpManager.isHeadsUpGoingAway() + || mBubbleController.hasBubbles() + || mAssistManager.hasAssistUi() + || mForceCollapsedUntilLayout + || hasCutoutInset; + if (shouldObserve == mShouldAdjustInsets) { + return; + } + + if (shouldObserve) { + mStatusBarWindowView.getViewTreeObserver().addOnComputeInternalInsetsListener(this); + mStatusBarWindowView.requestLayout(); + } else { + mStatusBarWindowView.getViewTreeObserver().removeOnComputeInternalInsetsListener(this); + } + mShouldAdjustInsets = shouldObserve; + } + + /** + * Calls {@code updateTouchableRegion()} after a layout pass completes. + */ + public void updateTouchableRegionAfterLayout() { + mForceCollapsedUntilLayout = true; + mStatusBarWindowView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() { + @Override + public void onLayoutChange(View v, int left, int top, int right, int bottom, + int oldLeft, + int oldTop, int oldRight, int oldBottom) { + if (mStatusBarWindowView.getHeight() <= mStatusBarHeight) { + mStatusBarWindowView.removeOnLayoutChangeListener(this); + mForceCollapsedUntilLayout = false; + updateTouchableRegion(); + } + } + }); + } + + /** + * Notify that the status bar panel gets expanded or collapsed. + * + * @param isExpanded True to notify expanded, false to notify collapsed. + */ + public void setIsStatusBarExpanded(boolean isExpanded) { + if (isExpanded != mIsStatusBarExpanded) { + mIsStatusBarExpanded = isExpanded; + if (isExpanded) { + // make sure our state is sane + mForceCollapsedUntilLayout = false; + } + updateTouchableRegion(); + } + } + + @Override + public void onComputeInternalInsets(ViewTreeObserver.InternalInsetsInfo info) { + if (mIsStatusBarExpanded || mStatusBar.isBouncerShowing()) { + // The touchable region is always the full area when expanded + return; + } + + mHeadsUpManager.updateTouchableRegion(info); + + Rect bubbleRect = mBubbleController.getTouchableRegion(); + if (bubbleRect != null) { + info.touchableRegion.union(bubbleRect); + } + + Rect assistRect = mAssistManager.getTouchableRegion(); + if (assistRect != null) { + info.touchableRegion.union(assistRect); + } + } + + @Override + public void onConfigChanged(Configuration newConfig) { + initResources(); + } + + @Override + public void onDensityOrFontScaleChanged() { + initResources(); + } + + @Override + public void onOverlayChanged() { + initResources(); + } + + private void initResources() { + Resources resources = mContext.getResources(); + mStatusBarHeight = resources.getDimensionPixelSize( + com.android.internal.R.dimen.status_bar_height); + } +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java index 4ba28582d7ba..df014a49e5cb 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java @@ -202,4 +202,16 @@ public class DozeDockHandlerTest extends SysuiTestCase { verify(mMachine).requestState(eq(State.DOZE)); } + + @Test + public void testTransitionToPulsing_whenDockedHide_requestPulseOut() { + mDockHandler.transitionTo(DozeMachine.State.UNINITIALIZED, DozeMachine.State.INITIALIZED); + when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE_PULSING); + when(mMachine.getPulseReason()).thenReturn(DozeLog.PULSE_REASON_DOCKING); + mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED_HIDE); + + mDockHandler.transitionTo(DozeMachine.State.INITIALIZED, State.DOZE_PULSING); + + verify(mHost).stopPulsing(); + } } diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index c75b4c6f113c..9995d8e4d893 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java @@ -115,7 +115,7 @@ public final class ContentCaptureManagerService extends public ContentCaptureManagerService(@NonNull Context context) { super(context, new FrameworkResourcesServiceNameResolver(context, com.android.internal.R.string.config_defaultContentCaptureService), - UserManager.DISALLOW_CONTENT_CAPTURE); + UserManager.DISALLOW_CONTENT_CAPTURE, /* refreshServiceOnPackageUpdate=*/ false); DeviceConfig.addOnPropertyChangedListener(DeviceConfig.NAMESPACE_CONTENT_CAPTURE, ActivityThread.currentApplication().getMainExecutor(), (namespace, key, value) -> onDeviceConfigChange(key, value)); diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java index feb1ac1bff21..c423f9c87d29 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java @@ -100,6 +100,13 @@ final class ContentCapturePerUserService @GuardedBy("mLock") private final WhitelistHelper mWhitelistHelper = new WhitelistHelper(); + /** + * When {@code true}, remote service died but service state is kept so it's restored after + * the system re-binds to it. + */ + @GuardedBy("mLock") + private boolean mZombie; + // TODO(b/111276913): add mechanism to prune stale sessions, similar to Autofill's ContentCapturePerUserService(@NonNull ContentCaptureManagerService master, @@ -179,6 +186,37 @@ final class ContentCapturePerUserService public void onServiceDied(@NonNull RemoteContentCaptureService service) { // Don't do anything; eventually the system will bind to it again... Slog.w(TAG, "remote service died: " + service); + synchronized (mLock) { + mZombie = true; + } + } + + /** + * Called after the remote service connected, it's used to restore state from a 'zombie' + * service (i.e., after it died). + */ + void onConnected() { + synchronized (mLock) { + if (mZombie) { + // Sanity check - shouldn't happen + if (mRemoteService == null) { + Slog.w(TAG, "Cannot ressurect sessions because remote service is null"); + return; + } + + mZombie = false; + final int numSessions = mSessions.size(); + if (mMaster.debug) { + Slog.d(TAG, "Ressurrecting remote service (" + mRemoteService + ") on " + + numSessions + " sessions"); + } + + for (int i = 0; i < numSessions; i++) { + final ContentCaptureServerSession session = mSessions.valueAt(i); + session.resurrectLocked(); + } + } + } } // TODO(b/119613670): log metrics @@ -260,7 +298,7 @@ final class ContentCapturePerUserService } final ContentCaptureServerSession newSession = new ContentCaptureServerSession( - activityToken, this, mRemoteService, componentName, taskId, + activityToken, this, mRemoteService, componentName, clientReceiver, taskId, displayId, sessionId, uid, flags); if (mMaster.verbose) { Slog.v(TAG, "startSession(): new session for " @@ -389,6 +427,9 @@ final class ContentCapturePerUserService @GuardedBy("mLock") public void destroyLocked() { if (mMaster.debug) Slog.d(TAG, "destroyLocked()"); + if (mRemoteService != null) { + mRemoteService.destroy(); + } destroySessionsLocked(); } @@ -449,6 +490,8 @@ final class ContentCapturePerUserService protected void dumpLocked(String prefix, PrintWriter pw) { super.dumpLocked(prefix, pw); + pw.print(prefix); pw.print("Zombie: "); pw.println(mZombie); + final String prefix2 = prefix + " "; if (mRemoteService != null) { pw.print(prefix); pw.println("remote service:"); diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureServerSession.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureServerSession.java index 40948432751d..da198362f5cb 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureServerSession.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureServerSession.java @@ -23,6 +23,7 @@ import android.service.contentcapture.SnapshotData; import android.util.LocalLog; import android.util.Slog; import android.view.contentcapture.ContentCaptureContext; +import android.view.contentcapture.ContentCaptureSession; import android.view.contentcapture.ContentCaptureSessionId; import com.android.internal.annotations.GuardedBy; @@ -44,6 +45,12 @@ final class ContentCaptureServerSession { private final ContentCaptureContext mContentCaptureContext; /** + * Reference to the binder object help at the client-side process and used to set its state. + */ + @NonNull + private final IResultReceiver mSessionStateReceiver; + + /** * Canonical session id. */ private final String mId; @@ -56,7 +63,7 @@ final class ContentCaptureServerSession { ContentCaptureServerSession(@NonNull IBinder activityToken, @NonNull ContentCapturePerUserService service, @NonNull RemoteContentCaptureService remoteService, - @NonNull ComponentName appComponentName, + @NonNull ComponentName appComponentName, @NonNull IResultReceiver sessionStateReceiver, int taskId, int displayId, @NonNull String sessionId, int uid, int flags) { mActivityToken = activityToken; mService = service; @@ -65,6 +72,7 @@ final class ContentCaptureServerSession { mRemoteService = remoteService; mContentCaptureContext = new ContentCaptureContext(/* clientContext= */ null, appComponentName, taskId, displayId, flags); + mSessionStateReceiver = sessionStateReceiver; } /** @@ -79,7 +87,8 @@ final class ContentCaptureServerSession { */ @GuardedBy("mLock") public void notifySessionStartedLocked(@NonNull IResultReceiver clientReceiver) { - mRemoteService.onSessionStarted(mContentCaptureContext, mId, mUid, clientReceiver); + mRemoteService.onSessionStarted(mContentCaptureContext, mId, mUid, clientReceiver, + ContentCaptureSession.STATE_ACTIVE); } /** @@ -129,6 +138,17 @@ final class ContentCaptureServerSession { } } + /** + * Called to restore the active state of a session that was paused while the service died. + */ + @GuardedBy("mLock") + public void resurrectLocked() { + mRemoteService.onSessionStarted(new ContentCaptureContext(mContentCaptureContext, + ContentCaptureContext.FLAG_RECONNECTED), mId, mUid, mSessionStateReceiver, + ContentCaptureSession.STATE_ACTIVE + | ContentCaptureSession.STATE_SERVICE_RESURRECTED); + } + @GuardedBy("mLock") public void dumpLocked(@NonNull String prefix, @NonNull PrintWriter pw) { pw.print(prefix); pw.print("id: "); pw.print(mId); pw.println(); diff --git a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java index 1d2d6254f759..2ce5059244a1 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java @@ -40,14 +40,16 @@ final class RemoteContentCaptureService private final IBinder mServerCallback; private final int mIdleUnbindTimeoutMs; + private final ContentCapturePerUserService mPerUserService; RemoteContentCaptureService(Context context, String serviceInterface, ComponentName serviceComponentName, IContentCaptureServiceCallback callback, int userId, - ContentCaptureServiceCallbacks callbacks, boolean bindInstantServiceAllowed, + ContentCapturePerUserService perUserService, boolean bindInstantServiceAllowed, boolean verbose, int idleUnbindTimeoutMs) { - super(context, serviceInterface, serviceComponentName, userId, callbacks, + super(context, serviceInterface, serviceComponentName, userId, perUserService, context.getMainThreadHandler(), bindInstantServiceAllowed, verbose, /* initialCapacity= */ 2); + mPerUserService = perUserService; mServerCallback = callback.asBinder(); mIdleUnbindTimeoutMs = idleUnbindTimeoutMs; @@ -65,19 +67,25 @@ final class RemoteContentCaptureService return mIdleUnbindTimeoutMs; } - @Override // from RemoteService - protected void handleOnConnectedStateChanged(boolean state) { - if (state && getTimeoutIdleBindMillis() != PERMANENT_BOUND_TIMEOUT_MS) { + @Override // from AbstractRemoteService + protected void handleOnConnectedStateChanged(boolean connected) { + if (connected && getTimeoutIdleBindMillis() != PERMANENT_BOUND_TIMEOUT_MS) { scheduleUnbind(); } try { - if (state) { - mService.onConnected(mServerCallback, sVerbose, sDebug); + if (connected) { + try { + mService.onConnected(mServerCallback, sVerbose, sDebug); + } finally { + // Update the system-service state, in case the service reconnected after + // dying + mPerUserService.onConnected(); + } } else { mService.onDisconnected(); } } catch (Exception e) { - Slog.w(mTag, "Exception calling onConnectedStateChanged(" + state + "): " + e); + Slog.w(mTag, "Exception calling onConnectedStateChanged(" + connected + "): " + e); } } @@ -86,8 +94,10 @@ final class RemoteContentCaptureService * {@link RemoteContentCaptureService} to indicate the session was created. */ public void onSessionStarted(@Nullable ContentCaptureContext context, - @NonNull String sessionId, int uid, @NonNull IResultReceiver clientReceiver) { - scheduleAsyncRequest((s) -> s.onSessionStarted(context, sessionId, uid, clientReceiver)); + @NonNull String sessionId, int uid, @NonNull IResultReceiver clientReceiver, + int initialState) { + scheduleAsyncRequest( + (s) -> s.onSessionStarted(context, sessionId, uid, clientReceiver, initialState)); } /** diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 72f7a68ad2ad..3ed294845d97 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -299,6 +299,15 @@ public class ConnectivityService extends IConnectivityManager.Stub private INetworkPolicyManager mPolicyManager; private NetworkPolicyManagerInternal mPolicyManagerInternal; + /** + * TestNetworkService (lazily) created upon first usage. Locked to prevent creation of multiple + * instances. + */ + @GuardedBy("mTNSLock") + private TestNetworkService mTNS; + + private final Object mTNSLock = new Object(); + private String mCurrentTcpBufferSizes; private static final SparseArray<String> sMagicDecoderRing = MessageUtils.findMessageNames( @@ -6958,4 +6967,22 @@ public class ConnectivityService extends IConnectivityManager.Stub return vpn != null && vpn.getLockdown(); } } + + /** + * Returns a IBinder to a TestNetworkService. Will be lazily created as needed. + * + * <p>The TestNetworkService must be run in the system server due to TUN creation. + */ + @Override + public IBinder startOrGetTestNetworkService() { + synchronized (mTNSLock) { + TestNetworkService.enforceTestNetworkPermissions(mContext); + + if (mTNS == null) { + mTNS = new TestNetworkService(mContext, mNMS); + } + + return mTNS; + } + } } diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index e28d484eebc7..f4161103b699 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -2717,6 +2717,38 @@ class StorageManagerService extends IStorageManager.Stub } /** + * Check whether the device supports filesystem checkpointing. + * + * @return true if the device supports filesystem checkpointing, false otherwise. + */ + @Override + public boolean supportsCheckpoint() throws RemoteException { + // Only the system process is permitted to start checkpoints + if (Binder.getCallingUid() != android.os.Process.SYSTEM_UID) { + throw new SecurityException("no permission to check filesystem checkpoint support"); + } + + return mVold.supportsCheckpoint(); + } + + /** + * Signal that checkpointing partitions should start a checkpoint on the next boot. + * + * @param numTries Number of times to try booting in checkpoint mode, before we will boot + * non-checkpoint mode and commit all changes immediately. Callers are + * responsible for ensuring that boot is safe (eg, by rolling back updates). + */ + @Override + public void startCheckpoint(int numTries) throws RemoteException { + // Only the system process is permitted to start checkpoints + if (Binder.getCallingUid() != android.os.Process.SYSTEM_UID) { + throw new SecurityException("no permission to start filesystem checkpoint"); + } + + mVold.startCheckpoint(numTries); + } + + /** * Signal that checkpointing partitions should commit changes */ @Override diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 710a0ba34d4f..3a50aa8d74a0 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -30,13 +30,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; import android.os.BatteryManager; import android.os.Binder; -import android.os.Build; import android.os.Handler; import android.os.PowerManager; import android.os.PowerManager.ServiceType; @@ -356,8 +354,8 @@ final class UiModeManagerService extends SystemService { try { synchronized (mLock) { if (mNightMode != mode) { - // Only persist setting if not transient night mode or not in car mode - if (!shouldTransientNightWhenInCarMode() || !mCarModeEnabled) { + // Only persist setting if not in car mode + if (!mCarModeEnabled) { Settings.Secure.putIntForUser(getContext().getContentResolver(), Settings.Secure.UI_NIGHT_MODE, mode, user); } @@ -444,34 +442,12 @@ final class UiModeManagerService extends SystemService { } } - // Night mode settings in car mode are only persisted below Q. - // When targeting Q, changes are not saved and night mode will be re-read - // from settings when exiting car mode. - private boolean shouldTransientNightWhenInCarMode() { - int uid = Binder.getCallingUid(); - PackageManager packageManager = getContext().getPackageManager(); - String[] packagesForUid = packageManager.getPackagesForUid(uid); - if (packagesForUid == null || packagesForUid.length == 0) { - return false; - } - - try { - ApplicationInfo appInfo = packageManager.getApplicationInfoAsUser( - packagesForUid[0], 0, uid); - - return appInfo.targetSdkVersion >= Build.VERSION_CODES.Q; - } catch (PackageManager.NameNotFoundException ignored) { - } - - return false; - } - void setCarModeLocked(boolean enabled, int flags) { if (mCarModeEnabled != enabled) { mCarModeEnabled = enabled; - // When transient night mode and exiting car mode, restore night mode from settings - if (shouldTransientNightWhenInCarMode() && !mCarModeEnabled) { + // When exiting car mode, restore night mode from settings + if (!mCarModeEnabled) { Context context = getContext(); updateNightModeFromSettings(context, context.getResources(), @@ -534,9 +510,8 @@ final class UiModeManagerService extends SystemService { uiMode |= mNightMode << 4; } - // Override night mode in power save mode if not transient night mode or not in car mode - boolean shouldOverrideNight = !mCarModeEnabled || !shouldTransientNightWhenInCarMode(); - if (mPowerSave && shouldOverrideNight) { + // Override night mode in power save mode if not in car mode + if (mPowerSave && !mCarModeEnabled) { uiMode &= ~Configuration.UI_MODE_NIGHT_NO; uiMode |= Configuration.UI_MODE_NIGHT_YES; } diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java index 57ce98c14554..cc901821030a 100644 --- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java +++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java @@ -65,6 +65,7 @@ import android.opengl.GLES10; import android.os.Binder; import android.os.Build; import android.os.Bundle; +import android.os.IProgressListener; import android.os.ParcelFileDescriptor; import android.os.RemoteCallback; import android.os.RemoteCallback.OnResultListener; @@ -103,6 +104,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; @@ -114,6 +116,8 @@ final class ActivityManagerShellCommand extends ShellCommand { public static final String NO_CLASS_ERROR_CODE = "Error type 3"; private static final String SHELL_PACKAGE_NAME = "com.android.shell"; + private static final int USER_OPERATION_TIMEOUT_MS = 2 * 60 * 1000; // 2 minutes + // IPC interface to activity manager -- don't need to do additional security checks. final IActivityManager mInterface; final IActivityTaskManager mTaskInterface; @@ -377,6 +381,30 @@ final class ActivityManagerShellCommand extends ShellCommand { }); } + private class ProgressWaiter extends IProgressListener.Stub { + private final CountDownLatch mFinishedLatch = new CountDownLatch(1); + + @Override + public void onStarted(int id, Bundle extras) {} + + @Override + public void onProgress(int id, int progress, Bundle extras) {} + + @Override + public void onFinished(int id, Bundle extras) { + mFinishedLatch.countDown(); + } + + public boolean waitForFinish(long timeoutMillis) { + try { + return mFinishedLatch.await(timeoutMillis, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + System.err.println("Thread interrupted unexpectedly."); + return false; + } + } + } + int runStartActivity(PrintWriter pw) throws RemoteException { Intent intent; try { @@ -1692,8 +1720,24 @@ final class ActivityManagerShellCommand extends ShellCommand { } int runStartUser(PrintWriter pw) throws RemoteException { - String user = getNextArgRequired(); - boolean success = mInterface.startUserInBackground(Integer.parseInt(user)); + boolean wait = false; + String opt; + while ((opt = getNextOption()) != null) { + if ("-w".equals(opt)) { + wait = true; + } else { + getErrPrintWriter().println("Error: unknown option: " + opt); + return -1; + } + } + int userId = Integer.parseInt(getNextArgRequired()); + + final ProgressWaiter waiter = wait ? new ProgressWaiter() : null; + boolean success = mInterface.startUserInBackgroundWithListener(userId, waiter); + if (wait && success) { + success = waiter.waitForFinish(USER_OPERATION_TIMEOUT_MS); + } + if (success) { pw.println("Success: user started"); } else { @@ -3023,9 +3067,10 @@ final class ActivityManagerShellCommand extends ShellCommand { pw.println(" execution of that user if it is currently stopped."); pw.println(" get-current-user"); pw.println(" Returns id of the current foreground user."); - pw.println(" start-user <USER_ID>"); + pw.println(" start-user [-w] <USER_ID>"); pw.println(" Start USER_ID in background if it is currently stopped;"); - pw.println(" use switch-user if you want to start the user in foreground"); + pw.println(" use switch-user if you want to start the user in foreground."); + pw.println(" -w: wait for start-user to complete and the user to be unlocked."); pw.println(" unlock-user <USER_ID> [TOKEN_HEX]"); pw.println(" Attempt to unlock the given user using the given authorization token."); pw.println(" stop-user [-w] [-f] <USER_ID>"); diff --git a/services/core/java/com/android/server/am/MemoryStatUtil.java b/services/core/java/com/android/server/am/MemoryStatUtil.java index a58491472036..0d035805274c 100644 --- a/services/core/java/com/android/server/am/MemoryStatUtil.java +++ b/services/core/java/com/android/server/am/MemoryStatUtil.java @@ -57,15 +57,18 @@ public final class MemoryStatUtil { private static final String PROC_STATUS_FILE_FMT = "/proc/%d/status"; /** Path to procfs cmdline file. Used with pid: /proc/pid/cmdline. */ private static final String PROC_CMDLINE_FILE_FMT = "/proc/%d/cmdline"; + /** Path to debugfs file for the system ion heap. */ + private static final String DEBUG_SYSTEM_ION_HEAP_FILE = "/sys/kernel/debug/ion/heaps/system"; private static final Pattern PGFAULT = Pattern.compile("total_pgfault (\\d+)"); private static final Pattern PGMAJFAULT = Pattern.compile("total_pgmajfault (\\d+)"); private static final Pattern RSS_IN_BYTES = Pattern.compile("total_rss (\\d+)"); private static final Pattern CACHE_IN_BYTES = Pattern.compile("total_cache (\\d+)"); private static final Pattern SWAP_IN_BYTES = Pattern.compile("total_swap (\\d+)"); - private static final Pattern RSS_HIGH_WATERMARK_IN_BYTES = Pattern.compile("VmHWM:\\s*(\\d+)\\s*kB"); + private static final Pattern ION_HEAP_SIZE_IN_BYTES = + Pattern.compile("\n\\s*total\\s*(\\d+)\\s*\n"); private static final int PGFAULT_INDEX = 9; private static final int PGMAJFAULT_INDEX = 11; @@ -127,6 +130,16 @@ public final class MemoryStatUtil { return parseCmdlineFromProcfs(readFileContents(path)); } + /** + * Reads size of the system ion heap from debugfs. + * + * Returns value of the total size in bytes of the system ion heap from + * /sys/kernel/debug/ion/heaps/system. + */ + public static long readSystemIonHeapSizeFromDebugfs() { + return parseIonHeapSizeFromDebugfs(readFileContents(DEBUG_SYSTEM_ION_HEAP_FILE)); + } + private static String readFileContents(String path) { final File file = new File(path); if (!file.exists()) { @@ -228,6 +241,19 @@ public final class MemoryStatUtil { } /** + * Parses the ion heap size from the contents of a file under /sys/kernel/debug/ion/heaps in + * debugfs. The returned value is in bytes. + */ + @VisibleForTesting + static long parseIonHeapSizeFromDebugfs(String contents) { + if (contents == null || contents.isEmpty()) { + return 0; + } + Matcher m = ION_HEAP_SIZE_IN_BYTES.matcher(contents); + return m.find() ? Long.parseLong(m.group(1)) : 0; + } + + /** * Returns whether per-app memcg is available on device. */ static boolean hasMemcg() { diff --git a/services/core/java/com/android/server/am/OWNERS b/services/core/java/com/android/server/am/OWNERS index e483b2640c00..877bef775ea8 100644 --- a/services/core/java/com/android/server/am/OWNERS +++ b/services/core/java/com/android/server/am/OWNERS @@ -23,6 +23,9 @@ roosa@google.com svetoslavganov@google.com toddke@google.com +# Battery Stats +joeo@google.com + # Londoners michaelwr@google.com narayan@google.com diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index 194549f15ecf..99380c94b869 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -83,8 +83,8 @@ public class SettingsToPropertiesMapper { DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT, DeviceConfig.NAMESPACE_MEDIA_NATIVE, DeviceConfig.NAMESPACE_NETD_NATIVE, + DeviceConfig.NAMESPACE_RUNTIME_NATIVE, DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT, - DeviceConfig.RuntimeNative.NAMESPACE, }; private final String[] mGlobalSettings; diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 676cc336ef8b..f13c8935eb5b 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -938,6 +938,7 @@ class UserController implements Handler.Callback { * * @param userId ID of the user to start * @param foreground true if user should be brought to the foreground + * @param unlockListener Listener to be informed when the user has started and unlocked. * @return true if the user has been successfully started */ boolean startUser( @@ -962,6 +963,15 @@ class UserController implements Handler.Callback { try { final int oldUserId = getCurrentUserId(); if (oldUserId == userId) { + final UserState state = getStartedUserState(userId); + if (state != null && state.state == STATE_RUNNING_UNLOCKED) { + // We'll skip all later code, so we must tell listener it's already unlocked. + try { + unlockListener.onFinished(userId, null); + } catch (RemoteException ignore) { + // Ignore. + } + } return true; } diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java index 5965d592cf4f..7da848c12e83 100644 --- a/services/core/java/com/android/server/attention/AttentionManagerService.java +++ b/services/core/java/com/android/server/attention/AttentionManagerService.java @@ -16,9 +16,7 @@ package com.android.server.attention; -import static android.provider.DeviceConfig.AttentionManagerService.COMPONENT_NAME; -import static android.provider.DeviceConfig.AttentionManagerService.NAMESPACE; -import static android.provider.DeviceConfig.AttentionManagerService.SERVICE_ENABLED; +import static android.provider.DeviceConfig.NAMESPACE_ATTENTION_MANAGER_SERVICE; import android.Manifest; import android.annotation.Nullable; @@ -80,6 +78,12 @@ public class AttentionManagerService extends SystemService { /** If the check attention called within that period - cached value will be returned. */ private static final long STALE_AFTER_MILLIS = 5_000; + /** DeviceConfig flag name, if {@code true}, enables AttentionManagerService features. */ + private static final String SERVICE_ENABLED = "service_enabled"; + + /** DeviceConfig flag name, allows a CTS to inject a fake implementation. */ + private static final String COMPONENT_NAME = "component_name"; + private final Context mContext; private final PowerManager mPowerManager; private final Object mLock; @@ -122,12 +126,13 @@ public class AttentionManagerService extends SystemService { /** * Returns {@code true} if attention service is supported on this device. */ - public boolean isAttentionServiceSupported() { + private boolean isAttentionServiceSupported() { return isServiceEnabled() && isServiceAvailable(); } private boolean isServiceEnabled() { - return DeviceConfig.getBoolean(NAMESPACE, SERVICE_ENABLED, DEFAULT_SERVICE_ENABLED); + return DeviceConfig.getBoolean(NAMESPACE_ATTENTION_MANAGER_SERVICE, SERVICE_ENABLED, + DEFAULT_SERVICE_ENABLED); } /** @@ -135,7 +140,7 @@ public class AttentionManagerService extends SystemService { * * @return {@code true} if the framework was able to send the provided callback to the service */ - public boolean checkAttention(int requestCode, long timeout, + private boolean checkAttention(int requestCode, long timeout, AttentionCallbackInternal callback) { Preconditions.checkNotNull(callback); @@ -213,7 +218,7 @@ public class AttentionManagerService extends SystemService { } /** Cancels the specified attention check. */ - public void cancelAttentionCheck(int requestCode) { + private void cancelAttentionCheck(int requestCode) { synchronized (mLock) { final UserState userState = peekCurrentUserStateLocked(); if (userState == null) { @@ -283,7 +288,8 @@ public class AttentionManagerService extends SystemService { * system. */ private static ComponentName resolveAttentionService(Context context) { - final String flag = DeviceConfig.getProperty(NAMESPACE, COMPONENT_NAME); + final String flag = DeviceConfig.getProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE, + COMPONENT_NAME); final String componentNameString = flag != null ? flag : context.getString( R.string.config_defaultAttentionService); diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java index d2ccfcc732a9..3c27bf240570 100644 --- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java +++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java @@ -126,8 +126,26 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem private final SparseArray<S> mServicesCache = new SparseArray<>(); /** + * Whether the per-user service should be removed from the cache when its apk is updated. + */ + private final boolean mRefreshServiceOnPackageUpdate; + + /** + * Name of the service's package that was active but then was removed because its package + * update. + * + * <p>It's a temporary state set / used by the {@link PackageMonitor} implementation, but + * defined here so it can be dumped. + */ + @GuardedBy("mLock") + private String mLastActivePackageName; + + /** * Default constructor. * + * <p>When using this constructor, the {@link AbstractPerUserSystemService} is removed from + * the cache (and re-added) when the service package is updated. + * * @param context system context. * @param serviceNameResolver resolver for * {@link com.android.internal.infra.AbstractRemoteService} instances, or @@ -139,8 +157,32 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem protected AbstractMasterSystemService(@NonNull Context context, @Nullable ServiceNameResolver serviceNameResolver, @Nullable String disallowProperty) { + this(context, serviceNameResolver, disallowProperty, + /* refreshServiceOnPackageUpdate=*/ true); + } + + /** + * Full constructor. + * + * @param context system context. + * @param serviceNameResolver resolver for + * {@link com.android.internal.infra.AbstractRemoteService} instances, or + * {@code null} when the service doesn't bind to remote services. + * @param disallowProperty when not {@code null}, defines a {@link UserManager} restriction that + * disables the service. <b>NOTE: </b> you'll also need to add it to + * {@code UserRestrictionsUtils.USER_RESTRICTIONS}. + * @param refreshServiceOnPackageUpdate when {@code true}, the + * {@link AbstractPerUserSystemService} is removed from the cache (and re-added) when the + * service package is updated; when {@code false}, the service is untouched during the + * update. + */ + protected AbstractMasterSystemService(@NonNull Context context, + @Nullable ServiceNameResolver serviceNameResolver, + @Nullable String disallowProperty, boolean refreshServiceOnPackageUpdate) { super(context); + mRefreshServiceOnPackageUpdate = refreshServiceOnPackageUpdate; + mServiceNameResolver = serviceNameResolver; if (mServiceNameResolver != null) { mServiceNameResolver @@ -280,9 +322,6 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem oldService.removeSelfFromCacheLocked(); } mServiceNameResolver.setTemporaryService(userId, componentName, durationMs); - - // Must update the service on cache so its initialization code is triggered - updateCachedServiceLocked(userId); } } @@ -553,6 +592,8 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem final int size = mServicesCache.size(); pw.print(prefix); pw.print("Debug: "); pw.print(realDebug); pw.print(" Verbose: "); pw.println(realVerbose); + pw.print(" Refresh on package update: "); pw.println(mRefreshServiceOnPackageUpdate); + pw.print(" Last active service on update: "); pw.println(mLastActivePackageName); if (mServiceNameResolver != null) { pw.print(prefix); pw.print("Name resolver: "); mServiceNameResolver.dumpShort(pw); pw.println(); @@ -590,21 +631,42 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem } private void startTrackingPackageChanges() { - PackageMonitor monitor = new PackageMonitor() { + final PackageMonitor monitor = new PackageMonitor() { + @Override - public void onSomePackagesChanged() { + public void onPackageUpdateStarted(String packageName, int uid) { synchronized (mLock) { - updateCachedServiceLocked(getChangingUserId()); + final String activePackageName = getActiveServicePackageNameLocked(); + if (packageName.equals(activePackageName)) { + final int userId = getChangingUserId(); + if (mRefreshServiceOnPackageUpdate) { + if (debug) { + Slog.d(mTag, "Removing service for user " + userId + + " because package " + activePackageName + + " is being updated"); + } + mLastActivePackageName = activePackageName; + removeCachedServiceLocked(userId); + } else { + if (debug) { + Slog.d(mTag, "Holding service for user " + userId + + " while package " + activePackageName + + " is being updated"); + } + } + } } } @Override public void onPackageUpdateFinished(String packageName, int uid) { synchronized (mLock) { - final String activePackageName = getActiveServicePackageName(); - if (packageName.equals(activePackageName)) { - removeCachedServiceLocked(getChangingUserId()); - } else { + String activePackageName = getActiveServicePackageNameLocked(); + if (activePackageName == null) { + activePackageName = mLastActivePackageName; + mLastActivePackageName = null; + } + if (!packageName.equals(activePackageName)) { handlePackageUpdateLocked(packageName); } } @@ -630,7 +692,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) { synchronized (mLock) { - final String activePackageName = getActiveServicePackageName(); + final String activePackageName = getActiveServicePackageNameLocked(); for (String pkg : packages) { if (pkg.equals(activePackageName)) { if (!doit) { @@ -646,7 +708,9 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem } private void handleActiveServiceRemoved(@UserIdInt int userId) { - removeCachedServiceLocked(userId); + synchronized (mLock) { + removeCachedServiceLocked(userId); + } final String serviceSettingsProperty = getServiceSettingsProperty(); if (serviceSettingsProperty != null) { Settings.Secure.putStringForUser(getContext().getContentResolver(), @@ -654,7 +718,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem } } - private String getActiveServicePackageName() { + private String getActiveServicePackageNameLocked() { final int userId = getChangingUserId(); final S service = peekServiceForUserLocked(userId); if (service == null) { diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index a4c04b2e64aa..5fdd872409c0 100644 --- a/services/core/java/com/android/server/pm/ApexManager.java +++ b/services/core/java/com/android/server/pm/ApexManager.java @@ -41,6 +41,7 @@ import java.io.File; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -135,6 +136,17 @@ class ApexManager { } /** + * Checks if {@code packageName} is an apex package. + * + * @param packageName package to check. + * @return {@code true} if {@code packageName} is an apex package. + */ + boolean isApexPackage(String packageName) { + populateActivePackagesCacheIfNeeded(); + return mActivePackagesCache.containsKey(packageName); + } + + /** * Retrieves information about an apexd staged session i.e. the internal state used by apexd to * track the different states of a session. * @@ -246,6 +258,23 @@ class ApexManager { } /** + * Uninstalls given {@code apexPackage}. + * + * <p>NOTE. Device must be rebooted in order for uninstall to take effect. + * + * @param apexPackagePath package to uninstall. + * @return {@code true} upon successful uninstall, {@code false} otherwise. + */ + boolean uninstallApex(String apexPackagePath) { + try { + mApexService.unstagePackages(Collections.singletonList(apexPackagePath)); + return true; + } catch (Exception e) { + return false; + } + } + + /** * Dumps various state information to the provided {@link PrintWriter} object. * * @param pw the {@link PrintWriter} object to send information to. diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS index cd0cbd628040..af9b12a43f25 100644 --- a/services/core/java/com/android/server/pm/OWNERS +++ b/services/core/java/com/android/server/pm/OWNERS @@ -17,7 +17,7 @@ per-file StagingManager.java = dariofreni@google.com per-file AbstractStatsBase.java = agampe@google.com, calin@google.com, ngeoffray@google.com per-file BackgroundDexOptService.java = agampe@google.com, calin@google.com, ngeoffray@google.com per-file CompilerStats.java = agampe@google.com, calin@google.com, ngeoffray@google.com -per-file DynamicCodeLoggingService.java = agampe@google.com, calin@google.com, ngeoffray@google.com +per-file DynamicCodeLoggingService.java = alanstokes@google.com, agampe@google.com, calin@google.com, ngeoffray@google.com per-file InstructionSets.java = agampe@google.com, calin@google.com, ngeoffray@google.com per-file OtaDexoptService.java = agampe@google.com, calin@google.com, ngeoffray@google.com per-file OtaDexoptShellCommand.java = agampe@google.com, calin@google.com, ngeoffray@google.com diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 3a4bcca46966..d249b9763a20 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -205,7 +205,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements mApexManager = am; - mStagingManager = new StagingManager(pm, this, am, context); + mStagingManager = new StagingManager(this, am, context); } boolean okToSendBroadcasts() { @@ -589,7 +589,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements session = new PackageInstallerSession(mInternalCallback, mContext, mPm, this, mInstallThread.getLooper(), mStagingManager, sessionId, userId, installerPackageName, callingUid, params, createdMillis, stageDir, stageCid, false, - false, null, SessionInfo.INVALID_ID, false, false, false, + false, false, null, SessionInfo.INVALID_ID, false, false, false, SessionInfo.STAGED_SESSION_NO_ERROR, ""); synchronized (mSessions) { diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 2de50e2a0c4e..81c0a974993b 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -145,6 +145,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { private static final String ATTR_SESSION_STAGE_DIR = "sessionStageDir"; private static final String ATTR_SESSION_STAGE_CID = "sessionStageCid"; private static final String ATTR_PREPARED = "prepared"; + private static final String ATTR_COMMITTED = "committed"; private static final String ATTR_SEALED = "sealed"; private static final String ATTR_MULTI_PACKAGE = "multiPackage"; private static final String ATTR_PARENT_SESSION_ID = "parentSessionId"; @@ -401,7 +402,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { PackageSessionProvider sessionProvider, Looper looper, StagingManager stagingManager, int sessionId, int userId, String installerPackageName, int installerUid, SessionParams params, long createdMillis, - File stageDir, String stageCid, boolean prepared, boolean sealed, + File stageDir, String stageCid, boolean prepared, boolean committed, boolean sealed, @Nullable int[] childSessionIds, int parentSessionId, boolean isReady, boolean isFailed, boolean isApplied, int stagedSessionErrorCode, String stagedSessionErrorMessage) { @@ -434,6 +435,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } mPrepared = prepared; + mCommitted = committed; mStagedSessionReady = isReady; mStagedSessionFailed = isFailed; mStagedSessionApplied = isApplied; @@ -2156,6 +2158,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { pw.printPair("mClientProgress", mClientProgress); pw.printPair("mProgress", mProgress); + pw.printPair("mCommitted", mCommitted); pw.printPair("mSealed", mSealed); pw.printPair("mPermissionsManuallyAccepted", mPermissionsManuallyAccepted); pw.printPair("mRelinquished", mRelinquished); @@ -2214,6 +2217,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { writeStringAttribute(out, ATTR_SESSION_STAGE_CID, stageCid); } writeBooleanAttribute(out, ATTR_PREPARED, isPrepared()); + writeBooleanAttribute(out, ATTR_COMMITTED, isCommitted()); writeBooleanAttribute(out, ATTR_SEALED, isSealed()); writeBooleanAttribute(out, ATTR_MULTI_PACKAGE, params.isMultiPackage); @@ -2311,6 +2315,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { final File stageDir = (stageDirRaw != null) ? new File(stageDirRaw) : null; final String stageCid = readStringAttribute(in, ATTR_SESSION_STAGE_CID); final boolean prepared = readBooleanAttribute(in, ATTR_PREPARED, true); + final boolean committed = readBooleanAttribute(in, ATTR_COMMITTED); final boolean sealed = readBooleanAttribute(in, ATTR_SEALED); final int parentSessionId = readIntAttribute(in, ATTR_PARENT_SESSION_ID, SessionInfo.INVALID_ID); @@ -2387,8 +2392,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { return new PackageInstallerSession(callback, context, pm, sessionProvider, installerThread, stagingManager, sessionId, userId, installerPackageName, - installerUid, params, createdMillis, stageDir, stageCid, prepared, sealed, - childSessionIdsArray, parentSessionId, isReady, isFailed, isApplied, + installerUid, params, createdMillis, stageDir, stageCid, prepared, committed, + sealed, childSessionIdsArray, parentSessionId, isReady, isFailed, isApplied, stagedSessionErrorCode, stagedSessionErrorMessage); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 6f006e7d9d7c..e5b6397e863d 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -160,6 +160,7 @@ import android.content.pm.InstantAppInfo; import android.content.pm.InstantAppRequest; import android.content.pm.InstrumentationInfo; import android.content.pm.IntentFilterVerificationInfo; +import android.content.pm.PackageBackwardCompatibility; import android.content.pm.KeySet; import android.content.pm.ModuleInfo; import android.content.pm.PackageInfo; @@ -11058,6 +11059,8 @@ public class PackageManagerService extends IPackageManager.Stub pkg.mRealPackage = null; pkg.mAdoptPermissions = null; } + + PackageBackwardCompatibility.modifySharedLibraries(pkg); } private static @NonNull <T> T assertNotNull(@Nullable T object, String message) @@ -12937,6 +12940,8 @@ public class PackageManagerService extends IPackageManager.Stub final List<String> changedPackagesList = new ArrayList<>(packageNames.length); final IntArray changedUids = new IntArray(packageNames.length); final List<String> unactionedPackages = new ArrayList<>(packageNames.length); + final boolean[] canRestrict = (restrictionFlags != 0) ? canSuspendPackageForUserInternal( + packageNames, userId) : null; for (int i = 0; i < packageNames.length; i++) { final String packageName = packageNames[i]; @@ -12950,7 +12955,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } } - if (restrictionFlags != 0 && !canSuspendPackageForUserInternal(packageName, userId)) { + if (canRestrict != null && !canRestrict[i]) { unactionedPackages.add(packageName); continue; } @@ -13007,6 +13012,8 @@ public class PackageManagerService extends IPackageManager.Stub final List<String> changedPackagesList = new ArrayList<>(packageNames.length); final IntArray changedUids = new IntArray(packageNames.length); final List<String> unactionedPackages = new ArrayList<>(packageNames.length); + final boolean[] canSuspend = suspended ? canSuspendPackageForUserInternal(packageNames, + userId) : null; for (int i = 0; i < packageNames.length; i++) { final String packageName = packageNames[i]; @@ -13026,7 +13033,7 @@ public class PackageManagerService extends IPackageManager.Stub continue; } } - if (suspended && !canSuspendPackageForUserInternal(packageName, userId)) { + if (canSuspend != null && !canSuspend[i]) { unactionedPackages.add(packageName); continue; } @@ -13190,87 +13197,97 @@ public class PackageManagerService extends IPackageManager.Stub + " cannot query getUnsuspendablePackagesForUser for user " + userId); } final ArraySet<String> unactionablePackages = new ArraySet<>(); - for (String packageName : packageNames) { - if (!canSuspendPackageForUserInternal(packageName, userId)) { - unactionablePackages.add(packageName); + final boolean[] canSuspend = canSuspendPackageForUserInternal(packageNames, userId); + for (int i = 0; i < packageNames.length; i++) { + if (!canSuspend[i]) { + unactionablePackages.add(packageNames[i]); } } return unactionablePackages.toArray(new String[unactionablePackages.size()]); } - private boolean canSuspendPackageForUserInternal(String packageName, int userId) { + /** + * Returns an array of booleans, such that the ith boolean denotes whether the ith package can + * be suspended or not. + * + * @param packageNames The package names to check suspendability for. + * @param userId The user to check in + * @return An array containing results of the checks + */ + @NonNull + private boolean[] canSuspendPackageForUserInternal(@NonNull String[] packageNames, int userId) { + final boolean[] canSuspend = new boolean[packageNames.length]; final long callingId = Binder.clearCallingIdentity(); try { - if (isPackageDeviceAdmin(packageName, userId)) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": has an active device admin"); - return false; - } - - String activeLauncherPackageName = getActiveLauncherPackageName(userId); - if (packageName.equals(activeLauncherPackageName)) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": contains the active launcher"); - return false; - } + final String activeLauncherPackageName = getActiveLauncherPackageName(userId); + final String dialerPackageName = getDefaultDialerPackageName(userId); + for (int i = 0; i < packageNames.length; i++) { + canSuspend[i] = false; + final String packageName = packageNames[i]; - if (packageName.equals(mRequiredInstallerPackage)) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": required for package installation"); - return false; - } - - if (packageName.equals(mRequiredUninstallerPackage)) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": required for package uninstallation"); - return false; - } - - if (packageName.equals(mRequiredVerifierPackage)) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": required for package verification"); - return false; - } - - if (packageName.equals(getDefaultDialerPackageName(userId))) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": is the default dialer"); - return false; - } - - if (packageName.equals(mRequiredPermissionControllerPackage)) { - Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": required for permissions management"); - return false; - } - - synchronized (mPackages) { - if (mProtectedPackages.isPackageStateProtected(userId, packageName)) { + if (isPackageDeviceAdmin(packageName, userId)) { Slog.w(TAG, "Cannot suspend package \"" + packageName - + "\": protected package"); - return false; + + "\": has an active device admin"); + continue; } - - // Cannot suspend static shared libs as they are considered - // a part of the using app (emulating static linking). Also - // static libs are installed always on internal storage. - PackageParser.Package pkg = mPackages.get(packageName); - if (pkg != null && pkg.applicationInfo.isStaticSharedLibrary()) { - Slog.w(TAG, "Cannot suspend package: " + packageName - + " providing static shared library: " - + pkg.staticSharedLibName); - return false; + if (packageName.equals(activeLauncherPackageName)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": contains the active launcher"); + continue; } - } + if (packageName.equals(mRequiredInstallerPackage)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": required for package installation"); + continue; + } + if (packageName.equals(mRequiredUninstallerPackage)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": required for package uninstallation"); + continue; + } + if (packageName.equals(mRequiredVerifierPackage)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": required for package verification"); + continue; + } + if (packageName.equals(dialerPackageName)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": is the default dialer"); + continue; + } + if (packageName.equals(mRequiredPermissionControllerPackage)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": required for permissions management"); + continue; + } + synchronized (mPackages) { + if (mProtectedPackages.isPackageStateProtected(userId, packageName)) { + Slog.w(TAG, "Cannot suspend package \"" + packageName + + "\": protected package"); + continue; + } - if (PLATFORM_PACKAGE_NAME.equals(packageName)) { - Slog.w(TAG, "Cannot suspend the platform package: " + packageName); - return false; + // Cannot suspend static shared libs as they are considered + // a part of the using app (emulating static linking). Also + // static libs are installed always on internal storage. + PackageParser.Package pkg = mPackages.get(packageName); + if (pkg != null && pkg.applicationInfo.isStaticSharedLibrary()) { + Slog.w(TAG, "Cannot suspend package: " + packageName + + " providing static shared library: " + + pkg.staticSharedLibName); + continue; + } + } + if (PLATFORM_PACKAGE_NAME.equals(packageName)) { + Slog.w(TAG, "Cannot suspend the platform package: " + packageName); + continue; + } + canSuspend[i] = true; } - return true; } finally { Binder.restoreCallingIdentity(callingId); } + return canSuspend; } private String getActiveLauncherPackageName(int userId) { @@ -23902,6 +23919,50 @@ public class PackageManagerService extends IPackageManager.Stub mDefaultHomeProvider = provider; } } + + @Override + public boolean isApexPackage(String packageName) { + return PackageManagerService.this.mApexManager.isApexPackage(packageName); + } + + @Override + public void uninstallApex(String packageName, long versionCode, int userId, + IntentSender intentSender) { + final int callerUid = Binder.getCallingUid(); + if (callerUid != Process.ROOT_UID && callerUid != Process.SHELL_UID) { + throw new SecurityException("Not allowed to uninstall apexes"); + } + PackageInstallerService.PackageDeleteObserverAdapter adapter = + new PackageInstallerService.PackageDeleteObserverAdapter( + PackageManagerService.this.mContext, intentSender, packageName, + false, userId); + if (userId != UserHandle.USER_ALL) { + adapter.onPackageDeleted(packageName, PackageManager.DELETE_FAILED_ABORTED, + "Can't uninstall an apex for a single user"); + return; + } + final ApexManager am = PackageManagerService.this.mApexManager; + PackageInfo activePackage = am.getActivePackage(packageName); + if (activePackage == null) { + adapter.onPackageDeleted(packageName, PackageManager.DELETE_FAILED_ABORTED, + packageName + " is not an apex package"); + return; + } + if (versionCode != PackageManager.VERSION_CODE_HIGHEST + && activePackage.getLongVersionCode() != versionCode) { + adapter.onPackageDeleted(packageName, PackageManager.DELETE_FAILED_ABORTED, + "Active version " + activePackage.getLongVersionCode() + + " is not equal to " + versionCode + "]"); + return; + } + if (!am.uninstallApex(activePackage.applicationInfo.sourceDir)) { + adapter.onPackageDeleted(packageName, PackageManager.DELETE_FAILED_ABORTED, + "Failed to uninstall apex " + packageName); + } else { + adapter.onPackageDeleted(packageName, PackageManager.DELETE_SUCCEEDED, + null); + } + } } @GuardedBy("mPackages") diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 912a50e0ca38..2d1afa7e87a7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -1619,30 +1619,36 @@ class PackageManagerShellCommand extends ShellCommand { } userId = translateUserId(userId, true /*allowAll*/, "runUninstall"); - if (userId == UserHandle.USER_ALL) { - userId = UserHandle.USER_SYSTEM; - flags |= PackageManager.DELETE_ALL_USERS; + final LocalIntentReceiver receiver = new LocalIntentReceiver(); + PackageManagerInternal internal = LocalServices.getService(PackageManagerInternal.class); + + if (internal.isApexPackage(packageName)) { + internal.uninstallApex(packageName, versionCode, userId, receiver.getIntentSender()); } else { - final PackageInfo info = mInterface.getPackageInfo(packageName, - PackageManager.MATCH_STATIC_SHARED_LIBRARIES, userId); - if (info == null) { - pw.println("Failure [not installed for " + userId + "]"); - return 1; - } - final boolean isSystem = - (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; - // If we are being asked to delete a system app for just one - // user set flag so it disables rather than reverting to system - // version of the app. - if (isSystem) { - flags |= PackageManager.DELETE_SYSTEM_APP; + if (userId == UserHandle.USER_ALL) { + userId = UserHandle.USER_SYSTEM; + flags |= PackageManager.DELETE_ALL_USERS; + } else { + final PackageInfo info = mInterface.getPackageInfo(packageName, + PackageManager.MATCH_STATIC_SHARED_LIBRARIES, userId); + if (info == null) { + pw.println("Failure [not installed for " + userId + "]"); + return 1; + } + final boolean isSystem = + (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0; + // If we are being asked to delete a system app for just one + // user set flag so it disables rather than reverting to system + // version of the app. + if (isSystem) { + flags |= PackageManager.DELETE_SYSTEM_APP; + } } - } - final LocalIntentReceiver receiver = new LocalIntentReceiver(); - mInterface.getPackageInstaller().uninstall(new VersionedPackage(packageName, - versionCode), null /*callerPackageName*/, flags, - receiver.getIntentSender(), userId); + mInterface.getPackageInstaller().uninstall(new VersionedPackage(packageName, + versionCode), null /*callerPackageName*/, flags, + receiver.getIntentSender(), userId); + } final Intent result = receiver.getResult(); final int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS, diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 088146d2d658..fce9bb101b5d 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -69,7 +69,6 @@ public class StagingManager { private static final String TAG = "StagingManager"; private final PackageInstallerService mPi; - private final PackageManagerService mPm; private final ApexManager mApexManager; private final PowerManager mPowerManager; private final Handler mBgHandler; @@ -77,9 +76,7 @@ public class StagingManager { @GuardedBy("mStagedSessions") private final SparseArray<PackageInstallerSession> mStagedSessions = new SparseArray<>(); - StagingManager(PackageManagerService pm, PackageInstallerService pi, ApexManager am, - Context context) { - mPm = pm; + StagingManager(PackageInstallerService pi, ApexManager am, Context context) { mPi = pi; mApexManager = am; mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); @@ -529,8 +526,8 @@ public class StagingManager { } void abortCommittedSession(@NonNull PackageInstallerSession session) { - if (session.isStagedSessionApplied() || session.isStagedSessionFailed()) { - Slog.w(TAG, "Cannot abort already finalized session : " + session.sessionId); + if (session.isStagedSessionApplied()) { + Slog.w(TAG, "Cannot abort applied session : " + session.sessionId); return; } abortSession(session); @@ -606,6 +603,10 @@ public class StagingManager { } private void checkStateAndResume(@NonNull PackageInstallerSession session) { + if (!session.isCommitted()) { + // Session hasn't been committed yet, ignore. + return; + } // Check the state of the session and decide what to do next. if (session.isStagedSessionFailed() || session.isStagedSessionApplied()) { // Final states, nothing to do. diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index b877fe7bbd99..f97dd3b680bb 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -155,11 +155,6 @@ public final class DefaultPermissionGrantPolicy { ACTIVITY_RECOGNITION_PERMISSIONS.add(Manifest.permission.ACTIVITY_RECOGNITION); } - private static final Set<String> COARSE_LOCATION_PERMISSIONS = new ArraySet<>(); - static { - COARSE_LOCATION_PERMISSIONS.add(Manifest.permission.ACCESS_COARSE_LOCATION); - } - private static final Set<String> CALENDAR_PERMISSIONS = new ArraySet<>(); static { CALENDAR_PERMISSIONS.add(Manifest.permission.READ_CALENDAR); @@ -803,8 +798,7 @@ public final class DefaultPermissionGrantPolicy { private void grantDefaultPermissionsToDefaultSystemUseOpenWifiApp( String useOpenWifiPackage, int userId) { - grantPermissionsToSystemPackage( - useOpenWifiPackage, userId, COARSE_LOCATION_PERMISSIONS); + grantPermissionsToSystemPackage(useOpenWifiPackage, userId, ALWAYS_LOCATION_PERMISSIONS); } public void grantDefaultPermissionsToDefaultSmsApp(String packageName, int userId) { @@ -824,7 +818,7 @@ public final class DefaultPermissionGrantPolicy { public void grantDefaultPermissionsToDefaultUseOpenWifiApp(String packageName, int userId) { Log.i(TAG, "Granting permissions to default Use Open WiFi app for user:" + userId); - grantIgnoringSystemPackage(packageName, userId, COARSE_LOCATION_PERMISSIONS); + grantIgnoringSystemPackage(packageName, userId, ALWAYS_LOCATION_PERMISSIONS); } public void grantDefaultPermissionsToDefaultSimCallManager(String packageName, int userId) { diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index c0e597497740..58106367842a 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -44,7 +44,6 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW; import static android.view.WindowManager.LayoutParams.LAST_SYSTEM_WINDOW; -import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; @@ -127,7 +126,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.database.ContentObserver; -import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.hardware.display.DisplayManager; @@ -211,7 +209,6 @@ import com.android.internal.policy.PhoneWindow; import com.android.internal.statusbar.IStatusBarService; import com.android.internal.util.ArrayUtils; import com.android.internal.util.ScreenshotHelper; -import com.android.internal.widget.PointerLocationView; import com.android.server.ExtconStateObserver; import com.android.server.ExtconUEventObserver; import com.android.server.GestureLauncherService; @@ -494,9 +491,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { private boolean mHandleVolumeKeysInWM; - int mPointerLocationMode = 0; // guarded by mLock - PointerLocationView mPointerLocationView; - private boolean mPendingKeyguardOccluded; private boolean mKeyguardOccludedChanged; private boolean mNotifyUserActivity; @@ -619,8 +613,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { private boolean mPerDisplayFocusEnabled = false; private volatile int mTopFocusedDisplayId = INVALID_DISPLAY; - private static final int MSG_ENABLE_POINTER_LOCATION = 1; - private static final int MSG_DISABLE_POINTER_LOCATION = 2; private static final int MSG_DISPATCH_MEDIA_KEY_WITH_WAKE_LOCK = 3; private static final int MSG_DISPATCH_MEDIA_KEY_REPEAT_WITH_WAKE_LOCK = 4; private static final int MSG_KEYGUARD_DRAWN_COMPLETE = 5; @@ -651,12 +643,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void handleMessage(Message msg) { switch (msg.what) { - case MSG_ENABLE_POINTER_LOCATION: - enablePointerLocation(); - break; - case MSG_DISABLE_POINTER_LOCATION: - disablePointerLocation(); - break; case MSG_DISPATCH_MEDIA_KEY_WITH_WAKE_LOCK: dispatchMediaKeyWithWakeLock((KeyEvent)msg.obj); break; @@ -779,9 +765,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.SCREEN_OFF_TIMEOUT), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.POINTER_LOCATION), false, this, - UserHandle.USER_ALL); resolver.registerContentObserver(Settings.Secure.getUriFor( Settings.Secure.DEFAULT_INPUT_METHOD), false, this, UserHandle.USER_ALL); @@ -2007,15 +1990,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { updateWakeGestureListenerLp(); } - if (mSystemReady) { - int pointerLocation = Settings.System.getIntForUser(resolver, - Settings.System.POINTER_LOCATION, 0, UserHandle.USER_CURRENT); - if (mPointerLocationMode != pointerLocation) { - mPointerLocationMode = pointerLocation; - mHandler.sendEmptyMessage(pointerLocation != 0 ? - MSG_ENABLE_POINTER_LOCATION : MSG_DISABLE_POINTER_LOCATION); - } - } // use screen off timeout setting as the timeout for the lockscreen mLockScreenTimeout = Settings.System.getIntForUser(resolver, Settings.System.SCREEN_OFF_TIMEOUT, 0, UserHandle.USER_CURRENT); @@ -2047,46 +2021,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { && mWakeGestureListener.isSupported(); } - private void enablePointerLocation() { - if (mPointerLocationView == null) { - mPointerLocationView = new PointerLocationView(mContext); - mPointerLocationView.setPrintCoords(false); - WindowManager.LayoutParams lp = new WindowManager.LayoutParams( - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT); - lp.type = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; - lp.flags = WindowManager.LayoutParams.FLAG_FULLSCREEN - | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE - | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE - | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; - lp.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; - if (ActivityManager.isHighEndGfx()) { - lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; - lp.privateFlags |= - WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_HARDWARE_ACCELERATED; - } - lp.format = PixelFormat.TRANSLUCENT; - lp.setTitle("PointerLocation"); - WindowManager wm = (WindowManager) mContext.getSystemService(WINDOW_SERVICE); - lp.inputFeatures |= WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL; - wm.addView(mPointerLocationView, lp); - //TODO (b/111365687) : make system context per display. - mWindowManagerFuncs.registerPointerEventListener(mPointerLocationView, DEFAULT_DISPLAY); - } - } - - private void disablePointerLocation() { - if (mPointerLocationView != null) { - //TODO (b/111365687) : make system context per display. - mWindowManagerFuncs.unregisterPointerEventListener(mPointerLocationView, - DEFAULT_DISPLAY); - WindowManager wm = (WindowManager) mContext.getSystemService(WINDOW_SERVICE); - wm.removeView(mPointerLocationView); - mPointerLocationView = null; - } - } - - /** {@inheritDoc} */ @Override public int checkAddPermission(WindowManager.LayoutParams attrs, int[] outAppOp) { diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index d58707cf2eec..2af234252e0f 100644 --- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -443,7 +443,7 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { * Returns true if the window is current in multi-windowing mode. i.e. it shares the * screen with other application windows. */ - public boolean isInMultiWindowMode(); + boolean inMultiWindowMode(); public int getRotationAnimationHint(); diff --git a/services/core/java/com/android/server/rollback/RollbackData.java b/services/core/java/com/android/server/rollback/RollbackData.java index 8a95877be71d..b37e2680605b 100644 --- a/services/core/java/com/android/server/rollback/RollbackData.java +++ b/services/core/java/com/android/server/rollback/RollbackData.java @@ -23,9 +23,11 @@ import android.content.rollback.RollbackInfo; import java.io.File; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.text.ParseException; import java.time.Instant; import java.util.ArrayList; + /** * Information about a rollback available for a set of atomically installed * packages. @@ -138,4 +140,27 @@ class RollbackData { public boolean isStaged() { return info.isStaged(); } + + static String rollbackStateToString(@RollbackState int state) { + switch (state) { + case RollbackData.ROLLBACK_STATE_ENABLING: return "enabling"; + case RollbackData.ROLLBACK_STATE_AVAILABLE: return "available"; + case RollbackData.ROLLBACK_STATE_COMMITTED: return "committed"; + } + throw new AssertionError("Invalid rollback state: " + state); + } + + static @RollbackState int rollbackStateFromString(String state) + throws ParseException { + switch (state) { + case "enabling": return RollbackData.ROLLBACK_STATE_ENABLING; + case "available": return RollbackData.ROLLBACK_STATE_AVAILABLE; + case "committed": return RollbackData.ROLLBACK_STATE_COMMITTED; + } + throw new ParseException("Invalid rollback state: " + state, 0); + } + + public String getStateAsString() { + return rollbackStateToString(state); + } } diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 952399bf3a7d..83d18a6a5e15 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -50,11 +50,14 @@ import android.util.SparseLongArray; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.IndentingPrintWriter; import com.android.server.LocalServices; import com.android.server.pm.Installer; import java.io.File; +import java.io.FileDescriptor; import java.io.IOException; +import java.io.PrintWriter; import java.security.SecureRandom; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -873,6 +876,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { return false; } + if (session.resolvedBaseCodePath == null) { + Log.e(TAG, "Session code path has not been resolved."); + return false; + } + // Get information about the package to be installed. PackageParser.PackageLite newPackage = null; try { @@ -1268,4 +1276,39 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { + rollbackData.info.getRollbackId(), ioe); } } + + @Override + protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " "); + synchronized (mLock) { + for (RollbackData data : mRollbacks) { + RollbackInfo info = data.info; + ipw.println(info.getRollbackId() + ":"); + ipw.increaseIndent(); + ipw.println("-state: " + data.getStateAsString()); + ipw.println("-timestamp: " + data.timestamp); + if (data.stagedSessionId != -1) { + ipw.println("-stagedSessionId: " + data.stagedSessionId); + } + ipw.println("-packages:"); + ipw.increaseIndent(); + for (PackageRollbackInfo pkg : info.getPackages()) { + ipw.println(pkg.getPackageName() + + " " + pkg.getVersionRolledBackFrom().getLongVersionCode() + + " -> " + pkg.getVersionRolledBackTo().getLongVersionCode()); + } + ipw.decreaseIndent(); + if (data.state == RollbackData.ROLLBACK_STATE_COMMITTED) { + ipw.println("-causePackages:"); + ipw.increaseIndent(); + for (VersionedPackage cPkg : info.getCausePackages()) { + ipw.println(cPkg.getPackageName() + " " + cPkg.getLongVersionCode()); + } + ipw.decreaseIndent(); + ipw.println("-committedSessionId: " + info.getCommittedSessionId()); + } + ipw.decreaseIndent(); + } + } + } } diff --git a/services/core/java/com/android/server/rollback/RollbackStore.java b/services/core/java/com/android/server/rollback/RollbackStore.java index 4f8f6856bb6f..2cfa46532834 100644 --- a/services/core/java/com/android/server/rollback/RollbackStore.java +++ b/services/core/java/com/android/server/rollback/RollbackStore.java @@ -16,6 +16,9 @@ package com.android.server.rollback; +import static com.android.server.rollback.RollbackData.rollbackStateFromString; +import static com.android.server.rollback.RollbackData.rollbackStateToString; + import android.annotation.NonNull; import android.content.pm.VersionedPackage; import android.content.rollback.PackageRollbackInfo; @@ -401,23 +404,4 @@ class RollbackStore { file.delete(); } } - - private static String rollbackStateToString(@RollbackData.RollbackState int state) { - switch (state) { - case RollbackData.ROLLBACK_STATE_ENABLING: return "enabling"; - case RollbackData.ROLLBACK_STATE_AVAILABLE: return "available"; - case RollbackData.ROLLBACK_STATE_COMMITTED: return "committed"; - } - throw new AssertionError("Invalid rollback state: " + state); - } - - private static @RollbackData.RollbackState int rollbackStateFromString(String state) - throws ParseException { - switch (state) { - case "enabling": return RollbackData.ROLLBACK_STATE_ENABLING; - case "available": return RollbackData.ROLLBACK_STATE_AVAILABLE; - case "committed": return RollbackData.ROLLBACK_STATE_COMMITTED; - } - throw new ParseException("Invalid rollback state: " + state, 0); - } } diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java index 4815e5cd7b83..2b17d19e1cf7 100644 --- a/services/core/java/com/android/server/stats/StatsCompanionService.java +++ b/services/core/java/com/android/server/stats/StatsCompanionService.java @@ -24,6 +24,7 @@ import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.server.am.MemoryStatUtil.readCmdlineFromProcfs; import static com.android.server.am.MemoryStatUtil.readMemoryStatFromProcfs; import static com.android.server.am.MemoryStatUtil.readRssHighWaterMarkFromProcfs; +import static com.android.server.am.MemoryStatUtil.readSystemIonHeapSizeFromDebugfs; import android.annotation.NonNull; import android.annotation.Nullable; @@ -1182,6 +1183,15 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { SystemProperties.set("sys.rss_hwm_reset.on", "1"); } + private void pullSystemIonHeapSize( + int tagId, long elapsedNanos, long wallClockNanos, + List<StatsLogEventWrapper> pulledData) { + final long systemIonHeapSizeInBytes = readSystemIonHeapSizeFromDebugfs(); + StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos, wallClockNanos); + e.writeLong(systemIonHeapSizeInBytes); + pulledData.add(e); + } + private void pullBinderCallsStats( int tagId, long elapsedNanos, long wallClockNanos, List<StatsLogEventWrapper> pulledData) { @@ -2068,6 +2078,10 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { pullProcessMemoryHighWaterMark(tagId, elapsedNanos, wallClockNanos, ret); break; } + case StatsLog.SYSTEM_ION_HEAP_SIZE: { + pullSystemIonHeapSize(tagId, elapsedNanos, wallClockNanos, ret); + break; + } case StatsLog.BINDER_CALLS: { pullBinderCallsStats(tagId, elapsedNanos, wallClockNanos, ret); break; diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index bb5a2213488a..af05a271efef 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -2237,6 +2237,10 @@ public class AppTransition implements Dump { || transit == TRANSIT_ACTIVITY_RELAUNCH; } + static boolean isChangeTransit(int transit) { + return transit == TRANSIT_TASK_CHANGE_WINDOWING_MODE; + } + /** * @return whether the transition should show the thumbnail being scaled down. */ diff --git a/services/core/java/com/android/server/wm/AppTransitionController.java b/services/core/java/com/android/server/wm/AppTransitionController.java index 8f0a7c08fca8..f63269571fc0 100644 --- a/services/core/java/com/android/server/wm/AppTransitionController.java +++ b/services/core/java/com/android/server/wm/AppTransitionController.java @@ -513,8 +513,11 @@ public class AppTransitionController { // Given no app transition pass it through instead of a wallpaper transition. // Never convert the crashing transition. // Never update the transition for the wallpaper if we are just docking from recents + // Never convert a change transition since the top activity isn't changing and will likely + // still be above an opening wallpaper. if (transit == TRANSIT_NONE || transit == TRANSIT_CRASHING_ACTIVITY_CLOSE - || transit == TRANSIT_DOCK_TASK_FROM_RECENTS) { + || transit == TRANSIT_DOCK_TASK_FROM_RECENTS + || AppTransition.isChangeTransit(transit)) { return transit; } @@ -601,6 +604,10 @@ public class AppTransitionController { */ @VisibleForTesting int maybeUpdateTransitToTranslucentAnim(int transit) { + if (AppTransition.isChangeTransit(transit)) { + // There's no special animation to handle change animations with translucent apps + return transit; + } final boolean taskOrActivity = AppTransition.isTaskTransit(transit) || AppTransition.isActivityTransit(transit); boolean allOpeningVisible = true; diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 220370c0859c..ea3a7d5ca3b2 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -1747,7 +1747,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree } boolean isInChangeTransition() { - return mTransitChangeLeash != null || isChangeTransition(mTransit); + return mTransitChangeLeash != null || AppTransition.isChangeTransit(mTransit); } @VisibleForTesting @@ -1979,7 +1979,14 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree mLetterbox.attachInput(w); } getPosition(mTmpPoint); - mLetterbox.layout(getParent().getBounds(), w.getFrameLw(), mTmpPoint); + // Get the bounds of the "space-to-fill". We union the Task and the Stack bounds here + // to handle both split window (where task-bounds can be larger) and orientation + // letterbox (where the task is letterboxed within stack). + Rect spaceToFill = getTask().getBounds(); + if (getStack() != null) { + spaceToFill.union(getStack().getBounds()); + } + mLetterbox.layout(spaceToFill, w.getFrameLw(), mTmpPoint); } else if (mLetterbox != null) { mLetterbox.hide(); } @@ -2448,30 +2455,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree return boundsLayer; } - /** Get position and crop region of animation. */ - @VisibleForTesting - void getAnimationBounds(Point outPosition, Rect outBounds) { - outPosition.set(0, 0); - outBounds.setEmpty(); - - final TaskStack stack = getStack(); - final Task task = getTask(); - if (task != null && task.inFreeformWindowingMode()) { - task.getRelativeDisplayedPosition(outPosition); - } else if (stack != null) { - stack.getRelativeDisplayedPosition(outPosition); - } - - // Always use stack bounds in order to have the ability to animate outside the task region. - // It also needs to be consistent when {@link #mNeedsAnimationBoundsLayer} is set that crops - // according to the bounds. - if (stack != null) { - stack.getBounds(outBounds); - } - // We have the relative position so the local position can be removed from bounds. - outBounds.offsetTo(0, 0); - } - @Override Rect getDisplayedBounds() { final Task task = getTask(); @@ -2484,10 +2467,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree return getBounds(); } - private static boolean isChangeTransition(int transit) { - return transit == TRANSIT_TASK_CHANGE_WINDOWING_MODE; - } - boolean applyAnimationLocked(WindowManager.LayoutParams lp, int transit, boolean enter, boolean isVoiceInteraction) { @@ -2507,9 +2486,15 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree if (okToAnimate()) { final AnimationAdapter adapter; AnimationAdapter thumbnailAdapter = null; - getAnimationBounds(mTmpPoint, mTmpRect); - boolean isChanging = isChangeTransition(transit) && enter; + // Separate position and size for use in animators. Use task-bounds for now so + // that activity-level letterbox (maxAspectRatio) is included in the animation. + mTmpRect.set(getTask() != null ? getTask().getBounds() : getBounds()); + mTmpPoint.set(mTmpRect.left, mTmpRect.top); + mTmpRect.offsetTo(0, 0); + + final boolean isChanging = AppTransition.isChangeTransit(transit) && enter + && getDisplayContent().mChangingApps.contains(this); // Delaying animation start isn't compatible with remote animations at all. if (getDisplayContent().mAppTransition.getRemoteAnimationController() != null diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index e48361fa0667..ba1dfbba06f8 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -44,8 +44,8 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATIO import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW; -import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT; +import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_STATUS_BAR_VISIBLE_TRANSPARENT; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR; @@ -113,6 +113,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.graphics.Insets; +import android.graphics.PixelFormat; import android.graphics.Rect; import android.hardware.input.InputManager; import android.hardware.power.V1_0.PowerHint; @@ -149,6 +150,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ScreenShapeHelper; import com.android.internal.util.ScreenshotHelper; +import com.android.internal.widget.PointerLocationView; import com.android.server.LocalServices; import com.android.server.UiThread; import com.android.server.policy.WindowManagerPolicy; @@ -343,6 +345,8 @@ public class DisplayPolicy { private InputConsumer mInputConsumer = null; + private PointerLocationView mPointerLocationView; + /** * The area covered by system windows which belong to another display. Forwarded insets is set * in case this is a virtual display, this is displayed on another display that has insets, and @@ -357,6 +361,8 @@ public class DisplayPolicy { private static final int MSG_UPDATE_DREAMING_SLEEP_TOKEN = 1; private static final int MSG_REQUEST_TRANSIENT_BARS = 2; private static final int MSG_DISPOSE_INPUT_CONSUMER = 3; + private static final int MSG_ENABLE_POINTER_LOCATION = 4; + private static final int MSG_DISABLE_POINTER_LOCATION = 5; private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS = 0; private static final int MSG_REQUEST_TRANSIENT_BARS_ARG_NAVIGATION = 1; @@ -383,6 +389,12 @@ public class DisplayPolicy { case MSG_DISPOSE_INPUT_CONSUMER: disposeInputConsumer((InputConsumer) msg.obj); break; + case MSG_ENABLE_POINTER_LOCATION: + enablePointerLocation(); + break; + case MSG_DISABLE_POINTER_LOCATION: + disablePointerLocation(); + break; } } } @@ -541,6 +553,9 @@ public class DisplayPolicy { void systemReady() { mSystemGestures.systemReady(); + if (mService.mPointerLocationEnabled) { + setPointerLocationEnabled(true); + } } private int getDisplayId() { @@ -747,7 +762,7 @@ public class DisplayPolicy { case TYPE_WALLPAPER: // Dreams and wallpapers don't have an app window token and can thus not be // letterboxed. Hence always let them extend under the cutout. - attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; + attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; break; case TYPE_STATUS_BAR: @@ -2095,7 +2110,7 @@ public class DisplayPolicy { // Ensure that windows with a DEFAULT or NEVER display cutout mode are laid out in // the cutout safe zone. - if (cutoutMode != LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS) { + if (cutoutMode != LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES) { final Rect displayCutoutSafeExceptMaybeBars = sTmpDisplayCutoutSafeExceptMaybeBarsRect; displayCutoutSafeExceptMaybeBars.set(displayFrames.mDisplayCutoutSafe); if (layoutInScreen && layoutInsetDecor && !requestedFullscreen @@ -2146,7 +2161,7 @@ public class DisplayPolicy { // TYPE_SYSTEM_ERROR is above the NavigationBar so it can't be allowed to extend over it. // Also, we don't allow windows in multi-window mode to extend out of the screen. if ((fl & FLAG_LAYOUT_NO_LIMITS) != 0 && type != TYPE_SYSTEM_ERROR - && !win.isInMultiWindowMode()) { + && !win.inMultiWindowMode()) { df.left = df.top = -10000; df.right = df.bottom = 10000; if (type != TYPE_WALLPAPER) { @@ -3414,4 +3429,57 @@ public class DisplayPolicy { pw.print(prefix); pw.println("Looper state:"); mHandler.getLooper().dump(new PrintWriterPrinter(pw), prefix + " "); } + + private boolean supportsPointerLocation() { + return mDisplayContent.isDefaultDisplay || !mDisplayContent.isPrivate(); + } + + void setPointerLocationEnabled(boolean pointerLocationEnabled) { + if (!supportsPointerLocation()) { + return; + } + + mHandler.sendEmptyMessage(pointerLocationEnabled + ? MSG_ENABLE_POINTER_LOCATION : MSG_DISABLE_POINTER_LOCATION); + } + + private void enablePointerLocation() { + if (mPointerLocationView != null) { + return; + } + + mPointerLocationView = new PointerLocationView(mContext); + mPointerLocationView.setPrintCoords(false); + final WindowManager.LayoutParams lp = new WindowManager.LayoutParams( + WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.MATCH_PARENT); + lp.type = WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY; + lp.flags = WindowManager.LayoutParams.FLAG_FULLSCREEN + | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE + | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; + lp.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES; + if (ActivityManager.isHighEndGfx()) { + lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; + lp.privateFlags |= + WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_HARDWARE_ACCELERATED; + } + lp.format = PixelFormat.TRANSLUCENT; + lp.setTitle("PointerLocation - display " + getDisplayId()); + lp.inputFeatures |= WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL; + final WindowManager wm = mContext.getSystemService(WindowManager.class); + wm.addView(mPointerLocationView, lp); + mDisplayContent.registerPointerEventListener(mPointerLocationView); + } + + private void disablePointerLocation() { + if (mPointerLocationView == null) { + return; + } + + mDisplayContent.unregisterPointerEventListener(mPointerLocationView); + final WindowManager wm = mContext.getSystemService(WindowManager.class); + wm.removeView(mPointerLocationView); + mPointerLocationView = null; + } } diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 499cbaf915a1..bb7867ce53ec 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -433,29 +433,6 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta } } - /** Return true if the current bound can get outputted to the rest of the system as-is. */ - private boolean useCurrentBounds() { - final DisplayContent displayContent = getDisplayContent(); - return matchParentBounds() - || !inSplitScreenSecondaryWindowingMode() - || displayContent == null - || displayContent.getSplitScreenPrimaryStackIgnoringVisibility() != null; - } - - @Override - public void getBounds(Rect out) { - if (useCurrentBounds()) { - // No need to adjust the output bounds if fullscreen or the docked stack is visible - // since it is already what we want to represent to the rest of the system. - super.getBounds(out); - return; - } - - // The bounds has been adjusted to accommodate for a docked stack, but the docked stack is - // not currently visible. Go ahead a represent it as fullscreen to the rest of the system. - mStack.getDisplayContent().getBounds(out); - } - @Override public Rect getDisplayedBounds() { if (mOverrideDisplayedBounds.isEmpty()) { @@ -506,36 +483,28 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta // a DimLayer anyway if we weren't visible. final boolean dockedResizing = displayContent != null && displayContent.mDividerControllerLocked.isResizing(); - if (useCurrentBounds()) { - if (inFreeformWindowingMode() && getMaxVisibleBounds(out)) { - return; - } - - if (!matchParentBounds()) { - // When minimizing the docked stack when going home, we don't adjust the task bounds - // so we need to intersect the task bounds with the stack bounds here. - // - // If we are Docked Resizing with snap points, the task bounds could be smaller than the stack - // bounds and so we don't even want to use them. Even if the app should not be resized the Dim - // should keep up with the divider. - if (dockedResizing) { - mStack.getBounds(out); - } else { - mStack.getBounds(mTmpRect); - mTmpRect.intersect(getBounds()); - out.set(mTmpRect); - } - } else { - out.set(getBounds()); - } + if (inFreeformWindowingMode() && getMaxVisibleBounds(out)) { return; } - // The bounds has been adjusted to accommodate for a docked stack, but the docked stack is - // not currently visible. Go ahead a represent it as fullscreen to the rest of the system. - if (displayContent != null) { - displayContent.getBounds(out); + if (!matchParentBounds()) { + // When minimizing the docked stack when going home, we don't adjust the task bounds + // so we need to intersect the task bounds with the stack bounds here. + // + // If we are Docked Resizing with snap points, the task bounds could be smaller than the + // stack bounds and so we don't even want to use them. Even if the app should not be + // resized the Dim should keep up with the divider. + if (dockedResizing) { + mStack.getBounds(out); + } else { + mStack.getBounds(mTmpRect); + mTmpRect.intersect(getBounds()); + out.set(mTmpRect); + } + } else { + out.set(getBounds()); } + return; } void setDragResizing(boolean dragResizing, int dragResizeMode) { @@ -702,16 +671,6 @@ class Task extends WindowContainer<AppWindowToken> implements ConfigurationConta positionChildAt(position, aToken, false /* includeParents */); } - boolean isFullscreen() { - if (useCurrentBounds()) { - return matchParentBounds(); - } - // The bounds has been adjusted to accommodate for a docked stack, but the docked stack - // is not currently visible. Go ahead a represent it as fullscreen to the rest of the - // system. - return true; - } - void forceWindowsScaleable(boolean force) { mWmService.openSurfaceTransaction(); try { diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 241f14e371bc..e6b8112b0345 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -303,17 +303,6 @@ public class TaskStack extends WindowContainer<Task> implements return super.getBounds(); } - /** Return true if the current bound can get outputted to the rest of the system as-is. */ - private boolean useCurrentBounds() { - if (matchParentBounds() - || !inSplitScreenSecondaryWindowingMode() - || mDisplayContent == null - || mDisplayContent.getSplitScreenPrimaryStackIgnoringVisibility() != null) { - return true; - } - return false; - } - @Override public void getBounds(Rect bounds) { bounds.set(getBounds()); @@ -321,22 +310,15 @@ public class TaskStack extends WindowContainer<Task> implements @Override public Rect getBounds() { - if (useCurrentBounds()) { - // If we're currently adjusting for IME or minimized docked stack, we use the adjusted - // bounds; otherwise, no need to adjust the output bounds if fullscreen or the docked - // stack is visible since it is already what we want to represent to the rest of the - // system. - if (!mAdjustedBounds.isEmpty()) { - return mAdjustedBounds; - } else { - return super.getBounds(); - } - } - - // The bounds has been adjusted to accommodate for a docked stack, but the docked stack - // is not currently visible. Go ahead a represent it as fullscreen to the rest of the + // If we're currently adjusting for IME or minimized docked stack, we use the adjusted + // bounds; otherwise, no need to adjust the output bounds if fullscreen or the docked + // stack is visible since it is already what we want to represent to the rest of the // system. - return mDisplayContent.getBounds(); + if (!mAdjustedBounds.isEmpty()) { + return mAdjustedBounds; + } else { + return super.getBounds(); + } } /** @@ -1425,13 +1407,7 @@ public class TaskStack extends WindowContainer<Task> implements @Override boolean fillsParent() { - if (useCurrentBounds()) { - return matchParentBounds(); - } - // The bounds has been adjusted to accommodate for a docked stack, but the docked stack - // is not currently visible. Go ahead a represent it as fullscreen to the rest of the - // system. - return true; + return matchParentBounds(); } @Override @@ -1516,7 +1492,7 @@ public class TaskStack extends WindowContainer<Task> implements for (int i = mChildren.size() - 1; i >= 0; --i) { final Task task = mChildren.get(i); - if (task.isFullscreen()) { + if (task.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) { results.searchDone = true; return; } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index e3a8be5d52d4..a6c92571bc03 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -689,6 +689,8 @@ public class WindowManagerService extends IWindowManager.Stub Settings.Secure.getUriFor(Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS); private final Uri mPolicyControlUri = Settings.Global.getUriFor(Settings.Global.POLICY_CONTROL); + private final Uri mPointerLocationUri = + Settings.System.getUriFor(Settings.System.POINTER_LOCATION); public SettingsObserver() { super(new Handler()); @@ -703,8 +705,8 @@ public class WindowManagerService extends IWindowManager.Stub UserHandle.USER_ALL); resolver.registerContentObserver(mImmersiveModeConfirmationsUri, false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(mPolicyControlUri, false, this, - UserHandle.USER_ALL); + resolver.registerContentObserver(mPolicyControlUri, false, this, UserHandle.USER_ALL); + resolver.registerContentObserver(mPointerLocationUri, false, this, UserHandle.USER_ALL); } @Override @@ -723,6 +725,11 @@ public class WindowManagerService extends IWindowManager.Stub return; } + if (mPointerLocationUri.equals(uri)) { + updatePointerLocation(); + return; + } + @UpdateAnimationScaleMode final int mode; if (mWindowAnimationScaleUri.equals(uri)) { @@ -749,6 +756,22 @@ public class WindowManagerService extends IWindowManager.Stub updateRotation(false /* alwaysSendConfiguration */, false /* forceRelayout */); } } + + void updatePointerLocation() { + ContentResolver resolver = mContext.getContentResolver(); + final boolean enablePointerLocation = Settings.System.getIntForUser(resolver, + Settings.System.POINTER_LOCATION, 0, UserHandle.USER_CURRENT) != 0; + + if (mPointerLocationEnabled == enablePointerLocation) { + return; + } + mPointerLocationEnabled = enablePointerLocation; + synchronized (mGlobalLock) { + mRoot.forAllDisplayPolicies(PooledLambda.obtainConsumer( + DisplayPolicy::setPointerLocationEnabled, PooledLambda.__(), + mPointerLocationEnabled)); + } + } } PowerManager mPowerManager; @@ -758,6 +781,7 @@ public class WindowManagerService extends IWindowManager.Stub private float mTransitionAnimationScaleSetting = 1.0f; private float mAnimatorDurationScaleSetting = 1.0f; private boolean mAnimationsDisabled = false; + boolean mPointerLocationEnabled = false; final InputManagerService mInputManager; final DisplayManagerInternal mDisplayManagerInternal; @@ -4363,6 +4387,7 @@ public class WindowManagerService extends IWindowManager.Stub mHasWideColorGamutSupport = queryWideColorGamutSupport(); mHasHdrSupport = queryHdrSupport(); UiThread.getHandler().post(mSettingsObserver::updateSystemUiSettings); + UiThread.getHandler().post(mSettingsObserver::updatePointerLocation); IVrManager vrManager = IVrManager.Stub.asInterface( ServiceManager.getService(Context.VR_SERVICE)); if (vrManager != null) { @@ -7447,13 +7472,26 @@ public class WindowManagerService extends IWindowManager.Stub @Override public boolean injectInputAfterTransactionsApplied(InputEvent ev, int mode) { - waitForAnimationsToComplete(); - - synchronized (mGlobalLock) { - mWindowPlacerLocked.performSurfacePlacementIfScheduled(); + boolean shouldWaitForAnimComplete = false; + if (ev instanceof KeyEvent) { + KeyEvent keyEvent = (KeyEvent) ev; + shouldWaitForAnimComplete = keyEvent.getSource() == InputDevice.SOURCE_MOUSE + || keyEvent.getAction() == KeyEvent.ACTION_DOWN; + } else if (ev instanceof MotionEvent) { + MotionEvent motionEvent = (MotionEvent) ev; + shouldWaitForAnimComplete = motionEvent.getSource() == InputDevice.SOURCE_MOUSE + || motionEvent.getAction() == MotionEvent.ACTION_DOWN; } - new SurfaceControl.Transaction().syncInputWindows().apply(true); + if (shouldWaitForAnimComplete) { + waitForAnimationsToComplete(); + + synchronized (mGlobalLock) { + mWindowPlacerLocked.performSurfacePlacementIfScheduled(); + } + + new SurfaceControl.Transaction().syncInputWindows().apply(true); + } return LocalServices.getService(InputManagerInternal.class).injectInputEvent(ev, mode); } diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 20cca66d8a52..ee445d836214 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -826,7 +826,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mHaveFrame = true; final Task task = getTask(); - final boolean inFullscreenContainer = inFullscreenContainer(); + final boolean isFullscreenAndFillsDisplay = !inMultiWindowMode() && matchesDisplayBounds(); final boolean windowsAreFloating = task != null && task.isFloating(); final DisplayContent dc = getDisplayContent(); @@ -845,7 +845,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final WindowState imeWin = mWmService.mRoot.getCurrentInputMethodWindow(); final boolean isImeTarget = imeWin != null && imeWin.isVisibleNow() && isInputMethodTarget(); - if (inFullscreenContainer || layoutInParentFrame()) { + if (isFullscreenAndFillsDisplay || layoutInParentFrame()) { // We use the parent frame as the containing frame for fullscreen and child windows mWindowFrames.mContainingFrame.set(mWindowFrames.mParentFrame); layoutDisplayFrame = mWindowFrames.mDisplayFrame; @@ -983,7 +983,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP Math.min(mWindowFrames.mStableFrame.bottom, mWindowFrames.mFrame.bottom)); } - if (inFullscreenContainer && !windowsAreFloating) { + if (isFullscreenAndFillsDisplay && !windowsAreFloating) { // Windows that are not fullscreen can be positioned outside of the display frame, // but that is not a reason to provide them with overscan insets. InsetUtils.insetsBetweenFrames(layoutContainingFrame, mWindowFrames.mOverscanFrame, @@ -996,7 +996,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mWindowFrames.calculateDockedDividerInsets(c.getDisplayCutout().getSafeInsets()); } else { getDisplayContent().getBounds(mTmpRect); - mWindowFrames.calculateInsets(windowsAreFloating, inFullscreenContainer, mTmpRect); + mWindowFrames.calculateInsets( + windowsAreFloating, isFullscreenAndFillsDisplay, mTmpRect); } mWindowFrames.setDisplayCutout( @@ -1038,9 +1039,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // TODO: Look into whether this override is still necessary. @Override public Rect getBounds() { - if (isInMultiWindowMode()) { - return getTask().getBounds(); - } else if (mAppToken != null){ + if (mAppToken != null) { return mAppToken.getBounds(); } else { return super.getBounds(); @@ -1751,6 +1750,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP && mWindowFrames.mFrame.bottom >= displayInfo.appHeight; } + private boolean matchesDisplayBounds() { + return getDisplayContent().getBounds().equals(getBounds()); + } + /** Returns true if last applied config was not yet requested by client. */ boolean isConfigChanged() { return !getLastReportedConfiguration().equals(getConfiguration()); @@ -3114,20 +3117,16 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return getDisplayContent().mCurrentFocus == this; } - @Override - public boolean isInMultiWindowMode() { - final Task task = getTask(); - return task != null && !task.isFullscreen(); - } /** Is this window in a container that takes up the entire screen space? */ - private boolean inFullscreenContainer() { - return mAppToken == null || (mAppToken.matchParentBounds() && !isInMultiWindowMode()); + private boolean inAppWindowThatMatchesParentBounds() { + return mAppToken == null || (mAppToken.matchParentBounds() && !inMultiWindowMode()); } - /** @return true when the window is in fullscreen task, but has non-fullscreen bounds set. */ + /** @return true when the window is in fullscreen mode, but has non-fullscreen bounds set, or + * is transitioning into/out-of fullscreen. */ boolean isLetterboxedAppWindow() { - return !isInMultiWindowMode() && mAppToken != null && !mAppToken.matchParentBounds() + return !inMultiWindowMode() && !matchesDisplayBounds() || isLetterboxedForDisplayCutoutLw(); } @@ -3494,7 +3493,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final int pw = containingFrame.width(); final int ph = containingFrame.height(); final Task task = getTask(); - final boolean inNonFullscreenContainer = !inFullscreenContainer(); + final boolean inNonFullscreenContainer = !inAppWindowThatMatchesParentBounds(); final boolean noLimits = (mAttrs.flags & FLAG_LAYOUT_NO_LIMITS) != 0; // We need to fit it to the display if either diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 92bb082eca59..780d4714275b 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -26,7 +26,6 @@ import static android.view.WindowManager.TRANSIT_NONE; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; -import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ORIENTATION; @@ -792,16 +791,10 @@ class WindowStateAnimator { if (DEBUG_WINDOW_CROP) Slog.d(TAG, "Applying decor to crop win=" + w + " mDecorFrame=" + w.getDecorFrame() + " mSystemDecorRect=" + mSystemDecorRect); - final Task task = w.getTask(); - final boolean fullscreen = w.fillsDisplay() || (task != null && task.isFullscreen()); - final boolean isFreeformResizing = - w.isDragResizing() && w.getResizeMode() == DRAG_RESIZE_MODE_FREEFORM; - // We use the clip rect as provided by the tranformation for non-fullscreen windows to // avoid premature clipping with the system decor rect. clipRect.set(mSystemDecorRect); - if (DEBUG_WINDOW_CROP) Slog.d(TAG, "win=" + w + " Initial clip rect: " + clipRect - + " fullscreen=" + fullscreen); + if (DEBUG_WINDOW_CROP) Slog.d(TAG, "win=" + w + " Initial clip rect: " + clipRect); w.expandForSurfaceInsets(clipRect); diff --git a/services/core/java/com/android/server/wm/WindowTraceBuffer.java b/services/core/java/com/android/server/wm/WindowTraceBuffer.java index a4ee9077c150..8c65884a4d89 100644 --- a/services/core/java/com/android/server/wm/WindowTraceBuffer.java +++ b/services/core/java/com/android/server/wm/WindowTraceBuffer.java @@ -93,8 +93,8 @@ class WindowTraceBuffer { void writeTraceToFile(File traceFile) throws IOException { synchronized (mBufferLock) { traceFile.delete(); - traceFile.setReadable(true, false); try (OutputStream os = new FileOutputStream(traceFile)) { + traceFile.setReadable(true /* readable */, false /* ownerOnly */); ProtoOutputStream proto = new ProtoOutputStream(); proto.write(MAGIC_NUMBER, MAGIC_NUMBER_VALUE); os.write(proto.getBytes()); diff --git a/services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java b/services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java index 93cac08f0033..71b43973ea14 100644 --- a/services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java +++ b/services/tests/servicestests/src/com/android/server/am/MemoryStatUtilTest.java @@ -21,6 +21,7 @@ import static com.android.server.am.MemoryStatUtil.JIFFY_NANOS; import static com.android.server.am.MemoryStatUtil.MemoryStat; import static com.android.server.am.MemoryStatUtil.PAGE_SIZE; import static com.android.server.am.MemoryStatUtil.parseCmdlineFromProcfs; +import static com.android.server.am.MemoryStatUtil.parseIonHeapSizeFromDebugfs; import static com.android.server.am.MemoryStatUtil.parseMemoryStatFromMemcg; import static com.android.server.am.MemoryStatUtil.parseMemoryStatFromProcfs; import static com.android.server.am.MemoryStatUtil.parseVmHWMFromProcfs; @@ -178,6 +179,33 @@ public class MemoryStatUtilTest { + "voluntary_ctxt_switches:\t903\n" + "nonvoluntary_ctxt_switches:\t104\n"; + private static final String DEBUG_SYSTEM_ION_HEAP_CONTENTS = String.join( + " client pid size\n", + "----------------------------------------------------\n", + " audio@2.0-servi 765 4096\n", + " audio@2.0-servi 765 61440\n", + " audio@2.0-servi 765 4096\n", + " voip_client 96 8192\n", + " voip_client 96 4096\n", + " system_server 1232 16728064\n", + " surfaceflinger 611 50642944\n", + "----------------------------------------------------\n", + "orphaned allocations (info is from last known client):\n", + "----------------------------------------------------\n", + " total orphaned 0\n", + " total 55193600\n", + " deferred free 0\n", + "----------------------------------------------------\n", + "0 order 4 highmem pages in uncached pool = 0 total\n", + "0 order 4 lowmem pages in uncached pool = 0 total\n", + "1251 order 4 lowmem pages in cached pool = 81985536 total\n", + "VMID 8: 0 order 4 highmem pages in secure pool = 0 total\n", + "VMID 8: 0 order 4 lowmem pages in secure pool = 0 total\n", + "--------------------------------------------\n", + "uncached pool = 4096 cached pool = 83566592 secure pool = 0\n", + "pool total (uncached + cached + secure) = 83570688\n", + "--------------------------------------------\n"); + @Test public void testParseMemoryStatFromMemcg_parsesCorrectValues() { MemoryStat stat = parseMemoryStatFromMemcg(MEMORY_STAT_CONTENTS); @@ -271,4 +299,21 @@ public class MemoryStatUtilTest { output.write(bytes, 0, bytes.length); return output.toString(); } + + @Test + public void testParseIonHeapSizeFromDebugfs_emptyContents() { + assertEquals(0, parseIonHeapSizeFromDebugfs("")); + + assertEquals(0, parseIonHeapSizeFromDebugfs(null)); + } + + @Test + public void testParseIonHeapSizeFromDebugfs_invalidValue() { + assertEquals(0, parseIonHeapSizeFromDebugfs("<<no-value>>")); + } + + @Test + public void testParseIonHeapSizeFromDebugfs_correctValue() { + assertEquals(55193600, parseIonHeapSizeFromDebugfs(DEBUG_SYSTEM_ION_HEAP_CONTENTS)); + } } 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 28a815ec72a7..bd7774a64019 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -5021,8 +5021,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { configureContextForAccess(mContext, false); assertExpectException(SecurityException.class, /* messageRegex= */ null, - () -> dpm.setProfileOwnerCanAccessDeviceIdsForUser(admin2, - UserHandle.of(DpmMockContext.CALLER_UID))); + () -> dpm.setProfileOwnerCanAccessDeviceIds(admin2)); } public void testGrantDeviceIdsAccess_notByAuthorizedCaller() throws Exception { @@ -5030,8 +5029,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { configureContextForAccess(mContext, false); assertExpectException(SecurityException.class, /* messageRegex= */ null, - () -> dpm.setProfileOwnerCanAccessDeviceIdsForUser(admin1, - UserHandle.of(DpmMockContext.CALLER_UID))); + () -> dpm.setProfileOwnerCanAccessDeviceIds(admin1)); } public void testGrantDeviceIdsAccess_byAuthorizedSystemCaller() throws Exception { @@ -5060,8 +5058,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { DpmMockContext.CALLER_MANAGED_PROVISIONING_UID); try { runAsCaller(mServiceContext, dpms, dpm -> { - dpm.setProfileOwnerCanAccessDeviceIdsForUser(admin1, - UserHandle.of(DpmMockContext.CALLER_USER_HANDLE)); + dpm.setProfileOwnerCanAccessDeviceIds(admin1); }); } finally { mServiceContext.binder.restoreCallingIdentity(ident); @@ -5314,7 +5311,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { mServiceContext.binder.callingUid = UserHandle.getUid(DpmMockContext.CALLER_USER_HANDLE, DpmMockContext.SYSTEM_UID); runAsCaller(mServiceContext, dpms, dpm -> { - dpm.setProfileOwnerCanAccessDeviceIdsForUser(who, UserHandle.of(userId)); + dpm.setProfileOwnerCanAccessDeviceIds(who); }); mServiceContext.binder.restoreCallingIdentity(ident); } diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java index 26722fd64b4a..d3f33a152734 100644 --- a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java @@ -167,6 +167,7 @@ public class PackageInstallerSessionTest { /* stageDir */ mTmpDir, /* stageCid */ null, /* prepared */ true, + /* committed */ true, /* sealed */ false, // Setting to true would trigger some PM logic. /* childSessionIds */ childSessionIds != null ? childSessionIds : new int[0], /* parentSessionId */ parentSessionId, @@ -300,6 +301,7 @@ public class PackageInstallerSessionTest { assertEquals(expected.getStagedSessionErrorMessage(), actual.getStagedSessionErrorMessage()); assertEquals(expected.isPrepared(), actual.isPrepared()); + assertEquals(expected.isCommitted(), actual.isCommitted()); assertEquals(expected.isSealed(), actual.isSealed()); assertEquals(expected.isMultiPackage(), actual.isMultiPackage()); assertEquals(expected.hasParentSessionId(), actual.hasParentSessionId()); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java index c072d4e28e81..83c0af92a6ee 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java @@ -59,7 +59,7 @@ public class AppChangeTransitionTests extends WindowTestsBase { public void setUpOnDisplay(DisplayContent dc) { mStack = createTaskStackOnDisplay(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD, dc); mTask = createTaskInStack(mStack, 0 /* userId */); - mToken = WindowTestUtils.createTestAppWindowToken(dc, false /* skipOnParentChanged */); + mToken = WindowTestUtils.createTestAppWindowToken(dc); mTask.addChild(mToken, 0); diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java index 5e12a950c560..81133d1052ec 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java @@ -18,6 +18,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.view.WindowManager.TRANSIT_TASK_CHANGE_WINDOWING_MODE; import static android.view.WindowManager.TRANSIT_TASK_CLOSE; import static android.view.WindowManager.TRANSIT_TASK_OPEN; @@ -77,4 +78,21 @@ public class AppTransitionControllerTest extends WindowTestsBase { TRANSIT_TASK_CLOSE)); } } + + @Test + public void testChangeIsNotOverwritten() { + synchronized (mWm.mGlobalLock) { + final AppWindowToken behind = createAppWindowToken(mDisplayContent, + WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); + final AppWindowToken translucentOpening = createAppWindowToken(mDisplayContent, + WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); + translucentOpening.setFillsParent(false); + translucentOpening.setHidden(true); + mDisplayContent.mOpeningApps.add(behind); + mDisplayContent.mOpeningApps.add(translucentOpening); + assertEquals(TRANSIT_TASK_CHANGE_WINDOWING_MODE, + mAppTransitionController.maybeUpdateTransitToTranslucentAnim( + TRANSIT_TASK_CHANGE_WINDOWING_MODE)); + } + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java index a98a6046890d..db04f1159150 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenAnimationTests.java @@ -60,7 +60,7 @@ public class AppWindowTokenAnimationTests extends WindowTestsBase { MockitoAnnotations.initMocks(this); mToken = createTestAppWindowToken(mDisplayContent, WINDOWING_MODE_FULLSCREEN, - ACTIVITY_TYPE_STANDARD, false /* skipOnParentChanged */); + ACTIVITY_TYPE_STANDARD); } @Test diff --git a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java index 68b40b92b9cc..d17e5c3f5359 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppWindowTokenTests.java @@ -16,8 +16,6 @@ package com.android.server.wm; -import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; -import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; @@ -48,7 +46,6 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.verify; import android.content.res.Configuration; -import android.graphics.Point; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; import android.view.Display; @@ -81,8 +78,7 @@ public class AppWindowTokenTests extends WindowTestsBase { public void setUp() throws Exception { mStack = createTaskStackOnDisplay(mDisplayContent); mTask = createTaskInStack(mStack, 0 /* userId */); - mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent, - false /* skipOnParentChanged */); + mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent); mTask.addChild(mToken, 0); } @@ -219,9 +215,6 @@ public class AppWindowTokenTests extends WindowTestsBase { @Test public void testSizeCompatBounds() { - // The real surface transaction is unnecessary. - mToken.setSkipPrepareSurfaces(true); - final Rect fixedBounds = mToken.getRequestedOverrideConfiguration().windowConfiguration .getBounds(); fixedBounds.set(0, 0, 1200, 1600); @@ -479,32 +472,6 @@ public class AppWindowTokenTests extends WindowTestsBase { assertHasStartingWindow(tokenBottom); } - @Test - public void testTransitionAnimationPositionAndBounds() { - final Rect stackBounds = new Rect( - 0/* left */, 0 /* top */, 1000 /* right */, 1000 /* bottom */); - final Rect taskBounds = new Rect( - 100/* left */, 200 /* top */, 600 /* right */, 600 /* bottom */); - mStack.setBounds(stackBounds); - mTask.setBounds(taskBounds); - - mTask.setWindowingMode(WINDOWING_MODE_FREEFORM); - assertTransitionAnimationPositionAndBounds(taskBounds.left, taskBounds.top, stackBounds); - - mTask.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); - assertTransitionAnimationPositionAndBounds(stackBounds.left, stackBounds.top, stackBounds); - } - - private void assertTransitionAnimationPositionAndBounds(int expectedX, int expectedY, - Rect expectedBounds) { - final Point outPosition = new Point(); - final Rect outBounds = new Rect(); - mToken.getAnimationBounds(outPosition, outBounds); - assertEquals(expectedX, outPosition.x); - assertEquals(expectedY, outPosition.y); - assertEquals(expectedBounds, outBounds); - } - private void assertHasStartingWindow(AppWindowToken atoken) { assertNotNull(atoken.startingSurface); assertNotNull(atoken.startingData); diff --git a/services/tests/wmtests/src/com/android/server/wm/PersisterQueueTests.java b/services/tests/wmtests/src/com/android/server/wm/PersisterQueueTests.java index 83274401f13d..a166444ce871 100644 --- a/services/tests/wmtests/src/com/android/server/wm/PersisterQueueTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/PersisterQueueTests.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue; import android.os.SystemClock; import android.platform.test.annotations.Presubmit; +import androidx.test.filters.FlakyTest; import androidx.test.filters.MediumTest; import org.junit.After; @@ -157,6 +158,7 @@ public class PersisterQueueTests implements PersisterQueue.Listener { } @Test + @FlakyTest(bugId = 128526085) public void testProcessTwoItems_OneAfterAnother() throws Exception { // First item mLatch = new CountDownLatch(1); diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java index b140da501c38..b9e9909c2dc9 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackChangedListenerTest.java @@ -100,6 +100,7 @@ public class TaskStackChangedListenerTest { } @Test + @Presubmit public void testTaskDescriptionChanged() throws Exception { final Object[] params = new Object[2]; final CountDownLatch latch = new CountDownLatch(1); @@ -132,6 +133,7 @@ public class TaskStackChangedListenerTest { } @Test + @Presubmit public void testActivityRequestedOrientationChanged() throws Exception { final int[] params = new int[2]; final CountDownLatch latch = new CountDownLatch(1); diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java index 2ccdb9ea068c..78fca0f2e6ef 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowFrameTests.java @@ -19,6 +19,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; +import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import static android.view.DisplayCutout.BOUNDS_POSITION_TOP; import static android.view.DisplayCutout.fromBoundingRect; import static android.view.WindowManager.LayoutParams.MATCH_PARENT; @@ -27,7 +28,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; -import android.app.ActivityManager.TaskDescription; import android.content.res.Configuration; import android.graphics.Rect; import android.platform.test.annotations.Presubmit; @@ -54,23 +54,15 @@ import org.mockito.Mockito; @Presubmit public class WindowFrameTests extends WindowTestsBase { - private WindowToken mWindowToken; private final IWindow mIWindow = new TestIWindow(); private final Rect mEmptyRect = new Rect(); - static class WindowStateWithTask extends WindowState { - final Task mTask; + static class FrameTestWindowState extends WindowState { boolean mDockedResizingForTest = false; - WindowStateWithTask(WindowManagerService wm, IWindow iWindow, WindowToken windowToken, - WindowManager.LayoutParams attrs, Task t) { + FrameTestWindowState(WindowManagerService wm, IWindow iWindow, WindowToken windowToken, + WindowManager.LayoutParams attrs) { super(wm, mock(Session.class), iWindow, windowToken, null, 0, 0, attrs, 0, 0, false /* ownerCanAddInternalSystemWindow */); - mTask = t; - } - - @Override - Task getTask() { - return mTask; } @Override @@ -79,52 +71,10 @@ public class WindowFrameTests extends WindowTestsBase { } } - private static class TaskWithBounds extends Task { - Rect mBounds; - final Rect mOverrideDisplayedBounds = new Rect(); - boolean mFullscreenForTest = true; - - TaskWithBounds(TaskStack stack, WindowManagerService wm, Rect bounds) { - super(0, stack, 0, wm, 0, false, new TaskDescription(), null); - setBounds(bounds); - } - - @Override - public int setBounds(Rect bounds) { - mBounds = bounds; - return super.setBounds(bounds); - } - - @Override - public Rect getBounds() { - return mBounds; - } - - @Override - public void getBounds(Rect out) { - out.set(mBounds); - } - - @Override - public void getRequestedOverrideBounds(Rect outBounds) { - outBounds.set(mBounds); - } - @Override - Rect getOverrideDisplayedBounds() { - return mOverrideDisplayedBounds; - } - @Override - boolean isFullscreen() { - return mFullscreenForTest; - } - } - TaskStack mStubStack; @Before public void setUp() throws Exception { - mWindowToken = createAppWindowToken(mWm.getDefaultDisplayContentLocked(), - WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); mStubStack = mock(TaskStack.class); } @@ -168,7 +118,8 @@ public class WindowFrameTests extends WindowTestsBase { expectedRect.bottom); } - private void assertPolicyCrop(WindowStateWithTask w, int left, int top, int right, int bottom) { + private void assertPolicyCrop( + FrameTestWindowState w, int left, int top, int right, int bottom) { Rect policyCrop = new Rect(); w.calculatePolicyCrop(policyCrop); assertRect(policyCrop, left, top, right, bottom); @@ -177,8 +128,7 @@ public class WindowFrameTests extends WindowTestsBase { @Test public void testLayoutInFullscreenTaskInsets() { // fullscreen task doesn't use bounds for computeFrame - final Task task = new TaskWithBounds(mStubStack, mWm, null); - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final int bottomContentInset = 100; @@ -235,8 +185,7 @@ public class WindowFrameTests extends WindowTestsBase { @Test public void testLayoutInFullscreenTaskNoInsets() { // fullscreen task doesn't use bounds for computeFrame - final Task task = new TaskWithBounds(mStubStack, mWm, null); - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; // With no insets or system decor all the frames incoming from PhoneWindowManager @@ -323,9 +272,11 @@ public class WindowFrameTests extends WindowTestsBase { final int taskRight = logicalWidth / 4 * 3; final int taskBottom = logicalHeight / 4 * 3; final Rect taskBounds = new Rect(taskLeft, taskTop, taskRight, taskBottom); - final TaskWithBounds task = new TaskWithBounds(mStubStack, mWm, taskBounds); - task.mFullscreenForTest = false; - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); + final Task task = w.getTask(); + // Use split-screen because it is non-fullscreen, but also not floating + task.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); + task.setBounds(taskBounds); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight); @@ -359,8 +310,8 @@ public class WindowFrameTests extends WindowTestsBase { final int insetTop = logicalHeight / 5; final int insetRight = insetLeft + (taskRight - taskLeft); final int insetBottom = insetTop + (taskBottom - taskTop); - task.mOverrideDisplayedBounds.set(taskBounds); - task.mBounds.set(insetLeft, insetTop, insetRight, insetBottom); + task.setOverrideDisplayedBounds(taskBounds); + task.setBounds(insetLeft, insetTop, insetRight, insetBottom); windowFrames.setFrames(pf, pf, pf, cf, cf, pf, cf, mEmptyRect); w.computeFrameLw(); assertFrame(w, taskLeft, taskTop, taskRight, taskBottom); @@ -373,8 +324,7 @@ public class WindowFrameTests extends WindowTestsBase { @Test public void testCalculatePolicyCrop() { - final WindowStateWithTask w = createWindow( - new TaskWithBounds(mStubStack, mWm, null), MATCH_PARENT, MATCH_PARENT); + final FrameTestWindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final DisplayInfo displayInfo = w.getDisplayContent().getDisplayInfo(); @@ -439,9 +389,11 @@ public class WindowFrameTests extends WindowTestsBase { final int taskRight = logicalWidth / 4 * 3; final int taskBottom = logicalHeight / 4 * 3; final Rect taskBounds = new Rect(taskLeft, taskTop, taskRight, taskBottom); - final TaskWithBounds task = new TaskWithBounds(mStubStack, mWm, taskBounds); - task.mFullscreenForTest = false; - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); + final Task task = w.getTask(); + // Use split-screen because it is non-fullscreen, but also not floating + task.setWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); + task.setBounds(taskBounds); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final Rect pf = new Rect(0, 0, logicalWidth, logicalHeight); @@ -461,7 +413,8 @@ public class WindowFrameTests extends WindowTestsBase { config.windowConfiguration.setBounds(cf); w.mAppToken.onRequestedOverrideConfigurationChanged(config); pf.set(0, 0, logicalWidth, logicalHeight); - task.mFullscreenForTest = true; + task.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + task.setBounds(null); windowFrames.setFrames(pf, pf, pf, cf, cf, pf, cf, mEmptyRect); w.computeFrameLw(); assertFrame(w, cf.left, cf.top, cf.right, cf.bottom); @@ -472,8 +425,7 @@ public class WindowFrameTests extends WindowTestsBase { @Test public void testDisplayCutout() { // Regular fullscreen task and window - final Task task = new TaskWithBounds(mStubStack, mWm, null); - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final Rect pf = new Rect(0, 0, 1000, 2000); @@ -496,11 +448,10 @@ public class WindowFrameTests extends WindowTestsBase { @Test public void testDisplayCutout_tempDisplayedBounds() { // Regular fullscreen task and window - final TaskWithBounds task = new TaskWithBounds(mStubStack, mWm, - new Rect(0, 0, 1000, 2000)); - task.mFullscreenForTest = false; + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); + final Task task = w.getTask(); + task.setBounds(new Rect(0, 0, 1000, 2000)); task.setOverrideDisplayedBounds(new Rect(0, -500, 1000, 1500)); - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; final Rect pf = new Rect(0, -500, 1000, 1500); @@ -523,12 +474,10 @@ public class WindowFrameTests extends WindowTestsBase { @Test public void testFreeformContentInsets() { // fullscreen task doesn't use bounds for computeFrame - final Task task = new TaskWithBounds(mStubStack, mWm, null); - WindowState w = createWindow(task, MATCH_PARENT, MATCH_PARENT); + WindowState w = createWindow(MATCH_PARENT, MATCH_PARENT); + final Task task = w.getTask(); w.mAttrs.gravity = Gravity.LEFT | Gravity.TOP; task.setWindowingMode(WINDOWING_MODE_FREEFORM); - ((TaskWithBounds) task).mFullscreenForTest = false; - w.setWindowingMode(WINDOWING_MODE_FREEFORM); DisplayContent dc = mWm.getDefaultDisplayContentLocked(); dc.mInputMethodTarget = w; @@ -551,7 +500,6 @@ public class WindowFrameTests extends WindowTestsBase { final Rect winRect = new Rect(200, 200, 300, 500); task.setBounds(winRect); - w.setBounds(winRect); w.getWindowFrames().setFrames(pf, df, of, cf, vf, dcf, sf, mEmptyRect); w.computeFrameLw(); @@ -580,11 +528,16 @@ public class WindowFrameTests extends WindowTestsBase { assertEquals(winRect, w.getFrameLw()); } - private WindowStateWithTask createWindow(Task task, int width, int height) { + private FrameTestWindowState createWindow(int width, int height) { final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams(TYPE_APPLICATION); attrs.width = width; attrs.height = height; - return new WindowStateWithTask(mWm, mIWindow, mWindowToken, attrs, task); + AppWindowToken token = createAppWindowToken(mWm.getDefaultDisplayContentLocked(), + WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD); + + FrameTestWindowState ws = new FrameTestWindowState(mWm, mIWindow, token, attrs); + token.addWindow(ws); + return ws; } } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java index 0dec8ee7776f..a7a785d14d6a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java @@ -56,24 +56,15 @@ class WindowTestUtils { static TestAppWindowToken createTestAppWindowToken(DisplayContent dc) { synchronized (dc.mWmService.mGlobalLock) { - return new TestAppWindowToken(dc, true /* skipOnParentChanged */); - } - } - - static TestAppWindowToken createTestAppWindowToken(DisplayContent dc, - boolean skipOnParentChanged) { - synchronized (dc.mWmService.mGlobalLock) { - return new TestAppWindowToken(dc, skipOnParentChanged); + return new TestAppWindowToken(dc); } } /** Used so we can gain access to some protected members of the {@link AppWindowToken} class. */ static class TestAppWindowToken extends AppWindowToken { boolean mOnTop = false; - private boolean mSkipPrepareSurfaces; - boolean mSkipOnParentChanged = true; - private TestAppWindowToken(DisplayContent dc, boolean skipOnParentChanged) { + private TestAppWindowToken(DisplayContent dc) { super(dc.mWmService, new IApplicationToken.Stub() { @Override public String getName() { @@ -81,7 +72,6 @@ class WindowTestUtils { } }, new ComponentName("", ""), false, dc, true /* fillsParent */); mTargetSdk = Build.VERSION_CODES.CUR_DEVELOPMENT; - mSkipOnParentChanged = skipOnParentChanged; mActivityRecord = mock(ActivityRecord.class); mActivityRecord.app = mock(WindowProcessController.class); } @@ -103,44 +93,10 @@ class WindowTestUtils { } @Override - void onParentChanged() { - if (!mSkipOnParentChanged) { - super.onParentChanged(); - } else { - updateConfigurationFromParent(this); - } - } - - @Override boolean isOnTop() { return mOnTop; } - @Override - void prepareSurfaces() { - if (!mSkipPrepareSurfaces) { - super.prepareSurfaces(); - } - } - - void setSkipPrepareSurfaces(boolean ignore) { - mSkipPrepareSurfaces = ignore; - } - } - - /** - * Used when we don't want to perform surface related operation in - * {@link WindowContainer#onParentChanged} or the overridden method, but the configuration - * still needs to propagate from parent. - * - * @see ConfigurationContainer#onParentChanged - */ - static void updateConfigurationFromParent(WindowContainer container) { - final WindowContainer parent = container.getParent(); - if (parent != null) { - container.onConfigurationChanged(parent.getConfiguration()); - container.onMergedOverrideConfigurationChanged(); - } } static TestWindowToken createTestWindowToken(int type, DisplayContent dc) { @@ -246,10 +202,5 @@ class WindowTestUtils { mHasSurface = hadSurface; } - - @Override - void onParentChanged() { - updateConfigurationFromParent(this); - } } } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java index 032eba17a6b5..8c37ca5e309e 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -229,10 +229,11 @@ class WindowTestsBase { } catch (Exception e) { Log.e(TAG, "Failed to tear down test", e); throw e; + } finally { + mMockTracker.close(); + mMockTracker = null; } - mMockTracker.close(); - mMockTracker = null; } private WindowState createCommonWindow(WindowState parent, int type, String name) { @@ -269,16 +270,10 @@ class WindowTestsBase { WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int windowingMode, int activityType) { - return createTestAppWindowToken(dc, windowingMode, activityType, - false /*skipOnParentChanged */); - } - - WindowTestUtils.TestAppWindowToken createTestAppWindowToken(DisplayContent dc, int - windowingMode, int activityType, boolean skipOnParentChanged) { final TaskStack stack = createTaskStackOnDisplay(windowingMode, activityType, dc); final Task task = createTaskInStack(stack, 0 /* userId */); final WindowTestUtils.TestAppWindowToken appWindowToken = - WindowTestUtils.createTestAppWindowToken(dc, skipOnParentChanged); + WindowTestUtils.createTestAppWindowToken(dc); task.addChild(appWindowToken, 0); return appWindowToken; } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index ae12a17e1e2f..28e6596ce5bb 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -555,6 +555,15 @@ public abstract class Connection extends Conferenceable { public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED"; /** + * Connection event used to inform Telecom when a hold operation on a call has failed. + * Not intended for use by the UI at this time. + * Sent via {@link #sendConnectionEvent(String, Bundle)}. The {@link Bundle} parameter is + * expected to be null when this connection event is used. + * @hide + */ + public static final String EVENT_CALL_HOLD_FAILED = "android.telecom.event.CALL_HOLD_FAILED"; + + /** * Connection event used to inform {@link InCallService}s when the process of merging a * Connection into a conference has begun. * <p> diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 52c54254da6e..3d0a3c5d6f7f 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1589,7 +1589,7 @@ public class TelecomManager { Build.VERSION_CODES.O_MR1) { Log.e("TAG", "addNewIncomingCall failed. Use public api " + "acceptHandover for API > O-MR1"); - // TODO add "return" after DUO team adds support for new handover API + return; } getTelecomService().addNewIncomingCall( phoneAccount, extras == null ? new Bundle() : extras); diff --git a/telephony/java/android/telephony/CellIdentityNr.java b/telephony/java/android/telephony/CellIdentityNr.java index 5a89ae83fbb6..4be52a322c03 100644 --- a/telephony/java/android/telephony/CellIdentityNr.java +++ b/telephony/java/android/telephony/CellIdentityNr.java @@ -16,13 +16,15 @@ package android.telephony; +import android.annotation.IntRange; +import android.annotation.Nullable; import android.os.Parcel; import android.telephony.gsm.GsmCellLocation; import java.util.Objects; /** - * Information to represent a unique 5G NR cell. + * Information to represent a unique NR(New Radio 5G) cell. */ public final class CellIdentityNr extends CellIdentity { private static final String TAG = "CellIdentityNr"; @@ -79,7 +81,7 @@ public final class CellIdentityNr extends CellIdentity { } /** - * Get the NR Cell Identity. + * Get the NR(New Radio 5G) Cell Identity. * * @return The 36-bit NR Cell Identity in range [0, 68719476735] or * {@link CellInfo#UNAVAILABLE_LONG} if unknown. @@ -96,6 +98,7 @@ public final class CellIdentityNr extends CellIdentity { * * @return Integer value in range [0, 3279165] or {@link CellInfo#UNAVAILABLE} if unknown. */ + @IntRange(from = 0, to = 3279165) public int getNrarfcn() { return mNrArfcn; } @@ -104,6 +107,7 @@ public final class CellIdentityNr extends CellIdentity { * Get the physical cell id. * @return Integer value in range [0, 1007] or {@link CellInfo#UNAVAILABLE} if unknown. */ + @IntRange(from = 0, to = 1007) public int getPci() { return mPci; } @@ -112,6 +116,7 @@ public final class CellIdentityNr extends CellIdentity { * Get the tracking area code. * @return a 16 bit integer or {@link CellInfo#UNAVAILABLE} if unknown. */ + @IntRange(from = 0, to = 65535) public int getTac() { return mTac; } @@ -119,6 +124,7 @@ public final class CellIdentityNr extends CellIdentity { /** * @return Mobile Country Code in string format, or {@code null} if unknown. */ + @Nullable public String getMccString() { return mMccStr; } @@ -126,6 +132,7 @@ public final class CellIdentityNr extends CellIdentity { /** * @return Mobile Network Code in string fomrat, or {@code null} if unknown. */ + @Nullable public String getMncString() { return mMncStr; } diff --git a/telephony/java/android/telephony/CellInfoNr.java b/telephony/java/android/telephony/CellInfoNr.java index fb147ce7b4e9..0227610024a4 100644 --- a/telephony/java/android/telephony/CellInfoNr.java +++ b/telephony/java/android/telephony/CellInfoNr.java @@ -16,6 +16,7 @@ package android.telephony; +import android.annotation.NonNull; import android.os.Parcel; import java.util.Objects; @@ -36,11 +37,13 @@ public final class CellInfoNr extends CellInfo { } @Override + @NonNull public CellIdentity getCellIdentity() { return mCellIdentity; } @Override + @NonNull public CellSignalStrength getCellSignalStrength() { return mCellSignalStrength; } diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index 48c07e8d54e1..28f6515d09e5 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -397,81 +397,4 @@ public class RadioAccessFamily implements Parcelable { } return result; } - - /** - * convert RAF from {@link android.hardware.radio.V1_0.RadioAccessFamily} to - * {@link TelephonyManager.NetworkTypeBitMask}, the bitmask represented by - * {@link TelephonyManager.NetworkType}. - * - * @param raf {@link android.hardware.radio.V1_0.RadioAccessFamily} - * @return {@link TelephonyManager.NetworkTypeBitMask} - */ - public static int convertToNetworkTypeBitMask(int raf) { - int networkTypeRaf = 0; - - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.GSM) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_GSM; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.GPRS) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_GPRS; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EDGE) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EDGE; - } - // convert both IS95A/IS95B to CDMA as network mode doesn't support CDMA - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.IS95A) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_CDMA; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.IS95B) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_CDMA; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.ONE_X_RTT) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_0) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_A) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_B) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EHRPD) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSUPA) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSDPA) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSPA) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSPA; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSPAP) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.UMTS) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_UMTS; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.TD_SCDMA) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.LTE) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_LTE; - } - if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.LTE_CA) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA; - } - if ((raf & android.hardware.radio.V1_4.RadioAccessFamily.NR) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_NR; - } - // TODO: need hal definition - if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN)) != 0) { - networkTypeRaf |= TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN; - } - - return (networkTypeRaf == 0) ? TelephonyManager.NETWORK_TYPE_UNKNOWN : networkTypeRaf; - } } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0c6bc4864877..3dee114c1688 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6152,7 +6152,7 @@ public class TelephonyManager { // FIXME Need to get it from Telephony Dev Controller when that gets implemented! // and then this method shouldn't be used at all! if(isMultiSimEnabled()) { - return 2; + return getPhoneCount(); } else { return 1; } @@ -6774,14 +6774,12 @@ public class TelephonyManager { } } catch (RemoteException ex) { Rlog.e(TAG, "getPreferredNetworkType RemoteException", ex); - } catch (NullPointerException ex) { - Rlog.e(TAG, "getPreferredNetworkType NPE", ex); } return -1; } /** - * Get the preferred network type bitmap. + * Get the preferred network type bitmask. * * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()} @@ -6790,13 +6788,13 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE READ_PRIVILEGED_PHONE_STATE} * or that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}). * - * @return The bitmap of preferred network types. + * @return The bitmask of preferred network types. * * @hide */ @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @SystemApi - public @NetworkTypeBitMask long getPreferredNetworkTypeBitmap() { + public @NetworkTypeBitMask long getPreferredNetworkTypeBitmask() { try { ITelephony telephony = getITelephony(); if (telephony != null) { @@ -6804,9 +6802,7 @@ public class TelephonyManager { telephony.getPreferredNetworkType(getSubId())); } } catch (RemoteException ex) { - Rlog.e(TAG, "getPreferredNetworkTypeBitmap RemoteException", ex); - } catch (NullPointerException ex) { - Rlog.e(TAG, "getPreferredNetworkTypeBitmap NPE", ex); + Rlog.e(TAG, "getPreferredNetworkTypeBitmask RemoteException", ex); } return 0; } @@ -7031,14 +7027,12 @@ public class TelephonyManager { } } catch (RemoteException ex) { Rlog.e(TAG, "setPreferredNetworkType RemoteException", ex); - } catch (NullPointerException ex) { - Rlog.e(TAG, "setPreferredNetworkType NPE", ex); } return false; } /** - * Set the preferred network type bitmap. + * Set the preferred network type bitmask. * * <p>If this object has been created with {@link #createForSubscriptionId}, applies to the * given subId. Otherwise, applies to {@link SubscriptionManager#getDefaultSubscriptionId()} @@ -7047,24 +7041,22 @@ public class TelephonyManager { * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling * app has carrier privileges (see {@link #hasCarrierPrivileges}). * - * @param networkTypeBitmap The bitmap of preferred network types. + * @param networkTypeBitmask The bitmask of preferred network types. * @return true on success; false on any failure. * @hide */ @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @SystemApi - public boolean setPreferredNetworkTypeBitmap(@NetworkTypeBitMask long networkTypeBitmap) { + public boolean setPreferredNetworkTypeBitmask(@NetworkTypeBitMask long networkTypeBitmask) { try { ITelephony telephony = getITelephony(); if (telephony != null) { return telephony.setPreferredNetworkType( getSubId(), RadioAccessFamily.getNetworkTypeFromRaf( - (int) networkTypeBitmap)); + (int) networkTypeBitmask)); } } catch (RemoteException ex) { - Rlog.e(TAG, "setPreferredNetworkType RemoteException", ex); - } catch (NullPointerException ex) { - Rlog.e(TAG, "setPreferredNetworkType NPE", ex); + Rlog.e(TAG, "setPreferredNetworkTypeBitmask RemoteException", ex); } return false; } diff --git a/telephony/java/android/telephony/ims/ImsException.java b/telephony/java/android/telephony/ims/ImsException.java index bdaad5bffe5e..02eddf67e25b 100644 --- a/telephony/java/android/telephony/ims/ImsException.java +++ b/telephony/java/android/telephony/ims/ImsException.java @@ -19,6 +19,7 @@ package android.telephony.ims; import android.annotation.IntDef; import android.annotation.Nullable; import android.annotation.SystemApi; +import android.content.pm.PackageManager; import android.text.TextUtils; import java.lang.annotation.Retention; @@ -48,7 +49,9 @@ public class ImsException extends Exception { /** * This device or carrier configuration does not support IMS for this subscription. * <p> - * This is a permanent configuration error and there should be no retry. + * This is a permanent configuration error and there should be no retry. Usually this is + * because {@link PackageManager#FEATURE_TELEPHONY_IMS} is not available + * or the device has no ImsService implementation to service this request. */ public static final int CODE_ERROR_UNSUPPORTED_OPERATION = 2; diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java index 58ddf21888fc..12e80062747c 100644 --- a/telephony/java/android/telephony/ims/ImsMmTelManager.java +++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java @@ -25,6 +25,8 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.content.Context; +import android.content.pm.IPackageManager; +import android.content.pm.PackageManager; import android.net.Uri; import android.os.Binder; import android.os.RemoteException; @@ -314,7 +316,7 @@ public class ImsMmTelManager { private int mSubId; /** - * Create an instance of ImsManager for the subscription id specified. + * Create an instance of {@link ImsMmTelManager} for the subscription id specified. * * @param subId The ID of the subscription that this ImsMmTelManager will use. * @see android.telephony.SubscriptionManager#getActiveSubscriptionInfoList() @@ -366,12 +368,14 @@ public class ImsMmTelManager { if (executor == null) { throw new IllegalArgumentException("Must include a non-null Executor."); } + if (!isImsAvailableOnDevice()) { + throw new ImsException("IMS not available on device.", + ImsException.CODE_ERROR_UNSUPPORTED_OPERATION); + } c.setExecutor(executor); try { getITelephony().registerImsRegistrationCallback(mSubId, c.getBinder()); - } catch (RemoteException e) { - throw e.rethrowAsRuntimeException(); - } catch (IllegalStateException e) { + } catch (RemoteException | IllegalStateException e) { throw new ImsException(e.getMessage(), ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); } } @@ -434,6 +438,10 @@ public class ImsMmTelManager { if (executor == null) { throw new IllegalArgumentException("Must include a non-null Executor."); } + if (!isImsAvailableOnDevice()) { + throw new ImsException("IMS not available on device.", + ImsException.CODE_ERROR_UNSUPPORTED_OPERATION); + } c.setExecutor(executor); try { getITelephony().registerMmTelCapabilityCallback(mSubId, c.getBinder()); @@ -800,6 +808,22 @@ public class ImsMmTelManager { } } + private static boolean isImsAvailableOnDevice() { + IPackageManager pm = IPackageManager.Stub.asInterface(ServiceManager.getService("package")); + if (pm == null) { + // For some reason package manger is not available.. This will fail internally anyways, + // so do not throw error and allow. + return true; + } + try { + return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS, 0); + } catch (RemoteException e) { + // For some reason package manger is not available.. This will fail internally anyways, + // so do not throw error and allow. + } + return true; + } + private static ITelephony getITelephony() { ITelephony binder = ITelephony.Stub.asInterface( ServiceManager.getService(Context.TELEPHONY_SERVICE)); diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java index b0184916ff70..a478606da22a 100644 --- a/telephony/java/android/telephony/ims/ImsReasonInfo.java +++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java @@ -142,6 +142,11 @@ public final class ImsReasonInfo implements Parcelable { * Call was disconnected because a handover is not feasible due to network conditions. */ public static final int CODE_LOCAL_HO_NOT_FEASIBLE = 149; + /** + * This device does not support IMS. + * @hide + */ + public static final int CODE_LOCAL_IMS_NOT_SUPPORTED_ON_DEVICE = 150; /* * TIMEOUT (IMS -> Telephony) diff --git a/telephony/java/android/telephony/ims/ProvisioningManager.java b/telephony/java/android/telephony/ims/ProvisioningManager.java index d12cda8a30a4..8cdf6a235749 100644 --- a/telephony/java/android/telephony/ims/ProvisioningManager.java +++ b/telephony/java/android/telephony/ims/ProvisioningManager.java @@ -24,6 +24,8 @@ import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.WorkerThread; import android.content.Context; +import android.content.pm.IPackageManager; +import android.content.pm.PackageManager; import android.os.Binder; import android.os.RemoteException; import android.os.ServiceManager; @@ -209,12 +211,14 @@ public class ProvisioningManager { @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void registerProvisioningChangedCallback(@NonNull @CallbackExecutor Executor executor, @NonNull Callback callback) throws ImsException { + if (!isImsAvailableOnDevice()) { + throw new ImsException("IMS not available on device.", + ImsException.CODE_ERROR_UNSUPPORTED_OPERATION); + } callback.setExecutor(executor); try { getITelephony().registerImsProvisioningChangedCallback(mSubId, callback.getBinder()); - } catch (RemoteException e) { - throw e.rethrowAsRuntimeException(); - } catch (IllegalStateException e) { + } catch (RemoteException | IllegalStateException e) { throw new ImsException(e.getMessage(), ImsException.CODE_ERROR_SERVICE_UNAVAILABLE); } } @@ -232,8 +236,7 @@ public class ProvisioningManager { @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull Callback callback) { try { - getITelephony().unregisterImsProvisioningChangedCallback(mSubId, - callback.getBinder()); + getITelephony().unregisterImsProvisioningChangedCallback(mSubId, callback.getBinder()); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } @@ -373,6 +376,22 @@ public class ProvisioningManager { } } + private static boolean isImsAvailableOnDevice() { + IPackageManager pm = IPackageManager.Stub.asInterface(ServiceManager.getService("package")); + if (pm == null) { + // For some reason package manger is not available.. This will fail internally anyways, + // so do not throw error and allow. + return true; + } + try { + return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS, 0); + } catch (RemoteException e) { + // For some reason package manger is not available.. This will fail internally anyways, + // so do not throw error and allow. + } + return true; + } + private static ITelephony getITelephony() { ITelephony binder = ITelephony.Stub.asInterface( ServiceManager.getService(Context.TELEPHONY_SERVICE)); diff --git a/tests/ActivityManagerPerfTests/test-app/Android.bp b/tests/ActivityManagerPerfTests/test-app/Android.bp new file mode 100644 index 000000000000..ef9d587581c4 --- /dev/null +++ b/tests/ActivityManagerPerfTests/test-app/Android.bp @@ -0,0 +1,21 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "ActivityManagerPerfTestsTestApp", + srcs: ["src/**/*.java"], + static_libs: ["ActivityManagerPerfTestsUtils"], + min_sdk_version: "25", + sdk_version: "current", +} diff --git a/tests/ActivityManagerPerfTests/test-app/Android.mk b/tests/ActivityManagerPerfTests/test-app/Android.mk deleted file mode 100644 index 33d15d2a3387..000000000000 --- a/tests/ActivityManagerPerfTests/test-app/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - ActivityManagerPerfTestsUtils - -LOCAL_MIN_SDK_VERSION := 25 - -LOCAL_PACKAGE_NAME := ActivityManagerPerfTestsTestApp -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) diff --git a/tests/ActivityManagerPerfTests/tests/Android.bp b/tests/ActivityManagerPerfTests/tests/Android.bp new file mode 100644 index 000000000000..2ae2cc49bb7a --- /dev/null +++ b/tests/ActivityManagerPerfTests/tests/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "ActivityManagerPerfTests", + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.rules", + "apct-perftests-utils", + "ActivityManagerPerfTestsUtils", + ], + platform_apis: true, + min_sdk_version: "25", + // For android.permission.FORCE_STOP_PACKAGES permission + certificate: "platform", +} diff --git a/tests/ActivityManagerPerfTests/tests/Android.mk b/tests/ActivityManagerPerfTests/tests/Android.mk deleted file mode 100644 index e1f56b8ba55f..000000000000 --- a/tests/ActivityManagerPerfTests/tests/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules \ - apct-perftests-utils \ - ActivityManagerPerfTestsUtils - -LOCAL_PACKAGE_NAME := ActivityManagerPerfTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_MIN_SDK_VERSION := 25 - -# For android.permission.FORCE_STOP_PACKAGES permission -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) diff --git a/tests/ActivityManagerPerfTests/utils/Android.bp b/tests/ActivityManagerPerfTests/utils/Android.bp new file mode 100644 index 000000000000..300b7ea998fa --- /dev/null +++ b/tests/ActivityManagerPerfTests/utils/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +java_test { + name: "ActivityManagerPerfTestsUtils", + sdk_version: "current", + srcs: [ + "src/**/*.java", + "src/com/android/frameworks/perftests/am/util/ITimeReceiverCallback.aidl", + ], + static_libs: [ + "androidx.test.rules", + "junit", + "ub-uiautomator", + ], +} diff --git a/tests/ActivityManagerPerfTests/utils/Android.mk b/tests/ActivityManagerPerfTests/utils/Android.mk deleted file mode 100644 index 7a7471dd6cd8..000000000000 --- a/tests/ActivityManagerPerfTests/utils/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_SDK_VERSION := current - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - src/com/android/frameworks/perftests/am/util/ITimeReceiverCallback.aidl - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules \ - junit \ - ub-uiautomator - -LOCAL_MODULE := ActivityManagerPerfTestsUtils - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/tests/ActivityViewTest/Android.bp b/tests/ActivityViewTest/Android.bp new file mode 100644 index 000000000000..e7b8c8e1d058 --- /dev/null +++ b/tests/ActivityViewTest/Android.bp @@ -0,0 +1,6 @@ +android_test { + name: "ActivityViewTest", + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", +} diff --git a/tests/ActivityViewTest/Android.mk b/tests/ActivityViewTest/Android.mk deleted file mode 100644 index 9c7ca7eb5d00..000000000000 --- a/tests/ActivityViewTest/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := ActivityViewTest -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_MODULE_TAGS := tests -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) diff --git a/tests/AppLaunch/Android.bp b/tests/AppLaunch/Android.bp new file mode 100644 index 000000000000..f90f26f00e6d --- /dev/null +++ b/tests/AppLaunch/Android.bp @@ -0,0 +1,13 @@ +android_test { + name: "AppLaunch", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", + libs: [ + "android.test.base", + "android.test.runner", + ], + static_libs: ["androidx.test.rules"], + test_suites: ["device-tests"], +} diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk deleted file mode 100644 index f50bca560f83..000000000000 --- a/tests/AppLaunch/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := AppLaunch -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner - -LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules - -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/AppLaunchWear/Android.bp b/tests/AppLaunchWear/Android.bp new file mode 100644 index 000000000000..8d34b6eb9c0f --- /dev/null +++ b/tests/AppLaunchWear/Android.bp @@ -0,0 +1,13 @@ +android_test { + name: "AppLaunchWear", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", + libs: [ + "android.test.base", + "android.test.runner", + ], + static_libs: ["androidx.test.rules"], + test_suites: ["device-tests"], +} diff --git a/tests/AppLaunchWear/Android.mk b/tests/AppLaunchWear/Android.mk deleted file mode 100644 index 332b6808ace8..000000000000 --- a/tests/AppLaunchWear/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := AppLaunchWear -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner - -LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules - -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/BackgroundDexOptServiceIntegrationTests/Android.bp b/tests/BackgroundDexOptServiceIntegrationTests/Android.bp new file mode 100644 index 000000000000..a85d129b013a --- /dev/null +++ b/tests/BackgroundDexOptServiceIntegrationTests/Android.bp @@ -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. +// + +android_test { + name: "BackgroundDexOptServiceIntegrationTests", + srcs: ["src/**/*.java"], + static_libs: ["androidx.test.rules"], + platform_apis: true, + test_suites: ["device-tests"], + certificate: "platform", +} diff --git a/tests/BackgroundDexOptServiceIntegrationTests/Android.mk b/tests/BackgroundDexOptServiceIntegrationTests/Android.mk deleted file mode 100644 index f47cf96446ba..000000000000 --- a/tests/BackgroundDexOptServiceIntegrationTests/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2017 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include all test java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules \ - -LOCAL_PACKAGE_NAME := BackgroundDexOptServiceIntegrationTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) diff --git a/tests/Compatibility/Android.bp b/tests/Compatibility/Android.bp new file mode 100644 index 000000000000..4ca406eba3cf --- /dev/null +++ b/tests/Compatibility/Android.bp @@ -0,0 +1,22 @@ +// Copyright (C) 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 +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "AppCompatibilityTest", + static_libs: ["androidx.test.rules"], + // Include all test java files. + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", +} diff --git a/tests/Compatibility/Android.mk b/tests/Compatibility/Android.mk deleted file mode 100644 index 643f9ebd5f15..000000000000 --- a/tests/Compatibility/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules -# Include all test java files. -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - - -LOCAL_PACKAGE_NAME := AppCompatibilityTest -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_CERTIFICATE := platform -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp new file mode 100644 index 000000000000..05f0a8e7921d --- /dev/null +++ b/tests/FlickerTests/Android.bp @@ -0,0 +1,30 @@ +// +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +android_test { + name: "FlickerTests", + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", + test_suites: ["device-tests"], + libs: ["android.test.runner"], + static_libs: [ + "flickertestapplib", + "flickerlib", + "truth-prebuilt", + "app-helpers-core", + ], +} diff --git a/tests/FlickerTests/Android.mk b/tests/FlickerTests/Android.mk deleted file mode 100644 index 3c70f8bc2d72..000000000000 --- a/tests/FlickerTests/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := FlickerTests -LOCAL_MODULE_TAGS := tests optional -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_CERTIFICATE := platform -LOCAL_COMPATIBILITY_SUITE := device-tests - -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := \ - flickertestapplib \ - flickerlib \ - truth-prebuilt \ - app-helpers-core - -include $(BUILD_PACKAGE) -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file diff --git a/tests/FlickerTests/lib/Android.bp b/tests/FlickerTests/lib/Android.bp new file mode 100644 index 000000000000..982fcbadddf7 --- /dev/null +++ b/tests/FlickerTests/lib/Android.bp @@ -0,0 +1,44 @@ +// +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +java_test { + name: "flickerlib", + platform_apis: true, + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.janktesthelper", + "cts-amwm-util", + "platformprotosnano", + "layersprotosnano", + "truth-prebuilt", + "sysui-helper", + "launcher-helper-lib", + ], +} + +java_library { + name: "flickerautomationhelperlib", + sdk_version: "test_current", + srcs: [ + "src/com/android/server/wm/flicker/AutomationUtils.java", + "src/com/android/server/wm/flicker/WindowUtils.java", + ], + static_libs: [ + "sysui-helper", + "launcher-helper-lib", + "compatibility-device-util-axt", + ], +} diff --git a/tests/FlickerTests/lib/Android.mk b/tests/FlickerTests/lib/Android.mk deleted file mode 100644 index e438822a6f32..000000000000 --- a/tests/FlickerTests/lib/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := flickerlib -LOCAL_MODULE_TAGS := tests optional -# sign this with platform cert, so this test is allowed to call private platform apis -LOCAL_CERTIFICATE := platform -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.janktesthelper \ - cts-amwm-util \ - platformprotosnano \ - layersprotosnano \ - truth-prebuilt \ - sysui-helper \ - launcher-helper-lib \ - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := flickerautomationhelperlib -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := src/com/android/server/wm/flicker/AutomationUtils.java \ - src/com/android/server/wm/flicker/WindowUtils.java -LOCAL_STATIC_JAVA_LIBRARIES := sysui-helper \ - launcher-helper-lib \ - compatibility-device-util-axt - -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/FlickerTests/lib/test/Android.bp b/tests/FlickerTests/lib/test/Android.bp new file mode 100644 index 000000000000..bfeb75b23469 --- /dev/null +++ b/tests/FlickerTests/lib/test/Android.bp @@ -0,0 +1,33 @@ +// +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +android_test { + name: "FlickerLibTest", + // sign this with platform cert, so this test is allowed to call private platform apis + certificate: "platform", + platform_apis: true, + test_suites: ["tests"], + srcs: ["src/**/*.java"], + libs: ["android.test.runner"], + static_libs: [ + "androidx.test.rules", + "platform-test-annotations", + "truth-prebuilt", + "platformprotosnano", + "layersprotosnano", + "flickerlib", + ], +} diff --git a/tests/FlickerTests/lib/test/Android.mk b/tests/FlickerTests/lib/test/Android.mk deleted file mode 100644 index 5be89ba624e6..000000000000 --- a/tests/FlickerTests/lib/test/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_PACKAGE_NAME := FlickerLibTest -LOCAL_MODULE_TAGS := tests optional -# sign this with platform cert, so this test is allowed to call private platform apis -LOCAL_CERTIFICATE := platform -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := tests -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules \ - platform-test-annotations \ - truth-prebuilt \ - platformprotosnano \ - layersprotosnano \ - flickerlib - -include $(BUILD_PACKAGE) -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file diff --git a/tests/FlickerTests/test-apps/Android.bp b/tests/FlickerTests/test-apps/Android.bp new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/tests/FlickerTests/test-apps/Android.bp diff --git a/tests/FlickerTests/test-apps/Android.mk b/tests/FlickerTests/test-apps/Android.mk deleted file mode 100644 index 9af9f444ca59..000000000000 --- a/tests/FlickerTests/test-apps/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include $(call all-subdir-makefiles) diff --git a/tests/FlickerTests/test-apps/flickerapp/Android.bp b/tests/FlickerTests/test-apps/flickerapp/Android.bp new file mode 100644 index 000000000000..0bea209a757a --- /dev/null +++ b/tests/FlickerTests/test-apps/flickerapp/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "FlickerTestApp", + srcs: ["**/*.java"], + sdk_version: "current", + test_suites: ["device-tests"], +} + +java_test { + name: "flickertestapplib", + sdk_version: "current", + srcs: ["src/com/android/server/wm/flicker/testapp/ActivityOptions.java"], +} diff --git a/tests/FlickerTests/test-apps/flickerapp/Android.mk b/tests/FlickerTests/test-apps/flickerapp/Android.mk deleted file mode 100644 index b916900a7504..000000000000 --- a/tests/FlickerTests/test-apps/flickerapp/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -LOCAL_PACKAGE_NAME := FlickerTestApp -LOCAL_MODULE_TAGS := tests optional -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_SDK_VERSION := current -LOCAL_COMPATIBILITY_SUITE := device-tests -include $(BUILD_PACKAGE) - -include $(CLEAR_VARS) -LOCAL_MODULE := flickertestapplib -LOCAL_MODULE_TAGS := tests optional -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := src/com/android/server/wm/flicker/testapp/ActivityOptions.java -include $(BUILD_STATIC_JAVA_LIBRARY) - -include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file diff --git a/tests/Internal/Android.bp b/tests/Internal/Android.bp new file mode 100644 index 000000000000..4cb9f8d5e1e6 --- /dev/null +++ b/tests/Internal/Android.bp @@ -0,0 +1,18 @@ +android_test { + name: "InternalTests", + proto: { + type: "nano", + }, + // Include some source files directly to be able to access package members + srcs: ["src/**/*.java"], + libs: ["android.test.runner"], + static_libs: [ + "junit", + "androidx.test.rules", + "mockito-target-minus-junit4", + ], + java_resource_dirs: ["res"], + certificate: "platform", + platform_apis: true, + test_suites: ["device-tests"], +} diff --git a/tests/Internal/Android.mk b/tests/Internal/Android.mk deleted file mode 100644 index 2e26ef103794..000000000000 --- a/tests/Internal/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_USE_AAPT2 := true -LOCAL_MODULE_TAGS := tests - -LOCAL_PROTOC_OPTIMIZE_TYPE := nano - -# Include some source files directly to be able to access package members -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit \ - androidx.test.rules \ - mockito-target-minus-junit4 - -LOCAL_JAVA_RESOURCE_DIRS := res -LOCAL_CERTIFICATE := platform - -LOCAL_PACKAGE_NAME := InternalTests -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) diff --git a/tests/PackageWatchdog/Android.bp b/tests/PackageWatchdog/Android.bp new file mode 100644 index 000000000000..b07996568839 --- /dev/null +++ b/tests/PackageWatchdog/Android.bp @@ -0,0 +1,28 @@ +// Copyright (C) 2019 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. + +// PackageWatchdogTest +android_test { + name: "PackageWatchdogTest", + srcs: ["src/**/*.java"], + static_libs: [ + "junit", + "frameworks-base-testutils", + "androidx.test.rules", + "services.core", + ], + libs: ["android.test.runner"], + platform_apis: true, + test_suites: ["device-tests"], +} diff --git a/tests/PackageWatchdog/Android.mk b/tests/PackageWatchdog/Android.mk deleted file mode 100644 index 1e4aacce1613..000000000000 --- a/tests/PackageWatchdog/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2019 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -# PackageWatchdogTest -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := PackageWatchdogTest -LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := \ - junit \ - frameworks-base-testutils \ - androidx.test.rules \ - services.core - -LOCAL_JAVA_LIBRARIES := \ - android.test.runner - -LOCAL_PRIVATE_PLATFORM_APIS := true -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) diff --git a/tests/RcsTests/Android.bp b/tests/RcsTests/Android.bp new file mode 100644 index 000000000000..8ee496066bb3 --- /dev/null +++ b/tests/RcsTests/Android.bp @@ -0,0 +1,17 @@ +android_test { + name: "RcsTests", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", + libs: [ + "android.test.runner", + "android.test.base", + ], + static_libs: [ + "junit", + "androidx.test.rules", + "mockito-target-minus-junit4", + "truth-prebuilt", + ], +} diff --git a/tests/RcsTests/Android.mk b/tests/RcsTests/Android.mk deleted file mode 100644 index a276584530f4..000000000000 --- a/tests/RcsTests/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := RcsTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base -LOCAL_STATIC_JAVA_LIBRARIES := junit androidx.test.rules mockito-target-minus-junit4 truth-prebuilt - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/ServiceCrashTest/Android.bp b/tests/ServiceCrashTest/Android.bp new file mode 100644 index 000000000000..40a377de852f --- /dev/null +++ b/tests/ServiceCrashTest/Android.bp @@ -0,0 +1,12 @@ +android_test { + name: "ServiceCrashTest", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + platform_apis: true, + certificate: "platform", + libs: ["android.test.base"], + static_libs: [ + "compatibility-device-util-axt", + "androidx.test.rules", + ], +} diff --git a/tests/ServiceCrashTest/Android.mk b/tests/ServiceCrashTest/Android.mk deleted file mode 100644 index 617ee7caf139..000000000000 --- a/tests/ServiceCrashTest/Android.mk +++ /dev/null @@ -1,20 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := ServiceCrashTest -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.base - -LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util-axt androidx.test.rules - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/SurfaceComposition/Android.bp b/tests/SurfaceComposition/Android.bp new file mode 100644 index 000000000000..53e4d52b2efd --- /dev/null +++ b/tests/SurfaceComposition/Android.bp @@ -0,0 +1,32 @@ +// Copyright (C) 2015 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "SurfaceComposition", + // Don't include this package in any target + // When built, explicitly put it in the data partition. + dex_preopt: { + enabled: false, + }, + optimize: { + enabled: false, + }, + srcs: ["src/**/*.java"], + static_libs: ["junit"], + libs: [ + "android.test.runner.stubs", + "android.test.base.stubs", + ], + sdk_version: "current", +} diff --git a/tests/SurfaceComposition/Android.mk b/tests/SurfaceComposition/Android.mk deleted file mode 100644 index f59458d48c68..000000000000 --- a/tests/SurfaceComposition/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -# Don't include this package in any target -LOCAL_MODULE_TAGS := tests -# When built, explicitly put it in the data partition. -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - -LOCAL_DEX_PREOPT := false - -LOCAL_PROGUARD_ENABLED := disabled - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := junit - -LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs - -LOCAL_PACKAGE_NAME := SurfaceComposition - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) diff --git a/tests/SystemMemoryTest/Android.mk b/tests/SystemMemoryTest/Android.mk deleted file mode 100644 index 09a1618c6ad1..000000000000 --- a/tests/SystemMemoryTest/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -include $(call all-subdir-makefiles) diff --git a/tests/SystemMemoryTest/device/Android.bp b/tests/SystemMemoryTest/device/Android.bp new file mode 100644 index 000000000000..2bf0fec0fd1f --- /dev/null +++ b/tests/SystemMemoryTest/device/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test_helper_app { + name: "SystemMemoryTestDevice", + sdk_version: "current", + srcs: ["src/**/*.java"], + test_suites: ["general-tests"], +} diff --git a/tests/SystemMemoryTest/device/Android.mk b/tests/SystemMemoryTest/device/Android.mk deleted file mode 100644 index 75408df4b295..000000000000 --- a/tests/SystemMemoryTest/device/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) -LOCAL_PACKAGE_NAME := SystemMemoryTestDevice -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_COMPATIBILITY_SUITE := general-tests -include $(BUILD_PACKAGE) diff --git a/tests/SystemMemoryTest/host/Android.bp b/tests/SystemMemoryTest/host/Android.bp new file mode 100644 index 000000000000..3bb5489dab6c --- /dev/null +++ b/tests/SystemMemoryTest/host/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +java_test_host { + name: "system-memory-test", + srcs: ["src/**/*.java"], + libs: ["tradefed"], + test_suites: ["general-tests"], +} diff --git a/tests/SystemMemoryTest/host/Android.mk b/tests/SystemMemoryTest/host/Android.mk deleted file mode 100644 index a516e38adfec..000000000000 --- a/tests/SystemMemoryTest/host/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := system-memory-test -LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := tradefed -LOCAL_COMPATIBILITY_SUITE := general-tests -include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/tests/UsageReportingTest/Android.bp b/tests/UsageReportingTest/Android.bp new file mode 100644 index 000000000000..0bac5a224b26 --- /dev/null +++ b/tests/UsageReportingTest/Android.bp @@ -0,0 +1,8 @@ +android_test { + name: "UsageReportingTest", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + static_libs: ["androidx.legacy_legacy-support-v4"], + certificate: "platform", + platform_apis: true, +} diff --git a/tests/UsageReportingTest/Android.mk b/tests/UsageReportingTest/Android.mk deleted file mode 100644 index afb6e16b1fdf..000000000000 --- a/tests/UsageReportingTest/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -# Only compile source java files in this apk. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_USE_AAPT2 := true -LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4 - -LOCAL_CERTIFICATE := platform - -LOCAL_PACKAGE_NAME := UsageReportingTest -LOCAL_PRIVATE_PLATFORM_APIS := true - -include $(BUILD_PACKAGE) diff --git a/tests/UsageStatsPerfTests/Android.bp b/tests/UsageStatsPerfTests/Android.bp new file mode 100644 index 000000000000..3991fb8366ac --- /dev/null +++ b/tests/UsageStatsPerfTests/Android.bp @@ -0,0 +1,26 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "UsageStatsPerfTests", + srcs: ["src/**/*.java"], + static_libs: [ + "androidx.test.rules", + "apct-perftests-utils", + "services.usage", + ], + platform_apis: true, + // For android.permission.FORCE_STOP_PACKAGES permission + certificate: "platform", +} diff --git a/tests/UsageStatsPerfTests/Android.mk b/tests/UsageStatsPerfTests/Android.mk deleted file mode 100644 index 4304fb0d8e9e..000000000000 --- a/tests/UsageStatsPerfTests/Android.mk +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - androidx.test.rules \ - apct-perftests-utils \ - services.usage - -LOCAL_PACKAGE_NAME := UsageStatsPerfTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -# For android.permission.FORCE_STOP_PACKAGES permission -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) diff --git a/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp b/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp new file mode 100644 index 000000000000..c7e9df0fe9cf --- /dev/null +++ b/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +//################################################# + +android_test { + name: "AoapTestDeviceApp", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + platform_apis: true, + optimize: { + enabled: false, + }, +} diff --git a/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk b/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk deleted file mode 100644 index cd7aaedf2bb1..000000000000 --- a/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -LOCAL_PATH:= $(call my-dir) - -################################################## - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_PACKAGE_NAME := AoapTestDeviceApp -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - diff --git a/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp b/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp new file mode 100644 index 000000000000..6fa58cb5c682 --- /dev/null +++ b/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.bp @@ -0,0 +1,27 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +//################################################# + +android_test { + name: "AoapTestHostApp", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + platform_apis: true, + optimize: { + enabled: false, + }, +} diff --git a/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk b/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk deleted file mode 100644 index bd8a51b69bff..000000000000 --- a/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -LOCAL_PATH:= $(call my-dir) - -################################################## - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_PACKAGE_NAME := AoapTestHostApp -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - diff --git a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp new file mode 100644 index 000000000000..edd4205968b3 --- /dev/null +++ b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.bp @@ -0,0 +1,32 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// + +//################################################# + +// TODO: should this be android_helper_test_app? +android_app { + name: "UsbHostExternalManagementTestApp", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + platform_apis: true, + privileged: true, + // TODO remove tests tag + //LOCAL_MODULE_TAGS := tests + //LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) + optimize: { + enabled: false, + }, +} diff --git a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk deleted file mode 100644 index fed454eb9d01..000000000000 --- a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# - -LOCAL_PATH:= $(call my-dir) - -################################################## - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - -LOCAL_PACKAGE_NAME := UsbHostExternalManagementTestApp -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_PRIVILEGED_MODULE := true -# TODO remove tests tag -#LOCAL_MODULE_TAGS := tests -#LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - -LOCAL_PROGUARD_ENABLED := disabled - -include $(BUILD_PACKAGE) - diff --git a/tests/UsbTests/Android.bp b/tests/UsbTests/Android.bp new file mode 100644 index 000000000000..1b2cf638f514 --- /dev/null +++ b/tests/UsbTests/Android.bp @@ -0,0 +1,34 @@ +// +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +android_test { + name: "UsbTests", + srcs: ["**/*.java"], + static_libs: [ + "frameworks-base-testutils", + "androidx.test.rules", + "mockito-target-inline-minus-junit4", + "platform-test-annotations", + "services.core", + "services.net", + "services.usb", + "truth-prebuilt", + ], + jni_libs: ["libdexmakerjvmtiagent"], + certificate: "platform", + platform_apis: true, + test_suites: ["device-tests"], +} diff --git a/tests/UsbTests/Android.mk b/tests/UsbTests/Android.mk deleted file mode 100644 index aef993b9d348..000000000000 --- a/tests/UsbTests/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_SRC_FILES := $(call all-subdir-java-files) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - frameworks-base-testutils \ - androidx.test.rules \ - mockito-target-inline-minus-junit4 \ - platform-test-annotations \ - services.core \ - services.net \ - services.usb \ - truth-prebuilt \ - -LOCAL_JNI_SHARED_LIBRARIES := \ - libdexmakerjvmtiagent \ - -LOCAL_CERTIFICATE := platform - -LOCAL_PACKAGE_NAME := UsbTests -LOCAL_PRIVATE_PLATFORM_APIS := true - -LOCAL_COMPATIBILITY_SUITE := device-tests - -include $(BUILD_PACKAGE) diff --git a/tests/WindowAnimationJank/Android.bp b/tests/WindowAnimationJank/Android.bp new file mode 100644 index 000000000000..50b2297386cc --- /dev/null +++ b/tests/WindowAnimationJank/Android.bp @@ -0,0 +1,25 @@ +// Copyright (C) 2015 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +android_test { + name: "WindowAnimationJank", + srcs: ["src/**/*.java"], + static_libs: [ + "ub-uiautomator", + "androidx.test.janktesthelper", + "junit", + ], + libs: ["android.test.base.stubs"], + sdk_version: "current", +} diff --git a/tests/WindowAnimationJank/Android.mk b/tests/WindowAnimationJank/Android.mk deleted file mode 100644 index 1c2d16787e88..000000000000 --- a/tests/WindowAnimationJank/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2015 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests - -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := WindowAnimationJank - -LOCAL_STATIC_JAVA_LIBRARIES := \ - ub-uiautomator \ - androidx.test.janktesthelper \ - junit - -LOCAL_JAVA_LIBRARIES := android.test.base.stubs - -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 379819d417a1..476330052dcf 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -1171,39 +1171,49 @@ public class WifiConfiguration implements Parcelable { * This network is disabled because EAP-TLS failure */ public static final int DISABLED_TLS_VERSION_MISMATCH = 8; + /** + * This network is disabled due to WifiManager.disconnect() call. + */ + public static final int DISABLED_BY_WIFI_MANAGER_DISCONNECT = 9; + // Values above are for temporary disablement; values below are for permanent disablement. /** + * The starting index for permanent network selection disabled reasons + */ + public static final int NETWORK_SELECTION_DISABLED_PERMANENT_STARTING_INDEX = 10; + /** * This network is disabled due to absence of user credentials */ - public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 9; + public static final int DISABLED_AUTHENTICATION_NO_CREDENTIALS = 10; /** * This network is permanently disabled because it has no Internet access and user does not * want to stay connected. */ - public static final int DISABLED_NO_INTERNET_PERMANENT = 10; + public static final int DISABLED_NO_INTERNET_PERMANENT = 11; /** - * This network is disabled due to WifiManager disable it explicitly + * This network is disabled due to WifiManager.disable() call. */ - public static final int DISABLED_BY_WIFI_MANAGER = 11; + public static final int DISABLED_BY_WIFI_MANAGER = 12; /** * This network is disabled due to user switching */ - public static final int DISABLED_DUE_TO_USER_SWITCH = 12; + public static final int DISABLED_DUE_TO_USER_SWITCH = 13; /** * This network is disabled due to wrong password */ - public static final int DISABLED_BY_WRONG_PASSWORD = 13; + public static final int DISABLED_BY_WRONG_PASSWORD = 14; /** * This network is disabled because service is not subscribed */ - public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 14; + public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 15; /** * This Maximum disable reason value */ - public static final int NETWORK_SELECTION_DISABLED_MAX = 15; + public static final int NETWORK_SELECTION_DISABLED_MAX = 16; /** - * Quality network selection disable reason String (for debug purpose) + * Quality network selection disable reason String (for debug purposes & configuration + * storage) */ public static final String[] QUALITY_NETWORK_SELECTION_DISABLE_REASON = { "NETWORK_SELECTION_ENABLE", @@ -1215,6 +1225,7 @@ public class WifiConfiguration implements Parcelable { "NETWORK_SELECTION_DISABLED_NO_INTERNET_TEMPORARY", "NETWORK_SELECTION_DISABLED_WPS_START", "NETWORK_SELECTION_DISABLED_TLS_VERSION", + "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER_DISCONNECT", "NETWORK_SELECTION_DISABLED_AUTHENTICATION_NO_CREDENTIALS", "NETWORK_SELECTION_DISABLED_NO_INTERNET_PERMANENT", "NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER", diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 869f665048a3..d38b2f49048b 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -948,7 +948,8 @@ public class WifiManager { /** * Directed broadcast intent action indicating that the device has connected to one of the * network suggestions provided by the app. This will be sent post connection to a network - * which was created with {@link WifiNetworkSuggestion.Builder#setIsAppInteractionRequired()} + * which was created with {@link WifiNetworkSuggestion.Builder#setIsAppInteractionRequired( + * boolean)} * flag set. * <p> * Note: The broadcast is sent to the app only if it holds @@ -1001,8 +1002,9 @@ public class WifiManager { /** * In this Wi-Fi lock mode, Wi-Fi will not go to power save. * This results in operating with low packet latency. - * The lock is active even when the device screen is off or - * the acquiring application is running in the background. + * The lock is only active when the device is connected to an access point. + * The lock is active even when the device screen is off or the acquiring application is + * running in the background. * This mode will consume more power and hence should be used only * when there is a need for this tradeoff. * <p> @@ -1020,6 +1022,7 @@ public class WifiManager { * In this Wi-Fi lock mode, Wi-Fi will operate with a priority to achieve low latency. * {@link #WIFI_MODE_FULL_LOW_LATENCY} lock has the following limitations: * <ol> + * <li>The lock is only active when the device is connected to an access point.</li> * <li>The lock is only active when the screen is on.</li> * <li>The lock is only active when the acquiring app is running in the foreground.</li> * </ol> diff --git a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java index 8b56b3f24593..6c2d7ff882d3 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSpecifier.java +++ b/wifi/java/android/net/wifi/WifiNetworkSpecifier.java @@ -183,10 +183,12 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc /** * Specifies whether this represents an Enhanced Open (OWE) network. * + * @param isEnhancedOpen {@code true} to indicate that the network uses enhanced open, + * {@code false} otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsEnhancedOpen() { - mIsEnhancedOpen = true; + public @NonNull Builder setIsEnhancedOpen(boolean isEnhancedOpen) { + mIsEnhancedOpen = isEnhancedOpen; return this; } @@ -261,10 +263,12 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc * hidden networks need to be explicitly probed for.</li> * <li>If not set, defaults to false (i.e not a hidden network).</li> * + * @param isHiddenSsid {@code true} to indicate that the network is hidden, {@code false} + * otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsHiddenSsid() { - mIsHiddenSSID = true; + public @NonNull Builder setIsHiddenSsid(boolean isHiddenSsid) { + mIsHiddenSSID = isHiddenSsid; return this; } diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index 3742b83d5836..32a7a477466d 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -18,6 +18,7 @@ package android.net.wifi; import static com.android.internal.util.Preconditions.checkNotNull; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityThread; @@ -159,10 +160,12 @@ public final class WifiNetworkSuggestion implements Parcelable { /** * Specifies whether this represents an Enhanced Open (OWE) network. * + * @param isEnhancedOpen {@code true} to indicate that the network used enhanced open, + * {@code false} otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsEnhancedOpen() { - mIsEnhancedOpen = true; + public @NonNull Builder setIsEnhancedOpen(boolean isEnhancedOpen) { + mIsEnhancedOpen = isEnhancedOpen; return this; } @@ -235,10 +238,12 @@ public final class WifiNetworkSuggestion implements Parcelable { * <p> * <li>If not set, defaults to false (i.e not a hidden network).</li> * + * @param isHiddenSsid {@code true} to indicate that the network is hidden, {@code false} + * otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsHiddenSsid() { - mIsHiddenSSID = true; + public @NonNull Builder setIsHiddenSsid(boolean isHiddenSsid) { + mIsHiddenSSID = isHiddenSsid; return this; } @@ -253,10 +258,12 @@ public final class WifiNetworkSuggestion implements Parcelable { * <p> * <li>If not set, defaults to false (i.e no app interaction required).</li> * + * @param isAppInteractionRequired {@code true} to indicate that app interaction is + * required, {@code false} otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsAppInteractionRequired() { - mIsAppInteractionRequired = true; + public @NonNull Builder setIsAppInteractionRequired(boolean isAppInteractionRequired) { + mIsAppInteractionRequired = isAppInteractionRequired; return this; } @@ -265,10 +272,12 @@ public final class WifiNetworkSuggestion implements Parcelable { * <p> * <li>If not set, defaults to false (i.e no user interaction required).</li> * + * @param isUserInteractionRequired {@code true} to indicate that user interaction is + * required, {@code false} otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsUserInteractionRequired() { - mIsUserInteractionRequired = true; + public @NonNull Builder setIsUserInteractionRequired(boolean isUserInteractionRequired) { + mIsUserInteractionRequired = isUserInteractionRequired; return this; } @@ -283,7 +292,7 @@ public final class WifiNetworkSuggestion implements Parcelable { * @return Instance of {@link Builder} to enable chaining of the builder method. * @throws IllegalArgumentException if the priority value is negative. */ - public @NonNull Builder setPriority(int priority) { + public @NonNull Builder setPriority(@IntRange(from = 0) int priority) { if (priority < 0) { throw new IllegalArgumentException("Invalid priority value " + priority); } @@ -296,10 +305,12 @@ public final class WifiNetworkSuggestion implements Parcelable { * <p> * <li>If not set, defaults to false (i.e not metered).</li> * + * @param isMetered {@code true} to indicate that the network is metered, {@code false} + * otherwise. * @return Instance of {@link Builder} to enable chaining of the builder method. */ - public @NonNull Builder setIsMetered() { - mIsMetered = true; + public @NonNull Builder setIsMetered(boolean isMetered) { + mIsMetered = isMetered; return this; } diff --git a/wifi/tests/runtests.sh b/wifi/tests/runtests.sh index 2caf8a59b9fb..1e0ec37c52e2 100755 --- a/wifi/tests/runtests.sh +++ b/wifi/tests/runtests.sh @@ -19,7 +19,7 @@ set -x # print commands adb root adb wait-for-device -adb install -r -g "$OUT/data/app/FrameworksWifiApiTests/FrameworksWifiApiTests.apk" +adb install -r -g "$OUT/testcases/FrameworksWifiApiTests/arm64/FrameworksWifiApiTests.apk" adb shell am instrument --no-hidden-api-checks -w "$@" \ 'android.net.wifi.test/androidx.test.runner.AndroidJUnitRunner' diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java index feac0e598127..edb43d8bdf52 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSpecifierTest.java @@ -114,7 +114,7 @@ public class WifiNetworkSpecifierTest { .setSsid(TEST_SSID) .setBssid(MacAddress.fromString(TEST_BSSID)) .setWpa2EnterpriseConfig(enterpriseConfig) - .setIsHiddenSsid() + .setIsHiddenSsid(true) .build(); assertTrue(specifier instanceof WifiNetworkSpecifier); @@ -278,7 +278,7 @@ public class WifiNetworkSpecifierTest { new WifiNetworkSpecifier.Builder() .setBssidPattern(MacAddress.fromString(TEST_BSSID_OUI_BASE_ADDRESS), MacAddress.fromString(TEST_BSSID_OUI_MASK)) - .setIsHiddenSsid() + .setIsHiddenSsid(true) .build(); } @@ -305,7 +305,7 @@ public class WifiNetworkSpecifierTest { public void testWifiNetworkSpecifierBuilderWithSsidMatchPatternForHiddenNetwork() { new WifiNetworkSpecifier.Builder() .setSsidPattern(new PatternMatcher(TEST_SSID, PATTERN_PREFIX)) - .setIsHiddenSsid() + .setIsHiddenSsid(true) .build(); } @@ -341,14 +341,14 @@ public class WifiNetworkSpecifierTest { /** * Ensure {@link WifiNetworkSpecifier.Builder#build()} throws an exception * when both {@link WifiNetworkSpecifier.Builder#setWpa3Passphrase(String)} and - * {@link WifiNetworkSpecifier.Builder#setIsEnhancedOpen()} are invoked. + * {@link WifiNetworkSpecifier.Builder#setIsEnhancedOpen(boolean)} are invoked. */ @Test(expected = IllegalStateException.class) public void testWifiNetworkSpecifierBuilderWithBothWpa3PasphraseAndEnhancedOpen() { new WifiNetworkSpecifier.Builder() .setSsidPattern(new PatternMatcher(TEST_SSID, PATTERN_LITERAL)) .setWpa3Passphrase(TEST_PRESHARED_KEY) - .setIsEnhancedOpen() + .setIsEnhancedOpen(true) .build(); } diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java index 05ee22c90464..2b0c7732e7ae 100644 --- a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java +++ b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java @@ -49,7 +49,7 @@ public class WifiNetworkSuggestionTest { public void testWifiNetworkSuggestionBuilderForOpenNetworkWithReqAppInteraction() { WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) - .setIsAppInteractionRequired() + .setIsAppInteractionRequired(true) .build(); assertEquals(Process.myUid(), suggestion.suggestorUid); @@ -74,7 +74,7 @@ public class WifiNetworkSuggestionTest { WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) .setWpa2Passphrase(TEST_PRESHARED_KEY) - .setIsAppInteractionRequired() + .setIsAppInteractionRequired(true) .setPriority(0) .build(); @@ -101,8 +101,8 @@ public class WifiNetworkSuggestionTest { WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) .setWpa2Passphrase(TEST_PRESHARED_KEY) - .setIsUserInteractionRequired() - .setIsMetered() + .setIsUserInteractionRequired(true) + .setIsMetered(true) .build(); assertEquals("\"" + TEST_SSID + "\"", suggestion.wifiConfiguration.SSID); @@ -126,7 +126,7 @@ public class WifiNetworkSuggestionTest { WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) .setBssid(MacAddress.fromString(TEST_BSSID)) - .setIsEnhancedOpen() + .setIsEnhancedOpen(true) .build(); assertEquals("\"" + TEST_SSID + "\"", suggestion.wifiConfiguration.SSID); @@ -265,7 +265,7 @@ public class WifiNetworkSuggestionTest { public void testWifiNetworkSuggestionBuilderWithInvalidPriority() { new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) - .setPriority(-1) + .setPriority(-2) .build(); } @@ -301,14 +301,14 @@ public class WifiNetworkSuggestionTest { /** * Ensure {@link WifiNetworkSuggestion.Builder#build()} throws an exception * when both {@link WifiNetworkSuggestion.Builder#setWpa3Passphrase(String)} and - * {@link WifiNetworkSuggestion.Builder#setIsEnhancedOpen()} are invoked. + * {@link WifiNetworkSuggestion.Builder#setIsEnhancedOpen(boolean)} are invoked. */ @Test(expected = IllegalStateException.class) public void testWifiNetworkSuggestionBuilderWithBothWpa3PasphraseAndEnhancedOpen() { new WifiNetworkSuggestion.Builder() .setSsid(TEST_SSID) .setWpa3Passphrase(TEST_PRESHARED_KEY) - .setIsEnhancedOpen() + .setIsEnhancedOpen(true) .build(); } |