diff options
234 files changed, 6555 insertions, 2520 deletions
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp index 231c91026bb6..43e762d04342 100644 --- a/apex/statsd/framework/Android.bp +++ b/apex/statsd/framework/Android.bp @@ -30,6 +30,7 @@ java_library { ], permitted_packages: [ "android.app", + "android.os", "android.util", ], libs: [ @@ -43,6 +44,7 @@ java_library { "//frameworks/base/apex/statsd:__subpackages__", //TODO(b/146167933) remove this when framework is built with framework-statsd-stubs "//frameworks/base", + "//frameworks/opt/net/wifi/service", ], apex_available: [ "com.android.os.statsd", diff --git a/core/java/android/os/StatsDimensionsValue.java b/apex/statsd/framework/java/android/os/StatsDimensionsValue.java index da13ea13d5fa..886130fc5f14 100644 --- a/core/java/android/os/StatsDimensionsValue.java +++ b/apex/statsd/framework/java/android/os/StatsDimensionsValue.java @@ -264,7 +264,8 @@ public final class StatsDimensionsValue implements Parcelable { /** * Parcelable Creator for StatsDimensionsValue. */ - public static final @android.annotation.NonNull Parcelable.Creator<StatsDimensionsValue> CREATOR = new + public static final @android.annotation.NonNull + Parcelable.Creator<StatsDimensionsValue> CREATOR = new Parcelable.Creator<StatsDimensionsValue>() { public StatsDimensionsValue createFromParcel(Parcel in) { return new StatsDimensionsValue(in); diff --git a/api/current.txt b/api/current.txt index 2416493fac9d..515df6d8b654 100644 --- a/api/current.txt +++ b/api/current.txt @@ -39565,7 +39565,7 @@ package android.provider { protected static interface ContactsContract.RawContactsColumns { field public static final String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set"; field public static final String AGGREGATION_MODE = "aggregation_mode"; - field @Deprecated public static final String BACKUP_ID = "backup_id"; + field public static final String BACKUP_ID = "backup_id"; field public static final String CONTACT_ID = "contact_id"; field public static final String DATA_SET = "data_set"; field public static final String DELETED = "deleted"; @@ -47296,6 +47296,7 @@ package android.telephony { public final class PreciseDataConnectionState implements android.os.Parcelable { method public int describeContents(); + method @Nullable public android.telephony.data.ApnSetting getApnSetting(); method public int getLastCauseCode(); method @Nullable public android.net.LinkProperties getLinkProperties(); method public int getNetworkType(); diff --git a/api/system-current.txt b/api/system-current.txt index aade42b78696..89811ada123a 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2304,6 +2304,7 @@ package android.content.pm { field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000 field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000 field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000 + field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000 field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000 field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000 field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000 @@ -2453,8 +2454,8 @@ package android.hardware { package android.hardware.biometrics { public static interface BiometricManager.Authenticators { - field public static final int BIOMETRIC_CONVENIENCE = 4095; // 0xfff - field public static final int EMPTY_SET = 0; // 0x0 + field @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static final int BIOMETRIC_CONVENIENCE = 4095; // 0xfff + field @RequiresPermission(android.Manifest.permission.WRITE_DEVICE_CONFIG) public static final int EMPTY_SET = 0; // 0x0 } } @@ -5378,7 +5379,7 @@ package android.media.tv.tuner.frontend { public static class Atsc3FrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder> { method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings build(); method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setBandwidth(int); - method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setDemodOutputFormat(byte); + method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setDemodOutputFormat(int); method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setPlpSettings(@NonNull android.media.tv.tuner.frontend.Atsc3PlpSettings[]); } @@ -5432,7 +5433,7 @@ package android.media.tv.tuner.frontend { public class DvbcFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings { method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder builder(@NonNull android.content.Context); - method public byte getAnnex(); + method public int getAnnex(); method public long getFec(); method public int getModulation(); method public int getOuterFec(); @@ -5460,7 +5461,7 @@ package android.media.tv.tuner.frontend { public static class DvbcFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder> { method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings build(); - method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(byte); + method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(int); method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setFec(long); method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setModulation(int); method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setOuterFec(int); @@ -7510,20 +7511,16 @@ package android.net.wifi { @Deprecated public class WifiConfiguration implements android.os.Parcelable { method @Deprecated public int getAuthType(); - method @Deprecated @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment(); method @Deprecated @NonNull public android.net.IpConfiguration getIpConfiguration(); method @Deprecated @NonNull public android.net.wifi.WifiConfiguration.NetworkSelectionStatus getNetworkSelectionStatus(); method @Deprecated @NonNull public String getPrintableSsid(); - method @Deprecated @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings(); method @Deprecated public int getRecentFailureReason(); - method @Deprecated @Nullable public android.net.StaticIpConfiguration getStaticIpConfiguration(); method @Deprecated public boolean hasNoInternetAccess(); method @Deprecated public boolean isEphemeral(); method @Deprecated public static boolean isMetered(@Nullable android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiInfo); method @Deprecated public boolean isNoInternetAccessExpected(); method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration); method @Deprecated public void setNetworkSelectionStatus(@NonNull android.net.wifi.WifiConfiguration.NetworkSelectionStatus); - method @Deprecated public void setProxy(@NonNull android.net.IpConfiguration.ProxySettings, @NonNull android.net.ProxyInfo); field @Deprecated public static final int AP_BAND_2GHZ = 0; // 0x0 field @Deprecated public static final int AP_BAND_5GHZ = 1; // 0x1 field @Deprecated public static final int AP_BAND_ANY = -1; // 0xffffffff @@ -7565,11 +7562,11 @@ package android.net.wifi { @Deprecated public static class WifiConfiguration.NetworkSelectionStatus { method @Deprecated public int getDisableReasonCounter(int); method @Deprecated public long getDisableTime(); - method @Deprecated public boolean getHasEverConnected(); method @Deprecated @Nullable public static String getNetworkDisableReasonString(int); method @Deprecated public int getNetworkSelectionDisableReason(); method @Deprecated public int getNetworkSelectionStatus(); method @Deprecated @NonNull public String getNetworkStatusString(); + method @Deprecated public boolean hasEverConnected(); method @Deprecated public boolean isNetworkEnabled(); method @Deprecated public boolean isNetworkPermanentlyDisabled(); field @Deprecated public static final int DISABLED_ASSOCIATION_REJECTION = 1; // 0x1 @@ -7579,10 +7576,10 @@ package android.net.wifi { field @Deprecated public static final int DISABLED_BY_WIFI_MANAGER = 7; // 0x7 field @Deprecated public static final int DISABLED_BY_WRONG_PASSWORD = 8; // 0x8 field @Deprecated public static final int DISABLED_DHCP_FAILURE = 3; // 0x3 + field @Deprecated public static final int DISABLED_NONE = 0; // 0x0 field @Deprecated public static final int DISABLED_NO_INTERNET_PERMANENT = 6; // 0x6 field @Deprecated public static final int DISABLED_NO_INTERNET_TEMPORARY = 4; // 0x4 field @Deprecated public static final int NETWORK_SELECTION_DISABLED_MAX = 10; // 0xa - field @Deprecated public static final int NETWORK_SELECTION_ENABLE = 0; // 0x0 field @Deprecated public static final int NETWORK_SELECTION_ENABLED = 0; // 0x0 field @Deprecated public static final int NETWORK_SELECTION_PERMANENTLY_DISABLED = 2; // 0x2 field @Deprecated public static final int NETWORK_SELECTION_TEMPORARY_DISABLED = 1; // 0x1 @@ -7779,7 +7776,7 @@ package android.net.wifi { } public static interface WifiManager.ScoreChangeCallback { - method public void onStatusChange(int, boolean); + method public void onScoreChange(int, @NonNull android.net.NetworkScore); method public void onTriggerUpdateOfWifiUsabilityStats(int); } @@ -8910,13 +8907,13 @@ package android.os { public class UpdateEngine { ctor public UpdateEngine(); - method @NonNull public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]); + method @NonNull @WorkerThread public android.os.UpdateEngine.AllocateSpaceResult allocateSpace(@NonNull String, @NonNull String[]); method public void applyPayload(String, long, long, String[]); method public void applyPayload(@NonNull android.content.res.AssetFileDescriptor, @NonNull String[]); method public boolean bind(android.os.UpdateEngineCallback, android.os.Handler); method public boolean bind(android.os.UpdateEngineCallback); method public void cancel(); - method public int cleanupAppliedPayload(); + method @WorkerThread public int cleanupAppliedPayload(); method public void resetStatus(); method public void resume(); method public void suspend(); @@ -8925,8 +8922,8 @@ package android.os { } public static final class UpdateEngine.AllocateSpaceResult { - method public int errorCode(); - method public long freeSpaceRequired(); + method public int getErrorCode(); + method public long getFreeSpaceRequired(); } public static final class UpdateEngine.ErrorCodeConstants { diff --git a/api/test-current.txt b/api/test-current.txt index 5bf1fd8245d1..cee560b00abe 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -767,6 +767,7 @@ package android.content { method public void setAutofillOptions(@Nullable android.content.AutofillOptions); method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions); method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS") public void startActivityAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.os.UserHandle); + field public static final String APP_INTEGRITY_SERVICE = "app_integrity"; field public static final String BUGREPORT_SERVICE = "bugreport"; field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture"; field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle"; @@ -792,6 +793,60 @@ package android.content { } +package android.content.integrity { + + public class AppIntegrityManager { + method @NonNull public android.content.integrity.RuleSet getCurrentRuleSet(); + method @NonNull public String getCurrentRuleSetProvider(); + method @NonNull public String getCurrentRuleSetVersion(); + method public void updateRuleSet(@NonNull android.content.integrity.RuleSet, @NonNull android.content.IntentSender); + field public static final String EXTRA_STATUS = "android.content.integrity.extra.STATUS"; + field public static final int STATUS_FAILURE = 1; // 0x1 + field public static final int STATUS_SUCCESS = 0; // 0x0 + } + + public abstract class IntegrityFormula { + method @NonNull public static android.content.integrity.IntegrityFormula all(@NonNull android.content.integrity.IntegrityFormula...); + method @NonNull public static android.content.integrity.IntegrityFormula any(@NonNull android.content.integrity.IntegrityFormula...); + method @NonNull public android.content.integrity.IntegrityFormula equalTo(@NonNull String); + method @NonNull public android.content.integrity.IntegrityFormula equalTo(boolean); + method @NonNull public android.content.integrity.IntegrityFormula equalTo(long); + method @NonNull public android.content.integrity.IntegrityFormula greaterThan(long); + method @NonNull public android.content.integrity.IntegrityFormula greaterThanOrEquals(long); + method @NonNull public static android.content.integrity.IntegrityFormula not(@NonNull android.content.integrity.IntegrityFormula); + field @NonNull public static final android.content.integrity.IntegrityFormula APP_CERTIFICATE; + field @NonNull public static final android.content.integrity.IntegrityFormula INSTALLER_CERTIFICATE; + field @NonNull public static final android.content.integrity.IntegrityFormula INSTALLER_NAME; + field @NonNull public static final android.content.integrity.IntegrityFormula PACKAGE_NAME; + field @NonNull public static final android.content.integrity.IntegrityFormula PRE_INSTALLED; + field @NonNull public static final android.content.integrity.IntegrityFormula VERSION_CODE; + } + + public final class Rule implements android.os.Parcelable { + ctor public Rule(@NonNull android.content.integrity.IntegrityFormula, int); + method public int describeContents(); + method public int getEffect(); + method @NonNull public android.content.integrity.IntegrityFormula getFormula(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.content.integrity.Rule> CREATOR; + field public static final int DENY = 0; // 0x0 + field public static final int FORCE_ALLOW = 1; // 0x1 + } + + public class RuleSet { + method @NonNull public java.util.List<android.content.integrity.Rule> getRules(); + method @NonNull public String getVersion(); + } + + public static class RuleSet.Builder { + ctor public RuleSet.Builder(); + method @NonNull public android.content.integrity.RuleSet.Builder addRules(@NonNull java.util.List<android.content.integrity.Rule>); + method @NonNull public android.content.integrity.RuleSet build(); + method @NonNull public android.content.integrity.RuleSet.Builder setVersion(@NonNull String); + } + +} + package android.content.pm { public class ActivityInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable { @@ -878,6 +933,7 @@ package android.content.pm { field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000 field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000 field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000 + field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000 field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000 field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000 field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000 @@ -4924,6 +4980,11 @@ package android.view { method public abstract String asyncImpl() default ""; } + public class SurfaceControlViewHost { + method public void addView(@NonNull android.view.View, android.view.WindowManager.LayoutParams); + method public void relayout(android.view.WindowManager.LayoutParams); + } + @UiThread public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback { method public android.view.View getTooltipView(); method public boolean isAutofilled(); diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index 520366f518ab..a1278f358380 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -42,10 +42,10 @@ #include <android-base/properties.h> +#include <ui/DisplayConfig.h> #include <ui/PixelFormat.h> #include <ui/Rect.h> #include <ui/Region.h> -#include <ui/DisplayInfo.h> #include <gui/ISurfaceComposer.h> #include <gui/Surface.h> @@ -283,16 +283,19 @@ status_t BootAnimation::readyToRun() { mDisplayToken = SurfaceComposerClient::getInternalDisplayToken(); if (mDisplayToken == nullptr) - return -1; + return NAME_NOT_FOUND; - DisplayInfo dinfo; - status_t status = SurfaceComposerClient::getDisplayInfo(mDisplayToken, &dinfo); - if (status) - return -1; + DisplayConfig displayConfig; + const status_t error = + SurfaceComposerClient::getActiveDisplayConfig(mDisplayToken, &displayConfig); + if (error != NO_ERROR) + return error; + + const ui::Size& resolution = displayConfig.resolution; // create the native surface sp<SurfaceControl> control = session()->createSurface(String8("BootAnimation"), - dinfo.w, dinfo.h, PIXEL_FORMAT_RGB_565); + resolution.getWidth(), resolution.getHeight(), PIXEL_FORMAT_RGB_565); SurfaceComposerClient::Transaction t; diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 2237bf2b2acb..ebed4ee2b82d 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -110,7 +110,7 @@ cc_defaults { ], cflags: [ - // "-DNEW_ENCODING_SCHEME", + "-DNEW_ENCODING_SCHEME", ], local_include_dirs: [ diff --git a/cmds/statsd/src/atom_field_options.proto b/cmds/statsd/src/atom_field_options.proto index 946c55087005..9c875ba7502d 100644 --- a/cmds/statsd/src/atom_field_options.proto +++ b/cmds/statsd/src/atom_field_options.proto @@ -24,46 +24,75 @@ option java_outer_classname = "AtomFieldOptions"; import "google/protobuf/descriptor.proto"; enum StateField { - // Default value for fields that are not primary or exclusive state. + // Default value for fields that are not a primary or exclusive state field. STATE_FIELD_UNSET = 0; // Fields that represent the key that the state belongs to. - PRIMARY = 1; + // Used on simple proto fields. Do not use on attribution chains. + PRIMARY_FIELD = 1; // The field that represents the state. It's an exclusive state. - EXCLUSIVE = 2; - + EXCLUSIVE_STATE = 2; + // Used on an attribution chain field to indicate that the first uid is the + // primary field. PRIMARY_FIELD_FIRST_UID = 3; } -// Used to annotate an atom that reprsents a state change. A state change atom must have exactly ONE -// exclusive state field, and any number of primary key fields. -// For example, -// message UidProcessStateChanged { -// optional int32 uid = 1 [(state_field_option).option = PRIMARY]; -// optional android.app.ProcessStateEnum state = 2 [(state_field_option).option = EXCLUSIVE]; +// Used to annotate an atom that represents a state change. A state change atom must have exactly +// ONE exclusive state field, and any number of primary key fields. For example, message +// UidProcessStateChanged { +// optional int32 uid = 1 [(state_field_option).option = PRIMARY_FIELD]; +// optional android.app.ProcessStateEnum state = 2 [(state_field_option).option = +// EXCLUSIVE_STATE]; // } -// Each of this UidProcessStateChanged atom represents a state change for a specific uid. +// Each UidProcessStateChanged atom event represents a state change for a specific uid. // A new state automatically overrides the previous state. // -// If the atom has 2 or more primary fields, it means the combination of the primary fields are -// the primary key. +// If the atom has 2 or more primary fields, it means the combination of the +// primary fields are the primary key. // For example: // message ThreadStateChanged { -// optional int32 pid = 1 [(state_field_option).option = PRIMARY]; -// optional int32 tid = 2 [(state_field_option).option = PRIMARY]; -// optional int32 state = 3 [(state_field_option).option = EXCLUSIVE]; +// optional int32 pid = 1 [(state_field_option).option = PRIMARY_FIELD]; +// optional int32 tid = 2 [(state_field_option).option = PRIMARY_FIELD]; +// optional int32 state = 3 [(state_field_option).option = EXCLUSIVE_STATE]; // } // // Sometimes, there is no primary key field, when the state is GLOBAL. // For example, -// // message ScreenStateChanged { -// optional android.view.DisplayStateEnum state = 1 [(state_field_option).option = EXCLUSIVE]; +// optional android.view.DisplayStateEnum state = 1 [(state_field_option).option = +// EXCLUSIVE_STATE]; // } // -// Only fields of primary types can be annotated. AttributionNode cannot be primary keys (and they -// usually are not). +// For state atoms with attribution chain, sometimes the primary key is the first uid in the chain. +// For example: +// message AudioStateChanged { +// repeated AttributionNode attribution_node = 1 +// [(stateFieldOption).option = PRIMARY_KEY_FIRST_UID]; +// +// enum State { +// OFF = 0; +// ON = 1; +// // RESET indicates all audio stopped. Used when it (re)starts (e.g. after it crashes). +// RESET = 2; +// } +// optional State state = 2 [(stateFieldOption).option = EXCLUSIVE_STATE]; +// } message StateAtomFieldOption { optional StateField option = 1 [default = STATE_FIELD_UNSET]; + + // Note: We cannot annotate directly on the enums because many enums are imported from other + // proto files in the platform. proto-lite cc library does not support annotations unfortunately + + // Knowing the default state value allows state trackers to remove entries that become the + // default state. If there is no default value specified, the default value is unknown, and all + // states will be tracked in memory. + optional int32 default_state_value = 2; + + // A reset state signals all states go to default value. For example, BLE reset means all active + // BLE scans are to be turned off. + optional int32 reset_state_value = 3; + + // If the state change needs to count nesting. + optional bool nested = 4 [default = true]; } // Used to generate StatsLog.write APIs. diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 12058cae1a2a..4c0c16f6ac84 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -378,11 +378,11 @@ message Atom { BootTimeEventUtcTime boot_time_event_utc_time_reported = 241; BootTimeEventErrorCode boot_time_event_error_code_reported = 242 [(module) = "framework"]; UserspaceRebootReported userspace_reboot_reported = 243; - NotificationReported notification_reported = 244; + NotificationReported notification_reported = 244 [(module) = "framework"]; NotificationPanelReported notification_panel_reported = 245; NotificationChannelModified notification_panel_modified = 246; - IntegrityCheckResultReported integrity_check_result_reported = 247; - IntegrityRulesPushed integrity_rules_pushed = 248; + IntegrityCheckResultReported integrity_check_result_reported = 247 [(module) = "framework"]; + IntegrityRulesPushed integrity_rules_pushed = 248 [(module) = "framework"]; CellBroadcastMessageReported cb_message_reported = 249 [(module) = "cellbroadcast"]; CellBroadcastMessageError cb_message_error = @@ -466,7 +466,7 @@ message Atom { DangerousPermissionStateSampled dangerous_permission_state_sampled = 10067 [(module) = "framework"]; GraphicsStats graphics_stats = 10068; - RuntimeAppOpsAccess runtime_app_ops_access = 10069; + RuntimeAppOpAccess runtime_app_op_access = 10069 [(module) = "framework"]; IonHeapSize ion_heap_size = 10070 [(module) = "framework"]; } @@ -563,7 +563,8 @@ message ThermalThrottlingStateChanged { */ message ScreenStateChanged { // New screen state, from frameworks/base/core/proto/android/view/enums.proto. - optional android.view.DisplayStateEnum state = 1 [(state_field_option).option = EXCLUSIVE]; + optional android.view.DisplayStateEnum state = 1 + [(state_field_option).option = EXCLUSIVE_STATE, (state_field_option).nested = false]; } /** @@ -574,10 +575,11 @@ message ScreenStateChanged { * frameworks/base/services/core/java/com/android/server/am/BatteryStatsService.java */ message UidProcessStateChanged { - optional int32 uid = 1 [(state_field_option).option = PRIMARY, (is_uid) = true]; + optional int32 uid = 1 [(state_field_option).option = PRIMARY_FIELD, (is_uid) = true]; // The state, from frameworks/base/core/proto/android/app/enums.proto. - optional android.app.ProcessStateEnum state = 2 [(state_field_option).option = EXCLUSIVE]; + optional android.app.ProcessStateEnum state = 2 + [(state_field_option).option = EXCLUSIVE_STATE, (state_field_option).nested = false]; } /** @@ -609,7 +611,7 @@ message ActivityManagerSleepStateChanged { ASLEEP = 1; AWAKE = 2; } - optional State state = 1 [(state_field_option).option = EXCLUSIVE]; + optional State state = 1 [(state_field_option).option = EXCLUSIVE_STATE]; } /** @@ -628,7 +630,7 @@ message MemoryFactorStateChanged { CRITICAL = 4; // critical memory. } - optional State factor = 1 [(state_field_option).option = EXCLUSIVE]; + optional State factor = 1 [(state_field_option).option = EXCLUSIVE_STATE]; } /** @@ -790,7 +792,8 @@ message ProcessLifeCycleStateChanged { * packages/apps/Bluetooth/src/com/android/bluetooth/gatt/AppScanStats.java */ message BleScanStateChanged { - repeated AttributionNode attribution_node = 1; + repeated AttributionNode attribution_node = 1 + [(state_field_option).option = PRIMARY_FIELD_FIRST_UID]; enum State { OFF = 0; @@ -798,14 +801,19 @@ message BleScanStateChanged { // RESET indicates all ble stopped. Used when it (re)starts (e.g. after it crashes). RESET = 2; } - optional State state = 2; + optional State state = 2 [ + (state_field_option).option = EXCLUSIVE_STATE, + (state_field_option).default_state_value = 0 /* State.OFF */, + (state_field_option).reset_state_value = 2 /* State.RESET */, + (state_field_option).nested = true + ]; // Does the scan have a filter. - optional bool is_filtered = 3; + optional bool is_filtered = 3 [(state_field_option).option = PRIMARY_FIELD]; // Whether the scan is a CALLBACK_TYPE_FIRST_MATCH scan. Called 'background' scan internally. - optional bool is_first_match = 4; + optional bool is_first_match = 4 [(state_field_option).option = PRIMARY_FIELD]; // Whether the scan set to piggy-back off the results of other scans (SCAN_MODE_OPPORTUNISTIC). - optional bool is_opportunistic = 5; + optional bool is_opportunistic = 5 [(state_field_option).option = PRIMARY_FIELD]; } /** @@ -1029,11 +1037,11 @@ message WakelockStateChanged { // The type (level) of the wakelock; e.g. a partial wakelock or a full wakelock. // From frameworks/base/core/proto/android/os/enums.proto. - optional android.os.WakeLockLevelEnum type = 2 [(state_field_option).option = PRIMARY]; + optional android.os.WakeLockLevelEnum type = 2 [(state_field_option).option = PRIMARY_FIELD]; ; // The wakelock tag (Called tag in the Java API, sometimes name elsewhere). - optional string tag = 3 [(state_field_option).option = PRIMARY]; + optional string tag = 3 [(state_field_option).option = PRIMARY_FIELD]; enum State { RELEASE = 0; @@ -1041,7 +1049,11 @@ message WakelockStateChanged { CHANGE_RELEASE = 2; CHANGE_ACQUIRE = 3; } - optional State state = 4 [(state_field_option).option = EXCLUSIVE]; + optional State state = 4 [ + (state_field_option).option = EXCLUSIVE_STATE, + (state_field_option).default_state_value = 0, + (state_field_option).nested = true + ]; } /** @@ -3225,9 +3237,9 @@ message PictureInPictureStateChanged { * services/core/java/com/android/server/wm/Session.java */ message OverlayStateChanged { - optional int32 uid = 1 [(state_field_option).option = PRIMARY, (is_uid) = true]; + optional int32 uid = 1 [(state_field_option).option = PRIMARY_FIELD, (is_uid) = true]; - optional string package_name = 2 [(state_field_option).option = PRIMARY]; + optional string package_name = 2 [(state_field_option).option = PRIMARY_FIELD]; optional bool using_alert_window = 3; @@ -3235,7 +3247,11 @@ message OverlayStateChanged { ENTERED = 1; EXITED = 2; } - optional State state = 4 [(state_field_option).option = EXCLUSIVE]; + optional State state = 4 [ + (state_field_option).option = EXCLUSIVE_STATE, + (state_field_option).nested = false, + (state_field_option).default_state_value = 2 + ]; } /* @@ -3401,7 +3417,7 @@ message LmkKillOccurred { */ message AppDied { // timestamp(elapsedRealtime) of record creation - optional uint64 timestamp_millis = 1 [(state_field_option).option = EXCLUSIVE]; + optional uint64 timestamp_millis = 1 [(state_field_option).option = EXCLUSIVE_STATE]; } /** @@ -3921,7 +3937,7 @@ message PrivacyIndicatorsInteracted { DIALOG_LINE_ITEM = 5; } - optional Type type = 1 [(state_field_option).option = EXCLUSIVE]; + optional Type type = 1 [(state_field_option).option = EXCLUSIVE_STATE]; // Used if the type is LINE_ITEM optional string package_name = 2; @@ -8132,15 +8148,15 @@ message GraphicsStats { /** * Message related to dangerous (runtime) app ops access */ -message RuntimeAppOpsAccess { +message RuntimeAppOpAccess { // Uid of the package accessing app op optional int32 uid = 1 [(is_uid) = true]; // Name of the package accessing app op optional string package_name = 2; - // operation id; maps to the OP_* constants in AppOpsManager.java - optional int32 op_id = 3; + // operation string id per OPSTR_ constants in AppOpsManager.java + optional string op = 3; // feature id; provided by developer when accessing related API, limited at 50 chars by API. // Features must be provided through manifest using <feature> tag available in R and above. diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp index 988a53f5d028..15d7e33d63fd 100644 --- a/cmds/statsd/src/external/StatsPullerManager.cpp +++ b/cmds/statsd/src/external/StatsPullerManager.cpp @@ -80,7 +80,7 @@ bool StatsPullerManager::PullLocked(int tagId, vector<shared_ptr<LogEvent>>* dat } return ret; } else { - VLOG("Unknown tagId %d", tagId); + ALOGW("StatsPullerManager: Unknown tagId %d", tagId); return false; // Return early since we don't know what to pull. } } diff --git a/cmds/statsd/src/state/StateTracker.cpp b/cmds/statsd/src/state/StateTracker.cpp index 3ad21e0c96ae..ab861275073c 100644 --- a/cmds/statsd/src/state/StateTracker.cpp +++ b/cmds/statsd/src/state/StateTracker.cpp @@ -26,7 +26,9 @@ namespace os { namespace statsd { StateTracker::StateTracker(const int32_t atomId, const util::StateAtomFieldOptions& stateAtomInfo) - : mAtomId(atomId), mStateField(getSimpleMatcher(atomId, stateAtomInfo.exclusiveField)) { + : mAtomId(atomId), + mStateField(getSimpleMatcher(atomId, stateAtomInfo.exclusiveField)), + mNested(stateAtomInfo.nested) { // create matcher for each primary field for (const auto& primaryField : stateAtomInfo.primaryFields) { if (primaryField == util::FIRST_UID_IN_CHAIN) { @@ -38,7 +40,13 @@ StateTracker::StateTracker(const int32_t atomId, const util::StateAtomFieldOptio } } - // TODO(tsaichristine): b/142108433 set default state, reset state, and nesting + if (stateAtomInfo.defaultState != util::UNSET_VALUE) { + mDefaultState = stateAtomInfo.defaultState; + } + + if (stateAtomInfo.resetState != util::UNSET_VALUE) { + mResetState = stateAtomInfo.resetState; + } } void StateTracker::onLogEvent(const LogEvent& event) { @@ -60,7 +68,6 @@ void StateTracker::onLogEvent(const LogEvent& event) { // Parse event for state value. FieldValue stateValue; - int32_t state; if (!filterValues(mStateField, event.getValues(), &stateValue) || stateValue.mValue.getType() != INT) { ALOGE("StateTracker error extracting state from log event. Type: %d", @@ -68,11 +75,12 @@ void StateTracker::onLogEvent(const LogEvent& event) { handlePartialReset(eventTimeNs, primaryKey); return; } - state = stateValue.mValue.int_value; + int32_t state = stateValue.mValue.int_value; if (state == mResetState) { VLOG("StateTracker Reset state: %s", stateValue.mValue.toString().c_str()); handleReset(eventTimeNs); + return; } // Track and update state. @@ -113,15 +121,17 @@ bool StateTracker::getStateValue(const HashableDimensionKey& queryKey, FieldValu return true; } } else if (queryKey.getValues().size() > mPrimaryFields.size()) { - ALOGE("StateTracker query key size > primary key size is illegal"); + ALOGE("StateTracker query key size %zu > primary key size %zu is illegal", + queryKey.getValues().size(), mPrimaryFields.size()); } else { - ALOGE("StateTracker query key size < primary key size is not supported"); + ALOGE("StateTracker query key size %zu < primary key size %zu is not supported", + queryKey.getValues().size(), mPrimaryFields.size()); } - // Set the state value to unknown if: + // Set the state value to default state if: // - query key size is incorrect // - query key is not found in state map - output->mValue = StateTracker::kStateUnknown; + output->mValue = mDefaultState; return false; } @@ -164,18 +174,52 @@ void StateTracker::updateState(const HashableDimensionKey& primaryKey, const int *oldState = mDefaultState; } - // update state map - if (eventState == mDefaultState) { - // remove (key, state) pair if state returns to default state - VLOG("\t StateTracker changed to default state") - mStateMap.erase(primaryKey); - } else { - mStateMap[primaryKey].state = eventState; - mStateMap[primaryKey].count = 1; + // Update state map for non-nested counting case. + // Every state event triggers a state overwrite. + if (!mNested) { + if (eventState == mDefaultState) { + // remove (key, state) pair if state returns to default state + VLOG("\t StateTracker changed to default state") + mStateMap.erase(primaryKey); + } else { + mStateMap[primaryKey].state = eventState; + mStateMap[primaryKey].count = 1; + } + *newState = eventState; + return; } - *newState = eventState; - // TODO(tsaichristine): support atoms with nested counting + // Update state map for nested counting case. + // + // Nested counting is only allowed for binary state events such as ON/OFF or + // ACQUIRE/RELEASE. For example, WakelockStateChanged might have the state + // events: ON, ON, OFF. The state will still be ON until we see the same + // number of OFF events as ON events. + // + // In atoms.proto, a state atom with nested counting enabled + // must only have 2 states and one of the states must be the default state. + it = mStateMap.find(primaryKey); + if (it != mStateMap.end()) { + *newState = it->second.state; + if (eventState == it->second.state) { + it->second.count++; + } else if (eventState == mDefaultState) { + if ((--it->second.count) == 0) { + mStateMap.erase(primaryKey); + *newState = mDefaultState; + } + } else { + ALOGE("StateTracker Nest counting state has a third state instead of the binary state " + "limit."); + return; + } + } else { + if (eventState != mDefaultState) { + mStateMap[primaryKey].state = eventState; + mStateMap[primaryKey].count = 1; + } + *newState = eventState; + } } } // namespace statsd diff --git a/cmds/statsd/src/state/StateTracker.h b/cmds/statsd/src/state/StateTracker.h index 70f16274c7f6..aeca2a53bfdc 100644 --- a/cmds/statsd/src/state/StateTracker.h +++ b/cmds/statsd/src/state/StateTracker.h @@ -74,6 +74,8 @@ private: int32_t mResetState = kStateUnknown; + const bool mNested; + // Maps primary key to state value info std::unordered_map<HashableDimensionKey, StateValueInfo> mStateMap; diff --git a/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp b/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp index c7ba9be3ca5a..5e60abaf7792 100644 --- a/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp +++ b/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp @@ -14,12 +14,12 @@ #include <gtest/gtest.h> +#include <vector> + #include "src/StatsLogProcessor.h" #include "src/stats_log_util.h" #include "tests/statsd_test_util.h" -#include <vector> - namespace android { namespace os { namespace statsd { @@ -29,12 +29,13 @@ namespace statsd { namespace { const int64_t metricId = 123456; +const int32_t ATOM_TAG = android::util::SUBSYSTEM_SLEEP_STATE; StatsdConfig CreateStatsdConfig(const GaugeMetric::SamplingType sampling_type, bool useCondition = true) { StatsdConfig config; config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root. - auto atomMatcher = CreateSimpleAtomMatcher("TestMatcher", android::util::SUBSYSTEM_SLEEP_STATE); + auto atomMatcher = CreateSimpleAtomMatcher("TestMatcher", ATOM_TAG); *config.add_atom_matcher() = atomMatcher; *config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher(); *config.add_atom_matcher() = CreateScreenTurnedOffAtomMatcher(); @@ -51,7 +52,7 @@ StatsdConfig CreateStatsdConfig(const GaugeMetric::SamplingType sampling_type, gaugeMetric->set_sampling_type(sampling_type); gaugeMetric->mutable_gauge_fields_filter()->set_include_all(true); *gaugeMetric->mutable_dimensions_in_what() = - CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {1 /* subsystem name */}); + CreateDimensions(ATOM_TAG, {1 /* subsystem name */}); gaugeMetric->set_bucket(FIVE_MINUTES); gaugeMetric->set_max_pull_delay_sec(INT_MAX); config.set_hash_strings_in_metric_report(false); @@ -69,8 +70,8 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) { TimeUnitToBucketSizeInMillis(config.gauge_metric(0).bucket()) * 1000000; ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), ATOM_TAG); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -144,7 +145,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvents) { EXPECT_GT((int)gaugeMetrics.data_size(), 1); auto data = gaugeMetrics.data(0); - EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field()); + EXPECT_EQ(ATOM_TAG, data.dimensions_in_what().field()); EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size()); EXPECT_EQ(1 /* subsystem name field */, data.dimensions_in_what().value_tuple().dimensions_value(0).field()); @@ -214,8 +215,8 @@ TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents) { TimeUnitToBucketSizeInMillis(config.gauge_metric(0).bucket()) * 1000000; ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), ATOM_TAG); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -267,7 +268,7 @@ TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents) { EXPECT_GT((int)gaugeMetrics.data_size(), 1); auto data = gaugeMetrics.data(0); - EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field()); + EXPECT_EQ(ATOM_TAG, data.dimensions_in_what().field()); EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size()); EXPECT_EQ(1 /* subsystem name field */, data.dimensions_in_what().value_tuple().dimensions_value(0).field()); @@ -315,8 +316,8 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm) { TimeUnitToBucketSizeInMillis(config.gauge_metric(0).bucket()) * 1000000; ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback, ATOM_TAG); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -371,7 +372,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEvent_LateAlarm) { EXPECT_GT((int)gaugeMetrics.data_size(), 1); auto data = gaugeMetrics.data(0); - EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field()); + EXPECT_EQ(ATOM_TAG, data.dimensions_in_what().field()); EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size()); EXPECT_EQ(1 /* subsystem name field */, data.dimensions_in_what().value_tuple().dimensions_value(0).field()); @@ -424,8 +425,8 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation) { event_activation->set_ttl_seconds(ttlNs / 1000000000); ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), ATOM_TAG); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -493,7 +494,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation) { EXPECT_GT((int)gaugeMetrics.data_size(), 0); auto data = gaugeMetrics.data(0); - EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field()); + EXPECT_EQ(ATOM_TAG, data.dimensions_in_what().field()); EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size()); EXPECT_EQ(1 /* subsystem name field */, data.dimensions_in_what().value_tuple().dimensions_value(0).field()); @@ -542,8 +543,8 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition) { TimeUnitToBucketSizeInMillis(config.gauge_metric(0).bucket()) * 1000000; ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), ATOM_TAG); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -586,7 +587,7 @@ TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition) { EXPECT_GT((int)gaugeMetrics.data_size(), 0); auto data = gaugeMetrics.data(0); - EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field()); + EXPECT_EQ(ATOM_TAG, data.dimensions_in_what().field()); EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size()); EXPECT_EQ(1 /* subsystem name field */, data.dimensions_in_what().value_tuple().dimensions_value(0).field()); diff --git a/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp b/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp index 16b51d99535b..9d58867f09db 100644 --- a/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp +++ b/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp @@ -12,22 +12,24 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <android/os/BnPullAtomCallback.h> +#include <android/os/IPullAtomResultReceiver.h> +#include <binder/IPCThreadState.h> #include <gtest/gtest.h> -#include <binder/IPCThreadState.h> +#include <vector> + #include "src/StatsLogProcessor.h" #include "src/StatsService.h" #include "src/stats_log_util.h" #include "tests/statsd_test_util.h" -#include <vector> - namespace android { namespace os { namespace statsd { #ifdef __ANDROID__ - +namespace { const string kApp1 = "app1.sharing.1"; const int kConfigKey = 789130123; // Randomly chosen to avoid collisions with existing configs. const int kCallingUid = 0; // Randomly chosen @@ -109,6 +111,7 @@ StatsdConfig MakeGaugeMetricConfig(int64_t minTime) { gaugeMetric->set_min_bucket_size_nanos(minTime); return config; } +} // anonymous namespace TEST(PartialBucketE2eTest, TestCountMetricWithoutSplit) { StatsService service(nullptr, nullptr); @@ -202,6 +205,9 @@ TEST(PartialBucketE2eTest, TestCountMetricSplitOnRemoval) { TEST(PartialBucketE2eTest, TestValueMetricWithoutMinPartialBucket) { StatsService service(nullptr, nullptr); + service.mPullerManager->RegisterPullAtomCallback( + /*uid=*/0, android::util::SUBSYSTEM_SLEEP_STATE, NS_PER_SEC, NS_PER_SEC * 10, {}, + new FakeSubsystemSleepCallback()); // Partial buckets don't occur when app is first installed. service.mUidMap->updateApp(1, String16(kApp1.c_str()), 1, 1, String16("v1"), String16("")); SendConfig(service, MakeValueMetricConfig(0)); @@ -220,6 +226,9 @@ TEST(PartialBucketE2eTest, TestValueMetricWithoutMinPartialBucket) { TEST(PartialBucketE2eTest, TestValueMetricWithMinPartialBucket) { StatsService service(nullptr, nullptr); + service.mPullerManager->RegisterPullAtomCallback( + /*uid=*/0, android::util::SUBSYSTEM_SLEEP_STATE, NS_PER_SEC, NS_PER_SEC * 10, {}, + new FakeSubsystemSleepCallback()); // Partial buckets don't occur when app is first installed. service.mUidMap->updateApp(1, String16(kApp1.c_str()), 1, 1, String16("v1"), String16("")); SendConfig(service, MakeValueMetricConfig(60 * NS_PER_SEC /* One minute */)); diff --git a/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp b/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp index e8d2ec514cad..a140af876474 100644 --- a/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp +++ b/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp @@ -69,8 +69,9 @@ TEST(ValueMetricE2eTest, TestPulledEvents) { TimeUnitToBucketSizeInMillis(config.value_metric(0).bucket()) * 1000000; ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), + android::util::SUBSYSTEM_SLEEP_STATE); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -173,8 +174,9 @@ TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm) { TimeUnitToBucketSizeInMillis(config.value_metric(0).bucket()) * 1000000; ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), + android::util::SUBSYSTEM_SLEEP_STATE); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); @@ -285,8 +287,9 @@ TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation) { event_activation->set_ttl_seconds(ttlNs / 1000000000); ConfigKey cfgKey; - auto processor = CreateStatsLogProcessor( - baseTimeNs, configAddedTimeNs, config, cfgKey); + auto processor = CreateStatsLogProcessor(baseTimeNs, configAddedTimeNs, config, cfgKey, + new FakeSubsystemSleepCallback(), + android::util::SUBSYSTEM_SLEEP_STATE); EXPECT_EQ(processor->mMetricsManagers.size(), 1u); EXPECT_TRUE(processor->mMetricsManagers.begin()->second->isConfigValid()); processor->mPullerManager->ForceClearPullerCache(); diff --git a/cmds/statsd/tests/state/StateTracker_test.cpp b/cmds/statsd/tests/state/StateTracker_test.cpp index 84aaa54bc5bf..b0acd5ad7452 100644 --- a/cmds/statsd/tests/state/StateTracker_test.cpp +++ b/cmds/statsd/tests/state/StateTracker_test.cpp @@ -127,6 +127,23 @@ std::shared_ptr<LogEvent> buildOverlayEventBadStateType(int uid, const std::stri event->init(); return event; } + +std::shared_ptr<LogEvent> buildBleScanEvent(int uid, bool acquire, bool reset) { + std::vector<AttributionNodeInternal> chain; + chain.push_back(AttributionNodeInternal()); + AttributionNodeInternal& attr = chain.back(); + attr.set_uid(uid); + + std::shared_ptr<LogEvent> event = + std::make_shared<LogEvent>(android::util::BLE_SCAN_STATE_CHANGED, 1000); + event->write(chain); + event->write(reset ? 2 : acquire ? 1 : 0); // PARTIAL_WAKE_LOCK + event->write(0); // filtered + event->write(0); // first match + event->write(0); // opportunistic + event->init(); + return event; +} // END: build event functions. // START: get primary key functions @@ -277,6 +294,80 @@ TEST(StateTrackerTest, TestUnregisterListener) { } /** + * Test a binary state atom with nested counting. + * + * To go from an "ON" state to an "OFF" state with nested counting, we must see + * an equal number of "OFF" events as "ON" events. + * For example, ACQUIRE, ACQUIRE, RELEASE will still be in the ACQUIRE state. + * ACQUIRE, ACQUIRE, RELEASE, RELEASE will be in the RELEASE state. + */ +TEST(StateTrackerTest, TestStateChangeNested) { + sp<TestStateListener> listener = new TestStateListener(); + StateManager mgr; + mgr.registerListener(android::util::WAKELOCK_STATE_CHANGED, listener); + + std::shared_ptr<LogEvent> event1 = + buildPartialWakelockEvent(1000 /* uid */, "tag", true /*acquire*/); + mgr.onLogEvent(*event1); + EXPECT_EQ(1, listener->updates.size()); + EXPECT_EQ(1000, listener->updates[0].mKey.getValues()[0].mValue.int_value); + EXPECT_EQ(1, listener->updates[0].mState); + listener->updates.clear(); + + std::shared_ptr<LogEvent> event2 = + buildPartialWakelockEvent(1000 /* uid */, "tag", true /*acquire*/); + mgr.onLogEvent(*event2); + EXPECT_EQ(0, listener->updates.size()); + + std::shared_ptr<LogEvent> event3 = + buildPartialWakelockEvent(1000 /* uid */, "tag", false /*release*/); + mgr.onLogEvent(*event3); + EXPECT_EQ(0, listener->updates.size()); + + std::shared_ptr<LogEvent> event4 = + buildPartialWakelockEvent(1000 /* uid */, "tag", false /*release*/); + mgr.onLogEvent(*event4); + EXPECT_EQ(1, listener->updates.size()); + EXPECT_EQ(1000, listener->updates[0].mKey.getValues()[0].mValue.int_value); + EXPECT_EQ(0, listener->updates[0].mState); +} + +/** + * Test a state atom with a reset state. + * + * If the reset state value is seen, every state in the map is set to the default + * state and every listener is notified. + */ +TEST(StateTrackerTest, TestStateChangeReset) { + sp<TestStateListener> listener = new TestStateListener(); + StateManager mgr; + mgr.registerListener(android::util::BLE_SCAN_STATE_CHANGED, listener); + + std::shared_ptr<LogEvent> event1 = + buildBleScanEvent(1000 /* uid */, true /*acquire*/, false /*reset*/); + mgr.onLogEvent(*event1); + EXPECT_EQ(1, listener->updates.size()); + EXPECT_EQ(1000, listener->updates[0].mKey.getValues()[0].mValue.int_value); + EXPECT_EQ(BleScanStateChanged::ON, listener->updates[0].mState); + listener->updates.clear(); + + std::shared_ptr<LogEvent> event2 = + buildBleScanEvent(2000 /* uid */, true /*acquire*/, false /*reset*/); + mgr.onLogEvent(*event2); + EXPECT_EQ(1, listener->updates.size()); + EXPECT_EQ(2000, listener->updates[0].mKey.getValues()[0].mValue.int_value); + EXPECT_EQ(BleScanStateChanged::ON, listener->updates[0].mState); + listener->updates.clear(); + + std::shared_ptr<LogEvent> event3 = + buildBleScanEvent(2000 /* uid */, false /*acquire*/, true /*reset*/); + mgr.onLogEvent(*event3); + EXPECT_EQ(2, listener->updates.size()); + EXPECT_EQ(BleScanStateChanged::OFF, listener->updates[0].mState); + EXPECT_EQ(BleScanStateChanged::OFF, listener->updates[1].mState); +} + +/** * Test StateManager's onLogEvent and StateListener's onStateChanged correctly * updates listener for states without primary keys. */ @@ -334,7 +425,7 @@ TEST(StateTrackerTest, TestStateChangePrimaryFieldAttrChain) { // Log event. std::shared_ptr<LogEvent> event = - buildPartialWakelockEvent(1001 /* uid */, "tag1", false /* acquire */); + buildPartialWakelockEvent(1001 /* uid */, "tag1", true /* acquire */); mgr.onLogEvent(*event); EXPECT_EQ(1, mgr.getStateTrackersCount()); @@ -346,23 +437,25 @@ TEST(StateTrackerTest, TestStateChangePrimaryFieldAttrChain) { EXPECT_EQ(1001, listener1->updates[0].mKey.getValues()[0].mValue.int_value); EXPECT_EQ(1, listener1->updates[0].mKey.getValues()[1].mValue.int_value); EXPECT_EQ("tag1", listener1->updates[0].mKey.getValues()[2].mValue.str_value); - EXPECT_EQ(WakelockStateChanged::RELEASE, listener1->updates[0].mState); + EXPECT_EQ(WakelockStateChanged::ACQUIRE, listener1->updates[0].mState); // Check StateTracker was updated by querying for state. HashableDimensionKey queryKey; getPartialWakelockKey(1001 /* uid */, "tag1", &queryKey); - EXPECT_EQ(WakelockStateChanged::RELEASE, + EXPECT_EQ(WakelockStateChanged::ACQUIRE, getStateInt(mgr, android::util::WAKELOCK_STATE_CHANGED, queryKey)); // No state stored for this query key. HashableDimensionKey queryKey2; getPartialWakelockKey(1002 /* uid */, "tag1", &queryKey2); - EXPECT_EQ(-1, getStateInt(mgr, android::util::WAKELOCK_STATE_CHANGED, queryKey2)); + EXPECT_EQ(WakelockStateChanged::RELEASE, + getStateInt(mgr, android::util::WAKELOCK_STATE_CHANGED, queryKey2)); // Partial query fails. HashableDimensionKey queryKey3; getPartialWakelockKey(1001 /* uid */, &queryKey3); - EXPECT_EQ(-1, getStateInt(mgr, android::util::WAKELOCK_STATE_CHANGED, queryKey3)); + EXPECT_EQ(WakelockStateChanged::RELEASE, + getStateInt(mgr, android::util::WAKELOCK_STATE_CHANGED, queryKey3)); } /** diff --git a/cmds/statsd/tests/statsd_test_util.cpp b/cmds/statsd/tests/statsd_test_util.cpp index e0aecceac4e3..6e1890ad63a9 100644 --- a/cmds/statsd/tests/statsd_test_util.cpp +++ b/cmds/statsd/tests/statsd_test_util.cpp @@ -580,9 +580,15 @@ std::unique_ptr<LogEvent> CreateUidProcessStateChangedEvent( } sp<StatsLogProcessor> CreateStatsLogProcessor(const int64_t timeBaseNs, const int64_t currentTimeNs, - const StatsdConfig& config, const ConfigKey& key) { + const StatsdConfig& config, const ConfigKey& key, + const sp<IPullAtomCallback>& puller, + const int32_t atomTag) { sp<UidMap> uidMap = new UidMap(); sp<StatsPullerManager> pullerManager = new StatsPullerManager(); + if (puller != nullptr) { + pullerManager->RegisterPullAtomCallback(/*uid=*/0, atomTag, NS_PER_SEC, NS_PER_SEC * 10, {}, + puller); + } sp<AlarmMonitor> anomalyAlarmMonitor = new AlarmMonitor(1, [](const sp<IStatsCompanionService>&, int64_t){}, [](const sp<IStatsCompanionService>&){}); @@ -942,6 +948,34 @@ void backfillStartEndTimestamp(ConfigMetricsReportList *config_report_list) { } } +binder::Status FakeSubsystemSleepCallback::onPullAtom( + int atomTag, const sp<IPullAtomResultReceiver>& resultReceiver) { + // Convert stats_events into StatsEventParcels. + std::vector<android::util::StatsEventParcel> parcels; + for (int i = 1; i < 3; i++) { + stats_event* event = stats_event_obtain(); + stats_event_set_atom_id(event, atomTag); + std::string subsystemName = "subsystem_name_"; + subsystemName = subsystemName + std::to_string(i); + stats_event_write_string8(event, subsystemName.c_str()); + stats_event_write_string8(event, "subsystem_subname foo"); + stats_event_write_int64(event, /*count= */ i); + stats_event_write_int64(event, /*time_millis= */ i * 100); + stats_event_build(event); + size_t size; + uint8_t* buffer = stats_event_get_buffer(event, &size); + + android::util::StatsEventParcel p; + // vector.assign() creates a copy, but this is inevitable unless + // stats_event.h/c uses a vector as opposed to a buffer. + p.buffer.assign(buffer, buffer + size); + parcels.push_back(std::move(p)); + stats_event_release(event); + } + resultReceiver->pullFinished(atomTag, /*success=*/true, parcels); + return binder::Status::ok(); +} + } // namespace statsd } // namespace os } // namespace android diff --git a/cmds/statsd/tests/statsd_test_util.h b/cmds/statsd/tests/statsd_test_util.h index 9bdfeebe561f..576a4916d60b 100644 --- a/cmds/statsd/tests/statsd_test_util.h +++ b/cmds/statsd/tests/statsd_test_util.h @@ -14,12 +14,16 @@ #pragma once +#include <android/os/BnPullAtomCallback.h> +#include <android/os/IPullAtomCallback.h> +#include <android/os/IPullAtomResultReceiver.h> #include <gtest/gtest.h> + #include "frameworks/base/cmds/statsd/src/stats_log.pb.h" #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" #include "src/StatsLogProcessor.h" -#include "src/logd/LogEvent.h" #include "src/hash.h" +#include "src/logd/LogEvent.h" #include "src/stats_log_util.h" #include "statslog.h" @@ -224,9 +228,10 @@ std::unique_ptr<LogEvent> CreateUidProcessStateChangedEvent( AttributionNodeInternal CreateAttribution(const int& uid, const string& tag); // Create a statsd log event processor upon the start time in seconds, config and key. -sp<StatsLogProcessor> CreateStatsLogProcessor(const int64_t timeBaseNs, - const int64_t currentTimeNs, - const StatsdConfig& config, const ConfigKey& key); +sp<StatsLogProcessor> CreateStatsLogProcessor(const int64_t timeBaseNs, const int64_t currentTimeNs, + const StatsdConfig& config, const ConfigKey& key, + const sp<IPullAtomCallback>& puller = nullptr, + const int32_t atomTag = 0 /*for puller only*/); // Util function to sort the log events by timestamp. void sortLogEventsByTimestamp(std::vector<std::unique_ptr<LogEvent>> *events); @@ -278,6 +283,12 @@ bool backfillDimensionPath(const DimensionsValue& path, const google::protobuf::RepeatedPtrField<DimensionsValue>& leafValues, DimensionsValue* dimension); +class FakeSubsystemSleepCallback : public BnPullAtomCallback { +public: + binder::Status onPullAtom(int atomTag, + const sp<IPullAtomResultReceiver>& resultReceiver) override; +}; + template <typename T> void backfillDimensionPath(const DimensionsValue& whatPath, const DimensionsValue& conditionPath, diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index 4e47594b6196..c60f7bd29ce8 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -278,7 +278,7 @@ public abstract class ActivityManagerInternal { String resolvedType, boolean fgRequired, String callingPackage, @UserIdInt int userId, boolean allowBackgroundActivityStarts) throws TransactionTooLargeException; - public abstract void disconnectActivityFromServices(Object connectionHolder, Object conns); + public abstract void disconnectActivityFromServices(Object connectionHolder); public abstract void cleanUpServices(@UserIdInt int userId, ComponentName component, Intent baseIntent); public abstract ActivityInfo getActivityInfoForUser(ActivityInfo aInfo, @UserIdInt int userId); diff --git a/core/java/android/app/admin/DevicePolicyEventLogger.java b/core/java/android/app/admin/DevicePolicyEventLogger.java index 4c0e176c519e..bbc0bdfa6d7d 100644 --- a/core/java/android/app/admin/DevicePolicyEventLogger.java +++ b/core/java/android/app/admin/DevicePolicyEventLogger.java @@ -19,10 +19,9 @@ package android.app.admin; import android.annotation.Nullable; import android.content.ComponentName; import android.stats.devicepolicy.nano.StringList; -import android.util.StatsLog; import com.android.framework.protobuf.nano.MessageNano; -import com.android.internal.util.Preconditions; +import com.android.internal.util.FrameworkStatsLog; import java.util.Arrays; import java.util.Objects; @@ -197,8 +196,8 @@ public class DevicePolicyEventLogger { */ public void write() { byte[] bytes = stringArrayValueToBytes(mStringArrayValue); - StatsLog.write(StatsLog.DEVICE_POLICY_EVENT, mEventId, mAdminPackageName, mIntValue, - mBooleanValue, mTimePeriodMs, bytes); + FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_POLICY_EVENT, mEventId, mAdminPackageName, + mIntValue, mBooleanValue, mTimePeriodMs, bytes); } /** diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index ec40b7e3508c..249e58244870 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -5099,6 +5099,7 @@ public abstract class Context { * @hide */ @SystemApi + @TestApi public static final String APP_INTEGRITY_SERVICE = "app_integrity"; /** diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index acffec98b2fc..6f8a99fce897 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -4284,7 +4284,15 @@ public class Intent implements Parcelable, Cloneable { public static final String ACTION_SERVICE_STATE = "android.intent.action.SERVICE_STATE"; /** - * Used for looking up a Data Loader Service provider. + * Used by {@link services.core.java.com.android.server.pm.DataLoaderManagerService} + * for querying Data Loader Service providers. Data loader service providers register this + * intent filter in their manifests, so that they can be looked up and bound to by + * {@code DataLoaderManagerService}. + * + * Data loader service providers must be privileged apps. + * See {@link com.android.server.pm.PackageManagerShellCommandDataLoader} as an example of such + * data loader service provider. + * * @hide */ @SystemApi diff --git a/core/java/android/content/integrity/AppIntegrityManager.java b/core/java/android/content/integrity/AppIntegrityManager.java index e53ef66020f1..9f95d4d75f6f 100644 --- a/core/java/android/content/integrity/AppIntegrityManager.java +++ b/core/java/android/content/integrity/AppIntegrityManager.java @@ -19,6 +19,7 @@ package android.content.integrity; import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.TestApi; import android.content.Context; import android.content.IntentSender; import android.content.pm.ParceledListSlice; @@ -33,6 +34,7 @@ import android.os.RemoteException; * * @hide */ +@TestApi @SystemApi @SystemService(Context.APP_INTEGRITY_SERVICE) public class AppIntegrityManager { @@ -100,4 +102,23 @@ public class AppIntegrityManager { throw e.rethrowAsRuntimeException(); } } + + /** + * Get current RuleSet on device. + * + * <p>Warning: this method is only used for tests. + * + * @hide + */ + @TestApi + @NonNull + public RuleSet getCurrentRuleSet() { + try { + ParceledListSlice<Rule> rules = mManager.getCurrentRules(); + String version = mManager.getCurrentRuleSetVersion(); + return new RuleSet.Builder().setVersion(version).addRules(rules.getList()).build(); + } catch (RemoteException e) { + throw e.rethrowAsRuntimeException(); + } + } } diff --git a/core/java/android/content/integrity/AtomicFormula.java b/core/java/android/content/integrity/AtomicFormula.java index 76007e67798d..439d53661b8e 100644 --- a/core/java/android/content/integrity/AtomicFormula.java +++ b/core/java/android/content/integrity/AtomicFormula.java @@ -460,14 +460,14 @@ public abstract class AtomicFormula extends IntegrityFormula { } private static String hashValue(@Key int key, String value) { - // Hash the string value unless it is a PACKAGE_NAME or INSTALLER_NAME and the value is - // less than 33 characters. - if (value.length() <= 32) { + // Hash the string value if it is a PACKAGE_NAME or INSTALLER_NAME and the value is + // greater than 32 characters. + if (value.length() > 32) { if (key == PACKAGE_NAME || key == INSTALLER_NAME) { - return value; + return hash(value); } } - return hash(value); + return value; } private static String hash(String value) { diff --git a/core/java/android/content/integrity/IAppIntegrityManager.aidl b/core/java/android/content/integrity/IAppIntegrityManager.aidl index 6b73fd70bb99..4714ad7c7989 100644 --- a/core/java/android/content/integrity/IAppIntegrityManager.aidl +++ b/core/java/android/content/integrity/IAppIntegrityManager.aidl @@ -25,4 +25,5 @@ interface IAppIntegrityManager { void updateRuleSet(String version, in ParceledListSlice<Rule> rules, in IntentSender statusReceiver); String getCurrentRuleSetVersion(); String getCurrentRuleSetProvider(); + ParceledListSlice<Rule> getCurrentRules(); } diff --git a/core/java/android/content/integrity/IntegrityFormula.java b/core/java/android/content/integrity/IntegrityFormula.java index 8505d32e3f02..a2d937e4df31 100644 --- a/core/java/android/content/integrity/IntegrityFormula.java +++ b/core/java/android/content/integrity/IntegrityFormula.java @@ -19,6 +19,7 @@ package android.content.integrity; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.content.integrity.AtomicFormula.BooleanAtomicFormula; import android.content.integrity.AtomicFormula.LongAtomicFormula; import android.content.integrity.AtomicFormula.StringAtomicFormula; @@ -37,6 +38,7 @@ import java.util.Arrays; * @hide */ @SystemApi +@TestApi @VisibleForTesting public abstract class IntegrityFormula { diff --git a/core/java/android/content/integrity/Rule.java b/core/java/android/content/integrity/Rule.java index c421c4076d16..d29e6df5ec39 100644 --- a/core/java/android/content/integrity/Rule.java +++ b/core/java/android/content/integrity/Rule.java @@ -21,6 +21,7 @@ import static com.android.internal.util.Preconditions.checkArgument; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.Parcel; import android.os.Parcelable; @@ -37,6 +38,7 @@ import java.util.Objects; * * @hide */ +@TestApi @SystemApi @VisibleForTesting public final class Rule implements Parcelable { diff --git a/core/java/android/content/integrity/RuleSet.java b/core/java/android/content/integrity/RuleSet.java index b423b54a7d92..e121ff8bbcaa 100644 --- a/core/java/android/content/integrity/RuleSet.java +++ b/core/java/android/content/integrity/RuleSet.java @@ -18,6 +18,7 @@ package android.content.integrity; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import java.util.ArrayList; import java.util.Collections; @@ -29,6 +30,7 @@ import java.util.Objects; * * @hide */ +@TestApi @SystemApi public class RuleSet { private final String mVersion; diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index b1b9454aeddd..2acbb97cb20a 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -1467,6 +1467,8 @@ public class PackageInstaller { public DataLoaderParams dataLoaderParams; /** {@hide} */ public int rollbackDataPolicy = PackageManager.RollbackDataPolicy.RESTORE; + /** {@hide} */ + public boolean forceQueryableOverride; /** * Construct parameters for a new package install session. @@ -1499,6 +1501,7 @@ public class PackageInstaller { installerPackageName = source.readString(); isMultiPackage = source.readBoolean(); isStaged = source.readBoolean(); + forceQueryableOverride = source.readBoolean(); requiredInstalledVersionCode = source.readLong(); DataLoaderParamsParcel dataLoaderParamsParcel = source.readParcelable( DataLoaderParamsParcel.class.getClassLoader()); @@ -1528,6 +1531,7 @@ public class PackageInstaller { ret.installerPackageName = installerPackageName; ret.isMultiPackage = isMultiPackage; ret.isStaged = isStaged; + ret.forceQueryableOverride = forceQueryableOverride; ret.requiredInstalledVersionCode = requiredInstalledVersionCode; ret.dataLoaderParams = dataLoaderParams; ret.rollbackDataPolicy = rollbackDataPolicy; @@ -1904,6 +1908,14 @@ public class PackageInstaller { this.dataLoaderParams = dataLoaderParams; } + /** + * + * {@hide} + */ + public void setForceQueryable() { + this.forceQueryableOverride = true; + } + /** {@hide} */ public void dump(IndentingPrintWriter pw) { pw.printPair("mode", mode); @@ -1923,6 +1935,7 @@ public class PackageInstaller { pw.printPair("installerPackageName", installerPackageName); pw.printPair("isMultiPackage", isMultiPackage); pw.printPair("isStaged", isStaged); + pw.printPair("forceQueryable", forceQueryableOverride); pw.printPair("requiredInstalledVersionCode", requiredInstalledVersionCode); pw.printPair("dataLoaderParams", dataLoaderParams); pw.printPair("rollbackDataPolicy", rollbackDataPolicy); @@ -1954,6 +1967,7 @@ public class PackageInstaller { dest.writeString(installerPackageName); dest.writeBoolean(isMultiPackage); dest.writeBoolean(isStaged); + dest.writeBoolean(forceQueryableOverride); dest.writeLong(requiredInstalledVersionCode); if (dataLoaderParams != null) { dest.writeParcelable(dataLoaderParams.getData(), flags); @@ -2078,6 +2092,8 @@ public class PackageInstaller { /** {@hide} */ public boolean isStaged; /** {@hide} */ + public boolean forceQueryable; + /** {@hide} */ public int parentSessionId = INVALID_ID; /** {@hide} */ public int[] childSessionIds = NO_SESSIONS; @@ -2135,6 +2151,7 @@ public class PackageInstaller { installFlags = source.readInt(); isMultiPackage = source.readBoolean(); isStaged = source.readBoolean(); + forceQueryable = source.readBoolean(); parentSessionId = source.readInt(); childSessionIds = source.createIntArray(); if (childSessionIds == null) { @@ -2476,6 +2493,14 @@ public class PackageInstaller { } /** + * Returns true if this session is marked as forceQueryable + * {@hide} + */ + public boolean isForceQueryable() { + return forceQueryable; + } + + /** * Returns {@code true} if this session is an active staged session. * * We consider a session active if it has been committed and it is either pending @@ -2636,6 +2661,7 @@ public class PackageInstaller { dest.writeInt(installFlags); dest.writeBoolean(isMultiPackage); dest.writeBoolean(isStaged); + dest.writeBoolean(forceQueryable); dest.writeInt(parentSessionId); dest.writeIntArray(childSessionIds); dest.writeBoolean(isStagedSessionApplied); diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index dfe9fe64657d..b6b27b6e514a 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -954,6 +954,10 @@ public class PackageParser { throw new PackageParserException(INSTALL_PARSE_FAILED_NOT_APK, "No packages found in split"); } + // Apk directory is directly nested under the current directory + if (files.length == 1 && files[0].isDirectory()) { + return parseClusterPackageLite(files[0], flags); + } String packageName = null; int versionCode = 0; @@ -1327,12 +1331,9 @@ public class PackageParser { } } - pkg.setCodePath(packageDir.getCanonicalPath()); + pkg.setCodePath(lite.codePath); pkg.setUse32bitAbi(lite.use32bitAbi); return pkg; - } catch (IOException e) { - throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION, - "Failed to get path: " + lite.baseCodePath, e); } finally { IoUtils.closeQuietly(assetLoader); } diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index a0f089b2df41..3aa1a6d3f8ff 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -259,6 +259,17 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { @TestApi public static final int PROTECTION_FLAG_COMPANION = 0x800000; + /** + * Additional flag for {@link #protectionLevel}, corresponding + * to the <code>retailDemo</code> value of + * {@link android.R.attr#protectionLevel}. + * + * @hide + */ + @SystemApi + @TestApi + public static final int PROTECTION_FLAG_RETAIL_DEMO = 0x1000000; + /** @hide */ @IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = { PROTECTION_FLAG_PRIVILEGED, @@ -282,6 +293,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { PROTECTION_FLAG_APP_PREDICTOR, PROTECTION_FLAG_TELEPHONY, PROTECTION_FLAG_COMPANION, + PROTECTION_FLAG_RETAIL_DEMO, }) @Retention(RetentionPolicy.SOURCE) public @interface ProtectionFlags {} @@ -528,6 +540,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { if ((level & PermissionInfo.PROTECTION_FLAG_TELEPHONY) != 0) { protLevel += "|telephony"; } + if ((level & PermissionInfo.PROTECTION_FLAG_RETAIL_DEMO) != 0) { + protLevel += "|retailDemo"; + } return protLevel; } diff --git a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java index 90a332ccb430..5be9c910744d 100644 --- a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java +++ b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java @@ -97,6 +97,10 @@ public class ApkLiteParseUtils { throw new PackageParser.PackageParserException( PackageManager.INSTALL_PARSE_FAILED_NOT_APK, "No packages found in split"); } + // Apk directory is directly nested under the current directory + if (files.length == 1 && files[0].isDirectory()) { + return parseClusterPackageLite(files[0], flags); + } String packageName = null; int versionCode = 0; diff --git a/core/java/android/content/pm/parsing/ApkParseUtils.java b/core/java/android/content/pm/parsing/ApkParseUtils.java index 7506412f72cc..5c8c9a41a520 100644 --- a/core/java/android/content/pm/parsing/ApkParseUtils.java +++ b/core/java/android/content/pm/parsing/ApkParseUtils.java @@ -205,11 +205,8 @@ public class ApkParseUtils { } } - return parsingPackage.setCodePath(packageDir.getCanonicalPath()) + return parsingPackage.setCodePath(lite.codePath) .setUse32BitAbi(lite.use32bitAbi); - } catch (IOException e) { - throw new PackageParserException(INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION, - "Failed to get path: " + lite.baseCodePath, e); } finally { IoUtils.closeQuietly(assetLoader); } diff --git a/core/java/android/hardware/biometrics/BiometricManager.java b/core/java/android/hardware/biometrics/BiometricManager.java index 4c114fdc5f10..125b676e14f7 100644 --- a/core/java/android/hardware/biometrics/BiometricManager.java +++ b/core/java/android/hardware/biometrics/BiometricManager.java @@ -18,6 +18,7 @@ package android.hardware.biometrics; import static android.Manifest.permission.USE_BIOMETRIC; import static android.Manifest.permission.USE_BIOMETRIC_INTERNAL; +import static android.Manifest.permission.WRITE_DEVICE_CONFIG; import android.annotation.IntDef; import android.annotation.RequiresPermission; @@ -87,9 +88,15 @@ public class BiometricManager { /** * Empty set with no authenticators specified. + * + * <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust + * the reported strength of a biometric sensor. It is not a valid parameter for any of the + * public {@link android.hardware.biometrics} APIs. + * * @hide */ @SystemApi + @RequiresPermission(WRITE_DEVICE_CONFIG) int EMPTY_SET = 0x0000; /** @@ -115,12 +122,16 @@ public class BiometricManager { /** * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the - * requirements for <strong>Convenience</strong>, as defined by the Android CDD. This - * is not a valid parameter to any of the {@link android.hardware.biometrics} APIs, since - * the CDD allows only {@link #BIOMETRIC_WEAK} and stronger authenticators to participate. + * requirements for <strong>Convenience</strong>, as defined by the Android CDD. + * + * <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust + * the reported strength of a biometric sensor. It is not a valid parameter for any of the + * public {@link android.hardware.biometrics} APIs. + * * @hide */ @SystemApi + @RequiresPermission(WRITE_DEVICE_CONFIG) int BIOMETRIC_CONVENIENCE = 0x0FFF; /** diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl index 0dc66b5052c5..6baa3832403f 100644 --- a/core/java/android/net/IConnectivityManager.aidl +++ b/core/java/android/net/IConnectivityManager.aidl @@ -121,6 +121,14 @@ interface IConnectivityManager ParcelFileDescriptor establishVpn(in VpnConfig config); + boolean provisionVpnProfile(in VpnProfile profile, String packageName); + + void deleteVpnProfile(String packageName); + + void startVpnProfile(String packageName); + + void stopVpnProfile(String packageName); + VpnConfig getVpnConfig(int userId); @UnsupportedAppUsage diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java index f95807a14f00..e60cc81bf9d2 100644 --- a/core/java/android/net/VpnManager.java +++ b/core/java/android/net/VpnManager.java @@ -20,8 +20,17 @@ import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.NonNull; import android.annotation.Nullable; +import android.app.Activity; +import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; +import android.os.RemoteException; + +import com.android.internal.net.VpnProfile; + +import java.io.IOException; +import java.security.GeneralSecurityException; /** * This class provides an interface for apps to manage platform VPN profiles @@ -41,6 +50,15 @@ public class VpnManager { @NonNull private final Context mContext; @NonNull private final IConnectivityManager mService; + private static Intent getIntentForConfirmation() { + final Intent intent = new Intent(); + final ComponentName componentName = ComponentName.unflattenFromString( + Resources.getSystem().getString( + com.android.internal.R.string.config_customVpnConfirmDialogComponent)); + intent.setComponent(componentName); + return intent; + } + /** * Create an instance of the VpnManger with the given context. * @@ -57,18 +75,49 @@ public class VpnManager { /** * Install a VpnProfile configuration keyed on the calling app's package name. * - * @param profile the PlatformVpnProfile provided by this package. Will override any previous - * PlatformVpnProfile stored for this package. - * @return an intent to request user consent if needed (null otherwise). + * <p>This method returns {@code null} if user consent has already been granted, or an {@link + * Intent} to a system activity. If an intent is returned, the application should launch the + * activity using {@link Activity#startActivityForResult} to request user consent. The activity + * may pop up a dialog to require user action, and the result will come back via its {@link + * Activity#onActivityResult}. If the result is {@link Activity#RESULT_OK}, the user has + * consented, and the VPN profile can be started. + * + * @param profile the VpnProfile provided by this package. Will override any previous VpnProfile + * stored for this package. + * @return an Intent requesting user consent to start the VPN, or null if consent is not + * required based on privileges or previous user consent. */ @Nullable public Intent provisionVpnProfile(@NonNull PlatformVpnProfile profile) { - throw new UnsupportedOperationException("Not yet implemented"); + final VpnProfile internalProfile; + + try { + internalProfile = profile.toVpnProfile(); + } catch (GeneralSecurityException | IOException e) { + // Conversion to VpnProfile failed; this is an invalid profile. Both of these exceptions + // indicate a failure to convert a PrivateKey or X509Certificate to a Base64 encoded + // string as required by the VpnProfile. + throw new IllegalArgumentException("Failed to serialize PlatformVpnProfile", e); + } + + try { + // Profile can never be null; it either gets set, or an exception is thrown. + if (mService.provisionVpnProfile(internalProfile, mContext.getOpPackageName())) { + return null; + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + return getIntentForConfirmation(); } /** Delete the VPN profile configuration that was provisioned by the calling app */ public void deleteProvisionedVpnProfile() { - throw new UnsupportedOperationException("Not yet implemented"); + try { + mService.deleteVpnProfile(mContext.getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** @@ -78,11 +127,19 @@ public class VpnManager { * setup, or if user consent has not been granted */ public void startProvisionedVpnProfile() { - throw new UnsupportedOperationException("Not yet implemented"); + try { + mService.startVpnProfile(mContext.getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** Tear down the VPN provided by the calling app (if any) */ public void stopProvisionedVpnProfile() { - throw new UnsupportedOperationException("Not yet implemented"); + try { + mService.stopVpnProfile(mContext.getOpPackageName()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } } diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index 73e1adf134f2..223f92054f79 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -19,6 +19,7 @@ package android.os; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.WorkerThread; import android.content.res.AssetFileDescriptor; import android.os.IUpdateEngine; import android.os.IUpdateEngineCallback; @@ -478,7 +479,7 @@ public class UpdateEngine { * </ul> */ @ErrorCode - public int errorCode() { + public int getErrorCode() { return mErrorCode; } @@ -492,14 +493,15 @@ public class UpdateEngine { * * @return The following values: * <ul> - * <li>zero if {@link #errorCode} returns {@link ErrorCodeConstants#SUCCESS}</li> - * <li>non-zero if {@link #errorCode} returns {@link ErrorCodeConstants#NOT_ENOUGH_SPACE}. + * <li>zero if {@link #getErrorCode} returns {@link ErrorCodeConstants#SUCCESS}</li> + * <li>non-zero if {@link #getErrorCode} returns + * {@link ErrorCodeConstants#NOT_ENOUGH_SPACE}. * Value is the estimated total space required on userdata partition.</li> * </ul> - * @throws IllegalStateException if {@link #errorCode} is not one of the above. + * @throws IllegalStateException if {@link #getErrorCode} is not one of the above. * */ - public long freeSpaceRequired() { + public long getFreeSpaceRequired() { if (mErrorCode == ErrorCodeConstants.SUCCESS) { return 0; } @@ -507,7 +509,7 @@ public class UpdateEngine { return mFreeSpaceRequired; } throw new IllegalStateException(String.format( - "freeSpaceRequired() is not available when error code is %d", mErrorCode)); + "getFreeSpaceRequired() is not available when error code is %d", mErrorCode)); } } @@ -531,8 +533,10 @@ public class UpdateEngine { * * @param payloadMetadataFilename See {@link #verifyPayloadMetadata}. * @param headerKeyValuePairs See {@link #applyPayload}. - * @return See {@link AllocateSpaceResult}. + * @return See {@link AllocateSpaceResult#getErrorCode} and + * {@link AllocateSpaceResult#getFreeSpaceRequired}. */ + @WorkerThread @NonNull public AllocateSpaceResult allocateSpace( @NonNull String payloadMetadataFilename, @@ -583,6 +587,7 @@ public class UpdateEngine { * @throws ServiceSpecificException if other transient errors has occurred. * A reboot may or may not help resolving the issue. */ + @WorkerThread @ErrorCode public int cleanupAppliedPayload() { try { diff --git a/core/java/android/os/incremental/IncrementalFileStorages.java b/core/java/android/os/incremental/IncrementalFileStorages.java index 4a668791aeb9..987a53e337a0 100644 --- a/core/java/android/os/incremental/IncrementalFileStorages.java +++ b/core/java/android/os/incremental/IncrementalFileStorages.java @@ -17,24 +17,24 @@ package android.os.incremental; /** - * Set up files and directories used in an installation session. - * Currently only used by Incremental Installation. - * For Incremental installation, the expected outcome of this function is: - * 0) All the files are in defaultStorage - * 1) All APK files are in the same directory, bound to mApkStorage, and bound to the - * InstallerSession's stage dir. The files are linked from mApkStorage to defaultStorage. - * 2) All lib files are in the sub directories as their names suggest, and in the same parent - * directory as the APK files. The files are linked from mApkStorage to defaultStorage. - * 3) OBB files are in another directory that is different from APK files and lib files, bound - * to mObbStorage. The files are linked from mObbStorage to defaultStorage. + * Set up files and directories used in an installation session. Currently only used by Incremental + * Installation. For Incremental installation, the expected outcome of this function is: 0) All the + * files are in defaultStorage 1) All APK files are in the same directory, bound to mApkStorage, and + * bound to the InstallerSession's stage dir. The files are linked from mApkStorage to + * defaultStorage. 2) All lib files are in the sub directories as their names suggest, and in the + * same parent directory as the APK files. The files are linked from mApkStorage to defaultStorage. + * 3) OBB files are in another directory that is different from APK files and lib files, bound to + * mObbStorage. The files are linked from mObbStorage to defaultStorage. * * @throws IllegalStateException the session is not an Incremental installation session. */ import android.annotation.NonNull; import android.annotation.Nullable; +import android.content.Context; import android.content.pm.DataLoaderParams; import android.content.pm.InstallationFile; +import android.text.TextUtils; import android.util.Slog; import java.io.File; @@ -42,6 +42,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.List; +import java.util.Objects; import java.util.Random; /** @@ -50,6 +52,10 @@ import java.util.Random; */ public final class IncrementalFileStorages { private static final String TAG = "IncrementalFileStorages"; + + private static final String TMP_DIR_ROOT = "/data/incremental/tmp"; + private static final Random TMP_DIR_RANDOM = new Random(); + private @Nullable IncrementalStorage mDefaultStorage; private @Nullable String mDefaultDir; private @NonNull IncrementalManager mIncrementalManager; @@ -61,41 +67,77 @@ public final class IncrementalFileStorages { * TODO(b/133435829): code clean up * * @throws IllegalStateException the session is not an Incremental installation session. + * @throws IOException if fails to setup files or directories. */ - public IncrementalFileStorages(@NonNull String packageName, + public static IncrementalFileStorages initialize(Context context, @NonNull File stageDir, + @NonNull DataLoaderParams dataLoaderParams, + List<InstallationFile> addedFiles) throws IOException { + // TODO(b/136132412): sanity check if session should not be incremental + IncrementalManager incrementalManager = (IncrementalManager) context.getSystemService( + Context.INCREMENTAL_SERVICE); + if (incrementalManager == null) { + // TODO(b/146080380): add incremental-specific error code + throw new IOException("Failed to obtain incrementalManager."); + } + + IncrementalFileStorages result = null; + try { + result = new IncrementalFileStorages(stageDir, incrementalManager, dataLoaderParams); + for (InstallationFile file : addedFiles) { + if (file.getFileType() == InstallationFile.FILE_TYPE_APK) { + try { + result.addApkFile(file); + } catch (IOException e) { + // TODO(b/146080380): add incremental-specific error code + throw new IOException( + "Failed to add and configure Incremental File: " + file.getName(), + e); + } + } else { + throw new IOException("Unknown file type: " + file.getFileType()); + } + } + + if (!result.mDefaultStorage.startLoading()) { + // TODO(b/146080380): add incremental-specific error code + throw new IOException("Failed to start loading data for Incremental installation."); + } + + return result; + } catch (IOException e) { + if (result != null) { + result.cleanUp(); + } + throw e; + } + } + + private IncrementalFileStorages(@NonNull File stageDir, @NonNull IncrementalManager incrementalManager, - @NonNull DataLoaderParams dataLoaderParams) { + @NonNull DataLoaderParams dataLoaderParams) throws IOException { mStageDir = stageDir; mIncrementalManager = incrementalManager; if (dataLoaderParams.getComponentName().getPackageName().equals("local")) { final String incrementalPath = dataLoaderParams.getArguments(); - mDefaultStorage = mIncrementalManager.openStorage(incrementalPath); mDefaultDir = incrementalPath; - return; - } - mDefaultDir = getTempDir(); - if (mDefaultDir == null) { - return; + if (TextUtils.isEmpty(mDefaultDir)) { + throw new IOException("Failed to create storage: incrementalPath is empty"); + } + mDefaultStorage = mIncrementalManager.openStorage(incrementalPath); + } else { + mDefaultDir = getTempDir(); + if (mDefaultDir == null) { + throw new IOException("Failed to create storage: tempDir is empty"); + } + mDefaultStorage = mIncrementalManager.createStorage(mDefaultDir, + dataLoaderParams, + IncrementalManager.CREATE_MODE_CREATE + | IncrementalManager.CREATE_MODE_TEMPORARY_BIND, false); } - mDefaultStorage = mIncrementalManager.createStorage(mDefaultDir, - dataLoaderParams, - IncrementalManager.CREATE_MODE_CREATE - | IncrementalManager.CREATE_MODE_TEMPORARY_BIND, false); - } - /** - * Adds a file into the installation session. Makes sure it will be placed inside - * a proper storage instance, based on its file type. - */ - public void addFile(@NonNull InstallationFile file) throws IOException { if (mDefaultStorage == null) { - throw new IOException("Cannot add file because default storage does not exist"); - } - if (file.getFileType() == InstallationFile.FILE_TYPE_APK) { - addApkFile(file); - } else { - throw new IOException("Unknown file type: " + file.getFileType()); + throw new IOException("Failed to create storage"); } } @@ -108,26 +150,6 @@ public final class IncrementalFileStorages { mDefaultStorage.makeFile(apkName, apk.getSize(), null, apk.getMetadata(), 0, null, null, null); } - if (targetFile.exists()) { - Slog.i(TAG, "!!! created: " + targetFile.getAbsolutePath()); - } - } - - /** - * Starts loading data for default storage. - * TODO(b/136132412): update the implementation with latest API design. - */ - public boolean startLoading() { - if (mDefaultStorage == null) { - return false; - } - return mDefaultStorage.startLoading(); - } - - /** - * Sets up obb storage directory and create bindings. - */ - public void finishSetUp() { } /** @@ -135,22 +157,21 @@ public final class IncrementalFileStorages { * TODO(b/136132412): make sure unnecessary binds are removed but useful storages are kept */ public void cleanUp() { - if (mDefaultStorage != null && mDefaultDir != null) { - try { - mDefaultStorage.unBind(mDefaultDir); - mDefaultStorage.unBind(mStageDir.getAbsolutePath()); - } catch (IOException ignored) { - } - mDefaultDir = null; - mDefaultStorage = null; + Objects.requireNonNull(mDefaultStorage); + + try { + mDefaultStorage.unBind(mDefaultDir); + mDefaultStorage.unBind(mStageDir.getAbsolutePath()); + } catch (IOException ignored) { } + + mDefaultDir = null; + mDefaultStorage = null; } - private String getTempDir() { - final String tmpDirRoot = "/data/incremental/tmp"; - final Random random = new Random(); - final Path tmpDir = - Paths.get(tmpDirRoot, String.valueOf(random.nextInt(Integer.MAX_VALUE - 1))); + private static String getTempDir() { + final Path tmpDir = Paths.get(TMP_DIR_ROOT, + String.valueOf(TMP_DIR_RANDOM.nextInt(Integer.MAX_VALUE - 1))); try { Files.createDirectories(tmpDir); } catch (Exception ex) { diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index e383a371eb41..146387e761d4 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -2381,11 +2381,7 @@ public final class ContactsContract { * This id is provided by its own data source, and can be used to backup metadata * to the server. * This should be unique within each set of account_name/account_type/data_set - * - * @deprecated This column is no longer supported as of Android version - * {@link android.os.Build.VERSION_CODES#R}. */ - @Deprecated public static final String BACKUP_ID = "backup_id"; /** @@ -2450,8 +2446,8 @@ public final class ContactsContract { * needs to be synchronized by the server. * <P>Type: INTEGER (boolean)</P> * - * @deprecated This column is no longer supported as of Android version - * {@link android.os.Build.VERSION_CODES#R}. + * @deprecated This column never actually worked since added. It will not supported as + * of Android version {@link android.os.Build.VERSION_CODES#R}. */ @Deprecated public static final String METADATA_DIRTY = "metadata_dirty"; @@ -4196,8 +4192,8 @@ public final class ContactsContract { * Hash id on the data fields, used for backup and restore. * * @hide - * @deprecated This column is no longer supported as of Android version - * {@link android.os.Build.VERSION_CODES#R}. + * @deprecated This column was never public since added. It will not be supported + * as of Android version {@link android.os.Build.VERSION_CODES#R}. */ @Deprecated public static final String HASH_ID = "hash_id"; @@ -9506,8 +9502,8 @@ public final class ContactsContract { /** * @hide - * @deprecated These columns are no longer supported as of Android version - * {@link android.os.Build.VERSION_CODES#R}. + * @deprecated These columns were never public since added. They will not be supported + * as of Android version {@link android.os.Build.VERSION_CODES#R}. */ @Deprecated @SystemApi @@ -9616,8 +9612,8 @@ public final class ContactsContract { * from server before it is merged into other CP2 tables. * * @hide - * @deprecated These columns are no longer supported as of Android version - * {@link android.os.Build.VERSION_CODES#R}. + * @deprecated These columns were never public since added. They will not be supported + * as of Android version {@link android.os.Build.VERSION_CODES#R}. */ @Deprecated @SystemApi diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index 091d78e88c98..505d4ca4b399 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -383,6 +383,14 @@ public final class DeviceConfig { */ public static final String NAMESPACE_WIDGET = "widget"; + /** + * Namespace for connectivity thermal power manager features. + * + * @hide + */ + public static final String NAMESPACE_CONNECTIVITY_THERMAL_POWER_MANAGER = + "connectivity_thermal_power_manager"; + private static final Object sLock = new Object(); @GuardedBy("sLock") private static ArrayMap<OnPropertiesChangedListener, Pair<String, Executor>> sListeners = diff --git a/core/java/android/service/autofill/Dataset.java b/core/java/android/service/autofill/Dataset.java index 262d9896df87..886b433d4ade 100644 --- a/core/java/android/service/autofill/Dataset.java +++ b/core/java/android/service/autofill/Dataset.java @@ -322,6 +322,9 @@ public final class Dataset implements Parcelable { * platform needs to fill in the authentication arguments. * * @param authentication Intent to an activity with your authentication flow. + * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. * * @see android.app.PendingIntent @@ -349,6 +352,8 @@ public final class Dataset implements Parcelable { * * @param id id for this dataset or {@code null} to unset. * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. */ public @NonNull Builder setId(@Nullable String id) { @@ -378,6 +383,9 @@ public final class Dataset implements Parcelable { * @param value value to be autofilled. Pass {@code null} if you do not have the value * but the target view is a logical part of the dataset. For example, if * the dataset needs authentication and you have no access to the value. + * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. */ public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value) { @@ -403,8 +411,10 @@ public final class Dataset implements Parcelable { * but the target view is a logical part of the dataset. For example, if * the dataset needs authentication and you have no access to the value. * @param presentation the presentation used to visualize this field. - * @return this builder. * + * @throws IllegalStateException if {@link #build()} was already called. + * + * @return this builder. */ public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value, @NonNull RemoteViews presentation) { @@ -439,7 +449,7 @@ public final class Dataset implements Parcelable { * * @return this builder. * @throws IllegalStateException if the builder was constructed without a - * {@link RemoteViews presentation}. + * {@link RemoteViews presentation} or {@link #build()} was already called. */ public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value, @Nullable Pattern filter) { @@ -475,6 +485,8 @@ public final class Dataset implements Parcelable { * such as passwords). * @param presentation the presentation used to visualize this field. * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. */ public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value, @@ -504,6 +516,8 @@ public final class Dataset implements Parcelable { * as inline suggestions. If the dataset supports inline suggestions, * this should not be null. * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. */ public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value, @@ -544,6 +558,8 @@ public final class Dataset implements Parcelable { * as inline suggestions. If the dataset supports inline suggestions, this * should not be null. * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. */ public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value, @@ -576,6 +592,8 @@ public final class Dataset implements Parcelable { * as inline suggestions. If the dataset supports inline suggestions, this * should not be null. * + * @throws IllegalStateException if {@link #build()} was already called. + * * @return this builder. * * @hide @@ -628,7 +646,8 @@ public final class Dataset implements Parcelable { * @throws IllegalStateException if no field was set (through * {@link #setValue(AutofillId, AutofillValue)} or * {@link #setValue(AutofillId, AutofillValue, RemoteViews)} or - * {@link #setValue(AutofillId, AutofillValue, RemoteViews, InlinePresentation)}). + * {@link #setValue(AutofillId, AutofillValue, RemoteViews, InlinePresentation)}), + * or if {@link #build()} was already called. * * @return The built dataset. */ diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java index 5a8521fead87..707426a22889 100644 --- a/core/java/android/service/contentcapture/ContentCaptureService.java +++ b/core/java/android/service/contentcapture/ContentCaptureService.java @@ -42,7 +42,6 @@ import android.os.RemoteException; import android.util.Log; import android.util.Slog; import android.util.SparseIntArray; -import android.util.StatsLog; import android.view.contentcapture.ContentCaptureCondition; import android.view.contentcapture.ContentCaptureContext; import android.view.contentcapture.ContentCaptureEvent; @@ -55,6 +54,7 @@ import android.view.contentcapture.IContentCaptureDirectManager; import android.view.contentcapture.MainContentCaptureSession; import com.android.internal.os.IResultReceiver; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.Preconditions; import java.io.FileDescriptor; @@ -594,7 +594,7 @@ public abstract class ContentCaptureService extends Service { + rightUid); long now = System.currentTimeMillis(); if (now - mLastCallerMismatchLog > mCallerMismatchTimeout) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_CALLER_MISMATCH_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_CALLER_MISMATCH_REPORTED, getPackageManager().getNameForUid(rightUid), getPackageManager().getNameForUid(uid)); mLastCallerMismatchLog = now; diff --git a/core/java/android/util/RotationUtils.java b/core/java/android/util/RotationUtils.java new file mode 100644 index 000000000000..a44ed59c14d4 --- /dev/null +++ b/core/java/android/util/RotationUtils.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2020 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.util; + +import static android.view.Surface.ROTATION_0; +import static android.view.Surface.ROTATION_180; +import static android.view.Surface.ROTATION_270; +import static android.view.Surface.ROTATION_90; + +import android.graphics.Insets; +import android.view.Surface.Rotation; + +/** + * A class containing utility methods related to rotation. + * + * @hide + */ +public class RotationUtils { + + /** + * Rotates an Insets according to the given rotation. + */ + public static Insets rotateInsets(Insets insets, @Rotation int rotation) { + if (insets == null || insets == Insets.NONE) { + return insets; + } + Insets rotated; + switch (rotation) { + case ROTATION_0: + rotated = insets; + break; + case ROTATION_90: + rotated = Insets.of( + insets.top, + insets.right, + insets.bottom, + insets.left); + break; + case ROTATION_180: + rotated = Insets.of( + insets.right, + insets.bottom, + insets.left, + insets.top); + break; + case ROTATION_270: + rotated = Insets.of( + insets.bottom, + insets.left, + insets.top, + insets.right); + break; + default: + throw new IllegalArgumentException("unknown rotation: " + rotation); + } + return rotated; + } +} diff --git a/core/java/android/util/StatsLog.java b/core/java/android/util/StatsLog.java index 8635340397b4..cc922d398969 100644 --- a/core/java/android/util/StatsLog.java +++ b/core/java/android/util/StatsLog.java @@ -28,6 +28,8 @@ import android.os.IStatsd; import android.os.RemoteException; import android.os.ServiceManager; +import com.android.internal.util.FrameworkStatsLog; + /** * StatsLog provides an API for developers to send events to statsd. The events can be used to * define custom metrics inside statsd. @@ -60,7 +62,7 @@ public final class StatsLog extends StatsLogInternal { return false; } service.sendAppBreadcrumbAtom(label, - StatsLog.APP_BREADCRUMB_REPORTED__STATE__START); + FrameworkStatsLog.APP_BREADCRUMB_REPORTED__STATE__START); return true; } catch (RemoteException e) { sService = null; @@ -88,7 +90,8 @@ public final class StatsLog extends StatsLogInternal { } return false; } - service.sendAppBreadcrumbAtom(label, StatsLog.APP_BREADCRUMB_REPORTED__STATE__STOP); + service.sendAppBreadcrumbAtom( + label, FrameworkStatsLog.APP_BREADCRUMB_REPORTED__STATE__STOP); return true; } catch (RemoteException e) { sService = null; @@ -117,7 +120,7 @@ public final class StatsLog extends StatsLogInternal { return false; } service.sendAppBreadcrumbAtom( - label, StatsLog.APP_BREADCRUMB_REPORTED__STATE__UNSPECIFIED); + label, FrameworkStatsLog.APP_BREADCRUMB_REPORTED__STATE__UNSPECIFIED); return true; } catch (RemoteException e) { sService = null; diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java index 19793b945ffd..f6c72c4eefbc 100644 --- a/core/java/android/view/GestureDetector.java +++ b/core/java/android/view/GestureDetector.java @@ -16,12 +16,12 @@ package android.view; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DOUBLE_TAP; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SCROLL; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DOUBLE_TAP; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SCROLL; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; @@ -29,7 +29,8 @@ import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.SystemClock; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; /** * Detects various gestures and events using the supplied {@link MotionEvent}s. @@ -887,8 +888,8 @@ public class GestureDetector { mHasRecordedClassification = true; return; } - StatsLog.write( - StatsLog.TOUCH_GESTURE_CLASSIFIED, + FrameworkStatsLog.write( + FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED, getClass().getName(), classification, (int) (SystemClock.uptimeMillis() - mCurrentMotionEvent.getDownTime()), diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 1677357dedbe..91000a93b17c 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -318,5 +318,11 @@ interface IWindowSession { * an input channel where the client can receive input. */ void grantInputChannel(int displayId, in SurfaceControl surface, in IWindow window, - in IBinder hostInputToken, out InputChannel outInputChannel); + in IBinder hostInputToken, int flags, out InputChannel outInputChannel); + + /** + * Update the flags on an input channel associated with a particular surface. + */ + void updateInputChannel(in IBinder channelToken, int displayId, in SurfaceControl surface, + int flags); } diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index bee05a9a57d0..fe9e36e53cd8 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -152,7 +152,8 @@ public final class SurfaceControl implements Parcelable { int L, int T, int R, int B); private static native void nativeSetDisplaySize(long transactionObj, IBinder displayToken, int width, int height); - private static native SurfaceControl.PhysicalDisplayInfo[] nativeGetDisplayConfigs( + private static native SurfaceControl.DisplayInfo nativeGetDisplayInfo(IBinder displayToken); + private static native SurfaceControl.DisplayConfig[] nativeGetDisplayConfigs( IBinder displayToken); private static native DisplayedContentSamplingAttributes nativeGetDisplayedContentSamplingAttributes(IBinder displayToken); @@ -1278,140 +1279,45 @@ public final class SurfaceControl implements Parcelable { Integer.toHexString(System.identityHashCode(this)); } - /* - * set display parameters. - * needs to be inside open/closeTransaction block + /** + * Immutable information about physical display. + * + * @hide */ + public static final class DisplayInfo { + public float density; + public boolean secure; + + @Override + public String toString() { + return "DisplayInfo{density=" + density + ", secure=" + secure + "}"; + } + } /** - * Describes the properties of a physical display known to surface flinger. + * Configuration supported by physical display. + * * @hide */ - public static final class PhysicalDisplayInfo { - /** - * @hide - */ - @UnsupportedAppUsage + public static final class DisplayConfig { public int width; - - /** - * @hide - */ - @UnsupportedAppUsage public int height; - - /** - * @hide - */ - @UnsupportedAppUsage - public float refreshRate; - - /** - * @hide - */ - @UnsupportedAppUsage - public float density; - - /** - * @hide - */ - @UnsupportedAppUsage public float xDpi; - - /** - * @hide - */ - @UnsupportedAppUsage public float yDpi; - /** - * @hide - */ - @UnsupportedAppUsage - public boolean secure; - - /** - * @hide - */ - @UnsupportedAppUsage + public float refreshRate; public long appVsyncOffsetNanos; - - /** - * @hide - */ - @UnsupportedAppUsage public long presentationDeadlineNanos; - /** - * @hide - */ - @UnsupportedAppUsage - public PhysicalDisplayInfo() { - } - - /** - * @hide - */ - public PhysicalDisplayInfo(PhysicalDisplayInfo other) { - copyFrom(other); - } - - /** - * @hide - */ - @Override - public boolean equals(Object o) { - return o instanceof PhysicalDisplayInfo && equals((PhysicalDisplayInfo)o); - } - - /** - * @hide - */ - public boolean equals(PhysicalDisplayInfo other) { - return other != null - && width == other.width - && height == other.height - && refreshRate == other.refreshRate - && density == other.density - && xDpi == other.xDpi - && yDpi == other.yDpi - && secure == other.secure - && appVsyncOffsetNanos == other.appVsyncOffsetNanos - && presentationDeadlineNanos == other.presentationDeadlineNanos; - } - - /** - * @hide - */ - @Override - public int hashCode() { - return 0; // don't care - } - - /** - * @hide - */ - public void copyFrom(PhysicalDisplayInfo other) { - width = other.width; - height = other.height; - refreshRate = other.refreshRate; - density = other.density; - xDpi = other.xDpi; - yDpi = other.yDpi; - secure = other.secure; - appVsyncOffsetNanos = other.appVsyncOffsetNanos; - presentationDeadlineNanos = other.presentationDeadlineNanos; - } - - /** - * @hide - */ @Override public String toString() { - return "PhysicalDisplayInfo{" + width + " x " + height + ", " + refreshRate + " fps, " - + "density " + density + ", " + xDpi + " x " + yDpi + " dpi, secure " + secure - + ", appVsyncOffset " + appVsyncOffsetNanos - + ", bufferDeadline " + presentationDeadlineNanos + "}"; + return "DisplayConfig{width=" + width + + ", height=" + height + + ", xDpi=" + xDpi + + ", yDpi=" + yDpi + + ", refreshRate=" + refreshRate + + ", appVsyncOffsetNanos=" + appVsyncOffsetNanos + + ", presentationDeadlineNanos=" + presentationDeadlineNanos + "}"; } } @@ -1428,8 +1334,17 @@ public final class SurfaceControl implements Parcelable { /** * @hide */ - @UnsupportedAppUsage - public static SurfaceControl.PhysicalDisplayInfo[] getDisplayConfigs(IBinder displayToken) { + public static SurfaceControl.DisplayInfo getDisplayInfo(IBinder displayToken) { + if (displayToken == null) { + throw new IllegalArgumentException("displayToken must not be null"); + } + return nativeGetDisplayInfo(displayToken); + } + + /** + * @hide + */ + public static SurfaceControl.DisplayConfig[] getDisplayConfigs(IBinder displayToken) { if (displayToken == null) { throw new IllegalArgumentException("displayToken must not be null"); } @@ -1825,7 +1740,7 @@ public final class SurfaceControl implements Parcelable { } /** - * TODO(116025192): Remove this stopgap once framework is display-agnostic. + * TODO(b/116025192): Remove this stopgap once framework is display-agnostic. * * @hide */ diff --git a/core/java/android/view/SurfaceControlViewHost.java b/core/java/android/view/SurfaceControlViewHost.java index 71cf051a4e08..bf848196454d 100644 --- a/core/java/android/view/SurfaceControlViewHost.java +++ b/core/java/android/view/SurfaceControlViewHost.java @@ -138,6 +138,7 @@ public class SurfaceControlViewHost { /** * @hide */ + @TestApi public void addView(@NonNull View view, WindowManager.LayoutParams attrs) { mViewRoot.setView(view, attrs, null); } @@ -161,6 +162,7 @@ public class SurfaceControlViewHost { /** * @hide */ + @TestApi public void relayout(WindowManager.LayoutParams attrs) { mViewRoot.setLayoutParams(attrs, false); mViewRoot.setReportNextDraw(); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index ee7f6fb11de6..70475860cb4d 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -17,13 +17,14 @@ package android.view; import static android.content.res.Resources.ID_NULL; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP; -import static android.util.StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION; import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL; import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__DEEP_PRESS; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__LONG_PRESS; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__SINGLE_TAP; +import static com.android.internal.util.FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__UNKNOWN_CLASSIFICATION; + import static java.lang.Math.max; import android.animation.AnimatorInflater; @@ -102,7 +103,6 @@ import android.util.Property; import android.util.SparseArray; import android.util.SparseIntArray; import android.util.StateSet; -import android.util.StatsLog; import android.util.SuperNotCalledException; import android.util.TypedValue; import android.view.AccessibilityIterators.CharacterTextSegmentIterator; @@ -142,6 +142,7 @@ import android.widget.FrameLayout; import android.widget.ScrollBarDrawable; import com.android.internal.R; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.view.TooltipPopup; import com.android.internal.view.menu.MenuBuilder; import com.android.internal.widget.ScrollBarUtils; @@ -28059,7 +28060,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private boolean mOriginalPressedState; /** * The classification of the long click being checked: one of the - * StatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__* constants. + * FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED__CLASSIFICATION__* constants. */ private int mClassification; @@ -28125,7 +28126,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } // To avoid negatively impacting View performance, the latency and displacement metrics // are omitted. - StatsLog.write(StatsLog.TOUCH_GESTURE_CLASSIFIED, getClass().getName(), classification); + FrameworkStatsLog.write(FrameworkStatsLog.TOUCH_GESTURE_CLASSIFIED, getClass().getName(), + classification); } /** diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java index 91778aaf51fd..62f3fa4f6ed4 100644 --- a/core/java/android/view/WindowlessWindowManager.java +++ b/core/java/android/view/WindowlessWindowManager.java @@ -41,9 +41,14 @@ public class WindowlessWindowManager implements IWindowSession { private class State { SurfaceControl mSurfaceControl; WindowManager.LayoutParams mParams = new WindowManager.LayoutParams(); - State(SurfaceControl sc, WindowManager.LayoutParams p) { + int mDisplayId; + IBinder mInputChannelToken; + State(SurfaceControl sc, WindowManager.LayoutParams p, int displayId, + IBinder inputChannelToken) { mSurfaceControl = sc; mParams.copyFrom(p); + mDisplayId = displayId; + mInputChannelToken = inputChannelToken; } }; @@ -105,19 +110,23 @@ public class WindowlessWindowManager implements IWindowSession { .setFormat(attrs.format) .setName(attrs.getTitle().toString()); final SurfaceControl sc = b.build(); - synchronized (this) { - mStateForWindow.put(window.asBinder(), new State(sc, attrs)); - } if (((attrs.inputFeatures & WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0)) { try { - mRealWm.grantInputChannel(displayId, sc, window, mHostInputToken, outInputChannel); + mRealWm.grantInputChannel(displayId, sc, window, mHostInputToken, attrs.flags, + outInputChannel); } catch (RemoteException e) { - Log.e(TAG, "Failed to bless surface: " + e); + Log.e(TAG, "Failed to grant input to surface: ", e); } } + final State state = new State(sc, attrs, displayId, + outInputChannel != null ? outInputChannel.getToken() : null); + synchronized (this) { + mStateForWindow.put(window.asBinder(), state); + } + return WindowManagerGlobal.ADD_OKAY | WindowManagerGlobal.ADD_FLAG_APP_VISIBLE; } @@ -162,7 +171,7 @@ public class WindowlessWindowManager implements IWindowSession { DisplayCutout.ParcelableWrapper cutout, MergedConfiguration mergedConfiguration, SurfaceControl outSurfaceControl, InsetsState outInsetsState, Point outSurfaceSize, SurfaceControl outBLASTSurfaceControl) { - State state = null; + final State state; synchronized (this) { state = mStateForWindow.get(window.asBinder()); } @@ -173,8 +182,9 @@ public class WindowlessWindowManager implements IWindowSession { SurfaceControl sc = state.mSurfaceControl; SurfaceControl.Transaction t = new SurfaceControl.Transaction(); + int attrChanges = 0; if (inAttrs != null) { - state.mParams.copyFrom(inAttrs); + attrChanges = state.mParams.copyFrom(inAttrs); } WindowManager.LayoutParams attrs = state.mParams; @@ -197,6 +207,16 @@ public class WindowlessWindowManager implements IWindowSession { mergedConfiguration.setConfiguration(mConfiguration, mConfiguration); + if ((attrChanges & WindowManager.LayoutParams.FLAGS_CHANGED) != 0 + && state.mInputChannelToken != null) { + try { + mRealWm.updateInputChannel(state.mInputChannelToken, state.mDisplayId, sc, + attrs.flags); + } catch (RemoteException e) { + Log.e(TAG, "Failed to update surface input channel: ", e); + } + } + return 0; } @@ -353,7 +373,12 @@ public class WindowlessWindowManager implements IWindowSession { @Override public void grantInputChannel(int displayId, SurfaceControl surface, IWindow window, - IBinder hostInputToken, InputChannel outInputChannel) { + IBinder hostInputToken, int flags, InputChannel outInputChannel) { + } + + @Override + public void updateInputChannel(IBinder channelToken, int displayId, SurfaceControl surface, + int flags) { } @Override diff --git a/core/java/android/widget/Magnifier.java b/core/java/android/widget/Magnifier.java index 57b63a7a9f0d..50da6ce19f44 100644 --- a/core/java/android/widget/Magnifier.java +++ b/core/java/android/widget/Magnifier.java @@ -854,6 +854,8 @@ public final class Magnifier { // The z of the magnifier surface, defining its z order in the list of // siblings having the same parent surface (usually the main app surface). private static final int SURFACE_Z = 5; + // The width of the ramp region in pixels on the left & right sides of the fish-eye effect. + private static final int FISHEYE_RAMP_WIDTH = 30; // Display associated to the view the magnifier is attached to. private final Display mDisplay; @@ -906,7 +908,8 @@ public final class Magnifier { // Whether is in the new magnifier style. private boolean mIsFishEyeStyle; // The mesh matrix for the fish-eye effect. - private float[] mMesh; + private float[] mMeshLeft; + private float[] mMeshRight; private int mMeshWidth; private int mMeshHeight; @@ -986,29 +989,29 @@ public final class Magnifier { } private void createMeshMatrixForFishEyeEffect() { - mMeshWidth = mZoom < 1.5f ? 5 : 4; + mMeshWidth = 1; mMeshHeight = 6; final float w = mContentWidth; final float h = mContentHeight; - final float dx = (w - mZoom * w * (mMeshWidth - 2) / mMeshWidth) / 2; - mMesh = new float[2 * (mMeshWidth + 1) * (mMeshHeight + 1)]; + final float h0 = h / mZoom; + final float dh = h - h0; + final float ramp = FISHEYE_RAMP_WIDTH; + mMeshLeft = new float[2 * (mMeshWidth + 1) * (mMeshHeight + 1)]; + mMeshRight = new float[2 * (mMeshWidth + 1) * (mMeshHeight + 1)]; for (int i = 0; i < 2 * (mMeshWidth + 1) * (mMeshHeight + 1); i += 2) { // Calculates X value. final int colIndex = i % (2 * (mMeshWidth + 1)) / 2; - if (colIndex == 0) { - mMesh[i] = 0; - } else if (colIndex == mMeshWidth) { - mMesh[i] = w; - } else { - mMesh[i] = (colIndex - 1) * (w - 2 * dx) / (mMeshWidth - 2) + dx; - } + mMeshLeft[i] = (float) colIndex * ramp / mMeshWidth; + mMeshRight[i] = w - ramp + colIndex * ramp / mMeshWidth; + // Calculates Y value. final int rowIndex = i / 2 / (mMeshWidth + 1); - final float y0 = colIndex == 0 || colIndex == mMeshWidth - ? (h - h / mZoom) / 2 : 0; - final float dy = colIndex == 0 || colIndex == mMeshWidth - ? h / mZoom / mMeshHeight : h / mMeshHeight; - mMesh[i + 1] = y0 + rowIndex * dy; + final float hl = h0 + dh * colIndex / mMeshWidth; + final float yl = (h - hl) / 2; + mMeshLeft[i + 1] = yl + hl * rowIndex / mMeshHeight; + final float hr = h - dh * colIndex / mMeshWidth; + final float yr = (h - hr) / 2; + mMeshRight[i + 1] = yr + hr * rowIndex / mMeshHeight; } } @@ -1166,14 +1169,31 @@ public final class Magnifier { final RecordingCanvas canvas = mBitmapRenderNode.beginRecording(mContentWidth, mContentHeight); try { + final int w = mBitmap.getWidth(); + final int h = mBitmap.getHeight(); + final Paint paint = new Paint(); + paint.setFilterBitmap(true); if (mIsFishEyeStyle) { + final int ramp = FISHEYE_RAMP_WIDTH; + final int margin = + (int)((mContentWidth - (mContentWidth - 2 * ramp) / mZoom) / 2); + + // Draws the middle part. + final Rect srcRect = new Rect(margin, 0, w - margin, h); + final Rect dstRect = new Rect( + ramp, 0, mContentWidth - ramp, mContentHeight); + canvas.drawBitmap(mBitmap, srcRect, dstRect, paint); + + // Draws the left/right parts with mesh matrixes. + canvas.drawBitmapMesh( + Bitmap.createBitmap(mBitmap, 0, 0, margin, h), + mMeshWidth, mMeshHeight, mMeshLeft, 0, null, 0, paint); canvas.drawBitmapMesh( - mBitmap, mMeshWidth, mMeshHeight, mMesh, 0, null, 0, null); + Bitmap.createBitmap(mBitmap, w - margin, 0, margin, h), + mMeshWidth, mMeshHeight, mMeshRight, 0, null, 0, paint); } else { - final Rect srcRect = new Rect(0, 0, mBitmap.getWidth(), mBitmap.getHeight()); + final Rect srcRect = new Rect(0, 0, w, h); final Rect dstRect = new Rect(0, 0, mContentWidth, mContentHeight); - final Paint paint = new Paint(); - paint.setFilterBitmap(true); canvas.drawBitmap(mBitmap, srcRect, dstRect, paint); } } finally { diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index ed04fd83a515..140c410e8de6 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -19,10 +19,10 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.metrics.LogMaker; import android.os.Build; -import android.util.StatsLog; import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.util.FrameworkStatsLog; /** * Writes sysui_multi_event records to the system event log. @@ -55,8 +55,8 @@ public class MetricsLogger { protected void saveLog(LogMaker log) { // TODO(b/116684537): Flag guard logging to event log and statsd socket. EventLogTags.writeSysuiMultiAction(log.serialize()); - StatsLog.write(StatsLog.KEY_VALUE_PAIRS_ATOM, /* UID is retrieved from statsd side */ 0, - log.getEntries()); + FrameworkStatsLog.write(FrameworkStatsLog.KEY_VALUE_PAIRS_ATOM, + /* UID is retrieved from statsd side */ 0, log.getEntries()); } public static final int VIEW_UNKNOWN = MetricsEvent.VIEW_UNKNOWN; diff --git a/core/java/com/android/internal/logging/UiEventLoggerImpl.java b/core/java/com/android/internal/logging/UiEventLoggerImpl.java index fe758a8e6cb7..785b2edf2e1b 100644 --- a/core/java/com/android/internal/logging/UiEventLoggerImpl.java +++ b/core/java/com/android/internal/logging/UiEventLoggerImpl.java @@ -16,10 +16,10 @@ package com.android.internal.logging; -import android.util.StatsLog; +import com.android.internal.util.FrameworkStatsLog; /** - * Standard implementation of UiEventLogger, writing to StatsLog. + * Standard implementation of UiEventLogger, writing to FrameworkStatsLog. * * See UiEventReported atom in atoms.proto for more context. */ @@ -33,7 +33,7 @@ public class UiEventLoggerImpl implements UiEventLogger { public void log(UiEventEnum event, int uid, String packageName) { final int eventID = event.getId(); if (eventID > 0) { - StatsLog.write(StatsLog.UI_EVENT_REPORTED, eventID, uid, packageName); + FrameworkStatsLog.write(FrameworkStatsLog.UI_EVENT_REPORTED, eventID, uid, packageName); } } @@ -42,7 +42,7 @@ public class UiEventLoggerImpl implements UiEventLogger { InstanceId instance) { final int eventID = event.getId(); if (eventID > 0) { - StatsLog.write(StatsLog.UI_EVENT_REPORTED, eventID, uid, packageName, + FrameworkStatsLog.write(FrameworkStatsLog.UI_EVENT_REPORTED, eventID, uid, packageName, instance.getId()); } } diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 580c1f00d788..18066dce287e 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -85,7 +85,6 @@ import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; import android.util.SparseLongArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.Xml; import android.view.Display; @@ -100,6 +99,7 @@ import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidUserSysTimeRea import com.android.internal.util.ArrayUtils; import com.android.internal.util.FastPrintWriter; import com.android.internal.util.FastXmlSerializer; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.XmlUtils; import libcore.util.EmptyArray; @@ -4263,13 +4263,13 @@ public class BatteryStatsImpl extends BatteryStats { getUidStatsLocked(uid).noteStartWakeLocked(pid, name, type, elapsedRealtime); if (wc != null) { - StatsLog.write(StatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), wc.getTags(), - getPowerManagerWakeLockLevel(type), name, - StatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE); + FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), + wc.getTags(), getPowerManagerWakeLockLevel(type), name, + FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE); } else { - StatsLog.write_non_chained(StatsLog.WAKELOCK_STATE_CHANGED, uid, null, - getPowerManagerWakeLockLevel(type), name, - StatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, uid, + null, getPowerManagerWakeLockLevel(type), name, + FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE); } } } @@ -4308,13 +4308,13 @@ public class BatteryStatsImpl extends BatteryStats { getUidStatsLocked(uid).noteStopWakeLocked(pid, name, type, elapsedRealtime); if (wc != null) { - StatsLog.write(StatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), wc.getTags(), - getPowerManagerWakeLockLevel(type), name, - StatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE); + FrameworkStatsLog.write(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, wc.getUids(), + wc.getTags(), getPowerManagerWakeLockLevel(type), name, + FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE); } else { - StatsLog.write_non_chained(StatsLog.WAKELOCK_STATE_CHANGED, uid, null, - getPowerManagerWakeLockLevel(type), name, - StatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED, uid, + null, getPowerManagerWakeLockLevel(type), name, + FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE); } } } @@ -4323,7 +4323,8 @@ public class BatteryStatsImpl extends BatteryStats { * Converts BatteryStats wakelock types back into PowerManager wakelock levels. * This is the inverse map of Notifier.getBatteryStatsWakeLockMonitorType(). * These are estimations, since batterystats loses some of the original data. - * TODO: Delete this. Instead, StatsLog.write should be called from PowerManager's Notifier. + * TODO: Delete this. Instead, FrameworkStatsLog.write should be called from + * PowerManager's Notifier. */ private int getPowerManagerWakeLockLevel(int battertStatsWakelockType) { switch (battertStatsWakelockType) { @@ -4516,7 +4517,7 @@ public class BatteryStatsImpl extends BatteryStats { long deltaUptime = uptimeMs - mLastWakeupUptimeMs; SamplingTimer timer = getWakeupReasonTimerLocked(mLastWakeupReason); timer.add(deltaUptime * 1000, 1); // time in in microseconds - StatsLog.write(StatsLog.KERNEL_WAKEUP_REPORTED, mLastWakeupReason, + FrameworkStatsLog.write(FrameworkStatsLog.KERNEL_WAKEUP_REPORTED, mLastWakeupReason, /* duration_usec */ deltaUptime * 1000); mLastWakeupReason = null; } @@ -4658,12 +4659,12 @@ public class BatteryStatsImpl extends BatteryStats { mGpsNesting++; if (workChain == null) { - StatsLog.write_non_chained(StatsLog.GPS_SCAN_STATE_CHANGED, uid, null, - StatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, uid, null, + FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON); } else { - StatsLog.write(StatsLog.GPS_SCAN_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, workChain.getUids(), workChain.getTags(), - StatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON); } getUidStatsLocked(uid).noteStartGps(elapsedRealtime); @@ -4684,11 +4685,11 @@ public class BatteryStatsImpl extends BatteryStats { } if (workChain == null) { - StatsLog.write_non_chained(StatsLog.GPS_SCAN_STATE_CHANGED, uid, null, - StatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, uid, null, + FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF); } else { - StatsLog.write(StatsLog.GPS_SCAN_STATE_CHANGED, workChain.getUids(), - workChain.getTags(), StatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, workChain.getUids(), + workChain.getTags(), FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF); } getUidStatsLocked(uid).noteStopGps(elapsedRealtime); @@ -4947,9 +4948,10 @@ public class BatteryStatsImpl extends BatteryStats { mPowerSaveModeEnabledTimer.stopRunningLocked(elapsedRealtime); } addHistoryRecordLocked(elapsedRealtime, uptime); - StatsLog.write(StatsLog.BATTERY_SAVER_MODE_STATE_CHANGED, enabled ? - StatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__ON : - StatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED, + enabled + ? FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__ON + : FrameworkStatsLog.BATTERY_SAVER_MODE_STATE_CHANGED__STATE__OFF); } } @@ -4977,7 +4979,7 @@ public class BatteryStatsImpl extends BatteryStats { if (nowIdling) statsmode = DEVICE_IDLE_MODE_DEEP; else if (nowLightIdling) statsmode = DEVICE_IDLE_MODE_LIGHT; else statsmode = DEVICE_IDLE_MODE_OFF; - StatsLog.write(StatsLog.DEVICE_IDLING_MODE_STATE_CHANGED, statsmode); + FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLING_MODE_STATE_CHANGED, statsmode); } if (mDeviceIdling != nowIdling) { mDeviceIdling = nowIdling; @@ -5023,7 +5025,7 @@ public class BatteryStatsImpl extends BatteryStats { mDeviceIdleModeFullTimer.startRunningLocked(elapsedRealtime); } mDeviceIdleMode = mode; - StatsLog.write(StatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mode); + FrameworkStatsLog.write(FrameworkStatsLog.DEVICE_IDLE_MODE_STATE_CHANGED, mode); } } @@ -5197,7 +5199,8 @@ public class BatteryStatsImpl extends BatteryStats { if (DEBUG_HISTORY) Slog.v(TAG, "Phone started scanning to: " + Integer.toHexString(mHistoryCur.states)); mPhoneSignalScanningTimer.startRunningLocked(elapsedRealtime); - StatsLog.write(StatsLog.PHONE_SERVICE_STATE_CHANGED, state, simState, strengthBin); + FrameworkStatsLog.write(FrameworkStatsLog.PHONE_SERVICE_STATE_CHANGED, state, + simState, strengthBin); } } @@ -5209,7 +5212,8 @@ public class BatteryStatsImpl extends BatteryStats { + Integer.toHexString(mHistoryCur.states)); newHistory = true; mPhoneSignalScanningTimer.stopRunningLocked(elapsedRealtime); - StatsLog.write(StatsLog.PHONE_SERVICE_STATE_CHANGED, state, simState, strengthBin); + FrameworkStatsLog.write(FrameworkStatsLog.PHONE_SERVICE_STATE_CHANGED, state, + simState, strengthBin); } } @@ -5236,7 +5240,8 @@ public class BatteryStatsImpl extends BatteryStats { if (DEBUG_HISTORY) Slog.v(TAG, "Signal strength " + strengthBin + " to: " + Integer.toHexString(mHistoryCur.states)); newHistory = true; - StatsLog.write(StatsLog.PHONE_SIGNAL_STRENGTH_CHANGED, strengthBin); + FrameworkStatsLog.write( + FrameworkStatsLog.PHONE_SIGNAL_STRENGTH_CHANGED, strengthBin); } else { stopAllPhoneSignalStrengthTimersLocked(-1); } @@ -12436,13 +12441,13 @@ public class BatteryStatsImpl extends BatteryStats { final int status, final int plugType, final int level) { if (recentPast == null || recentPast.batteryStatus != status) { - StatsLog.write(StatsLog.CHARGING_STATE_CHANGED, status); + FrameworkStatsLog.write(FrameworkStatsLog.CHARGING_STATE_CHANGED, status); } if (recentPast == null || recentPast.batteryPlugType != plugType) { - StatsLog.write(StatsLog.PLUGGED_STATE_CHANGED, plugType); + FrameworkStatsLog.write(FrameworkStatsLog.PLUGGED_STATE_CHANGED, plugType); } if (recentPast == null || recentPast.batteryLevel != level) { - StatsLog.write(StatsLog.BATTERY_LEVEL_CHANGED, level); + FrameworkStatsLog.write(FrameworkStatsLog.BATTERY_LEVEL_CHANGED, level); } } diff --git a/core/java/com/android/internal/os/StatsdHiddenApiUsageLogger.java b/core/java/com/android/internal/os/StatsdHiddenApiUsageLogger.java index c169b2239554..89773b3feac7 100644 --- a/core/java/com/android/internal/os/StatsdHiddenApiUsageLogger.java +++ b/core/java/com/android/internal/os/StatsdHiddenApiUsageLogger.java @@ -18,10 +18,10 @@ package com.android.internal.os; import android.metrics.LogMaker; import android.os.Process; -import android.util.StatsLog; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.util.FrameworkStatsLog; import dalvik.system.VMRuntime.HiddenApiUsageLogger; @@ -84,23 +84,24 @@ class StatsdHiddenApiUsageLogger implements HiddenApiUsageLogger { } private void newLogUsage(String signature, int accessMethod, boolean accessDenied) { - int accessMethodProto = StatsLog.HIDDEN_API_USED__ACCESS_METHOD__NONE; + int accessMethodProto = FrameworkStatsLog.HIDDEN_API_USED__ACCESS_METHOD__NONE; switch(accessMethod) { case HiddenApiUsageLogger.ACCESS_METHOD_NONE: - accessMethodProto = StatsLog.HIDDEN_API_USED__ACCESS_METHOD__NONE; + accessMethodProto = FrameworkStatsLog.HIDDEN_API_USED__ACCESS_METHOD__NONE; break; case HiddenApiUsageLogger.ACCESS_METHOD_REFLECTION: - accessMethodProto = StatsLog.HIDDEN_API_USED__ACCESS_METHOD__REFLECTION; + accessMethodProto = FrameworkStatsLog.HIDDEN_API_USED__ACCESS_METHOD__REFLECTION; break; case HiddenApiUsageLogger.ACCESS_METHOD_JNI: - accessMethodProto = StatsLog.HIDDEN_API_USED__ACCESS_METHOD__JNI; + accessMethodProto = FrameworkStatsLog.HIDDEN_API_USED__ACCESS_METHOD__JNI; break; case HiddenApiUsageLogger.ACCESS_METHOD_LINKING: - accessMethodProto = StatsLog.HIDDEN_API_USED__ACCESS_METHOD__LINKING; + accessMethodProto = FrameworkStatsLog.HIDDEN_API_USED__ACCESS_METHOD__LINKING; break; } int uid = Process.myUid(); - StatsLog.write(StatsLog.HIDDEN_API_USED, uid, signature, accessMethodProto, accessDenied); + FrameworkStatsLog.write(FrameworkStatsLog.HIDDEN_API_USED, uid, signature, + accessMethodProto, accessDenied); } } diff --git a/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java b/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java index 8bb1e48201bb..ba60fa590792 100644 --- a/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java +++ b/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java @@ -20,11 +20,11 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; import android.util.Pair; -import android.util.StatsLog; import android.view.WindowManager.LayoutParams; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.util.FrameworkStatsLog; /** * Used to wrap different logging calls in one, so that client side code base is clean and more @@ -39,10 +39,10 @@ public class MetricsLoggerWrapper { Pair<ComponentName, Integer> topActivityInfo) { MetricsLogger.action(context, MetricsEvent.ACTION_PICTURE_IN_PICTURE_DISMISSED, METRIC_VALUE_DISMISSED_BY_TAP); - StatsLog.write(StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, getUid(context, topActivityInfo.first, topActivityInfo.second), topActivityInfo.first.flattenToString(), - StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__DISMISSED); + FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__DISMISSED); } public static void logPictureInPictureDismissByDrag(Context context, @@ -50,20 +50,20 @@ public class MetricsLoggerWrapper { MetricsLogger.action(context, MetricsEvent.ACTION_PICTURE_IN_PICTURE_DISMISSED, METRIC_VALUE_DISMISSED_BY_DRAG); - StatsLog.write(StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, getUid(context, topActivityInfo.first, topActivityInfo.second), topActivityInfo.first.flattenToString(), - StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__DISMISSED); + FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__DISMISSED); } public static void logPictureInPictureMinimize(Context context, boolean isMinimized, Pair<ComponentName, Integer> topActivityInfo) { MetricsLogger.action(context, MetricsEvent.ACTION_PICTURE_IN_PICTURE_MINIMIZED, isMinimized); - StatsLog.write(StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, getUid(context, topActivityInfo.first, topActivityInfo.second), topActivityInfo.first.flattenToString(), - StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__MINIMIZED); + FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__MINIMIZED); } /** @@ -92,29 +92,29 @@ public class MetricsLoggerWrapper { int uid, String shortComponentName, boolean supportsEnterPipOnTaskSwitch) { MetricsLogger.action(context, MetricsEvent.ACTION_PICTURE_IN_PICTURE_ENTERED, supportsEnterPipOnTaskSwitch); - StatsLog.write(StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, uid, + FrameworkStatsLog.write(FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, uid, shortComponentName, - StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__ENTERED); + FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__ENTERED); } public static void logPictureInPictureFullScreen(Context context, int uid, String shortComponentName) { MetricsLogger.action(context, MetricsEvent.ACTION_PICTURE_IN_PICTURE_EXPANDED_TO_FULLSCREEN); - StatsLog.write(StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED, uid, shortComponentName, - StatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__EXPANDED_TO_FULL_SCREEN); + FrameworkStatsLog.PICTURE_IN_PICTURE_STATE_CHANGED__STATE__EXPANDED_TO_FULL_SCREEN); } public static void logAppOverlayEnter(int uid, String packageName, boolean changed, int type, boolean usingAlertWindow) { if (changed) { if (type != LayoutParams.TYPE_APPLICATION_OVERLAY) { - StatsLog.write(StatsLog.OVERLAY_STATE_CHANGED, uid, packageName, true, - StatsLog.OVERLAY_STATE_CHANGED__STATE__ENTERED); + FrameworkStatsLog.write(FrameworkStatsLog.OVERLAY_STATE_CHANGED, uid, packageName, + true, FrameworkStatsLog.OVERLAY_STATE_CHANGED__STATE__ENTERED); } else if (!usingAlertWindow){ - StatsLog.write(StatsLog.OVERLAY_STATE_CHANGED, uid, packageName, false, - StatsLog.OVERLAY_STATE_CHANGED__STATE__ENTERED); + FrameworkStatsLog.write(FrameworkStatsLog.OVERLAY_STATE_CHANGED, uid, packageName, + false, FrameworkStatsLog.OVERLAY_STATE_CHANGED__STATE__ENTERED); } } } @@ -122,11 +122,11 @@ public class MetricsLoggerWrapper { public static void logAppOverlayExit(int uid, String packageName, boolean changed, int type, boolean usingAlertWindow) { if (changed) { if (type != LayoutParams.TYPE_APPLICATION_OVERLAY) { - StatsLog.write(StatsLog.OVERLAY_STATE_CHANGED, uid, packageName, true, - StatsLog.OVERLAY_STATE_CHANGED__STATE__EXITED); + FrameworkStatsLog.write(FrameworkStatsLog.OVERLAY_STATE_CHANGED, uid, packageName, + true, FrameworkStatsLog.OVERLAY_STATE_CHANGED__STATE__EXITED); } else if (!usingAlertWindow){ - StatsLog.write(StatsLog.OVERLAY_STATE_CHANGED, uid, packageName, false, - StatsLog.OVERLAY_STATE_CHANGED__STATE__EXITED); + FrameworkStatsLog.write(FrameworkStatsLog.OVERLAY_STATE_CHANGED, uid, packageName, + false, FrameworkStatsLog.OVERLAY_STATE_CHANGED__STATE__EXITED); } } } diff --git a/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java index 31b5e491d0e5..ac2361dff560 100644 --- a/core/java/com/android/server/BootReceiver.java +++ b/core/java/com/android/server/BootReceiver.java @@ -35,14 +35,13 @@ import android.text.TextUtils; import android.util.AtomicFile; import android.util.EventLog; import android.util.Slog; -import android.util.StatsLog; import android.util.Xml; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.util.FastXmlSerializer; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.XmlUtils; -import com.android.server.DropboxLogTags; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -330,7 +329,7 @@ public class BootReceiver extends BroadcastReceiver { addTextToDropBox(db, "system_server_native_crash", text, filename, maxSize); } if (tag.equals(TAG_TOMBSTONE)) { - StatsLog.write(StatsLog.TOMB_STONE_OCCURRED); + FrameworkStatsLog.write(FrameworkStatsLog.TOMB_STONE_OCCURRED); } addTextToDropBox(db, tag, text, filename, maxSize); } @@ -427,20 +426,25 @@ public class BootReceiver extends BroadcastReceiver { int eventType; switch (propPostfix) { case "early": - eventType = StatsLog.BOOT_TIME_EVENT_DURATION__EVENT__MOUNT_EARLY_DURATION; + eventType = + FrameworkStatsLog + .BOOT_TIME_EVENT_DURATION__EVENT__MOUNT_EARLY_DURATION; break; case "default": eventType = - StatsLog.BOOT_TIME_EVENT_DURATION__EVENT__MOUNT_DEFAULT_DURATION; + FrameworkStatsLog + .BOOT_TIME_EVENT_DURATION__EVENT__MOUNT_DEFAULT_DURATION; break; case "late": - eventType = StatsLog.BOOT_TIME_EVENT_DURATION__EVENT__MOUNT_LATE_DURATION; + eventType = + FrameworkStatsLog + .BOOT_TIME_EVENT_DURATION__EVENT__MOUNT_LATE_DURATION; break; default: continue; } - StatsLog.write(StatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, eventType, - duration); + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, + eventType, duration); } } } @@ -544,7 +548,8 @@ public class BootReceiver extends BroadcastReceiver { Slog.e(TAG, "No value received for shutdown duration"); } - StatsLog.write(StatsLog.SHUTDOWN_SEQUENCE_REPORTED, reboot, reason, start, duration); + FrameworkStatsLog.write(FrameworkStatsLog.SHUTDOWN_SEQUENCE_REPORTED, reboot, reason, start, + duration); } private static void logFsShutdownTime() { @@ -571,19 +576,19 @@ public class BootReceiver extends BroadcastReceiver { Pattern pattern = Pattern.compile(LAST_SHUTDOWN_TIME_PATTERN, Pattern.MULTILINE); Matcher matcher = pattern.matcher(lines); if (matcher.find()) { - StatsLog.write(StatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, - StatsLog.BOOT_TIME_EVENT_DURATION__EVENT__SHUTDOWN_DURATION, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_DURATION_REPORTED, + FrameworkStatsLog.BOOT_TIME_EVENT_DURATION__EVENT__SHUTDOWN_DURATION, Integer.parseInt(matcher.group(1))); - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ERROR_CODE_REPORTED, - StatsLog.BOOT_TIME_EVENT_ERROR_CODE__EVENT__SHUTDOWN_UMOUNT_STAT, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ERROR_CODE_REPORTED, + FrameworkStatsLog.BOOT_TIME_EVENT_ERROR_CODE__EVENT__SHUTDOWN_UMOUNT_STAT, Integer.parseInt(matcher.group(2))); Slog.i(TAG, "boot_fs_shutdown," + matcher.group(1) + "," + matcher.group(2)); } else { // not found // This can happen when a device has too much kernel log after file system unmount // ,exceeding maxReadSize. And having that much kernel logging can affect overall // performance as well. So it is better to fix the kernel to reduce the amount of log. - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ERROR_CODE_REPORTED, - StatsLog.BOOT_TIME_EVENT_ERROR_CODE__EVENT__SHUTDOWN_UMOUNT_STAT, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ERROR_CODE_REPORTED, + FrameworkStatsLog.BOOT_TIME_EVENT_ERROR_CODE__EVENT__SHUTDOWN_UMOUNT_STAT, UMOUNT_STATUS_NOT_AVAILABLE); Slog.w(TAG, "boot_fs_shutdown, string not found"); } @@ -694,8 +699,9 @@ public class BootReceiver extends BroadcastReceiver { } stat = fixFsckFsStat(partition, stat, lines, startLineNumber, endLineNumber); if ("userdata".equals(partition) || "data".equals(partition)) { - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ERROR_CODE_REPORTED, - StatsLog.BOOT_TIME_EVENT_ERROR_CODE__EVENT__FS_MGR_FS_STAT_DATA_PARTITION, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ERROR_CODE_REPORTED, + FrameworkStatsLog + .BOOT_TIME_EVENT_ERROR_CODE__EVENT__FS_MGR_FS_STAT_DATA_PARTITION, stat); } Slog.i(TAG, "fs_stat, partition:" + partition + " stat:0x" + Integer.toHexString(stat)); diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 2b9d45431582..f564d7558832 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -22,20 +22,22 @@ #include "android_hardware_input_InputWindowHandle.h" #include "core_jni_helpers.h" +#include <memory> + +#include <android-base/chrono_utils.h> #include <android/graphics/region.h> #include <android_runtime/AndroidRuntime.h> -#include <android-base/chrono_utils.h> -#include <nativehelper/JNIHelp.h> -#include <nativehelper/ScopedUtfChars.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_view_SurfaceSession.h> #include <gui/Surface.h> #include <gui/SurfaceComposerClient.h> #include <jni.h> -#include <memory> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedUtfChars.h> #include <stdio.h> #include <system/graphics.h> #include <ui/ConfigStoreTypes.h> +#include <ui/DisplayConfig.h> #include <ui/DisplayInfo.h> #include <ui/DisplayedFrameStats.h> #include <ui/FrameStats.h> @@ -63,16 +65,21 @@ static const char* const OutOfResourcesException = static struct { jclass clazz; jmethodID ctor; + jfieldID density; + jfieldID secure; +} gDisplayInfoClassInfo; + +static struct { + jclass clazz; + jmethodID ctor; jfieldID width; jfieldID height; - jfieldID refreshRate; - jfieldID density; jfieldID xDpi; jfieldID yDpi; - jfieldID secure; + jfieldID refreshRate; jfieldID appVsyncOffsetNanos; jfieldID presentationDeadlineNanos; -} gPhysicalDisplayInfoClassInfo; +} gDisplayConfigClassInfo; static struct { jfieldID bottom; @@ -766,37 +773,46 @@ static void nativeSetDisplaySize(JNIEnv* env, jclass clazz, } } -static jobjectArray nativeGetDisplayConfigs(JNIEnv* env, jclass clazz, - jobject tokenObj) { - sp<IBinder> token(ibinderForJavaObject(env, tokenObj)); - if (token == NULL) return NULL; +static jobject nativeGetDisplayInfo(JNIEnv* env, jclass clazz, jobject tokenObj) { + DisplayInfo info; + if (const auto token = ibinderForJavaObject(env, tokenObj); + !token || SurfaceComposerClient::getDisplayInfo(token, &info) != NO_ERROR) { + return nullptr; + } - Vector<DisplayInfo> configs; - if (SurfaceComposerClient::getDisplayConfigs(token, &configs) != NO_ERROR || - configs.size() == 0) { - return NULL; + jobject object = env->NewObject(gDisplayInfoClassInfo.clazz, gDisplayInfoClassInfo.ctor); + env->SetFloatField(object, gDisplayInfoClassInfo.density, info.density); + env->SetBooleanField(object, gDisplayInfoClassInfo.secure, info.secure); + return object; +} + +static jobjectArray nativeGetDisplayConfigs(JNIEnv* env, jclass clazz, jobject tokenObj) { + Vector<DisplayConfig> configs; + if (const auto token = ibinderForJavaObject(env, tokenObj); !token || + SurfaceComposerClient::getDisplayConfigs(token, &configs) != NO_ERROR || + configs.isEmpty()) { + return nullptr; } - jobjectArray configArray = env->NewObjectArray(configs.size(), - gPhysicalDisplayInfoClassInfo.clazz, NULL); + jobjectArray configArray = + env->NewObjectArray(configs.size(), gDisplayConfigClassInfo.clazz, nullptr); for (size_t c = 0; c < configs.size(); ++c) { - const DisplayInfo& info = configs[c]; - jobject infoObj = env->NewObject(gPhysicalDisplayInfoClassInfo.clazz, - gPhysicalDisplayInfoClassInfo.ctor); - env->SetIntField(infoObj, gPhysicalDisplayInfoClassInfo.width, info.w); - env->SetIntField(infoObj, gPhysicalDisplayInfoClassInfo.height, info.h); - env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.refreshRate, info.fps); - env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.density, info.density); - env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.xDpi, info.xdpi); - env->SetFloatField(infoObj, gPhysicalDisplayInfoClassInfo.yDpi, info.ydpi); - env->SetBooleanField(infoObj, gPhysicalDisplayInfoClassInfo.secure, info.secure); - env->SetLongField(infoObj, gPhysicalDisplayInfoClassInfo.appVsyncOffsetNanos, - info.appVsyncOffset); - env->SetLongField(infoObj, gPhysicalDisplayInfoClassInfo.presentationDeadlineNanos, - info.presentationDeadline); - env->SetObjectArrayElement(configArray, static_cast<jsize>(c), infoObj); - env->DeleteLocalRef(infoObj); + const DisplayConfig& config = configs[c]; + jobject object = + env->NewObject(gDisplayConfigClassInfo.clazz, gDisplayConfigClassInfo.ctor); + env->SetIntField(object, gDisplayConfigClassInfo.width, config.resolution.getWidth()); + env->SetIntField(object, gDisplayConfigClassInfo.height, config.resolution.getHeight()); + env->SetFloatField(object, gDisplayConfigClassInfo.xDpi, config.xDpi); + env->SetFloatField(object, gDisplayConfigClassInfo.yDpi, config.yDpi); + + env->SetFloatField(object, gDisplayConfigClassInfo.refreshRate, config.refreshRate); + env->SetLongField(object, gDisplayConfigClassInfo.appVsyncOffsetNanos, + config.appVsyncOffset); + env->SetLongField(object, gDisplayConfigClassInfo.presentationDeadlineNanos, + config.presentationDeadline); + env->SetObjectArrayElement(configArray, static_cast<jsize>(c), object); + env->DeleteLocalRef(object); } return configArray; @@ -1409,7 +1425,9 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeSetDisplayProjection }, {"nativeSetDisplaySize", "(JLandroid/os/IBinder;II)V", (void*)nativeSetDisplaySize }, - {"nativeGetDisplayConfigs", "(Landroid/os/IBinder;)[Landroid/view/SurfaceControl$PhysicalDisplayInfo;", + {"nativeGetDisplayInfo", "(Landroid/os/IBinder;)Landroid/view/SurfaceControl$DisplayInfo;", + (void*)nativeGetDisplayInfo }, + {"nativeGetDisplayConfigs", "(Landroid/os/IBinder;)[Landroid/view/SurfaceControl$DisplayConfig;", (void*)nativeGetDisplayConfigs }, {"nativeGetActiveConfig", "(Landroid/os/IBinder;)I", (void*)nativeGetActiveConfig }, @@ -1507,21 +1525,24 @@ int register_android_view_SurfaceControl(JNIEnv* env) int err = RegisterMethodsOrDie(env, "android/view/SurfaceControl", sSurfaceControlMethods, NELEM(sSurfaceControlMethods)); - jclass clazz = FindClassOrDie(env, "android/view/SurfaceControl$PhysicalDisplayInfo"); - gPhysicalDisplayInfoClassInfo.clazz = MakeGlobalRefOrDie(env, clazz); - gPhysicalDisplayInfoClassInfo.ctor = GetMethodIDOrDie(env, - gPhysicalDisplayInfoClassInfo.clazz, "<init>", "()V"); - gPhysicalDisplayInfoClassInfo.width = GetFieldIDOrDie(env, clazz, "width", "I"); - gPhysicalDisplayInfoClassInfo.height = GetFieldIDOrDie(env, clazz, "height", "I"); - gPhysicalDisplayInfoClassInfo.refreshRate = GetFieldIDOrDie(env, clazz, "refreshRate", "F"); - gPhysicalDisplayInfoClassInfo.density = GetFieldIDOrDie(env, clazz, "density", "F"); - gPhysicalDisplayInfoClassInfo.xDpi = GetFieldIDOrDie(env, clazz, "xDpi", "F"); - gPhysicalDisplayInfoClassInfo.yDpi = GetFieldIDOrDie(env, clazz, "yDpi", "F"); - gPhysicalDisplayInfoClassInfo.secure = GetFieldIDOrDie(env, clazz, "secure", "Z"); - gPhysicalDisplayInfoClassInfo.appVsyncOffsetNanos = GetFieldIDOrDie(env, - clazz, "appVsyncOffsetNanos", "J"); - gPhysicalDisplayInfoClassInfo.presentationDeadlineNanos = GetFieldIDOrDie(env, - clazz, "presentationDeadlineNanos", "J"); + jclass infoClazz = FindClassOrDie(env, "android/view/SurfaceControl$DisplayInfo"); + gDisplayInfoClassInfo.clazz = MakeGlobalRefOrDie(env, infoClazz); + gDisplayInfoClassInfo.ctor = GetMethodIDOrDie(env, infoClazz, "<init>", "()V"); + gDisplayInfoClassInfo.density = GetFieldIDOrDie(env, infoClazz, "density", "F"); + gDisplayInfoClassInfo.secure = GetFieldIDOrDie(env, infoClazz, "secure", "Z"); + + jclass configClazz = FindClassOrDie(env, "android/view/SurfaceControl$DisplayConfig"); + gDisplayConfigClassInfo.clazz = MakeGlobalRefOrDie(env, configClazz); + gDisplayConfigClassInfo.ctor = GetMethodIDOrDie(env, configClazz, "<init>", "()V"); + gDisplayConfigClassInfo.width = GetFieldIDOrDie(env, configClazz, "width", "I"); + gDisplayConfigClassInfo.height = GetFieldIDOrDie(env, configClazz, "height", "I"); + gDisplayConfigClassInfo.xDpi = GetFieldIDOrDie(env, configClazz, "xDpi", "F"); + gDisplayConfigClassInfo.yDpi = GetFieldIDOrDie(env, configClazz, "yDpi", "F"); + gDisplayConfigClassInfo.refreshRate = GetFieldIDOrDie(env, configClazz, "refreshRate", "F"); + gDisplayConfigClassInfo.appVsyncOffsetNanos = + GetFieldIDOrDie(env, configClazz, "appVsyncOffsetNanos", "J"); + gDisplayConfigClassInfo.presentationDeadlineNanos = + GetFieldIDOrDie(env, configClazz, "presentationDeadlineNanos", "J"); jclass rectClazz = FindClassOrDie(env, "android/graphics/Rect"); gRectClassInfo.bottom = GetFieldIDOrDie(env, rectClazz, "bottom", "I"); diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 1ea7d6144356..92941b8cb22b 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -820,6 +820,7 @@ static void MountEmulatedStorage(uid_t uid, jint mount_mode, if (isFuse) { if (mount_mode == MOUNT_EXTERNAL_PASS_THROUGH) { const std::string pass_through_source = StringPrintf("/mnt/pass_through/%d", user_id); + PrepareDir(pass_through_source, 0710, AID_ROOT, AID_MEDIA_RW, fail_fn); BindMount(pass_through_source, "/storage", fail_fn); } else if (mount_mode == MOUNT_EXTERNAL_INSTALLER) { const std::string installer_source = StringPrintf("/mnt/installer/%d", user_id); diff --git a/core/proto/android/server/connectivity/data_stall_event.proto b/core/proto/android/server/connectivity/data_stall_event.proto index a82326f67d74..23fcf6ebc2cc 100644 --- a/core/proto/android/server/connectivity/data_stall_event.proto +++ b/core/proto/android/server/connectivity/data_stall_event.proto @@ -34,7 +34,7 @@ enum ApBand { AP_BAND_5GHZ = 2; } -// Refer to definition in ServiceState.java. +// Refer to definition in TelephonyManager.java. enum RadioTech { RADIO_TECHNOLOGY_UNKNOWN = 0; RADIO_TECHNOLOGY_GPRS = 1; @@ -49,8 +49,8 @@ enum RadioTech { RADIO_TECHNOLOGY_HSUPA = 10; RADIO_TECHNOLOGY_HSPA = 11; RADIO_TECHNOLOGY_EVDO_B = 12; - RADIO_TECHNOLOGY_EHRPD = 13; - RADIO_TECHNOLOGY_LTE = 14; + RADIO_TECHNOLOGY_LTE = 13; + RADIO_TECHNOLOGY_EHRPD = 14; RADIO_TECHNOLOGY_HSPAP = 15; RADIO_TECHNOLOGY_GSM = 16; RADIO_TECHNOLOGY_TD_SCDMA = 17; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 6b44047bf359..0e7214a4f3d3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4018,9 +4018,9 @@ statistics <p>Declaring the permission implies intention to use the API and the user of the device can grant permission through the Settings application. - <p>Protection level: signature|privileged|development|appop --> + <p>Protection level: signature|privileged|development|appop|retailDemo --> <permission android:name="android.permission.PACKAGE_USAGE_STATS" - android:protectionLevel="signature|privileged|development|appop" /> + android:protectionLevel="signature|privileged|development|appop|retailDemo" /> <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" /> <!-- @hide @SystemApi Allows an application to observe usage time of apps. The app can register @@ -4238,7 +4238,7 @@ <!-- @SystemApi @TestApi @hide Allows managing apk level rollbacks. --> <permission android:name="android.permission.MANAGE_ROLLBACKS" - android:protectionLevel="signature|verifier" /> + android:protectionLevel="signature|privileged" /> <!-- @TestApi @hide Allows testing apk level rollbacks. --> <permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" diff --git a/core/res/res/drawable/media_seamless_background.xml b/core/res/res/drawable/media_seamless_background.xml index aec89e0e8980..9b470cbe096f 100644 --- a/core/res/res/drawable/media_seamless_background.xml +++ b/core/res/res/drawable/media_seamless_background.xml @@ -20,7 +20,7 @@ <item android:id="@android:id/background"> <shape android:shape="rectangle"> <stroke android:width="1dp" android:color="#1f000000"/> - <corners android:radius="20dp"/> + <corners android:radius="24dp"/> </shape> </item> </ripple> diff --git a/core/res/res/values-mcc334/config.xml b/core/res/res/values-mcc334/config.xml new file mode 100644 index 000000000000..e99c9a028178 --- /dev/null +++ b/core/res/res/values-mcc334/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> + <bool name="config_showAreaUpdateInfoSettings">true</bool> +</resources> diff --git a/core/res/res/values-mcc732/config.xml b/core/res/res/values-mcc732/config.xml new file mode 100644 index 000000000000..e99c9a028178 --- /dev/null +++ b/core/res/res/values-mcc732/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> + <bool name="config_showAreaUpdateInfoSettings">true</bool> +</resources> diff --git a/core/res/res/values-mcc740/config.xml b/core/res/res/values-mcc740/config.xml new file mode 100644 index 000000000000..e99c9a028178 --- /dev/null +++ b/core/res/res/values-mcc740/config.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2020, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app --> + <bool name="config_showAreaUpdateInfoSettings">true</bool> +</resources> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 059bc443a609..b22e1867f257 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -301,6 +301,9 @@ <!-- Additional flag from base permission type: this permission can be automatically granted to the system companion device manager service --> <flag name="companion" value="0x800000" /> + <!-- Additional flag from base permission type: this permission will be granted to the + retail demo app, as defined by the OEM. --> + <flag name="retailDemo" value="0x1000000" /> </attr> <!-- Flags indicating more context for a permission group. --> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 52b92d2660da..612fc928dae0 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3590,7 +3590,6 @@ --> <string name="config_defaultWellbeingPackage" translatable="false"></string> - <!-- The package name for the system telephony apps. This package must be trusted, as it will be granted with permissions with special telephony protection level. Note, framework by default support multiple telephony apps, each package @@ -3658,6 +3657,19 @@ --> <string name="config_defaultContentSuggestionsService" translatable="false"></string> + <!-- The package name for the default retail demo app. + This package must be trusted, as it has the permissions to query the usage stats on the + device. + Example: "com.google.android.retaildemo" + --> + <string name="config_retailDemoPackage" translatable="false"></string> + + <!-- The package signature hash for the default retail demo app. + This package must be trusted, as it has the permissions to query the usage stats on the + device. + --> + <string name="config_retailDemoPackageSignature" translatable="false"></string> + <!-- Whether the device uses the default focus highlight when focus state isn't specified. --> <bool name="config_useDefaultFocusHighlight">true</bool> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 0b5082cdaf94..22abedcac2a7 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -33,9 +33,11 @@ <dimen name="toast_y_offset">24dp</dimen> <!-- Height of the status bar --> <dimen name="status_bar_height">@dimen/status_bar_height_portrait</dimen> - <!-- Height of the status bar in portrait --> + <!-- Height of the status bar in portrait. The height should be + Max((status bar content height + waterfall top size), top cutout size) --> <dimen name="status_bar_height_portrait">24dp</dimen> - <!-- Height of the status bar in landscape --> + <!-- Height of the status bar in landscape. The height should be + Max((status bar content height + waterfall top size), top cutout size) --> <dimen name="status_bar_height_landscape">@dimen/status_bar_height_portrait</dimen> <!-- Height of area above QQS where battery/time go --> <dimen name="quick_qs_offset_height">48dp</dimen> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 21d1d3cf9c89..d676150a4ba3 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3396,6 +3396,8 @@ <java-symbol type="string" name="config_defaultAttentionService" /> <java-symbol type="string" name="config_defaultSystemCaptionsService" /> <java-symbol type="string" name="config_defaultSystemCaptionsManagerService" /> + <java-symbol type="string" name="config_retailDemoPackage" /> + <java-symbol type="string" name="config_retailDemoPackageSignature" /> <java-symbol type="string" name="notification_channel_foreground_service" /> <java-symbol type="string" name="foreground_service_app_in_background" /> diff --git a/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java b/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java index 355601ca05ed..fbe16f2c39d1 100644 --- a/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java +++ b/core/tests/coretests/src/com/android/internal/os/BatteryStatsHelperTest.java @@ -37,12 +37,13 @@ import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Process; import android.text.format.DateUtils; -import android.util.StatsLog; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.internal.util.FrameworkStatsLog; + import junit.framework.TestCase; import org.junit.Before; @@ -262,31 +263,31 @@ public class BatteryStatsHelperTest extends TestCase { @Test public void testDrainTypesSyncedWithProto() { assertEquals(BatterySipper.DrainType.AMBIENT_DISPLAY.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__AMBIENT_DISPLAY); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__AMBIENT_DISPLAY); // AtomsProto has no "APP" assertEquals(BatterySipper.DrainType.BLUETOOTH.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__BLUETOOTH); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__BLUETOOTH); assertEquals(BatterySipper.DrainType.CAMERA.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__CAMERA); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__CAMERA); assertEquals(BatterySipper.DrainType.CELL.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__CELL); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__CELL); assertEquals(BatterySipper.DrainType.FLASHLIGHT.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__FLASHLIGHT); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__FLASHLIGHT); assertEquals(BatterySipper.DrainType.IDLE.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__IDLE); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__IDLE); assertEquals(BatterySipper.DrainType.MEMORY.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__MEMORY); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__MEMORY); assertEquals(BatterySipper.DrainType.OVERCOUNTED.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__OVERCOUNTED); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__OVERCOUNTED); assertEquals(BatterySipper.DrainType.PHONE.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__PHONE); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__PHONE); assertEquals(BatterySipper.DrainType.SCREEN.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__SCREEN); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__SCREEN); assertEquals(BatterySipper.DrainType.UNACCOUNTED.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__UNACCOUNTED); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__UNACCOUNTED); // AtomsProto has no "USER" assertEquals(BatterySipper.DrainType.WIFI.ordinal(), - StatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__WIFI); + FrameworkStatsLog.DEVICE_CALCULATED_POWER_BLAME_OTHER__DRAIN_TYPE__WIFI); } private BatterySipper createTestSmearBatterySipper(long activityTime, double totalPowerMah, diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 816bb8789667..a676fa2b2a83 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -306,6 +306,7 @@ applications that come with the platform <permission name="android.permission.LOCAL_MAC_ADDRESS"/> <permission name="android.permission.MANAGE_ACCESSIBILITY"/> <permission name="android.permission.MANAGE_DEVICE_ADMINS"/> + <permission name="android.permission.MANAGE_ROLLBACKS"/> <permission name="android.permission.MANAGE_USB"/> <permission name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/> <permission name="android.permission.MODIFY_PHONE_STATE"/> @@ -371,6 +372,7 @@ applications that come with the platform <permission name="android.permission.CONTROL_DEVICE_LIGHTS" /> <!-- Permission required for ShortcutManagerUsageTest CTS test. --> <permission name="android.permission.ACCESS_SHORTCUTS"/> + <permission name="android.permission.REBOOT"/> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> @@ -398,5 +400,6 @@ applications that come with the platform </privapp-permissions> <privapp-permissions package="com.android.settings"> <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/> + <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/> </privapp-permissions> </permissions> diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 699b96a685c9..c1435d1ea2d5 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -700,7 +700,7 @@ void CanvasContext::enqueueFrameWork(std::function<void()>&& func) { int64_t CanvasContext::getFrameNumber() { // mFrameNumber is reset to -1 when the surface changes or we swap buffers if (mFrameNumber == -1 && mNativeSurface.get()) { - mFrameNumber = static_cast<int64_t>(mNativeSurface->getNextFrameNumber()); + mFrameNumber = ANativeWindow_getNextFrameId(mNativeSurface->getNativeWindow()); } return mFrameNumber; } diff --git a/libs/hwui/renderthread/ReliableSurface.h b/libs/hwui/renderthread/ReliableSurface.h index 32472539f616..da5097ce33f0 100644 --- a/libs/hwui/renderthread/ReliableSurface.h +++ b/libs/hwui/renderthread/ReliableSurface.h @@ -43,8 +43,6 @@ public: int query(int what, int* value) const { return mSurface->query(what, value); } - uint64_t getNextFrameNumber() const { return mSurface->getNextFrameNumber(); } - int getAndClearError() { int ret = mBufferQueueState; mBufferQueueState = OK; diff --git a/libs/hwui/tests/common/TestContext.cpp b/libs/hwui/tests/common/TestContext.cpp index e075d806126b..06f158f25fc5 100644 --- a/libs/hwui/tests/common/TestContext.cpp +++ b/libs/hwui/tests/common/TestContext.cpp @@ -22,43 +22,50 @@ namespace android { namespace uirenderer { namespace test { -static const int IDENT_DISPLAYEVENT = 1; - -static android::DisplayInfo DUMMY_DISPLAY{ - 1080, // w - 1920, // h - 320.0, // xdpi - 320.0, // ydpi - 60.0, // fps - 2.0, // density - ui::ROTATION_0, // orientation - false, // secure? - 0, // appVsyncOffset - 0, // presentationDeadline -}; - -DisplayInfo getInternalDisplay() { -#if !HWUI_NULL_GPU - DisplayInfo display; - const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken(); - LOG_ALWAYS_FATAL_IF(token == nullptr, - "Failed to get display info because internal display is disconnected\n"); - status_t status = SurfaceComposerClient::getDisplayInfo(token, &display); - LOG_ALWAYS_FATAL_IF(status, "Failed to get display info\n"); - return display; +const DisplayInfo& getDisplayInfo() { + static DisplayInfo info = [] { + DisplayInfo info; +#if HWUI_NULL_GPU + info.density = 2.f; #else - return DUMMY_DISPLAY; + const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken(); + LOG_ALWAYS_FATAL_IF(!token, "%s: No internal display", __FUNCTION__); + + const status_t status = SurfaceComposerClient::getDisplayInfo(token, &info); + LOG_ALWAYS_FATAL_IF(status, "%s: Failed to get display info", __FUNCTION__); #endif + return info; + }(); + + return info; } -// Initialize to a dummy default -android::DisplayInfo gDisplay = DUMMY_DISPLAY; +const DisplayConfig& getActiveDisplayConfig() { + static DisplayConfig config = [] { + DisplayConfig config; +#if HWUI_NULL_GPU + config.resolution = ui::Size(1080, 1920); + config.xDpi = config.yDpi = 320.f; + config.refreshRate = 60.f; +#else + const sp<IBinder> token = SurfaceComposerClient::getInternalDisplayToken(); + LOG_ALWAYS_FATAL_IF(!token, "%s: No internal display", __FUNCTION__); + + const status_t status = SurfaceComposerClient::getActiveDisplayConfig(token, &config); + LOG_ALWAYS_FATAL_IF(status, "%s: Failed to get active display config", __FUNCTION__); +#endif + return config; + }(); + + return config; +} TestContext::TestContext() { mLooper = new Looper(true); mSurfaceComposerClient = new SurfaceComposerClient(); - mLooper->addFd(mDisplayEventReceiver.getFd(), IDENT_DISPLAYEVENT, Looper::EVENT_INPUT, nullptr, - nullptr); + + constexpr int EVENT_ID = 1; + mLooper->addFd(mDisplayEventReceiver.getFd(), EVENT_ID, Looper::EVENT_INPUT, nullptr, nullptr); } TestContext::~TestContext() {} @@ -79,8 +86,10 @@ void TestContext::createSurface() { } void TestContext::createWindowSurface() { - mSurfaceControl = mSurfaceComposerClient->createSurface(String8("HwuiTest"), gDisplay.w, - gDisplay.h, PIXEL_FORMAT_RGBX_8888); + const ui::Size& resolution = getActiveDisplayResolution(); + mSurfaceControl = + mSurfaceComposerClient->createSurface(String8("HwuiTest"), resolution.getWidth(), + resolution.getHeight(), PIXEL_FORMAT_RGBX_8888); SurfaceComposerClient::Transaction t; t.setLayer(mSurfaceControl, 0x7FFFFFF).show(mSurfaceControl).apply(); @@ -94,7 +103,8 @@ void TestContext::createOffscreenSurface() { producer->setMaxDequeuedBufferCount(3); producer->setAsyncMode(true); mConsumer = new BufferItemConsumer(consumer, GRALLOC_USAGE_HW_COMPOSER, 4); - mConsumer->setDefaultBufferSize(gDisplay.w, gDisplay.h); + const ui::Size& resolution = getActiveDisplayResolution(); + mConsumer->setDefaultBufferSize(resolution.getWidth(), resolution.getHeight()); mSurface = new Surface(producer); } diff --git a/libs/hwui/tests/common/TestContext.h b/libs/hwui/tests/common/TestContext.h index 116d4de8090a..a012ecb1a1d3 100644 --- a/libs/hwui/tests/common/TestContext.h +++ b/libs/hwui/tests/common/TestContext.h @@ -23,20 +23,25 @@ #include <gui/Surface.h> #include <gui/SurfaceComposerClient.h> #include <gui/SurfaceControl.h> +#include <ui/DisplayConfig.h> #include <ui/DisplayInfo.h> #include <utils/Looper.h> #include <atomic> #include <thread> +#define dp(x) ((x) * android::uirenderer::test::getDisplayInfo().density) + namespace android { namespace uirenderer { namespace test { -extern DisplayInfo gDisplay; -#define dp(x) ((x)*android::uirenderer::test::gDisplay.density) +const DisplayInfo& getDisplayInfo(); +const DisplayConfig& getActiveDisplayConfig(); -DisplayInfo getInternalDisplay(); +inline const ui::Size& getActiveDisplayResolution() { + return getActiveDisplayConfig().resolution; +} class TestContext { public: diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp index 22d5abbd3dbc..3b6baa70db9a 100644 --- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp +++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp @@ -109,16 +109,14 @@ void outputBenchmarkReport(const TestScene::Info& info, const TestScene::Options void run(const TestScene::Info& info, const TestScene::Options& opts, benchmark::BenchmarkReporter* reporter) { - // Switch to the real display - gDisplay = getInternalDisplay(); - Properties::forceDrawFrame = true; TestContext testContext; testContext.setRenderOffscreen(opts.renderOffscreen); // create the native surface - const int width = gDisplay.w; - const int height = gDisplay.h; + const ui::Size& resolution = getActiveDisplayResolution(); + const int width = resolution.getWidth(); + const int height = resolution.getHeight(); sp<Surface> surface = testContext.surface(); std::unique_ptr<TestScene> scene(info.createScene(opts)); diff --git a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java index 127d00c0afe2..d57148092754 100644 --- a/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java +++ b/location/java/com/android/internal/location/gnssmetrics/GnssMetrics.java @@ -24,12 +24,12 @@ import android.server.location.ServerLocationProtoEnums; import android.text.format.DateUtils; import android.util.Base64; import android.util.Log; -import android.util.StatsLog; import android.util.TimeUtils; import com.android.internal.app.IBatteryStats; import com.android.internal.location.nano.GnssLogsProto.GnssLog; import com.android.internal.location.nano.GnssLogsProto.PowerMetrics; +import com.android.internal.util.FrameworkStatsLog; import java.util.ArrayList; import java.util.Arrays; @@ -540,7 +540,7 @@ public class GnssMetrics { } int signalLevel = getSignalLevel(avgCn0); if (signalLevel != mLastSignalLevel) { - StatsLog.write(StatsLog.GPS_SIGNAL_QUALITY_CHANGED, signalLevel); + FrameworkStatsLog.write(FrameworkStatsLog.GPS_SIGNAL_QUALITY_CHANGED, signalLevel); mLastSignalLevel = signalLevel; } try { diff --git a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java index 85f3f72020d0..b40ab00afb30 100644 --- a/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java @@ -327,7 +327,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { */ public static class Builder extends FrontendSettings.Builder<Builder> { private int mBandwidth; - private byte mDemodOutputFormat; + private int mDemodOutputFormat; private Atsc3PlpSettings[] mPlpSettings; private Builder() { @@ -345,7 +345,7 @@ public class Atsc3FrontendSettings extends FrontendSettings { * Sets Demod Output Format. */ @NonNull - public Builder setDemodOutputFormat(byte demodOutputFormat) { + public Builder setDemodOutputFormat(@DemodOutputFormat int demodOutputFormat) { mDemodOutputFormat = demodOutputFormat; return this; } diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index bfa4f3f027a4..705d5207cc5f 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -147,11 +147,11 @@ public class DvbcFrontendSettings extends FrontendSettings { private final long mFec; private final int mSymbolRate; private final int mOuterFec; - private final byte mAnnex; + private final int mAnnex; private final int mSpectralInversion; private DvbcFrontendSettings(int frequency, int modulation, long fec, int symbolRate, - int outerFec, byte annex, int spectralInversion) { + int outerFec, int annex, int spectralInversion) { super(frequency); mModulation = modulation; mFec = fec; @@ -192,7 +192,7 @@ public class DvbcFrontendSettings extends FrontendSettings { * Gets Annex. */ @Annex - public byte getAnnex() { + public int getAnnex() { return mAnnex; } /** @@ -223,7 +223,7 @@ public class DvbcFrontendSettings extends FrontendSettings { private long mFec; private int mSymbolRate; private int mOuterFec; - private byte mAnnex; + private int mAnnex; private int mSpectralInversion; private Builder() { @@ -265,7 +265,7 @@ public class DvbcFrontendSettings extends FrontendSettings { * Sets Annex. */ @NonNull - public Builder setAnnex(@Annex byte annex) { + public Builder setAnnex(@Annex int annex) { mAnnex = annex; return this; } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java index a784e04ee6a0..ddb7341b7366 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java @@ -16,6 +16,7 @@ package com.android.settingslib.bluetooth; +import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_AUDIO; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN; @@ -45,6 +46,7 @@ public class A2dpProfile implements LocalBluetoothProfile { private boolean mIsProfileReady; private final CachedBluetoothDeviceManager mDeviceManager; + private final BluetoothAdapter mBluetoothAdapter; static final ParcelUuid[] SINK_UUIDS = { BluetoothUuid.A2DP_SINK, @@ -99,7 +101,8 @@ public class A2dpProfile implements LocalBluetoothProfile { mContext = context; mDeviceManager = deviceManager; mProfileManager = profileManager; - BluetoothAdapter.getDefaultAdapter().getProfileProxy(context, new A2dpServiceListener(), + mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + mBluetoothAdapter.getProfileProxy(context, new A2dpServiceListener(), BluetoothProfile.A2DP); } @@ -173,8 +176,10 @@ public class A2dpProfile implements LocalBluetoothProfile { } public boolean setActiveDevice(BluetoothDevice device) { - if (mService == null) return false; - return mService.setActiveDevice(device); + if (mBluetoothAdapter == null) { + return false; + } + return mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_AUDIO); } public BluetoothDevice getActiveDevice() { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java index d65b5da22056..218d0b2dc2c0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java @@ -16,6 +16,7 @@ package com.android.settingslib.bluetooth; +import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_PHONE_CALL; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN; @@ -45,6 +46,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { private final CachedBluetoothDeviceManager mDeviceManager; private final LocalBluetoothProfileManager mProfileManager; + private final BluetoothAdapter mBluetoothAdapter; static final ParcelUuid[] UUIDS = { BluetoothUuid.HSP, @@ -99,7 +101,8 @@ public class HeadsetProfile implements LocalBluetoothProfile { LocalBluetoothProfileManager profileManager) { mDeviceManager = deviceManager; mProfileManager = profileManager; - BluetoothAdapter.getDefaultAdapter().getProfileProxy(context, new HeadsetServiceListener(), + mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + mBluetoothAdapter.getProfileProxy(context, new HeadsetServiceListener(), BluetoothProfile.HEADSET); } @@ -134,10 +137,10 @@ public class HeadsetProfile implements LocalBluetoothProfile { } public boolean setActiveDevice(BluetoothDevice device) { - if (mService == null) { + if (mBluetoothAdapter == null) { return false; } - return mService.setActiveDevice(device); + return mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_PHONE_CALL); } public BluetoothDevice getActiveDevice() { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java index 9f1af669c708..b82fb37a770f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java @@ -16,6 +16,7 @@ package com.android.settingslib.bluetooth; +import static android.bluetooth.BluetoothAdapter.ACTIVE_DEVICE_ALL; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_ALLOWED; import static android.bluetooth.BluetoothProfile.CONNECTION_POLICY_FORBIDDEN; @@ -45,6 +46,7 @@ public class HearingAidProfile implements LocalBluetoothProfile { static final String NAME = "HearingAid"; private final LocalBluetoothProfileManager mProfileManager; + private final BluetoothAdapter mBluetoothAdapter; // Order of this profile in device profiles list private static final int ORDINAL = 1; @@ -97,7 +99,8 @@ public class HearingAidProfile implements LocalBluetoothProfile { mContext = context; mDeviceManager = deviceManager; mProfileManager = profileManager; - BluetoothAdapter.getDefaultAdapter().getProfileProxy(context, + mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + mBluetoothAdapter.getProfileProxy(context, new HearingAidServiceListener(), BluetoothProfile.HEARING_AID); } @@ -171,8 +174,10 @@ public class HearingAidProfile implements LocalBluetoothProfile { } public boolean setActiveDevice(BluetoothDevice device) { - if (mService == null) return false; - return mService.setActiveDevice(device); + if (mBluetoothAdapter == null) { + return false; + } + return mBluetoothAdapter.setActiveDevice(device, ACTIVE_DEVICE_ALL); } public List<BluetoothDevice> getActiveDevices() { diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java index 99c7dcf52818..d287f95e504a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaDevice.java @@ -74,6 +74,21 @@ public class InfoMediaDevice extends MediaDevice { } @Override + public void requestSetVolume(int volume) { + mRouterManager.requestSetVolume(mRouteInfo, volume); + } + + @Override + public int getMaxVolume() { + return mRouteInfo.getVolumeMax(); + } + + @Override + public int getCurrentVolume() { + return mRouteInfo.getVolume(); + } + + @Override public void disconnect() { //TODO(b/144535188): disconnected last select device } diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 53a852069478..839d528406cd 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -109,6 +109,59 @@ public abstract class MediaDevice implements Comparable<MediaDevice> { public abstract boolean isConnected(); /** + * Request to set volume. + * + * @param volume is the new value. + */ + public void requestSetVolume(int volume) { + } + + /** + * Get max volume from MediaDevice. + * + * @return max volume. + */ + public int getMaxVolume() { + return 100; + } + + /** + * Get current volume from MediaDevice. + * + * @return current volume. + */ + public int getCurrentVolume() { + return 0; + } + + /** + * Get application package name. + * + * @return package name. + */ + public String getClientPackageName() { + return null; + } + + /** + * Get application label from MediaDevice. + * + * @return application label. + */ + public String getClientAppLabel() { + return null; + } + + /** + * Get application label from MediaDevice. + * + * @return application label. + */ + public int getDeviceType() { + return mType; + } + + /** * Rules: * 1. If there is one of the connected devices identified as a carkit, this carkit will * be always on the top of the device list. Rule 2 and Rule 3 can’t overrule this rule. diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java index 78ccba02fb04..d4e0510e15a7 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java @@ -60,7 +60,7 @@ public class WifiUtils { if (config != null) { WifiConfiguration.NetworkSelectionStatus networkStatus = config.getNetworkSelectionStatus(); - for (int index = WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLE; + for (int index = WifiConfiguration.NetworkSelectionStatus.DISABLED_NONE; index < WifiConfiguration.NetworkSelectionStatus .NETWORK_SELECTION_DISABLED_MAX; index++) { if (networkStatus.getDisableReasonCounter(index) != 0) { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 3c52f543c81b..44864a61ade6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -626,7 +626,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { * Get names of the settings for which the current value should be preserved during restore. */ private Set<String> getSettingsToPreserveInRestore(Uri settingsUri) { - if (!FeatureFlagUtils.isEnabled(getApplicationContext(), + if (!FeatureFlagUtils.isEnabled(getBaseContext(), FeatureFlagUtils.SETTINGS_DO_NOT_RESTORE_PRESERVED)) { return Collections.emptySet(); } diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 84d9bb673d1f..6a89b71be897 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -91,6 +91,7 @@ <uses-permission android:name="android.permission.TEST_MANAGE_ROLLBACKS" /> <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" /> <uses-permission android:name="android.permission.READ_FRAME_BUFFER" /> + <uses-permission android:name="android.permission.REBOOT" /> <uses-permission android:name="android.permission.DEVICE_POWER" /> <uses-permission android:name="android.permission.POWER_SAVER" /> <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" /> @@ -253,6 +254,9 @@ <!-- Permission required for CTS test - CtsLightsManagerTest --> <uses-permission android:name="android.permission.CONTROL_DEVICE_LIGHTS" /> + <!-- Permission needed to test mainline permission module rollback --> + <uses-permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" diff --git a/packages/SystemUI/res/color/lock_background.xml b/packages/SystemUI/res/color/control_background.xml index 646fe5dfe712..646fe5dfe712 100644 --- a/packages/SystemUI/res/color/lock_background.xml +++ b/packages/SystemUI/res/color/control_background.xml diff --git a/packages/SystemUI/res/color/unknown_foreground.xml b/packages/SystemUI/res/color/control_foreground.xml index bf028f18a7de..bf028f18a7de 100644 --- a/packages/SystemUI/res/color/unknown_foreground.xml +++ b/packages/SystemUI/res/color/control_foreground.xml diff --git a/packages/SystemUI/res/color/thermo_cool_background.xml b/packages/SystemUI/res/color/thermo_cool_background.xml new file mode 100644 index 000000000000..646fe5dfe712 --- /dev/null +++ b/packages/SystemUI/res/color/thermo_cool_background.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:color="@color/control_default_background" /> + <item android:color="@color/GM2_blue_50" /> +</selector> diff --git a/packages/SystemUI/res/color/thermo_cool_foreground.xml b/packages/SystemUI/res/color/thermo_cool_foreground.xml new file mode 100644 index 000000000000..bf028f18a7de --- /dev/null +++ b/packages/SystemUI/res/color/thermo_cool_foreground.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:color="@color/control_default_foreground" /> + <item android:color="@color/GM2_blue_700" /> + </selector> diff --git a/packages/SystemUI/res/color/thermo_heat_background.xml b/packages/SystemUI/res/color/thermo_heat_background.xml new file mode 100644 index 000000000000..6f29ed5f60ac --- /dev/null +++ b/packages/SystemUI/res/color/thermo_heat_background.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:color="@color/control_default_background" /> + <item android:color="@color/GM2_red_50" /> +</selector> diff --git a/packages/SystemUI/res/color/lock_foreground.xml b/packages/SystemUI/res/color/thermo_heat_foreground.xml index 3e05653bce92..72f4b8d13458 100644 --- a/packages/SystemUI/res/color/lock_foreground.xml +++ b/packages/SystemUI/res/color/thermo_heat_foreground.xml @@ -2,5 +2,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false" android:color="@color/control_default_foreground" /> - <item android:color="@color/GM2_blue_700" /> + <item android:color="@color/GM2_red_700" /> </selector> diff --git a/packages/SystemUI/res/drawable/qs_media_background.xml b/packages/SystemUI/res/drawable/qs_media_background.xml new file mode 100644 index 000000000000..2821e4c28bab --- /dev/null +++ b/packages/SystemUI/res/drawable/qs_media_background.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2020 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 + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="?android:attr/colorBackgroundFloating" /> + <corners + android:bottomLeftRadius="@dimen/qs_media_corner_radius" + android:topLeftRadius="@dimen/qs_media_corner_radius" + android:bottomRightRadius="@dimen/qs_media_corner_radius" + android:topRightRadius="@dimen/qs_media_corner_radius" + /> +</shape>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/media_carousel.xml b/packages/SystemUI/res/layout/media_carousel.xml index e91f840fe238..149446c55fc5 100644 --- a/packages/SystemUI/res/layout/media_carousel.xml +++ b/packages/SystemUI/res/layout/media_carousel.xml @@ -19,7 +19,7 @@ <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="@dimen/qs_media_height" + android:layout_height="wrap_content" android:padding="@dimen/qs_media_padding" android:scrollbars="none" android:visibility="gone" diff --git a/packages/SystemUI/res/layout/qqs_media_panel.xml b/packages/SystemUI/res/layout/qqs_media_panel.xml index 1189371fc7f1..403b5dc3a427 100644 --- a/packages/SystemUI/res/layout/qqs_media_panel.xml +++ b/packages/SystemUI/res/layout/qqs_media_panel.xml @@ -23,20 +23,25 @@ android:layout_height="match_parent" android:orientation="vertical" android:gravity="center" - android:padding="10dp" + android:paddingTop="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="12dp" + android:background="@drawable/qs_media_background" > - <!-- Top line: icon + artist name --> + <!-- Top line: icon + song name --> <LinearLayout android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" android:clipChildren="false" android:gravity="center" + android:layout_marginBottom="12dp" > <com.android.internal.widget.CachingIconView android:id="@+id/icon" - android:layout_width="15dp" - android:layout_height="15dp" + android:layout_width="14dp" + android:layout_height="14dp" android:layout_marginEnd="5dp" /> <TextView @@ -48,15 +53,6 @@ /> </LinearLayout> - <!-- Second line: song name --> - <TextView - android:id="@+id/header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:fontFamily="@*android:string/config_bodyFontFamily" - android:gravity="center"/> - <!-- Bottom section: controls --> <LinearLayout android:id="@+id/media_actions" @@ -70,8 +66,6 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" android:gravity="center" android:visibility="gone" android:id="@+id/action0" @@ -80,8 +74,6 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" android:gravity="center" android:visibility="gone" android:id="@+id/action1" @@ -90,8 +82,6 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" android:gravity="center" android:visibility="gone" android:id="@+id/action2" diff --git a/packages/SystemUI/res/layout/qs_footer_impl.xml b/packages/SystemUI/res/layout/qs_footer_impl.xml index a02962e5e1e6..0c9ce3938420 100644 --- a/packages/SystemUI/res/layout/qs_footer_impl.xml +++ b/packages/SystemUI/res/layout/qs_footer_impl.xml @@ -130,9 +130,10 @@ </LinearLayout> <View android:id="@+id/qs_drag_handle_view" - android:layout_width="24dp" + android:layout_width="48dp" android:layout_height="4dp" - android:layout_marginBottom="16dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" android:layout_gravity="center_horizontal|bottom" android:background="@drawable/qs_footer_drag_handle" /> diff --git a/packages/SystemUI/res/layout/qs_media_panel.xml b/packages/SystemUI/res/layout/qs_media_panel.xml index dd422766c153..22303dc1d8d2 100644 --- a/packages/SystemUI/res/layout/qs_media_panel.xml +++ b/packages/SystemUI/res/layout/qs_media_panel.xml @@ -23,50 +23,116 @@ android:layout_height="match_parent" android:orientation="vertical" android:gravity="center_horizontal|fill_vertical" - android:padding="10dp" + android:padding="16dp" + android:background="@drawable/qs_media_background" > - <!-- placeholder for notification header --> + <!-- Header section --> <LinearLayout android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/header" - android:padding="3dp" - android:layout_marginEnd="-12dp" + android:layout_marginBottom="16dp" + > + + <ImageView + android:id="@+id/album_art" + android:layout_width="@dimen/qs_media_album_size" + android:layout_height="@dimen/qs_media_album_size" + android:layout_marginRight="16dp" + android:layout_weight="0" /> - <!-- Top line: artist name --> - <LinearLayout - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" + <LinearLayout + android:orientation="vertical" + android:layout_width="0dp" + android:layout_height="@dimen/qs_media_album_size" + android:layout_weight="1" > - <TextView - android:id="@+id/header_title" - android:layout_width="wrap_content" + <LinearLayout + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + > + <com.android.internal.widget.CachingIconView + android:id="@+id/icon" + android:layout_width="16dp" + android:layout_height="16dp" + android:layout_marginEnd="5dp" + /> + <TextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="14sp" + android:singleLine="true" + /> + </LinearLayout> + + <!-- Song name --> + <TextView + android:id="@+id/header_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:fontFamily="@*android:string/config_headlineFontFamilyMedium" + android:textSize="18sp" + android:paddingBottom="6dp" + android:gravity="center"/> + + <!-- Artist name --> + <TextView + android:id="@+id/header_artist" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@*android:string/config_bodyFontFamily" + android:textSize="14sp" + android:singleLine="true" + /> + </LinearLayout> + + <!-- Output chip --> + <LinearLayout + android:layout_width="0dp" android:layout_height="wrap_content" - android:fontFamily="@*android:string/config_headlineFontFamilyMedium" - android:singleLine="true" - /> + android:orientation="horizontal" + android:visibility="gone" + android:paddingTop="6dp" + android:paddingBottom="6dp" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:gravity="center" + android:id="@+id/media_seamless" + android:background="@*android:drawable/media_seamless_background" + android:layout_weight="1" + > + <ImageView + android:layout_width="@dimen/qs_seamless_icon_size" + android:layout_height="@dimen/qs_seamless_icon_size" + android:src="@*android:drawable/ic_media_seamless" + android:layout_marginRight="8dp" + android:id="@+id/media_seamless_image" + /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@*android:string/config_bodyFontFamily" + android:text="@*android:string/ext_media_seamless_action" + android:textSize="14sp" + android:id="@+id/media_seamless_text" + android:singleLine="true" + /> + </LinearLayout> </LinearLayout> - <!-- Second line: song name --> - <TextView - android:id="@+id/header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:fontFamily="@*android:string/config_bodyFontFamily" - android:gravity="center"/> - - <!-- Bottom section: controls --> + <!-- Controls --> <LinearLayout android:id="@+id/media_actions" android:orientation="horizontal" android:layoutDirection="ltr" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" > @@ -74,8 +140,8 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:gravity="center" android:visibility="gone" android:id="@+id/action0" @@ -84,18 +150,18 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:gravity="center" android:visibility="gone" android:id="@+id/action1" /> <ImageButton style="@android:style/Widget.Material.Button.Borderless.Small" - android:layout_width="48dp" - android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" + android:layout_width="52dp" + android:layout_height="52dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:gravity="center" android:visibility="gone" android:id="@+id/action2" @@ -104,8 +170,8 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:gravity="center" android:visibility="gone" android:id="@+id/action3" @@ -114,8 +180,8 @@ style="@android:style/Widget.Material.Button.Borderless.Small" android:layout_width="48dp" android:layout_height="48dp" - android:padding="8dp" - android:layout_marginEnd="2dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" android:gravity="center" android:visibility="gone" android:id="@+id/action4" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 1f9fb0511d26..33cabc1fea52 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1164,10 +1164,12 @@ <dimen name="new_qs_vertical_margin">8dp</dimen> <!-- Size of media cards in the QSPanel carousel --> - <dimen name="qs_media_height">150dp</dimen> <dimen name="qs_media_width">350dp</dimen> <dimen name="qs_media_padding">8dp</dimen> <dimen name="qs_media_corner_radius">10dp</dimen> + <dimen name="qs_media_album_size">72dp</dimen> + <dimen name="qs_seamless_icon_size">20dp</dimen> + <dimen name="qqs_media_spacing">8dp</dimen> <dimen name="magnification_border_size">5dp</dimen> <dimen name="magnification_frame_move_short">5dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 1f13f8dc02fe..fb8df5bfc7ce 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -196,7 +196,7 @@ <!-- text to show in place of RemoteInput images when they cannot be shown. [CHAR LIMIT=50] --> - <string name="remote_input_image_insertion_text">Image inserted</string> + <string name="remote_input_image_insertion_text">sent an image</string> <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] --> <string name="screenshot_saving_ticker">Saving screenshot\u2026</string> diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/tracing/FrameProtoTracer.java b/packages/SystemUI/shared/src/com/android/systemui/shared/tracing/FrameProtoTracer.java index 557845c34bf2..356e0ca7193c 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/tracing/FrameProtoTracer.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/tracing/FrameProtoTracer.java @@ -40,7 +40,7 @@ import java.util.function.Consumer; * @param <R> The proto class type of the entry root proto in the buffer */ public class FrameProtoTracer<P, S extends P, T extends P, R> - implements TraceBuffer.ProtoProvider<P, S, T>, Choreographer.FrameCallback { + implements Choreographer.FrameCallback { private static final String TAG = "FrameProtoTracer"; private static final int BUFFER_CAPACITY = 1024 * 1024; @@ -57,6 +57,25 @@ public class FrameProtoTracer<P, S extends P, T extends P, R> private volatile boolean mEnabled; private boolean mFrameScheduled; + private final TraceBuffer.ProtoProvider<P, S, T> mProvider = + new TraceBuffer.ProtoProvider<P, S, T>() { + @Override + public int getItemSize(P proto) { + return mParams.getProtoSize(proto); + } + + @Override + public byte[] getBytes(P proto) { + return mParams.getProtoBytes(proto); + } + + @Override + public void write(S encapsulatingProto, Queue<T> buffer, OutputStream os) + throws IOException { + os.write(mParams.serializeEncapsulatingProto(encapsulatingProto, buffer)); + } + }; + public interface ProtoTraceParams<P, S, T, R> { File getTraceFile(); S getEncapsulatingTraceProto(); @@ -68,7 +87,7 @@ public class FrameProtoTracer<P, S extends P, T extends P, R> public FrameProtoTracer(ProtoTraceParams<P, S, T, R> params) { mParams = params; - mBuffer = new TraceBuffer<>(BUFFER_CAPACITY, this, new Consumer<T>() { + mBuffer = new TraceBuffer<>(BUFFER_CAPACITY, mProvider, new Consumer<T>() { @Override public void accept(T t) { onProtoDequeued(t); @@ -78,21 +97,6 @@ public class FrameProtoTracer<P, S extends P, T extends P, R> mChoreographer = Choreographer.getMainThreadInstance(); } - @Override - public int getItemSize(P proto) { - return mParams.getProtoSize(proto); - } - - @Override - public byte[] getBytes(P proto) { - return mParams.getProtoBytes(proto); - } - - @Override - public void write(S encapsulatingProto, Queue<T> buffer, OutputStream os) throws IOException { - os.write(mParams.serializeEncapsulatingProto(encapsulatingProto, buffer)); - } - public void start() { synchronized (mLock) { if (mEnabled) { diff --git a/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java b/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java index eab970626bf1..924d16dd27d7 100644 --- a/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java +++ b/packages/SystemUI/src/com/android/systemui/ForegroundServiceNotificationListener.java @@ -89,7 +89,7 @@ public class ForegroundServiceNotificationListener { } @Override - public void onEntryRemoved(NotificationEntry entry, int reason, boolean removedByUser) { + public void onEntryRemoved(NotificationEntry entry, int reason) { removeNotification(entry.getSbn()); } }); diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/Behavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/Behavior.kt new file mode 100644 index 000000000000..44f3fbc58eaf --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/Behavior.kt @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2020 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.controls.ui + +interface Behavior { + fun apply(cvh: ControlViewHolder, cws: ControlWithState) +} diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt index 81b5f3698567..5519e32d6c10 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt @@ -17,22 +17,17 @@ package com.android.systemui.controls.ui import android.content.Context +import android.content.Intent import android.graphics.drawable.ClipDrawable -import android.graphics.drawable.Drawable import android.graphics.drawable.GradientDrawable import android.graphics.drawable.Icon import android.graphics.drawable.LayerDrawable import android.service.controls.Control -import android.service.controls.DeviceTypes -import android.service.controls.actions.BooleanAction import android.service.controls.actions.ControlAction -import android.service.controls.actions.FloatAction import android.service.controls.templates.ControlTemplate -import android.service.controls.templates.RangeTemplate +import android.service.controls.templates.TemperatureControlTemplate import android.service.controls.templates.ToggleRangeTemplate import android.service.controls.templates.ToggleTemplate -import android.util.TypedValue -import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.widget.ImageView @@ -41,8 +36,8 @@ import android.widget.TextView import com.android.systemui.controls.controller.ControlsController import com.android.systemui.R -private const val MIN_LEVEL = 0 -private const val MAX_LEVEL = 10000 +public const val MIN_LEVEL = 0 +public const val MAX_LEVEL = 10000 class ControlViewHolder( val layout: ViewGroup, @@ -78,6 +73,16 @@ class ControlViewHolder( Pair(Control.STATUS_UNKNOWN, ControlTemplate.NO_TEMPLATE) } + cws.control?.let { c -> + layout.setOnLongClickListener(View.OnLongClickListener() { + val closeDialog = Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS) + context.sendBroadcast(closeDialog) + + c.getAppIntent().send() + true + }) + } + findBehavior(status, template).apply(this, cws) } @@ -88,13 +93,14 @@ class ControlViewHolder( private fun findBehavior(status: Int, template: ControlTemplate): Behavior { return when { status == Control.STATUS_UNKNOWN -> UnknownBehavior() - template is ToggleTemplate -> ToggleTemplateBehavior() - template is ToggleRangeTemplate -> ToggleRangeTemplateBehavior() + template is ToggleTemplate -> ToggleBehavior() + template is ToggleRangeTemplate -> ToggleRangeBehavior() + template is TemperatureControlTemplate -> TemperatureControlBehavior() else -> { object : Behavior { override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { cvh.status.setText(cws.control?.getStatusText()) - cvh.applyRenderInfo(findRenderInfo(cws.ci.deviceType, false)) + cvh.applyRenderInfo(RenderInfo.lookup(cws.ci.deviceType, false)) } } } @@ -118,283 +124,3 @@ class ControlViewHolder( icon.setEnabled(enabled) } } - -private interface Behavior { - fun apply(cvh: ControlViewHolder, cws: ControlWithState) - - fun findRenderInfo(deviceType: Int, isActive: Boolean): RenderInfo = - deviceRenderMap.getOrDefault(deviceType, unknownDeviceMap).getValue(isActive) -} - -private class UnknownBehavior : Behavior { - override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { - cvh.status.setText("Loading...") - cvh.applyRenderInfo(findRenderInfo(cws.ci.deviceType, false)) - } -} - -private class ToggleRangeTemplateBehavior : Behavior { - lateinit var clipLayer: Drawable - lateinit var template: ToggleRangeTemplate - lateinit var control: Control - lateinit var cvh: ControlViewHolder - lateinit var rangeTemplate: RangeTemplate - lateinit var statusExtra: TextView - lateinit var status: TextView - lateinit var context: Context - - override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { - this.control = cws.control!! - this.cvh = cvh - - statusExtra = cvh.statusExtra - status = cvh.status - - status.setText(control.getStatusText()) - - context = status.getContext() - - cvh.layout.setOnTouchListener(ToggleRangeTouchListener()) - - val ld = cvh.layout.getBackground() as LayerDrawable - clipLayer = ld.findDrawableByLayerId(R.id.clip_layer) - - template = control.getControlTemplate() as ToggleRangeTemplate - rangeTemplate = template.getRange() - - val checked = template.isChecked() - val deviceType = control.getDeviceType() - - updateRange((rangeTemplate.getCurrentValue() / 100.0f), checked) - - cvh.setEnabled(checked) - cvh.applyRenderInfo(findRenderInfo(deviceType, checked)) - } - - fun toggle() { - cvh.action(BooleanAction(template.getTemplateId(), !template.isChecked())) - - val nextLevel = if (template.isChecked()) MIN_LEVEL else MAX_LEVEL - clipLayer.setLevel(nextLevel) - } - - fun beginUpdateRange() { - status.setVisibility(View.GONE) - statusExtra.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources() - .getDimensionPixelSize(R.dimen.control_status_expanded).toFloat()) - } - - fun updateRange(f: Float, checked: Boolean) { - clipLayer.setLevel(if (checked) (MAX_LEVEL * f).toInt() else MIN_LEVEL) - - if (checked && f < 100.0f && f > 0.0f) { - statusExtra.setText("" + (f * 100.0).toInt() + "%") - statusExtra.setVisibility(View.VISIBLE) - } else { - statusExtra.setText("") - statusExtra.setVisibility(View.GONE) - } - } - - fun endUpdateRange(f: Float) { - statusExtra.setText(" - " + (f * 100.0).toInt() + "%") - - val newValue = rangeTemplate.getMinValue() + - (f * (rangeTemplate.getMaxValue() - rangeTemplate.getMinValue())) - - statusExtra.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources() - .getDimensionPixelSize(R.dimen.control_status_normal).toFloat()) - status.setVisibility(View.VISIBLE) - - cvh.action(FloatAction(rangeTemplate.getTemplateId(), findNearestStep(newValue))) - } - - fun findNearestStep(value: Float): Float { - var minDiff = 1000f - - var f = rangeTemplate.getMinValue() - while (f <= rangeTemplate.getMaxValue()) { - val currentDiff = Math.abs(value - f) - if (currentDiff < minDiff) { - minDiff = currentDiff - } else { - return f - rangeTemplate.getStepValue() - } - - f += rangeTemplate.getStepValue() - } - - return rangeTemplate.getMaxValue() - } - - inner class ToggleRangeTouchListener() : View.OnTouchListener { - private var initialTouchX: Float = 0.0f - private var initialTouchY: Float = 0.0f - private var isDragging: Boolean = false - private val minDragDiff = 20 - - override fun onTouch(v: View, e: MotionEvent): Boolean { - when (e.getActionMasked()) { - MotionEvent.ACTION_DOWN -> setupTouch(e) - MotionEvent.ACTION_MOVE -> detectDrag(v, e) - MotionEvent.ACTION_UP -> endTouch(v, e) - } - - return true - } - - private fun setupTouch(e: MotionEvent) { - initialTouchX = e.getX() - initialTouchY = e.getY() - } - - private fun detectDrag(v: View, e: MotionEvent) { - val xDiff = Math.abs(e.getX() - initialTouchX) - val yDiff = Math.abs(e.getY() - initialTouchY) - - if (xDiff < minDragDiff) { - isDragging = false - } else { - if (!isDragging) { - this@ToggleRangeTemplateBehavior.beginUpdateRange() - } - v.getParent().requestDisallowInterceptTouchEvent(true) - isDragging = true - if (yDiff > xDiff) { - endTouch(v, e) - } else { - val percent = Math.max(0.0f, Math.min(1.0f, e.getX() / v.getWidth())) - this@ToggleRangeTemplateBehavior.updateRange(percent, true) - } - } - } - - private fun endTouch(v: View, e: MotionEvent) { - if (!isDragging) { - this@ToggleRangeTemplateBehavior.toggle() - } else { - val percent = Math.max(0.0f, Math.min(1.0f, e.getX() / v.getWidth())) - this@ToggleRangeTemplateBehavior.endUpdateRange(percent) - } - - initialTouchX = 0.0f - initialTouchY = 0.0f - isDragging = false - } - } -} - -private class ToggleTemplateBehavior : Behavior { - lateinit var clipLayer: Drawable - lateinit var template: ToggleTemplate - lateinit var control: Control - lateinit var cvh: ControlViewHolder - lateinit var context: Context - lateinit var status: TextView - - override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { - this.control = cws.control!! - this.cvh = cvh - status = cvh.status - - status.setText(control.getStatusText()) - - cvh.layout.setOnClickListener(View.OnClickListener() { toggle() }) - - val ld = cvh.layout.getBackground() as LayerDrawable - clipLayer = ld.findDrawableByLayerId(R.id.clip_layer) - - template = control.getControlTemplate() as ToggleTemplate - - val checked = template.isChecked() - val deviceType = control.getDeviceType() - - clipLayer.setLevel(if (checked) MAX_LEVEL else MIN_LEVEL) - cvh.setEnabled(checked) - cvh.applyRenderInfo(findRenderInfo(deviceType, checked)) - } - - fun toggle() { - cvh.action(BooleanAction(template.getTemplateId(), !template.isChecked())) - - val nextLevel = if (template.isChecked()) MIN_LEVEL else MAX_LEVEL - clipLayer.setLevel(nextLevel) - } -} - -internal data class RenderInfo(val iconResourceId: Int, val foreground: Int, val background: Int) - -private val unknownDeviceMap = mapOf( - false to RenderInfo( - R.drawable.ic_light_off_gm2_24px, - R.color.unknown_foreground, - R.color.unknown_foreground), - true to RenderInfo( - R.drawable.ic_lightbulb_outline_gm2_24px, - R.color.unknown_foreground, - R.color.unknown_foreground) -) - -private val deviceRenderMap = mapOf<Int, Map<Boolean, RenderInfo>>( - DeviceTypes.TYPE_UNKNOWN to unknownDeviceMap, - DeviceTypes.TYPE_LIGHT to mapOf( - false to RenderInfo( - R.drawable.ic_light_off_gm2_24px, - R.color.light_foreground, - R.color.light_background), - true to RenderInfo( - R.drawable.ic_lightbulb_outline_gm2_24px, - R.color.light_foreground, - R.color.light_background) - ), - DeviceTypes.TYPE_THERMOSTAT to mapOf( - false to RenderInfo( - R.drawable.ic_device_thermostat_gm2_24px, - R.color.light_foreground, - R.color.light_background), - true to RenderInfo( - R.drawable.ic_device_thermostat_gm2_24px, - R.color.light_foreground, - R.color.light_background) - ), - DeviceTypes.TYPE_CAMERA to mapOf( - false to RenderInfo( - R.drawable.ic_videocam_gm2_24px, - R.color.light_foreground, - R.color.light_background), - true to RenderInfo( - R.drawable.ic_videocam_gm2_24px, - R.color.light_foreground, - R.color.light_background) - ), - DeviceTypes.TYPE_LOCK to mapOf( - false to RenderInfo( - R.drawable.ic_lock_open_gm2_24px, - R.color.lock_foreground, - R.color.lock_background), - true to RenderInfo( - R.drawable.ic_lock_gm2_24px, - R.color.lock_foreground, - R.color.lock_background) - ), - DeviceTypes.TYPE_SWITCH to mapOf( - false to RenderInfo( - R.drawable.ic_switches_gm2_24px, - R.color.lock_foreground, - R.color.lock_background), - true to RenderInfo( - R.drawable.ic_switches_gm2_24px, - R.color.lock_foreground, - R.color.lock_background) - ), - DeviceTypes.TYPE_OUTLET to mapOf( - false to RenderInfo( - R.drawable.ic_power_off_gm2_24px, - R.color.lock_foreground, - R.color.lock_background), - true to RenderInfo( - R.drawable.ic_power_gm2_24px, - R.color.lock_foreground, - R.color.lock_background) - ) -) diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt index 40a93d69fef4..a777faf57fce 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt @@ -138,7 +138,10 @@ class ControlsUiControllerImpl @Inject constructor ( val serviceIntent = Intent() serviceIntent.setComponent(ComponentName("com.android.systemui.home.mock", "com.android.systemui.home.mock.AuthService")) - context.bindService(serviceIntent, tokenProviderConnection!!, Context.BIND_AUTO_CREATE) + if (!context.bindService(serviceIntent, tokenProviderConnection!!, + Context.BIND_AUTO_CREATE)) { + controlsController.get().subscribeToFavorites() + } } private fun showInitialSetupView() { diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt new file mode 100644 index 000000000000..24c8020529ff --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/RenderInfo.kt @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2020 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.controls.ui + +import android.service.controls.DeviceTypes +import android.service.controls.templates.TemperatureControlTemplate + +import com.android.systemui.R + +data class IconState(val disabledResourceId: Int, val enabledResourceId: Int) { + operator fun get(state: Boolean): Int { + return if (state) { + enabledResourceId + } else { + disabledResourceId + } + } +} + +data class RenderInfo(val iconResourceId: Int, val foreground: Int, val background: Int) { + + companion object { + fun lookup(deviceType: Int, enabled: Boolean): RenderInfo { + val iconState = deviceIconMap.getValue(deviceType) + val (fg, bg) = deviceColorMap.getValue(deviceType) + return RenderInfo(iconState[enabled], fg, bg) + } + + fun lookup(deviceType: Int, offset: Int, enabled: Boolean): RenderInfo { + val key = deviceType * BUCKET_SIZE + offset + return lookup(key, enabled) + } + } +} + +private const val BUCKET_SIZE = 1000 +private const val THERMOSTAT_RANGE = DeviceTypes.TYPE_THERMOSTAT * BUCKET_SIZE + +public val deviceColorMap = mapOf<Int, Pair<Int, Int>>( + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_HEAT) to + Pair(R.color.thermo_heat_foreground, R.color.thermo_heat_background), + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_COOL) to + Pair(R.color.thermo_cool_foreground, R.color.thermo_cool_background), + DeviceTypes.TYPE_LIGHT to Pair(R.color.light_foreground, R.color.light_background) +).withDefault { + Pair(R.color.control_foreground, R.color.control_background) +} + +public val deviceIconMap = mapOf<Int, IconState>( + THERMOSTAT_RANGE to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_OFF) to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_HEAT) to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_COOL) to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_HEAT_COOL) to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + (THERMOSTAT_RANGE + TemperatureControlTemplate.MODE_ECO) to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + DeviceTypes.TYPE_THERMOSTAT to IconState( + R.drawable.ic_device_thermostat_gm2_24px, + R.drawable.ic_device_thermostat_gm2_24px + ), + DeviceTypes.TYPE_LIGHT to IconState( + R.drawable.ic_light_off_gm2_24px, + R.drawable.ic_lightbulb_outline_gm2_24px + ), + DeviceTypes.TYPE_CAMERA to IconState( + R.drawable.ic_videocam_gm2_24px, + R.drawable.ic_videocam_gm2_24px + ), + DeviceTypes.TYPE_LOCK to IconState( + R.drawable.ic_lock_open_gm2_24px, + R.drawable.ic_lock_gm2_24px + ), + DeviceTypes.TYPE_SWITCH to IconState( + R.drawable.ic_switches_gm2_24px, + R.drawable.ic_switches_gm2_24px + ), + DeviceTypes.TYPE_OUTLET to IconState( + R.drawable.ic_power_off_gm2_24px, + R.drawable.ic_power_gm2_24px + ) +).withDefault { + IconState( + R.drawable.ic_light_off_gm2_24px, + R.drawable.ic_lightbulb_outline_gm2_24px + ) +} diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/TemperatureControlBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/TemperatureControlBehavior.kt new file mode 100644 index 000000000000..ae0ebbb9e1bb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/TemperatureControlBehavior.kt @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2020 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.controls.ui + +import android.content.Context +import android.graphics.drawable.Drawable +import android.graphics.drawable.LayerDrawable +import android.service.controls.Control +import android.service.controls.templates.TemperatureControlTemplate +import android.widget.TextView + +import com.android.systemui.R + +class TemperatureControlBehavior : Behavior { + lateinit var clipLayer: Drawable + lateinit var control: Control + lateinit var cvh: ControlViewHolder + lateinit var template: TemperatureControlTemplate + lateinit var status: TextView + lateinit var context: Context + + override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { + this.control = cws.control!! + this.cvh = cvh + status = cvh.status + + status.setText(control.getStatusText()) + + val ld = cvh.layout.getBackground() as LayerDrawable + clipLayer = ld.findDrawableByLayerId(R.id.clip_layer) + + template = control.getControlTemplate() as TemperatureControlTemplate + + val activeMode = template.getCurrentActiveMode() + val enabled = activeMode != 0 && activeMode != TemperatureControlTemplate.MODE_OFF + val deviceType = control.getDeviceType() + + clipLayer.setLevel(if (enabled) MAX_LEVEL else MIN_LEVEL) + cvh.setEnabled(enabled) + cvh.applyRenderInfo(RenderInfo.lookup(deviceType, activeMode, enabled)) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleBehavior.kt new file mode 100644 index 000000000000..7cd3ab795678 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleBehavior.kt @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2020 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.controls.ui + +import android.content.Context +import android.graphics.drawable.Drawable +import android.graphics.drawable.LayerDrawable +import android.view.View +import android.widget.TextView +import android.service.controls.Control +import android.service.controls.actions.BooleanAction +import android.service.controls.templates.ToggleTemplate + +import com.android.systemui.R + +class ToggleBehavior : Behavior { + lateinit var clipLayer: Drawable + lateinit var template: ToggleTemplate + lateinit var control: Control + lateinit var cvh: ControlViewHolder + lateinit var context: Context + lateinit var status: TextView + + override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { + this.control = cws.control!! + this.cvh = cvh + status = cvh.status + + status.setText(control.getStatusText()) + + cvh.layout.setOnClickListener(View.OnClickListener() { toggle() }) + + val ld = cvh.layout.getBackground() as LayerDrawable + clipLayer = ld.findDrawableByLayerId(R.id.clip_layer) + + template = control.getControlTemplate() as ToggleTemplate + + val checked = template.isChecked() + val deviceType = control.getDeviceType() + + clipLayer.setLevel(if (checked) MAX_LEVEL else MIN_LEVEL) + cvh.setEnabled(checked) + cvh.applyRenderInfo(RenderInfo.lookup(deviceType, checked)) + } + + fun toggle() { + cvh.action(BooleanAction(template.getTemplateId(), !template.isChecked())) + + val nextLevel = if (template.isChecked()) MIN_LEVEL else MAX_LEVEL + clipLayer.setLevel(nextLevel) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt new file mode 100644 index 000000000000..a6918f50a977 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ToggleRangeBehavior.kt @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2020 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.controls.ui + +import android.content.Context +import android.graphics.drawable.Drawable +import android.graphics.drawable.LayerDrawable +import android.view.MotionEvent +import android.view.View +import android.widget.TextView +import android.service.controls.Control +import android.service.controls.actions.BooleanAction +import android.service.controls.actions.FloatAction +import android.service.controls.templates.RangeTemplate +import android.service.controls.templates.ToggleRangeTemplate +import android.util.TypedValue + +import com.android.systemui.R + +class ToggleRangeBehavior : Behavior { + lateinit var clipLayer: Drawable + lateinit var template: ToggleRangeTemplate + lateinit var control: Control + lateinit var cvh: ControlViewHolder + lateinit var rangeTemplate: RangeTemplate + lateinit var statusExtra: TextView + lateinit var status: TextView + lateinit var context: Context + + override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { + this.control = cws.control!! + this.cvh = cvh + + statusExtra = cvh.statusExtra + status = cvh.status + + status.setText(control.getStatusText()) + + context = status.getContext() + + cvh.layout.setOnTouchListener(ToggleRangeTouchListener()) + + val ld = cvh.layout.getBackground() as LayerDrawable + clipLayer = ld.findDrawableByLayerId(R.id.clip_layer) + + template = control.getControlTemplate() as ToggleRangeTemplate + rangeTemplate = template.getRange() + + val checked = template.isChecked() + val deviceType = control.getDeviceType() + + updateRange((rangeTemplate.getCurrentValue() / 100.0f), checked) + + cvh.setEnabled(checked) + cvh.applyRenderInfo(RenderInfo.lookup(deviceType, checked)) + } + + fun toggle() { + cvh.action(BooleanAction(template.getTemplateId(), !template.isChecked())) + + val nextLevel = if (template.isChecked()) MIN_LEVEL else MAX_LEVEL + clipLayer.setLevel(nextLevel) + } + + fun beginUpdateRange() { + status.setVisibility(View.GONE) + statusExtra.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources() + .getDimensionPixelSize(R.dimen.control_status_expanded).toFloat()) + } + + fun updateRange(f: Float, checked: Boolean) { + clipLayer.setLevel(if (checked) (MAX_LEVEL * f).toInt() else MIN_LEVEL) + + if (checked && f < 100.0f && f > 0.0f) { + statusExtra.setText("" + (f * 100.0).toInt() + "%") + statusExtra.setVisibility(View.VISIBLE) + } else { + statusExtra.setText("") + statusExtra.setVisibility(View.GONE) + } + } + + fun endUpdateRange(f: Float) { + statusExtra.setText(" - " + (f * 100.0).toInt() + "%") + + val newValue = rangeTemplate.getMinValue() + + (f * (rangeTemplate.getMaxValue() - rangeTemplate.getMinValue())) + + statusExtra.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources() + .getDimensionPixelSize(R.dimen.control_status_normal).toFloat()) + status.setVisibility(View.VISIBLE) + + cvh.action(FloatAction(rangeTemplate.getTemplateId(), findNearestStep(newValue))) + } + + fun findNearestStep(value: Float): Float { + var minDiff = 1000f + + var f = rangeTemplate.getMinValue() + while (f <= rangeTemplate.getMaxValue()) { + val currentDiff = Math.abs(value - f) + if (currentDiff < minDiff) { + minDiff = currentDiff + } else { + return f - rangeTemplate.getStepValue() + } + + f += rangeTemplate.getStepValue() + } + + return rangeTemplate.getMaxValue() + } + + inner class ToggleRangeTouchListener() : View.OnTouchListener { + private var initialTouchX: Float = 0.0f + private var initialTouchY: Float = 0.0f + private var isDragging: Boolean = false + private val minDragDiff = 20 + + override fun onTouch(v: View, e: MotionEvent): Boolean { + when (e.getActionMasked()) { + MotionEvent.ACTION_DOWN -> setupTouch(e) + MotionEvent.ACTION_MOVE -> detectDrag(v, e) + MotionEvent.ACTION_UP -> endTouch(v, e) + } + + return true + } + + private fun setupTouch(e: MotionEvent) { + initialTouchX = e.getX() + initialTouchY = e.getY() + } + + private fun detectDrag(v: View, e: MotionEvent) { + val xDiff = Math.abs(e.getX() - initialTouchX) + val yDiff = Math.abs(e.getY() - initialTouchY) + + if (xDiff < minDragDiff) { + isDragging = false + } else { + if (!isDragging) { + this@ToggleRangeBehavior.beginUpdateRange() + } + v.getParent().requestDisallowInterceptTouchEvent(true) + isDragging = true + if (yDiff > xDiff) { + endTouch(v, e) + } else { + val percent = Math.max(0.0f, Math.min(1.0f, e.getX() / v.getWidth())) + this@ToggleRangeBehavior.updateRange(percent, true) + } + } + } + + private fun endTouch(v: View, e: MotionEvent) { + if (!isDragging) { + this@ToggleRangeBehavior.toggle() + } else { + val percent = Math.max(0.0f, Math.min(1.0f, e.getX() / v.getWidth())) + this@ToggleRangeBehavior.endUpdateRange(percent) + } + + initialTouchX = 0.0f + initialTouchY = 0.0f + isDragging = false + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/UnknownBehavior.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/UnknownBehavior.kt new file mode 100644 index 000000000000..5a6e5b481544 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/controls/ui/UnknownBehavior.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2020 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.controls.ui + +class UnknownBehavior : Behavior { + override fun apply(cvh: ControlViewHolder, cws: ControlWithState) { + cvh.status.setText("Loading...") + cvh.setEnabled(false) + cvh.applyRenderInfo(RenderInfo.lookup(cws.ci.deviceType, false)) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt index f66a1ece1868..f710f7fc47e2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/DoubleLineTileLayout.kt @@ -68,7 +68,7 @@ class DoubleLineTileLayout(context: Context) : ViewGroup(context), QSPanel.QSTil override fun updateResources(): Boolean { with(mContext.resources) { smallTileSize = getDimensionPixelSize(R.dimen.qs_quick_tile_size) - cellMarginHorizontal = getDimensionPixelSize(R.dimen.qs_tile_margin_horizontal) / 2 + cellMarginHorizontal = getDimensionPixelSize(R.dimen.qs_tile_margin_horizontal) cellMarginVertical = getDimensionPixelSize(R.dimen.new_qs_vertical_margin) } requestLayout() diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java b/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java index 1077834e7146..9e3e94ce4186 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSMediaPlayer.java @@ -36,7 +36,6 @@ import android.media.MediaMetadata; import android.media.session.MediaController; import android.media.session.MediaSession; import android.media.session.PlaybackState; -import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -45,7 +44,6 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RemoteViews; import android.widget.TextView; import androidx.core.graphics.drawable.RoundedBitmapDrawable; @@ -72,8 +70,6 @@ public class QSMediaPlayer { private View mSeamless; private MediaSession.Token mToken; private MediaController mController; - private int mWidth; - private int mHeight; private int mForegroundColor; private int mBackgroundColor; private ComponentName mRecvComponent; @@ -158,16 +154,11 @@ public class QSMediaPlayer { * * @param context * @param parent - * @param width - * @param height */ - public QSMediaPlayer(Context context, ViewGroup parent, int width, int height) { + public QSMediaPlayer(Context context, ViewGroup parent) { mContext = context; LayoutInflater inflater = LayoutInflater.from(mContext); mMediaNotifView = (LinearLayout) inflater.inflate(R.layout.qs_media_panel, parent, false); - - mWidth = width; - mHeight = height; } public View getView() { @@ -217,27 +208,18 @@ public class QSMediaPlayer { Notification.Builder builder = Notification.Builder.recoverBuilder(mContext, notif); // Album art - addAlbumArtBackground(mMediaMetadata, bgColor, mWidth, mHeight); + addAlbumArt(mMediaMetadata, bgColor); - // Reuse notification header instead of reimplementing everything - RemoteViews headerRemoteView = builder.makeNotificationHeader(); LinearLayout headerView = mMediaNotifView.findViewById(R.id.header); - View result = headerRemoteView.apply(mContext, headerView); - result.setPadding(0, 0, 0, 0); - LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, 75); - result.setLayoutParams(lp); - headerView.removeAllViews(); - headerView.addView(result); // App icon - ImageView appIcon = headerView.findViewById(com.android.internal.R.id.icon); + ImageView appIcon = headerView.findViewById(R.id.icon); Drawable iconDrawable = icon.loadDrawable(mContext); iconDrawable.setTint(iconColor); appIcon.setImageDrawable(iconDrawable); // App title - TextView appName = headerView.findViewById(com.android.internal.R.id.app_name_text); + TextView appName = headerView.findViewById(R.id.app_name); String appNameString = builder.loadHeaderAppName(); appName.setText(appNameString); appName.setTextColor(iconColor); @@ -254,25 +236,8 @@ public class QSMediaPlayer { } }); - // Separator - TextView separator = headerView.findViewById(com.android.internal.R.id.header_text_divider); - separator.setTextColor(iconColor); - - // Album name - TextView albumName = headerView.findViewById(com.android.internal.R.id.header_text); - String albumString = mMediaMetadata.getString(MediaMetadata.METADATA_KEY_ALBUM); - if (TextUtils.isEmpty(albumString)) { - albumName.setVisibility(View.GONE); - separator.setVisibility(View.GONE); - } else { - albumName.setText(albumString); - albumName.setTextColor(iconColor); - albumName.setVisibility(View.VISIBLE); - separator.setVisibility(View.VISIBLE); - } - // Transfer chip - mSeamless = headerView.findViewById(com.android.internal.R.id.media_seamless); + mSeamless = headerView.findViewById(R.id.media_seamless); mSeamless.setVisibility(View.VISIBLE); updateChip(device); ActivityStarter mActivityStarter = Dependency.get(ActivityStarter.class); @@ -284,13 +249,13 @@ public class QSMediaPlayer { }); // Artist name - TextView artistText = mMediaNotifView.findViewById(R.id.header_title); + TextView artistText = headerView.findViewById(R.id.header_artist); String artistName = mMediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST); artistText.setText(artistName); artistText.setTextColor(iconColor); // Song name - TextView titleText = mMediaNotifView.findViewById(R.id.header_text); + TextView titleText = headerView.findViewById(R.id.header_text); String songName = mMediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE); titleText.setText(songName); titleText.setTextColor(iconColor); @@ -363,34 +328,25 @@ public class QSMediaPlayer { return (state.getState() == PlaybackState.STATE_PLAYING); } - private void addAlbumArtBackground(MediaMetadata metadata, int bgColor, int width, int height) { + private void addAlbumArt(MediaMetadata metadata, int bgColor) { Bitmap albumArt = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART); float radius = mContext.getResources().getDimension(R.dimen.qs_media_corner_radius); + ImageView albumView = mMediaNotifView.findViewById(R.id.album_art); if (albumArt != null) { Log.d(TAG, "updating album art"); Bitmap original = albumArt.copy(Bitmap.Config.ARGB_8888, true); - Bitmap scaled = scaleBitmap(original, width, height); - Canvas canvas = new Canvas(scaled); - - // Add translucent layer over album art to improve contrast - Paint p = new Paint(); - p.setStyle(Paint.Style.FILL); - p.setColor(bgColor); - p.setAlpha(200); - canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), p); - + int albumSize = (int) mContext.getResources().getDimension(R.dimen.qs_media_album_size); + Bitmap scaled = scaleBitmap(original, albumSize, albumSize); RoundedBitmapDrawable roundedDrawable = RoundedBitmapDrawableFactory.create( mContext.getResources(), scaled); roundedDrawable.setCornerRadius(radius); - - mMediaNotifView.setBackground(roundedDrawable); + albumView.setImageDrawable(roundedDrawable); } else { Log.e(TAG, "No album art available"); - GradientDrawable rect = new GradientDrawable(); - rect.setCornerRadius(radius); - rect.setColor(bgColor); - mMediaNotifView.setBackground(rect); + albumView.setImageDrawable(null); } + + mMediaNotifView.setBackgroundTintList(ColorStateList.valueOf(bgColor)); } private Bitmap scaleBitmap(Bitmap original, int width, int height) { @@ -423,8 +379,8 @@ public class QSMediaPlayer { rect.setStroke(2, mForegroundColor); rect.setColor(mBackgroundColor); - ImageView iconView = mSeamless.findViewById(com.android.internal.R.id.media_seamless_image); - TextView deviceName = mSeamless.findViewById(com.android.internal.R.id.media_seamless_text); + ImageView iconView = mSeamless.findViewById(R.id.media_seamless_image); + TextView deviceName = mSeamless.findViewById(R.id.media_seamless_text); deviceName.setTextColor(fgTintList); if (device != null) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 0fd74547334b..14a117ca40a1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -95,6 +95,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne private final ArrayList<QSMediaPlayer> mMediaPlayers = new ArrayList<>(); private LocalMediaManager mLocalMediaManager; private MediaDevice mDevice; + private boolean mUpdateCarousel = false; protected boolean mExpanded; protected boolean mListening; @@ -184,7 +185,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne HorizontalScrollView mediaScrollView = (HorizontalScrollView) LayoutInflater.from( mContext).inflate(R.layout.media_carousel, this, false); mMediaCarousel = mediaScrollView.findViewById(R.id.media_carousel); - addView(mediaScrollView); + addView(mediaScrollView, 0); } else { mMediaCarousel = null; } @@ -200,6 +201,23 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne mPluginManager = pluginManager; } + @Override + public void onVisibilityAggregated(boolean isVisible) { + super.onVisibilityAggregated(isVisible); + if (!isVisible && mUpdateCarousel) { + for (QSMediaPlayer player : mMediaPlayers) { + if (player.isPlaying()) { + LayoutParams lp = (LayoutParams) player.getView().getLayoutParams(); + mMediaCarousel.removeView(player.getView()); + mMediaCarousel.addView(player.getView(), 0, lp); + ((HorizontalScrollView) mMediaCarousel.getParent()).fullScroll(View.FOCUS_LEFT); + mUpdateCarousel = false; + break; + } + } + } + } + /** * Add or update a player for the associated media session * @param token @@ -237,7 +255,6 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne } } - int playerHeight = (int) getResources().getDimension(R.dimen.qs_media_height); int playerWidth = (int) getResources().getDimension(R.dimen.qs_media_width); int padding = (int) getResources().getDimension(R.dimen.qs_media_padding); LayoutParams lp = new LayoutParams(playerWidth, ViewGroup.LayoutParams.MATCH_PARENT); @@ -246,8 +263,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne if (player == null) { Log.d(TAG, "creating new player"); - - player = new QSMediaPlayer(mContext, this, playerWidth, playerHeight); + player = new QSMediaPlayer(mContext, this); if (player.isPlaying()) { mMediaCarousel.addView(player.getView(), 0, lp); // add in front @@ -256,9 +272,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne } mMediaPlayers.add(player); } else if (player.isPlaying()) { - // move it to the front - mMediaCarousel.removeView(player.getView()); - mMediaCarousel.addView(player.getView(), 0, lp); + mUpdateCarousel = true; } Log.d(TAG, "setting player session"); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java index cec1cb2fb53b..9018a375c365 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSMediaPlayer.java @@ -23,13 +23,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.ColorStateList; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.Icon; import android.media.MediaMetadata; import android.media.session.MediaController; @@ -45,9 +39,6 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.core.graphics.drawable.RoundedBitmapDrawable; -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; - import com.android.systemui.R; import java.util.List; @@ -63,7 +54,6 @@ public class QuickQSMediaPlayer { private LinearLayout mMediaNotifView; private MediaSession.Token mToken; private MediaController mController; - private int mBackgroundColor; private int mForegroundColor; private ComponentName mRecvComponent; @@ -142,7 +132,6 @@ public class QuickQSMediaPlayer { View actionsContainer, int[] actionsToShow, PendingIntent contentIntent) { mToken = token; mForegroundColor = iconColor; - mBackgroundColor = bgColor; String oldPackage = ""; if (mController != null) { @@ -185,8 +174,7 @@ public class QuickQSMediaPlayer { } }); - // Album art - addAlbumArtBackground(mMediaMetadata, mBackgroundColor); + mMediaNotifView.setBackgroundTintList(ColorStateList.valueOf(bgColor)); // App icon ImageView appIcon = mMediaNotifView.findViewById(R.id.icon); @@ -194,14 +182,8 @@ public class QuickQSMediaPlayer { iconDrawable.setTint(mForegroundColor); appIcon.setImageDrawable(iconDrawable); - // Artist name - TextView appText = mMediaNotifView.findViewById(R.id.header_title); - String artistName = mMediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST); - appText.setText(artistName); - appText.setTextColor(mForegroundColor); - // Song name - TextView titleText = mMediaNotifView.findViewById(R.id.header_text); + TextView titleText = mMediaNotifView.findViewById(R.id.header_title); String songName = mMediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE); titleText.setText(songName); titleText.setTextColor(mForegroundColor); @@ -277,54 +259,4 @@ public class QuickQSMediaPlayer { public boolean hasMediaSession() { return mController != null && mController.getPlaybackState() != null; } - - private void addAlbumArtBackground(MediaMetadata metadata, int bgColor) { - Bitmap albumArt = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART); - float radius = mContext.getResources().getDimension(R.dimen.qs_media_corner_radius); - Rect bounds = new Rect(); - mMediaNotifView.getBoundsOnScreen(bounds); - int width = bounds.width(); - int height = bounds.height(); - if (albumArt != null && width > 0 && height > 0) { - Bitmap original = albumArt.copy(Bitmap.Config.ARGB_8888, true); - Bitmap scaled = scaleBitmap(original, width, height); - Canvas canvas = new Canvas(scaled); - - // Add translucent layer over album art to improve contrast - Paint p = new Paint(); - p.setStyle(Paint.Style.FILL); - p.setColor(bgColor); - p.setAlpha(200); - canvas.drawRect(0, 0, canvas.getWidth(), canvas.getHeight(), p); - - RoundedBitmapDrawable roundedDrawable = RoundedBitmapDrawableFactory.create( - mContext.getResources(), scaled); - roundedDrawable.setCornerRadius(radius); - - mMediaNotifView.setBackground(roundedDrawable); - } else { - Log.e(TAG, "No album art available"); - GradientDrawable rect = new GradientDrawable(); - rect.setCornerRadius(radius); - rect.setColor(bgColor); - mMediaNotifView.setBackground(rect); - } - } - - private Bitmap scaleBitmap(Bitmap original, int width, int height) { - Bitmap cropped = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(cropped); - - float scale = (float) cropped.getWidth() / (float) original.getWidth(); - float dy = (cropped.getHeight() - original.getHeight() * scale) / 2.0f; - Matrix transformation = new Matrix(); - transformation.postTranslate(0, dy); - transformation.preScale(scale, scale); - - Paint paint = new Paint(); - paint.setFilterBitmap(true); - canvas.drawBitmap(original, transformation, paint); - - return cropped; - } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index b05d4fdf7db7..e9207016eb68 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -85,20 +85,21 @@ public class QuickQSPanel extends QSPanel { mHorizontalLinearLayout.setClipChildren(false); mHorizontalLinearLayout.setClipToPadding(false); + int marginSize = (int) mContext.getResources().getDimension(R.dimen.qqs_media_spacing); + mMediaPlayer = new QuickQSMediaPlayer(mContext, mHorizontalLinearLayout); + LayoutParams lp2 = new LayoutParams(0, LayoutParams.MATCH_PARENT, 1); + lp2.setMarginEnd(marginSize); + lp2.setMarginStart(0); + mHorizontalLinearLayout.addView(mMediaPlayer.getView(), lp2); + mTileLayout = new DoubleLineTileLayout(context); mMediaTileLayout = mTileLayout; mRegularTileLayout = new HeaderTileLayout(context); LayoutParams lp = new LayoutParams(0, LayoutParams.MATCH_PARENT, 1); - lp.setMarginEnd(10); - lp.setMarginStart(0); + lp.setMarginEnd(0); + lp.setMarginStart(marginSize); mHorizontalLinearLayout.addView((View) mTileLayout, lp); - mMediaPlayer = new QuickQSMediaPlayer(mContext, mHorizontalLinearLayout); - LayoutParams lp2 = new LayoutParams(0, LayoutParams.MATCH_PARENT, 1); - lp2.setMarginEnd(0); - lp2.setMarginStart(25); - mHorizontalLinearLayout.addView(mMediaPlayer.getView(), lp2); - sDefaultMaxTiles = getResources().getInteger(R.integer.quick_qs_panel_max_columns); mTileLayout.setListening(mListening); diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java index 37743ec55517..9f59277c918a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java @@ -1,5 +1,7 @@ package com.android.systemui.qs; +import static com.android.systemui.util.Utils.useQsMediaPlayer; + import android.content.Context; import android.content.res.Resources; import android.provider.Settings; @@ -42,7 +44,8 @@ public class TileLayout extends ViewGroup implements QSTileLayout { public TileLayout(Context context, AttributeSet attrs) { super(context, attrs); setFocusableInTouchMode(true); - mLessRows = Settings.System.getInt(context.getContentResolver(), "qs_less_rows", 0) != 0; + mLessRows = (Settings.System.getInt(context.getContentResolver(), "qs_less_rows", 0) != 0) + || useQsMediaPlayer(context); updateResources(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java index eaa9d78c08f4..7fe229c26f3a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java @@ -16,6 +16,9 @@ package com.android.systemui.statusbar.notification.collection; +import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_NOT_CANCELED; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.NOT_DISMISSED; + import java.util.Arrays; import java.util.List; @@ -132,8 +135,20 @@ public class ListDumper { .append(" "); } + if (notifEntry.mCancellationReason != REASON_NOT_CANCELED) { + rksb.append("cancellationReason=") + .append(notifEntry.mCancellationReason) + .append(" "); + } + if (notifEntry.hasInflationError()) { - rksb.append("hasInflationError "); + rksb.append("(!)hasInflationError "); + } + + if (notifEntry.getDismissState() != NOT_DISMISSED) { + rksb.append("dismissState=") + .append(notifEntry.getDismissState()) + .append(" "); } String rkString = rksb.toString(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java index cb8cef8fdd72..3b2fe9441c32 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java @@ -35,9 +35,14 @@ import static android.service.notification.NotificationListenerService.REASON_TI import static android.service.notification.NotificationListenerService.REASON_UNAUTOBUNDLED; import static android.service.notification.NotificationListenerService.REASON_USER_STOPPED; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.DISMISSED; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.NOT_DISMISSED; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.PARENT_DISMISSED; + +import static java.util.Objects.requireNonNull; + import android.annotation.IntDef; import android.annotation.MainThread; -import android.annotation.NonNull; import android.annotation.Nullable; import android.os.RemoteException; import android.service.notification.NotificationListenerService.Ranking; @@ -45,6 +50,8 @@ import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; import android.util.ArrayMap; +import androidx.annotation.NonNull; + import com.android.internal.statusbar.IStatusBarService; import com.android.systemui.DumpController; import com.android.systemui.Dumpable; @@ -172,15 +179,65 @@ public class NotifCollection implements Dumpable { /** * Dismiss a notification on behalf of the user. */ - void dismissNotification( - NotificationEntry entry, - @CancellationReason int reason, - @NonNull DismissedByUserStats stats) { + void dismissNotification(NotificationEntry entry, @NonNull DismissedByUserStats stats) { Assert.isMainThread(); - Objects.requireNonNull(stats); + requireNonNull(stats); checkForReentrantCall(); - removeNotification(entry.getKey(), null, reason, stats); + if (entry != mNotificationSet.get(entry.getKey())) { + throw new IllegalStateException("Invalid entry: " + entry.getKey()); + } + + if (entry.getDismissState() == DISMISSED) { + return; + } + + // Optimistically mark the notification as dismissed -- we'll wait for the signal from + // system server before removing it from our notification set. + entry.setDismissState(DISMISSED); + mLogger.logNotifDismissed(entry.getKey()); + + List<NotificationEntry> canceledEntries = new ArrayList<>(); + + if (isCanceled(entry)) { + canceledEntries.add(entry); + } else { + // Ask system server to remove it for us + try { + mStatusBarService.onNotificationClear( + entry.getSbn().getPackageName(), + entry.getSbn().getTag(), + entry.getSbn().getId(), + entry.getSbn().getUser().getIdentifier(), + entry.getSbn().getKey(), + stats.dismissalSurface, + stats.dismissalSentiment, + stats.notificationVisibility); + } catch (RemoteException e) { + // system process is dead if we're here. + } + + // Also mark any children as dismissed as system server will auto-dismiss them as well + if (entry.getSbn().getNotification().isGroupSummary()) { + for (NotificationEntry otherEntry : mNotificationSet.values()) { + if (otherEntry.getSbn().getGroupKey().equals(entry.getSbn().getGroupKey()) + && otherEntry.getDismissState() != DISMISSED) { + otherEntry.setDismissState(PARENT_DISMISSED); + if (isCanceled(otherEntry)) { + canceledEntries.add(otherEntry); + } + } + } + } + } + + // Immediately remove any dismissed notifs that have already been canceled by system server + // (probably due to being lifetime-extended up until this point). + for (NotificationEntry canceledEntry : canceledEntries) { + tryRemoveNotification(canceledEntry); + } + + rebuildList(); } private void onNotificationPosted(StatusBarNotification sbn, RankingMap rankingMap) { @@ -208,7 +265,15 @@ public class NotifCollection implements Dumpable { Assert.isMainThread(); mLogger.logNotifRemoved(sbn.getKey(), reason); - removeNotification(sbn.getKey(), rankingMap, reason, null); + + final NotificationEntry entry = mNotificationSet.get(sbn.getKey()); + if (entry == null) { + throw new IllegalStateException("No notification to remove with key " + sbn.getKey()); + } + entry.mCancellationReason = reason; + applyRanking(rankingMap); + tryRemoveNotification(entry); + rebuildList(); } private void onNotificationRankingUpdate(RankingMap rankingMap) { @@ -242,9 +307,12 @@ public class NotifCollection implements Dumpable { // Update to an existing entry mLogger.logNotifUpdated(sbn.getKey()); - // Notification is updated so it is essentially re-added and thus alive again. Don't + cancelLocalDismissal(entry); + + // Notification is updated so it is essentially re-added and thus alive again. Don't // need to keep its lifetime extended. cancelLifetimeExtension(entry); + entry.mCancellationReason = REASON_NOT_CANCELED; entry.setSbn(sbn); if (rankingMap != null) { @@ -255,71 +323,62 @@ public class NotifCollection implements Dumpable { } } - private void removeNotification( - String key, - @Nullable RankingMap rankingMap, - @CancellationReason int reason, - @Nullable DismissedByUserStats dismissedByUserStats) { + /** + * Tries to remove a notification from the notification set. This removal may be blocked by + * lifetime extenders. Does not trigger a rebuild of the list; caller must do that manually. + * + * @return True if the notification was removed, false otherwise. + */ + private boolean tryRemoveNotification(NotificationEntry entry) { + if (mNotificationSet.get(entry.getKey()) != entry) { + throw new IllegalStateException("No notification to remove with key " + entry.getKey()); + } - NotificationEntry entry = mNotificationSet.get(key); - if (entry == null) { - throw new IllegalStateException("No notification to remove with key " + key); + if (!isCanceled(entry)) { + throw new IllegalStateException("Cannot remove notification " + entry.getKey() + + ": has not been marked for removal"); } - entry.mLifetimeExtenders.clear(); - mAmDispatchingToOtherCode = true; - for (NotifLifetimeExtender extender : mLifetimeExtenders) { - if (extender.shouldExtendLifetime(entry, reason)) { - entry.mLifetimeExtenders.add(extender); - } + if (isDismissedByUser(entry)) { + // User-dismissed notifications cannot be lifetime-extended + cancelLifetimeExtension(entry); + } else { + updateLifetimeExtension(entry); } - mAmDispatchingToOtherCode = false; if (!isLifetimeExtended(entry)) { mNotificationSet.remove(entry.getKey()); - - if (dismissedByUserStats != null) { - try { - mStatusBarService.onNotificationClear( - entry.getSbn().getPackageName(), - entry.getSbn().getTag(), - entry.getSbn().getId(), - entry.getSbn().getUser().getIdentifier(), - entry.getSbn().getKey(), - dismissedByUserStats.dismissalSurface, - dismissedByUserStats.dismissalSentiment, - dismissedByUserStats.notificationVisibility); - } catch (RemoteException e) { - // system process is dead if we're here. - } - } - - if (rankingMap != null) { - applyRanking(rankingMap); - } - - dispatchOnEntryRemoved(entry, reason, dismissedByUserStats != null /* removedByUser */); + dispatchOnEntryRemoved(entry, entry.mCancellationReason); dispatchOnEntryCleanUp(entry); + return true; + } else { + return false; } - - rebuildList(); } private void applyRanking(@NonNull RankingMap rankingMap) { for (NotificationEntry entry : mNotificationSet.values()) { - if (!isLifetimeExtended(entry)) { - Ranking ranking = requireRanking(rankingMap, entry.getKey()); - entry.setRanking(ranking); - - // TODO: (b/145659174) update the sbn's overrideGroupKey in - // NotificationEntry.setRanking instead of here once we fully migrate to the - // NewNotifPipeline - if (mFeatureFlags.isNewNotifPipelineRenderingEnabled()) { - final String newOverrideGroupKey = ranking.getOverrideGroupKey(); - if (!Objects.equals(entry.getSbn().getOverrideGroupKey(), - newOverrideGroupKey)) { - entry.getSbn().setOverrideGroupKey(newOverrideGroupKey); + if (!isCanceled(entry)) { + + // TODO: (b/148791039) We should crash if we are ever handed a ranking with + // incomplete entries. Right now, there's a race condition in NotificationListener + // that means this might occur when SystemUI is starting up. + Ranking ranking = new Ranking(); + if (rankingMap.getRanking(entry.getKey(), ranking)) { + entry.setRanking(ranking); + + // TODO: (b/145659174) update the sbn's overrideGroupKey in + // NotificationEntry.setRanking instead of here once we fully migrate to the + // NewNotifPipeline + if (mFeatureFlags.isNewNotifPipelineRenderingEnabled()) { + final String newOverrideGroupKey = ranking.getOverrideGroupKey(); + if (!Objects.equals(entry.getSbn().getOverrideGroupKey(), + newOverrideGroupKey)) { + entry.getSbn().setOverrideGroupKey(newOverrideGroupKey); + } } + } else { + mLogger.logRankingMissing(entry.getKey(), rankingMap); } } } @@ -347,9 +406,9 @@ public class NotifCollection implements Dumpable { } if (!isLifetimeExtended(entry)) { - // TODO: This doesn't need to be undefined -- we can set either EXTENDER_EXPIRED or - // save the original reason - removeNotification(entry.getKey(), null, REASON_UNKNOWN, null); + if (tryRemoveNotification(entry)) { + rebuildList(); + } } } @@ -366,6 +425,31 @@ public class NotifCollection implements Dumpable { return entry.mLifetimeExtenders.size() > 0; } + private void updateLifetimeExtension(NotificationEntry entry) { + entry.mLifetimeExtenders.clear(); + mAmDispatchingToOtherCode = true; + for (NotifLifetimeExtender extender : mLifetimeExtenders) { + if (extender.shouldExtendLifetime(entry, entry.mCancellationReason)) { + entry.mLifetimeExtenders.add(extender); + } + } + mAmDispatchingToOtherCode = false; + } + + private void cancelLocalDismissal(NotificationEntry entry) { + if (isDismissedByUser(entry)) { + entry.setDismissState(NOT_DISMISSED); + if (entry.getSbn().getNotification().isGroupSummary()) { + for (NotificationEntry otherEntry : mNotificationSet.values()) { + if (otherEntry.getSbn().getGroupKey().equals(entry.getSbn().getGroupKey()) + && otherEntry.getDismissState() == PARENT_DISMISSED) { + otherEntry.setDismissState(NOT_DISMISSED); + } + } + } + } + } + private void checkForReentrantCall() { if (mAmDispatchingToOtherCode) { throw new IllegalStateException("Reentrant call detected"); @@ -381,6 +465,19 @@ public class NotifCollection implements Dumpable { return ranking; } + /** + * True if the notification has been canceled by system server. Usually, such notifications are + * immediately removed from the collection, but can sometimes stick around due to lifetime + * extenders. + */ + private static boolean isCanceled(NotificationEntry entry) { + return entry.mCancellationReason != REASON_NOT_CANCELED; + } + + private static boolean isDismissedByUser(NotificationEntry entry) { + return entry.getDismissState() != NOT_DISMISSED; + } + private void dispatchOnEntryInit(NotificationEntry entry) { mAmDispatchingToOtherCode = true; for (NotifCollectionListener listener : mNotifCollectionListeners) { @@ -413,13 +510,10 @@ public class NotifCollection implements Dumpable { mAmDispatchingToOtherCode = false; } - private void dispatchOnEntryRemoved( - NotificationEntry entry, - @CancellationReason int reason, - boolean removedByUser) { + private void dispatchOnEntryRemoved(NotificationEntry entry, @CancellationReason int reason) { mAmDispatchingToOtherCode = true; for (NotifCollectionListener listener : mNotifCollectionListeners) { - listener.onEntryRemoved(entry, reason, removedByUser); + listener.onEntryRemoved(entry, reason); } mAmDispatchingToOtherCode = false; } @@ -431,6 +525,20 @@ public class NotifCollection implements Dumpable { } mAmDispatchingToOtherCode = false; } + @Override + public void dump(@NonNull FileDescriptor fd, PrintWriter pw, @NonNull String[] args) { + final List<NotificationEntry> entries = new ArrayList<>(getActiveNotifs()); + + pw.println("\t" + TAG + " unsorted/unfiltered notifications:"); + if (entries.size() == 0) { + pw.println("\t\t None"); + } + pw.println( + ListDumper.dumpList( + entries, + true, + "\t\t")); + } private final BatchableNotificationHandler mNotifHandler = new BatchableNotificationHandler() { @Override @@ -486,20 +594,6 @@ public class NotifCollection implements Dumpable { @Retention(RetentionPolicy.SOURCE) public @interface CancellationReason {} + public static final int REASON_NOT_CANCELED = -1; public static final int REASON_UNKNOWN = 0; - - @Override - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - final List<NotificationEntry> entries = new ArrayList<>(getActiveNotifs()); - - pw.println("\t" + TAG + " unsorted/unfiltered notifications:"); - if (entries.size() == 0) { - pw.println("\t\t None"); - } - pw.println( - ListDumper.dumpList( - entries, - true, - "\t\t")); - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifInflaterImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifInflaterImpl.java index e7b772f1c7b2..7a6d4f1c7d7b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifInflaterImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifInflaterImpl.java @@ -98,13 +98,12 @@ public class NotifInflaterImpl implements NotifInflater { @Override public void run() { int dismissalSurface = NotificationStats.DISMISSAL_SHADE; - /** + /* * TODO: determine dismissal surface (ie: shade / headsup / aod) * see {@link NotificationLogger#logNotificationClear} */ mNotifCollection.dismissNotification( entry, - 0, new DismissedByUserStats( dismissalSurface, DISMISS_SENTIMENT_NEUTRAL, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java index 1f77ec229041..a95668b5e48d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java @@ -29,9 +29,11 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICAT import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; +import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_NOT_CANCELED; import static com.android.systemui.statusbar.notification.stack.NotificationSectionsManager.BUCKET_ALERTING; -import android.annotation.NonNull; +import static java.util.Objects.requireNonNull; + import android.app.Notification; import android.app.Notification.MessagingStyle.Message; import android.app.NotificationChannel; @@ -50,6 +52,7 @@ import android.util.ArraySet; import android.view.View; import android.widget.ImageView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; @@ -59,6 +62,7 @@ import com.android.internal.util.ContrastColorUtil; import com.android.systemui.statusbar.InflationTask; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.notification.InflationException; +import com.android.systemui.statusbar.notification.collection.NotifCollection.CancellationReason; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter; import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender; @@ -105,9 +109,18 @@ public final class NotificationEntry extends ListEntry { /** If this was a group child that was promoted to the top level, then who did the promoting. */ @Nullable NotifPromoter mNotifPromoter; - /** If this notification had an issue with inflating. Only used with the NewNotifPipeline **/ + /** + * If this notification was cancelled by system server, then the reason that was supplied. + * Uncancelled notifications always have REASON_NOT_CANCELED. Note that lifetime-extended + * notifications will have this set even though they are still in the active notification set. + */ + @CancellationReason int mCancellationReason = REASON_NOT_CANCELED; + + /** @see #hasInflationError() */ private boolean mHasInflationError; + /** @see #getDismissState() */ + @NonNull private DismissState mDismissState = DismissState.NOT_DISMISSED; /* * Old members @@ -169,9 +182,9 @@ public final class NotificationEntry extends ListEntry { public NotificationEntry( @NonNull StatusBarNotification sbn, @NonNull Ranking ranking) { - super(Objects.requireNonNull(Objects.requireNonNull(sbn).getKey())); + super(requireNonNull(requireNonNull(sbn).getKey())); - Objects.requireNonNull(ranking); + requireNonNull(ranking); mKey = sbn.getKey(); setSbn(sbn); @@ -201,8 +214,8 @@ public final class NotificationEntry extends ListEntry { * TODO: Make this package-private */ public void setSbn(@NonNull StatusBarNotification sbn) { - Objects.requireNonNull(sbn); - Objects.requireNonNull(sbn.getKey()); + requireNonNull(sbn); + requireNonNull(sbn.getKey()); if (!sbn.getKey().equals(mKey)) { throw new IllegalArgumentException("New key " + sbn.getKey() @@ -227,8 +240,8 @@ public final class NotificationEntry extends ListEntry { * TODO: Make this package-private */ public void setRanking(@NonNull Ranking ranking) { - Objects.requireNonNull(ranking); - Objects.requireNonNull(ranking.getKey()); + requireNonNull(ranking); + requireNonNull(ranking.getKey()); if (!ranking.getKey().equals(mKey)) { throw new IllegalArgumentException("New key " + ranking.getKey() @@ -239,6 +252,34 @@ public final class NotificationEntry extends ListEntry { } /* + * Bookkeeping getters and setters + */ + + /** + * Whether this notification had an error when attempting to inflate. This is only used in + * the NewNotifPipeline + */ + public boolean hasInflationError() { + return mHasInflationError; + } + + void setHasInflationError(boolean hasError) { + mHasInflationError = hasError; + } + + /** + * Set if the user has dismissed this notif but we haven't yet heard back from system server to + * confirm the dismissal. + */ + @NonNull public DismissState getDismissState() { + return mDismissState; + } + + void setDismissState(@NonNull DismissState dismissState) { + mDismissState = requireNonNull(dismissState); + } + + /* * Convenience getters for SBN and Ranking members */ @@ -275,7 +316,6 @@ public final class NotificationEntry extends ListEntry { return mRanking.canBubble(); } - public @NonNull List<Notification.Action> getSmartActions() { return mRanking.getSmartActions(); } @@ -578,18 +618,6 @@ public final class NotificationEntry extends ListEntry { remoteInputTextWhenReset = null; } - void setHasInflationError(boolean hasError) { - mHasInflationError = hasError; - } - - /** - * Whether this notification had an error when attempting to inflate. This is only used in - * the NewNotifPipeline - */ - public boolean hasInflationError() { - return mHasInflationError; - } - public void setHasSentReply() { hasSentReply = true; } @@ -974,6 +1002,16 @@ public final class NotificationEntry extends ListEntry { } } + /** @see #getDismissState() */ + public enum DismissState { + /** User has not dismissed this notif or its parent */ + NOT_DISMISSED, + /** User has dismissed this notif specifically */ + DISMISSED, + /** User has dismissed this notif's parent (which implicitly dismisses this one as well) */ + PARENT_DISMISSED, + } + private static final long LAUNCH_COOLDOWN = 2000; private static final long REMOTE_INPUT_COOLDOWN = 500; private static final long INITIALIZATION_DELAY = 400; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HideLocallyDismissedNotifsCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HideLocallyDismissedNotifsCoordinator.java new file mode 100644 index 000000000000..0059e7baa3c2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/HideLocallyDismissedNotifsCoordinator.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2020 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.notification.collection.coordinator; + +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.NOT_DISMISSED; + +import com.android.systemui.statusbar.notification.collection.NotifPipeline; +import com.android.systemui.statusbar.notification.collection.NotificationEntry; +import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter; + +/** + * Filters out notifications that have been dismissed locally (by the user) but that system server + * hasn't yet confirmed the removal of. + */ +public class HideLocallyDismissedNotifsCoordinator implements Coordinator { + @Override + public void attach(NotifPipeline pipeline) { + pipeline.addPreGroupFilter(mFilter); + } + + private final NotifFilter mFilter = new NotifFilter("HideLocallyDismissedNotifsFilter") { + @Override + public boolean shouldFilterOut(NotificationEntry entry, long now) { + return entry.getDismissState() != NOT_DISMISSED; + } + }; +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java index 8d0dd5b111ba..0a1e09f4c99d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java @@ -56,6 +56,7 @@ public class NotifCoordinators implements Dumpable { PreparationCoordinator preparationCoordinator) { dumpController.registerDumpable(TAG, this); + mCoordinators.add(new HideLocallyDismissedNotifsCoordinator()); mCoordinators.add(keyguardCoordinator); mCoordinators.add(rankingCoordinator); mCoordinators.add(foregroundCoordinator); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java index 20c9cbc8790d..41314b86695a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java @@ -72,7 +72,7 @@ public class PreparationCoordinator implements Coordinator { } @Override - public void onEntryRemoved(NotificationEntry entry, int reason, boolean removedByUser) { + public void onEntryRemoved(NotificationEntry entry, int reason) { abortInflation(entry, "entryRemoved reason=" + reason); } }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionListener.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionListener.java index ff6da12bd0bc..b2c53dae16cd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionListener.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionListener.java @@ -54,10 +54,7 @@ public interface NotifCollectionListener { * immediately after a user dismisses a notification: we wait until we receive confirmation from * system server before considering the notification removed. */ - default void onEntryRemoved( - NotificationEntry entry, - @CancellationReason int reason, - boolean removedByUser) { + default void onEntryRemoved(NotificationEntry entry, @CancellationReason int reason) { } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt index bd1bd860f80c..14e15031056f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt @@ -16,8 +16,11 @@ package com.android.systemui.statusbar.notification.collection.notifcollection +import android.service.notification.NotificationListenerService.RankingMap import com.android.systemui.log.LogBuffer -import com.android.systemui.log.LogLevel +import com.android.systemui.log.LogLevel.DEBUG +import com.android.systemui.log.LogLevel.INFO +import com.android.systemui.log.LogLevel.WARNING import com.android.systemui.log.dagger.NotificationLog import javax.inject.Inject @@ -25,7 +28,7 @@ class NotifCollectionLogger @Inject constructor( @NotificationLog private val buffer: LogBuffer ) { fun logNotifPosted(key: String) { - buffer.log(TAG, LogLevel.INFO, { + buffer.log(TAG, INFO, { str1 = key }, { "POSTED $str1" @@ -33,7 +36,7 @@ class NotifCollectionLogger @Inject constructor( } fun logNotifGroupPosted(groupKey: String, batchSize: Int) { - buffer.log(TAG, LogLevel.INFO, { + buffer.log(TAG, INFO, { str1 = groupKey int1 = batchSize }, { @@ -42,7 +45,7 @@ class NotifCollectionLogger @Inject constructor( } fun logNotifUpdated(key: String) { - buffer.log(TAG, LogLevel.INFO, { + buffer.log(TAG, INFO, { str1 = key }, { "UPDATED $str1" @@ -50,13 +53,29 @@ class NotifCollectionLogger @Inject constructor( } fun logNotifRemoved(key: String, reason: Int) { - buffer.log(TAG, LogLevel.INFO, { + buffer.log(TAG, INFO, { str1 = key int1 = reason }, { "REMOVED $str1 reason=$int1" }) } + + fun logNotifDismissed(key: String) { + buffer.log(TAG, INFO, { + str1 = key + }, { + "DISMISSED $str1" + }) + } + + fun logRankingMissing(key: String, rankingMap: RankingMap) { + buffer.log(TAG, WARNING, { str1 = key }, { "Ranking update is missing ranking for $str1" }) + buffer.log(TAG, DEBUG, {}, { "Ranking map contents:" }) + for (entry in rankingMap.orderedKeys) { + buffer.log(TAG, DEBUG, { str1 = entry }, { " $str1" }) + } + } } private const val TAG = "NotifCollection"
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace.proto b/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace.proto index 08ae99ceb7a1..d940a6b5c460 100644 --- a/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace.proto +++ b/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace.proto @@ -29,3 +29,29 @@ message EdgeBackGestureHandlerProto { optional bool allow_gesture = 1; } + +/* represents a file full of system ui trace entries. + Encoded, it should start with 0x9 0x53 0x59 0x53 0x55 0x49 0x54 0x52 0x43 (.SYSUITRC), such + that they can be easily identified. */ +message SystemUiTraceFileProto { + + /* constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 | MagicNumber.MAGIC_NUMBER_L + (this is needed because enums have to be 32 bits and there's no nice way to put 64bit + constants into .proto files. */ + enum MagicNumber { + INVALID = 0; + MAGIC_NUMBER_L = 0x55535953; /* SYSU (little-endian ASCII) */ + MAGIC_NUMBER_H = 0x43525449; /* ITRC (little-endian ASCII) */ + } + + optional fixed64 magic_number = 1; /* Must be the first field, set to value in MagicNumber */ + repeated SystemUiTraceEntryProto entry = 2; +} + +/* one system ui trace entry. */ +message SystemUiTraceEntryProto { + /* required: elapsed realtime in nanos since boot of when this entry was logged */ + optional fixed64 elapsed_realtime_nanos = 1; + + optional SystemUiTraceProto system_ui = 3; +} diff --git a/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace_file.proto b/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace_file.proto deleted file mode 100644 index d1523ef13501..000000000000 --- a/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace_file.proto +++ /dev/null @@ -1,49 +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. - */ - -syntax = "proto2"; - -import "frameworks/base/packages/SystemUI/src/com/android/systemui/tracing/sysui_trace.proto"; - -package com.android.systemui.tracing; - -option java_multiple_files = true; - -/* represents a file full of system ui trace entries. - Encoded, it should start with 0x9 0x53 0x59 0x53 0x55 0x49 0x54 0x52 0x43 (.SYSUITRC), such - that they can be easily identified. */ -message SystemUiTraceFileProto { - - /* constant; MAGIC_NUMBER = (long) MAGIC_NUMBER_H << 32 | MagicNumber.MAGIC_NUMBER_L - (this is needed because enums have to be 32 bits and there's no nice way to put 64bit - constants into .proto files. */ - enum MagicNumber { - INVALID = 0; - MAGIC_NUMBER_L = 0x55535953; /* SYSU (little-endian ASCII) */ - MAGIC_NUMBER_H = 0x43525449; /* ITRC (little-endian ASCII) */ - } - - optional fixed64 magic_number = 1; /* Must be the first field, set to value in MagicNumber */ - repeated SystemUiTraceEntryProto entry = 2; -} - -/* one system ui trace entry. */ -message SystemUiTraceEntryProto { - /* required: elapsed realtime in nanos since boot of when this entry was logged */ - optional fixed64 elapsed_realtime_nanos = 1; - - optional SystemUiTraceProto system_ui = 3; -} diff --git a/packages/SystemUI/src/com/android/systemui/wm/DisplayLayout.java b/packages/SystemUI/src/com/android/systemui/wm/DisplayLayout.java index 264a683f6a3d..64b0b66a47a9 100644 --- a/packages/SystemUI/src/com/android/systemui/wm/DisplayLayout.java +++ b/packages/SystemUI/src/com/android/systemui/wm/DisplayLayout.java @@ -31,9 +31,11 @@ import android.annotation.NonNull; import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; +import android.graphics.Insets; import android.graphics.Rect; import android.os.SystemProperties; import android.provider.Settings; +import android.util.RotationUtils; import android.util.Size; import android.view.Display; import android.view.DisplayCutout; @@ -43,8 +45,6 @@ import android.view.Surface; import com.android.internal.R; -import java.util.List; - /** * Contains information about the layout-properties of a display. This refers to internal layout * like insets/cutout/rotation. In general, this can be thought of as the System-UI analog to @@ -323,28 +323,38 @@ public class DisplayLayout { if (cutout == null || cutout == DisplayCutout.NO_CUTOUT) { return null; } + final Insets waterfallInsets = + RotationUtils.rotateInsets(cutout.getWaterfallInsets(), rotation); if (rotation == ROTATION_0) { - return computeSafeInsets( - cutout, displayWidth, displayHeight); + return computeSafeInsets(cutout, displayWidth, displayHeight); } final boolean rotated = (rotation == ROTATION_90 || rotation == ROTATION_270); - Rect[] cutoutRects = computeSafeInsets(cutout, displayWidth, displayHeight) - .getBoundingRectsAll(); + Rect[] cutoutRects = cutout.getBoundingRectsAll(); final Rect[] newBounds = new Rect[cutoutRects.length]; final Rect displayBounds = new Rect(0, 0, displayWidth, displayHeight); for (int i = 0; i < cutoutRects.length; ++i) { - newBounds[i] = new Rect(cutoutRects[i]); - rotateBounds(newBounds[i], displayBounds, rotation); + final Rect rect = new Rect(cutoutRects[i]); + if (!rect.isEmpty()) { + rotateBounds(rect, displayBounds, rotation); + } + newBounds[getBoundIndexFromRotation(i, rotation)] = rect; } - return computeSafeInsets(DisplayCutout.fromBounds(newBounds), + return computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall(newBounds, waterfallInsets), rotated ? displayHeight : displayWidth, rotated ? displayWidth : displayHeight); } + private static int getBoundIndexFromRotation(int index, int rotation) { + return (index - rotation) < 0 + ? index - rotation + DisplayCutout.BOUNDS_POSITION_LENGTH + : index - rotation; + } + /** Calculate safe insets. */ public static DisplayCutout computeSafeInsets(DisplayCutout inner, int displayWidth, int displayHeight) { - if (inner == DisplayCutout.NO_CUTOUT || inner.isBoundsEmpty()) { + if (inner == DisplayCutout.NO_CUTOUT) { return null; } @@ -353,58 +363,44 @@ public class DisplayLayout { return inner.replaceSafeInsets(safeInsets); } - private static Rect computeSafeInsets(Size displaySize, DisplayCutout cutout) { - if (displaySize.getWidth() < displaySize.getHeight()) { - final List<Rect> boundingRects = cutout.replaceSafeInsets( - new Rect(0, displaySize.getHeight() / 2, 0, displaySize.getHeight() / 2)) - .getBoundingRects(); - int topInset = findInsetForSide(displaySize, boundingRects, Gravity.TOP); - int bottomInset = findInsetForSide(displaySize, boundingRects, Gravity.BOTTOM); - return new Rect(0, topInset, 0, bottomInset); - } else if (displaySize.getWidth() > displaySize.getHeight()) { - final List<Rect> boundingRects = cutout.replaceSafeInsets( - new Rect(displaySize.getWidth() / 2, 0, displaySize.getWidth() / 2, 0)) - .getBoundingRects(); - int leftInset = findInsetForSide(displaySize, boundingRects, Gravity.LEFT); - int right = findInsetForSide(displaySize, boundingRects, Gravity.RIGHT); - return new Rect(leftInset, 0, right, 0); - } else { + private static Rect computeSafeInsets( + Size displaySize, DisplayCutout cutout) { + if (displaySize.getWidth() == displaySize.getHeight()) { throw new UnsupportedOperationException("not implemented: display=" + displaySize + " cutout=" + cutout); } + + int leftInset = Math.max(cutout.getWaterfallInsets().left, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectLeft(), Gravity.LEFT)); + int topInset = Math.max(cutout.getWaterfallInsets().top, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectTop(), Gravity.TOP)); + int rightInset = Math.max(cutout.getWaterfallInsets().right, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectRight(), Gravity.RIGHT)); + int bottomInset = Math.max(cutout.getWaterfallInsets().bottom, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectBottom(), + Gravity.BOTTOM)); + + return new Rect(leftInset, topInset, rightInset, bottomInset); } - private static int findInsetForSide(Size display, List<Rect> boundingRects, int gravity) { + private static int findCutoutInsetForSide(Size display, Rect boundingRect, int gravity) { + if (boundingRect.isEmpty()) { + return 0; + } + int inset = 0; - final int size = boundingRects.size(); - for (int i = 0; i < size; i++) { - Rect boundingRect = boundingRects.get(i); - switch (gravity) { - case Gravity.TOP: - if (boundingRect.top == 0) { - inset = Math.max(inset, boundingRect.bottom); - } - break; - case Gravity.BOTTOM: - if (boundingRect.bottom == display.getHeight()) { - inset = Math.max(inset, display.getHeight() - boundingRect.top); - } - break; - case Gravity.LEFT: - if (boundingRect.left == 0) { - inset = Math.max(inset, boundingRect.right); - } - break; - case Gravity.RIGHT: - if (boundingRect.right == display.getWidth()) { - inset = Math.max(inset, display.getWidth() - boundingRect.left); - } - break; - default: - throw new IllegalArgumentException("unknown gravity: " + gravity); - } + switch (gravity) { + case Gravity.TOP: + return Math.max(inset, boundingRect.bottom); + case Gravity.BOTTOM: + return Math.max(inset, display.getHeight() - boundingRect.top); + case Gravity.LEFT: + return Math.max(inset, boundingRect.right); + case Gravity.RIGHT: + return Math.max(inset, display.getWidth() - boundingRect.left); + default: + throw new IllegalArgumentException("unknown gravity: " + gravity); } - return inset; } static boolean hasNavigationBar(DisplayInfo info, Context context, int displayId) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java index b65298097ff1..7c94ed20e95a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java @@ -17,9 +17,16 @@ package com.android.systemui.statusbar.notification.collection; import static android.service.notification.NotificationListenerService.REASON_APP_CANCEL; +import static android.service.notification.NotificationListenerService.REASON_CANCEL; import static android.service.notification.NotificationListenerService.REASON_CLICK; +import static android.service.notification.NotificationStats.DISMISSAL_SHADE; +import static android.service.notification.NotificationStats.DISMISS_SENTIMENT_NEUTRAL; +import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_NOT_CANCELED; import static com.android.systemui.statusbar.notification.collection.NotifCollection.REASON_UNKNOWN; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.DISMISSED; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.NOT_DISMISSED; +import static com.android.systemui.statusbar.notification.collection.NotificationEntry.DismissState.PARENT_DISMISSED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,7 +47,6 @@ import static java.util.Objects.requireNonNull; import android.annotation.Nullable; import android.os.RemoteException; import android.service.notification.NotificationListenerService.Ranking; -import android.service.notification.NotificationStats; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.util.ArrayMap; @@ -77,6 +83,7 @@ import org.mockito.Spy; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -236,7 +243,7 @@ public class NotifCollectionTest extends SysuiTestCase { mNoMan.retractNotif(notif.sbn, REASON_APP_CANCEL); // THEN the listener is notified - verify(mCollectionListener).onEntryRemoved(entry, REASON_APP_CANCEL, false); + verify(mCollectionListener).onEntryRemoved(entry, REASON_APP_CANCEL); verify(mCollectionListener).onEntryCleanUp(entry); assertEquals(notif.sbn, entry.getSbn()); assertEquals(notif.ranking, entry.getRanking()); @@ -322,24 +329,15 @@ public class NotifCollectionTest extends SysuiTestCase { } @Test - public void testDismissNotification() throws RemoteException { - // GIVEN a collection with a couple notifications and a lifetime extender - mCollection.addNotificationLifetimeExtender(mExtender1); - + public void testDismissNotificationSentToSystemServer() throws RemoteException { + // GIVEN a collection with a couple notifications NotifEvent notif1 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 47, "myTag")); NotifEvent notif2 = mNoMan.postNotif(buildNotif(TEST_PACKAGE2, 88, "barTag")); NotificationEntry entry2 = mCollectionListener.getEntry(notif2.key); // WHEN a notification is manually dismissed - DismissedByUserStats stats = new DismissedByUserStats( - NotificationStats.DISMISSAL_SHADE, - NotificationStats.DISMISS_SENTIMENT_NEUTRAL, - NotificationVisibility.obtain(entry2.getKey(), 7, 2, true)); - - mCollection.dismissNotification(entry2, REASON_CLICK, stats); - - // THEN we check for lifetime extension - verify(mExtender1).shouldExtendLifetime(entry2, REASON_CLICK); + DismissedByUserStats stats = defaultStats(entry2); + mCollection.dismissNotification(entry2, defaultStats(entry2)); // THEN we send the dismissal to system server verify(mStatusBarService).onNotificationClear( @@ -351,9 +349,96 @@ public class NotifCollectionTest extends SysuiTestCase { stats.dismissalSurface, stats.dismissalSentiment, stats.notificationVisibility); + } + + @Test + public void testDismissedNotificationsAreMarkedAsDismissedLocally() { + // GIVEN a collection with a notification + NotifEvent notif1 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 47, "myTag")); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN a notification is manually dismissed + mCollection.dismissNotification(entry1, defaultStats(entry1)); - // THEN we fire a remove event - verify(mCollectionListener).onEntryRemoved(entry2, REASON_CLICK, true); + // THEN the entry is marked as dismissed locally + assertEquals(DISMISSED, entry1.getDismissState()); + } + + @Test + public void testDismissedNotificationsCannotBeLifetimeExtended() { + // GIVEN a collection with a notification and a lifetime extender + mCollection.addNotificationLifetimeExtender(mExtender1); + NotifEvent notif1 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 47, "myTag")); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN a notification is manually dismissed + mCollection.dismissNotification(entry1, defaultStats(entry1)); + + // THEN lifetime extenders are never queried + verify(mExtender1, never()).shouldExtendLifetime(eq(entry1), anyInt()); + } + + @Test + public void testDismissedNotificationsDoNotTriggerRemovalEvents() { + // GIVEN a collection with a notification + NotifEvent notif1 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 47, "myTag")); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN a notification is manually dismissed + mCollection.dismissNotification(entry1, defaultStats(entry1)); + + // THEN onEntryRemoved is not called + verify(mCollectionListener, never()).onEntryRemoved(eq(entry1), anyInt()); + } + + @Test + public void testDismissedNotificationsStillAppearInNotificationSet() { + // GIVEN a collection with a notification + NotifEvent notif1 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 47, "myTag")); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN a notification is manually dismissed + mCollection.dismissNotification(entry1, defaultStats(entry1)); + + // THEN the dismissed entry still appears in the notification set + assertEquals( + new ArraySet<>(Collections.singletonList(entry1)), + new ArraySet<>(mCollection.getActiveNotifs())); + } + + @Test + public void testDismissingLifetimeExtendedSummaryDoesNotDismissChildren() { + // GIVEN A notif group with one summary and two children + mCollection.addNotificationLifetimeExtender(mExtender1); + NotifEvent notif1 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 1, "myTag") + .setGroup(mContext, GROUP_1) + .setGroupSummary(mContext, true)); + NotifEvent notif2 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 2, "myTag") + .setGroup(mContext, GROUP_1)); + NotifEvent notif3 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 3, "myTag") + .setGroup(mContext, GROUP_1)); + + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + NotificationEntry entry2 = mCollectionListener.getEntry(notif2.key); + NotificationEntry entry3 = mCollectionListener.getEntry(notif3.key); + + // GIVEN that the summary and one child are retracted, but both are lifetime-extended + mExtender1.shouldExtendLifetime = true; + mNoMan.retractNotif(notif1.sbn, REASON_CANCEL); + mNoMan.retractNotif(notif2.sbn, REASON_CANCEL); + assertEquals( + new ArraySet<>(List.of(entry1, entry2, entry3)), + new ArraySet<>(mCollection.getActiveNotifs())); + + // WHEN the summary is dismissed by the user + mCollection.dismissNotification(entry1, defaultStats(entry1)); + + // THEN the summary is removed, but both children stick around + assertEquals( + new ArraySet<>(List.of(entry2, entry3)), + new ArraySet<>(mCollection.getActiveNotifs())); + assertEquals(NOT_DISMISSED, entry2.getDismissState()); + assertEquals(NOT_DISMISSED, entry3.getDismissState()); } @Test(expected = IllegalStateException.class) @@ -366,15 +451,115 @@ public class NotifCollectionTest extends SysuiTestCase { mNoMan.retractNotif(notif2.sbn, REASON_UNKNOWN); // WHEN we try to dismiss a notification that isn't present - mCollection.dismissNotification( - entry2, - REASON_CLICK, - new DismissedByUserStats(0, 0, NotificationVisibility.obtain("foo", 47, 3, true))); + mCollection.dismissNotification(entry2, defaultStats(entry2)); // THEN an exception is thrown } @Test + public void testGroupChildrenAreDismissedLocallyWhenSummaryIsDismissed() { + // GIVEN a collection with two grouped notifs in it + NotifEvent notif0 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0) + .setGroup(mContext, GROUP_1) + .setGroupSummary(mContext, true)); + NotifEvent notif1 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 1) + .setGroup(mContext, GROUP_1)); + NotificationEntry entry0 = mCollectionListener.getEntry(notif0.key); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN the summary is dismissed + mCollection.dismissNotification(entry0, defaultStats(entry0)); + + // THEN all members of the group are marked as dismissed locally + assertEquals(DISMISSED, entry0.getDismissState()); + assertEquals(PARENT_DISMISSED, entry1.getDismissState()); + } + + @Test + public void testUpdatingDismissedSummaryBringsChildrenBack() { + // GIVEN a collection with two grouped notifs in it + NotifEvent notif0 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0) + .setGroup(mContext, GROUP_1) + .setGroupSummary(mContext, true)); + NotifEvent notif1 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 1) + .setGroup(mContext, GROUP_1)); + NotificationEntry entry0 = mCollectionListener.getEntry(notif0.key); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN the summary is dismissed but then reposted without a group + mCollection.dismissNotification(entry0, defaultStats(entry0)); + NotifEvent notif0a = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0)); + + // THEN it and all of its previous children are no longer dismissed locally + assertEquals(NOT_DISMISSED, entry0.getDismissState()); + assertEquals(NOT_DISMISSED, entry1.getDismissState()); + } + + @Test + public void testDismissedChildrenAreNotResetByParentUpdate() { + // GIVEN a collection with three grouped notifs in it + NotifEvent notif0 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0) + .setGroup(mContext, GROUP_1) + .setGroupSummary(mContext, true)); + NotifEvent notif1 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 1) + .setGroup(mContext, GROUP_1)); + NotifEvent notif2 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 2) + .setGroup(mContext, GROUP_1)); + NotificationEntry entry0 = mCollectionListener.getEntry(notif0.key); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + NotificationEntry entry2 = mCollectionListener.getEntry(notif2.key); + + // WHEN a child is dismissed, then the parent is dismissed, then the parent is updated + mCollection.dismissNotification(entry1, defaultStats(entry1)); + mCollection.dismissNotification(entry0, defaultStats(entry0)); + NotifEvent notif0a = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0)); + + // THEN the manually-dismissed child is still marked as dismissed + assertEquals(NOT_DISMISSED, entry0.getDismissState()); + assertEquals(DISMISSED, entry1.getDismissState()); + assertEquals(NOT_DISMISSED, entry2.getDismissState()); + } + + @Test + public void testUpdatingGroupKeyOfDismissedSummaryBringsChildrenBack() { + // GIVEN a collection with two grouped notifs in it + NotifEvent notif0 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0) + .setOverrideGroupKey(GROUP_1) + .setGroupSummary(mContext, true)); + NotifEvent notif1 = mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 1) + .setOverrideGroupKey(GROUP_1)); + NotificationEntry entry0 = mCollectionListener.getEntry(notif0.key); + NotificationEntry entry1 = mCollectionListener.getEntry(notif1.key); + + // WHEN the summary is dismissed but then reposted AND in the same update one of the + // children's ranking loses its override group + mCollection.dismissNotification(entry0, defaultStats(entry0)); + mNoMan.setRanking(entry1.getKey(), new RankingBuilder() + .setKey(entry1.getKey()) + .build()); + mNoMan.postNotif( + buildNotif(TEST_PACKAGE, 0) + .setOverrideGroupKey(GROUP_1) + .setGroupSummary(mContext, true)); + + // THEN it and all of its previous children are no longer dismissed locally, including the + // child that is no longer part of the group + assertEquals(NOT_DISMISSED, entry0.getDismissState()); + assertEquals(NOT_DISMISSED, entry1.getDismissState()); + } + + @Test public void testLifetimeExtendersAreQueriedWhenNotifRemoved() { // GIVEN a couple notifications and a few lifetime extenders mExtender1.shouldExtendLifetime = true; @@ -389,12 +574,12 @@ public class NotifCollectionTest extends SysuiTestCase { NotificationEntry entry2 = mCollectionListener.getEntry(notif2.key); // WHEN a notification is removed - mNoMan.retractNotif(notif2.sbn, REASON_UNKNOWN); + mNoMan.retractNotif(notif2.sbn, REASON_CLICK); // THEN each extender is asked whether to extend, even if earlier ones return true - verify(mExtender1).shouldExtendLifetime(entry2, REASON_UNKNOWN); - verify(mExtender2).shouldExtendLifetime(entry2, REASON_UNKNOWN); - verify(mExtender3).shouldExtendLifetime(entry2, REASON_UNKNOWN); + verify(mExtender1).shouldExtendLifetime(entry2, REASON_CLICK); + verify(mExtender2).shouldExtendLifetime(entry2, REASON_CLICK); + verify(mExtender3).shouldExtendLifetime(entry2, REASON_CLICK); // THEN the entry is not removed assertTrue(mCollection.getActiveNotifs().contains(entry2)); @@ -428,9 +613,9 @@ public class NotifCollectionTest extends SysuiTestCase { mExtender2.callback.onEndLifetimeExtension(mExtender2, entry2); // THEN each extender is re-queried - verify(mExtender1).shouldExtendLifetime(entry2, REASON_UNKNOWN); - verify(mExtender2).shouldExtendLifetime(entry2, REASON_UNKNOWN); - verify(mExtender3).shouldExtendLifetime(entry2, REASON_UNKNOWN); + verify(mExtender1).shouldExtendLifetime(entry2, REASON_APP_CANCEL); + verify(mExtender2).shouldExtendLifetime(entry2, REASON_APP_CANCEL); + verify(mExtender3).shouldExtendLifetime(entry2, REASON_APP_CANCEL); // THEN the entry is not removed assertTrue(mCollection.getActiveNotifs().contains(entry2)); @@ -466,9 +651,9 @@ public class NotifCollectionTest extends SysuiTestCase { assertTrue(mCollection.getActiveNotifs().contains(entry2)); // THEN we don't re-query the extenders - verify(mExtender1, never()).shouldExtendLifetime(eq(entry2), anyInt()); - verify(mExtender2, never()).shouldExtendLifetime(eq(entry2), anyInt()); - verify(mExtender3, never()).shouldExtendLifetime(eq(entry2), anyInt()); + verify(mExtender1, never()).shouldExtendLifetime(entry2, REASON_APP_CANCEL); + verify(mExtender2, never()).shouldExtendLifetime(entry2, REASON_APP_CANCEL); + verify(mExtender3, never()).shouldExtendLifetime(entry2, REASON_APP_CANCEL); // THEN the entry properly records all extenders that returned true assertEquals(Arrays.asList(mExtender1), entry2.mLifetimeExtenders); @@ -501,7 +686,7 @@ public class NotifCollectionTest extends SysuiTestCase { // THEN the entry removed assertFalse(mCollection.getActiveNotifs().contains(entry2)); - verify(mCollectionListener).onEntryRemoved(entry2, REASON_UNKNOWN, false); + verify(mCollectionListener).onEntryRemoved(entry2, REASON_UNKNOWN); } @Test @@ -591,6 +776,36 @@ public class NotifCollectionTest extends SysuiTestCase { assertEquals(notif2a.ranking, entry2.getRanking()); } + @Test + public void testCancellationReasonIsSetWhenNotifIsCancelled() { + // GIVEN a notification + NotifEvent notif0 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 3)); + NotificationEntry entry0 = mCollectionListener.getEntry(notif0.key); + + // WHEN the notification is retracted + mNoMan.retractNotif(notif0.sbn, REASON_APP_CANCEL); + + // THEN the retraction reason is stored on the notif + assertEquals(REASON_APP_CANCEL, entry0.mCancellationReason); + } + + @Test + public void testCancellationReasonIsClearedWhenNotifIsUpdated() { + // GIVEN a notification and a lifetime extender that will preserve it + NotifEvent notif0 = mNoMan.postNotif(buildNotif(TEST_PACKAGE, 3)); + NotificationEntry entry0 = mCollectionListener.getEntry(notif0.key); + mCollection.addNotificationLifetimeExtender(mExtender1); + mExtender1.shouldExtendLifetime = true; + + // WHEN the notification is retracted and subsequently reposted + mNoMan.retractNotif(notif0.sbn, REASON_APP_CANCEL); + assertEquals(REASON_APP_CANCEL, entry0.mCancellationReason); + mNoMan.postNotif(buildNotif(TEST_PACKAGE, 3)); + + // THEN the notification has its cancellation reason cleared + assertEquals(REASON_NOT_CANCELED, entry0.mCancellationReason); + } + private static NotificationEntryBuilder buildNotif(String pkg, int id, String tag) { return new NotificationEntryBuilder() .setPkg(pkg) @@ -604,6 +819,13 @@ public class NotifCollectionTest extends SysuiTestCase { .setId(id); } + private static DismissedByUserStats defaultStats(NotificationEntry entry) { + return new DismissedByUserStats( + DISMISSAL_SHADE, + DISMISS_SENTIMENT_NEUTRAL, + NotificationVisibility.obtain(entry.getKey(), 7, 2, true)); + } + private static class RecordingCollectionListener implements NotifCollectionListener { private final Map<String, NotificationEntry> mLastSeenEntries = new ArrayMap<>(); @@ -621,7 +843,7 @@ public class NotifCollectionTest extends SysuiTestCase { } @Override - public void onEntryRemoved(NotificationEntry entry, int reason, boolean removedByUser) { + public void onEntryRemoved(NotificationEntry entry, int reason) { } @Override @@ -674,4 +896,6 @@ public class NotifCollectionTest extends SysuiTestCase { private static final String TEST_PACKAGE = "com.android.test.collection"; private static final String TEST_PACKAGE2 = "com.android.test.collection2"; + + private static final String GROUP_1 = "group_1"; } diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index 8eea04759cdb..507e98369855 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -27,6 +27,7 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentSender; +import android.content.pm.PackageManager; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.metrics.LogMaker; @@ -187,7 +188,10 @@ final class SaveUi { context = new ContextThemeWrapper(context, mThemeId) { @Override public void startActivity(Intent intent) { - if (intent.resolveActivity(getPackageManager()) == null) { + if (resolveActivity(intent) == null) { + if (sDebug) { + Slog.d(TAG, "Can not startActivity for save UI with intent=" + intent); + } return; } intent.putExtra(AutofillManager.EXTRA_RESTORE_CROSS_ACTIVITY, true); @@ -199,6 +203,16 @@ final class SaveUi { // Apply restore mechanism startIntentSenderWithRestore(p, intent); } + + private ComponentName resolveActivity(Intent intent) { + final PackageManager packageManager = getPackageManager(); + final ComponentName componentName = intent.resolveActivity(packageManager); + if (componentName != null) { + return componentName; + } + intent.addFlags(Intent.FLAG_ACTIVITY_MATCH_EXTERNAL); + return intent.resolveActivity(packageManager); + } }; final LayoutInflater inflater = LayoutInflater.from(context); final View view = inflater.inflate(R.layout.autofill_save, null); diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java index dd1b84b16f68..7ea4eff3381c 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureMetricsLogger.java @@ -20,7 +20,8 @@ import android.annotation.Nullable; import android.content.ComponentName; import android.content.ContentCaptureOptions; import android.service.contentcapture.FlushMetrics; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; import java.util.List; @@ -35,8 +36,8 @@ public final class ContentCaptureMetricsLogger { /** @hide */ public static void writeServiceEvent(int eventType, @NonNull String serviceName, @Nullable String targetPackage) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, eventType, serviceName, - targetPackage); + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, eventType, + serviceName, targetPackage); } /** @hide */ @@ -79,16 +80,16 @@ public final class ContentCaptureMetricsLogger { stringBuilder.append(activities.get(i).flattenToShortString()); } } - StatsLog.write(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, - StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_WHITELIST, + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS, + FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_WHITELIST, serviceName, stringBuilder.toString()); } /** @hide */ public static void writeSessionEvent(int sessionId, int event, int flags, @NonNull ComponentName service, @Nullable ComponentName app, boolean isChildSession) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_SESSION_EVENTS, sessionId, event, flags, - ComponentName.flattenToShortString(service), + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS, sessionId, event, + flags, ComponentName.flattenToShortString(service), ComponentName.flattenToShortString(app), isChildSession); } @@ -96,7 +97,7 @@ public final class ContentCaptureMetricsLogger { public static void writeSessionFlush(int sessionId, @NonNull ComponentName service, @Nullable ComponentName app, @NonNull FlushMetrics fm, @NonNull ContentCaptureOptions options, int flushReason) { - StatsLog.write(StatsLog.CONTENT_CAPTURE_FLUSHED, sessionId, + FrameworkStatsLog.write(FrameworkStatsLog.CONTENT_CAPTURE_FLUSHED, sessionId, ComponentName.flattenToShortString(service), ComponentName.flattenToShortString(app), fm.sessionStarted, fm.sessionFinished, fm.viewAppearedCount, fm.viewDisappearedCount, fm.viewTextChangedCount, diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java index 0f1122e3886a..583c5b593b88 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java @@ -61,13 +61,13 @@ import android.util.ArraySet; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; -import android.util.StatsLog; import android.view.contentcapture.ContentCaptureCondition; import android.view.contentcapture.DataRemovalRequest; import android.view.contentcapture.DataShareRequest; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.IResultReceiver; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.contentcapture.RemoteContentCaptureService.ContentCaptureServiceCallbacks; import com.android.server.infra.AbstractPerUserSystemService; @@ -275,7 +275,7 @@ final class ContentCapturePerUserService /* binder= */ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_NO_SERVICE, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -299,7 +299,7 @@ final class ContentCapturePerUserService /* binder= */ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_NOT_WHITELISTED, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -313,7 +313,7 @@ final class ContentCapturePerUserService /* binder=*/ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_DUPLICATED_ID, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -330,7 +330,7 @@ final class ContentCapturePerUserService /* binder= */ null); // Log metrics. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__SESSION_NOT_CREATED, STATE_DISABLED | STATE_NO_SERVICE, serviceComponentName, componentName, /* isChildSession= */ false); return; @@ -651,7 +651,7 @@ final class ContentCapturePerUserService } finally { Binder.restoreCallingIdentity(token); } - writeServiceEvent(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_DISABLED, + writeServiceEvent(FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__SET_DISABLED, getServiceComponentName()); } diff --git a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java index c16df0f19943..9a170ac6da10 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java @@ -32,13 +32,13 @@ import android.service.contentcapture.IContentCaptureServiceCallback; import android.service.contentcapture.IDataShareCallback; import android.service.contentcapture.SnapshotData; import android.util.Slog; -import android.util.StatsLog; import android.view.contentcapture.ContentCaptureContext; import android.view.contentcapture.DataRemovalRequest; import android.view.contentcapture.DataShareRequest; import com.android.internal.infra.AbstractMultiplePendingRequestsRemoteService; import com.android.internal.os.IResultReceiver; +import com.android.internal.util.FrameworkStatsLog; final class RemoteContentCaptureService extends AbstractMultiplePendingRequestsRemoteService<RemoteContentCaptureService, @@ -83,7 +83,8 @@ final class RemoteContentCaptureService if (connected) { try { mService.onConnected(mServerCallback, sVerbose, sDebug); - writeServiceEvent(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_CONNECTED, + writeServiceEvent( + FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_CONNECTED, mComponentName); } finally { // Update the system-service state, in case the service reconnected after @@ -92,7 +93,8 @@ final class RemoteContentCaptureService } } else { mService.onDisconnected(); - writeServiceEvent(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_DISCONNECTED, + writeServiceEvent( + FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_DISCONNECTED, mComponentName); } } catch (Exception e) { @@ -114,8 +116,9 @@ final class RemoteContentCaptureService (s) -> s.onSessionStarted(context, sessionId, uid, clientReceiver, initialState)); // Metrics logging. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_STARTED, initialState, - getComponentName(), context.getActivityComponent(), /* is_child_session= */ false); + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_STARTED, + initialState, getComponentName(), context.getActivityComponent(), + /* is_child_session= */ false); } /** @@ -126,7 +129,7 @@ final class RemoteContentCaptureService scheduleAsyncRequest((s) -> s.onSessionFinished(sessionId)); // Metrics logging. writeSessionEvent(sessionId, - StatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_FINISHED, + FrameworkStatsLog.CONTENT_CAPTURE_SESSION_EVENTS__EVENT__ON_SESSION_FINISHED, /* flags= */ 0, getComponentName(), /* app= */ null, /* is_child_session= */ false); } @@ -143,7 +146,8 @@ final class RemoteContentCaptureService */ public void onDataRemovalRequest(@NonNull DataRemovalRequest request) { scheduleAsyncRequest((s) -> s.onDataRemovalRequest(request)); - writeServiceEvent(StatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_USER_DATA_REMOVED, + writeServiceEvent( + FrameworkStatsLog.CONTENT_CAPTURE_SERVICE_EVENTS__EVENT__ON_USER_DATA_REMOVED, mComponentName); } diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index 27b6bfb8f5fd..bdcd832e4f4a 100644 --- a/services/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -67,6 +67,7 @@ public abstract class PackageManagerInternal { public static final int PACKAGE_TELEPHONY = 12; public static final int PACKAGE_WIFI = 13; public static final int PACKAGE_COMPANION = 14; + public static final int PACKAGE_RETAIL_DEMO = 15; @IntDef(value = { INTEGRITY_VERIFICATION_ALLOW, @@ -105,6 +106,7 @@ public abstract class PackageManagerInternal { PACKAGE_TELEPHONY, PACKAGE_WIFI, PACKAGE_COMPANION, + PACKAGE_RETAIL_DEMO, }) @Retention(RetentionPolicy.SOURCE) public @interface KnownPackage {} diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 0f2fb9252c29..3441a5f19508 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -86,7 +86,6 @@ import android.util.SparseArray; import android.util.SparseBooleanArray; import android.util.SparseIntArray; import android.util.SparseLongArray; -import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; @@ -94,6 +93,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.LocalLog; import com.android.internal.util.StatLogger; @@ -331,12 +331,16 @@ class AlarmManagerService extends SystemService { return (history == null) ? 0 : history.size(); } - long getLastWakeupForPackage(String packageName, int userId, int positionFromEnd) { + /** + * @param n The desired nth-last wakeup + * (1=1st-last=the ultimate wakeup and 2=2nd-last=the penultimate wakeup) + */ + long getNthLastWakeupForPackage(String packageName, int userId, int n) { final LongArrayQueue history = mPackageHistory.get(Pair.create(packageName, userId)); if (history == null) { return 0; } - final int i = history.size() - positionFromEnd; + final int i = history.size() - n; return (i < 0) ? 0 : history.get(i); } @@ -400,6 +404,11 @@ class AlarmManagerService extends SystemService { "standby_rare_quota", "standby_never_quota", }; + // Not putting this in the KEYS_APP_STANDBY_QUOTAS array because this uses a different + // window size. + private static final String KEY_APP_STANDBY_RESTRICTED_QUOTA = "standby_restricted_quota"; + private static final String KEY_APP_STANDBY_RESTRICTED_WINDOW = + "app_standby_restricted_window"; private static final long DEFAULT_MIN_FUTURITY = 5 * 1000; private static final long DEFAULT_MIN_INTERVAL = 60 * 1000; @@ -420,6 +429,8 @@ class AlarmManagerService extends SystemService { 1, // Rare 0 // Never }; + private static final int DEFAULT_APP_STANDBY_RESTRICTED_QUOTA = 1; + private static final long DEFAULT_APP_STANDBY_RESTRICTED_WINDOW = MILLIS_IN_DAY; // Minimum futurity of a new alarm public long MIN_FUTURITY = DEFAULT_MIN_FUTURITY; @@ -446,6 +457,8 @@ class AlarmManagerService extends SystemService { public long APP_STANDBY_WINDOW = DEFAULT_APP_STANDBY_WINDOW; public int[] APP_STANDBY_QUOTAS = new int[DEFAULT_APP_STANDBY_QUOTAS.length]; + public int APP_STANDBY_RESTRICTED_QUOTA = DEFAULT_APP_STANDBY_RESTRICTED_QUOTA; + public long APP_STANDBY_RESTRICTED_WINDOW = DEFAULT_APP_STANDBY_RESTRICTED_WINDOW; private ContentResolver mResolver; private final KeyValueListParser mParser = new KeyValueListParser(','); @@ -520,6 +533,14 @@ class AlarmManagerService extends SystemService { Math.min(APP_STANDBY_QUOTAS[i - 1], DEFAULT_APP_STANDBY_QUOTAS[i])); } + APP_STANDBY_RESTRICTED_QUOTA = Math.max(1, + mParser.getInt(KEY_APP_STANDBY_RESTRICTED_QUOTA, + DEFAULT_APP_STANDBY_RESTRICTED_QUOTA)); + + APP_STANDBY_RESTRICTED_WINDOW = Math.max(APP_STANDBY_WINDOW, + mParser.getLong(KEY_APP_STANDBY_RESTRICTED_WINDOW, + DEFAULT_APP_STANDBY_RESTRICTED_WINDOW)); + MAX_ALARMS_PER_UID = mParser.getInt(KEY_MAX_ALARMS_PER_UID, DEFAULT_MAX_ALARMS_PER_UID); if (MAX_ALARMS_PER_UID < DEFAULT_MAX_ALARMS_PER_UID) { @@ -581,6 +602,14 @@ class AlarmManagerService extends SystemService { pw.println(APP_STANDBY_QUOTAS[i]); } + pw.print(KEY_APP_STANDBY_RESTRICTED_QUOTA); pw.print("="); + TimeUtils.formatDuration(APP_STANDBY_RESTRICTED_QUOTA, pw); + pw.println(); + + pw.print(KEY_APP_STANDBY_RESTRICTED_WINDOW); pw.print("="); + TimeUtils.formatDuration(APP_STANDBY_RESTRICTED_WINDOW, pw); + pw.println(); + pw.decreaseIndent(); } @@ -1814,25 +1843,44 @@ class AlarmManagerService extends SystemService { sourcePackage, sourceUserId, mInjector.getElapsedRealtime()); // Quota deferring implementation: + boolean deferred = false; final int wakeupsInWindow = mAppWakeupHistory.getTotalWakeupsInWindow(sourcePackage, sourceUserId); - final int quotaForBucket = getQuotaForBucketLocked(standbyBucket); - boolean deferred = false; - if (wakeupsInWindow >= quotaForBucket) { - final long minElapsed; - if (quotaForBucket <= 0) { - // Just keep deferring for a day till the quota changes - minElapsed = mInjector.getElapsedRealtime() + MILLIS_IN_DAY; - } else { - // Suppose the quota for window was q, and the qth last delivery time for this - // package was t(q) then the next delivery must be after t(q) + <window_size> - final long t = mAppWakeupHistory.getLastWakeupForPackage(sourcePackage, - sourceUserId, quotaForBucket); - minElapsed = t + 1 + mConstants.APP_STANDBY_WINDOW; + if (standbyBucket == UsageStatsManager.STANDBY_BUCKET_RESTRICTED) { + // Special case because it's 1/day instead of 1/hour. + // AppWakeupHistory doesn't delete old wakeup times until a new one is logged, so we + // should always have the last wakeup available. + if (wakeupsInWindow > 0) { + final long lastWakeupTime = mAppWakeupHistory.getNthLastWakeupForPackage( + sourcePackage, sourceUserId, mConstants.APP_STANDBY_RESTRICTED_QUOTA); + if (mInjector.getElapsedRealtime() - lastWakeupTime + < mConstants.APP_STANDBY_RESTRICTED_WINDOW) { + final long minElapsed = + lastWakeupTime + mConstants.APP_STANDBY_RESTRICTED_WINDOW; + if (alarm.expectedWhenElapsed < minElapsed) { + alarm.whenElapsed = alarm.maxWhenElapsed = minElapsed; + deferred = true; + } + } } - if (alarm.expectedWhenElapsed < minElapsed) { - alarm.whenElapsed = alarm.maxWhenElapsed = minElapsed; - deferred = true; + } else { + final int quotaForBucket = getQuotaForBucketLocked(standbyBucket); + if (wakeupsInWindow >= quotaForBucket) { + final long minElapsed; + if (quotaForBucket <= 0) { + // Just keep deferring for a day till the quota changes + minElapsed = mInjector.getElapsedRealtime() + MILLIS_IN_DAY; + } else { + // Suppose the quota for window was q, and the qth last delivery time for this + // package was t(q) then the next delivery must be after t(q) + <window_size> + final long t = mAppWakeupHistory.getNthLastWakeupForPackage( + sourcePackage, sourceUserId, quotaForBucket); + minElapsed = t + 1 + mConstants.APP_STANDBY_WINDOW; + } + if (alarm.expectedWhenElapsed < minElapsed) { + alarm.whenElapsed = alarm.maxWhenElapsed = minElapsed; + deferred = true; + } } } if (!deferred) { @@ -3915,7 +3963,7 @@ class AlarmManagerService extends SystemService { Slog.v(TAG, "Time changed notification from kernel; rebatching"); } // StatsLog requires currentTimeMillis(), which == nowRTC to within usecs. - StatsLog.write(StatsLog.WALL_CLOCK_TIME_SHIFTED, nowRTC); + FrameworkStatsLog.write(FrameworkStatsLog.WALL_CLOCK_TIME_SHIFTED, nowRTC); removeImpl(null, mTimeTickTrigger); removeImpl(mDateChangeSender, null); rebatchAllAlarms(); diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 3774b645339d..311a494ee570 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -69,17 +69,17 @@ import android.text.TextUtils; import android.util.FeatureFlagUtils; import android.util.Log; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.pm.UserRestrictionsUtils; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedList; import java.util.Locale; import java.util.Map; @@ -87,7 +87,6 @@ import java.util.NoSuchElementException; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantReadWriteLock; - class BluetoothManagerService extends IBluetoothManager.Stub { private static final String TAG = "BluetoothManagerService"; private static final boolean DBG = true; @@ -2300,9 +2299,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub { new ActiveLog(reason, packageName, enable, System.currentTimeMillis())); } - int state = enable ? StatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED : - StatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED; - StatsLog.write_non_chained(StatsLog.BLUETOOTH_ENABLED_STATE_CHANGED, + int state = enable ? FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__ENABLED : + FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED__STATE__DISABLED; + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.BLUETOOTH_ENABLED_STATE_CHANGED, Binder.getCallingUid(), null, state, reason, packageName); } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 0194a213f185..8c8a4e22d48a 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4317,7 +4317,7 @@ public class ConnectivityService extends IConnectivityManager.Stub throwIfLockdownEnabled(); Vpn vpn = mVpns.get(userId); if (vpn != null) { - return vpn.prepare(oldPackage, newPackage); + return vpn.prepare(oldPackage, newPackage, false); } else { return false; } @@ -4366,6 +4366,78 @@ public class ConnectivityService extends IConnectivityManager.Stub } /** + * Stores the given VPN profile based on the provisioning package name. + * + * <p>If there is already a VPN profile stored for the provisioning package, this call will + * overwrite the profile. + * + * <p>This is designed to serve the VpnManager only; settings-based VPN profiles are managed + * exclusively by the Settings app, and passed into the platform at startup time. + * + * @return {@code true} if user consent has already been granted, {@code false} otherwise. + * @hide + */ + @Override + public boolean provisionVpnProfile(@NonNull VpnProfile profile, @NonNull String packageName) { + final int user = UserHandle.getUserId(Binder.getCallingUid()); + synchronized (mVpns) { + return mVpns.get(user).provisionVpnProfile(packageName, profile, mKeyStore); + } + } + + /** + * Deletes the stored VPN profile for the provisioning package + * + * <p>If there are no profiles for the given package, this method will silently succeed. + * + * <p>This is designed to serve the VpnManager only; settings-based VPN profiles are managed + * exclusively by the Settings app, and passed into the platform at startup time. + * + * @hide + */ + @Override + public void deleteVpnProfile(@NonNull String packageName) { + final int user = UserHandle.getUserId(Binder.getCallingUid()); + synchronized (mVpns) { + mVpns.get(user).deleteVpnProfile(packageName, mKeyStore); + } + } + + /** + * Starts the VPN based on the stored profile for the given package + * + * <p>This is designed to serve the VpnManager only; settings-based VPN profiles are managed + * exclusively by the Settings app, and passed into the platform at startup time. + * + * @throws IllegalArgumentException if no profile was found for the given package name. + * @hide + */ + @Override + public void startVpnProfile(@NonNull String packageName) { + final int user = UserHandle.getUserId(Binder.getCallingUid()); + synchronized (mVpns) { + throwIfLockdownEnabled(); + mVpns.get(user).startVpnProfile(packageName, mKeyStore); + } + } + + /** + * Stops the Platform VPN if the provided package is running one. + * + * <p>This is designed to serve the VpnManager only; settings-based VPN profiles are managed + * exclusively by the Settings app, and passed into the platform at startup time. + * + * @hide + */ + @Override + public void stopVpnProfile(@NonNull String packageName) { + final int user = UserHandle.getUserId(Binder.getCallingUid()); + synchronized (mVpns) { + mVpns.get(user).stopVpnProfile(packageName); + } + } + + /** * Start legacy VPN, controlling native daemons as needed. Creates a * secondary thread to perform connection work, returning quickly. */ @@ -4568,6 +4640,13 @@ public class ConnectivityService extends IConnectivityManager.Stub } } + /** + * Throws if there is any currently running, always-on Legacy VPN. + * + * <p>The LockdownVpnTracker and mLockdownEnabled both track whether an always-on Legacy VPN is + * running across the entire system. Tracking for app-based VPNs is done on a per-user, + * per-package basis in Vpn.java + */ @GuardedBy("mVpns") private void throwIfLockdownEnabled() { if (mLockdownEnabled) { diff --git a/services/core/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java index 3e5c278a7fd4..80036bb4b4fa 100644 --- a/services/core/java/com/android/server/RescueParty.java +++ b/services/core/java/com/android/server/RescueParty.java @@ -42,11 +42,11 @@ import android.util.ExceptionUtils; import android.util.Log; import android.util.MathUtils; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.PackageWatchdog.FailureReasons; import com.android.server.PackageWatchdog.PackageHealthObserver; import com.android.server.PackageWatchdog.PackageHealthObserverImpact; @@ -253,7 +253,7 @@ public class RescueParty { private static void executeRescueLevelInternal(Context context, int level, @Nullable String failedPackage) throws Exception { - StatsLog.write(StatsLog.RESCUE_PARTY_RESET_REPORTED, level); + FrameworkStatsLog.write(FrameworkStatsLog.RESCUE_PARTY_RESET_REPORTED, level); switch (level) { case LEVEL_RESET_SETTINGS_UNTRUSTED_DEFAULTS: resetAllSettings(context, Settings.RESET_MODE_UNTRUSTED_DEFAULTS, failedPackage); diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index e17dde9a766e..a08bdb23dd22 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -3942,8 +3942,12 @@ class StorageManagerService extends IStorageManager.Stub final boolean hasMtp = mIPackageManager.checkUidPermission(ACCESS_MTP, uid) == PERMISSION_GRANTED; if (mIsFuseEnabled && hasMtp) { - // The process hosting the MTP server should be able to write in Android/ - return Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE; + ApplicationInfo ai = mIPackageManager.getApplicationInfo(packageName, + 0, UserHandle.getUserId(uid)); + if (ai.isSignedWithPlatformKey()) { + // Platform processes hosting the MTP server should be able to write in Android/ + return Zygote.MOUNT_EXTERNAL_ANDROID_WRITABLE; + } } // Determine if caller is holding runtime permission diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 139a87154223..56f942480eaf 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -77,7 +77,6 @@ import android.telephony.data.ApnSetting; import android.telephony.emergency.EmergencyNumber; import android.telephony.ims.ImsReasonInfo; import android.util.LocalLog; -import android.util.StatsLog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IBatteryStats; @@ -87,6 +86,7 @@ import com.android.internal.telephony.ITelephonyRegistry; import com.android.internal.telephony.TelephonyPermissions; import com.android.internal.util.ArrayUtils; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.IndentingPrintWriter; import com.android.server.am.BatteryStatsService; @@ -2395,12 +2395,12 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { try { if (state == TelephonyManager.CALL_STATE_IDLE) { mBatteryStats.notePhoneOff(); - StatsLog.write(StatsLog.PHONE_STATE_CHANGED, - StatsLog.PHONE_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.PHONE_STATE_CHANGED, + FrameworkStatsLog.PHONE_STATE_CHANGED__STATE__OFF); } else { mBatteryStats.notePhoneOn(); - StatsLog.write(StatsLog.PHONE_STATE_CHANGED, - StatsLog.PHONE_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write(FrameworkStatsLog.PHONE_STATE_CHANGED, + FrameworkStatsLog.PHONE_STATE_CHANGED__STATE__ON); } } catch (RemoteException e) { /* The remote entity disappeared, we can safely ignore the exception. */ diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index 79b3a7b0d114..f7d7d6c5d15f 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -65,13 +65,13 @@ import android.provider.Settings.SettingNotFoundException; import android.util.DebugUtils; import android.util.Slog; import android.util.SparseArray; -import android.util.StatsLog; import android.util.proto.ProtoOutputStream; import android.view.InputDevice; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IBatteryStats; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -1370,8 +1370,8 @@ public class VibratorService extends IVibratorService.Stub private void noteVibratorOnLocked(int uid, long millis) { try { mBatteryStatsService.noteVibratorOn(uid, millis); - StatsLog.write_non_chained(StatsLog.VIBRATOR_STATE_CHANGED, uid, null, - StatsLog.VIBRATOR_STATE_CHANGED__STATE__ON, millis); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.VIBRATOR_STATE_CHANGED, uid, null, + FrameworkStatsLog.VIBRATOR_STATE_CHANGED__STATE__ON, millis); mCurVibUid = uid; mIsVibrating = true; } catch (RemoteException e) { @@ -1382,8 +1382,8 @@ public class VibratorService extends IVibratorService.Stub if (mCurVibUid >= 0) { try { mBatteryStatsService.noteVibratorOff(mCurVibUid); - StatsLog.write_non_chained(StatsLog.VIBRATOR_STATE_CHANGED, mCurVibUid, null, - StatsLog.VIBRATOR_STATE_CHANGED__STATE__OFF, 0); + FrameworkStatsLog.write_non_chained(FrameworkStatsLog.VIBRATOR_STATE_CHANGED, + mCurVibUid, null, FrameworkStatsLog.VIBRATOR_STATE_CHANGED__STATE__OFF, 0); } catch (RemoteException e) { } mCurVibUid = -1; } diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java index a60b09fda2e8..a1ccd8459c69 100644 --- a/services/core/java/com/android/server/Watchdog.java +++ b/services/core/java/com/android/server/Watchdog.java @@ -40,10 +40,10 @@ import android.util.EventLog; import android.util.Log; import android.util.Slog; import android.util.SparseArray; -import android.util.StatsLog; import com.android.internal.os.ProcessCpuTracker; import com.android.internal.os.ZygoteConnectionConstants; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.am.ActivityManagerService; import com.android.server.wm.SurfaceAnimationThread; @@ -636,7 +636,8 @@ public class Watchdog extends Thread { "watchdog", null, "system_server", null, null, null, subject, cpuInfo, stack, null); } - StatsLog.write(StatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, subject); + FrameworkStatsLog.write(FrameworkStatsLog.SYSTEM_SERVER_WATCHDOG_OCCURRED, + subject); } }; dropboxThread.start(); diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java index 143474bd5c94..10994133e265 100644 --- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java +++ b/services/core/java/com/android/server/adb/AdbDebuggingManager.java @@ -46,12 +46,12 @@ import android.service.adb.AdbDebuggingManagerProto; import android.util.AtomicFile; import android.util.Base64; import android.util.Slog; -import android.util.StatsLog; import android.util.Xml; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.FastXmlSerializer; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.XmlUtils; import com.android.internal.util.dump.DualDumpOutputStream; import com.android.server.FgThread; @@ -493,8 +493,8 @@ public class AdbDebuggingManager { "Logging key " + key + ", state = " + state + ", alwaysAllow = " + alwaysAllow + ", lastConnectionTime = " + lastConnectionTime + ", authWindow = " + authWindow); - StatsLog.write(StatsLog.ADB_CONNECTION_CHANGED, lastConnectionTime, authWindow, state, - alwaysAllow); + FrameworkStatsLog.write(FrameworkStatsLog.ADB_CONNECTION_CHANGED, lastConnectionTime, + authWindow, state, alwaysAllow); } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 6560777edd53..d80ff35ce70d 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -18924,19 +18924,16 @@ public class ActivityManagerService extends IActivityManager.Stub } // The arguments here are untyped because the base ActivityManagerInternal class - // doesn't have compile-time visiblity into ActivityServiceConnectionHolder or + // doesn't have compile-time visibility into ActivityServiceConnectionHolder or // ConnectionRecord. @Override - public void disconnectActivityFromServices(Object connectionHolder, Object conns) { + public void disconnectActivityFromServices(Object connectionHolder) { // 'connectionHolder' is an untyped ActivityServiceConnectionsHolder - // 'conns' is an untyped HashSet<ConnectionRecord> final ActivityServiceConnectionsHolder holder = (ActivityServiceConnectionsHolder) connectionHolder; - final HashSet<ConnectionRecord> toDisconnect = (HashSet<ConnectionRecord>) conns; - synchronized(ActivityManagerService.this) { - for (ConnectionRecord cr : toDisconnect) { - mServices.removeConnectionLocked(cr, null, holder); - } + synchronized (ActivityManagerService.this) { + holder.forEachConnection(cr -> mServices.removeConnectionLocked( + (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */)); } } diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index c5d6bba27234..c75ee04543e3 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -130,6 +130,10 @@ class UserController implements Handler.Callback { // giving up on them and unfreezing the screen. static final int USER_SWITCH_TIMEOUT_MS = 3 * 1000; + // Amount of time we wait for observers to handle a user switch before we log a warning. + // Must be smaller than USER_SWITCH_TIMEOUT_MS. + private static final int USER_SWITCH_WARNING_TIMEOUT_MS = 500; + // ActivityManager thread message constants static final int REPORT_USER_SWITCH_MSG = 10; static final int CONTINUE_USER_SWITCH_MSG = 20; @@ -1615,9 +1619,13 @@ class UserController implements Handler.Callback { synchronized (mLock) { long delay = SystemClock.elapsedRealtime() - dispatchStartedTime; if (delay > USER_SWITCH_TIMEOUT_MS) { - Slog.e(TAG, "User switch timeout: observer " + name + Slog.e(TAG, "User switch timeout: observer " + name + " sent result after " + delay + " ms"); + } else if (delay > USER_SWITCH_WARNING_TIMEOUT_MS) { + Slog.w(TAG, "User switch slowed down by observer " + name + + ": result sent after " + delay + " ms"); } + curWaitingUserSwitchCallbacks.remove(name); // Continue switching if all callbacks have been notified and // user switching session is still valid diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java index 5ac5b29b1475..0440de674e9e 100644 --- a/services/core/java/com/android/server/attention/AttentionManagerService.java +++ b/services/core/java/com/android/server/attention/AttentionManagerService.java @@ -56,13 +56,12 @@ import android.service.attention.IAttentionService; import android.text.TextUtils; import android.util.Slog; import android.util.SparseArray; -import android.util.StatsLog; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.IndentingPrintWriter; -import com.android.internal.util.Preconditions; import com.android.server.SystemService; import java.io.FileDescriptor; @@ -274,8 +273,8 @@ public class AttentionManagerService extends SystemService { userState.mAttentionCheckCacheBuffer.add( new AttentionCheckCache(SystemClock.uptimeMillis(), result, timestamp)); } - StatsLog.write( - StatsLog.ATTENTION_MANAGER_SERVICE_RESULT_REPORTED, + FrameworkStatsLog.write( + FrameworkStatsLog.ATTENTION_MANAGER_SERVICE_RESULT_REPORTED, result); } @@ -287,8 +286,8 @@ public class AttentionManagerService extends SystemService { userState.mCurrentAttentionCheck.mIsFulfilled = true; } - StatsLog.write( - StatsLog.ATTENTION_MANAGER_SERVICE_RESULT_REPORTED, + FrameworkStatsLog.write( + FrameworkStatsLog.ATTENTION_MANAGER_SERVICE_RESULT_REPORTED, error); } }; diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java index 96af74a60b1d..61c99b88d113 100644 --- a/services/core/java/com/android/server/camera/CameraServiceProxy.java +++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java @@ -36,23 +36,22 @@ import android.os.UserManager; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.SystemService; import com.android.server.wm.WindowManagerInternal; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; /** * CameraServiceProxy is the system_server analog to the camera service running in cameraserver. @@ -315,22 +314,22 @@ public class CameraServiceProxy extends SystemService * Package-private */ private void logCameraUsageEvent(CameraUsageEvent e) { - int facing = StatsLog.CAMERA_ACTION_EVENT__FACING__UNKNOWN; + int facing = FrameworkStatsLog.CAMERA_ACTION_EVENT__FACING__UNKNOWN; switch(e.mCameraFacing) { case ICameraServiceProxy.CAMERA_FACING_BACK: - facing = StatsLog.CAMERA_ACTION_EVENT__FACING__BACK; + facing = FrameworkStatsLog.CAMERA_ACTION_EVENT__FACING__BACK; break; case ICameraServiceProxy.CAMERA_FACING_FRONT: - facing = StatsLog.CAMERA_ACTION_EVENT__FACING__FRONT; + facing = FrameworkStatsLog.CAMERA_ACTION_EVENT__FACING__FRONT; break; case ICameraServiceProxy.CAMERA_FACING_EXTERNAL: - facing = StatsLog.CAMERA_ACTION_EVENT__FACING__EXTERNAL; + facing = FrameworkStatsLog.CAMERA_ACTION_EVENT__FACING__EXTERNAL; break; default: Slog.w(TAG, "Unknown camera facing: " + e.mCameraFacing); } - StatsLog.write(StatsLog.CAMERA_ACTION_EVENT, e.getDuration(), e.mAPILevel, - e.mClientName, facing); + FrameworkStatsLog.write(FrameworkStatsLog.CAMERA_ACTION_EVENT, e.getDuration(), + e.mAPILevel, e.mClientName, facing); } } diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 423e0212dfd6..03795597f47a 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -24,6 +24,8 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; import static android.net.RouteInfo.RTN_THROW; import static android.net.RouteInfo.RTN_UNREACHABLE; +import static com.android.internal.util.Preconditions.checkNotNull; + import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; @@ -157,6 +159,16 @@ public class Vpn { // is actually O(n²)+O(n²). private static final int MAX_ROUTES_TO_EVALUATE = 150; + /** + * Largest profile size allowable for Platform VPNs. + * + * <p>The largest platform VPN profiles use IKEv2 RSA Certificate Authentication and have two + * X509Certificates, and one RSAPrivateKey. This should lead to a max size of 2x 12kB for the + * certificates, plus a reasonable upper bound on the private key of 32kB. The rest of the + * profile is expected to be negligible in size. + */ + @VisibleForTesting static final int MAX_VPN_PROFILE_SIZE_BYTES = 1 << 17; // 128kB + // TODO: create separate trackers for each unique VPN to support // automated reconnection @@ -656,6 +668,11 @@ public class Vpn { * It uses {@link VpnConfig#LEGACY_VPN} as its package name, and * it can be revoked by itself. * + * The permission checks to verify that the VPN has already been granted + * user consent are dependent on the type of the VPN being prepared. See + * {@link AppOpsManager#OP_ACTIVATE_VPN} and {@link + * AppOpsManager#OP_ACTIVATE_PLATFORM_VPN} for more information. + * * Note: when we added VPN pre-consent in * https://android.googlesource.com/platform/frameworks/base/+/0554260 * the names oldPackage and newPackage became misleading, because when @@ -674,10 +691,13 @@ public class Vpn { * * @param oldPackage The package name of the old VPN application * @param newPackage The package name of the new VPN application - * + * @param isPlatformVpn Whether the package being prepared is using a platform VPN profile. + * Preparing a platform VPN profile requires only the lesser ACTIVATE_PLATFORM_VPN appop. * @return true if the operation succeeded. */ - public synchronized boolean prepare(String oldPackage, String newPackage) { + // TODO: Use an Intdef'd type to represent what kind of VPN the caller is preparing. + public synchronized boolean prepare( + String oldPackage, String newPackage, boolean isPlatformVpn) { if (oldPackage != null) { // Stop an existing always-on VPN from being dethroned by other apps. if (mAlwaysOn && !isCurrentPreparedPackage(oldPackage)) { @@ -688,13 +708,14 @@ public class Vpn { if (!isCurrentPreparedPackage(oldPackage)) { // The package doesn't match. We return false (to obtain user consent) unless the // user has already consented to that VPN package. - if (!oldPackage.equals(VpnConfig.LEGACY_VPN) && isVpnUserPreConsented(oldPackage)) { + if (!oldPackage.equals(VpnConfig.LEGACY_VPN) + && isVpnPreConsented(mContext, oldPackage, isPlatformVpn)) { prepareInternal(oldPackage); return true; } return false; } else if (!oldPackage.equals(VpnConfig.LEGACY_VPN) - && !isVpnUserPreConsented(oldPackage)) { + && !isVpnPreConsented(mContext, oldPackage, isPlatformVpn)) { // Currently prepared VPN is revoked, so unprepare it and return false. prepareInternal(VpnConfig.LEGACY_VPN); return false; @@ -805,13 +826,29 @@ public class Vpn { return false; } - private boolean isVpnUserPreConsented(String packageName) { - AppOpsManager appOps = - (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE); + private static boolean isVpnPreConsented( + Context context, String packageName, boolean isPlatformVpn) { + return isPlatformVpn + ? isVpnProfilePreConsented(context, packageName) + : isVpnServicePreConsented(context, packageName); + } - // Verify that the caller matches the given package and has permission to activate VPNs. - return appOps.noteOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN, Binder.getCallingUid(), - packageName) == AppOpsManager.MODE_ALLOWED; + private static boolean doesPackageHaveAppop(Context context, String packageName, int appop) { + final AppOpsManager appOps = + (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); + + // Verify that the caller matches the given package and has the required permission. + return appOps.noteOpNoThrow(appop, Binder.getCallingUid(), packageName) + == AppOpsManager.MODE_ALLOWED; + } + + private static boolean isVpnServicePreConsented(Context context, String packageName) { + return doesPackageHaveAppop(context, packageName, AppOpsManager.OP_ACTIVATE_VPN); + } + + private static boolean isVpnProfilePreConsented(Context context, String packageName) { + return doesPackageHaveAppop(context, packageName, AppOpsManager.OP_ACTIVATE_PLATFORM_VPN) + || isVpnServicePreConsented(context, packageName); } private int getAppUid(String app, int userHandle) { @@ -1005,6 +1042,9 @@ public class Vpn { * Establish a VPN network and return the file descriptor of the VPN interface. This methods * returns {@code null} if the application is revoked or not prepared. * + * <p>This method supports ONLY VpnService-based VPNs. For Platform VPNs, see {@link + * provisionVpnProfile} and {@link startVpnProfile} + * * @param config The parameters to configure the network. * @return The file descriptor of the VPN interface. */ @@ -1015,7 +1055,7 @@ public class Vpn { return null; } // Check to ensure consent hasn't been revoked since we were prepared. - if (!isVpnUserPreConsented(mPackage)) { + if (!isVpnServicePreConsented(mContext, mPackage)) { return null; } // Check if the service is properly declared. @@ -1680,6 +1720,10 @@ public class Vpn { public int settingsSecureGetIntForUser(String key, int def, int userId) { return Settings.Secure.getIntForUser(mContext.getContentResolver(), key, def, userId); } + + public boolean isCallerSystem() { + return Binder.getCallingUid() == Process.SYSTEM_UID; + } } private native int jniCreate(int mtu); @@ -2228,4 +2272,148 @@ public class Vpn { } } } + + private void verifyCallingUidAndPackage(String packageName) { + if (getAppUid(packageName, mUserHandle) != Binder.getCallingUid()) { + throw new SecurityException("Mismatched package and UID"); + } + } + + @VisibleForTesting + String getProfileNameForPackage(String packageName) { + return Credentials.PLATFORM_VPN + mUserHandle + "_" + packageName; + } + + /** + * Stores an app-provisioned VPN profile and returns whether the app is already prepared. + * + * @param packageName the package name of the app provisioning this profile + * @param profile the profile to be stored and provisioned + * @param keyStore the System keystore instance to save VPN profiles + * @returns whether or not the app has already been granted user consent + */ + public synchronized boolean provisionVpnProfile( + @NonNull String packageName, @NonNull VpnProfile profile, @NonNull KeyStore keyStore) { + checkNotNull(packageName, "No package name provided"); + checkNotNull(profile, "No profile provided"); + checkNotNull(keyStore, "KeyStore missing"); + + verifyCallingUidAndPackage(packageName); + + final byte[] encodedProfile = profile.encode(); + if (encodedProfile.length > MAX_VPN_PROFILE_SIZE_BYTES) { + throw new IllegalArgumentException("Profile too big"); + } + + // Permissions checked during startVpnProfile() + Binder.withCleanCallingIdentity( + () -> { + keyStore.put( + getProfileNameForPackage(packageName), + encodedProfile, + Process.SYSTEM_UID, + 0 /* flags */); + }); + + // TODO: if package has CONTROL_VPN, grant the ACTIVATE_PLATFORM_VPN appop. + // This mirrors the prepareAndAuthorize that is used by VpnService. + + // Return whether the app is already pre-consented + return isVpnProfilePreConsented(mContext, packageName); + } + + /** + * Deletes an app-provisioned VPN profile. + * + * @param packageName the package name of the app provisioning this profile + * @param keyStore the System keystore instance to save VPN profiles + */ + public synchronized void deleteVpnProfile( + @NonNull String packageName, @NonNull KeyStore keyStore) { + checkNotNull(packageName, "No package name provided"); + checkNotNull(keyStore, "KeyStore missing"); + + verifyCallingUidAndPackage(packageName); + + Binder.withCleanCallingIdentity( + () -> { + keyStore.delete(getProfileNameForPackage(packageName), Process.SYSTEM_UID); + }); + } + + /** + * Retrieves the VpnProfile. + * + * <p>Must be used only as SYSTEM_UID, otherwise the key/UID pair will not match anything in the + * keystore. + */ + @VisibleForTesting + @Nullable + VpnProfile getVpnProfilePrivileged(@NonNull String packageName, @NonNull KeyStore keyStore) { + if (!mSystemServices.isCallerSystem()) { + Log.wtf(TAG, "getVpnProfilePrivileged called as non-System UID "); + return null; + } + + final byte[] encoded = keyStore.get(getProfileNameForPackage(packageName)); + if (encoded == null) return null; + + return VpnProfile.decode("" /* Key unused */, encoded); + } + + /** + * Starts an already provisioned VPN Profile, keyed by package name. + * + * <p>This method is meant to be called by apps (via VpnManager and ConnectivityService). + * Privileged (system) callers should use startVpnProfilePrivileged instead. Otherwise the UIDs + * will not match during appop checks. + * + * @param packageName the package name of the app provisioning this profile + * @param keyStore the System keystore instance to retrieve VPN profiles + */ + public synchronized void startVpnProfile( + @NonNull String packageName, @NonNull KeyStore keyStore) { + checkNotNull(packageName, "No package name provided"); + checkNotNull(keyStore, "KeyStore missing"); + + // Prepare VPN for startup + if (!prepare(packageName, null /* newPackage */, true /* isPlatformVpn */)) { + throw new SecurityException("User consent not granted for package " + packageName); + } + + Binder.withCleanCallingIdentity( + () -> { + final VpnProfile profile = getVpnProfilePrivileged(packageName, keyStore); + if (profile == null) { + throw new IllegalArgumentException("No profile found for " + packageName); + } + + startVpnProfilePrivileged(profile); + }); + } + + private void startVpnProfilePrivileged(@NonNull VpnProfile profile) { + // TODO: Start PlatformVpnRunner + } + + /** + * Stops an already running VPN Profile for the given package. + * + * <p>This method is meant to be called by apps (via VpnManager and ConnectivityService). + * Privileged (system) callers should (re-)prepare the LEGACY_VPN instead. + * + * @param packageName the package name of the app provisioning this profile + */ + public synchronized void stopVpnProfile(@NonNull String packageName) { + checkNotNull(packageName, "No package name provided"); + + // To stop the VPN profile, the caller must be the current prepared package. Otherwise, + // the app is not prepared, and we can just return. + if (!isCurrentPreparedPackage(packageName)) { + // TODO: Also check to make sure that the running VPN is a VPN profile. + return; + } + + prepareInternal(VpnConfig.LEGACY_VPN); + } } diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java index 4ddc391bd889..6d130d91f639 100644 --- a/services/core/java/com/android/server/content/SyncManager.java +++ b/services/core/java/com/android/server/content/SyncManager.java @@ -212,8 +212,11 @@ public class SyncManager { private static final int SYNC_OP_STATE_VALID = 0; - private static final int SYNC_OP_STATE_INVALID = 1; + // "1" used to include errors 3, 4 and 5 but now it's split up. private static final int SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS = 2; + private static final int SYNC_OP_STATE_INVALID_NO_ACCOUNT = 3; + private static final int SYNC_OP_STATE_INVALID_NOT_SYNCABLE = 4; + private static final int SYNC_OP_STATE_INVALID_SYNC_DISABLED = 5; /** Flags used when connecting to a sync adapter service */ private static final int SYNC_ADAPTER_CONNECTION_FLAGS = Context.BIND_AUTO_CREATE @@ -3206,12 +3209,10 @@ public class SyncManager { } final int syncOpState = computeSyncOpState(op); - switch (syncOpState) { - case SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS: - case SYNC_OP_STATE_INVALID: { - SyncJobService.callJobFinished(op.jobId, false, - "invalid op state: " + syncOpState); - } return; + if (syncOpState != SYNC_OP_STATE_VALID) { + SyncJobService.callJobFinished(op.jobId, false, + "invalid op state: " + syncOpState); + return; } if (!dispatchSyncOperation(op)) { @@ -3354,27 +3355,27 @@ public class SyncManager { pollFrequencyMillis, flexMillis, ContentResolver.SYNC_EXEMPTION_NONE); final int syncOpState = computeSyncOpState(op); - switch (syncOpState) { - case SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS: { - String packageName = op.owningPackage; - final int userId = UserHandle.getUserId(op.owningUid); - // If the app did not run and has no account access, done - if (!wasPackageEverLaunched(packageName, userId)) { - return; - } - mAccountManagerInternal.requestAccountAccess(op.target.account, - packageName, userId, new RemoteCallback((Bundle result) -> { - if (result != null - && result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT)) { - updateOrAddPeriodicSync(target, pollFrequency, flex, extras); - } - } - )); - } return; - - case SYNC_OP_STATE_INVALID: { + if (syncOpState == SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS) { + String packageName = op.owningPackage; + final int userId = UserHandle.getUserId(op.owningUid); + // If the app did not run and has no account access, done + if (!wasPackageEverLaunched(packageName, userId)) { return; } + mLogger.log("requestAccountAccess for SYNC_OP_STATE_INVALID_NO_ACCOUNT_ACCESS"); + mAccountManagerInternal.requestAccountAccess(op.target.account, + packageName, userId, new RemoteCallback((Bundle result) -> { + if (result != null + && result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT)) { + updateOrAddPeriodicSync(target, pollFrequency, flex, extras); + } + } + )); + return; + } + if (syncOpState != SYNC_OP_STATE_VALID) { + mLogger.log("syncOpState=", syncOpState); + return; } scheduleSyncOperationH(op); @@ -3452,7 +3453,7 @@ public class SyncManager { Slog.v(TAG, " Dropping sync operation: account doesn't exist."); } Slog.wtf(TAG, "SYNC_OP_STATE_INVALID: account doesn't exist."); - return SYNC_OP_STATE_INVALID; + return SYNC_OP_STATE_INVALID_NO_ACCOUNT; } // Drop this sync request if it isn't syncable. state = computeSyncable(target.account, target.userId, target.provider, true); @@ -3469,7 +3470,7 @@ public class SyncManager { Slog.v(TAG, " Dropping sync operation: isSyncable == NOT_SYNCABLE"); } Slog.wtf(TAG, "SYNC_OP_STATE_INVALID: NOT_SYNCABLE"); - return SYNC_OP_STATE_INVALID; + return SYNC_OP_STATE_INVALID_NOT_SYNCABLE; } final boolean syncEnabled = mSyncStorageEngine.getMasterSyncAutomatically(target.userId) @@ -3488,7 +3489,7 @@ public class SyncManager { Slog.v(TAG, " Dropping sync operation: disallowed by settings/network."); } Slog.wtf(TAG, "SYNC_OP_STATE_INVALID: disallowed by settings/network"); - return SYNC_OP_STATE_INVALID; + return SYNC_OP_STATE_INVALID_SYNC_DISABLED; } return SYNC_OP_STATE_VALID; } diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 7e8fe3ae8428..87a5730edc2e 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -91,8 +91,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { private void tryConnectDisplayLocked(long physicalDisplayId) { final IBinder displayToken = SurfaceControl.getPhysicalDisplayToken(physicalDisplayId); if (displayToken != null) { - SurfaceControl.PhysicalDisplayInfo[] configs = - SurfaceControl.getDisplayConfigs(displayToken); + SurfaceControl.DisplayInfo info = SurfaceControl.getDisplayInfo(displayToken); + if (info == null) { + Slog.w(TAG, "No valid info found for display device " + physicalDisplayId); + return; + } + SurfaceControl.DisplayConfig[] configs = SurfaceControl.getDisplayConfigs(displayToken); if (configs == null) { // There are no valid configs for this device, so we can't use it Slog.w(TAG, "No valid configs found for display device " + physicalDisplayId); @@ -115,19 +119,19 @@ final class LocalDisplayAdapter extends DisplayAdapter { activeColorMode = Display.COLOR_MODE_INVALID; } int[] colorModes = SurfaceControl.getDisplayColorModes(displayToken); - SurfaceControl.DesiredDisplayConfigSpecs desiredDisplayConfigSpecs = + SurfaceControl.DesiredDisplayConfigSpecs configSpecs = SurfaceControl.getDesiredDisplayConfigSpecs(displayToken); LocalDisplayDevice device = mDevices.get(physicalDisplayId); if (device == null) { // Display was added. final boolean isInternal = mDevices.size() == 0; - device = new LocalDisplayDevice(displayToken, physicalDisplayId, configs, - activeConfig, desiredDisplayConfigSpecs, colorModes, activeColorMode, + device = new LocalDisplayDevice(displayToken, physicalDisplayId, info, + configs, activeConfig, configSpecs, colorModes, activeColorMode, isInternal); mDevices.put(physicalDisplayId, device); sendDisplayDeviceEventLocked(device, DISPLAY_DEVICE_EVENT_ADDED); - } else if (device.updatePhysicalDisplayInfoLocked(configs, activeConfig, - desiredDisplayConfigSpecs, colorModes, activeColorMode)) { + } else if (device.updateDisplayConfigsLocked(configs, activeConfig, configSpecs, + colorModes, activeColorMode)) { // Display properties changed. sendDisplayDeviceEventLocked(device, DISPLAY_DEVICE_EVENT_CHANGED); } @@ -179,7 +183,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { private DisplayModeDirector.DesiredDisplayModeSpecs mDisplayModeSpecs = new DisplayModeDirector.DesiredDisplayModeSpecs(); private boolean mDisplayModeSpecsInvalid; - private int mActivePhysIndex; + private int mActiveConfigId; private int mActiveColorMode; private boolean mActiveColorModeInvalid; private Display.HdrCapabilities mHdrCapabilities; @@ -189,21 +193,25 @@ final class LocalDisplayAdapter extends DisplayAdapter { private boolean mGameContentTypeRequested; private boolean mSidekickActive; private SidekickInternal mSidekickInternal; - private SurfaceControl.PhysicalDisplayInfo[] mDisplayInfos; + private SurfaceControl.DisplayInfo mDisplayInfo; + private SurfaceControl.DisplayConfig[] mDisplayConfigs; private Spline mSystemBrightnessToNits; private Spline mNitsToHalBrightness; private boolean mHalBrightnessSupport; LocalDisplayDevice(IBinder displayToken, long physicalDisplayId, - SurfaceControl.PhysicalDisplayInfo[] physicalDisplayInfos, int activeDisplayInfo, - SurfaceControl.DesiredDisplayConfigSpecs physicalDisplayConfigSpecs, + SurfaceControl.DisplayInfo info, SurfaceControl.DisplayConfig[] configs, + int activeConfigId, SurfaceControl.DesiredDisplayConfigSpecs configSpecs, int[] colorModes, int activeColorMode, boolean isInternal) { super(LocalDisplayAdapter.this, displayToken, UNIQUE_ID_PREFIX + physicalDisplayId); mPhysicalDisplayId = physicalDisplayId; mIsInternal = isInternal; - updatePhysicalDisplayInfoLocked(physicalDisplayInfos, activeDisplayInfo, - physicalDisplayConfigSpecs, colorModes, activeColorMode); + mDisplayInfo = info; + + updateDisplayConfigsLocked(configs, activeConfigId, configSpecs, colorModes, + activeColorMode); updateColorModesLocked(colorModes, activeColorMode); + mSidekickInternal = LocalServices.getService(SidekickInternal.class); if (mIsInternal) { LightsManager lights = LocalServices.getService(LightsManager.class); @@ -226,23 +234,24 @@ final class LocalDisplayAdapter extends DisplayAdapter { return true; } - public boolean updatePhysicalDisplayInfoLocked( - SurfaceControl.PhysicalDisplayInfo[] physicalDisplayInfos, int activeDisplayInfo, - SurfaceControl.DesiredDisplayConfigSpecs physicalDisplayConfigSpecs, - int[] colorModes, int activeColorMode) { - mDisplayInfos = Arrays.copyOf(physicalDisplayInfos, physicalDisplayInfos.length); - mActivePhysIndex = activeDisplayInfo; + public boolean updateDisplayConfigsLocked( + SurfaceControl.DisplayConfig[] configs, int activeConfigId, + SurfaceControl.DesiredDisplayConfigSpecs configSpecs, int[] colorModes, + int activeColorMode) { + mDisplayConfigs = Arrays.copyOf(configs, configs.length); + mActiveConfigId = activeConfigId; + // Build an updated list of all existing modes. ArrayList<DisplayModeRecord> records = new ArrayList<DisplayModeRecord>(); boolean modesAdded = false; - for (int i = 0; i < physicalDisplayInfos.length; i++) { - SurfaceControl.PhysicalDisplayInfo info = physicalDisplayInfos[i]; + for (int i = 0; i < configs.length; i++) { + SurfaceControl.DisplayConfig config = configs[i]; // First, check to see if we've already added a matching mode. Since not all // configuration options are exposed via Display.Mode, it's possible that we have - // multiple PhysicalDisplayInfos that would generate the same Display.Mode. + // multiple DisplayConfigs that would generate the same Display.Mode. boolean existingMode = false; for (int j = 0; j < records.size(); j++) { - if (records.get(j).hasMatchingMode(info)) { + if (records.get(j).hasMatchingMode(config)) { existingMode = true; break; } @@ -253,9 +262,9 @@ final class LocalDisplayAdapter extends DisplayAdapter { // If we haven't already added a mode for this configuration to the new set of // supported modes then check to see if we have one in the prior set of supported // modes to reuse. - DisplayModeRecord record = findDisplayModeRecord(info); + DisplayModeRecord record = findDisplayModeRecord(config); if (record == null) { - record = new DisplayModeRecord(info); + record = new DisplayModeRecord(config); modesAdded = true; } records.add(record); @@ -265,7 +274,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { DisplayModeRecord activeRecord = null; for (int i = 0; i < records.size(); i++) { DisplayModeRecord record = records.get(i); - if (record.hasMatchingMode(physicalDisplayInfos[activeDisplayInfo])){ + if (record.hasMatchingMode(configs[activeConfigId])) { activeRecord = record; break; } @@ -282,17 +291,15 @@ final class LocalDisplayAdapter extends DisplayAdapter { // Check whether surface flinger spontaneously changed display config specs out from // under us. If so, schedule a traversal to reapply our display config specs. if (mDisplayModeSpecs.baseModeId != 0) { - int activeBaseMode = - findMatchingModeIdLocked(physicalDisplayConfigSpecs.defaultConfig); + int activeBaseMode = findMatchingModeIdLocked(configSpecs.defaultConfig); // If we can't map the defaultConfig index to a mode, then the physical display // configs must have changed, and the code below for handling changes to the // list of available modes will take care of updating display config specs. if (activeBaseMode != 0) { if (mDisplayModeSpecs.baseModeId != activeBaseMode - || mDisplayModeSpecs.refreshRateRange.min - != physicalDisplayConfigSpecs.minRefreshRate + || mDisplayModeSpecs.refreshRateRange.min != configSpecs.minRefreshRate || mDisplayModeSpecs.refreshRateRange.max - != physicalDisplayConfigSpecs.maxRefreshRate) { + != configSpecs.maxRefreshRate) { mDisplayModeSpecsInvalid = true; sendTraversalRequestLocked(); } @@ -313,7 +320,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { } // Update the default mode, if needed. - if (findDisplayInfoIndexLocked(mDefaultModeId) < 0) { + if (findDisplayConfigIdLocked(mDefaultModeId) < 0) { if (mDefaultModeId != 0) { Slog.w(TAG, "Default display mode no longer available, using currently" + " active mode as default."); @@ -434,10 +441,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { return true; } - private DisplayModeRecord findDisplayModeRecord(SurfaceControl.PhysicalDisplayInfo info) { + private DisplayModeRecord findDisplayModeRecord(SurfaceControl.DisplayConfig config) { for (int i = 0; i < mSupportedModes.size(); i++) { DisplayModeRecord record = mSupportedModes.valueAt(i); - if (record.hasMatchingMode(info)) { + if (record.hasMatchingMode(config)) { return record; } } @@ -455,10 +462,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { @Override public DisplayDeviceInfo getDisplayDeviceInfoLocked() { if (mInfo == null) { - SurfaceControl.PhysicalDisplayInfo phys = mDisplayInfos[mActivePhysIndex]; + SurfaceControl.DisplayConfig config = mDisplayConfigs[mActiveConfigId]; mInfo = new DisplayDeviceInfo(); - mInfo.width = phys.width; - mInfo.height = phys.height; + mInfo.width = config.width; + mInfo.height = config.height; mInfo.modeId = mActiveModeId; mInfo.defaultModeId = mDefaultModeId; mInfo.supportedModes = getDisplayModes(mSupportedModes); @@ -471,20 +478,20 @@ final class LocalDisplayAdapter extends DisplayAdapter { mInfo.supportedColorModes[i] = mSupportedColorModes.get(i); } mInfo.hdrCapabilities = mHdrCapabilities; - mInfo.appVsyncOffsetNanos = phys.appVsyncOffsetNanos; - mInfo.presentationDeadlineNanos = phys.presentationDeadlineNanos; + mInfo.appVsyncOffsetNanos = config.appVsyncOffsetNanos; + mInfo.presentationDeadlineNanos = config.presentationDeadlineNanos; mInfo.state = mState; mInfo.uniqueId = getUniqueId(); final DisplayAddress.Physical physicalAddress = DisplayAddress.fromPhysicalDisplayId(mPhysicalDisplayId); mInfo.address = physicalAddress; - mInfo.densityDpi = (int) (phys.density * 160 + 0.5f); - mInfo.xDpi = phys.xDpi; - mInfo.yDpi = phys.yDpi; + mInfo.densityDpi = (int) (mDisplayInfo.density * 160 + 0.5f); + mInfo.xDpi = config.xDpi; + mInfo.yDpi = config.yDpi; // Assume that all built-in displays that have secure output (eg. HDCP) also // support compositing from gralloc protected buffers. - if (phys.secure) { + if (mDisplayInfo.secure) { mInfo.flags = DisplayDeviceInfo.FLAG_SECURE | DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS; } @@ -721,8 +728,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { // a valid mode. return; } - int basePhysIndex = findDisplayInfoIndexLocked(displayModeSpecs.baseModeId); - if (basePhysIndex < 0) { + int baseConfigId = findDisplayConfigIdLocked(displayModeSpecs.baseModeId); + if (baseConfigId < 0) { // When a display is hotplugged, it's possible for a mode to be removed that was // previously valid. Because of the way display changes are propagated through the // framework, and the caching of the display mode specs in LogicalDisplay, it's @@ -740,7 +747,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { getHandler().sendMessage(PooledLambda.obtainMessage( LocalDisplayDevice::setDesiredDisplayModeSpecsAsync, this, getDisplayTokenLocked(), - new SurfaceControl.DesiredDisplayConfigSpecs(basePhysIndex, + new SurfaceControl.DesiredDisplayConfigSpecs(baseConfigId, mDisplayModeSpecs.refreshRateRange.min, mDisplayModeSpecs.refreshRateRange.max))); } @@ -764,22 +771,22 @@ final class LocalDisplayAdapter extends DisplayAdapter { updateDeviceInfoLocked(); } - public void onActivePhysicalDisplayModeChangedLocked(int physIndex) { - if (updateActiveModeLocked(physIndex)) { + public void onActiveDisplayConfigChangedLocked(int configId) { + if (updateActiveModeLocked(configId)) { updateDeviceInfoLocked(); } } - public boolean updateActiveModeLocked(int activePhysIndex) { - if (mActivePhysIndex == activePhysIndex) { + public boolean updateActiveModeLocked(int activeConfigId) { + if (mActiveConfigId == activeConfigId) { return false; } - mActivePhysIndex = activePhysIndex; - mActiveModeId = findMatchingModeIdLocked(activePhysIndex); + mActiveConfigId = activeConfigId; + mActiveModeId = findMatchingModeIdLocked(activeConfigId); mActiveModeInvalid = mActiveModeId == 0; if (mActiveModeInvalid) { Slog.w(TAG, "In unknown mode after setting allowed configs" - + ", activePhysIndex=" + mActivePhysIndex); + + ", activeConfigId=" + mActiveConfigId); } return true; } @@ -850,7 +857,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { pw.println("mPhysicalDisplayId=" + mPhysicalDisplayId); pw.println("mDisplayModeSpecs={" + mDisplayModeSpecs + "}"); pw.println("mDisplayModeSpecsInvalid=" + mDisplayModeSpecsInvalid); - pw.println("mActivePhysIndex=" + mActivePhysIndex); + pw.println("mActiveConfigId=" + mActiveConfigId); pw.println("mActiveModeId=" + mActiveModeId); pw.println("mActiveColorMode=" + mActiveColorMode); pw.println("mDefaultModeId=" + mDefaultModeId); @@ -861,9 +868,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { pw.println("mAllmRequested=" + mAllmRequested); pw.println("mGameContentTypeSupported" + mGameContentTypeSupported); pw.println("mGameContentTypeRequested" + mGameContentTypeRequested); - pw.println("mDisplayInfos="); - for (int i = 0; i < mDisplayInfos.length; i++) { - pw.println(" " + mDisplayInfos[i]); + pw.println("mDisplayInfo=" + mDisplayInfo); + pw.println("mDisplayConfigs="); + for (int i = 0; i < mDisplayConfigs.length; i++) { + pw.println(" " + mDisplayConfigs[i]); } pw.println("mSupportedModes="); for (int i = 0; i < mSupportedModes.size(); i++) { @@ -879,12 +887,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { pw.println("]"); } - private int findDisplayInfoIndexLocked(int modeId) { + private int findDisplayConfigIdLocked(int modeId) { DisplayModeRecord record = mSupportedModes.get(modeId); if (record != null) { - for (int i = 0; i < mDisplayInfos.length; i++) { - SurfaceControl.PhysicalDisplayInfo info = mDisplayInfos[i]; - if (record.hasMatchingMode(info)){ + for (int i = 0; i < mDisplayConfigs.length; i++) { + SurfaceControl.DisplayConfig config = mDisplayConfigs[i]; + if (record.hasMatchingMode(config)) { return i; } } @@ -892,11 +900,11 @@ final class LocalDisplayAdapter extends DisplayAdapter { return -1; } - private int findMatchingModeIdLocked(int physIndex) { - SurfaceControl.PhysicalDisplayInfo info = mDisplayInfos[physIndex]; + private int findMatchingModeIdLocked(int configId) { + SurfaceControl.DisplayConfig config = mDisplayConfigs[configId]; for (int i = 0; i < mSupportedModes.size(); i++) { DisplayModeRecord record = mSupportedModes.valueAt(i); - if (record.hasMatchingMode(info)) { + if (record.hasMatchingMode(config)) { return record.mMode.getModeId(); } } @@ -948,23 +956,23 @@ final class LocalDisplayAdapter extends DisplayAdapter { private static final class DisplayModeRecord { public final Display.Mode mMode; - public DisplayModeRecord(SurfaceControl.PhysicalDisplayInfo phys) { - mMode = createMode(phys.width, phys.height, phys.refreshRate); + DisplayModeRecord(SurfaceControl.DisplayConfig config) { + mMode = createMode(config.width, config.height, config.refreshRate); } /** - * Returns whether the mode generated by the given PhysicalDisplayInfo matches the mode + * Returns whether the mode generated by the given DisplayConfig matches the mode * contained by the record modulo mode ID. * - * Note that this doesn't necessarily mean the the PhysicalDisplayInfos are identical, just + * Note that this doesn't necessarily mean that the DisplayConfigs are identical, just * that they generate identical modes. */ - public boolean hasMatchingMode(SurfaceControl.PhysicalDisplayInfo info) { + public boolean hasMatchingMode(SurfaceControl.DisplayConfig config) { int modeRefreshRate = Float.floatToIntBits(mMode.getRefreshRate()); - int displayInfoRefreshRate = Float.floatToIntBits(info.refreshRate); - return mMode.getPhysicalWidth() == info.width - && mMode.getPhysicalHeight() == info.height - && modeRefreshRate == displayInfoRefreshRate; + int configRefreshRate = Float.floatToIntBits(config.refreshRate); + return mMode.getPhysicalWidth() == config.width + && mMode.getPhysicalHeight() == config.height + && modeRefreshRate == configRefreshRate; } public String toString() { @@ -989,12 +997,12 @@ final class LocalDisplayAdapter extends DisplayAdapter { } @Override - public void onConfigChanged(long timestampNanos, long physicalDisplayId, int physIndex) { + public void onConfigChanged(long timestampNanos, long physicalDisplayId, int configId) { if (DEBUG) { Slog.d(TAG, "onConfigChanged(" + "timestampNanos=" + timestampNanos + ", physicalDisplayId=" + physicalDisplayId - + ", physIndex=" + physIndex + ")"); + + ", configId=" + configId + ")"); } synchronized (getSyncRoot()) { LocalDisplayDevice device = mDevices.get(physicalDisplayId); @@ -1005,7 +1013,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { } return; } - device.onActivePhysicalDisplayModeChangedLocked(physIndex); + device.onActiveDisplayConfigChangedLocked(configId); } } } diff --git a/services/core/java/com/android/server/incremental/IncrementalManagerService.java b/services/core/java/com/android/server/incremental/IncrementalManagerService.java index 5876d433face..64f25dd6f9fd 100644 --- a/services/core/java/com/android/server/incremental/IncrementalManagerService.java +++ b/services/core/java/com/android/server/incremental/IncrementalManagerService.java @@ -32,7 +32,10 @@ import android.os.ShellCallback; import android.os.incremental.IIncrementalManager; import android.util.Slog; +import com.android.internal.util.DumpUtils; + import java.io.FileDescriptor; +import java.io.PrintWriter; /** * This service has the following purposes: @@ -71,6 +74,13 @@ public class IncrementalManagerService extends IIncrementalManager.Stub { mNativeInstance = nativeStartService(); } + @SuppressWarnings("resource") + @Override + protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { + if (!DumpUtils.checkDumpAndUsageStatsPermission(mContext, TAG, pw)) return; + nativeDump(mNativeInstance, fd.getInt$()); + } + /** * Notifies native IIncrementalManager service that system is ready. */ @@ -158,4 +168,6 @@ public class IncrementalManagerService extends IIncrementalManager.Stub { private static native long nativeStartService(); private static native void nativeSystemReady(long nativeInstance); + + private static native void nativeDump(long nativeInstance, int fd); } diff --git a/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java b/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java index 15dd6464e094..9754b6d4db02 100644 --- a/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java +++ b/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java @@ -46,11 +46,12 @@ import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; +import android.provider.Settings; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.integrity.engine.RuleEvaluationEngine; import com.android.server.integrity.model.IntegrityCheckResult; @@ -67,6 +68,7 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -105,6 +107,8 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { private final RuleEvaluationEngine mEvaluationEngine; private final IntegrityFileManager mIntegrityFileManager; + private final boolean mCheckIntegrityForRuleProviders; + /** Create an instance of {@link AppIntegrityManagerServiceImpl}. */ public static AppIntegrityManagerServiceImpl create(Context context) { HandlerThread handlerThread = new HandlerThread("AppIntegrityManagerServiceHandler"); @@ -115,7 +119,13 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { LocalServices.getService(PackageManagerInternal.class), RuleEvaluationEngine.getRuleEvaluationEngine(), IntegrityFileManager.getInstance(), - handlerThread.getThreadHandler()); + handlerThread.getThreadHandler(), + Settings.Global.getInt( + context.getContentResolver(), + Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER, + 0) + == 1 + ); } @VisibleForTesting @@ -124,12 +134,14 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { PackageManagerInternal packageManagerInternal, RuleEvaluationEngine evaluationEngine, IntegrityFileManager integrityFileManager, - Handler handler) { + Handler handler, + boolean checkIntegrityForRuleProviders) { mContext = context; mPackageManagerInternal = packageManagerInternal; mEvaluationEngine = evaluationEngine; mIntegrityFileManager = integrityFileManager; mHandler = handler; + mCheckIntegrityForRuleProviders = checkIntegrityForRuleProviders; IntentFilter integrityVerificationFilter = new IntentFilter(); integrityVerificationFilter.addAction(ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION); @@ -170,7 +182,8 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { success = false; } - StatsLog.write(StatsLog.INTEGRITY_RULES_PUSHED, success, ruleProvider, version); + FrameworkStatsLog.write(FrameworkStatsLog.INTEGRITY_RULES_PUSHED, success, + ruleProvider, version); Intent intent = new Intent(); intent.putExtra(EXTRA_STATUS, success ? STATUS_SUCCESS : STATUS_FAILURE); @@ -207,6 +220,17 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { : ""; } + @Override + public ParceledListSlice<Rule> getCurrentRules() { + List<Rule> rules = Collections.emptyList(); + try { + rules = mIntegrityFileManager.readRules(/* appInstallMetadata= */ null); + } catch (Exception e) { + Slog.e(TAG, "Error getting current rules", e); + } + return new ParceledListSlice<>(rules); + } + private void handleIntegrityVerification(Intent intent) { int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1); @@ -228,7 +252,8 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { String installerPackageName = getInstallerPackageName(intent); // Skip integrity verification if the verifier is doing the install. - if (isRuleProvider(installerPackageName)) { + if (!mCheckIntegrityForRuleProviders + && isRuleProvider(installerPackageName)) { Slog.i(TAG, "Verifier doing the install. Skipping integrity check."); mPackageManagerInternal.setIntegrityVerificationResult( verificationId, PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); @@ -262,8 +287,8 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { + " due to " + result.getMatchedRules()); - StatsLog.write( - StatsLog.INTEGRITY_CHECK_RESULT_REPORTED, + FrameworkStatsLog.write( + FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED, packageName, appCert, appInstallMetadata.getVersionCode(), @@ -295,7 +320,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { * Verify the UID and return the installer package name. * * @return the package name of the installer, or null if it cannot be determined or it is - * installed via adb. + * installed via adb. */ @Nullable private String getInstallerPackageName(Intent intent) { @@ -584,12 +609,13 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { } private List<String> getAllowedRuleProviders() { - return Arrays.asList(mContext.getResources().getStringArray( - R.array.config_integrityRuleProviderPackages)); + return Arrays.asList( + mContext.getResources() + .getStringArray(R.array.config_integrityRuleProviderPackages)); } private boolean isRuleProvider(String installerPackageName) { - return getAllowedRuleProviders().stream().anyMatch( - ruleProvider -> ruleProvider.equals(installerPackageName)); + return getAllowedRuleProviders().stream() + .anyMatch(ruleProvider -> ruleProvider.equals(installerPackageName)); } } diff --git a/services/core/java/com/android/server/integrity/IntegrityFileManager.java b/services/core/java/com/android/server/integrity/IntegrityFileManager.java index fffe7d9030ff..7f0231e72373 100644 --- a/services/core/java/com/android/server/integrity/IntegrityFileManager.java +++ b/services/core/java/com/android/server/integrity/IntegrityFileManager.java @@ -147,19 +147,21 @@ public class IntegrityFileManager { /** * Read rules from persistent storage. * - * @param appInstallMetadata information about the install used to select rules to read + * @param appInstallMetadata information about the install used to select rules to read. If + * null, all rules will be read. */ - public List<Rule> readRules(AppInstallMetadata appInstallMetadata) + public List<Rule> readRules(@Nullable AppInstallMetadata appInstallMetadata) throws IOException, RuleParseException { synchronized (RULES_LOCK) { // Try to identify indexes from the index file. - List<RuleIndexRange> ruleReadingIndexes; - try { - ruleReadingIndexes = - mRuleIndexingController.identifyRulesToEvaluate(appInstallMetadata); - } catch (Exception e) { - Slog.w(TAG, "Error identifying the rule indexes. Trying unindexed.", e); - ruleReadingIndexes = Collections.emptyList(); + List<RuleIndexRange> ruleReadingIndexes = Collections.emptyList(); + if (appInstallMetadata != null) { + try { + ruleReadingIndexes = + mRuleIndexingController.identifyRulesToEvaluate(appInstallMetadata); + } catch (Exception e) { + Slog.w(TAG, "Error identifying the rule indexes. Trying unindexed.", e); + } } // Read the rules based on the index information when available. diff --git a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java index 1b605c7c430c..1fa067065e1b 100644 --- a/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java +++ b/services/core/java/com/android/server/integrity/model/IntegrityCheckResult.java @@ -18,7 +18,8 @@ package com.android.server.integrity.model; import android.annotation.Nullable; import android.content.integrity.Rule; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; import java.util.Collections; import java.util.List; @@ -86,11 +87,11 @@ public final class IntegrityCheckResult { */ public int getLoggingResponse() { if (getEffect() == Effect.DENY) { - return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED; + return FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED; } else if (getEffect() == Effect.ALLOW && getMatchedRules().isEmpty()) { - return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED; + return FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED; } else if (getEffect() == Effect.ALLOW && !getMatchedRules().isEmpty()) { - return StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED; + return FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED; } else { throw new IllegalStateException("IntegrityCheckResult is not valid."); } diff --git a/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java b/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java index d01499668e8c..00e054596cd7 100644 --- a/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java +++ b/services/core/java/com/android/server/integrity/serializer/RuleBinarySerializer.java @@ -87,7 +87,7 @@ public class RuleBinarySerializer implements RuleSerializer { } if (rules.size() > TOTAL_RULE_SIZE_LIMIT) { - throw new IllegalArgumentException("Too many rules provided."); + throw new IllegalArgumentException("Too many rules provided: " + rules.size()); } // Determine the indexing groups and the order of the rules within each indexed group. @@ -134,7 +134,11 @@ public class RuleBinarySerializer implements RuleSerializer { .map(list -> list.size()) .collect(Collectors.summingInt(Integer::intValue)); if (totalRuleCount > ruleSizeLimit) { - throw new IllegalArgumentException("Too many rules provided in the indexing group."); + throw new IllegalArgumentException( + "Too many rules provided in the indexing group. Provided " + + totalRuleCount + + " limit " + + ruleSizeLimit); } } diff --git a/services/core/java/com/android/server/locksettings/RebootEscrowManager.java b/services/core/java/com/android/server/locksettings/RebootEscrowManager.java index 795aaa4815ef..e991f96b208f 100644 --- a/services/core/java/com/android/server/locksettings/RebootEscrowManager.java +++ b/services/core/java/com/android/server/locksettings/RebootEscrowManager.java @@ -25,10 +25,10 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserManager; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.widget.RebootEscrowListener; import java.io.IOException; @@ -135,7 +135,7 @@ class RebootEscrowManager { for (UserInfo user : users) { mStorage.removeRebootEscrow(user.id); } - StatsLog.write(StatsLog.REBOOT_ESCROW_RECOVERY_REPORTED, false); + FrameworkStatsLog.write(FrameworkStatsLog.REBOOT_ESCROW_RECOVERY_REPORTED, false); return; } @@ -143,7 +143,8 @@ class RebootEscrowManager { for (UserInfo user : rebootEscrowUsers) { allUsersUnlocked &= restoreRebootEscrowForUser(user.id, escrowKey); } - StatsLog.write(StatsLog.REBOOT_ESCROW_RECOVERY_REPORTED, allUsersUnlocked); + FrameworkStatsLog.write(FrameworkStatsLog.REBOOT_ESCROW_RECOVERY_REPORTED, + allUsersUnlocked); } private RebootEscrowKey getAndClearRebootEscrowKey() { diff --git a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java index 00b4c2b060ac..d61379921f2e 100644 --- a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java +++ b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java @@ -16,7 +16,7 @@ package com.android.server.notification; -import android.util.StatsLog; +import com.android.internal.util.FrameworkStatsLog; /** * Standard implementation of NotificationRecordLogger interface. @@ -31,7 +31,7 @@ public class NotificationRecordLoggerImpl implements NotificationRecordLogger { if (!p.shouldLog(buzzBeepBlink)) { return; } - StatsLog.write(StatsLog.NOTIFICATION_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.NOTIFICATION_REPORTED, /* int32 event_id = 1 */ p.getUiEvent().getId(), /* int32 uid = 2 */ r.getUid(), /* string package_name = 3 */ r.sbn.getPackageName(), diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 89f24d86192c..3ad120705eb3 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -347,6 +347,7 @@ public class AppsFilter { mForceQueryable.contains(newPkgSetting.appId) /* shared user that is already force queryable */ || newPkg.isForceQueryable() + || newPkgSetting.forceQueryableOverride || (newPkgSetting.isSystem() && (mSystemAppsQueryable || ArrayUtils.contains(mForceQueryableByDevicePackageNames, newPkg.getPackageName()))); diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index c17ad1119631..9116c4032ad5 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -635,6 +635,13 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements stageCid = buildExternalStageCid(sessionId); } } + + // reset the force queryable param if it's not called by an approved caller. + if (params.forceQueryableOverride) { + if (callingUid != Process.SHELL_UID && callingUid != Process.ROOT_UID) { + params.forceQueryableOverride = false; + } + } InstallSource installSource = InstallSource.create(installerPackageName, originatingPackageName, requestedInstallerPackageName); session = new PackageInstallerSession(mInternalCallback, mContext, mPm, this, diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java index 38da8ab26962..bf7bebd10a13 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerSession.java +++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java @@ -101,7 +101,6 @@ import android.os.RevocableFileDescriptor; import android.os.SystemProperties; import android.os.UserHandle; import android.os.incremental.IncrementalFileStorages; -import android.os.incremental.IncrementalManager; import android.os.storage.StorageManager; import android.provider.Settings.Secure; import android.stats.devicepolicy.DevicePolicyEnums; @@ -559,17 +558,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { mStagedSessionErrorMessage = stagedSessionErrorMessage != null ? stagedSessionErrorMessage : ""; - // TODO(b/136132412): sanity check if session should not be incremental - if (!params.isStaged && isIncrementalInstallation()) { - IncrementalManager incrementalManager = (IncrementalManager) mContext.getSystemService( - Context.INCREMENTAL_SERVICE); - if (incrementalManager != null) { - mIncrementalFileStorages = - new IncrementalFileStorages(mPackageName, stageDir, incrementalManager, - params.dataLoaderParams); - } - } - if (isStreamingInstallation() && this.params.dataLoaderParams.getComponentName().getPackageName() == SYSTEM_DATA_LOADER_PACKAGE) { @@ -1040,10 +1028,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } - if (mIncrementalFileStorages != null) { - mIncrementalFileStorages.finishSetUp(); - } - dispatchStreamValidateAndCommit(); } @@ -1052,11 +1036,6 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } private void handleStreamValidateAndCommit() { - // TODO(b/136132412): update with new APIs - if (mIncrementalFileStorages != null) { - mIncrementalFileStorages.startLoading(); - } - boolean success = streamValidateAndCommit(); if (isMultiPackage()) { @@ -2476,17 +2455,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } } - if (mIncrementalFileStorages != null) { - for (InstallationFile file : addedFiles) { - try { - mIncrementalFileStorages.addFile(file); - } catch (IOException ex) { - // TODO(b/146080380): add incremental-specific error code - throw new PackageManagerException(INSTALL_FAILED_INTERNAL_ERROR, - "Failed to add and configure Incremental File: " + file.getName(), ex); - } + // TODO(b/136132412): update with new APIs + if (isIncrementalInstallation()) { + try { + mIncrementalFileStorages = IncrementalFileStorages.initialize(mContext, + stageDir, params.dataLoaderParams, addedFiles); + return true; + } catch (IOException e) { + throw new PackageManagerException(e); } - return true; } final DataLoaderManager dataLoaderManager = mContext.getSystemService( @@ -2761,13 +2738,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { bridge.forceClose(); } } + if (mIncrementalFileStorages != null) { + mIncrementalFileStorages.cleanUp(); + mIncrementalFileStorages = null; + } // For staged sessions, we don't delete the directory where the packages have been copied, // since these packages are supposed to be read on reboot. // Those dirs are deleted when the staged session has reached a final state. if (stageDir != null && !params.isStaged) { - if (mIncrementalFileStorages != null) { - mIncrementalFileStorages.cleanUp(); - } try { mPm.mInstaller.rmPackageDir(stageDir.getAbsolutePath()); } catch (InstallerException ignored) { @@ -2783,6 +2761,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { } else { if (mIncrementalFileStorages != null) { mIncrementalFileStorages.cleanUp(); + mIncrementalFileStorages = null; } try { mPm.mInstaller.rmPackageDir(stageDir.getAbsolutePath()); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 40c07e3694d9..db8d490d53b9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -117,6 +117,7 @@ import static com.android.server.pm.PackageManagerServiceUtils.dumpCriticalInfo; import static com.android.server.pm.PackageManagerServiceUtils.getCompressedFiles; import static com.android.server.pm.PackageManagerServiceUtils.getLastModifiedTime; import static com.android.server.pm.PackageManagerServiceUtils.logCriticalInfo; +import static com.android.server.pm.PackageManagerServiceUtils.makeDirRecursive; import static com.android.server.pm.PackageManagerServiceUtils.verifySignatures; import android.Manifest; @@ -361,7 +362,6 @@ import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FilenameFilter; import java.io.IOException; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -651,6 +651,8 @@ public class PackageManagerService extends IPackageManager.Stub private static final String[] INSTANT_APP_BROADCAST_PERMISSION = new String[] { android.Manifest.permission.ACCESS_INSTANT_APPS }; + private static final String RANDOM_DIR_PREFIX = "~~"; + final ServiceThread mHandlerThread; final PackageHandler mHandler; @@ -1542,6 +1544,7 @@ public class PackageManagerService extends IPackageManager.Stub final @Nullable String[] mTelephonyPackages; final @NonNull String mServicesExtensionPackageName; final @NonNull String mSharedSystemSharedLibraryPackageName; + final @Nullable String mRetailDemoPackage; private final PackageUsage mPackageUsage = new PackageUsage(); private final CompilerStats mCompilerStats = new CompilerStats(); @@ -2996,9 +2999,6 @@ public class PackageManagerService extends IPackageManager.Stub } } - //delete tmp files - deleteTempPackageFiles(); - final int cachedSystemApps = PackageParser.sCachedPackageReadCount.get(); // Remove any shared userIDs that have no associated packages @@ -3161,6 +3161,7 @@ public class PackageManagerService extends IPackageManager.Stub mAppPredictionServicePackage = getAppPredictionServicePackageName(); mIncidentReportApproverPackage = getIncidentReportApproverPackageName(); mTelephonyPackages = getTelephonyPackageNames(); + mRetailDemoPackage = getRetailDemoPackageName(); // Now that we know all of the shared libraries, update all clients to have // the correct library paths. @@ -3591,8 +3592,7 @@ public class PackageManagerService extends IPackageManager.Stub getNextCodePath(Environment.getDataAppDirectory(null), packageName); int ret = PackageManager.INSTALL_SUCCEEDED; try { - Os.mkdir(dstCodePath.getAbsolutePath(), 0755); - Os.chmod(dstCodePath.getAbsolutePath(), 0755); + makeDirRecursive(dstCodePath, 0755); for (File srcFile : compressedFiles) { final String srcFileName = srcFile.getName(); final String dstFileName = srcFileName.substring( @@ -9852,8 +9852,12 @@ public class PackageManagerService extends IPackageManager.Stub @GuardedBy("mInstallLock") void removeCodePathLI(File codePath) { if (codePath.isDirectory()) { + File codePathParent = codePath.getParentFile(); try { mInstaller.rmPackageDir(codePath.getAbsolutePath()); + if (codePathParent.getName().startsWith(RANDOM_DIR_PREFIX)) { + mInstaller.rmPackageDir(codePathParent.getAbsolutePath()); + } } catch (InstallerException e) { Slog.w(TAG, "Failed to remove code path", e); } @@ -10570,6 +10574,10 @@ public class PackageManagerService extends IPackageManager.Stub if (pkgSetting.sharedUser != null) { pkgSetting.sharedUser.addPackage(pkgSetting); } + if (reconciledPkg.installArgs != null && reconciledPkg.installArgs.forceQueryableOverride) { + pkgSetting.forceQueryableOverride = true; + } + // TODO(toddke): Consider a method specifically for modifying the Package object // post scan; or, moving this stuff out of the Package object since it has nothing // to do with the package on disk. @@ -14063,6 +14071,7 @@ public class PackageManagerService extends IPackageManager.Stub @Nullable MultiPackageInstallParams mParentInstallParams; final long requiredInstalledVersionCode; + final boolean forceQueryableOverride; InstallParams(OriginInfo origin, MoveInfo move, IPackageInstallObserver2 observer, int installFlags, InstallSource installSource, String volumeUuid, @@ -14084,6 +14093,7 @@ public class PackageManagerService extends IPackageManager.Stub this.signingDetails = signingDetails; this.installReason = installReason; this.requiredInstalledVersionCode = requiredInstalledVersionCode; + this.forceQueryableOverride = false; } InstallParams(ActiveInstallSession activeInstallSession) { @@ -14117,6 +14127,7 @@ public class PackageManagerService extends IPackageManager.Stub signingDetails = activeInstallSession.getSigningDetails(); requiredInstalledVersionCode = activeInstallSession.getSessionParams() .requiredInstalledVersionCode; + forceQueryableOverride = activeInstallSession.getSessionParams().forceQueryableOverride; } @Override @@ -14717,6 +14728,7 @@ public class PackageManagerService extends IPackageManager.Stub final int traceCookie; final PackageParser.SigningDetails signingDetails; final int installReason; + final boolean forceQueryableOverride; @Nullable final MultiPackageInstallParams mMultiPackageInstallParams; // The list of instruction sets supported by this app. This is currently @@ -14730,7 +14742,7 @@ public class PackageManagerService extends IPackageManager.Stub String abiOverride, String[] installGrantPermissions, List<String> whitelistedRestrictedPermissions, String traceMethod, int traceCookie, SigningDetails signingDetails, - int installReason, + int installReason, boolean forceQueryableOverride, MultiPackageInstallParams multiPackageInstallParams) { this.origin = origin; this.move = move; @@ -14747,6 +14759,7 @@ public class PackageManagerService extends IPackageManager.Stub this.traceCookie = traceCookie; this.signingDetails = signingDetails; this.installReason = installReason; + this.forceQueryableOverride = forceQueryableOverride; this.mMultiPackageInstallParams = multiPackageInstallParams; } @@ -14757,7 +14770,7 @@ public class PackageManagerService extends IPackageManager.Stub params.getUser(), null /*instructionSets*/, params.packageAbiOverride, params.grantedRuntimePermissions, params.whitelistedRestrictedPermissions, params.traceMethod, params.traceCookie, params.signingDetails, - params.installReason, params.mParentInstallParams); + params.installReason, params.forceQueryableOverride, params.mParentInstallParams); } abstract int copyApk(); @@ -14848,7 +14861,7 @@ public class PackageManagerService extends IPackageManager.Stub super(OriginInfo.fromNothing(), null, null, 0, InstallSource.EMPTY, null, null, instructionSets, null, null, null, null, 0, PackageParser.SigningDetails.UNKNOWN, - PackageManager.INSTALL_REASON_UNKNOWN, null /* parent */); + PackageManager.INSTALL_REASON_UNKNOWN, false, null /* parent */); this.codeFile = (codePath != null) ? new File(codePath) : null; this.resourceFile = (resourcePath != null) ? new File(resourcePath) : null; } @@ -14926,7 +14939,9 @@ public class PackageManagerService extends IPackageManager.Stub final boolean onIncremental = mIncrementalManager != null && isIncrementalPath(beforeCodeFile.getAbsolutePath()); try { + makeDirRecursive(afterCodeFile.getParentFile(), 0775); if (onIncremental) { + // TODO(b/147371381): fix incremental installation mIncrementalManager.rename(beforeCodeFile.getAbsolutePath(), afterCodeFile.getAbsolutePath()); } else { @@ -15138,16 +15153,29 @@ public class PackageManagerService extends IPackageManager.Stub } } + /** + * Given {@code targetDir}, returns {@code targetDir/~~[randomStrA]/[packageName]-[randomStrB].} + * Makes sure that {@code targetDir/~~[randomStrA]} directory doesn't exist. + * Notice that this method doesn't actually create any directory. + * + * @param targetDir Directory that is two-levels up from the result directory. + * @param packageName Name of the package whose code files are to be installed under the result + * directory. + * @return File object for the directory that should hold the code files of {@code packageName}. + */ private File getNextCodePath(File targetDir, String packageName) { - File result; SecureRandom random = new SecureRandom(); byte[] bytes = new byte[16]; + File firstLevelDir; do { random.nextBytes(bytes); - String suffix = Base64.encodeToString(bytes, Base64.URL_SAFE | Base64.NO_WRAP); - result = new File(targetDir, packageName + "-" + suffix); - } while (result.exists()); - return result; + String dirName = RANDOM_DIR_PREFIX + + Base64.encodeToString(bytes, Base64.URL_SAFE | Base64.NO_WRAP); + firstLevelDir = new File(targetDir, dirName); + } while (firstLevelDir.exists()); + random.nextBytes(bytes); + String suffix = Base64.encodeToString(bytes, Base64.URL_SAFE | Base64.NO_WRAP); + return new File(firstLevelDir, packageName + "-" + suffix); } static class PackageInstalledInfo { @@ -17142,12 +17170,6 @@ public class PackageManagerService extends IPackageManager.Stub } } - private void deleteTempPackageFiles() { - // TODO: Is this used? - final FilenameFilter filter = - (dir, name) -> name.startsWith("vmdl") && name.endsWith(".tmp"); - } - @Override public void deletePackageAsUser(String packageName, int versionCode, IPackageDeleteObserver observer, int userId, int flags) { @@ -19703,6 +19725,41 @@ public class PackageManagerService extends IPackageManager.Stub } @Nullable + private String getRetailDemoPackageName() { + final String predefinedPkgName = mContext.getString(R.string.config_retailDemoPackage); + final String predefinedSignature = mContext.getString( + R.string.config_retailDemoPackageSignature); + + if (TextUtils.isEmpty(predefinedPkgName) || TextUtils.isEmpty(predefinedSignature)) { + return null; + } + + final AndroidPackage androidPkg = mPackages.get(predefinedPkgName); + if (androidPkg != null) { + final SigningDetails signingDetail = androidPkg.getSigningDetails(); + if (signingDetail != null && signingDetail.signatures != null) { + try { + final MessageDigest msgDigest = MessageDigest.getInstance("SHA-256"); + for (Signature signature : signingDetail.signatures) { + if (TextUtils.equals(predefinedSignature, + HexEncoding.encodeToString(msgDigest.digest( + signature.toByteArray()), false))) { + return predefinedPkgName; + } + } + } catch (NoSuchAlgorithmException e) { + Slog.e( + TAG, + "Unable to verify signatures as getting the retail demo package name", + e); + } + } + } + + return null; + } + + @Nullable private String ensureSystemPackageName(@Nullable String packageName) { if (packageName == null) { return null; @@ -21477,7 +21534,7 @@ public class PackageManagerService extends IPackageManager.Stub final int absoluteCodePathCount = absoluteCodePaths.size(); for (int i = 0; i < absoluteCodePathCount; i++) { String absoluteCodePath = absoluteCodePaths.get(i); - if (absolutePath.startsWith(absoluteCodePath)) { + if (absoluteCodePath.startsWith(absolutePath)) { pathValid = true; break; } @@ -22990,6 +23047,10 @@ public class PackageManagerService extends IPackageManager.Stub return filterOnlySystemPackages(mTelephonyPackages); case PackageManagerInternal.PACKAGE_COMPANION: return filterOnlySystemPackages("com.android.companiondevicemanager"); + case PackageManagerInternal.PACKAGE_RETAIL_DEMO: + return TextUtils.isEmpty(mRetailDemoPackage) + ? ArrayUtils.emptyArray(String.class) + : new String[] {mRetailDemoPackage}; default: return ArrayUtils.emptyArray(String.class); } diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index ded9a9c58c5e..71a5545c4131 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -83,6 +83,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; +import java.nio.file.Path; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.text.SimpleDateFormat; @@ -918,4 +919,21 @@ public class PackageManagerServiceUtils { } return packageSetting.getPermissionsState(); } + + /** + * Recursively create target directory + */ + public static void makeDirRecursive(File targetDir, int mode) throws ErrnoException { + final Path targetDirPath = targetDir.toPath(); + final int directoriesCount = targetDirPath.getNameCount(); + File currentDir; + for (int i = 1; i <= directoriesCount; i++) { + currentDir = targetDirPath.subpath(0, i).toFile(); + if (currentDir.exists()) { + continue; + } + Os.mkdir(currentDir.getAbsolutePath(), mode); + Os.chmod(currentDir.getAbsolutePath(), mode); + } + } } diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index e7f6b8982b04..bb69680fb9f9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -2730,6 +2730,9 @@ class PackageManagerShellCommand extends ShellCommand { case "--staged": sessionParams.setStaged(); break; + case "--force-queryable": + sessionParams.setForceQueryable(); + break; case "--enable-rollback": if (params.installerPackageName == null) { // com.android.shell has the TEST_MANAGE_ROLLBACKS diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java index f1ac0afa5dfd..7d95b198d8ce 100644 --- a/services/core/java/com/android/server/pm/PackageSettingBase.java +++ b/services/core/java/com/android/server/pm/PackageSettingBase.java @@ -36,7 +36,6 @@ import android.util.SparseArray; import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.Preconditions; import java.io.File; import java.util.Arrays; @@ -132,6 +131,8 @@ public abstract class PackageSettingBase extends SettingBase { IntentFilterVerificationInfo verificationInfo; + boolean forceQueryableOverride; + PackageSettingBase(String name, String realName, File codePath, File resourcePath, String legacyNativeLibraryPathString, String primaryCpuAbiString, String secondaryCpuAbiString, String cpuAbiOverrideString, @@ -261,6 +262,7 @@ public abstract class PackageSettingBase extends SettingBase { ? Arrays.copyOf(orig.usesStaticLibrariesVersions, orig.usesStaticLibrariesVersions.length) : null; updateAvailable = orig.updateAvailable; + forceQueryableOverride = orig.forceQueryableOverride; } @VisibleForTesting @@ -693,6 +695,7 @@ public abstract class PackageSettingBase extends SettingBase { this.categoryHint = other.categoryHint; this.updateAvailable = other.updateAvailable; this.verificationInfo = other.verificationInfo; + this.forceQueryableOverride = other.forceQueryableOverride; if (mOldCodePaths != null) { if (other.mOldCodePaths != null) { diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 5d948b24256a..fcd8e221a9e8 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -2836,6 +2836,9 @@ public final class Settings { if (pkg.updateAvailable) { serializer.attribute(null, "updateAvailable", "true"); } + if (pkg.forceQueryableOverride) { + serializer.attribute(null, "forceQueryable", "true"); + } writeUsesStaticLibLPw(serializer, pkg.usesStaticLibraries, pkg.usesStaticLibrariesVersions); @@ -3599,6 +3602,7 @@ public final class Settings { PackageSetting packageSetting = null; String version = null; long versionCode = 0; + String installedForceQueryable = null; try { name = parser.getAttributeValue(null, ATTR_NAME); realName = parser.getAttributeValue(null, "realName"); @@ -3615,6 +3619,7 @@ public final class Settings { secondaryCpuAbiString = parser.getAttributeValue(null, "secondaryCpuAbi"); cpuAbiOverrideString = parser.getAttributeValue(null, "cpuAbiOverride"); updateAvailable = parser.getAttributeValue(null, "updateAvailable"); + installedForceQueryable = parser.getAttributeValue(null, "forceQueryable"); if (primaryCpuAbiString == null && legacyCpuAbiString != null) { primaryCpuAbiString = legacyCpuAbiString; @@ -3798,6 +3803,7 @@ public final class Settings { packageSetting.primaryCpuAbiString = primaryCpuAbiString; packageSetting.secondaryCpuAbiString = secondaryCpuAbiString; packageSetting.updateAvailable = "true".equals(updateAvailable); + packageSetting.forceQueryableOverride = "true".equals(installedForceQueryable); // Handle legacy string here for single-user mode final String enabledStr = parser.getAttributeValue(null, ATTR_ENABLED); if (enabledStr != null) { diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index f368666a06ba..f7889ea6141c 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -1977,10 +1977,15 @@ public class ShortcutService extends IShortcutService.Stub { * After validating the caller, it passes the request to {@link #mShortcutRequestPinProcessor}. * Either {@param shortcut} or {@param appWidget} should be non-null. */ - private boolean requestPinItem(String packageName, int userId, ShortcutInfo shortcut, + private boolean requestPinItem(String callingPackage, int userId, ShortcutInfo shortcut, AppWidgetProviderInfo appWidget, Bundle extras, IntentSender resultIntent) { - verifyCaller(packageName, userId); - verifyShortcutInfoPackage(packageName, shortcut); + verifyCaller(callingPackage, userId); + if (shortcut == null || !injectHasAccessShortcutsPermission( + injectBinderCallingPid(), injectBinderCallingUid())) { + // Verify if caller is the shortcut owner, only if caller doesn't have ACCESS_SHORTCUTS. + verifyShortcutInfoPackage(callingPackage, shortcut); + } + final String shortcutPackage = shortcut.getPackage(); final boolean ret; synchronized (mLock) { @@ -1995,13 +2000,13 @@ public class ShortcutService extends IShortcutService.Stub { // and then proceed the rest of the process. if (shortcut != null) { final ShortcutPackage ps = getPackageShortcutsForPublisherLocked( - packageName, userId); + shortcutPackage, userId); final String id = shortcut.getId(); if (ps.isShortcutExistsAndInvisibleToPublisher(id)) { ps.updateInvisibleShortcutForPinRequestWith(shortcut); - packageShortcutsChanged(packageName, userId); + packageShortcutsChanged(shortcutPackage, userId); } } diff --git a/services/core/java/com/android/server/pm/permission/BasePermission.java b/services/core/java/com/android/server/pm/permission/BasePermission.java index 565a85fd1ac1..e323c9869afb 100644 --- a/services/core/java/com/android/server/pm/permission/BasePermission.java +++ b/services/core/java/com/android/server/pm/permission/BasePermission.java @@ -284,6 +284,10 @@ public final class BasePermission { return (protectionLevel & PermissionInfo.PROTECTION_FLAG_COMPANION) != 0; } + public boolean isRetailDemo() { + return (protectionLevel & PermissionInfo.PROTECTION_FLAG_RETAIL_DEMO) != 0; + } + public void transfer(@NonNull String origPackageName, @NonNull String newPackageName) { if (!origPackageName.equals(sourcePackageName)) { return; diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 6167a509b85f..1fc2dd5193e1 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -55,6 +55,8 @@ import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.ApplicationPackageManager; import android.app.IActivityManager; +import android.app.admin.DeviceAdminInfo; +import android.app.admin.DevicePolicyManagerInternal; import android.compat.annotation.ChangeId; import android.compat.annotation.EnabledAfter; import android.content.Context; @@ -3355,10 +3357,27 @@ public class PermissionManagerService extends IPermissionManager.Stub { // Special permissions for the system companion device manager. allowed = true; } + if (!allowed && bp.isRetailDemo() + && ArrayUtils.contains(mPackageManagerInt.getKnownPackageNames( + PackageManagerInternal.PACKAGE_RETAIL_DEMO, UserHandle.USER_SYSTEM), + pkg.getPackageName()) && isProfileOwner(pkg.getUid())) { + // Special permission granted only to the OEM specified retail demo app + allowed = true; + } } return allowed; } + private static boolean isProfileOwner(int uid) { + DevicePolicyManagerInternal dpmInternal = + LocalServices.getService(DevicePolicyManagerInternal.class); + if (dpmInternal != null) { + return dpmInternal + .isActiveAdminWithPolicy(uid, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); + } + return false; + } + private static boolean canGrantOemPermission(PackageSetting ps, String permission) { if (!ps.isOem()) { return false; diff --git a/services/core/java/com/android/server/power/AttentionDetector.java b/services/core/java/com/android/server/power/AttentionDetector.java index eec0d5f35c5c..cc72dd69a5fa 100644 --- a/services/core/java/com/android/server/power/AttentionDetector.java +++ b/services/core/java/com/android/server/power/AttentionDetector.java @@ -38,9 +38,9 @@ import android.provider.DeviceConfig; import android.provider.Settings; import android.service.attention.AttentionService; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import com.android.server.wm.WindowManagerInternal; @@ -285,7 +285,8 @@ public class AttentionDetector { private void resetConsecutiveExtensionCount() { final long previousCount = mConsecutiveTimeoutExtendedCount.getAndSet(0); if (previousCount > 0) { - StatsLog.write(StatsLog.SCREEN_TIMEOUT_EXTENSION_REPORTED, previousCount); + FrameworkStatsLog.write(FrameworkStatsLog.SCREEN_TIMEOUT_EXTENSION_REPORTED, + previousCount); } } diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index b45522d11a5d..0b95be15f157 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -49,13 +49,13 @@ import android.provider.Settings; import android.telephony.TelephonyManager; import android.util.EventLog; import android.util.Slog; -import android.util.StatsLog; import android.view.WindowManagerPolicyConstants.OnReason; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IBatteryStats; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.EventLogTags; import com.android.server.LocalServices; import com.android.server.inputmethod.InputMethodManagerInternal; @@ -199,8 +199,8 @@ public class Notifier { try { mBatteryStats.noteInteractive(true); } catch (RemoteException ex) { } - StatsLog.write(StatsLog.INTERACTIVE_STATE_CHANGED, - StatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write(FrameworkStatsLog.INTERACTIVE_STATE_CHANGED, + FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON); } /** @@ -247,13 +247,15 @@ public class Notifier { try { if (workSource != null) { mBatteryStats.noteLongPartialWakelockStartFromSource(tag, historyTag, workSource); - StatsLog.write(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, workSource, - tag, historyTag, StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write(FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, + workSource, tag, historyTag, + FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON); } else { mBatteryStats.noteLongPartialWakelockStart(tag, historyTag, ownerUid); - StatsLog.write_non_chained(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, - ownerUid, null, tag, historyTag, - StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.write_non_chained( + FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, ownerUid, null, tag, + historyTag, + FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__ON); } } catch (RemoteException ex) { // Ignore @@ -270,13 +272,15 @@ public class Notifier { try { if (workSource != null) { mBatteryStats.noteLongPartialWakelockFinishFromSource(tag, historyTag, workSource); - StatsLog.write(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, workSource, - tag, historyTag, StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, + workSource, tag, historyTag, + FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF); } else { mBatteryStats.noteLongPartialWakelockFinish(tag, historyTag, ownerUid); - StatsLog.write_non_chained(StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, - ownerUid, null, tag, historyTag, - StatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write_non_chained( + FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED, ownerUid, null, tag, + historyTag, + FrameworkStatsLog.LONG_PARTIAL_WAKELOCK_STATE_CHANGED__STATE__OFF); } } catch (RemoteException ex) { // Ignore @@ -415,9 +419,9 @@ public class Notifier { try { mBatteryStats.noteInteractive(interactive); } catch (RemoteException ex) { } - StatsLog.write(StatsLog.INTERACTIVE_STATE_CHANGED, - interactive ? StatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON : - StatsLog.INTERACTIVE_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.write(FrameworkStatsLog.INTERACTIVE_STATE_CHANGED, + interactive ? FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__ON : + FrameworkStatsLog.INTERACTIVE_STATE_CHANGED__STATE__OFF); // Handle early behaviors. mInteractive = interactive; diff --git a/services/core/java/com/android/server/rollback/Rollback.java b/services/core/java/com/android/server/rollback/Rollback.java index e0143ae4841b..bf7413b64588 100644 --- a/services/core/java/com/android/server/rollback/Rollback.java +++ b/services/core/java/com/android/server/rollback/Rollback.java @@ -187,6 +187,14 @@ class Rollback { private final int[] mPackageSessionIds; /** + * The number of sessions in the install which are notified with success by + * {@link PackageInstaller.SessionCallback#onFinished(int, boolean)}. + * This rollback will be enabled only after all child sessions finished with success. + */ + @GuardedBy("mLock") + private int mNumPackageSessionsWithSuccess; + + /** * Constructs a new, empty Rollback instance. * * @param rollbackId the id of the rollback. @@ -840,6 +848,17 @@ class Rollback { return mPackageSessionIds.length; } + /** + * Called when a child session finished with success. + * Returns true when all child sessions are notified with success. This rollback will be + * enabled only after all child sessions finished with success. + */ + boolean notifySessionWithSuccess() { + synchronized (mLock) { + return ++mNumPackageSessionsWithSuccess == mPackageSessionIds.length; + } + } + static String rollbackStateToString(@RollbackState int state) { switch (state) { case Rollback.ROLLBACK_STATE_ENABLING: return "enabling"; diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index 4425c0acba2a..3fa114e3b7a3 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -123,7 +123,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { // Rollbacks we are in the process of enabling. @GuardedBy("mLock") - private final Set<NewRollback> mNewRollbacks = new ArraySet<>(); + private final Set<Rollback> mNewRollbacks = new ArraySet<>(); // The list of all rollbacks, including available and committed rollbacks. @GuardedBy("mLock") @@ -240,16 +240,16 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { Slog.v(TAG, "broadcast=ACTION_CANCEL_ENABLE_ROLLBACK token=" + token); } synchronized (mLock) { - NewRollback found = null; - for (NewRollback newRollback : mNewRollbacks) { - if (newRollback.rollback.hasToken(token)) { + Rollback found = null; + for (Rollback newRollback : mNewRollbacks) { + if (newRollback.hasToken(token)) { found = newRollback; break; } } if (found != null) { mNewRollbacks.remove(found); - found.rollback.delete(mAppDataRollbackHelper); + found.delete(mAppDataRollbackHelper); } } } @@ -442,12 +442,12 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { rollback.delete(mAppDataRollbackHelper); } } - Iterator<NewRollback> iter2 = mNewRollbacks.iterator(); + Iterator<Rollback> iter2 = mNewRollbacks.iterator(); while (iter2.hasNext()) { - NewRollback newRollback = iter2.next(); - if (newRollback.rollback.includesPackage(packageName)) { + Rollback newRollback = iter2.next(); + if (newRollback.includesPackage(packageName)) { iter2.remove(); - newRollback.rollback.delete(mAppDataRollbackHelper); + newRollback.delete(mAppDataRollbackHelper); } } @@ -802,7 +802,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { } } - NewRollback newRollback; + Rollback newRollback; synchronized (mLock) { // See if we already have a NewRollback that contains this package // session. If not, create a NewRollback for the parent session @@ -813,9 +813,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { mNewRollbacks.add(newRollback); } } - newRollback.rollback.addToken(token); + newRollback.addToken(token); - return enableRollbackForPackageSession(newRollback.rollback, packageSession); + return enableRollbackForPackageSession(newRollback, packageSession); } @WorkerThread @@ -825,12 +825,12 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { } synchronized (mLock) { - NewRollback newRollback = getNewRollbackForPackageSessionLocked(sessionId); + Rollback newRollback = getNewRollbackForPackageSessionLocked(sessionId); if (newRollback != null) { - Slog.w(TAG, "Delete new rollback id=" + newRollback.rollback.info.getRollbackId() + Slog.w(TAG, "Delete new rollback id=" + newRollback.info.getRollbackId() + " for session id=" + sessionId); mNewRollbacks.remove(newRollback); - newRollback.rollback.delete(mAppDataRollbackHelper); + newRollback.delete(mAppDataRollbackHelper); } Iterator<Rollback> iter = mRollbacks.iterator(); while (iter.hasNext()) { @@ -972,9 +972,8 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { rollback.snapshotUserData(packageName, userIds, mAppDataRollbackHelper); } // non-staged installs - for (NewRollback rollback : mNewRollbacks) { - rollback.rollback.snapshotUserData( - packageName, userIds, mAppDataRollbackHelper); + for (Rollback rollback : mNewRollbacks) { + rollback.snapshotUserData(packageName, userIds, mAppDataRollbackHelper); } } } @@ -1016,13 +1015,13 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { return; } - NewRollback newRollback; + Rollback newRollback; synchronized (mLock) { newRollback = createNewRollbackLocked(session); } if (!session.isMultiPackage()) { - if (!enableRollbackForPackageSession(newRollback.rollback, session)) { + if (!enableRollbackForPackageSession(newRollback, session)) { Slog.e(TAG, "Unable to enable rollback for session: " + sessionId); result.offer(-1); return; @@ -1036,7 +1035,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { result.offer(-1); return; } - if (!enableRollbackForPackageSession(newRollback.rollback, childSession)) { + if (!enableRollbackForPackageSession(newRollback, childSession)) { Slog.e(TAG, "Unable to enable rollback for session: " + sessionId); result.offer(-1); return; @@ -1197,7 +1196,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { } if (success) { - NewRollback newRollback; + Rollback newRollback; synchronized (mLock) { newRollback = getNewRollbackForPackageSessionLocked(sessionId); if (newRollback != null && newRollback.notifySessionWithSuccess()) { @@ -1229,8 +1228,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { * or null on error. */ @WorkerThread - private Rollback completeEnableRollback(NewRollback newRollback) { - Rollback rollback = newRollback.rollback; + private Rollback completeEnableRollback(Rollback rollback) { if (LOCAL_LOGV) { Slog.v(TAG, "completeEnableRollback id=" + rollback.info.getRollbackId()); } @@ -1341,38 +1339,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { } } - private static class NewRollback { - public final Rollback rollback; - - /** - * The number of sessions in the install which are notified with success by - * {@link PackageInstaller.SessionCallback#onFinished(int, boolean)}. - * This NewRollback will be enabled only after all child sessions finished with success. - */ - @GuardedBy("mNewRollbackLock") - private int mNumPackageSessionsWithSuccess; - - private final Object mNewRollbackLock = new Object(); - - NewRollback(Rollback rollback) { - this.rollback = rollback; - } - - /** - * Called when a child session finished with success. - * Returns true when all child sessions are notified with success. This NewRollback will be - * enabled only after all child sessions finished with success. - */ - boolean notifySessionWithSuccess() { - synchronized (mNewRollbackLock) { - return ++mNumPackageSessionsWithSuccess == rollback.getPackageSessionIdCount(); - } - } - } - @WorkerThread @GuardedBy("mLock") - private NewRollback createNewRollbackLocked(PackageInstaller.SessionInfo parentSession) { + private Rollback createNewRollbackLocked(PackageInstaller.SessionInfo parentSession) { int rollbackId = allocateRollbackIdLocked(); final int userId; if (parentSession.getUser() == UserHandle.ALL) { @@ -1404,7 +1373,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { installerPackageName, packageSessionIds); } - return new NewRollback(rollback); + return rollback; } /** @@ -1414,11 +1383,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { */ @WorkerThread @GuardedBy("mLock") - NewRollback getNewRollbackForPackageSessionLocked(int packageSessionId) { + Rollback getNewRollbackForPackageSessionLocked(int packageSessionId) { // We expect mNewRollbacks to be a very small list; linear search // should be plenty fast. - for (NewRollback newRollback: mNewRollbacks) { - if (newRollback.rollback.containsSessionId(packageSessionId)) { + for (Rollback newRollback: mNewRollbacks) { + if (newRollback.containsSessionId(packageSessionId)) { return newRollback; } } diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 8893213d4a71..8d090f1b6fce 100644 --- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -16,7 +16,7 @@ package com.android.server.rollback; -import static android.util.StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN; +import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN; import android.annotation.Nullable; import android.content.BroadcastReceiver; @@ -38,9 +38,9 @@ import android.os.SystemProperties; import android.text.TextUtils; import android.util.ArraySet; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.annotations.GuardedBy; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.PackageWatchdog; import com.android.server.PackageWatchdog.FailureReasons; import com.android.server.PackageWatchdog.PackageHealthObserver; @@ -224,14 +224,15 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve saveStagedRollbackId(rollbackId); } WatchdogRollbackLogger.logEvent(logPackage, - StatsLog + FrameworkStatsLog .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED, WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN, ""); } else if (sessionInfo.isStagedSessionFailed() && markStagedSessionHandled(rollbackId)) { WatchdogRollbackLogger.logEvent(logPackage, - StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE, + FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE, WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN, ""); mContext.unregisterReceiver(listener); @@ -337,7 +338,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve final VersionedPackage logPackage = logPackageTemp; WatchdogRollbackLogger.logEvent(logPackage, - StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE, + FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE, reasonToLog, failedPackageToLog); final LocalIntentReceiver rollbackReceiver = new LocalIntentReceiver((Intent result) -> { int status = result.getIntExtra(RollbackManager.EXTRA_STATUS, @@ -355,7 +356,8 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve logPackage); } else { WatchdogRollbackLogger.logEvent(logPackage, - StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS, + FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS, reasonToLog, failedPackageToLog); } } else { @@ -363,7 +365,8 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve markStagedSessionHandled(rollback.getRollbackId()); } WatchdogRollbackLogger.logEvent(logPackage, - StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE, + FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE, reasonToLog, failedPackageToLog); } }); diff --git a/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java b/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java index 3c923e7d2e31..46ec2f8258ca 100644 --- a/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java +++ b/services/core/java/com/android/server/rollback/WatchdogRollbackLogger.java @@ -16,11 +16,11 @@ package com.android.server.rollback; -import static android.util.StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH; -import static android.util.StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING; -import static android.util.StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK; -import static android.util.StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH; -import static android.util.StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN; +import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH; +import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING; +import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK; +import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH; +import static com.android.internal.util.FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN; import android.annotation.NonNull; import android.annotation.Nullable; @@ -36,6 +36,7 @@ import android.util.Slog; import android.util.StatsLog; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.PackageWatchdog; import java.util.ArrayList; @@ -69,20 +70,27 @@ public final class WatchdogRollbackLogger { } } + /** + * Returns the logging parent of a given package if it exists, {@code null} otherwise. + * + * The logging parent is defined by the {@code android.content.pm.LOGGING_PARENT} field in the + * metadata of a package's AndroidManifest.xml. + */ @VisibleForTesting + @Nullable static VersionedPackage getLogPackage(Context context, @NonNull VersionedPackage failingPackage) { String logPackageName; VersionedPackage loggingParent; logPackageName = getLoggingParentName(context, failingPackage.getPackageName()); if (logPackageName == null) { - return failingPackage; + return null; } try { loggingParent = new VersionedPackage(logPackageName, context.getPackageManager() .getPackageInfo(logPackageName, 0 /* flags */).getLongVersionCode()); } catch (PackageManager.NameNotFoundException e) { - return failingPackage; + return null; } return loggingParent; } @@ -104,18 +112,14 @@ public final class WatchdogRollbackLogger { return; } - // Identify the logging parent for this rollback. When all configurations are correct, each - // package in the rollback refers to the same logging parent, except for the logging parent - // itself. If a logging parent is missing for a package, we use the package itself for - // logging. This might result in over-logging, but we prefer this over no logging. + // Identify the logging parent for this rollback. When all configurations are correct, + // each package in the rollback has a logging parent set in metadata. final Set<String> loggingPackageNames = new ArraySet<>(); for (PackageRollbackInfo packageRollback : rollback.getPackages()) { final String loggingParentName = getLoggingParentName(context, packageRollback.getPackageName()); if (loggingParentName != null) { loggingPackageNames.add(loggingParentName); - } else { - loggingPackageNames.add(packageRollback.getPackageName()); } } @@ -138,11 +142,13 @@ public final class WatchdogRollbackLogger { for (VersionedPackage oldLoggingPackage : oldLoggingPackages) { if (sessionInfo.isStagedSessionApplied()) { logEvent(oldLoggingPackage, - StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS, + FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS, WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN, ""); } else if (sessionInfo.isStagedSessionFailed()) { logEvent(oldLoggingPackage, - StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE, + FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE, WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN, ""); } } @@ -165,6 +171,10 @@ public final class WatchdogRollbackLogger { if (logPackage != null) { StatsLog.logWatchdogRollbackOccurred(type, logPackage.getPackageName(), logPackage.getVersionCode(), rollbackReason, failingPackageName); + } else { + // In the case that the log package is null, still log an empty string as an + // indication that retrieving the logging parent failed. + StatsLog.logWatchdogRollbackOccurred(type, "", 0, rollbackReason, failingPackageName); } } @@ -186,13 +196,14 @@ public final class WatchdogRollbackLogger { private static String rollbackTypeToString(int type) { switch (type) { - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE: + case FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE: return "ROLLBACK_INITIATE"; - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS: + case FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS: return "ROLLBACK_SUCCESS"; - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE: + case FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE: return "ROLLBACK_FAILURE"; - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED: + case FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED: return "ROLLBACK_BOOT_TRIGGERED"; default: return "UNKNOWN"; @@ -201,13 +212,15 @@ public final class WatchdogRollbackLogger { private static String rollbackReasonToString(int reason) { switch (reason) { - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH: + case FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH: return "REASON_NATIVE_CRASH"; - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK: + case FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK: return "REASON_EXPLICIT_HEALTH_CHECK"; - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH: + case FrameworkStatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH: return "REASON_APP_CRASH"; - case StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING: + case FrameworkStatsLog + .WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING: return "REASON_APP_NOT_RESPONDING"; default: return "UNKNOWN"; diff --git a/services/core/java/com/android/server/signedconfig/GlobalSettingsConfigApplicator.java b/services/core/java/com/android/server/signedconfig/GlobalSettingsConfigApplicator.java index d77cf900a0a9..897aa14ebb64 100644 --- a/services/core/java/com/android/server/signedconfig/GlobalSettingsConfigApplicator.java +++ b/services/core/java/com/android/server/signedconfig/GlobalSettingsConfigApplicator.java @@ -23,7 +23,8 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; import java.security.GeneralSecurityException; import java.util.Arrays; @@ -82,7 +83,7 @@ class GlobalSettingsConfigApplicator { return mVerifier.verifySignature(data, signature); } catch (GeneralSecurityException e) { Slog.e(TAG, "Failed to verify signature", e); - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__SECURITY_EXCEPTION; + mEvent.status = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__SECURITY_EXCEPTION; return false; } } @@ -116,14 +117,14 @@ class GlobalSettingsConfigApplicator { mEvent.version = config.version; } catch (InvalidConfigException e) { Slog.e(TAG, "Failed to parse global settings from package " + mSourcePackage, e); - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__INVALID_CONFIG; + mEvent.status = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__INVALID_CONFIG; return; } int currentVersion = getCurrentConfigVersion(); if (currentVersion >= config.version) { Slog.i(TAG, "Global settings from package " + mSourcePackage + " is older than existing: " + config.version + "<=" + currentVersion); - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__OLD_CONFIG; + mEvent.status = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__OLD_CONFIG; return; } // We have new config! @@ -133,12 +134,12 @@ class GlobalSettingsConfigApplicator { config.getMatchingConfig(Build.VERSION.SDK_INT); if (matchedConfig == null) { Slog.i(TAG, "Settings is not applicable to current SDK version; ignoring"); - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__NOT_APPLICABLE; + mEvent.status = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__NOT_APPLICABLE; return; } Slog.i(TAG, "Updating global settings to version " + config.version); updateCurrentConfig(config.version, matchedConfig.values); - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__APPLIED; + mEvent.status = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__APPLIED; } } diff --git a/services/core/java/com/android/server/signedconfig/SignatureVerifier.java b/services/core/java/com/android/server/signedconfig/SignatureVerifier.java index 146c51688531..a85764221de5 100644 --- a/services/core/java/com/android/server/signedconfig/SignatureVerifier.java +++ b/services/core/java/com/android/server/signedconfig/SignatureVerifier.java @@ -18,7 +18,8 @@ package com.android.server.signedconfig; import android.os.Build; import android.util.Slog; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; @@ -96,7 +97,8 @@ public class SignatureVerifier { try { signature = Base64.getDecoder().decode(base64Signature); } catch (IllegalArgumentException e) { - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__BASE64_FAILURE_SIGNATURE; + mEvent.status = + FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__BASE64_FAILURE_SIGNATURE; Slog.e(TAG, "Failed to base64 decode signature"); return false; } @@ -108,7 +110,8 @@ public class SignatureVerifier { if (DBG) Slog.w(TAG, "Trying to verify signature using debug key"); if (verifyWithPublicKey(mDebugKey, data, signature)) { Slog.i(TAG, "Verified config using debug key"); - mEvent.verifiedWith = StatsLog.SIGNED_CONFIG_REPORTED__VERIFIED_WITH__DEBUG; + mEvent.verifiedWith = + FrameworkStatsLog.SIGNED_CONFIG_REPORTED__VERIFIED_WITH__DEBUG; return true; } else { if (DBG) Slog.i(TAG, "Config verification failed using debug key"); @@ -120,16 +123,19 @@ public class SignatureVerifier { if (mProdKey == null) { Slog.e(TAG, "No prod key; construction failed?"); mEvent.status = - StatsLog.SIGNED_CONFIG_REPORTED__STATUS__SIGNATURE_CHECK_FAILED_PROD_KEY_ABSENT; + FrameworkStatsLog + .SIGNED_CONFIG_REPORTED__STATUS__SIGNATURE_CHECK_FAILED_PROD_KEY_ABSENT; return false; } if (verifyWithPublicKey(mProdKey, data, signature)) { Slog.i(TAG, "Verified config using production key"); - mEvent.verifiedWith = StatsLog.SIGNED_CONFIG_REPORTED__VERIFIED_WITH__PRODUCTION; + mEvent.verifiedWith = + FrameworkStatsLog.SIGNED_CONFIG_REPORTED__VERIFIED_WITH__PRODUCTION; return true; } else { if (DBG) Slog.i(TAG, "Verification failed using production key"); - mEvent.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__SIGNATURE_CHECK_FAILED; + mEvent.status = + FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__SIGNATURE_CHECK_FAILED; return false; } } diff --git a/services/core/java/com/android/server/signedconfig/SignedConfigEvent.java b/services/core/java/com/android/server/signedconfig/SignedConfigEvent.java index 2f2062c6f2ee..c1adf936d79b 100644 --- a/services/core/java/com/android/server/signedconfig/SignedConfigEvent.java +++ b/services/core/java/com/android/server/signedconfig/SignedConfigEvent.java @@ -15,24 +15,24 @@ */ package com.android.server.signedconfig; -import android.util.StatsLog; +import com.android.internal.util.FrameworkStatsLog; /** * Helper class to allow a SignedConfigReported event to be built up in stages. */ public class SignedConfigEvent { - public int type = StatsLog.SIGNED_CONFIG_REPORTED__TYPE__UNKNOWN_TYPE; - public int status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__UNKNOWN_STATUS; + public int type = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__TYPE__UNKNOWN_TYPE; + public int status = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__UNKNOWN_STATUS; public int version = 0; public String fromPackage = null; - public int verifiedWith = StatsLog.SIGNED_CONFIG_REPORTED__VERIFIED_WITH__NO_KEY; + public int verifiedWith = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__VERIFIED_WITH__NO_KEY; /** * Write this event to statslog. */ public void send() { - StatsLog.write(StatsLog.SIGNED_CONFIG_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.SIGNED_CONFIG_REPORTED, type, status, version, fromPackage, verifiedWith); } diff --git a/services/core/java/com/android/server/signedconfig/SignedConfigService.java b/services/core/java/com/android/server/signedconfig/SignedConfigService.java index dc39542dc29f..037c82ad6593 100644 --- a/services/core/java/com/android/server/signedconfig/SignedConfigService.java +++ b/services/core/java/com/android/server/signedconfig/SignedConfigService.java @@ -26,8 +26,8 @@ import android.content.pm.PackageManagerInternal; import android.net.Uri; import android.os.Bundle; import android.util.Slog; -import android.util.StatsLog; +import com.android.internal.util.FrameworkStatsLog; import com.android.server.LocalServices; import java.nio.charset.StandardCharsets; @@ -85,7 +85,7 @@ public class SignedConfigService { && metaData.containsKey(KEY_GLOBAL_SETTINGS_SIGNATURE)) { SignedConfigEvent event = new SignedConfigEvent(); try { - event.type = StatsLog.SIGNED_CONFIG_REPORTED__TYPE__GLOBAL_SETTINGS; + event.type = FrameworkStatsLog.SIGNED_CONFIG_REPORTED__TYPE__GLOBAL_SETTINGS; event.fromPackage = packageName; String config = metaData.getString(KEY_GLOBAL_SETTINGS); String signature = metaData.getString(KEY_GLOBAL_SETTINGS_SIGNATURE); @@ -95,7 +95,8 @@ public class SignedConfigService { } catch (IllegalArgumentException iae) { Slog.e(TAG, "Failed to base64 decode global settings config from " + packageName); - event.status = StatsLog.SIGNED_CONFIG_REPORTED__STATUS__BASE64_FAILURE_CONFIG; + event.status = + FrameworkStatsLog.SIGNED_CONFIG_REPORTED__STATUS__BASE64_FAILURE_CONFIG; return; } if (DBG) { diff --git a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java index b136ec754f59..734b71824490 100644 --- a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java +++ b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java @@ -41,11 +41,11 @@ import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.DataUnit; import android.util.Slog; -import android.util.StatsLog; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; import com.android.internal.notification.SystemNotificationChannels; import com.android.internal.util.DumpUtils; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.IndentingPrintWriter; import com.android.server.EventLogTags; import com.android.server.SystemService; @@ -512,15 +512,15 @@ public class DeviceStorageMonitorService extends SystemService { notification.flags |= Notification.FLAG_NO_CLEAR; mNotifManager.notifyAsUser(uuid.toString(), SystemMessage.NOTE_LOW_STORAGE, notification, UserHandle.ALL); - StatsLog.write(StatsLog.LOW_STORAGE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.LOW_STORAGE_STATE_CHANGED, Objects.toString(vol.getDescription()), - StatsLog.LOW_STORAGE_STATE_CHANGED__STATE__ON); + FrameworkStatsLog.LOW_STORAGE_STATE_CHANGED__STATE__ON); } else if (State.isLeaving(State.LEVEL_LOW, oldLevel, newLevel)) { mNotifManager.cancelAsUser(uuid.toString(), SystemMessage.NOTE_LOW_STORAGE, UserHandle.ALL); - StatsLog.write(StatsLog.LOW_STORAGE_STATE_CHANGED, + FrameworkStatsLog.write(FrameworkStatsLog.LOW_STORAGE_STATE_CHANGED, Objects.toString(vol.getDescription()), - StatsLog.LOW_STORAGE_STATE_CHANGED__STATE__OFF); + FrameworkStatsLog.LOW_STORAGE_STATE_CHANGED__STATE__OFF); } } diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index df6dfc4d8ffe..ed38e9a73050 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -3037,6 +3037,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } // Throw away any services that have been bound by this activity. mServiceConnectionsHolder.disconnectActivityFromServices(); + // This activity record is removing, make sure not to disconnect twice. + mServiceConnectionsHolder = null; } @Override diff --git a/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java b/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java index 6e75f9c9167f..5dfc261480f2 100644 --- a/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java +++ b/services/core/java/com/android/server/wm/ActivityServiceConnectionsHolder.java @@ -18,10 +18,13 @@ package com.android.server.wm; import static com.android.server.wm.ActivityStack.ActivityState.PAUSING; import static com.android.server.wm.ActivityStack.ActivityState.RESUMED; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP; +import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; + +import android.util.ArraySet; +import android.util.Slog; import java.io.PrintWriter; -import java.util.HashSet; -import java.util.Iterator; import java.util.function.Consumer; /** @@ -30,6 +33,8 @@ import java.util.function.Consumer; * instance of this per activity for tracking all services connected to that activity. AM will * sometimes query this to bump the OOM score for the processes with services connected to visible * activities. + * <p> + * Public methods are called in AM lock, otherwise in WM lock. */ public class ActivityServiceConnectionsHolder<T> { @@ -44,7 +49,10 @@ public class ActivityServiceConnectionsHolder<T> { * on the WM side since we don't perform operations on the object. Mainly here for communication * and booking with the AM side. */ - private HashSet<T> mConnections; + private ArraySet<T> mConnections; + + /** Whether all connections of {@link #mActivity} are being removed. */ + private volatile boolean mIsDisconnecting; ActivityServiceConnectionsHolder(ActivityTaskManagerService service, ActivityRecord activity) { mService = service; @@ -54,8 +62,16 @@ public class ActivityServiceConnectionsHolder<T> { /** Adds a connection record that the activity has bound to a specific service. */ public void addConnection(T c) { synchronized (mService.mGlobalLock) { + if (mIsDisconnecting) { + // This is unlikely to happen because the caller should create a new holder. + if (DEBUG_CLEANUP) { + Slog.e(TAG_ATM, "Skip adding connection " + c + " to a disconnecting holder of " + + mActivity); + } + return; + } if (mConnections == null) { - mConnections = new HashSet<>(); + mConnections = new ArraySet<>(); } mConnections.add(c); } @@ -67,6 +83,9 @@ public class ActivityServiceConnectionsHolder<T> { if (mConnections == null) { return; } + if (DEBUG_CLEANUP && mIsDisconnecting) { + Slog.v(TAG_ATM, "Remove pending disconnecting " + c + " of " + mActivity); + } mConnections.remove(c); } } @@ -88,26 +107,33 @@ public class ActivityServiceConnectionsHolder<T> { if (mConnections == null || mConnections.isEmpty()) { return; } - final Iterator<T> it = mConnections.iterator(); - while (it.hasNext()) { - T c = it.next(); - consumer.accept(c); + for (int i = mConnections.size() - 1; i >= 0; i--) { + consumer.accept(mConnections.valueAt(i)); } } } - /** Removes the connection between the activity and all services that were connected to it. */ + /** + * Removes the connection between the activity and all services that were connected to it. In + * general, this method is used to clean up if the activity didn't unbind services before it + * is destroyed. + */ void disconnectActivityFromServices() { - if (mConnections == null || mConnections.isEmpty()) { + if (mConnections == null || mConnections.isEmpty() || mIsDisconnecting) { return; } - // Capture and null out mConnections, to guarantee that we process + // Mark as disconnecting, to guarantee that we process // disconnect of these specific connections exactly once even if // we're racing with rapid activity lifecycle churn and this // method is invoked more than once on this object. - final Object disc = mConnections; - mConnections = null; - mService.mH.post(() -> mService.mAmInternal.disconnectActivityFromServices(this, disc)); + // It is possible that {@link #removeConnection} is called while the disconnect-runnable is + // still in the message queue, so keep the reference of {@link #mConnections} to make sure + // the connection list is up-to-date. + mIsDisconnecting = true; + mService.mH.post(() -> { + mService.mAmInternal.disconnectActivityFromServices(this); + mIsDisconnecting = false; + }); } public void dump(PrintWriter pw, String prefix) { @@ -116,4 +142,9 @@ public class ActivityServiceConnectionsHolder<T> { } } + /** Used by {@link ActivityRecord#dump}. */ + @Override + public String toString() { + return String.valueOf(mConnections); + } } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 16ac9fb41f30..810aa3438ea0 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -194,6 +194,7 @@ import android.provider.Settings; import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.IntArray; +import android.util.RotationUtils; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; @@ -1603,17 +1604,18 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo if (cutout == null || cutout == DisplayCutout.NO_CUTOUT) { return WmDisplayCutout.NO_CUTOUT; } + final Insets waterfallInsets = + RotationUtils.rotateInsets(cutout.getWaterfallInsets(), rotation); if (rotation == ROTATION_0) { return WmDisplayCutout.computeSafeInsets( cutout, mInitialDisplayWidth, mInitialDisplayHeight); } final boolean rotated = (rotation == ROTATION_90 || rotation == ROTATION_270); final Rect[] newBounds = mRotationUtil.getRotatedBounds( - WmDisplayCutout.computeSafeInsets( - cutout, mInitialDisplayWidth, mInitialDisplayHeight) - .getDisplayCutout().getBoundingRectsAll(), + cutout.getBoundingRectsAll(), rotation, mInitialDisplayWidth, mInitialDisplayHeight); - return WmDisplayCutout.computeSafeInsets(DisplayCutout.fromBounds(newBounds), + return WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall(newBounds, waterfallInsets), rotated ? mInitialDisplayHeight : mInitialDisplayWidth, rotated ? mInitialDisplayWidth : mInitialDisplayHeight); } diff --git a/services/core/java/com/android/server/wm/EmbeddedWindowController.java b/services/core/java/com/android/server/wm/EmbeddedWindowController.java index 0291017cd039..884f7694d648 100644 --- a/services/core/java/com/android/server/wm/EmbeddedWindowController.java +++ b/services/core/java/com/android/server/wm/EmbeddedWindowController.java @@ -20,8 +20,10 @@ package com.android.server.wm; import android.annotation.Nullable; import android.os.IBinder; import android.os.RemoteException; +import android.os.UserHandle; import android.util.ArrayMap; import android.view.IWindow; +import android.view.InputApplicationHandle; /** * Keeps track of embedded windows. @@ -44,21 +46,12 @@ class EmbeddedWindowController { * * @param inputToken input channel token passed in by the embedding process when it requests * the server to add an input channel to the embedded surface. - * @param window client token used to clean up the map if the embedding process dies - * @param hostWindowState input channel token belonging to the host window. This is needed to - * handle input callbacks to wm. It's used when raising ANR and when - * the user taps out side of the focused region on screen. This can be - * null if there is no host window. - * @param ownerUid calling uid - * @param ownerPid calling pid used for anr blaming + * @param embeddedWindow An {@link EmbeddedWindow} object to add to this controller. */ - void add(IBinder inputToken, IWindow window, @Nullable WindowState hostWindowState, - int ownerUid, int ownerPid) { - EmbeddedWindow embeddedWindow = new EmbeddedWindow(window, hostWindowState, ownerUid, - ownerPid); + void add(IBinder inputToken, EmbeddedWindow embeddedWindow) { try { mWindows.put(inputToken, embeddedWindow); - window.asBinder().linkToDeath(()-> { + embeddedWindow.mClient.asBinder().linkToDeath(()-> { synchronized (mWmLock) { mWindows.remove(inputToken); } @@ -101,6 +94,15 @@ class EmbeddedWindowController { final int mOwnerUid; final int mOwnerPid; + /** + * @param clientToken client token used to clean up the map if the embedding process dies + * @param hostWindowState input channel token belonging to the host window. This is needed + * to handle input callbacks to wm. It's used when raising ANR and + * when the user taps out side of the focused region on screen. This + * can be null if there is no host window. + * @param ownerUid calling uid + * @param ownerPid calling pid used for anr blaming + */ EmbeddedWindow(IWindow clientToken, WindowState hostWindowState, int ownerUid, int ownerPid) { mClient = clientToken; @@ -108,5 +110,21 @@ class EmbeddedWindowController { mOwnerUid = ownerUid; mOwnerPid = ownerPid; } + + String getName() { + final String hostWindowName = (mHostWindowState != null) + ? mHostWindowState.getWindowTag().toString() : "Internal"; + return "EmbeddedWindow{ u" + UserHandle.getUserId(mOwnerUid) + " " + hostWindowName + + "}"; + } + + InputApplicationHandle getApplicationHandle() { + if (mHostWindowState == null + || mHostWindowState.mInputWindowHandle.inputApplicationHandle == null) { + return null; + } + return new InputApplicationHandle( + mHostWindowState.mInputWindowHandle.inputApplicationHandle); + } } } diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index ab1f34adbeeb..9df42486580b 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -622,7 +622,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { @Override public void grantInputChannel(int displayId, SurfaceControl surface, - IWindow window, IBinder hostInputToken, InputChannel outInputChannel) { + IWindow window, IBinder hostInputToken, int flags, InputChannel outInputChannel) { if (hostInputToken == null && !mCanAddInternalSystemWindow) { // Callers without INTERNAL_SYSTEM_WINDOW permission cannot grant input channel to // embedded windows without providing a host window input token @@ -631,8 +631,19 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { final long identity = Binder.clearCallingIdentity(); try { - mService.grantInputChannel(mUid, mPid, displayId, surface, window, - hostInputToken, outInputChannel); + mService.grantInputChannel(mUid, mPid, displayId, surface, window, hostInputToken, + flags, outInputChannel); + } finally { + Binder.restoreCallingIdentity(identity); + } + } + + @Override + public void updateInputChannel(IBinder channelToken, int displayId, SurfaceControl surface, + int flags) { + final long identity = Binder.clearCallingIdentity(); + try { + mService.updateInputChannel(channelToken, displayId, surface, flags); } finally { Binder.restoreCallingIdentity(identity); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 98c584fc743a..a5b99b0a26a3 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -7814,40 +7814,52 @@ public class WindowManagerService extends IWindowManager.Stub * views. */ void grantInputChannel(int callingUid, int callingPid, int displayId, SurfaceControl surface, - IWindow window, IBinder hostInputToken, InputChannel outInputChannel) { - InputApplicationHandle applicationHandle = null; + IWindow window, IBinder hostInputToken, int flags, InputChannel outInputChannel) { + final InputApplicationHandle applicationHandle; final String name; final InputChannel[] inputChannels; final InputChannel clientChannel; final InputChannel serverChannel; synchronized (mGlobalLock) { - final WindowState hostWindow = mInputToWindowMap.get(hostInputToken); - final String hostWindowName = (hostWindow != null) - ? hostWindow.getWindowTag().toString() : "Internal"; - name = "EmbeddedWindow{ u" + UserHandle.getUserId(callingUid) - + " " + hostWindowName + "}"; + EmbeddedWindowController.EmbeddedWindow win = + new EmbeddedWindowController.EmbeddedWindow(window, + mInputToWindowMap.get(hostInputToken), callingUid, callingPid); + name = win.getName(); inputChannels = InputChannel.openInputChannelPair(name); serverChannel = inputChannels[0]; clientChannel = inputChannels[1]; mInputManager.registerInputChannel(serverChannel); - mEmbeddedWindowController.add(serverChannel.getToken(), window, hostWindow, callingUid, - callingPid); - - if (hostWindow != null - && hostWindow.mInputWindowHandle.inputApplicationHandle != null) { - applicationHandle = new InputApplicationHandle( - hostWindow.mInputWindowHandle.inputApplicationHandle); + mEmbeddedWindowController.add(clientChannel.getToken(), win); + if (serverChannel.getToken() != clientChannel.getToken()) { + throw new IllegalStateException("Client and Server channel are expected to" + + "be the same"); } + + applicationHandle = win.getApplicationHandle(); } + updateInputChannel(clientChannel.getToken(), callingUid, callingPid, displayId, surface, + name, applicationHandle, flags); + clientChannel.transferTo(outInputChannel); clientChannel.dispose(); + // Prevent the java finalizer from breaking the input channel. But we won't + // do any further management so we just release the java ref and let the + // InputDispatcher hold the last ref. + serverChannel.release(); + } + private void updateInputChannel(IBinder channelToken, int callingUid, int callingPid, + int displayId, SurfaceControl surface, String name, + InputApplicationHandle applicationHandle, int flags) { InputWindowHandle h = new InputWindowHandle(applicationHandle, displayId); - h.token = serverChannel.getToken(); + h.token = channelToken; h.name = name; - h.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL; + + final int sanitizedFlags = flags & (LayoutParams.FLAG_NOT_TOUCHABLE + | LayoutParams.FLAG_SLIPPERY); + h.layoutParamsFlags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | sanitizedFlags; h.layoutParamsType = 0; h.dispatchingTimeoutNanos = -1; h.canReceiveKeys = false; @@ -7862,15 +7874,34 @@ public class WindowManagerService extends IWindowManager.Stub h.replaceTouchableRegionWithCrop(null); - SurfaceSession s = new SurfaceSession(); SurfaceControl.Transaction t = mTransactionFactory.get(); t.setInputWindowInfo(surface, h); t.apply(); + t.close(); + } - // Prevent the java finalizer from breaking the input channel. But we won't - // do any further management so we just release the java ref and let the - // InputDispatcher hold the last ref. - serverChannel.release(); + /** + * Updates the flags on an existing surface's input channel. This assumes the surface provided + * is the one associated with the provided input-channel. If this isn't the case, behavior + * is undefined. + */ + void updateInputChannel(IBinder channelToken, int displayId, SurfaceControl surface, + int flags) { + final InputApplicationHandle applicationHandle; + final String name; + final EmbeddedWindowController.EmbeddedWindow win; + synchronized (mGlobalLock) { + win = mEmbeddedWindowController.get(channelToken); + if (win == null) { + Slog.e(TAG, "Couldn't find window for provided channelToken."); + return; + } + name = win.getName(); + applicationHandle = win.getApplicationHandle(); + } + + updateInputChannel(channelToken, win.mOwnerUid, win.mOwnerPid, displayId, surface, name, + applicationHandle, flags); } /** Return whether layer tracing is enabled */ diff --git a/services/core/java/com/android/server/wm/utils/WmDisplayCutout.java b/services/core/java/com/android/server/wm/utils/WmDisplayCutout.java index 3be5d3176df5..46fff032e053 100644 --- a/services/core/java/com/android/server/wm/utils/WmDisplayCutout.java +++ b/services/core/java/com/android/server/wm/utils/WmDisplayCutout.java @@ -21,7 +21,6 @@ import android.util.Size; import android.view.DisplayCutout; import android.view.Gravity; -import java.util.List; import java.util.Objects; /** @@ -41,12 +40,17 @@ public class WmDisplayCutout { mFrameSize = frameSize; } - public static WmDisplayCutout computeSafeInsets(DisplayCutout inner, - int displayWidth, int displayHeight) { - if (inner == DisplayCutout.NO_CUTOUT || inner.isBoundsEmpty()) { + /** + * Compute the safe insets according to the given DisplayCutout and the display size. + * + * @return return a WmDisplayCutout with calculated safe insets. + * @hide + */ + public static WmDisplayCutout computeSafeInsets( + DisplayCutout inner, int displayWidth, int displayHeight) { + if (inner == DisplayCutout.NO_CUTOUT) { return NO_CUTOUT; } - final Size displaySize = new Size(displayWidth, displayHeight); final Rect safeInsets = computeSafeInsets(displaySize, inner); return new WmDisplayCutout(inner.replaceSafeInsets(safeInsets), displaySize); @@ -112,57 +116,42 @@ public class WmDisplayCutout { } private static Rect computeSafeInsets(Size displaySize, DisplayCutout cutout) { - if (displaySize.getWidth() < displaySize.getHeight()) { - final List<Rect> boundingRects = cutout.replaceSafeInsets( - new Rect(0, displaySize.getHeight() / 2, 0, displaySize.getHeight() / 2)) - .getBoundingRects(); - int topInset = findInsetForSide(displaySize, boundingRects, Gravity.TOP); - int bottomInset = findInsetForSide(displaySize, boundingRects, Gravity.BOTTOM); - return new Rect(0, topInset, 0, bottomInset); - } else if (displaySize.getWidth() > displaySize.getHeight()) { - final List<Rect> boundingRects = cutout.replaceSafeInsets( - new Rect(displaySize.getWidth() / 2, 0, displaySize.getWidth() / 2, 0)) - .getBoundingRects(); - int leftInset = findInsetForSide(displaySize, boundingRects, Gravity.LEFT); - int right = findInsetForSide(displaySize, boundingRects, Gravity.RIGHT); - return new Rect(leftInset, 0, right, 0); - } else { + if (displaySize.getWidth() == displaySize.getHeight()) { throw new UnsupportedOperationException("not implemented: display=" + displaySize + " cutout=" + cutout); } + + int leftInset = Math.max(cutout.getWaterfallInsets().left, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectLeft(), Gravity.LEFT)); + int topInset = Math.max(cutout.getWaterfallInsets().top, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectTop(), Gravity.TOP)); + int rightInset = Math.max(cutout.getWaterfallInsets().right, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectRight(), Gravity.RIGHT)); + int bottomInset = Math.max(cutout.getWaterfallInsets().bottom, + findCutoutInsetForSide(displaySize, cutout.getBoundingRectBottom(), + Gravity.BOTTOM)); + + return new Rect(leftInset, topInset, rightInset, bottomInset); } - private static int findInsetForSide(Size display, List<Rect> boundingRects, int gravity) { + private static int findCutoutInsetForSide(Size display, Rect boundingRect, int gravity) { + if (boundingRect.isEmpty()) { + return 0; + } + int inset = 0; - final int size = boundingRects.size(); - for (int i = 0; i < size; i++) { - Rect boundingRect = boundingRects.get(i); - switch (gravity) { - case Gravity.TOP: - if (boundingRect.top == 0) { - inset = Math.max(inset, boundingRect.bottom); - } - break; - case Gravity.BOTTOM: - if (boundingRect.bottom == display.getHeight()) { - inset = Math.max(inset, display.getHeight() - boundingRect.top); - } - break; - case Gravity.LEFT: - if (boundingRect.left == 0) { - inset = Math.max(inset, boundingRect.right); - } - break; - case Gravity.RIGHT: - if (boundingRect.right == display.getWidth()) { - inset = Math.max(inset, display.getWidth() - boundingRect.left); - } - break; - default: - throw new IllegalArgumentException("unknown gravity: " + gravity); - } + switch (gravity) { + case Gravity.TOP: + return Math.max(inset, boundingRect.bottom); + case Gravity.BOTTOM: + return Math.max(inset, display.getHeight() - boundingRect.top); + case Gravity.LEFT: + return Math.max(inset, boundingRect.right); + case Gravity.RIGHT: + return Math.max(inset, display.getWidth() - boundingRect.left); + default: + throw new IllegalArgumentException("unknown gravity: " + gravity); } - return inset; } public DisplayCutout getDisplayCutout() { diff --git a/services/core/jni/com_android_server_incremental_IncrementalManagerService.cpp b/services/core/jni/com_android_server_incremental_IncrementalManagerService.cpp index 5e255f46fa05..10bac94f77e2 100644 --- a/services/core/jni/com_android_server_incremental_IncrementalManagerService.cpp +++ b/services/core/jni/com_android_server_incremental_IncrementalManagerService.cpp @@ -33,9 +33,14 @@ static void nativeSystemReady(JNIEnv* env, jclass klass, jlong self) { Incremental_IncrementalService_OnSystemReady(self); } +static void nativeDump(JNIEnv* env, jclass klass, jlong self, jint fd) { + Incremental_IncrementalService_OnDump(self, fd); +} + static const JNINativeMethod method_table[] = { {"nativeStartService", "()J", (void*)nativeStartService}, {"nativeSystemReady", "(J)V", (void*)nativeSystemReady}, + {"nativeDump", "(JI)V", (void*)nativeDump}, }; int register_android_server_incremental_IncrementalManagerService(JNIEnv* env) { diff --git a/services/incremental/BinderIncrementalService.cpp b/services/incremental/BinderIncrementalService.cpp index 91d05723a605..0941831f5299 100644 --- a/services/incremental/BinderIncrementalService.cpp +++ b/services/incremental/BinderIncrementalService.cpp @@ -17,12 +17,14 @@ #include "BinderIncrementalService.h" #include <binder/IResultReceiver.h> +#include <binder/PermissionCache.h> #include <incfs.h> #include "ServiceWrappers.h" #include "jni.h" #include "nativehelper/JNIHelp.h" #include "path.h" +#include <android-base/logging.h> using namespace std::literals; using namespace android::incremental; @@ -90,8 +92,13 @@ BinderIncrementalService* BinderIncrementalService::start() { return self.get(); } -status_t BinderIncrementalService::dump(int fd, const Vector<String16>& args) { - return OK; +status_t BinderIncrementalService::dump(int fd, const Vector<String16>&) { + static const String16 kDump("android.permission.DUMP"); + if (!PermissionCache::checkCallingPermission(kDump)) { + return PERMISSION_DENIED; + } + mImpl.onDump(fd); + return NO_ERROR; } void BinderIncrementalService::onSystemReady() { @@ -280,3 +287,10 @@ void Incremental_IncrementalService_OnSystemReady(jlong self) { ((android::os::incremental::BinderIncrementalService*)self)->onSystemReady(); } } +void Incremental_IncrementalService_OnDump(jlong self, jint fd) { + if (self) { + ((android::os::incremental::BinderIncrementalService*)self)->dump(fd, {}); + } else { + dprintf(fd, "BinderIncrementalService is stopped."); + } +} diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index e4a37dde7758..dbd97cfa039a 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -35,6 +35,7 @@ #include <uuid/uuid.h> #include <zlib.h> +#include <ctime> #include <iterator> #include <span> #include <stack> @@ -169,7 +170,7 @@ auto IncrementalService::IncFsMount::makeStorage(StorageId id) -> StorageMap::it base::StringAppendF(&name, "%.*s_%d_%d", int(constants().storagePrefix.size()), constants().storagePrefix.data(), id, no); auto fullName = path::join(root, constants().mount, name); - if (auto err = incrementalService.mIncFs->makeDir(control, fullName); !err) { + if (auto err = incrementalService.mIncFs->makeDir(control, fullName, 0755); !err) { std::lock_guard l(lock); return storages.insert_or_assign(id, Storage{std::move(fullName)}).first; } else if (err != EEXIST) { @@ -256,6 +257,68 @@ FileId IncrementalService::idFromMetadata(std::span<const uint8_t> metadata) { IncrementalService::~IncrementalService() = default; +inline const char* toString(TimePoint t) { + using SystemClock = std::chrono::system_clock; + time_t time = SystemClock::to_time_t(SystemClock::now() + std::chrono::duration_cast<SystemClock::duration>(t - Clock::now())); + return std::ctime(&time); +} + +inline const char* toString(IncrementalService::BindKind kind) { + switch (kind) { + case IncrementalService::BindKind::Temporary: + return "Temporary"; + case IncrementalService::BindKind::Permanent: + return "Permanent"; + } +} + +void IncrementalService::onDump(int fd) { + dprintf(fd, "Incremental is %s\n", incfs::enabled() ? "ENABLED" : "DISABLED"); + dprintf(fd, "Incremental dir: %s\n", mIncrementalDir.c_str()); + + std::unique_lock l(mLock); + + dprintf(fd, "Mounts (%d):\n", int(mMounts.size())); + for (auto&& [id, ifs] : mMounts) { + const IncFsMount& mnt = *ifs.get(); + dprintf(fd, "\t[%d]:\n", id); + dprintf(fd, "\t\tmountId: %d\n", mnt.mountId); + dprintf(fd, "\t\tnextStorageDirNo: %d\n", mnt.nextStorageDirNo.load()); + dprintf(fd, "\t\tdataLoaderStatus: %d\n", mnt.dataLoaderStatus.load()); + dprintf(fd, "\t\tconnectionLostTime: %s\n", toString(mnt.connectionLostTime)); + if (mnt.savedDataLoaderParams) { + const auto& params = mnt.savedDataLoaderParams.value(); + dprintf(fd, "\t\tsavedDataLoaderParams:\n"); + dprintf(fd, "\t\t\ttype: %s\n", toString(params.type).c_str()); + dprintf(fd, "\t\t\tpackageName: %s\n", params.packageName.c_str()); + dprintf(fd, "\t\t\tclassName: %s\n", params.className.c_str()); + dprintf(fd, "\t\t\targuments: %s\n", params.arguments.c_str()); + dprintf(fd, "\t\t\tdynamicArgs: %d\n", int(params.dynamicArgs.size())); + } + dprintf(fd, "\t\tstorages (%d):\n", int(mnt.storages.size())); + for (auto&& [storageId, storage] : mnt.storages) { + dprintf(fd, "\t\t\t[%d] -> [%s]\n", storageId, storage.name.c_str()); + } + + dprintf(fd, "\t\tbindPoints (%d):\n", int(mnt.bindPoints.size())); + for (auto&& [target, bind] : mnt.bindPoints) { + dprintf(fd, "\t\t\t[%s]->[%d]:\n", target.c_str(), bind.storage); + dprintf(fd, "\t\t\t\tsavedFilename: %s\n", bind.savedFilename.c_str()); + dprintf(fd, "\t\t\t\tsourceDir: %s\n", bind.sourceDir.c_str()); + dprintf(fd, "\t\t\t\tkind: %s\n", toString(bind.kind)); + } + } + + dprintf(fd, "Sorted binds (%d):\n", int(mBindsByPath.size())); + for (auto&& [target, mountPairIt] : mBindsByPath) { + const auto& bind = mountPairIt->second; + dprintf(fd, "\t\t[%s]->[%d]:\n", target.c_str(), bind.storage); + dprintf(fd, "\t\t\tsavedFilename: %s\n", bind.savedFilename.c_str()); + dprintf(fd, "\t\t\tsourceDir: %s\n", bind.sourceDir.c_str()); + dprintf(fd, "\t\t\tkind: %s\n", toString(bind.kind)); + } +} + std::optional<std::future<void>> IncrementalService::onSystemReady() { std::promise<void> threadFinished; if (mSystemReady.exchange(true)) { @@ -617,15 +680,7 @@ int IncrementalService::bind(StorageId storage, std::string_view source, std::st if (storageInfo == ifs->storages.end()) { return -EINVAL; } - std::string normSource; - if (path::isAbsolute(source)) { - normSource = path::normalize(source); - } else { - normSource = path::normalize(path::join(storageInfo->second.name, source)); - } - if (!path::startsWith(normSource, storageInfo->second.name)) { - return -EINVAL; - } + std::string normSource = normalizePathToStorage(ifs, storage, source); l.unlock(); std::unique_lock l2(mLock, std::defer_lock); return addBindMount(*ifs, storage, storageInfo->second.name, std::move(normSource), @@ -674,20 +729,29 @@ int IncrementalService::unbind(StorageId storage, std::string_view target) { return 0; } +std::string IncrementalService::normalizePathToStorage(const IncrementalService::IfsMountPtr ifs, + StorageId storage, std::string_view path) { + const auto storageInfo = ifs->storages.find(storage); + if (storageInfo == ifs->storages.end()) { + return {}; + } + std::string normPath; + if (path::isAbsolute(path)) { + normPath = path::normalize(path); + } else { + normPath = path::normalize(path::join(storageInfo->second.name, path)); + } + if (!path::startsWith(normPath, storageInfo->second.name)) { + return {}; + } + return normPath; +} + int IncrementalService::makeFile(StorageId storage, std::string_view path, int mode, FileId id, incfs::NewFileParams params) { if (auto ifs = getIfs(storage)) { - const auto storageInfo = ifs->storages.find(storage); - if (storageInfo == ifs->storages.end()) { - return -EINVAL; - } - std::string normPath; - if (path::isAbsolute(path)) { - normPath = path::normalize(path); - } else { - normPath = path::normalize(path::join(storageInfo->second.name, path)); - } - if (!path::startsWith(normPath, storageInfo->second.name)) { + std::string normPath = normalizePathToStorage(ifs, storage, path); + if (normPath.empty()) { return -EINVAL; } auto err = mIncFs->makeFile(ifs->control, normPath, mode, id, params); @@ -706,7 +770,11 @@ int IncrementalService::makeFile(StorageId storage, std::string_view path, int m int IncrementalService::makeDir(StorageId storageId, std::string_view path, int mode) { if (auto ifs = getIfs(storageId)) { - return mIncFs->makeDir(ifs->control, path, mode); + std::string normPath = normalizePathToStorage(ifs, storageId, path); + if (normPath.empty()) { + return -EINVAL; + } + return mIncFs->makeDir(ifs->control, normPath, mode); } return -EINVAL; } @@ -716,31 +784,40 @@ int IncrementalService::makeDirs(StorageId storageId, std::string_view path, int if (!ifs) { return -EINVAL; } - - auto err = mIncFs->makeDir(ifs->control, path, mode); + std::string normPath = normalizePathToStorage(ifs, storageId, path); + if (normPath.empty()) { + return -EINVAL; + } + auto err = mIncFs->makeDir(ifs->control, normPath, mode); if (err == -EEXIST) { return 0; } else if (err != -ENOENT) { return err; } - if (auto err = makeDirs(storageId, path::dirname(path), mode)) { + if (auto err = makeDirs(storageId, path::dirname(normPath), mode)) { return err; } - return mIncFs->makeDir(ifs->control, path, mode); + return mIncFs->makeDir(ifs->control, normPath, mode); } int IncrementalService::link(StorageId sourceStorageId, std::string_view oldPath, StorageId destStorageId, std::string_view newPath) { if (auto ifsSrc = getIfs(sourceStorageId), ifsDest = getIfs(destStorageId); ifsSrc && ifsSrc == ifsDest) { - return mIncFs->link(ifsSrc->control, oldPath, newPath); + std::string normOldPath = normalizePathToStorage(ifsSrc, sourceStorageId, oldPath); + std::string normNewPath = normalizePathToStorage(ifsDest, destStorageId, newPath); + if (normOldPath.empty() || normNewPath.empty()) { + return -EINVAL; + } + return mIncFs->link(ifsSrc->control, normOldPath, normNewPath); } return -EINVAL; } int IncrementalService::unlink(StorageId storage, std::string_view path) { if (auto ifs = getIfs(storage)) { - return mIncFs->unlink(ifs->control, path); + std::string normOldPath = normalizePathToStorage(ifs, storage, path); + return mIncFs->unlink(ifs->control, normOldPath); } return -EINVAL; } diff --git a/services/incremental/IncrementalService.h b/services/incremental/IncrementalService.h index ca5e4dbd9231..dec9f64f2084 100644 --- a/services/incremental/IncrementalService.h +++ b/services/incremental/IncrementalService.h @@ -18,8 +18,8 @@ #include <android-base/strings.h> #include <android-base/unique_fd.h> -#include <android/os/incremental/IIncrementalManager.h> #include <android/content/pm/DataLoaderParamsParcel.h> +#include <android/os/incremental/IIncrementalManager.h> #include <binder/IServiceManager.h> #include <utils/String16.h> #include <utils/StrongPointer.h> @@ -90,10 +90,11 @@ public: return idFromMetadata({(const uint8_t*)metadata.data(), metadata.size()}); } + void onDump(int fd); + std::optional<std::future<void>> onSystemReady(); - StorageId createStorage(std::string_view mountPoint, - DataLoaderParamsParcel&& dataLoaderParams, + StorageId createStorage(std::string_view mountPoint, DataLoaderParamsParcel&& dataLoaderParams, CreateOptions options = CreateOptions::Default); StorageId createLinkedStorage(std::string_view mountPoint, StorageId linkedStorage, CreateOptions options = CreateOptions::Default); @@ -109,8 +110,8 @@ public: int makeFile(StorageId storage, std::string_view path, int mode, FileId id, incfs::NewFileParams params); - int makeDir(StorageId storage, std::string_view path, int mode = 0555); - int makeDirs(StorageId storage, std::string_view path, int mode = 0555); + int makeDir(StorageId storage, std::string_view path, int mode = 0755); + int makeDirs(StorageId storage, std::string_view path, int mode = 0755); int link(StorageId sourceStorageId, std::string_view oldPath, StorageId destStorageId, std::string_view newPath); @@ -207,6 +208,8 @@ private: void deleteStorage(IncFsMount& ifs); void deleteStorageLocked(IncFsMount& ifs, std::unique_lock<std::mutex>&& ifsLock); MountMap::iterator getStorageSlotLocked(); + std::string normalizePathToStorage(const IfsMountPtr incfs, StorageId storage, + std::string_view path); // Member variables std::unique_ptr<VoldServiceWrapper> mVold; diff --git a/services/incremental/ServiceWrappers.h b/services/incremental/ServiceWrappers.h index ae3739dba2f0..f0b56729e8d7 100644 --- a/services/incremental/ServiceWrappers.h +++ b/services/incremental/ServiceWrappers.h @@ -70,7 +70,7 @@ public: virtual ~IncFsWrapper() = default; virtual ErrorCode makeFile(Control control, std::string_view path, int mode, FileId id, NewFileParams params) const = 0; - virtual ErrorCode makeDir(Control control, std::string_view path, int mode = 0555) const = 0; + virtual ErrorCode makeDir(Control control, std::string_view path, int mode) const = 0; virtual RawMetadata getMetadata(Control control, FileId fileid) const = 0; virtual RawMetadata getMetadata(Control control, std::string_view path) const = 0; virtual FileId getFileId(Control control, std::string_view path) const = 0; diff --git a/services/incremental/include/incremental_service.h b/services/incremental/include/incremental_service.h index 7109d953ba4d..4a34b11261b9 100644 --- a/services/incremental/include/incremental_service.h +++ b/services/incremental/include/incremental_service.h @@ -26,6 +26,7 @@ __BEGIN_DECLS jlong Incremental_IncrementalService_Start(); void Incremental_IncrementalService_OnSystemReady(jlong self); +void Incremental_IncrementalService_OnDump(jlong self, jint fd); __END_DECLS diff --git a/services/incremental/test/IncrementalServiceTest.cpp b/services/incremental/test/IncrementalServiceTest.cpp index 28268181f173..9cdc83e75055 100644 --- a/services/incremental/test/IncrementalServiceTest.cpp +++ b/services/incremental/test/IncrementalServiceTest.cpp @@ -406,29 +406,16 @@ TEST_F(IncrementalServiceTest, testMakeDirectory) { int storageId = mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel), IncrementalService::CreateOptions::CreateNew); - std::string_view dir_path("test"); - EXPECT_CALL(*mIncFs, makeDir(_, dir_path, _)); - auto res = mIncrementalService->makeDir(storageId, dir_path, 0555); - ASSERT_EQ(res, 0); -} + std::string dir_path("test"); -TEST_F(IncrementalServiceTest, testMakeDirectoryNested) { - mVold->mountIncFsSuccess(); - mIncFs->makeFileSuccess(); - mVold->bindMountSuccess(); - mIncrementalManager->prepareDataLoaderSuccess(); - mIncrementalManager->startDataLoaderSuccess(); - TemporaryDir tempDir; - int storageId = - mIncrementalService->createStorage(tempDir.path, std::move(mDataLoaderParcel), - IncrementalService::CreateOptions::CreateNew); - auto first = "first"sv; - auto second = "second"sv; - std::string dir_path = std::string(first) + "/" + std::string(second); - EXPECT_CALL(*mIncFs, makeDir(_, first, _)).Times(0); - EXPECT_CALL(*mIncFs, makeDir(_, second, _)).Times(0); - EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(dir_path), _)).Times(1); + std::string tempPath(tempDir.path); + std::replace(tempPath.begin(), tempPath.end(), '/', '_'); + std::string mount_dir = std::string(mRootDir.path) + "/" + tempPath.substr(1); + std::string normalized_dir_path = mount_dir + "/mount/st_1_0/" + dir_path; + // Expecting incfs to call makeDir on a path like: + // /data/local/tmp/TemporaryDir-06yixG/data_local_tmp_TemporaryDir-xwdFhT/mount/st_1_0/test + EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(normalized_dir_path), _)); auto res = mIncrementalService->makeDir(storageId, dir_path, 0555); ASSERT_EQ(res, 0); } @@ -446,15 +433,29 @@ TEST_F(IncrementalServiceTest, testMakeDirectories) { auto first = "first"sv; auto second = "second"sv; auto third = "third"sv; + + std::string tempPath(tempDir.path); + std::replace(tempPath.begin(), tempPath.end(), '/', '_'); + std::string mount_dir = std::string(mRootDir.path) + "/" + tempPath.substr(1); + InSequence seq; auto parent_path = std::string(first) + "/" + std::string(second); auto dir_path = parent_path + "/" + std::string(third); - EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(dir_path), _)).WillOnce(Return(-ENOENT)); - EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(parent_path), _)).WillOnce(Return(-ENOENT)); - EXPECT_CALL(*mIncFs, makeDir(_, first, _)).WillOnce(Return(0)); - EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(parent_path), _)).WillOnce(Return(0)); - EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(dir_path), _)).WillOnce(Return(0)); - auto res = mIncrementalService->makeDirs(storageId, dir_path, 0555); + + std::string normalized_first_path = mount_dir + "/mount/st_1_0/" + std::string(first); + std::string normalized_parent_path = mount_dir + "/mount/st_1_0/" + parent_path; + std::string normalized_dir_path = mount_dir + "/mount/st_1_0/" + dir_path; + + EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(normalized_dir_path), _)) + .WillOnce(Return(-ENOENT)); + EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(normalized_parent_path), _)) + .WillOnce(Return(-ENOENT)); + EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(normalized_first_path), _)) + .WillOnce(Return(0)); + EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(normalized_parent_path), _)) + .WillOnce(Return(0)); + EXPECT_CALL(*mIncFs, makeDir(_, std::string_view(normalized_dir_path), _)).WillOnce(Return(0)); + auto res = mIncrementalService->makeDirs(storageId, normalized_dir_path, 0555); ASSERT_EQ(res, 0); } } // namespace android::os::incremental diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6ba4330f3916..036335ca9011 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -71,7 +71,6 @@ import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Slog; -import android.util.StatsLog; import android.view.contentcapture.ContentCaptureManager; import com.android.internal.R; @@ -79,6 +78,7 @@ import com.android.internal.notification.SystemNotificationChannels; import com.android.internal.os.BinderInternal; import com.android.internal.util.ConcurrentUtils; import com.android.internal.util.EmergencyAffordanceManager; +import com.android.internal.util.FrameworkStatsLog; import com.android.internal.widget.ILockSettings; import com.android.server.am.ActivityManagerService; import com.android.server.appbinding.AppBindingService; @@ -453,8 +453,9 @@ public final class SystemServer { final long uptimeMillis = SystemClock.elapsedRealtime(); EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_SYSTEM_RUN, uptimeMillis); if (!mRuntimeRestart) { - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, - StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__SYSTEM_SERVER_INIT_START, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, + FrameworkStatsLog + .BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__SYSTEM_SERVER_INIT_START, uptimeMillis); } @@ -570,8 +571,8 @@ public final class SystemServer { if (!mRuntimeRestart && !isFirstBootOrUpgrade()) { final long uptimeMillis = SystemClock.elapsedRealtime(); - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, - StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__SYSTEM_SERVER_READY, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, + FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__SYSTEM_SERVER_READY, uptimeMillis); final long maxUptimeMillis = 60 * 1000; if (uptimeMillis > maxUptimeMillis) { @@ -807,8 +808,9 @@ public final class SystemServer { // Start the package manager. if (!mRuntimeRestart) { - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, - StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__PACKAGE_MANAGER_INIT_START, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, + FrameworkStatsLog + .BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__PACKAGE_MANAGER_INIT_START, SystemClock.elapsedRealtime()); } @@ -825,8 +827,9 @@ public final class SystemServer { mPackageManager = mSystemContext.getPackageManager(); t.traceEnd(); if (!mRuntimeRestart && !isFirstBootOrUpgrade()) { - StatsLog.write(StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, - StatsLog.BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__PACKAGE_MANAGER_INIT_READY, + FrameworkStatsLog.write(FrameworkStatsLog.BOOT_TIME_EVENT_ELAPSED_TIME_REPORTED, + FrameworkStatsLog + .BOOT_TIME_EVENT_ELAPSED_TIME__EVENT__PACKAGE_MANAGER_INIT_READY, SystemClock.elapsedRealtime()); } // Manages A/B OTA dexopting. This is a bootstrap service as we need it to rename diff --git a/services/people/java/com/android/server/people/SessionInfo.java b/services/people/java/com/android/server/people/SessionInfo.java index eb08e03c14de..eaa0781f12ef 100644 --- a/services/people/java/com/android/server/people/SessionInfo.java +++ b/services/people/java/com/android/server/people/SessionInfo.java @@ -25,7 +25,7 @@ import android.os.RemoteException; import android.util.Slog; import com.android.server.people.data.DataManager; -import com.android.server.people.prediction.ConversationPredictor; +import com.android.server.people.prediction.AppTargetPredictor; import java.util.List; @@ -34,12 +34,12 @@ class SessionInfo { private static final String TAG = "SessionInfo"; - private final ConversationPredictor mConversationPredictor; + private final AppTargetPredictor mAppTargetPredictor; private final RemoteCallbackList<IPredictionCallback> mCallbacks = new RemoteCallbackList<>(); SessionInfo(AppPredictionContext predictionContext, DataManager dataManager) { - mConversationPredictor = new ConversationPredictor(predictionContext, + mAppTargetPredictor = AppTargetPredictor.create(predictionContext, this::updatePredictions, dataManager); } @@ -51,8 +51,8 @@ class SessionInfo { mCallbacks.unregister(callback); } - ConversationPredictor getPredictor() { - return mConversationPredictor; + AppTargetPredictor getPredictor() { + return mAppTargetPredictor; } void onDestroy() { diff --git a/services/people/java/com/android/server/people/data/CallLogQueryHelper.java b/services/people/java/com/android/server/people/data/CallLogQueryHelper.java new file mode 100644 index 000000000000..d825b6b2bd8f --- /dev/null +++ b/services/people/java/com/android/server/people/data/CallLogQueryHelper.java @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + +import android.annotation.WorkerThread; +import android.content.Context; +import android.database.Cursor; +import android.provider.CallLog.Calls; +import android.text.TextUtils; +import android.util.Slog; +import android.util.SparseIntArray; + +import java.util.function.BiConsumer; + +/** A helper class that queries the call log database. */ +class CallLogQueryHelper { + + private static final String TAG = "CallLogQueryHelper"; + + private static final SparseIntArray CALL_TYPE_TO_EVENT_TYPE = new SparseIntArray(); + + static { + CALL_TYPE_TO_EVENT_TYPE.put(Calls.INCOMING_TYPE, Event.TYPE_CALL_INCOMING); + CALL_TYPE_TO_EVENT_TYPE.put(Calls.OUTGOING_TYPE, Event.TYPE_CALL_OUTGOING); + CALL_TYPE_TO_EVENT_TYPE.put(Calls.MISSED_TYPE, Event.TYPE_CALL_MISSED); + } + + private final Context mContext; + private final BiConsumer<String, Event> mEventConsumer; + private long mLastCallTimestamp; + + /** + * @param context Context for accessing the content resolver. + * @param eventConsumer Consumes the events created from the call log records. The first input + * param is the normalized phone number. + */ + CallLogQueryHelper(Context context, BiConsumer<String, Event> eventConsumer) { + mContext = context; + mEventConsumer = eventConsumer; + } + + /** + * Queries the call log database for the new data added since {@code sinceTime} and returns + * true if the query runs successfully and at least one call log entry is found. + */ + @WorkerThread + boolean querySince(long sinceTime) { + String[] projection = new String[] { + Calls.CACHED_NORMALIZED_NUMBER, Calls.DATE, Calls.DURATION, Calls.TYPE }; + String selection = Calls.DATE + " > ?"; + String[] selectionArgs = new String[] { Long.toString(sinceTime) }; + boolean hasResults = false; + try (Cursor cursor = mContext.getContentResolver().query( + Calls.CONTENT_URI, projection, selection, selectionArgs, + Calls.DEFAULT_SORT_ORDER)) { + if (cursor == null) { + Slog.w(TAG, "Cursor is null when querying call log."); + return false; + } + while (cursor.moveToNext()) { + // Phone number + int numberIndex = cursor.getColumnIndex(Calls.CACHED_NORMALIZED_NUMBER); + String phoneNumber = cursor.getString(numberIndex); + + // Date + int dateIndex = cursor.getColumnIndex(Calls.DATE); + long date = cursor.getLong(dateIndex); + + // Duration + int durationIndex = cursor.getColumnIndex(Calls.DURATION); + long durationSeconds = cursor.getLong(durationIndex); + + // Type + int typeIndex = cursor.getColumnIndex(Calls.TYPE); + int callType = cursor.getInt(typeIndex); + + mLastCallTimestamp = Math.max(mLastCallTimestamp, date); + if (addEvent(phoneNumber, date, durationSeconds, callType)) { + hasResults = true; + } + } + } + return hasResults; + } + + long getLastCallTimestamp() { + return mLastCallTimestamp; + } + + private boolean addEvent(String phoneNumber, long date, long durationSeconds, int callType) { + if (!validateEvent(phoneNumber, date, callType)) { + return false; + } + @Event.EventType int eventType = CALL_TYPE_TO_EVENT_TYPE.get(callType); + Event event = new Event.Builder(date, eventType) + .setCallDetails(new Event.CallDetails(durationSeconds)) + .build(); + mEventConsumer.accept(phoneNumber, event); + return true; + } + + private boolean validateEvent(String phoneNumber, long date, int callType) { + return !TextUtils.isEmpty(phoneNumber) + && date > 0L + && CALL_TYPE_TO_EVENT_TYPE.indexOfKey(callType) >= 0; + } +} diff --git a/services/people/java/com/android/server/people/data/DataManager.java b/services/people/java/com/android/server/people/data/DataManager.java index 4212072088e1..79503f797318 100644 --- a/services/people/java/com/android/server/people/data/DataManager.java +++ b/services/people/java/com/android/server/people/data/DataManager.java @@ -45,7 +45,9 @@ import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; +import android.provider.CallLog; import android.provider.ContactsContract.Contacts; +import android.provider.Telephony.MmsSms; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.telecom.TelecomManager; @@ -59,13 +61,13 @@ import com.android.internal.os.BackgroundThread; import com.android.internal.telephony.SmsApplication; import com.android.server.LocalServices; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; import java.util.function.Consumer; /** @@ -77,7 +79,7 @@ public class DataManager { private static final String PLATFORM_PACKAGE_NAME = "android"; private static final int MY_UID = Process.myUid(); private static final int MY_PID = Process.myPid(); - private static final long USAGE_STATS_QUERY_MAX_EVENT_AGE_MS = DateUtils.DAY_IN_MILLIS; + private static final long QUERY_EVENTS_MAX_AGE_MS = DateUtils.DAY_IN_MILLIS; private static final long USAGE_STATS_QUERY_INTERVAL_SEC = 120L; private final Context mContext; @@ -90,6 +92,8 @@ public class DataManager { private final SparseArray<ScheduledFuture<?>> mUsageStatsQueryFutures = new SparseArray<>(); private final SparseArray<NotificationListenerService> mNotificationListeners = new SparseArray<>(); + private final ContentObserver mCallLogContentObserver; + private final ContentObserver mMmsSmsContentObserver; private ShortcutServiceInternal mShortcutServiceInternal; private UsageStatsManagerInternal mUsageStatsManagerInternal; @@ -97,9 +101,7 @@ public class DataManager { private UserManager mUserManager; public DataManager(Context context) { - mContext = context; - mInjector = new Injector(); - mUsageStatsQueryExecutor = mInjector.createScheduledExecutor(); + this(context, new Injector()); } @VisibleForTesting @@ -107,6 +109,10 @@ public class DataManager { mContext = context; mInjector = injector; mUsageStatsQueryExecutor = mInjector.createScheduledExecutor(); + mCallLogContentObserver = new CallLogContentObserver( + BackgroundThread.getHandler()); + mMmsSmsContentObserver = new MmsSmsContentObserver( + BackgroundThread.getHandler()); } /** Initialization. Called when the system services are up running. */ @@ -159,6 +165,18 @@ public class DataManager { } catch (RemoteException e) { // Should never occur for local calls. } + + if (userId == UserHandle.USER_SYSTEM) { + // The call log and MMS/SMS messages are shared across user profiles. So only need to + // register the content observers once for the primary user. + // TODO: Register observers after the conversations and events being loaded from disk. + mContext.getContentResolver().registerContentObserver( + CallLog.CONTENT_URI, /* notifyForDescendants= */ true, + mCallLogContentObserver, UserHandle.USER_SYSTEM); + mContext.getContentResolver().registerContentObserver( + MmsSms.CONTENT_URI, /* notifyForDescendants= */ false, + mMmsSmsContentObserver, UserHandle.USER_SYSTEM); + } } /** This method is called when a user is stopped. */ @@ -183,6 +201,10 @@ public class DataManager { // Should never occur for local calls. } } + if (userId == UserHandle.USER_SYSTEM) { + mContext.getContentResolver().unregisterContentObserver(mCallLogContentObserver); + mContext.getContentResolver().unregisterContentObserver(mMmsSmsContentObserver); + } } /** @@ -199,6 +221,13 @@ public class DataManager { } } + /** Gets the {@link PackageData} for the given package and user. */ + @Nullable + public PackageData getPackage(@NonNull String packageName, @UserIdInt int userId) { + UserData userData = getUnlockedUserData(userId); + return userData != null ? userData.getPackageData(packageName) : null; + } + /** Gets the {@link ShortcutInfo} for the given shortcut ID. */ @Nullable public ShortcutInfo getShortcut(@NonNull String packageName, @UserIdInt int userId, @@ -212,20 +241,11 @@ public class DataManager { } /** - * Gets the conversation {@link ShareShortcutInfo}s from all packages owned by the calling user - * that match the specified {@link IntentFilter}. + * Gets the {@link ShareShortcutInfo}s from all packages owned by the calling user that match + * the specified {@link IntentFilter}. */ - public List<ShareShortcutInfo> getConversationShareTargets( - @NonNull IntentFilter intentFilter) { - List<ShareShortcutInfo> shareShortcuts = mShortcutManager.getShareTargets(intentFilter); - List<ShareShortcutInfo> result = new ArrayList<>(); - for (ShareShortcutInfo shareShortcut : shareShortcuts) { - ShortcutInfo si = shareShortcut.getShortcutInfo(); - if (getConversationInfo(si.getPackage(), si.getUserId(), si.getId()) != null) { - result.add(shareShortcut); - } - } - return result; + public List<ShareShortcutInfo> getShareShortcuts(@NonNull IntentFilter intentFilter) { + return mShortcutManager.getShareTargets(intentFilter); } /** Reports the {@link AppTargetEvent} from App Prediction Manager. */ @@ -236,7 +256,7 @@ public class DataManager { if (shortcutInfo == null || event.getAction() != AppTargetEvent.ACTION_LAUNCH) { return; } - PackageData packageData = getPackageData(appTarget.getPackageName(), + PackageData packageData = getPackage(appTarget.getPackageName(), appTarget.getUser().getIdentifier()); if (packageData == null) { return; @@ -277,26 +297,21 @@ public class DataManager { userId, MY_PID, MY_UID); } + private void forAllUnlockedUsers(Consumer<UserData> consumer) { + for (int i = 0; i < mUserDataArray.size(); i++) { + UserData userData = mUserDataArray.get(i); + if (userData.isUnlocked()) { + consumer.accept(userData); + } + } + } + @Nullable private UserData getUnlockedUserData(int userId) { UserData userData = mUserDataArray.get(userId); return userData != null && userData.isUnlocked() ? userData : null; } - @Nullable - private PackageData getPackageData(@NonNull String packageName, int userId) { - UserData userData = getUnlockedUserData(userId); - return userData != null ? userData.getPackageData(packageName) : null; - } - - @Nullable - private ConversationInfo getConversationInfo(@NonNull String packageName, @UserIdInt int userId, - @NonNull String shortcutId) { - PackageData packageData = getPackageData(packageName, userId); - return packageData != null ? packageData.getConversationStore().getConversation(shortcutId) - : null; - } - private void updateDefaultDialer(@NonNull UserData userData) { TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class); String defaultDialer = telecomManager != null @@ -318,7 +333,7 @@ public class DataManager { if (shortcutId == null) { return null; } - PackageData packageData = getPackageData(sbn.getPackageName(), + PackageData packageData = getPackage(sbn.getPackageName(), sbn.getUser().getIdentifier()); if (packageData == null || packageData.getConversationStore().getConversation(shortcutId) == null) { @@ -382,7 +397,7 @@ public class DataManager { usageEvents.getNextEvent(e); String packageName = e.getPackageName(); - PackageData packageData = getPackageData(packageName, userId); + PackageData packageData = getPackage(packageName, userId); if (packageData == null) { continue; } @@ -405,10 +420,25 @@ public class DataManager { } @VisibleForTesting + ContentObserver getCallLogContentObserverForTesting() { + return mCallLogContentObserver; + } + + @VisibleForTesting + ContentObserver getMmsSmsContentObserverForTesting() { + return mMmsSmsContentObserver; + } + + @VisibleForTesting NotificationListenerService getNotificationListenerServiceForTesting(@UserIdInt int userId) { return mNotificationListeners.get(userId); } + @VisibleForTesting + UserData getUserDataForTesting(@UserIdInt int userId) { + return mUserDataArray.get(userId); + } + /** Observer that observes the changes in the Contacts database. */ private class ContactsContentObserver extends ContentObserver { @@ -459,6 +489,88 @@ public class DataManager { } } + /** Observer that observes the changes in the call log database. */ + private class CallLogContentObserver extends ContentObserver implements + BiConsumer<String, Event> { + + private final CallLogQueryHelper mCallLogQueryHelper; + private long mLastCallTimestamp; + + private CallLogContentObserver(Handler handler) { + super(handler); + mCallLogQueryHelper = mInjector.createCallLogQueryHelper(mContext, this); + mLastCallTimestamp = System.currentTimeMillis() - QUERY_EVENTS_MAX_AGE_MS; + } + + @Override + public void onChange(boolean selfChange) { + if (mCallLogQueryHelper.querySince(mLastCallTimestamp)) { + mLastCallTimestamp = mCallLogQueryHelper.getLastCallTimestamp(); + } + } + + @Override + public void accept(String phoneNumber, Event event) { + forAllUnlockedUsers(userData -> { + PackageData defaultDialer = userData.getDefaultDialer(); + if (defaultDialer == null) { + return; + } + ConversationStore conversationStore = defaultDialer.getConversationStore(); + if (conversationStore.getConversationByPhoneNumber(phoneNumber) == null) { + return; + } + EventStore eventStore = defaultDialer.getEventStore(); + eventStore.getOrCreateCallEventHistory(phoneNumber).addEvent(event); + }); + } + } + + /** Observer that observes the changes in the MMS & SMS database. */ + private class MmsSmsContentObserver extends ContentObserver implements + BiConsumer<String, Event> { + + private final MmsQueryHelper mMmsQueryHelper; + private long mLastMmsTimestamp; + + private final SmsQueryHelper mSmsQueryHelper; + private long mLastSmsTimestamp; + + private MmsSmsContentObserver(Handler handler) { + super(handler); + mMmsQueryHelper = mInjector.createMmsQueryHelper(mContext, this); + mSmsQueryHelper = mInjector.createSmsQueryHelper(mContext, this); + mLastSmsTimestamp = mLastMmsTimestamp = + System.currentTimeMillis() - QUERY_EVENTS_MAX_AGE_MS; + } + + @Override + public void onChange(boolean selfChange) { + if (mMmsQueryHelper.querySince(mLastMmsTimestamp)) { + mLastMmsTimestamp = mMmsQueryHelper.getLastMessageTimestamp(); + } + if (mSmsQueryHelper.querySince(mLastSmsTimestamp)) { + mLastSmsTimestamp = mSmsQueryHelper.getLastMessageTimestamp(); + } + } + + @Override + public void accept(String phoneNumber, Event event) { + forAllUnlockedUsers(userData -> { + PackageData defaultSmsApp = userData.getDefaultSmsApp(); + if (defaultSmsApp == null) { + return; + } + ConversationStore conversationStore = defaultSmsApp.getConversationStore(); + if (conversationStore.getConversationByPhoneNumber(phoneNumber) == null) { + return; + } + EventStore eventStore = defaultSmsApp.getEventStore(); + eventStore.getOrCreateSmsEventHistory(phoneNumber).addEvent(event); + }); + } + } + /** Listener for the shortcut data changes. */ private class ShortcutServiceListener implements ShortcutServiceInternal.ShortcutChangeListener { @@ -504,7 +616,7 @@ public class DataManager { private UsageStatsQueryRunnable(int userId) { mUserId = userId; - mLastQueryTime = System.currentTimeMillis() - USAGE_STATS_QUERY_MAX_EVENT_AGE_MS; + mLastQueryTime = System.currentTimeMillis() - QUERY_EVENTS_MAX_AGE_MS; } @Override @@ -552,6 +664,21 @@ public class DataManager { return new ContactsQueryHelper(context); } + CallLogQueryHelper createCallLogQueryHelper(Context context, + BiConsumer<String, Event> eventConsumer) { + return new CallLogQueryHelper(context, eventConsumer); + } + + MmsQueryHelper createMmsQueryHelper(Context context, + BiConsumer<String, Event> eventConsumer) { + return new MmsQueryHelper(context, eventConsumer); + } + + SmsQueryHelper createSmsQueryHelper(Context context, + BiConsumer<String, Event> eventConsumer) { + return new SmsQueryHelper(context, eventConsumer); + } + int getCallingUserId() { return Binder.getCallingUserHandle().getIdentifier(); } diff --git a/services/people/java/com/android/server/people/data/MmsQueryHelper.java b/services/people/java/com/android/server/people/data/MmsQueryHelper.java new file mode 100644 index 000000000000..1e485c082d18 --- /dev/null +++ b/services/people/java/com/android/server/people/data/MmsQueryHelper.java @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + +import android.annotation.Nullable; +import android.annotation.WorkerThread; +import android.content.Context; +import android.database.Cursor; +import android.net.Uri; +import android.provider.Telephony.BaseMmsColumns; +import android.provider.Telephony.Mms; +import android.telephony.PhoneNumberUtils; +import android.text.TextUtils; +import android.util.Slog; +import android.util.SparseIntArray; + +import com.google.android.mms.pdu.PduHeaders; + +import java.util.function.BiConsumer; + +/** A helper class that queries the MMS database tables. */ +class MmsQueryHelper { + + private static final String TAG = "MmsQueryHelper"; + private static final long MILLIS_PER_SECONDS = 1000L; + private static final SparseIntArray MSG_BOX_TO_EVENT_TYPE = new SparseIntArray(); + + static { + MSG_BOX_TO_EVENT_TYPE.put(BaseMmsColumns.MESSAGE_BOX_INBOX, Event.TYPE_SMS_INCOMING); + MSG_BOX_TO_EVENT_TYPE.put(BaseMmsColumns.MESSAGE_BOX_SENT, Event.TYPE_SMS_OUTGOING); + } + + private final Context mContext; + private final BiConsumer<String, Event> mEventConsumer; + private long mLastMessageTimestamp; + private String mCurrentCountryIso; + + /** + * @param context Context for accessing the content resolver. + * @param eventConsumer Consumes the events created from the message records. The first input + * param is the normalized phone number. + */ + MmsQueryHelper(Context context, BiConsumer<String, Event> eventConsumer) { + mContext = context; + mEventConsumer = eventConsumer; + mCurrentCountryIso = Utils.getCurrentCountryIso(mContext); + } + + /** + * Queries the MMS database tables for the new data added since {@code sinceTime} (in millis) + * and returns true if the query runs successfully and at least one message entry is found. + */ + @WorkerThread + boolean querySince(long sinceTime) { + String[] projection = new String[] { Mms._ID, Mms.DATE, Mms.MESSAGE_BOX }; + String selection = Mms.DATE + " > ?"; + // NOTE: The field Mms.DATE is stored in seconds, not milliseconds. + String[] selectionArgs = new String[] { Long.toString(sinceTime / MILLIS_PER_SECONDS) }; + boolean hasResults = false; + try (Cursor cursor = mContext.getContentResolver().query( + Mms.CONTENT_URI, projection, selection, selectionArgs, null)) { + if (cursor == null) { + Slog.w(TAG, "Cursor is null when querying MMS table."); + return false; + } + while (cursor.moveToNext()) { + // ID + int msgIdIndex = cursor.getColumnIndex(Mms._ID); + String msgId = cursor.getString(msgIdIndex); + + // Date + int dateIndex = cursor.getColumnIndex(Mms.DATE); + long date = cursor.getLong(dateIndex) * MILLIS_PER_SECONDS; + + // Message box + int msgBoxIndex = cursor.getColumnIndex(Mms.MESSAGE_BOX); + int msgBox = cursor.getInt(msgBoxIndex); + + mLastMessageTimestamp = Math.max(mLastMessageTimestamp, date); + String address = getMmsAddress(msgId, msgBox); + if (address != null && addEvent(address, date, msgBox)) { + hasResults = true; + } + } + } + return hasResults; + } + + long getLastMessageTimestamp() { + return mLastMessageTimestamp; + } + + @Nullable + private String getMmsAddress(String msgId, int msgBox) { + Uri addressUri = Mms.Addr.getAddrUriForMessage(msgId); + String[] projection = new String[] { Mms.Addr.ADDRESS, Mms.Addr.TYPE }; + String address = null; + try (Cursor cursor = mContext.getContentResolver().query( + addressUri, projection, null, null, null)) { + if (cursor == null) { + Slog.w(TAG, "Cursor is null when querying MMS address table."); + return null; + } + while (cursor.moveToNext()) { + // Type + int typeIndex = cursor.getColumnIndex(Mms.Addr.TYPE); + int type = cursor.getInt(typeIndex); + + if ((msgBox == BaseMmsColumns.MESSAGE_BOX_INBOX && type == PduHeaders.FROM) + || (msgBox == BaseMmsColumns.MESSAGE_BOX_SENT && type == PduHeaders.TO)) { + // Address + int addrIndex = cursor.getColumnIndex(Mms.Addr.ADDRESS); + address = cursor.getString(addrIndex); + } + } + } + if (!Mms.isPhoneNumber(address)) { + return null; + } + return PhoneNumberUtils.formatNumberToE164(address, mCurrentCountryIso); + } + + private boolean addEvent(String phoneNumber, long date, int msgBox) { + if (!validateEvent(phoneNumber, date, msgBox)) { + return false; + } + @Event.EventType int eventType = MSG_BOX_TO_EVENT_TYPE.get(msgBox); + mEventConsumer.accept(phoneNumber, new Event(date, eventType)); + return true; + } + + private boolean validateEvent(String phoneNumber, long date, int msgBox) { + return !TextUtils.isEmpty(phoneNumber) + && date > 0L + && MSG_BOX_TO_EVENT_TYPE.indexOfKey(msgBox) >= 0; + } +} diff --git a/services/people/java/com/android/server/people/data/PackageData.java b/services/people/java/com/android/server/people/data/PackageData.java index 9c22a7f1c484..75b870c74591 100644 --- a/services/people/java/com/android/server/people/data/PackageData.java +++ b/services/people/java/com/android/server/people/data/PackageData.java @@ -17,11 +17,13 @@ package com.android.server.people.data; import android.annotation.NonNull; +import android.annotation.Nullable; import android.annotation.UserIdInt; import android.content.LocusId; import android.text.TextUtils; import java.util.function.Consumer; +import java.util.function.Predicate; /** The data associated with a package. */ public class PackageData { @@ -37,15 +39,19 @@ public class PackageData { @NonNull private final EventStore mEventStore; - private boolean mIsDefaultDialer; + private final Predicate<String> mIsDefaultDialerPredicate; - private boolean mIsDefaultSmsApp; + private final Predicate<String> mIsDefaultSmsAppPredicate; - PackageData(@NonNull String packageName, @UserIdInt int userId) { + PackageData(@NonNull String packageName, @UserIdInt int userId, + @NonNull Predicate<String> isDefaultDialerPredicate, + @NonNull Predicate<String> isDefaultSmsAppPredicate) { mPackageName = packageName; mUserId = userId; mConversationStore = new ConversationStore(); mEventStore = new EventStore(); + mIsDefaultDialerPredicate = isDefaultDialerPredicate; + mIsDefaultSmsAppPredicate = isDefaultSmsAppPredicate; } @NonNull @@ -68,6 +74,15 @@ public class PackageData { } /** + * Gets the {@link ConversationInfo} for a given shortcut ID. Returns null if such as {@link + * ConversationInfo} does not exist. + */ + @Nullable + public ConversationInfo getConversationInfo(@NonNull String shortcutId) { + return getConversationStore().getConversation(shortcutId); + } + + /** * Gets the combined {@link EventHistory} for a given shortcut ID. This returned {@link * EventHistory} has events of all types, no matter whether they're annotated with shortcut ID, * Locus ID, or phone number etc. @@ -114,11 +129,11 @@ public class PackageData { } public boolean isDefaultDialer() { - return mIsDefaultDialer; + return mIsDefaultDialerPredicate.test(mPackageName); } public boolean isDefaultSmsApp() { - return mIsDefaultSmsApp; + return mIsDefaultSmsAppPredicate.test(mPackageName); } @NonNull @@ -131,14 +146,6 @@ public class PackageData { return mEventStore; } - void setIsDefaultDialer(boolean value) { - mIsDefaultDialer = value; - } - - void setIsDefaultSmsApp(boolean value) { - mIsDefaultSmsApp = value; - } - void onDestroy() { // TODO: STOPSHIP: Implements this method for the case of package being uninstalled. } diff --git a/services/people/java/com/android/server/people/data/SmsQueryHelper.java b/services/people/java/com/android/server/people/data/SmsQueryHelper.java new file mode 100644 index 000000000000..c38c846bf461 --- /dev/null +++ b/services/people/java/com/android/server/people/data/SmsQueryHelper.java @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + +import android.annotation.WorkerThread; +import android.content.Context; +import android.database.Cursor; +import android.provider.Telephony.Sms; +import android.provider.Telephony.TextBasedSmsColumns; +import android.telephony.PhoneNumberUtils; +import android.text.TextUtils; +import android.util.Slog; +import android.util.SparseIntArray; + +import java.util.function.BiConsumer; + +/** A helper class that queries the SMS database table. */ +class SmsQueryHelper { + + private static final String TAG = "SmsQueryHelper"; + private static final SparseIntArray SMS_TYPE_TO_EVENT_TYPE = new SparseIntArray(); + + static { + SMS_TYPE_TO_EVENT_TYPE.put(TextBasedSmsColumns.MESSAGE_TYPE_INBOX, Event.TYPE_SMS_INCOMING); + SMS_TYPE_TO_EVENT_TYPE.put(TextBasedSmsColumns.MESSAGE_TYPE_SENT, Event.TYPE_SMS_OUTGOING); + } + + private final Context mContext; + private final BiConsumer<String, Event> mEventConsumer; + private final String mCurrentCountryIso; + private long mLastMessageTimestamp; + + /** + * @param context Context for accessing the content resolver. + * @param eventConsumer Consumes the events created from the message records. The first input + * param is the normalized phone number. + */ + SmsQueryHelper(Context context, BiConsumer<String, Event> eventConsumer) { + mContext = context; + mEventConsumer = eventConsumer; + mCurrentCountryIso = Utils.getCurrentCountryIso(mContext); + } + + /** + * Queries the SMS database tables for the new data added since {@code sinceTime} (in millis) + * and returns true if the query runs successfully and at least one message entry is found. + */ + @WorkerThread + boolean querySince(long sinceTime) { + String[] projection = new String[] { Sms._ID, Sms.DATE, Sms.TYPE, Sms.ADDRESS }; + String selection = Sms.DATE + " > ?"; + String[] selectionArgs = new String[] { Long.toString(sinceTime) }; + boolean hasResults = false; + try (Cursor cursor = mContext.getContentResolver().query( + Sms.CONTENT_URI, projection, selection, selectionArgs, null)) { + if (cursor == null) { + Slog.w(TAG, "Cursor is null when querying SMS table."); + return false; + } + while (cursor.moveToNext()) { + // ID + int msgIdIndex = cursor.getColumnIndex(Sms._ID); + String msgId = cursor.getString(msgIdIndex); + + // Date + int dateIndex = cursor.getColumnIndex(Sms.DATE); + long date = cursor.getLong(dateIndex); + + // Type + int typeIndex = cursor.getColumnIndex(Sms.TYPE); + int type = cursor.getInt(typeIndex); + + // Address + int addressIndex = cursor.getColumnIndex(Sms.ADDRESS); + String address = PhoneNumberUtils.formatNumberToE164( + cursor.getString(addressIndex), mCurrentCountryIso); + + mLastMessageTimestamp = Math.max(mLastMessageTimestamp, date); + if (address != null && addEvent(address, date, type)) { + hasResults = true; + } + } + } + return hasResults; + } + + long getLastMessageTimestamp() { + return mLastMessageTimestamp; + } + + private boolean addEvent(String phoneNumber, long date, int type) { + if (!validateEvent(phoneNumber, date, type)) { + return false; + } + @Event.EventType int eventType = SMS_TYPE_TO_EVENT_TYPE.get(type); + mEventConsumer.accept(phoneNumber, new Event(date, eventType)); + return true; + } + + private boolean validateEvent(String phoneNumber, long date, int type) { + return !TextUtils.isEmpty(phoneNumber) + && date > 0L + && SMS_TYPE_TO_EVENT_TYPE.indexOfKey(type) >= 0; + } +} diff --git a/services/people/java/com/android/server/people/data/UserData.java b/services/people/java/com/android/server/people/data/UserData.java index 2c16059e89ba..4e8fd16d05fd 100644 --- a/services/people/java/com/android/server/people/data/UserData.java +++ b/services/people/java/com/android/server/people/data/UserData.java @@ -34,6 +34,12 @@ class UserData { private Map<String, PackageData> mPackageDataMap = new ArrayMap<>(); + @Nullable + private String mDefaultDialer; + + @Nullable + private String mDefaultSmsApp; + UserData(@UserIdInt int userId) { mUserId = userId; } @@ -66,8 +72,7 @@ class UserData { */ @NonNull PackageData getOrCreatePackageData(String packageName) { - return mPackageDataMap.computeIfAbsent( - packageName, key -> new PackageData(packageName, mUserId)); + return mPackageDataMap.computeIfAbsent(packageName, key -> createPackageData(packageName)); } /** @@ -80,24 +85,32 @@ class UserData { } void setDefaultDialer(@Nullable String packageName) { - for (PackageData packageData : mPackageDataMap.values()) { - if (packageData.isDefaultDialer()) { - packageData.setIsDefaultDialer(false); - } - if (TextUtils.equals(packageName, packageData.getPackageName())) { - packageData.setIsDefaultDialer(true); - } - } + mDefaultDialer = packageName; + } + + @Nullable + PackageData getDefaultDialer() { + return mDefaultDialer != null ? getPackageData(mDefaultDialer) : null; } void setDefaultSmsApp(@Nullable String packageName) { - for (PackageData packageData : mPackageDataMap.values()) { - if (packageData.isDefaultSmsApp()) { - packageData.setIsDefaultSmsApp(false); - } - if (TextUtils.equals(packageName, packageData.getPackageName())) { - packageData.setIsDefaultSmsApp(true); - } - } + mDefaultSmsApp = packageName; + } + + @Nullable + PackageData getDefaultSmsApp() { + return mDefaultSmsApp != null ? getPackageData(mDefaultSmsApp) : null; + } + + private PackageData createPackageData(String packageName) { + return new PackageData(packageName, mUserId, this::isDefaultDialer, this::isDefaultSmsApp); + } + + private boolean isDefaultDialer(String packageName) { + return TextUtils.equals(mDefaultDialer, packageName); + } + + private boolean isDefaultSmsApp(String packageName) { + return TextUtils.equals(mDefaultSmsApp, packageName); } } diff --git a/services/people/java/com/android/server/people/data/Utils.java b/services/people/java/com/android/server/people/data/Utils.java new file mode 100644 index 000000000000..b7529605f462 --- /dev/null +++ b/services/people/java/com/android/server/people/data/Utils.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + +import android.content.Context; +import android.location.Country; +import android.location.CountryDetector; + +import java.util.Locale; + +/** The utilities static methods for people service data package. */ +class Utils { + + /** + * @return The ISO 3166-1 two letters country code of the country the user is in. + */ + static String getCurrentCountryIso(Context context) { + String countryIso = null; + CountryDetector detector = (CountryDetector) context.getSystemService( + Context.COUNTRY_DETECTOR); + if (detector != null) { + Country country = detector.detectCountry(); + if (country != null) { + countryIso = country.getCountryIso(); + } + } + if (countryIso == null) { + countryIso = Locale.getDefault().getCountry(); + } + return countryIso; + } + + private Utils() { + } +} diff --git a/services/people/java/com/android/server/people/prediction/AppTargetPredictor.java b/services/people/java/com/android/server/people/prediction/AppTargetPredictor.java new file mode 100644 index 000000000000..44f3e35833d9 --- /dev/null +++ b/services/people/java/com/android/server/people/prediction/AppTargetPredictor.java @@ -0,0 +1,128 @@ +/* + * 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.server.people.prediction; + +import android.annotation.MainThread; +import android.annotation.NonNull; +import android.annotation.WorkerThread; +import android.app.prediction.AppPredictionContext; +import android.app.prediction.AppTarget; +import android.app.prediction.AppTargetEvent; +import android.app.prediction.AppTargetId; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.server.people.data.DataManager; + +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.function.Consumer; + +/** + * Predictor that predicts the {@link AppTarget} the user is most likely to open. + */ +public class AppTargetPredictor { + + private static final String UI_SURFACE_SHARE = "share"; + + /** Creates a {@link AppTargetPredictor} instance based on the prediction context. */ + public static AppTargetPredictor create(@NonNull AppPredictionContext predictionContext, + @NonNull Consumer<List<AppTarget>> updatePredictionsMethod, + @NonNull DataManager dataManager) { + if (UI_SURFACE_SHARE.equals(predictionContext.getUiSurface())) { + return new ShareTargetPredictor( + predictionContext, updatePredictionsMethod, dataManager); + } + return new AppTargetPredictor(predictionContext, updatePredictionsMethod, dataManager); + } + + private final AppPredictionContext mPredictionContext; + private final Consumer<List<AppTarget>> mUpdatePredictionsMethod; + private final DataManager mDataManager; + private final ExecutorService mCallbackExecutor; + + AppTargetPredictor(@NonNull AppPredictionContext predictionContext, + @NonNull Consumer<List<AppTarget>> updatePredictionsMethod, + @NonNull DataManager dataManager) { + mPredictionContext = predictionContext; + mUpdatePredictionsMethod = updatePredictionsMethod; + mDataManager = dataManager; + mCallbackExecutor = Executors.newSingleThreadExecutor(); + } + + /** + * Called by the client app to indicate a target launch. + */ + @MainThread + public void onAppTargetEvent(AppTargetEvent event) { + } + + /** + * Called by the client app to indicate a particular location has been shown to the user. + */ + @MainThread + public void onLaunchLocationShown(String launchLocation, List<AppTargetId> targetIds) { + } + + /** + * Called by the client app to request sorting of the provided targets based on the prediction + * ranking. + */ + @MainThread + public void onSortAppTargets(List<AppTarget> targets, Consumer<List<AppTarget>> callback) { + mCallbackExecutor.execute(() -> sortTargets(targets, callback)); + } + + /** + * Called by the client app to request target predictions. + */ + @MainThread + public void onRequestPredictionUpdate() { + mCallbackExecutor.execute(this::predictTargets); + } + + @VisibleForTesting + public Consumer<List<AppTarget>> getUpdatePredictionsMethod() { + return mUpdatePredictionsMethod; + } + + /** To be overridden by the subclass to predict the targets. */ + @WorkerThread + void predictTargets() { + } + + /** + * To be overridden by the subclass to sort the provided targets based on the prediction + * ranking. + */ + @WorkerThread + void sortTargets(List<AppTarget> targets, Consumer<List<AppTarget>> callback) { + callback.accept(targets); + } + + AppPredictionContext getPredictionContext() { + return mPredictionContext; + } + + DataManager getDataManager() { + return mDataManager; + } + + void updatePredictions(List<AppTarget> targets) { + mUpdatePredictionsMethod.accept(targets); + } +} diff --git a/services/people/java/com/android/server/people/prediction/ConversationPredictor.java b/services/people/java/com/android/server/people/prediction/ConversationPredictor.java deleted file mode 100644 index ed8a56bb6435..000000000000 --- a/services/people/java/com/android/server/people/prediction/ConversationPredictor.java +++ /dev/null @@ -1,142 +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. - */ - -package com.android.server.people.prediction; - -import android.annotation.MainThread; -import android.annotation.NonNull; -import android.annotation.Nullable; -import android.app.prediction.AppPredictionContext; -import android.app.prediction.AppTarget; -import android.app.prediction.AppTargetEvent; -import android.app.prediction.AppTargetId; -import android.content.IntentFilter; -import android.content.pm.ShortcutInfo; -import android.content.pm.ShortcutManager.ShareShortcutInfo; - -import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.app.ChooserActivity; -import com.android.server.people.data.DataManager; -import com.android.server.people.data.EventHistory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.function.Consumer; - -/** - * Predictor that predicts the conversations or apps the user is most likely to open. - */ -public class ConversationPredictor { - - private static final String UI_SURFACE_SHARE = "share"; - - private final AppPredictionContext mPredictionContext; - private final Consumer<List<AppTarget>> mUpdatePredictionsMethod; - private final DataManager mDataManager; - private final ExecutorService mCallbackExecutor; - @Nullable - private final IntentFilter mIntentFilter; - - public ConversationPredictor(@NonNull AppPredictionContext predictionContext, - @NonNull Consumer<List<AppTarget>> updatePredictionsMethod, - @NonNull DataManager dataManager) { - mPredictionContext = predictionContext; - mUpdatePredictionsMethod = updatePredictionsMethod; - mDataManager = dataManager; - mCallbackExecutor = Executors.newSingleThreadExecutor(); - if (UI_SURFACE_SHARE.equals(mPredictionContext.getUiSurface())) { - mIntentFilter = mPredictionContext.getExtras().getParcelable( - ChooserActivity.APP_PREDICTION_INTENT_FILTER_KEY); - } else { - mIntentFilter = null; - } - } - - /** - * Called by the client app to indicate a target launch. - */ - @MainThread - public void onAppTargetEvent(AppTargetEvent event) { - mDataManager.reportAppTargetEvent(event, mIntentFilter); - } - - /** - * Called by the client app to indicate a particular location has been shown to the user. - */ - @MainThread - public void onLaunchLocationShown(String launchLocation, List<AppTargetId> targetIds) {} - - /** - * Called by the client app to request sorting of the provided targets based on the prediction - * ranking. - */ - @MainThread - public void onSortAppTargets(List<AppTarget> targets, Consumer<List<AppTarget>> callback) { - mCallbackExecutor.execute(() -> callback.accept(targets)); - } - - /** - * Called by the client app to request target predictions. - */ - @MainThread - public void onRequestPredictionUpdate() { - // TODO: Re-route the call to different ranking classes for different surfaces. - mCallbackExecutor.execute(() -> { - List<AppTarget> targets = new ArrayList<>(); - if (mIntentFilter != null) { - List<ShareShortcutInfo> shareShortcuts = - mDataManager.getConversationShareTargets(mIntentFilter); - for (ShareShortcutInfo shareShortcut : shareShortcuts) { - ShortcutInfo shortcutInfo = shareShortcut.getShortcutInfo(); - AppTargetId appTargetId = new AppTargetId(shortcutInfo.getId()); - String shareTargetClass = shareShortcut.getTargetComponent().getClassName(); - targets.add(new AppTarget.Builder(appTargetId, shortcutInfo) - .setClassName(shareTargetClass) - .build()); - } - } else { - List<ConversationData> conversationDataList = new ArrayList<>(); - mDataManager.forAllPackages(packageData -> - packageData.forAllConversations(conversationInfo -> { - EventHistory eventHistory = packageData.getEventHistory( - conversationInfo.getShortcutId()); - ConversationData conversationData = new ConversationData( - packageData.getPackageName(), packageData.getUserId(), - conversationInfo, eventHistory); - conversationDataList.add(conversationData); - })); - for (ConversationData conversationData : conversationDataList) { - String shortcutId = conversationData.getConversationInfo().getShortcutId(); - ShortcutInfo shortcut = mDataManager.getShortcut( - conversationData.getPackageName(), conversationData.getUserId(), - shortcutId); - if (shortcut != null) { - AppTargetId appTargetId = new AppTargetId(shortcut.getId()); - targets.add(new AppTarget.Builder(appTargetId, shortcut).build()); - } - } - } - mUpdatePredictionsMethod.accept(targets); - }); - } - - @VisibleForTesting - public Consumer<List<AppTarget>> getUpdatePredictionsMethod() { - return mUpdatePredictionsMethod; - } -} diff --git a/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java b/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java new file mode 100644 index 000000000000..280ced3a07c5 --- /dev/null +++ b/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.prediction; + +import android.annotation.MainThread; +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.WorkerThread; +import android.app.prediction.AppPredictionContext; +import android.app.prediction.AppTarget; +import android.app.prediction.AppTargetEvent; +import android.app.prediction.AppTargetId; +import android.content.IntentFilter; +import android.content.pm.ShortcutInfo; +import android.content.pm.ShortcutManager.ShareShortcutInfo; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.app.ChooserActivity; +import com.android.server.people.data.ConversationInfo; +import com.android.server.people.data.DataManager; +import com.android.server.people.data.EventHistory; +import com.android.server.people.data.PackageData; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +class ShareTargetPredictor extends AppTargetPredictor { + + private final IntentFilter mIntentFilter; + + ShareTargetPredictor(@NonNull AppPredictionContext predictionContext, + @NonNull Consumer<List<AppTarget>> updatePredictionsMethod, + @NonNull DataManager dataManager) { + super(predictionContext, updatePredictionsMethod, dataManager); + mIntentFilter = predictionContext.getExtras().getParcelable( + ChooserActivity.APP_PREDICTION_INTENT_FILTER_KEY); + } + + @MainThread + @Override + public void onAppTargetEvent(AppTargetEvent event) { + getDataManager().reportAppTargetEvent(event, mIntentFilter); + } + + @WorkerThread + @Override + protected void predictTargets() { + List<ShareTarget> shareTargets = getShareTargets(); + // TODO: Rank the share targets with the data in ShareTarget.mConversationData. + List<AppTarget> appTargets = new ArrayList<>(); + for (ShareTarget shareTarget : shareTargets) { + + ShortcutInfo shortcutInfo = shareTarget.getShareShortcutInfo().getShortcutInfo(); + AppTargetId appTargetId = new AppTargetId(shortcutInfo.getId()); + String shareTargetClassName = + shareTarget.getShareShortcutInfo().getTargetComponent().getClassName(); + AppTarget appTarget = new AppTarget.Builder(appTargetId, shortcutInfo) + .setClassName(shareTargetClassName) + .build(); + appTargets.add(appTarget); + if (appTargets.size() >= getPredictionContext().getPredictedTargetCount()) { + break; + } + } + updatePredictions(appTargets); + } + + @VisibleForTesting + List<ShareTarget> getShareTargets() { + List<ShareTarget> shareTargets = new ArrayList<>(); + List<ShareShortcutInfo> shareShortcuts = + getDataManager().getShareShortcuts(mIntentFilter); + + for (ShareShortcutInfo shareShortcut : shareShortcuts) { + ShortcutInfo shortcutInfo = shareShortcut.getShortcutInfo(); + String packageName = shortcutInfo.getPackage(); + int userId = shortcutInfo.getUserId(); + PackageData packageData = getDataManager().getPackage(packageName, userId); + + ConversationData conversationData = null; + if (packageData != null) { + String shortcutId = shortcutInfo.getId(); + ConversationInfo conversationInfo = + packageData.getConversationInfo(shortcutId); + + if (conversationInfo != null) { + EventHistory eventHistory = packageData.getEventHistory(shortcutId); + conversationData = new ConversationData( + packageName, userId, conversationInfo, eventHistory); + } + } + shareTargets.add(new ShareTarget(shareShortcut, conversationData)); + } + + return shareTargets; + } + + @VisibleForTesting + static class ShareTarget { + + @NonNull + private final ShareShortcutInfo mShareShortcutInfo; + @Nullable + private final ConversationData mConversationData; + + private ShareTarget(@NonNull ShareShortcutInfo shareShortcutInfo, + @Nullable ConversationData conversationData) { + mShareShortcutInfo = shareShortcutInfo; + mConversationData = conversationData; + } + + @NonNull + @VisibleForTesting + ShareShortcutInfo getShareShortcutInfo() { + return mShareShortcutInfo; + } + + @Nullable + @VisibleForTesting + ConversationData getConversationData() { + return mConversationData; + } + } +} diff --git a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java index 6a5de84266e2..bb149cf327b8 100644 --- a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java @@ -22,6 +22,7 @@ import static android.app.AlarmManager.RTC_WAKEUP; import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_ACTIVE; import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_FREQUENT; import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_RARE; +import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_RESTRICTED; import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_WORKING_SET; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doCallRealMethod; @@ -45,6 +46,7 @@ import static com.android.server.AlarmManagerService.Constants.KEY_MAX_INTERVAL; import static com.android.server.AlarmManagerService.Constants.KEY_MIN_FUTURITY; import static com.android.server.AlarmManagerService.Constants.KEY_MIN_INTERVAL; import static com.android.server.AlarmManagerService.IS_WAKEUP_MASK; +import static com.android.server.AlarmManagerService.MILLIS_IN_DAY; import static com.android.server.AlarmManagerService.TIME_CHANGED_MASK; import static com.android.server.AlarmManagerService.WORKING_INDEX; @@ -107,6 +109,7 @@ public class AlarmManagerServiceTest { private static final String TEST_CALLING_PACKAGE = "com.android.framework.test-package"; private static final int SYSTEM_UI_UID = 123456789; private static final int TEST_CALLING_UID = 12345; + private static final long RESTRICTED_WINDOW_MS = MILLIS_IN_DAY; private long mAppStandbyWindow; private AlarmManagerService mService; @@ -485,13 +488,13 @@ public class AlarmManagerServiceTest { anyLong())).thenReturn(standbyBucket); final long firstTrigger = mNowElapsedTest + 10; for (int i = 0; i < quota; i++) { - setTestAlarm(ELAPSED_REALTIME_WAKEUP, mNowElapsedTest + 10 + i, + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + i, getNewMockPendingIntent()); mNowElapsedTest = mTestTimer.getElapsed(); mTestTimer.expire(); } // This one should get deferred on set - setTestAlarm(ELAPSED_REALTIME_WAKEUP, mNowElapsedTest + quota + 10, + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + quota, getNewMockPendingIntent()); final long expectedNextTrigger = firstTrigger + 1 + mAppStandbyWindow; assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); @@ -503,11 +506,11 @@ public class AlarmManagerServiceTest { anyLong())).thenReturn(standbyBucket); final long firstTrigger = mNowElapsedTest + 10; for (int i = 0; i < quota; i++) { - setTestAlarm(ELAPSED_REALTIME_WAKEUP, mNowElapsedTest + 10 + i, + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + i, getNewMockPendingIntent()); } // This one should get deferred after the latest alarm expires - setTestAlarm(ELAPSED_REALTIME_WAKEUP, mNowElapsedTest + quota + 10, + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + quota, getNewMockPendingIntent()); for (int i = 0; i < quota; i++) { mNowElapsedTest = mTestTimer.getElapsed(); @@ -596,6 +599,43 @@ public class AlarmManagerServiceTest { testQuotasNoDeferral(STANDBY_BUCKET_RARE); } + @Test + public void testRestrictedBucketAlarmsDeferredOnSet() throws Exception { + when(mUsageStatsManagerInternal + .getAppStandbyBucket(eq(TEST_CALLING_PACKAGE), anyInt(), anyLong())) + .thenReturn(STANDBY_BUCKET_RESTRICTED); + // This one should go off + final long firstTrigger = mNowElapsedTest + 10; + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger, getNewMockPendingIntent()); + mNowElapsedTest = mTestTimer.getElapsed(); + mTestTimer.expire(); + + // This one should get deferred on set + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + 1, getNewMockPendingIntent()); + final long expectedNextTrigger = + firstTrigger + mService.mConstants.APP_STANDBY_RESTRICTED_WINDOW; + assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); + } + + @Test + public void testRestrictedBucketAlarmsDeferredOnExpiration() throws Exception { + when(mUsageStatsManagerInternal + .getAppStandbyBucket(eq(TEST_CALLING_PACKAGE), anyInt(), anyLong())) + .thenReturn(STANDBY_BUCKET_RESTRICTED); + // This one should go off + final long firstTrigger = mNowElapsedTest + 10; + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger, getNewMockPendingIntent()); + + // This one should get deferred after the latest alarm expires + setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + 1, getNewMockPendingIntent()); + + mNowElapsedTest = mTestTimer.getElapsed(); + mTestTimer.expire(); + final long expectedNextTrigger = + firstTrigger + mService.mConstants.APP_STANDBY_RESTRICTED_WINDOW; + assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); + } + private void assertAndHandleBucketChanged(int bucket) { when(mUsageStatsManagerInternal.getAppStandbyBucket(eq(TEST_CALLING_PACKAGE), anyInt(), anyLong())).thenReturn(bucket); diff --git a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java index 9e1ddb1f8a80..4a40b80a85c1 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/LocalDisplayAdapterTest.java @@ -109,10 +109,11 @@ public class LocalDisplayAdapterTest { */ @Test public void testPrivateDisplay() throws Exception { - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_A), createDummyDisplayInfo())); - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_B), createDummyDisplayInfo())); - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_C), createDummyDisplayInfo())); + setUpDisplay(new FakeDisplay(PORT_A)); + setUpDisplay(new FakeDisplay(PORT_B)); + setUpDisplay(new FakeDisplay(PORT_C)); updateAvailableDisplays(); + doReturn(new int[]{ PORT_B }).when(mMockedResources) .getIntArray(com.android.internal.R.array.config_localPrivateDisplayPorts); mAdapter.registerLocked(); @@ -135,9 +136,10 @@ public class LocalDisplayAdapterTest { */ @Test public void testPublicDisplaysForNoConfigLocalPrivateDisplayPorts() throws Exception { - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_A), createDummyDisplayInfo())); - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_C), createDummyDisplayInfo())); + setUpDisplay(new FakeDisplay(PORT_A)); + setUpDisplay(new FakeDisplay(PORT_C)); updateAvailableDisplays(); + // config_localPrivateDisplayPorts is null mAdapter.registerLocked(); @@ -165,9 +167,8 @@ public class LocalDisplayAdapterTest { */ @Test public void testDpiValues() throws Exception { - // needs default one always - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_A), createDummyDisplayInfo())); - setUpDisplay(new DisplayConfig(createDisplayAddress(PORT_B), createDummyDisplayInfo())); + setUpDisplay(new FakeDisplay(PORT_A)); + setUpDisplay(new FakeDisplay(PORT_B)); updateAvailableDisplays(); mAdapter.registerLocked(); @@ -193,32 +194,32 @@ public class LocalDisplayAdapterTest { assertEquals(expectedDensityDpi, info.densityDpi); } - private class DisplayConfig { + private static class FakeDisplay { public final DisplayAddress.Physical address; - public final IBinder displayToken = new Binder(); - public final SurfaceControl.PhysicalDisplayInfo displayInfo; - - private DisplayConfig( - DisplayAddress.Physical address, SurfaceControl.PhysicalDisplayInfo displayInfo) { - this.address = address; - this.displayInfo = displayInfo; + public final IBinder token = new Binder(); + public final SurfaceControl.DisplayInfo info; + public final SurfaceControl.DisplayConfig config; + + private FakeDisplay(int port) { + this.address = createDisplayAddress(port); + this.info = createFakeDisplayInfo(); + this.config = createFakeDisplayConfig(); } } - private void setUpDisplay(DisplayConfig config) { - mAddresses.add(config.address); - doReturn(config.displayToken).when(() -> - SurfaceControl.getPhysicalDisplayToken(config.address.getPhysicalDisplayId())); - doReturn(new SurfaceControl.PhysicalDisplayInfo[]{ - config.displayInfo - }).when(() -> SurfaceControl.getDisplayConfigs(config.displayToken)); - doReturn(0).when(() -> SurfaceControl.getActiveConfig(config.displayToken)); - doReturn(0).when(() -> SurfaceControl.getActiveColorMode(config.displayToken)); - doReturn(new int[]{ - 0 - }).when(() -> SurfaceControl.getDisplayColorModes(config.displayToken)); + private void setUpDisplay(FakeDisplay display) { + mAddresses.add(display.address); + doReturn(display.token).when(() -> + SurfaceControl.getPhysicalDisplayToken(display.address.getPhysicalDisplayId())); + doReturn(display.info).when(() -> SurfaceControl.getDisplayInfo(display.token)); + doReturn(new SurfaceControl.DisplayConfig[] { display.config }).when( + () -> SurfaceControl.getDisplayConfigs(display.token)); + doReturn(0).when(() -> SurfaceControl.getActiveConfig(display.token)); + doReturn(0).when(() -> SurfaceControl.getActiveColorMode(display.token)); + doReturn(new int[] { 0 }).when( + () -> SurfaceControl.getDisplayColorModes(display.token)); doReturn(new SurfaceControl.DesiredDisplayConfigSpecs(0, 60.f, 60.f)) - .when(() -> SurfaceControl.getDesiredDisplayConfigSpecs(config.displayToken)); + .when(() -> SurfaceControl.getDesiredDisplayConfigSpecs(display.token)); } private void updateAvailableDisplays() { @@ -235,18 +236,21 @@ public class LocalDisplayAdapterTest { return DisplayAddress.fromPortAndModel((byte) port, DISPLAY_MODEL); } - private static SurfaceControl.PhysicalDisplayInfo createDummyDisplayInfo() { - SurfaceControl.PhysicalDisplayInfo info = new SurfaceControl.PhysicalDisplayInfo(); + private static SurfaceControl.DisplayInfo createFakeDisplayInfo() { + final SurfaceControl.DisplayInfo info = new SurfaceControl.DisplayInfo(); info.density = 100; - info.xDpi = 100; - info.yDpi = 100; - info.secure = false; - info.width = 800; - info.height = 600; - return info; } + private static SurfaceControl.DisplayConfig createFakeDisplayConfig() { + final SurfaceControl.DisplayConfig config = new SurfaceControl.DisplayConfig(); + config.width = 800; + config.height = 600; + config.xDpi = 100; + config.yDpi = 100; + return config; + } + private void waitForHandlerToComplete(Handler handler, long waitTimeMs) throws InterruptedException { final Object lock = new Object(); diff --git a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java index 49ad866a56a4..fd8ccb30c98f 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java @@ -23,6 +23,8 @@ import static android.content.pm.PackageManager.EXTRA_VERIFICATION_ID; import static android.content.pm.PackageManager.EXTRA_VERIFICATION_INSTALLER_PACKAGE; import static android.content.pm.PackageManager.EXTRA_VERIFICATION_INSTALLER_UID; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; @@ -43,6 +45,7 @@ import android.content.IntentFilter; import android.content.IntentSender; import android.content.integrity.AppInstallMetadata; import android.content.integrity.AtomicFormula; +import android.content.integrity.IntegrityFormula; import android.content.integrity.Rule; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -103,12 +106,10 @@ public class AppIntegrityManagerServiceImplTest { private static final String PLAY_STORE_PKG = "com.android.vending"; private static final String ADB_INSTALLER = "adb"; - private static final String PLAY_STORE_CERT = - "play_store_cert"; + private static final String PLAY_STORE_CERT = "play_store_cert"; private static final String ADB_CERT = ""; - @org.junit.Rule - public MockitoRule mMockitoRule = MockitoJUnit.rule(); + @org.junit.Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); @Mock PackageManagerInternal mPackageManagerInternal; @Mock Context mMockContext; @@ -134,13 +135,14 @@ public class AppIntegrityManagerServiceImplTest { mPackageManagerInternal, mRuleEvaluationEngine, mIntegrityFileManager, - mHandler); + mHandler, + /* checkIntegrityForRuleProviders= */ true); mSpyPackageManager = spy(mRealContext.getPackageManager()); // setup mocks to prevent NPE when(mMockContext.getPackageManager()).thenReturn(mSpyPackageManager); when(mMockContext.getResources()).thenReturn(mMockResources); - when(mMockResources.getStringArray(anyInt())).thenReturn(new String[]{}); + when(mMockResources.getStringArray(anyInt())).thenReturn(new String[] {}); when(mIntegrityFileManager.initialized()).thenReturn(true); } @@ -152,8 +154,7 @@ public class AppIntegrityManagerServiceImplTest { makeUsSystemApp(); Rule rule = new Rule( - new AtomicFormula.BooleanAtomicFormula( - AtomicFormula.PRE_INSTALLED, true), + new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true), Rule.DENY); TestUtils.assertExpectException( SecurityException.class, @@ -171,8 +172,7 @@ public class AppIntegrityManagerServiceImplTest { whitelistUsAsRuleProvider(); Rule rule = new Rule( - new AtomicFormula.BooleanAtomicFormula( - AtomicFormula.PRE_INSTALLED, true), + new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true), Rule.DENY); TestUtils.assertExpectException( SecurityException.class, @@ -191,8 +191,7 @@ public class AppIntegrityManagerServiceImplTest { makeUsSystemApp(); Rule rule = new Rule( - new AtomicFormula.BooleanAtomicFormula( - AtomicFormula.PRE_INSTALLED, true), + new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true), Rule.DENY); // no SecurityException @@ -207,12 +206,7 @@ public class AppIntegrityManagerServiceImplTest { IntentSender mockReceiver = mock(IntentSender.class); List<Rule> rules = Arrays.asList( - new Rule( - new AtomicFormula.StringAtomicFormula( - AtomicFormula.PACKAGE_NAME, - PACKAGE_NAME, - /* isHashedValue= */ false), - Rule.DENY)); + new Rule(IntegrityFormula.PACKAGE_NAME.equalTo(PACKAGE_NAME), Rule.DENY)); mService.updateRuleSet(VERSION, new ParceledListSlice<>(rules), mockReceiver); runJobInHandler(); @@ -231,12 +225,7 @@ public class AppIntegrityManagerServiceImplTest { IntentSender mockReceiver = mock(IntentSender.class); List<Rule> rules = Arrays.asList( - new Rule( - new AtomicFormula.StringAtomicFormula( - AtomicFormula.PACKAGE_NAME, - PACKAGE_NAME, - /* isHashedValue= */ false), - Rule.DENY)); + new Rule(IntegrityFormula.PACKAGE_NAME.equalTo(PACKAGE_NAME), Rule.DENY)); mService.updateRuleSet(VERSION, new ParceledListSlice<>(rules), mockReceiver); runJobInHandler(); @@ -373,8 +362,8 @@ public class AppIntegrityManagerServiceImplTest { verify(mMockContext) .registerReceiver(broadcastReceiverCaptor.capture(), any(), any(), any()); Intent intent = makeVerificationIntent(TEST_FRAMEWORK_PACKAGE); - when(mRuleEvaluationEngine.evaluate(any(), any())).thenReturn( - IntegrityCheckResult.deny(/* rule= */ null)); + when(mRuleEvaluationEngine.evaluate(any(), any())) + .thenReturn(IntegrityCheckResult.deny(/* rule= */ null)); broadcastReceiverCaptor.getValue().onReceive(mMockContext, intent); runJobInHandler(); @@ -384,10 +373,20 @@ public class AppIntegrityManagerServiceImplTest { 1, PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); } + @Test + public void getCurrentRules() throws Exception { + whitelistUsAsRuleProvider(); + makeUsSystemApp(); + Rule rule = new Rule(IntegrityFormula.PACKAGE_NAME.equalTo("package"), Rule.DENY); + when(mIntegrityFileManager.readRules(any())).thenReturn(Arrays.asList(rule)); + + assertThat(mService.getCurrentRules().getList()).containsExactly(rule); + } + private void whitelistUsAsRuleProvider() { Resources mockResources = mock(Resources.class); when(mockResources.getStringArray(R.array.config_integrityRuleProviderPackages)) - .thenReturn(new String[]{TEST_FRAMEWORK_PACKAGE}); + .thenReturn(new String[] {TEST_FRAMEWORK_PACKAGE}); when(mMockContext.getResources()).thenReturn(mockResources); } @@ -409,14 +408,11 @@ public class AppIntegrityManagerServiceImplTest { private Intent makeVerificationIntent() throws Exception { PackageInfo packageInfo = - mRealContext.getPackageManager() + mRealContext + .getPackageManager() .getPackageInfo(TEST_FRAMEWORK_PACKAGE, PackageManager.GET_SIGNATURES); - doReturn(packageInfo) - .when(mSpyPackageManager) - .getPackageInfo(eq(INSTALLER), anyInt()); - doReturn(1) - .when(mSpyPackageManager) - .getPackageUid(eq(INSTALLER), anyInt()); + doReturn(packageInfo).when(mSpyPackageManager).getPackageInfo(eq(INSTALLER), anyInt()); + doReturn(1).when(mSpyPackageManager).getPackageUid(eq(INSTALLER), anyInt()); return makeVerificationIntent(INSTALLER); } diff --git a/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java b/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java index ec1423958f8f..6c23ff6fcb3c 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/model/IntegrityCheckResultTest.java @@ -21,7 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.integrity.AtomicFormula; import android.content.integrity.CompoundFormula; import android.content.integrity.Rule; -import android.util.StatsLog; + +import com.android.internal.util.FrameworkStatsLog; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,7 +41,7 @@ public class IntegrityCheckResultTest { assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW); assertThat(allowResult.getMatchedRules()).isEmpty(); assertThat(allowResult.getLoggingResponse()) - .isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED); + .isEqualTo(FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__ALLOWED); } @Test @@ -58,7 +59,8 @@ public class IntegrityCheckResultTest { assertThat(allowResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.ALLOW); assertThat(allowResult.getMatchedRules()).containsExactly(forceAllowRule); assertThat(allowResult.getLoggingResponse()) - .isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED); + .isEqualTo( + FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__FORCE_ALLOWED); } @Test @@ -76,7 +78,7 @@ public class IntegrityCheckResultTest { assertThat(denyResult.getEffect()).isEqualTo(IntegrityCheckResult.Effect.DENY); assertThat(denyResult.getMatchedRules()).containsExactly(failedRule); assertThat(denyResult.getLoggingResponse()) - .isEqualTo(StatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED); + .isEqualTo(FrameworkStatsLog.INTEGRITY_CHECK_RESULT_REPORTED__RESPONSE__REJECTED); } @Test diff --git a/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleBinarySerializerTest.java b/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleBinarySerializerTest.java index b3d949395d5c..b87877907d4f 100644 --- a/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleBinarySerializerTest.java +++ b/services/tests/servicestests/src/com/android/server/integrity/serializer/RuleBinarySerializerTest.java @@ -203,8 +203,8 @@ public class RuleBinarySerializerTest { + getBits(DEFAULT_FORMAT_VERSION_BYTES.length, /* numOfBits= */ 32) + SERIALIZED_END_INDEXING_KEY + getBits( - DEFAULT_FORMAT_VERSION_BYTES.length + getBytes(expectedBits).length, - /* numOfBits= */ 32); + DEFAULT_FORMAT_VERSION_BYTES.length + getBytes(expectedBits).length, + /* numOfBits= */ 32); expectedIndexingOutputStream.write( getBytes( expectedIndexingBitsForIndexed @@ -427,8 +427,7 @@ public class RuleBinarySerializerTest { Rule rule = new Rule( new AtomicFormula.LongAtomicFormula( - AtomicFormula.VERSION_CODE, AtomicFormula.EQ, - versionCode), + AtomicFormula.VERSION_CODE, AtomicFormula.EQ, versionCode), Rule.DENY); RuleSerializer binarySerializer = new RuleBinarySerializer(); String expectedBits = @@ -456,8 +455,7 @@ public class RuleBinarySerializerTest { String preInstalled = "1"; Rule rule = new Rule( - new AtomicFormula.BooleanAtomicFormula( - AtomicFormula.PRE_INSTALLED, true), + new AtomicFormula.BooleanAtomicFormula(AtomicFormula.PRE_INSTALLED, true), Rule.DENY); RuleSerializer binarySerializer = new RuleBinarySerializer(); String expectedBits = diff --git a/services/tests/servicestests/src/com/android/server/people/PeopleServiceTest.java b/services/tests/servicestests/src/com/android/server/people/PeopleServiceTest.java index d3166b91dc9e..4ae374abb7c2 100644 --- a/services/tests/servicestests/src/com/android/server/people/PeopleServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/people/PeopleServiceTest.java @@ -28,6 +28,7 @@ import android.app.prediction.IPredictionCallback; import android.content.Context; import android.content.pm.ParceledListSlice; import android.os.Binder; +import android.os.Bundle; import android.os.RemoteException; import com.android.server.LocalServices; @@ -76,6 +77,7 @@ public final class PeopleServiceTest { mPredictionContext = new AppPredictionContext.Builder(mContext) .setUiSurface(APP_PREDICTION_SHARE_UI_SURFACE) .setPredictedTargetCount(APP_PREDICTION_TARGET_COUNT) + .setExtras(new Bundle()) .build(); } diff --git a/services/tests/servicestests/src/com/android/server/people/data/CallLogQueryHelperTest.java b/services/tests/servicestests/src/com/android/server/people/data/CallLogQueryHelperTest.java new file mode 100644 index 000000000000..7a16d171b475 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/people/data/CallLogQueryHelperTest.java @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import android.database.Cursor; +import android.database.MatrixCursor; +import android.net.Uri; +import android.provider.CallLog.Calls; +import android.test.mock.MockContentProvider; +import android.test.mock.MockContentResolver; +import android.test.mock.MockContext; +import android.util.ArrayMap; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; + +@RunWith(JUnit4.class) +public final class CallLogQueryHelperTest { + + private static final String CALL_LOG_AUTHORITY = "call_log"; + private static final String NORMALIZED_PHONE_NUMBER = "+16505551111"; + + private static final String[] CALL_LOG_COLUMNS = new String[] { + Calls.CACHED_NORMALIZED_NUMBER, Calls.DATE, Calls.DURATION, Calls.TYPE }; + + @Mock + private MockContext mContext; + + private MatrixCursor mCursor; + private EventConsumer mEventConsumer; + private CallLogQueryHelper mHelper; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mCursor = new MatrixCursor(CALL_LOG_COLUMNS); + + MockContentResolver contentResolver = new MockContentResolver(); + contentResolver.addProvider(CALL_LOG_AUTHORITY, new CallLogContentProvider()); + when(mContext.getContentResolver()).thenReturn(contentResolver); + + mEventConsumer = new EventConsumer(); + mHelper = new CallLogQueryHelper(mContext, mEventConsumer); + } + + @Test + public void testQueryNoCalls() { + assertFalse(mHelper.querySince(50L)); + assertFalse(mEventConsumer.mEventMap.containsKey(NORMALIZED_PHONE_NUMBER)); + } + + @Test + public void testQueryIncomingCall() { + mCursor.addRow(new Object[] { + NORMALIZED_PHONE_NUMBER, /* date= */ 100L, /* duration= */ 30L, + /* type= */ Calls.INCOMING_TYPE }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100L, mHelper.getLastCallTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_CALL_INCOMING, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + assertEquals(30L, events.get(0).getCallDetails().getDurationSeconds()); + } + + @Test + public void testQueryOutgoingCall() { + mCursor.addRow(new Object[] { + NORMALIZED_PHONE_NUMBER, /* date= */ 100L, /* duration= */ 40L, + /* type= */ Calls.OUTGOING_TYPE }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100L, mHelper.getLastCallTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_CALL_OUTGOING, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + assertEquals(40L, events.get(0).getCallDetails().getDurationSeconds()); + } + + @Test + public void testQueryMissedCall() { + mCursor.addRow(new Object[] { + NORMALIZED_PHONE_NUMBER, /* date= */ 100L, /* duration= */ 0L, + /* type= */ Calls.MISSED_TYPE }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100L, mHelper.getLastCallTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_CALL_MISSED, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + assertEquals(0L, events.get(0).getCallDetails().getDurationSeconds()); + } + + @Test + public void testQueryMultipleCalls() { + mCursor.addRow(new Object[] { + NORMALIZED_PHONE_NUMBER, /* date= */ 100L, /* duration= */ 0L, + /* type= */ Calls.MISSED_TYPE }); + mCursor.addRow(new Object[] { + NORMALIZED_PHONE_NUMBER, /* date= */ 110L, /* duration= */ 40L, + /* type= */ Calls.OUTGOING_TYPE }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(110L, mHelper.getLastCallTimestamp()); + assertEquals(2, events.size()); + assertEquals(Event.TYPE_CALL_MISSED, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + assertEquals(Event.TYPE_CALL_OUTGOING, events.get(1).getType()); + assertEquals(110L, events.get(1).getTimestamp()); + assertEquals(40L, events.get(1).getCallDetails().getDurationSeconds()); + } + + private class EventConsumer implements BiConsumer<String, Event> { + + private final Map<String, List<Event>> mEventMap = new ArrayMap<>(); + + @Override + public void accept(String phoneNumber, Event event) { + mEventMap.computeIfAbsent(phoneNumber, key -> new ArrayList<>()).add(event); + } + } + + private class CallLogContentProvider extends MockContentProvider { + + @Override + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, + String sortOrder) { + return mCursor; + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java b/services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java index 91da761ce229..62ea425a54a7 100644 --- a/services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/people/data/DataManagerTest.java @@ -18,6 +18,8 @@ package com.android.server.people.data; import static android.app.usage.UsageEvents.Event.SHORTCUT_INVOCATION; +import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -40,14 +42,12 @@ import android.app.prediction.AppTargetEvent; import android.app.prediction.AppTargetId; import android.app.usage.UsageEvents; import android.app.usage.UsageStatsManagerInternal; -import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; -import android.content.pm.ShortcutManager.ShareShortcutInfo; import android.content.pm.ShortcutServiceInternal; import android.content.pm.UserInfo; import android.database.ContentObserver; @@ -58,6 +58,7 @@ import android.os.UserManager; import android.provider.ContactsContract; import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; +import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import android.util.Range; @@ -79,6 +80,7 @@ import java.util.List; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; @RunWith(JUnit4.class) public final class DataManagerTest { @@ -90,6 +92,7 @@ public final class DataManagerTest { private static final String TEST_SHORTCUT_ID = "sc"; private static final String CONTACT_URI = "content://com.android.contacts/contacts/lookup/123"; private static final String PHONE_NUMBER = "+1234567890"; + private static final long MILLIS_PER_MINUTE = 1000L * 60L; @Mock private Context mContext; @Mock private ShortcutServiceInternal mShortcutServiceInternal; @@ -97,6 +100,7 @@ public final class DataManagerTest { @Mock private ShortcutManager mShortcutManager; @Mock private UserManager mUserManager; @Mock private TelephonyManager mTelephonyManager; + @Mock private TelecomManager mTelecomManager; @Mock private ContentResolver mContentResolver; @Mock private ScheduledExecutorService mExecutorService; @Mock private ScheduledFuture mScheduledFuture; @@ -117,6 +121,9 @@ public final class DataManagerTest { when(mContext.getMainLooper()).thenReturn(Looper.getMainLooper()); + Context originalContext = getInstrumentation().getTargetContext(); + when(mContext.getApplicationInfo()).thenReturn(originalContext.getApplicationInfo()); + when(mContext.getSystemService(Context.SHORTCUT_SERVICE)).thenReturn(mShortcutManager); when(mContext.getSystemServiceName(ShortcutManager.class)).thenReturn( Context.SHORTCUT_SERVICE); @@ -127,6 +134,11 @@ public final class DataManagerTest { when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); + when(mContext.getSystemService(Context.TELECOM_SERVICE)).thenReturn(mTelecomManager); + when(mContext.getSystemServiceName(TelecomManager.class)).thenReturn( + Context.TELECOM_SERVICE); + when(mTelecomManager.getDefaultDialerPackage(anyInt())).thenReturn(TEST_PKG_NAME); + when(mExecutorService.scheduleAtFixedRate(any(Runnable.class), anyLong(), anyLong(), any( TimeUnit.class))).thenReturn(mScheduledFuture); @@ -224,31 +236,6 @@ public final class DataManagerTest { } @Test - public void testGetShareTargets() { - mDataManager.onUserUnlocked(USER_ID_PRIMARY); - - ShortcutInfo shortcut1 = - buildShortcutInfo("pkg_1", USER_ID_PRIMARY, "sc_1", buildPerson()); - ShareShortcutInfo shareShortcut1 = - new ShareShortcutInfo(shortcut1, new ComponentName("pkg_1", "activity")); - - ShortcutInfo shortcut2 = - buildShortcutInfo("pkg_2", USER_ID_PRIMARY, "sc_2", buildPerson()); - ShareShortcutInfo shareShortcut2 = - new ShareShortcutInfo(shortcut2, new ComponentName("pkg_2", "activity")); - mDataManager.onShortcutAddedOrUpdated(shortcut2); - - when(mShortcutManager.getShareTargets(any(IntentFilter.class))) - .thenReturn(Arrays.asList(shareShortcut1, shareShortcut2)); - - List<ShareShortcutInfo> shareShortcuts = - mDataManager.getConversationShareTargets(new IntentFilter()); - // Only "sc_2" is stored as a conversation. - assertEquals(1, shareShortcuts.size()); - assertEquals("sc_2", shareShortcuts.get(0).getShortcutInfo().getId()); - } - - @Test public void testReportAppTargetEvent() throws IntentFilter.MalformedMimeTypeException { mDataManager.onUserUnlocked(USER_ID_PRIMARY); ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID, @@ -351,6 +338,61 @@ public final class DataManagerTest { assertEquals(1, activeShortcutInvocationTimeSlots.size()); } + @Test + public void testCallLogContentObserver() { + mDataManager.onUserUnlocked(USER_ID_PRIMARY); + + ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID, + buildPerson()); + mDataManager.onShortcutAddedOrUpdated(shortcut); + + ContentObserver contentObserver = mDataManager.getCallLogContentObserverForTesting(); + contentObserver.onChange(false); + long currentTimestamp = System.currentTimeMillis(); + mInjector.mCallLogQueryHelper.mEventConsumer.accept(PHONE_NUMBER, + new Event(currentTimestamp - MILLIS_PER_MINUTE * 15L, Event.TYPE_CALL_OUTGOING)); + mInjector.mCallLogQueryHelper.mEventConsumer.accept(PHONE_NUMBER, + new Event(currentTimestamp - MILLIS_PER_MINUTE * 10L, Event.TYPE_CALL_INCOMING)); + mInjector.mCallLogQueryHelper.mEventConsumer.accept(PHONE_NUMBER, + new Event(currentTimestamp - MILLIS_PER_MINUTE * 5L, Event.TYPE_CALL_MISSED)); + + List<Range<Long>> activeTimeSlots = new ArrayList<>(); + mDataManager.forAllPackages(packageData -> + activeTimeSlots.addAll( + packageData.getEventHistory(TEST_SHORTCUT_ID) + .getEventIndex(Event.CALL_EVENT_TYPES) + .getActiveTimeSlots())); + assertEquals(3, activeTimeSlots.size()); + } + + @Test + public void testMmsSmsContentObserver() { + mDataManager.onUserUnlocked(USER_ID_PRIMARY); + + ShortcutInfo shortcut = buildShortcutInfo(TEST_PKG_NAME, USER_ID_PRIMARY, TEST_SHORTCUT_ID, + buildPerson()); + mDataManager.onShortcutAddedOrUpdated(shortcut); + mDataManager.getUserDataForTesting(USER_ID_PRIMARY).setDefaultSmsApp(TEST_PKG_NAME); + + ContentObserver contentObserver = mDataManager.getMmsSmsContentObserverForTesting(); + contentObserver.onChange(false); + long currentTimestamp = System.currentTimeMillis(); + Event outgoingSmsEvent = + new Event(currentTimestamp - MILLIS_PER_MINUTE * 10L, Event.TYPE_SMS_OUTGOING); + Event incomingSmsEvent = + new Event(currentTimestamp - MILLIS_PER_MINUTE * 5L, Event.TYPE_SMS_INCOMING); + mInjector.mMmsQueryHelper.mEventConsumer.accept(PHONE_NUMBER, outgoingSmsEvent); + mInjector.mSmsQueryHelper.mEventConsumer.accept(PHONE_NUMBER, incomingSmsEvent); + + List<Range<Long>> activeTimeSlots = new ArrayList<>(); + mDataManager.forAllPackages(packageData -> + activeTimeSlots.addAll( + packageData.getEventHistory(TEST_SHORTCUT_ID) + .getEventIndex(Event.SMS_EVENT_TYPES) + .getActiveTimeSlots())); + assertEquals(2, activeTimeSlots.size()); + } + private static <T> void addLocalServiceMock(Class<T> clazz, T mock) { LocalServices.removeServiceForTest(clazz); LocalServices.addService(clazz, mock); @@ -428,10 +470,73 @@ public final class DataManagerTest { } } + private class TestCallLogQueryHelper extends CallLogQueryHelper { + + private final BiConsumer<String, Event> mEventConsumer; + + TestCallLogQueryHelper(Context context, BiConsumer<String, Event> eventConsumer) { + super(context, eventConsumer); + mEventConsumer = eventConsumer; + } + + @Override + boolean querySince(long sinceTime) { + return true; + } + + @Override + long getLastCallTimestamp() { + return 100L; + } + } + + private class TestSmsQueryHelper extends SmsQueryHelper { + + private final BiConsumer<String, Event> mEventConsumer; + + TestSmsQueryHelper(Context context, BiConsumer<String, Event> eventConsumer) { + super(context, eventConsumer); + mEventConsumer = eventConsumer; + } + + @Override + boolean querySince(long sinceTime) { + return true; + } + + @Override + long getLastMessageTimestamp() { + return 100L; + } + } + + private class TestMmsQueryHelper extends MmsQueryHelper { + + private final BiConsumer<String, Event> mEventConsumer; + + TestMmsQueryHelper(Context context, BiConsumer<String, Event> eventConsumer) { + super(context, eventConsumer); + mEventConsumer = eventConsumer; + } + + @Override + boolean querySince(long sinceTime) { + return true; + } + + @Override + long getLastMessageTimestamp() { + return 100L; + } + } + private class TestInjector extends DataManager.Injector { private final TestContactsQueryHelper mContactsQueryHelper = new TestContactsQueryHelper(mContext); + private TestCallLogQueryHelper mCallLogQueryHelper; + private TestMmsQueryHelper mMmsQueryHelper; + private TestSmsQueryHelper mSmsQueryHelper; @Override ScheduledExecutorService createScheduledExecutor() { @@ -444,6 +549,27 @@ public final class DataManagerTest { } @Override + CallLogQueryHelper createCallLogQueryHelper(Context context, + BiConsumer<String, Event> eventConsumer) { + mCallLogQueryHelper = new TestCallLogQueryHelper(context, eventConsumer); + return mCallLogQueryHelper; + } + + @Override + MmsQueryHelper createMmsQueryHelper(Context context, + BiConsumer<String, Event> eventConsumer) { + mMmsQueryHelper = new TestMmsQueryHelper(context, eventConsumer); + return mMmsQueryHelper; + } + + @Override + SmsQueryHelper createSmsQueryHelper(Context context, + BiConsumer<String, Event> eventConsumer) { + mSmsQueryHelper = new TestSmsQueryHelper(context, eventConsumer); + return mSmsQueryHelper; + } + + @Override int getCallingUserId() { return mCallingUserId; } diff --git a/services/tests/servicestests/src/com/android/server/people/data/MmsQueryHelperTest.java b/services/tests/servicestests/src/com/android/server/people/data/MmsQueryHelperTest.java new file mode 100644 index 000000000000..7730890e1486 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/people/data/MmsQueryHelperTest.java @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import android.database.Cursor; +import android.database.MatrixCursor; +import android.net.Uri; +import android.provider.Telephony.BaseMmsColumns; +import android.provider.Telephony.Mms; +import android.test.mock.MockContentProvider; +import android.test.mock.MockContentResolver; +import android.test.mock.MockContext; +import android.util.ArrayMap; + +import com.google.android.mms.pdu.PduHeaders; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; + +@RunWith(JUnit4.class) +public final class MmsQueryHelperTest { + + private static final String MMS_AUTHORITY = "mms"; + private static final String PHONE_NUMBER = "650-555-1111"; + private static final String NORMALIZED_PHONE_NUMBER = "+16505551111"; + private static final String OWN_PHONE_NUMBER = "650-555-9999"; + + private static final String[] MMS_COLUMNS = new String[] { Mms._ID, Mms.DATE, Mms.MESSAGE_BOX }; + private static final String[] ADDR_COLUMNS = new String[] { Mms.Addr.ADDRESS, Mms.Addr.TYPE }; + + @Mock + private MockContext mContext; + + private MatrixCursor mMmsCursor; + private final List<MatrixCursor> mAddrCursors = new ArrayList<>(); + private EventConsumer mEventConsumer; + private MmsQueryHelper mHelper; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mMmsCursor = new MatrixCursor(MMS_COLUMNS); + mAddrCursors.add(new MatrixCursor(ADDR_COLUMNS)); + mAddrCursors.add(new MatrixCursor(ADDR_COLUMNS)); + + MockContentResolver contentResolver = new MockContentResolver(); + contentResolver.addProvider(MMS_AUTHORITY, new MmsContentProvider()); + when(mContext.getContentResolver()).thenReturn(contentResolver); + + mEventConsumer = new EventConsumer(); + mHelper = new MmsQueryHelper(mContext, mEventConsumer); + } + + @Test + public void testQueryNoMessages() { + assertFalse(mHelper.querySince(50_000L)); + assertFalse(mEventConsumer.mEventMap.containsKey(NORMALIZED_PHONE_NUMBER)); + } + + @Test + public void testQueryIncomingMessage() { + mMmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 100L, /* msgBox= */ BaseMmsColumns.MESSAGE_BOX_INBOX }); + mAddrCursors.get(0).addRow(new Object[] { + /* address= */ PHONE_NUMBER, /* type= */ PduHeaders.FROM }); + mAddrCursors.get(0).addRow(new Object[] { + /* address= */ OWN_PHONE_NUMBER, /* type= */ PduHeaders.TO }); + + assertTrue(mHelper.querySince(50_000L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100_000L, mHelper.getLastMessageTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_SMS_INCOMING, events.get(0).getType()); + assertEquals(100_000L, events.get(0).getTimestamp()); + } + + @Test + public void testQueryOutgoingMessage() { + mMmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 100L, /* msgBox= */ BaseMmsColumns.MESSAGE_BOX_SENT }); + mAddrCursors.get(0).addRow(new Object[] { + /* address= */ OWN_PHONE_NUMBER, /* type= */ PduHeaders.FROM }); + mAddrCursors.get(0).addRow(new Object[] { + /* address= */ PHONE_NUMBER, /* type= */ PduHeaders.TO }); + + assertTrue(mHelper.querySince(50_000L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100_000L, mHelper.getLastMessageTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_SMS_OUTGOING, events.get(0).getType()); + assertEquals(100_000L, events.get(0).getTimestamp()); + } + + @Test + public void testQueryMultipleMessages() { + mMmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 100L, /* msgBox= */ BaseMmsColumns.MESSAGE_BOX_SENT }); + mMmsCursor.addRow(new Object[] { + /* id= */ 1, /* date= */ 110L, /* msgBox= */ BaseMmsColumns.MESSAGE_BOX_INBOX }); + mAddrCursors.get(0).addRow(new Object[] { + /* address= */ OWN_PHONE_NUMBER, /* type= */ PduHeaders.FROM }); + mAddrCursors.get(0).addRow(new Object[] { + /* address= */ PHONE_NUMBER, /* type= */ PduHeaders.TO }); + mAddrCursors.get(1).addRow(new Object[] { + /* address= */ PHONE_NUMBER, /* type= */ PduHeaders.FROM }); + mAddrCursors.get(1).addRow(new Object[] { + /* address= */ OWN_PHONE_NUMBER, /* type= */ PduHeaders.TO }); + + assertTrue(mHelper.querySince(50_000L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(110_000L, mHelper.getLastMessageTimestamp()); + assertEquals(2, events.size()); + assertEquals(Event.TYPE_SMS_OUTGOING, events.get(0).getType()); + assertEquals(100_000L, events.get(0).getTimestamp()); + assertEquals(Event.TYPE_SMS_INCOMING, events.get(1).getType()); + assertEquals(110_000L, events.get(1).getTimestamp()); + } + + private class EventConsumer implements BiConsumer<String, Event> { + + private final Map<String, List<Event>> mEventMap = new ArrayMap<>(); + + @Override + public void accept(String phoneNumber, Event event) { + mEventMap.computeIfAbsent(phoneNumber, key -> new ArrayList<>()).add(event); + } + } + + private class MmsContentProvider extends MockContentProvider { + + @Override + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, + String sortOrder) { + List<String> segments = uri.getPathSegments(); + if (segments.size() == 2 && "addr".equals(segments.get(1))) { + int messageId = Integer.valueOf(segments.get(0)); + return mAddrCursors.get(messageId); + } + return mMmsCursor; + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/people/data/PackageDataTest.java b/services/tests/servicestests/src/com/android/server/people/data/PackageDataTest.java index 1b80d6fc3a2d..ec4789ad0cdf 100644 --- a/services/tests/servicestests/src/com/android/server/people/data/PackageDataTest.java +++ b/services/tests/servicestests/src/com/android/server/people/data/PackageDataTest.java @@ -16,7 +16,6 @@ package com.android.server.people.data; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -46,12 +45,15 @@ public final class PackageDataTest { private Event mE2; private Event mE3; private Event mE4; + private boolean mIsDefaultDialer; + private boolean mIsDefaultSmsApp; private PackageData mPackageData; @Before public void setUp() { - mPackageData = new PackageData(PACKAGE_NAME, USER_ID); + mPackageData = new PackageData( + PACKAGE_NAME, USER_ID, pkg -> mIsDefaultDialer, pkg -> mIsDefaultSmsApp); ConversationInfo conversationInfo = new ConversationInfo.Builder() .setShortcutId(SHORTCUT_ID) .setLocusId(LOCUS_ID) @@ -83,8 +85,8 @@ public final class PackageDataTest { @Test public void testGetEventHistoryDefaultDialerAndSmsApp() { - mPackageData.setIsDefaultDialer(true); - mPackageData.setIsDefaultSmsApp(true); + mIsDefaultDialer = true; + mIsDefaultSmsApp = true; EventStore eventStore = mPackageData.getEventStore(); eventStore.getOrCreateShortcutEventHistory(SHORTCUT_ID).addEvent(mE1); eventStore.getOrCreateCallEventHistory(PHONE_NUMBER).addEvent(mE3); diff --git a/services/tests/servicestests/src/com/android/server/people/data/SmsQueryHelperTest.java b/services/tests/servicestests/src/com/android/server/people/data/SmsQueryHelperTest.java new file mode 100644 index 000000000000..5cb8cb4fe9f1 --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/people/data/SmsQueryHelperTest.java @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.data; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import android.database.Cursor; +import android.database.MatrixCursor; +import android.net.Uri; +import android.provider.Telephony.Sms; +import android.provider.Telephony.TextBasedSmsColumns; +import android.test.mock.MockContentProvider; +import android.test.mock.MockContentResolver; +import android.test.mock.MockContext; +import android.util.ArrayMap; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; + +@RunWith(JUnit4.class) +public final class SmsQueryHelperTest { + + private static final String SMS_AUTHORITY = "sms"; + private static final String PHONE_NUMBER = "650-555-1111"; + private static final String NORMALIZED_PHONE_NUMBER = "+16505551111"; + + private static final String[] SMS_COLUMNS = new String[] { + Sms._ID, Sms.DATE, Sms.TYPE, Sms.ADDRESS }; + + @Mock + private MockContext mContext; + + private MatrixCursor mSmsCursor; + private EventConsumer mEventConsumer; + private SmsQueryHelper mHelper; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mSmsCursor = new MatrixCursor(SMS_COLUMNS); + + MockContentResolver contentResolver = new MockContentResolver(); + contentResolver.addProvider(SMS_AUTHORITY, new SmsContentProvider()); + when(mContext.getContentResolver()).thenReturn(contentResolver); + + mEventConsumer = new EventConsumer(); + mHelper = new SmsQueryHelper(mContext, mEventConsumer); + } + + @Test + public void testQueryNoMessages() { + assertFalse(mHelper.querySince(50_000L)); + assertFalse(mEventConsumer.mEventMap.containsKey(NORMALIZED_PHONE_NUMBER)); + } + + @Test + public void testQueryIncomingMessage() { + mSmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 100L, /* type= */ TextBasedSmsColumns.MESSAGE_TYPE_INBOX, + /* address= */ PHONE_NUMBER }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100L, mHelper.getLastMessageTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_SMS_INCOMING, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + } + + @Test + public void testQueryOutgoingMessage() { + mSmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 100L, /* type= */ TextBasedSmsColumns.MESSAGE_TYPE_SENT, + /* address= */ PHONE_NUMBER }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(100L, mHelper.getLastMessageTimestamp()); + assertEquals(1, events.size()); + assertEquals(Event.TYPE_SMS_OUTGOING, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + } + + @Test + public void testQueryMultipleMessages() { + mSmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 100L, /* type= */ TextBasedSmsColumns.MESSAGE_TYPE_SENT, + /* address= */ PHONE_NUMBER }); + mSmsCursor.addRow(new Object[] { + /* id= */ 0, /* date= */ 110L, /* type= */ TextBasedSmsColumns.MESSAGE_TYPE_INBOX, + /* address= */ PHONE_NUMBER }); + + assertTrue(mHelper.querySince(50L)); + List<Event> events = mEventConsumer.mEventMap.get(NORMALIZED_PHONE_NUMBER); + + assertEquals(110L, mHelper.getLastMessageTimestamp()); + assertEquals(2, events.size()); + assertEquals(Event.TYPE_SMS_OUTGOING, events.get(0).getType()); + assertEquals(100L, events.get(0).getTimestamp()); + assertEquals(Event.TYPE_SMS_INCOMING, events.get(1).getType()); + assertEquals(110L, events.get(1).getTimestamp()); + } + + private class EventConsumer implements BiConsumer<String, Event> { + + private final Map<String, List<Event>> mEventMap = new ArrayMap<>(); + + @Override + public void accept(String phoneNumber, Event event) { + mEventMap.computeIfAbsent(phoneNumber, key -> new ArrayList<>()).add(event); + } + } + + private class SmsContentProvider extends MockContentProvider { + + @Override + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, + String sortOrder) { + return mSmsCursor; + } + } +} diff --git a/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java b/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java new file mode 100644 index 000000000000..808906e3a06a --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.people.prediction; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.app.prediction.AppPredictionContext; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.pm.ShortcutInfo; +import android.content.pm.ShortcutManager.ShareShortcutInfo; +import android.os.Bundle; +import android.os.UserHandle; + +import com.android.server.people.data.ConversationInfo; +import com.android.server.people.data.DataManager; +import com.android.server.people.data.EventHistory; +import com.android.server.people.data.PackageData; +import com.android.server.people.prediction.ShareTargetPredictor.ShareTarget; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import java.util.ArrayList; +import java.util.List; + +@RunWith(JUnit4.class) +public final class ShareTargetPredictorTest { + + private static final String UI_SURFACE_SHARE = "share"; + private static final int NUM_PREDICTED_TARGETS = 5; + private static final int USER_ID = 0; + private static final String PACKAGE_1 = "pkg1"; + private static final String CLASS_1 = "cls1"; + private static final String PACKAGE_2 = "pkg2"; + private static final String CLASS_2 = "cls2"; + + @Mock private Context mContext; + @Mock private DataManager mDataManager; + @Mock private PackageData mPackageData1; + @Mock private PackageData mPackageData2; + + private List<ShareShortcutInfo> mShareShortcuts = new ArrayList<>(); + + private ShareTargetPredictor mPredictor; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + when(mDataManager.getShareShortcuts(any())).thenReturn(mShareShortcuts); + when(mDataManager.getPackage(PACKAGE_1, USER_ID)).thenReturn(mPackageData1); + when(mDataManager.getPackage(PACKAGE_2, USER_ID)).thenReturn(mPackageData2); + + AppPredictionContext predictionContext = new AppPredictionContext.Builder(mContext) + .setUiSurface(UI_SURFACE_SHARE) + .setPredictedTargetCount(NUM_PREDICTED_TARGETS) + .setExtras(new Bundle()) + .build(); + mPredictor = new ShareTargetPredictor(predictionContext, targets -> { }, mDataManager); + } + + @Test + public void testGetShareTargets() { + mShareShortcuts.add(buildShareShortcut(PACKAGE_1, CLASS_1, "sc1")); + mShareShortcuts.add(buildShareShortcut(PACKAGE_1, CLASS_1, "sc2")); + mShareShortcuts.add(buildShareShortcut(PACKAGE_2, CLASS_2, "sc3")); + mShareShortcuts.add(buildShareShortcut(PACKAGE_2, CLASS_2, "sc4")); + + when(mPackageData1.getConversationInfo("sc1")).thenReturn(mock(ConversationInfo.class)); + when(mPackageData1.getConversationInfo("sc2")).thenReturn(mock(ConversationInfo.class)); + when(mPackageData2.getConversationInfo("sc3")).thenReturn(mock(ConversationInfo.class)); + // "sc4" does not have a ConversationInfo. + + when(mPackageData1.getEventHistory(anyString())).thenReturn(mock(EventHistory.class)); + when(mPackageData2.getEventHistory(anyString())).thenReturn(mock(EventHistory.class)); + + List<ShareTarget> shareTargets = mPredictor.getShareTargets(); + + assertEquals(4, shareTargets.size()); + + assertEquals("sc1", shareTargets.get(0).getShareShortcutInfo().getShortcutInfo().getId()); + assertNotNull(shareTargets.get(0).getConversationData()); + + assertEquals("sc2", shareTargets.get(1).getShareShortcutInfo().getShortcutInfo().getId()); + assertNotNull(shareTargets.get(1).getConversationData()); + + assertEquals("sc3", shareTargets.get(2).getShareShortcutInfo().getShortcutInfo().getId()); + assertNotNull(shareTargets.get(2).getConversationData()); + + assertEquals("sc4", shareTargets.get(3).getShareShortcutInfo().getShortcutInfo().getId()); + assertNull(shareTargets.get(3).getConversationData()); + } + + private ShareShortcutInfo buildShareShortcut( + String packageName, String className, String shortcutId) { + ShortcutInfo shortcutInfo = buildShortcut(packageName, shortcutId); + ComponentName componentName = new ComponentName(packageName, className); + return new ShareShortcutInfo(shortcutInfo, componentName); + } + + private ShortcutInfo buildShortcut(String packageName, String shortcutId) { + Context mockContext = mock(Context.class); + when(mockContext.getPackageName()).thenReturn(packageName); + when(mockContext.getUserId()).thenReturn(USER_ID); + when(mockContext.getUser()).thenReturn(UserHandle.of(USER_ID)); + ShortcutInfo.Builder builder = new ShortcutInfo.Builder(mockContext, shortcutId) + .setShortLabel(shortcutId) + .setIntent(new Intent("TestIntent")); + return builder.build(); + } +} diff --git a/services/tests/servicestests/src/com/android/server/rollback/RollbackUnitTest.java b/services/tests/servicestests/src/com/android/server/rollback/RollbackUnitTest.java index 164c88382828..9719509659ec 100644 --- a/services/tests/servicestests/src/com/android/server/rollback/RollbackUnitTest.java +++ b/services/tests/servicestests/src/com/android/server/rollback/RollbackUnitTest.java @@ -291,6 +291,17 @@ public class RollbackUnitTest { verify(mMockDataHelper).restoreAppData(123, pkgInfo1, 7, 333, "blah"); } + @Test + public void notifySessionWithSuccess() { + int[] sessionIds = new int[]{ 7777, 8888 }; + Rollback rollback = new Rollback(123, new File("/test/testing"), -1, USER, INSTALLER, + sessionIds); + // The 1st invocation returns false because not all child sessions are notified. + assertThat(rollback.notifySessionWithSuccess()).isFalse(); + // The 2nd invocation returns true because now all child sessions are notified. + assertThat(rollback.notifySessionWithSuccess()).isTrue(); + } + private static PackageRollbackInfo newPkgInfoFor( String packageName, long fromVersion, long toVersion, boolean isApex) { return new PackageRollbackInfo(new VersionedPackage(packageName, fromVersion), diff --git a/services/tests/servicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java b/services/tests/servicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java index 61117f18445b..ba493d4f9646 100644 --- a/services/tests/servicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java +++ b/services/tests/servicestests/src/com/android/server/rollback/WatchdogRollbackLoggerTest.java @@ -60,18 +60,18 @@ public class WatchdogRollbackLoggerTest { } /** - * Ensures that the original package is returned if the application info has no metadata. + * Ensures that null is returned if the application info has no metadata. */ @Test public void testLogPackageHasNoMetadata() throws Exception { when(mMockPm.getApplicationInfo(anyString(), anyInt())).thenReturn(mApplicationInfo); VersionedPackage logPackage = WatchdogRollbackLogger.getLogPackage(mMockContext, sTestPackageV1); - assertThat(logPackage).isEqualTo(sTestPackageV1); + assertThat(logPackage).isNull(); } /** - * Ensures the original package is returned if the application info does not contain a logging + * Ensures that null is returned if the application info does not contain a logging * parent key. */ @Test @@ -81,7 +81,7 @@ public class WatchdogRollbackLoggerTest { bundle.putString(LOGGING_PARENT_KEY, null); VersionedPackage logPackage = WatchdogRollbackLogger.getLogPackage(mMockContext, sTestPackageV1); - assertThat(logPackage).isEqualTo(sTestPackageV1); + assertThat(logPackage).isNull(); } /** @@ -102,8 +102,7 @@ public class WatchdogRollbackLoggerTest { } /** - * Ensures that the original package is returned if Package Manager does not know about the - * logging parent. + * Ensures that null is returned if Package Manager does not know about the logging parent. */ @Test public void testLogPackageNameNotFound() throws Exception { @@ -114,6 +113,6 @@ public class WatchdogRollbackLoggerTest { new PackageManager.NameNotFoundException()); VersionedPackage logPackage = WatchdogRollbackLogger.getLogPackage(mMockContext, sTestPackageV1); - assertThat(logPackage).isEqualTo(sTestPackageV1); + assertThat(logPackage).isNull(); } } diff --git a/services/tests/wmtests/src/com/android/server/wm/utils/WmDisplayCutoutTest.java b/services/tests/wmtests/src/com/android/server/wm/utils/WmDisplayCutoutTest.java index fb8ba7bffd4c..a283476bfdf0 100644 --- a/services/tests/wmtests/src/com/android/server/wm/utils/WmDisplayCutoutTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/utils/WmDisplayCutoutTest.java @@ -47,6 +47,7 @@ import org.junit.Test; @SmallTest @Presubmit public class WmDisplayCutoutTest { + private static final Rect ZERO_RECT = new Rect(); private final DisplayCutout mCutoutTop = new DisplayCutout( Insets.of(0, 100, 0, 0), null /* boundLeft */, new Rect(50, 0, 75, 100) /* boundTop */, @@ -99,41 +100,204 @@ public class WmDisplayCutoutTest { } @Test - public void computeSafeInsets_top() { + public void computeSafeInsets_cutoutTop() { WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( - fromBoundingRect(0, 0, 100, 20, BOUNDS_POSITION_TOP), 200, 400); + fromBoundingRect(80, 0, 120, 20, BOUNDS_POSITION_TOP), 200, 400); assertEquals(new Rect(0, 20, 0, 0), cutout.getDisplayCutout().getSafeInsets()); } @Test - public void computeSafeInsets_left() { + public void computeSafeInsets_cutoutLeft() { WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( - fromBoundingRect(0, 0, 20, 100, BOUNDS_POSITION_LEFT), 400, 200); + fromBoundingRect(0, 180, 20, 220, BOUNDS_POSITION_LEFT), 200, 400); assertEquals(new Rect(20, 0, 0, 0), cutout.getDisplayCutout().getSafeInsets()); } @Test - public void computeSafeInsets_bottom() { + public void computeSafeInsets_cutoutBottom() { WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( - fromBoundingRect(0, 180, 100, 200, BOUNDS_POSITION_BOTTOM), 100, 200); + fromBoundingRect(80, 380, 120, 400, BOUNDS_POSITION_BOTTOM), 200, 400); assertEquals(new Rect(0, 0, 0, 20), cutout.getDisplayCutout().getSafeInsets()); } @Test - public void computeSafeInsets_right() { + public void computeSafeInsets_cutoutRight() { WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( - fromBoundingRect(180, 0, 200, 100, BOUNDS_POSITION_RIGHT), 200, 100); + fromBoundingRect(180, 180, 200, 220, BOUNDS_POSITION_RIGHT), 200, 400); assertEquals(new Rect(0, 0, 20, 0), cutout.getDisplayCutout().getSafeInsets()); } @Test + public void computeSafeInsets_topLeftCornerCutout_portrait() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(0, 0, 20, 20, BOUNDS_POSITION_TOP), 200, 400); + + assertEquals(new Rect(0, 20, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_topRightCornerCutout_portrait() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(180, 0, 200, 20, BOUNDS_POSITION_TOP), 200, 400); + + assertEquals(new Rect(0, 20, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_bottomLeftCornerCutout_portrait() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(0, 380, 20, 400, BOUNDS_POSITION_BOTTOM), 200, 400); + + assertEquals(new Rect(0, 0, 0, 20), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_bottomRightCornerCutout_portrait() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(180, 380, 200, 400, BOUNDS_POSITION_BOTTOM), 200, 400); + + assertEquals(new Rect(0, 0, 0, 20), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_topLeftCornerCutout_landscape() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(0, 0, 20, 20, BOUNDS_POSITION_LEFT), 400, 200); + + assertEquals(new Rect(20, 0, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_topRightCornerCutout_landscape() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(380, 0, 400, 20, BOUNDS_POSITION_RIGHT), 400, 200); + + assertEquals(new Rect(0, 0, 20, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_bottomLeftCornerCutout_landscape() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(0, 180, 20, 200, BOUNDS_POSITION_LEFT), 400, 200); + + assertEquals(new Rect(20, 0, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_bottomRightCornerCutout_landscape() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + fromBoundingRect(380, 180, 400, 200, BOUNDS_POSITION_RIGHT), 400, 200); + + assertEquals(new Rect(0, 0, 20, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_waterfall() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, ZERO_RECT, ZERO_RECT, ZERO_RECT}, + Insets.of(1, 2, 3, 4)), + 200, 400); + + assertEquals(new Rect(1, 2, 3, 4), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutTop_greaterThan_waterfallTop() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, new Rect(80, 0, 120, 30), ZERO_RECT, ZERO_RECT}, + Insets.of(0, 20, 0, 0)), + 200, 400); + + assertEquals(new Rect(0, 30, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutTop_lessThan_waterfallTop() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, new Rect(80, 0, 120, 30), ZERO_RECT, ZERO_RECT}, + Insets.of(0, 40, 0, 0)), + 200, 400); + + assertEquals(new Rect(0, 40, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutLeft_greaterThan_waterfallLeft() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {new Rect(0, 180, 30, 220), ZERO_RECT, ZERO_RECT, ZERO_RECT}, + Insets.of(20, 0, 0, 0)), + 200, 400); + + assertEquals(new Rect(30, 0, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutLeft_lessThan_waterfallLeft() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {new Rect(0, 180, 30, 220), ZERO_RECT, ZERO_RECT, ZERO_RECT}, + Insets.of(40, 0, 0, 0)), + 200, 400); + + assertEquals(new Rect(40, 0, 0, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutBottom_greaterThan_waterfallBottom() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, ZERO_RECT, ZERO_RECT, new Rect(80, 370, 120, 400)}, + Insets.of(0, 0, 0, 20)), + 200, 400); + + assertEquals(new Rect(0, 0, 0, 30), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutBottom_lessThan_waterfallBottom() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, ZERO_RECT, ZERO_RECT, new Rect(80, 370, 120, 400)}, + Insets.of(0, 0, 0, 40)), + 200, 400); + + assertEquals(new Rect(0, 0, 0, 40), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutRight_greaterThan_waterfallRight() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, ZERO_RECT, new Rect(170, 180, 200, 220), ZERO_RECT}, + Insets.of(0, 0, 20, 0)), + 200, 400); + + assertEquals(new Rect(0, 0, 30, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test + public void computeSafeInsets_cutoutRight_lessThan_waterfallRight() { + WmDisplayCutout cutout = WmDisplayCutout.computeSafeInsets( + DisplayCutout.fromBoundsAndWaterfall( + new Rect[] {ZERO_RECT, ZERO_RECT, new Rect(170, 180, 200, 220), ZERO_RECT}, + Insets.of(0, 0, 40, 0)), + 200, 400); + + assertEquals(new Rect(0, 0, 40, 0), cutout.getDisplayCutout().getSafeInsets()); + } + + @Test public void computeSafeInsets_bounds() { - DisplayCutout cutout = WmDisplayCutout.computeSafeInsets(mCutoutTop, 1000, - 2000).getDisplayCutout(); + DisplayCutout cutout = + WmDisplayCutout.computeSafeInsets(mCutoutTop, 1000, 2000).getDisplayCutout(); assertEquals(mCutoutTop.getBoundingRects(), cutout.getBoundingRects()); } diff --git a/telephony/java/android/telephony/BarringInfo.java b/telephony/java/android/telephony/BarringInfo.java index 9baa66fcd87e..92423a2f2218 100644 --- a/telephony/java/android/telephony/BarringInfo.java +++ b/telephony/java/android/telephony/BarringInfo.java @@ -62,38 +62,38 @@ public final class BarringInfo implements Parcelable { /* Applicabe to UTRAN */ /** Barring indicator for circuit-switched service; applicable to UTRAN */ public static final int BARRING_SERVICE_TYPE_CS_SERVICE = - android.hardware.radio.V1_5.BarringServiceType.CS_SERVICE; + android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_SERVICE; /** Barring indicator for packet-switched service; applicable to UTRAN */ public static final int BARRING_SERVICE_TYPE_PS_SERVICE = - android.hardware.radio.V1_5.BarringServiceType.PS_SERVICE; + android.hardware.radio.V1_5.BarringInfo.ServiceType.PS_SERVICE; /** Barring indicator for circuit-switched voice service; applicable to UTRAN */ public static final int BARRING_SERVICE_TYPE_CS_VOICE = - android.hardware.radio.V1_5.BarringServiceType.CS_VOICE; + android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_VOICE; /* Applicable to EUTRAN, NGRAN */ /** Barring indicator for mobile-originated signalling; applicable to EUTRAN and NGRAN */ public static final int BARRING_SERVICE_TYPE_MO_SIGNALLING = - android.hardware.radio.V1_5.BarringServiceType.MO_SIGNALLING; + android.hardware.radio.V1_5.BarringInfo.ServiceType.MO_SIGNALLING; /** Barring indicator for mobile-originated data traffic; applicable to EUTRAN and NGRAN */ public static final int BARRING_SERVICE_TYPE_MO_DATA = - android.hardware.radio.V1_5.BarringServiceType.MO_DATA; + android.hardware.radio.V1_5.BarringInfo.ServiceType.MO_DATA; /** Barring indicator for circuit-switched fallback for voice; applicable to EUTRAN and NGRAN */ public static final int BARRING_SERVICE_TYPE_CS_FALLBACK = - android.hardware.radio.V1_5.BarringServiceType.CS_FALLBACK; + android.hardware.radio.V1_5.BarringInfo.ServiceType.CS_FALLBACK; /** Barring indicator for MMTEL (IMS) voice; applicable to EUTRAN and NGRAN */ public static final int BARRING_SERVICE_TYPE_MMTEL_VOICE = - android.hardware.radio.V1_5.BarringServiceType.MMTEL_VOICE; + android.hardware.radio.V1_5.BarringInfo.ServiceType.MMTEL_VOICE; /** Barring indicator for MMTEL (IMS) video; applicable to EUTRAN and NGRAN */ public static final int BARRING_SERVICE_TYPE_MMTEL_VIDEO = - android.hardware.radio.V1_5.BarringServiceType.MMTEL_VIDEO; + android.hardware.radio.V1_5.BarringInfo.ServiceType.MMTEL_VIDEO; /* Applicable to UTRAN, EUTRAN, NGRAN */ /** Barring indicator for emergency services; applicable to UTRAN, EUTRAN, and NGRAN */ public static final int BARRING_SERVICE_TYPE_EMERGENCY = - android.hardware.radio.V1_5.BarringServiceType.EMERGENCY; + android.hardware.radio.V1_5.BarringInfo.ServiceType.EMERGENCY; /** Barring indicator for SMS sending; applicable to UTRAN, EUTRAN, and NGRAN */ public static final int BARRING_SERVICE_TYPE_SMS = - android.hardware.radio.V1_5.BarringServiceType.SMS; + android.hardware.radio.V1_5.BarringInfo.ServiceType.SMS; //TODO: add barring constants for Operator-Specific barring codes @@ -112,13 +112,14 @@ public final class BarringInfo implements Parcelable { public @interface BarringType {} /** Barring is inactive */ - public static final int BARRING_TYPE_NONE = android.hardware.radio.V1_5.BarringType.NONE; + public static final int BARRING_TYPE_NONE = + android.hardware.radio.V1_5.BarringInfo.BarringType.NONE; /** The service is barred */ public static final int BARRING_TYPE_UNCONDITIONAL = - android.hardware.radio.V1_5.BarringType.UNCONDITIONAL; + android.hardware.radio.V1_5.BarringInfo.BarringType.UNCONDITIONAL; /** The service may be barred based on additional factors */ public static final int BARRING_TYPE_CONDITIONAL = - android.hardware.radio.V1_5.BarringType.CONDITIONAL; + android.hardware.radio.V1_5.BarringInfo.BarringType.CONDITIONAL; /** If a modem does not report barring info, then the barring type will be UNKNOWN */ public static final int BARRING_TYPE_UNKNOWN = -1; @@ -277,27 +278,29 @@ public final class BarringInfo implements Parcelable { SparseArray<BarringServiceInfo> serviceInfos = new SparseArray<>(); for (android.hardware.radio.V1_5.BarringInfo halBarringInfo : halBarringInfos) { - if (halBarringInfo.type == android.hardware.radio.V1_5.BarringType.CONDITIONAL) { - if (halBarringInfo.typeSpecificInfo.getDiscriminator() - != android.hardware.radio.V1_5.BarringTypeSpecificInfo - .hidl_discriminator.conditionalBarringInfo) { + if (halBarringInfo.barringType + == android.hardware.radio.V1_5.BarringInfo.BarringType.CONDITIONAL) { + if (halBarringInfo.barringTypeSpecificInfo.getDiscriminator() + != android.hardware.radio.V1_5.BarringInfo.BarringTypeSpecificInfo + .hidl_discriminator.conditional) { // this is an error case where the barring info is conditional but the // conditional barring fields weren't included continue; } - android.hardware.radio.V1_5.ConditionalBarringInfo conditionalInfo = - halBarringInfo.typeSpecificInfo.conditionalBarringInfo(); + android.hardware.radio.V1_5.BarringInfo.BarringTypeSpecificInfo + .Conditional conditionalInfo = + halBarringInfo.barringTypeSpecificInfo.conditional(); serviceInfos.put( - halBarringInfo.service, new BarringServiceInfo( - halBarringInfo.type, // will always be CONDITIONAL here + halBarringInfo.serviceType, new BarringServiceInfo( + halBarringInfo.barringType, // will always be CONDITIONAL here conditionalInfo.isBarred, - conditionalInfo.barringFactor, - conditionalInfo.barringTimeSeconds)); + conditionalInfo.factor, + conditionalInfo.timeSeconds)); } else { // Barring type is either NONE or UNCONDITIONAL serviceInfos.put( - halBarringInfo.service, new BarringServiceInfo(halBarringInfo.type, - false, 0, 0)); + halBarringInfo.serviceType, new BarringServiceInfo( + halBarringInfo.barringType, false, 0, 0)); } } return new BarringInfo(ci, serviceInfos); @@ -321,6 +324,9 @@ public final class BarringInfo implements Parcelable { /** @hide */ @SystemApi public @NonNull BarringInfo createLocationInfoSanitizedCopy() { + // The only thing that would need sanitizing is the CellIdentity + if (mCellIdentity == null) return this; + return new BarringInfo(mCellIdentity.sanitizeLocationInfo(), mBarringServiceInfos); } diff --git a/telephony/java/android/telephony/PreciseDataConnectionState.java b/telephony/java/android/telephony/PreciseDataConnectionState.java index 54c22ae282fb..708adebb6db3 100644 --- a/telephony/java/android/telephony/PreciseDataConnectionState.java +++ b/telephony/java/android/telephony/PreciseDataConnectionState.java @@ -265,10 +265,10 @@ public final class PreciseDataConnectionState implements Parcelable { /** * Return the APN Settings for this data connection. * - * Returns the ApnSetting that was used to configure this data connection. + * @return the ApnSetting that was used to configure this data connection. */ // FIXME: This shouldn't be nullable; update once the ApnSetting is supplied correctly - @Nullable ApnSetting getApnSetting() { + public @Nullable ApnSetting getApnSetting() { return mApnSetting; } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 7406c8d5a33c..97f50fd314b8 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -55,7 +55,6 @@ import android.os.RemoteException; import android.provider.Telephony.SimInfo; import android.telephony.euicc.EuiccManager; import android.telephony.ims.ImsMmTelManager; -import android.util.DisplayMetrics; import android.util.Log; import android.util.Pair; @@ -2500,23 +2499,24 @@ public class SubscriptionManager { final SubscriptionInfo subInfo = SubscriptionManager.from(context).getActiveSubscriptionInfo(subId); - Configuration config = context.getResources().getConfiguration(); - Configuration newConfig = new Configuration(); - newConfig.setTo(config); + Configuration overrideConfig = new Configuration(); if (subInfo != null) { - newConfig.mcc = subInfo.getMcc(); - newConfig.mnc = subInfo.getMnc(); - if (newConfig.mnc == 0) newConfig.mnc = Configuration.MNC_ZERO; + overrideConfig.mcc = subInfo.getMcc(); + overrideConfig.mnc = subInfo.getMnc(); + if (overrideConfig.mnc == 0) overrideConfig.mnc = Configuration.MNC_ZERO; } if (useRootLocale) { - newConfig.setLocale(Locale.ROOT); + overrideConfig.setLocale(Locale.ROOT); } - DisplayMetrics metrics = context.getResources().getDisplayMetrics(); - DisplayMetrics newMetrics = new DisplayMetrics(); - newMetrics.setTo(metrics); - Resources res = new Resources(context.getResources().getAssets(), newMetrics, newConfig); + // Create new context with new configuration so that we can avoid modifying the passed in + // context. + // Note that if the original context configuration changes, the resources here will also + // change for all values except those overridden by newConfig (e.g. if the device has an + // orientation change). + Context newContext = context.createConfigurationContext(overrideConfig); + Resources res = newContext.getResources(); if (cacheKey != null) { // Save the newly created Resources in the resource cache. diff --git a/tests/net/java/android/net/VpnManagerTest.java b/tests/net/java/android/net/VpnManagerTest.java index 655c4d118592..97551c94e2ae 100644 --- a/tests/net/java/android/net/VpnManagerTest.java +++ b/tests/net/java/android/net/VpnManagerTest.java @@ -16,13 +16,21 @@ package android.net; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.test.mock.MockContext; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.internal.net.VpnProfile; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,7 +39,12 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) public class VpnManagerTest { - private static final String VPN_PROFILE_KEY = "KEY"; + private static final String PKG_NAME = "fooPackage"; + + private static final String SESSION_NAME_STRING = "testSession"; + private static final String SERVER_ADDR_STRING = "1.2.3.4"; + private static final String IDENTITY_STRING = "Identity"; + private static final byte[] PSK_BYTES = "preSharedKey".getBytes(); private IConnectivityManager mMockCs; private VpnManager mVpnManager; @@ -39,7 +52,7 @@ public class VpnManagerTest { new MockContext() { @Override public String getOpPackageName() { - return "fooPackage"; + return PKG_NAME; } }; @@ -50,34 +63,49 @@ public class VpnManagerTest { } @Test - public void testProvisionVpnProfile() throws Exception { - try { - mVpnManager.provisionVpnProfile(mock(PlatformVpnProfile.class)); - } catch (UnsupportedOperationException expected) { - } + public void testProvisionVpnProfilePreconsented() throws Exception { + final PlatformVpnProfile profile = getPlatformVpnProfile(); + when(mMockCs.provisionVpnProfile(any(VpnProfile.class), eq(PKG_NAME))).thenReturn(true); + + // Expect there to be no intent returned, as consent has already been granted. + assertNull(mVpnManager.provisionVpnProfile(profile)); + verify(mMockCs).provisionVpnProfile(eq(profile.toVpnProfile()), eq(PKG_NAME)); + } + + @Test + public void testProvisionVpnProfileNeedsConsent() throws Exception { + final PlatformVpnProfile profile = getPlatformVpnProfile(); + when(mMockCs.provisionVpnProfile(any(VpnProfile.class), eq(PKG_NAME))).thenReturn(false); + + // Expect intent to be returned, as consent has not already been granted. + assertNotNull(mVpnManager.provisionVpnProfile(profile)); + verify(mMockCs).provisionVpnProfile(eq(profile.toVpnProfile()), eq(PKG_NAME)); } @Test public void testDeleteProvisionedVpnProfile() throws Exception { - try { - mVpnManager.deleteProvisionedVpnProfile(); - } catch (UnsupportedOperationException expected) { - } + mVpnManager.deleteProvisionedVpnProfile(); + verify(mMockCs).deleteVpnProfile(eq(PKG_NAME)); } @Test public void testStartProvisionedVpnProfile() throws Exception { - try { - mVpnManager.startProvisionedVpnProfile(); - } catch (UnsupportedOperationException expected) { - } + mVpnManager.startProvisionedVpnProfile(); + verify(mMockCs).startVpnProfile(eq(PKG_NAME)); } @Test public void testStopProvisionedVpnProfile() throws Exception { - try { - mVpnManager.stopProvisionedVpnProfile(); - } catch (UnsupportedOperationException expected) { - } + mVpnManager.stopProvisionedVpnProfile(); + verify(mMockCs).stopVpnProfile(eq(PKG_NAME)); + } + + private Ikev2VpnProfile getPlatformVpnProfile() throws Exception { + return new Ikev2VpnProfile.Builder(SERVER_ADDR_STRING, IDENTITY_STRING) + .setBypassable(true) + .setMaxMtu(1300) + .setMetered(true) + .setAuthPsk(PSK_BYTES) + .build(); } } diff --git a/tests/net/java/com/android/server/connectivity/VpnTest.java b/tests/net/java/com/android/server/connectivity/VpnTest.java index ce50bef53d75..084ec7330236 100644 --- a/tests/net/java/com/android/server/connectivity/VpnTest.java +++ b/tests/net/java/com/android/server/connectivity/VpnTest.java @@ -28,11 +28,11 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_VPN; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; -import static android.net.RouteInfo.RTN_UNREACHABLE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.AdditionalMatchers.aryEq; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -43,6 +43,7 @@ import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -58,21 +59,20 @@ import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; import android.content.res.Resources; import android.net.ConnectivityManager; -import android.net.IpPrefix; -import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkInfo.DetailedState; -import android.net.RouteInfo; import android.net.UidRange; import android.net.VpnService; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.INetworkManagementService; import android.os.Looper; -import android.os.SystemClock; +import android.os.Process; import android.os.UserHandle; import android.os.UserManager; +import android.security.Credentials; +import android.security.KeyStore; import android.util.ArrayMap; import android.util.ArraySet; @@ -81,6 +81,7 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.R; import com.android.internal.net.VpnConfig; +import com.android.internal.net.VpnProfile; import org.junit.Before; import org.junit.Test; @@ -90,9 +91,6 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.net.Inet4Address; -import java.net.Inet6Address; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -124,6 +122,8 @@ public class VpnTest { managedProfileA.profileGroupId = primaryUser.id; } + static final String TEST_VPN_PKG = "com.dummy.vpn"; + /** * Names and UIDs for some fake packages. Important points: * - UID is ordered increasing. @@ -148,6 +148,8 @@ public class VpnTest { @Mock private NotificationManager mNotificationManager; @Mock private Vpn.SystemServices mSystemServices; @Mock private ConnectivityManager mConnectivityManager; + @Mock private KeyStore mKeyStore; + private final VpnProfile mVpnProfile = new VpnProfile("key"); @Before public void setUp() throws Exception { @@ -166,6 +168,7 @@ public class VpnTest { when(mContext.getString(R.string.config_customVpnAlwaysOnDisconnectedDialogComponent)) .thenReturn(Resources.getSystem().getString( R.string.config_customVpnAlwaysOnDisconnectedDialogComponent)); + when(mSystemServices.isCallerSystem()).thenReturn(true); // Used by {@link Notification.Builder} ApplicationInfo applicationInfo = new ApplicationInfo(); @@ -175,6 +178,10 @@ public class VpnTest { .thenReturn(applicationInfo); doNothing().when(mNetService).registerObserver(any()); + + // Deny all appops by default. + when(mAppOps.noteOpNoThrow(anyInt(), anyInt(), anyString())) + .thenReturn(AppOpsManager.MODE_IGNORED); } @Test @@ -464,12 +471,12 @@ public class VpnTest { order.verify(mNetService).setAllowOnlyVpnForUids(eq(true), aryEq(entireUser)); // When a new VPN package is set the rules should change to cover that package. - vpn.prepare(null, PKGS[0]); + vpn.prepare(null, PKGS[0], false /* isPlatformVpn */); order.verify(mNetService).setAllowOnlyVpnForUids(eq(false), aryEq(entireUser)); order.verify(mNetService).setAllowOnlyVpnForUids(eq(true), aryEq(exceptPkg0)); // When that VPN package is unset, everything should be undone again in reverse. - vpn.prepare(null, VpnConfig.LEGACY_VPN); + vpn.prepare(null, VpnConfig.LEGACY_VPN, false /* isPlatformVpn */); order.verify(mNetService).setAllowOnlyVpnForUids(eq(false), aryEq(exceptPkg0)); order.verify(mNetService).setAllowOnlyVpnForUids(eq(true), aryEq(entireUser)); } @@ -632,6 +639,185 @@ public class VpnTest { } /** + * The profile name should NOT change between releases for backwards compatibility + * + * <p>If this is changed between releases, the {@link Vpn#getVpnProfilePrivileged()} method MUST + * be updated to ensure backward compatibility. + */ + @Test + public void testGetProfileNameForPackage() throws Exception { + final Vpn vpn = createVpn(primaryUser.id); + setMockedUsers(primaryUser); + + final String expected = Credentials.PLATFORM_VPN + primaryUser.id + "_" + TEST_VPN_PKG; + assertEquals(expected, vpn.getProfileNameForPackage(TEST_VPN_PKG)); + } + + private Vpn createVpnAndSetupUidChecks(int... grantedOps) throws Exception { + final Vpn vpn = createVpn(primaryUser.id); + setMockedUsers(primaryUser); + + when(mPackageManager.getPackageUidAsUser(eq(TEST_VPN_PKG), anyInt())) + .thenReturn(Process.myUid()); + + for (final int op : grantedOps) { + when(mAppOps.noteOpNoThrow(op, Process.myUid(), TEST_VPN_PKG)) + .thenReturn(AppOpsManager.MODE_ALLOWED); + } + + return vpn; + } + + private void checkProvisionVpnProfile(Vpn vpn, boolean expectedResult, int... checkedOps) { + assertEquals(expectedResult, vpn.provisionVpnProfile(TEST_VPN_PKG, mVpnProfile, mKeyStore)); + + // The profile should always be stored, whether or not consent has been previously granted. + verify(mKeyStore) + .put( + eq(vpn.getProfileNameForPackage(TEST_VPN_PKG)), + eq(mVpnProfile.encode()), + eq(Process.SYSTEM_UID), + eq(0)); + + for (final int checkedOp : checkedOps) { + verify(mAppOps).noteOpNoThrow(checkedOp, Process.myUid(), TEST_VPN_PKG); + } + } + + @Test + public void testProvisionVpnProfilePreconsented() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN); + + checkProvisionVpnProfile( + vpn, true /* expectedResult */, AppOpsManager.OP_ACTIVATE_PLATFORM_VPN); + } + + @Test + public void testProvisionVpnProfileNotPreconsented() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(); + + // Expect that both the ACTIVATE_VPN and ACTIVATE_PLATFORM_VPN were tried, but the caller + // had neither. + checkProvisionVpnProfile(vpn, false /* expectedResult */, + AppOpsManager.OP_ACTIVATE_PLATFORM_VPN, AppOpsManager.OP_ACTIVATE_VPN); + } + + @Test + public void testProvisionVpnProfileVpnServicePreconsented() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OP_ACTIVATE_VPN); + + checkProvisionVpnProfile(vpn, true /* expectedResult */, AppOpsManager.OP_ACTIVATE_VPN); + } + + @Test + public void testProvisionVpnProfileTooLarge() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN); + + final VpnProfile bigProfile = new VpnProfile(""); + bigProfile.name = new String(new byte[Vpn.MAX_VPN_PROFILE_SIZE_BYTES + 1]); + + try { + vpn.provisionVpnProfile(TEST_VPN_PKG, bigProfile, mKeyStore); + fail("Expected IAE due to profile size"); + } catch (IllegalArgumentException expected) { + } + } + + @Test + public void testDeleteVpnProfile() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(); + + vpn.deleteVpnProfile(TEST_VPN_PKG, mKeyStore); + + verify(mKeyStore) + .delete(eq(vpn.getProfileNameForPackage(TEST_VPN_PKG)), eq(Process.SYSTEM_UID)); + } + + @Test + public void testGetVpnProfilePrivileged() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(); + + when(mKeyStore.get(vpn.getProfileNameForPackage(TEST_VPN_PKG))) + .thenReturn(new VpnProfile("").encode()); + + vpn.getVpnProfilePrivileged(TEST_VPN_PKG, mKeyStore); + + verify(mKeyStore).get(eq(vpn.getProfileNameForPackage(TEST_VPN_PKG))); + } + + @Test + public void testStartVpnProfile() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN); + + when(mKeyStore.get(vpn.getProfileNameForPackage(TEST_VPN_PKG))) + .thenReturn(mVpnProfile.encode()); + + vpn.startVpnProfile(TEST_VPN_PKG, mKeyStore); + + verify(mKeyStore).get(eq(vpn.getProfileNameForPackage(TEST_VPN_PKG))); + verify(mAppOps) + .noteOpNoThrow( + eq(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN), + eq(Process.myUid()), + eq(TEST_VPN_PKG)); + } + + @Test + public void testStartVpnProfileVpnServicePreconsented() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OP_ACTIVATE_VPN); + + when(mKeyStore.get(vpn.getProfileNameForPackage(TEST_VPN_PKG))) + .thenReturn(mVpnProfile.encode()); + + vpn.startVpnProfile(TEST_VPN_PKG, mKeyStore); + + // Verify that the the ACTIVATE_VPN appop was checked, but no error was thrown. + verify(mAppOps).noteOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN, Process.myUid(), TEST_VPN_PKG); + } + + @Test + public void testStartVpnProfileNotConsented() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(); + + try { + vpn.startVpnProfile(TEST_VPN_PKG, mKeyStore); + fail("Expected failure due to no user consent"); + } catch (SecurityException expected) { + } + + // Verify both appops were checked. + verify(mAppOps) + .noteOpNoThrow( + eq(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN), + eq(Process.myUid()), + eq(TEST_VPN_PKG)); + verify(mAppOps).noteOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN, Process.myUid(), TEST_VPN_PKG); + + // Keystore should never have been accessed. + verify(mKeyStore, never()).get(any()); + } + + @Test + public void testStartVpnProfileMissingProfile() throws Exception { + final Vpn vpn = createVpnAndSetupUidChecks(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN); + + when(mKeyStore.get(vpn.getProfileNameForPackage(TEST_VPN_PKG))).thenReturn(null); + + try { + vpn.startVpnProfile(TEST_VPN_PKG, mKeyStore); + fail("Expected failure due to missing profile"); + } catch (IllegalArgumentException expected) { + } + + verify(mKeyStore).get(vpn.getProfileNameForPackage(TEST_VPN_PKG)); + verify(mAppOps) + .noteOpNoThrow( + eq(AppOpsManager.OP_ACTIVATE_PLATFORM_VPN), + eq(Process.myUid()), + eq(TEST_VPN_PKG)); + } + + /** * Mock some methods of vpn object. */ private Vpn createVpn(@UserIdInt int userId) { diff --git a/tools/stats_log_api_gen/Android.bp b/tools/stats_log_api_gen/Android.bp index d3958a65c704..0e32aee93ebd 100644 --- a/tools/stats_log_api_gen/Android.bp +++ b/tools/stats_log_api_gen/Android.bp @@ -30,7 +30,6 @@ cc_binary_host { "utils.cpp", ], cflags: [ - "-DSTATS_SCHEMA_LEGACY", "-Wall", "-Werror", ], diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index d290acae1967..8bccd7150050 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -40,18 +40,21 @@ AtomDecl::AtomDecl() { } -AtomDecl::AtomDecl(const AtomDecl& that) - : code(that.code), - name(that.name), - message(that.message), - fields(that.fields), - primaryFields(that.primaryFields), - exclusiveField(that.exclusiveField), - uidField(that.uidField), - whitelisted(that.whitelisted), - binaryFields(that.binaryFields), - hasModule(that.hasModule), - moduleName(that.moduleName) {} +AtomDecl::AtomDecl(const AtomDecl &that) + : code(that.code), + name(that.name), + message(that.message), + fields(that.fields), + primaryFields(that.primaryFields), + exclusiveField(that.exclusiveField), + defaultState(that.defaultState), + resetState(that.resetState), + nested(that.nested), + uidField(that.uidField), + whitelisted(that.whitelisted), + binaryFields(that.binaryFields), + hasModule(that.hasModule), + moduleName(that.moduleName) {} AtomDecl::AtomDecl(int c, const string& n, const string& m) :code(c), @@ -281,7 +284,7 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, atomDecl->fields.push_back(atField); if (field->options().GetExtension(os::statsd::state_field_option).option() == - os::statsd::StateField::PRIMARY) { + os::statsd::StateField::PRIMARY_FIELD) { if (javaType == JAVA_TYPE_UNKNOWN || javaType == JAVA_TYPE_ATTRIBUTION_CHAIN || javaType == JAVA_TYPE_OBJECT || javaType == JAVA_TYPE_BYTE_ARRAY) { @@ -300,7 +303,7 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, } if (field->options().GetExtension(os::statsd::state_field_option).option() == - os::statsd::StateField::EXCLUSIVE) { + os::statsd::StateField::EXCLUSIVE_STATE) { if (javaType == JAVA_TYPE_UNKNOWN || javaType == JAVA_TYPE_ATTRIBUTION_CHAIN || javaType == JAVA_TYPE_OBJECT || javaType == JAVA_TYPE_BYTE_ARRAY) { @@ -312,6 +315,21 @@ int collate_atom(const Descriptor *atom, AtomDecl *atomDecl, } else { errorCount++; } + + if (field->options() + .GetExtension(os::statsd::state_field_option) + .has_default_state_value()) { + atomDecl->defaultState = field->options() + .GetExtension(os::statsd::state_field_option) + .default_state_value(); + } + + if (field->options().GetExtension(os::statsd::state_field_option).has_reset_state_value()) { + atomDecl->resetState = field->options() + .GetExtension(os::statsd::state_field_option) + .reset_state_value(); + } + atomDecl->nested = field->options().GetExtension(os::statsd::state_field_option).nested(); } if (field->options().GetExtension(os::statsd::is_uid) == true) { diff --git a/tools/stats_log_api_gen/Collation.h b/tools/stats_log_api_gen/Collation.h index 87d4d5db0cee..65d8e3efee5b 100644 --- a/tools/stats_log_api_gen/Collation.h +++ b/tools/stats_log_api_gen/Collation.h @@ -88,6 +88,9 @@ struct AtomDecl { vector<int> primaryFields; int exclusiveField = 0; + int defaultState = INT_MAX; + int resetState = INT_MAX; + bool nested; int uidField = 0; diff --git a/tools/stats_log_api_gen/atoms_info_writer.cpp b/tools/stats_log_api_gen/atoms_info_writer.cpp index 66ae96401974..984c929f63bd 100644 --- a/tools/stats_log_api_gen/atoms_info_writer.cpp +++ b/tools/stats_log_api_gen/atoms_info_writer.cpp @@ -25,11 +25,15 @@ namespace android { namespace stats_log_api_gen { static void write_atoms_info_header_body(FILE* out, const Atoms& atoms) { + fprintf(out, "static int UNSET_VALUE = INT_MAX;\n"); fprintf(out, "static int FIRST_UID_IN_CHAIN = 0;\n"); fprintf(out, "struct StateAtomFieldOptions {\n"); fprintf(out, " std::vector<int> primaryFields;\n"); fprintf(out, " int exclusiveField;\n"); + fprintf(out, " int defaultState = UNSET_VALUE;\n"); + fprintf(out, " int resetState = UNSET_VALUE;\n"); + fprintf(out, " bool nested;\n"); fprintf(out, "};\n"); fprintf(out, "\n"); @@ -126,7 +130,7 @@ static void write_atoms_info_cpp_body(FILE* out, const Atoms& atoms) { "static std::map<int, StateAtomFieldOptions> " "getStateAtomFieldOptions() {\n"); fprintf(out, " std::map<int, StateAtomFieldOptions> options;\n"); - fprintf(out, " StateAtomFieldOptions opt;\n"); + fprintf(out, " StateAtomFieldOptions* opt;\n"); for (set<AtomDecl>::const_iterator atom = atoms.decls.begin(); atom != atoms.decls.end(); atom++) { if (atom->primaryFields.size() == 0 && atom->exclusiveField == 0) { @@ -136,14 +140,26 @@ static void write_atoms_info_cpp_body(FILE* out, const Atoms& atoms) { "\n // Adding primary and exclusive fields for atom " "(%d)%s\n", atom->code, atom->name.c_str()); - fprintf(out, " opt.primaryFields.clear();\n"); + fprintf(out, " opt = &(options[static_cast<int>(%s)]);\n", + make_constant_name(atom->name).c_str()); + fprintf(out, " opt->primaryFields.reserve(%lu);\n", atom->primaryFields.size()); for (const auto& field : atom->primaryFields) { - fprintf(out, " opt.primaryFields.push_back(%d);\n", field); + fprintf(out, " opt->primaryFields.push_back(%d);\n", field); } - fprintf(out, " opt.exclusiveField = %d;\n", atom->exclusiveField); - fprintf(out, " options[static_cast<int>(%s)] = opt;\n", - make_constant_name(atom->name).c_str()); + fprintf(out, " opt->exclusiveField = %d;\n", atom->exclusiveField); + if (atom->defaultState != INT_MAX) { + fprintf(out, " opt->defaultState = %d;\n", atom->defaultState); + } else { + fprintf(out, " opt->defaultState = UNSET_VALUE;\n"); + } + + if (atom->resetState != INT_MAX) { + fprintf(out, " opt->resetState = %d;\n", atom->resetState); + } else { + fprintf(out, " opt->resetState = UNSET_VALUE;\n"); + } + fprintf(out, " opt->nested = %d;\n", atom->nested); } fprintf(out, " return options;\n"); diff --git a/tools/stats_log_api_gen/test.proto b/tools/stats_log_api_gen/test.proto index c9a47632b4bb..b892194410ae 100644 --- a/tools/stats_log_api_gen/test.proto +++ b/tools/stats_log_api_gen/test.proto @@ -148,53 +148,42 @@ message GoodStateAtoms { // The atom has only primary field but no exclusive state field. message BadStateAtom1 { - optional int32 uid = 1 - [(android.os.statsd.state_field_option).option = PRIMARY]; + optional int32 uid = 1 [(android.os.statsd.state_field_option).option = PRIMARY_FIELD]; } // Only primative types can be annotated. message BadStateAtom2 { repeated android.os.statsd.AttributionNode attribution = 1 - [(android.os.statsd.state_field_option).option = PRIMARY]; - optional int32 state = 2 - [(android.os.statsd.state_field_option).option = EXCLUSIVE]; + [(android.os.statsd.state_field_option).option = PRIMARY_FIELD]; + optional int32 state = 2 [(android.os.statsd.state_field_option).option = EXCLUSIVE_STATE]; } // Having 2 exclusive state field in the atom means the atom is badly designed. // E.g., putting bluetooth state and wifi state in the same atom. message BadStateAtom3 { - optional int32 uid = 1 - [(android.os.statsd.state_field_option).option = PRIMARY]; - optional int32 state = 2 - [(android.os.statsd.state_field_option).option = EXCLUSIVE]; - optional int32 state2 = 3 - [(android.os.statsd.state_field_option).option = EXCLUSIVE]; + optional int32 uid = 1 [(android.os.statsd.state_field_option).option = PRIMARY_FIELD]; + optional int32 state = 2 [(android.os.statsd.state_field_option).option = EXCLUSIVE_STATE]; + optional int32 state2 = 3 [(android.os.statsd.state_field_option).option = EXCLUSIVE_STATE]; } message GoodStateAtom1 { - optional int32 uid = 1 - [(android.os.statsd.state_field_option).option = PRIMARY]; - optional int32 state = 2 - [(android.os.statsd.state_field_option).option = EXCLUSIVE]; + optional int32 uid = 1 [(android.os.statsd.state_field_option).option = PRIMARY_FIELD]; + optional int32 state = 2 [(android.os.statsd.state_field_option).option = EXCLUSIVE_STATE]; } // Atoms can have exclusive state field, but no primary field. That means // the state is globally exclusive (e.g., DisplayState). message GoodStateAtom2 { optional int32 uid = 1; - optional int32 state = 2 - [(android.os.statsd.state_field_option).option = EXCLUSIVE]; + optional int32 state = 2 [(android.os.statsd.state_field_option).option = EXCLUSIVE_STATE]; } // We can have more than one primary fields. That means their combination is a // primary key. message GoodStateAtom3 { - optional int32 uid = 1 - [(android.os.statsd.state_field_option).option = PRIMARY]; - optional int32 tid = 2 - [(android.os.statsd.state_field_option).option = PRIMARY]; - optional int32 state = 3 - [(android.os.statsd.state_field_option).option = EXCLUSIVE]; + optional int32 uid = 1 [(android.os.statsd.state_field_option).option = PRIMARY_FIELD]; + optional int32 tid = 2 [(android.os.statsd.state_field_option).option = PRIMARY_FIELD]; + optional int32 state = 3 [(android.os.statsd.state_field_option).option = EXCLUSIVE_STATE]; } message WhitelistedAtom { diff --git a/wifi/java/android/net/wifi/IScoreChangeCallback.aidl b/wifi/java/android/net/wifi/IScoreChangeCallback.aidl index fd236107bc6e..462a97844d76 100644 --- a/wifi/java/android/net/wifi/IScoreChangeCallback.aidl +++ b/wifi/java/android/net/wifi/IScoreChangeCallback.aidl @@ -16,6 +16,8 @@ package android.net.wifi; +import android.net.NetworkScore; + /** * Interface for Wi-Fi network score callback. * @@ -23,7 +25,7 @@ package android.net.wifi; */ oneway interface IScoreChangeCallback { - void onStatusChange(int sessionId, boolean exiting); + void onScoreChange(int sessionId, in NetworkScore score); void onTriggerUpdateOfWifiUsabilityStats(int sessionId); } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 8d95cb010856..91b7df372e01 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -1252,8 +1252,8 @@ public class WifiConfiguration implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(value = { - NETWORK_SELECTION_ENABLE, + @IntDef(prefix = "DISABLED_", value = { + DISABLED_NONE, DISABLED_ASSOCIATION_REJECTION, DISABLED_AUTHENTICATION_FAILURE, DISABLED_DHCP_FAILURE, @@ -1267,7 +1267,7 @@ public class WifiConfiguration implements Parcelable { // Quality Network disabled reasons /** Default value. Means not disabled. */ - public static final int NETWORK_SELECTION_ENABLE = 0; + public static final int DISABLED_NONE = 0; /** * The starting index for network selection disabled reasons. * @hide @@ -1356,7 +1356,7 @@ public class WifiConfiguration implements Parcelable { private static SparseArray<DisableReasonInfo> buildDisableReasonInfos() { SparseArray<DisableReasonInfo> reasons = new SparseArray<>(); - reasons.append(NETWORK_SELECTION_ENABLE, + reasons.append(DISABLED_NONE, new DisableReasonInfo( // Note that these strings are persisted in // XmlUtil.NetworkSelectionStatusXmlUtil#writeToXml, @@ -1610,7 +1610,7 @@ public class WifiConfiguration implements Parcelable { } /** True if the device has ever connected to this network, false otherwise. */ - public boolean getHasEverConnected() { + public boolean hasEverConnected() { return mHasEverConnected; } @@ -1650,7 +1650,7 @@ public class WifiConfiguration implements Parcelable { /** * * Set the current network's disable reason. - * One of the {@link #NETWORK_SELECTION_ENABLE} or DISABLED_* constants. + * One of the {@link #DISABLED_NONE} or DISABLED_* constants. * e.g. {@link #DISABLED_ASSOCIATION_REJECTION}. * @see NetworkSelectionStatus#getNetworkSelectionDisableReason() */ @@ -1674,7 +1674,7 @@ public class WifiConfiguration implements Parcelable { /** * Get the network disable reason string for a reason code (for debugging). - * @param reason specific error reason. One of the {@link #NETWORK_SELECTION_ENABLE} or + * @param reason specific error reason. One of the {@link #DISABLED_NONE} or * DISABLED_* constants e.g. {@link #DISABLED_ASSOCIATION_REJECTION}. * @return network disable reason string, or null if the reason is invalid. */ @@ -1740,7 +1740,7 @@ public class WifiConfiguration implements Parcelable { /** * Returns the current network's disable reason. - * One of the {@link #NETWORK_SELECTION_ENABLE} or DISABLED_* constants + * One of the {@link #DISABLED_NONE} or DISABLED_* constants * e.g. {@link #DISABLED_ASSOCIATION_REJECTION}. */ @NetworkSelectionDisableReason @@ -1780,13 +1780,13 @@ public class WifiConfiguration implements Parcelable { /** * Get the disable counter of a specific reason. - * @param reason specific failure reason. One of the {@link #NETWORK_SELECTION_ENABLE} or + * @param reason specific failure reason. One of the {@link #DISABLED_NONE} or * DISABLED_* constants e.g. {@link #DISABLED_ASSOCIATION_REJECTION}. * @exception IllegalArgumentException for invalid reason * @return counter number for specific error reason. */ public int getDisableReasonCounter(@NetworkSelectionDisableReason int reason) { - if (reason >= NETWORK_SELECTION_ENABLE && reason < NETWORK_SELECTION_DISABLED_MAX) { + if (reason >= DISABLED_NONE && reason < NETWORK_SELECTION_DISABLED_MAX) { return mNetworkSeclectionDisableCounter[reason]; } else { throw new IllegalArgumentException("Illegal reason value: " + reason); @@ -1801,7 +1801,7 @@ public class WifiConfiguration implements Parcelable { * @hide */ public void setDisableReasonCounter(int reason, int value) { - if (reason >= NETWORK_SELECTION_ENABLE && reason < NETWORK_SELECTION_DISABLED_MAX) { + if (reason >= DISABLED_NONE && reason < NETWORK_SELECTION_DISABLED_MAX) { mNetworkSeclectionDisableCounter[reason] = value; } else { throw new IllegalArgumentException("Illegal reason value: " + reason); @@ -1815,7 +1815,7 @@ public class WifiConfiguration implements Parcelable { * @hide */ public void incrementDisableReasonCounter(int reason) { - if (reason >= NETWORK_SELECTION_ENABLE && reason < NETWORK_SELECTION_DISABLED_MAX) { + if (reason >= DISABLED_NONE && reason < NETWORK_SELECTION_DISABLED_MAX) { mNetworkSeclectionDisableCounter[reason]++; } else { throw new IllegalArgumentException("Illegal reason value: " + reason); @@ -1829,8 +1829,8 @@ public class WifiConfiguration implements Parcelable { * @hide */ public void clearDisableReasonCounter(int reason) { - if (reason >= NETWORK_SELECTION_ENABLE && reason < NETWORK_SELECTION_DISABLED_MAX) { - mNetworkSeclectionDisableCounter[reason] = NETWORK_SELECTION_ENABLE; + if (reason >= DISABLED_NONE && reason < NETWORK_SELECTION_DISABLED_MAX) { + mNetworkSeclectionDisableCounter[reason] = DISABLED_NONE; } else { throw new IllegalArgumentException("Illegal reason value: " + reason); } @@ -1841,7 +1841,7 @@ public class WifiConfiguration implements Parcelable { * @hide */ public void clearDisableReasonCounter() { - Arrays.fill(mNetworkSeclectionDisableCounter, NETWORK_SELECTION_ENABLE); + Arrays.fill(mNetworkSeclectionDisableCounter, DISABLED_NONE); } /** @@ -1871,7 +1871,7 @@ public class WifiConfiguration implements Parcelable { public void copy(NetworkSelectionStatus source) { mStatus = source.mStatus; mNetworkSelectionDisableReason = source.mNetworkSelectionDisableReason; - for (int index = NETWORK_SELECTION_ENABLE; index < NETWORK_SELECTION_DISABLED_MAX; + for (int index = DISABLED_NONE; index < NETWORK_SELECTION_DISABLED_MAX; index++) { mNetworkSeclectionDisableCounter[index] = source.mNetworkSeclectionDisableCounter[index]; @@ -1882,14 +1882,14 @@ public class WifiConfiguration implements Parcelable { setCandidate(source.getCandidate()); setCandidateScore(source.getCandidateScore()); setConnectChoice(source.getConnectChoice()); - setHasEverConnected(source.getHasEverConnected()); + setHasEverConnected(source.hasEverConnected()); } /** @hide */ public void writeToParcel(Parcel dest) { dest.writeInt(getNetworkSelectionStatus()); dest.writeInt(getNetworkSelectionDisableReason()); - for (int index = NETWORK_SELECTION_ENABLE; index < NETWORK_SELECTION_DISABLED_MAX; + for (int index = DISABLED_NONE; index < NETWORK_SELECTION_DISABLED_MAX; index++) { dest.writeInt(getDisableReasonCounter(index)); } @@ -1901,14 +1901,14 @@ public class WifiConfiguration implements Parcelable { } else { dest.writeInt(CONNECT_CHOICE_NOT_EXISTS); } - dest.writeInt(getHasEverConnected() ? 1 : 0); + dest.writeInt(hasEverConnected() ? 1 : 0); } /** @hide */ public void readFromParcel(Parcel in) { setNetworkSelectionStatus(in.readInt()); setNetworkSelectionDisableReason(in.readInt()); - for (int index = NETWORK_SELECTION_ENABLE; index < NETWORK_SELECTION_DISABLED_MAX; + for (int index = DISABLED_NONE; index < NETWORK_SELECTION_DISABLED_MAX; index++) { setDisableReasonCounter(index, in.readInt()); } @@ -2151,8 +2151,8 @@ public class WifiConfiguration implements Parcelable { sbuf.append(" mNetworkSelectionDisableReason ") .append(mNetworkSelectionStatus.getNetworkDisableReasonString() + "\n"); - for (int index = mNetworkSelectionStatus.NETWORK_SELECTION_ENABLE; - index < mNetworkSelectionStatus.NETWORK_SELECTION_DISABLED_MAX; index++) { + for (int index = NetworkSelectionStatus.DISABLED_NONE; + index < NetworkSelectionStatus.NETWORK_SELECTION_DISABLED_MAX; index++) { if (mNetworkSelectionStatus.getDisableReasonCounter(index) != 0) { sbuf.append(NetworkSelectionStatus.getNetworkDisableReasonString(index) + " counter:" + mNetworkSelectionStatus.getDisableReasonCounter(index) @@ -2164,7 +2164,7 @@ public class WifiConfiguration implements Parcelable { sbuf.append(" connect choice: ").append(mNetworkSelectionStatus.getConnectChoice()); } sbuf.append(" hasEverConnected: ") - .append(mNetworkSelectionStatus.getHasEverConnected()).append("\n"); + .append(mNetworkSelectionStatus.hasEverConnected()).append("\n"); if (this.numAssociation > 0) { sbuf.append(" numAssociation ").append(this.numAssociation).append("\n"); @@ -2533,7 +2533,7 @@ public class WifiConfiguration implements Parcelable { * @hide */ @Nullable - @SystemApi + @UnsupportedAppUsage public StaticIpConfiguration getStaticIpConfiguration() { return mIpConfiguration.getStaticIpConfiguration(); } @@ -2549,7 +2549,7 @@ public class WifiConfiguration implements Parcelable { * @hide */ @NonNull - @SystemApi + @UnsupportedAppUsage public IpConfiguration.IpAssignment getIpAssignment() { return mIpConfiguration.getIpAssignment(); } @@ -2565,7 +2565,7 @@ public class WifiConfiguration implements Parcelable { * @hide */ @NonNull - @SystemApi + @UnsupportedAppUsage public IpConfiguration.ProxySettings getProxySettings() { return mIpConfiguration.getProxySettings(); } @@ -2628,7 +2628,7 @@ public class WifiConfiguration implements Parcelable { * Set the {@link ProxySettings} and {@link ProxyInfo} for this network. * @hide */ - @SystemApi + @UnsupportedAppUsage public void setProxy(@NonNull ProxySettings settings, @NonNull ProxyInfo proxy) { mIpConfiguration.setProxySettings(settings); mIpConfiguration.setHttpProxy(proxy); diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 04016b606b96..db0d36e5c086 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -60,13 +60,13 @@ public class WifiEnterpriseConfig implements Parcelable { "android.net.wifi.extra.WAPI_AS_CERTIFICATE_DATA"; /** - * Intent extra: name for WAPI AS certificates + * Intent extra: name for WAPI USER certificates */ public static final String EXTRA_WAPI_USER_CERTIFICATE_NAME = "android.net.wifi.extra.WAPI_USER_CERTIFICATE_NAME"; /** - * Intent extra: data for WAPI AS certificates + * Intent extra: data for WAPI USER certificates */ public static final String EXTRA_WAPI_USER_CERTIFICATE_DATA = "android.net.wifi.extra.WAPI_USER_CERTIFICATE_DATA"; diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 76f97164032c..da521ed4d8a1 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -38,6 +38,7 @@ import android.net.ConnectivityManager; import android.net.DhcpInfo; import android.net.MacAddress; import android.net.Network; +import android.net.NetworkScore; import android.net.NetworkStack; import android.net.wifi.hotspot2.IProvisioningCallback; import android.net.wifi.hotspot2.OsuProvider; @@ -5948,10 +5949,11 @@ public class WifiManager { * * @param sessionId The ID to indicate current Wi-Fi network connection obtained from * {@link WifiConnectedNetworkScorer#start(int)}. - * @param isUsable The bit to indicate whether current Wi-Fi network is usable or not. - * Populated by connected network scorer in applications. + * @param score The {@link android.net.NetworkScore} object representing the + * characteristics of current Wi-Fi network. Populated by connected network + * scorer in applications. */ - void onStatusChange(int sessionId, boolean isUsable); + void onScoreChange(int sessionId, @NonNull NetworkScore score); /** * Called by applications to trigger an update of {@link WifiUsabilityStatsEntry}. @@ -5977,9 +5979,9 @@ public class WifiManager { } @Override - public void onStatusChange(int sessionId, boolean isUsable) { + public void onScoreChange(int sessionId, @NonNull NetworkScore score) { try { - mScoreChangeCallback.onStatusChange(sessionId, isUsable); + mScoreChangeCallback.onScoreChange(sessionId, score); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } |